dearsky/ntfy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI work, config.js stuff

Browse Source
This commit is contained in:
binwiederhier
2022-12-21 13:19:07 -05:00
parent 2b833413cf
commit d982ce13f5
18 changed files with 173 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/components/App.js
View File

@@ -87,7 +87,7 @@ const Layout = () => {
const newNotificationsCount = subscriptions?.reduce((prev, cur) => prev + cur.new, 0) || 0;
const [selected] = (subscriptions || []).filter(s => {
return (params.baseUrl && expandUrl(params.baseUrl).includes(s.baseUrl) && params.topic === s.topic)
|| (window.location.origin === s.baseUrl && params.topic === s.topic)
|| (config.baseUrl === s.baseUrl && params.topic === s.topic)
});
useConnectionListeners(subscriptions, users);
@@ -96,7 +96,7 @@ const Layout = () => {
useEffect(() => {
(async () => {
const acc = await api.getAccount("http://localhost:2586", session.token());
const acc = await api.getAccount(config.baseUrl, session.token());
if (acc) {
setAccount(acc);
if (acc.language) {