From 420e35c33cefe4f0c39af37825629f4aa1c2a8c1 Mon Sep 17 00:00:00 2001 From: Philipp Heckel Date: Sat, 5 Mar 2022 22:11:32 -0500 Subject: [PATCH] Use location.origin as default base URL --- web/src/app/config.js | 5 ----- web/src/app/utils.js | 3 +-- web/src/components/App.js | 5 +++++ web/src/components/Navigation.js | 3 +-- web/src/components/Notifications.js | 2 +- web/src/components/Preferences.js | 2 +- web/src/components/SubscribeDialog.js | 15 +++++++-------- 7 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 web/src/app/config.js diff --git a/web/src/app/config.js b/web/src/app/config.js deleted file mode 100644 index 1976d79e..00000000 --- a/web/src/app/config.js +++ /dev/null @@ -1,5 +0,0 @@ -//const config = window.config; -const config = { - defaultBaseUrl: "https://ntfy.sh" -}; -export default config; diff --git a/web/src/app/utils.js b/web/src/app/utils.js index 10ff28b8..c047ff7e 100644 --- a/web/src/app/utils.js +++ b/web/src/app/utils.js @@ -1,5 +1,4 @@ import {rawEmojis} from "./emojis"; -import config from "./config"; export const topicUrl = (baseUrl, topic) => `${baseUrl}/${topic}`; export const topicUrlWs = (baseUrl, topic) => `${topicUrl(baseUrl, topic)}/ws` @@ -116,7 +115,7 @@ export const openUrl = (url) => { }; export const subscriptionRoute = (subscription) => { - if (subscription.baseUrl !== config.defaultBaseUrl) { + if (subscription.baseUrl !== window.location.origin) { return `/${shortUrl(subscription.baseUrl)}/${subscription.topic}`; } return `/${subscription.topic}`; diff --git a/web/src/components/App.js b/web/src/components/App.js index d40da9d3..119deca7 100644 --- a/web/src/components/App.js +++ b/web/src/components/App.js @@ -21,8 +21,11 @@ import {BrowserRouter, Route, Routes, useLocation, useNavigate} from "react-rout import {subscriptionRoute} from "../app/utils"; // TODO support unsubscribed routes +// TODO add "home" route that is selected when nothing else fits // TODO new notification indicator // TODO sound +// TODO "copy url" toast +// TODO "copy link url" button const App = () => { return ( @@ -87,6 +90,8 @@ const Root = () => { connectionManager.resetStateListener(); connectionManager.resetNotificationListener(); } +// This is for the use of 'navigate' // FIXME +//eslint-disable-next-line }, [/* initial render */]); useEffect(() => { connectionManager.refresh(subscriptions, users) }, [subscriptions, users]); // Dangle! return ( diff --git a/web/src/components/Navigation.js b/web/src/components/Navigation.js index bc1fa8e1..eb98914d 100644 --- a/web/src/components/Navigation.js +++ b/web/src/components/Navigation.js @@ -17,7 +17,6 @@ import Typography from "@mui/material/Typography"; import {subscriptionRoute, topicShortUrl, topicUrl} from "../app/utils"; import {ConnectionState} from "../app/Connection"; import {useLocation, useNavigate} from "react-router-dom"; -import config from "../app/config"; const navWidth = 240; @@ -125,7 +124,7 @@ const SubscriptionItem = (props) => { const icon = (subscription.state === ConnectionState.Connecting) ? : ; - const label = (subscription.baseUrl === config.defaultBaseUrl) + const label = (subscription.baseUrl === window.location.origin) ? subscription.topic : topicShortUrl(subscription.baseUrl, subscription.topic); return ( diff --git a/web/src/components/Notifications.js b/web/src/components/Notifications.js index 38e8c9c4..61ac0694 100644 --- a/web/src/components/Notifications.js +++ b/web/src/components/Notifications.js @@ -76,7 +76,7 @@ const NotificationItem = (props) => { {date} {[1,2,4,5].includes(notification.priority) && {`Priority} diff --git a/web/src/components/Preferences.js b/web/src/components/Preferences.js index 608dc3be..6f5ac0eb 100644 --- a/web/src/components/Preferences.js +++ b/web/src/components/Preferences.js @@ -281,7 +281,7 @@ const UserDialog = (props) => { setUsername(props.user.username); setPassword(props.user.password); } - }, []); + }, [editMode, props.user]); return ( {editMode ? "Edit user" : "Add user"} diff --git a/web/src/components/SubscribeDialog.js b/web/src/components/SubscribeDialog.js index aa2de679..eee4132b 100644 --- a/web/src/components/SubscribeDialog.js +++ b/web/src/components/SubscribeDialog.js @@ -10,14 +10,13 @@ import DialogTitle from '@mui/material/DialogTitle'; import {Autocomplete, Checkbox, FormControlLabel, useMediaQuery} from "@mui/material"; import theme from "./theme"; import api from "../app/Api"; -import config from "../app/config"; import {topicUrl, validTopic, validUrl} from "../app/utils"; import Box from "@mui/material/Box"; import userManager from "../app/UserManager"; import subscriptionManager from "../app/SubscriptionManager"; import poller from "../app/Poller"; -const publicBaseUrl = "https://ntfy.sh" +const publicBaseUrl = "https://ntfy.sh"; const SubscribeDialog = (props) => { const [baseUrl, setBaseUrl] = useState(""); @@ -25,7 +24,7 @@ const SubscribeDialog = (props) => { const [showLoginPage, setShowLoginPage] = useState(false); const fullScreen = useMediaQuery(theme.breakpoints.down('sm')); const handleSuccess = async () => { - const actualBaseUrl = (baseUrl) ? baseUrl : config.defaultBaseUrl; + const actualBaseUrl = (baseUrl) ? baseUrl : window.location.origin; const subscription = { id: topicUrl(actualBaseUrl, topic), baseUrl: actualBaseUrl, @@ -61,11 +60,11 @@ const SubscribeDialog = (props) => { const SubscribePage = (props) => { const [anotherServerVisible, setAnotherServerVisible] = useState(false); const [errorText, setErrorText] = useState(""); - const baseUrl = (anotherServerVisible) ? props.baseUrl : config.defaultBaseUrl; + const baseUrl = (anotherServerVisible) ? props.baseUrl : window.location.origin; const topic = props.topic; const existingTopicUrls = props.subscriptions.map(s => topicUrl(s.baseUrl, s.topic)); const existingBaseUrls = Array.from(new Set([publicBaseUrl, ...props.subscriptions.map(s => s.baseUrl)])) - .filter(s => s !== config.defaultBaseUrl); + .filter(s => s !== window.location.origin); const handleSubscribe = async () => { const user = await userManager.get(baseUrl); // May be undefined const username = (user) ? user.username : "anonymous"; @@ -92,7 +91,7 @@ const SubscribePage = (props) => { const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(baseUrl, topic)); return validTopic(topic) && validUrl(baseUrl) && !isExistingTopicUrl; } else { - const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(config.defaultBaseUrl, topic)); // FIXME + const isExistingTopicUrl = existingTopicUrls.includes(topicUrl(window.location.origin, topic)); // FIXME return validTopic(topic) && !isExistingTopicUrl; } })(); @@ -127,7 +126,7 @@ const SubscribePage = (props) => { inputValue={props.baseUrl} onInputChange={(ev, newVal) => props.setBaseUrl(newVal)} renderInput={ (params) => - + } />} @@ -143,7 +142,7 @@ const LoginPage = (props) => { const [username, setUsername] = useState(""); const [password, setPassword] = useState(""); const [errorText, setErrorText] = useState(""); - const baseUrl = (props.baseUrl) ? props.baseUrl : config.defaultBaseUrl; + const baseUrl = (props.baseUrl) ? props.baseUrl : window.location.origin; const topic = props.topic; const handleLogin = async () => { const user = {baseUrl, username, password};