astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

slightly better

Browse source
This commit is contained in:
Curid 2022-06-04 16:10:26 +00:00
parent 86c132f9cd
commit f9b8d6ed1b
7 changed files with 47 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

1
web/package.json
View file

@ -1,6 +1,7 @@
{
"name": "ntfy",
"version": "1.0.0",
"homepage": ".",
"private": true,
"scripts": {
"start": "react-scripts start",

1
web/public/config.js
View file

@ -4,6 +4,5 @@
// The actual config is dynamically generated server-side.
var config = {
appRoot: "/",
disallowedTopics: ["docs", "static", "file", "app", "settings"]
};

20
web/public/index.html
View file

@ -1,9 +1,19 @@
<!DOCTYPE html>
<html lang="en">
<head>
<base>
<script>
// Calculate the root path.
const currentPath = "/" // Replaced by server.
const pathname = window.location.pathname
const lastIndex = pathname.lastIndexOf(currentPath)
var RootPath = pathname.slice(0, lastIndex+1)
console.log(`Root=${RootPath}`)
document.querySelector("base").href = RootPath;
</script>
<meta charset="UTF-8">
<title>ntfy web</title>
<!-- Mobile view -->
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@ -15,7 +25,7 @@
<meta name="apple-mobile-web-app-status-bar-style" content="#317f6f">
<!-- Favicon, see favicon.io -->
<link rel="icon" type="image/png" href="%PUBLIC_URL%/static/img/favicon.png">
<link rel="icon" type="image/png" href="static/img/favicon.png">
<!-- Previews in Google, Slack, WhatsApp, etc. -->
<meta property="og:type" content="website" />
@ -23,14 +33,14 @@
<meta property="og:site_name" content="ntfy web" />
<meta property="og:title" content="ntfy web" />
<meta property="og:description" content="ntfy lets you send push notifications via scripts from any computer or phone, entirely without signup or cost. Made with ❤ by Philipp C. Heckel, Apache License 2.0, source at https://heckel.io/ntfy." />
<meta property="og:image" content="%PUBLIC_URL%/static/img/ntfy.png" />
<meta property="og:image" content="static/img/ntfy.png" />
<meta property="og:url" content="https://ntfy.sh" />
<!-- Never index -->
<meta name="robots" content="noindex, nofollow" />
<!-- Fonts -->
<link rel="stylesheet" href="%PUBLIC_URL%/static/css/fonts.css" type="text/css">
<link rel="stylesheet" href="static/css/fonts.css" type="text/css">
</head>
<body>
<noscript>
@ -38,6 +48,6 @@
or <a href="https://ntfy.sh/docs/subscribe/phone/">Android/iOS app</a> to subscribe.
</noscript>
<div id="root"></div>
<script src="%PUBLIC_URL%/config.js"></script>
<script src="config.js"></script>
</body>
</html>

2
web/src/components/Navigation.js
View file

@ -122,7 +122,7 @@ const NavList = (props) => {
<ListItemIcon><SettingsIcon/></ListItemIcon>
<ListItemText primary={t("nav_button_settings")}/>
</ListItemButton>
<ListItemButton onClick={() => openUrl("/docs")}>
<ListItemButton onClick={() => openUrl("docs")}>
<ListItemIcon><ArticleIcon/></ListItemIcon>
<ListItemText primary={t("nav_button_documentation")}/>
</ListItemButton>

2
web/src/components/i18n.js
View file

@ -22,7 +22,7 @@ i18n
escapeValue: false, // not needed for react as it escapes by default
},
backend: {
loadPath: '/static/langs/{{lng}}.json',
loadPath: 'static/langs/{{lng}}.json',
}
});

13
web/src/components/routes.js
View file

@ -1,16 +1,17 @@
import config from "../app/config";
import {shortUrl} from "../app/utils";
const root = RootPath; // Defined in `public/index.html`.
const routes = {
root: config.appRoot,
settings: "/settings",
subscription: "/:topic",
subscriptionExternal: "/:baseUrl/:topic",
root: root,
settings: root+"settings",
subscription: root+":topic",
subscriptionExternal: root+":baseUrl/:topic",
forSubscription: (subscription) => {
if (subscription.baseUrl !== window.location.origin) {
return `/${shortUrl(subscription.baseUrl)}/${subscription.topic}`;
return root+`${shortUrl(subscription.baseUrl)}/${subscription.topic}`;
}
return `/${subscription.topic}`;
return root+`${subscription.topic}`;
}
};