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

Attempt to use react router the way it was meant to

Browse source
This commit is contained in:
Philipp Heckel 2022-03-08 14:13:32 -05:00
parent 4aad98256a
commit 55c021796e
3 changed files with 63 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
web/src/components/ActionBar.js
View file

@ -22,8 +22,8 @@ import subscriptionManager from "../app/SubscriptionManager";
const ActionBar = (props) => {
const location = useLocation();
let title = "ntfy";
if (props.selectedSubscription) {
title = topicShortUrl(props.selectedSubscription.baseUrl, props.selectedSubscription.topic);
if (props.selected) {
title = topicShortUrl(props.selected.baseUrl, props.selected.topic);
} else if (location.pathname === "/settings") {
title = "Settings";
}
@ -50,8 +50,8 @@ const ActionBar = (props) => {
<Typography variant="h6" noWrap component="div" sx={{ flexGrow: 1 }}>
{title}
</Typography>
{props.selectedSubscription && <SettingsIcon
subscription={props.selectedSubscription}
{props.selected && <SettingsIcon
subscription={props.selected}
onUnsubscribe={props.onUnsubscribe}
/>}
</Toolbar>