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

Use location.origin as default base URL

Browse source
This commit is contained in:
Philipp Heckel 2022-03-05 22:11:32 -05:00
parent c5ce51f242
commit 420e35c33c
7 changed files with 16 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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)
? <CircularProgress size="24px"/>
: <ChatBubbleOutlineIcon/>;
const label = (subscription.baseUrl === config.defaultBaseUrl)
const label = (subscription.baseUrl === window.location.origin)
? subscription.topic
: topicShortUrl(subscription.baseUrl, subscription.topic);
return (