From 0b97e8bb8df59725951dbbed1951bd23ae044cf6 Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Sat, 5 Apr 2025 15:34:58 +0200 Subject: [PATCH] Move "About" outside "Settings" in regard to routing Is already not part of the settings anymore, however, the route was never updated --- src/App.tsx | 2 +- .../app-updates/components/ServerUpdateChecker.tsx | 2 +- src/modules/core/AppRoute.constants.ts | 8 ++++---- src/modules/navigation-bar/NavigationBar.constants.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index f64ef40f..abaeb662 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -130,9 +130,9 @@ const MainApp = () => { } /> } /> {isMobileWidth && } />} + } /> } /> - } /> } /> } /> diff --git a/src/modules/app-updates/components/ServerUpdateChecker.tsx b/src/modules/app-updates/components/ServerUpdateChecker.tsx index 82bb52e0..02436c06 100644 --- a/src/modules/app-updates/components/ServerUpdateChecker.tsx +++ b/src/modules/app-updates/components/ServerUpdateChecker.tsx @@ -88,7 +88,7 @@ export const ServerUpdateChecker = () => { return null; } - const isAboutPage = window.location.pathname === AppRoutes.settings.childRoutes.about.path; + const isAboutPage = window.location.pathname === AppRoutes.about.path; if (isAboutPage) { return null; } diff --git a/src/modules/core/AppRoute.constants.ts b/src/modules/core/AppRoute.constants.ts index c5c7f19e..1fb52f22 100644 --- a/src/modules/core/AppRoute.constants.ts +++ b/src/modules/core/AppRoute.constants.ts @@ -25,14 +25,14 @@ export const AppRoutes = { matchAll: { match: '*', }, + about: { + match: 'about', + path: '/about', + }, settings: { path: '/settings', match: 'settings', childRoutes: { - about: { - match: 'about', - path: '/settings/about', - }, categories: { match: 'categories', path: '/settings/categories', diff --git a/src/modules/navigation-bar/NavigationBar.constants.ts b/src/modules/navigation-bar/NavigationBar.constants.ts index 2f7c95fa..e906ec38 100644 --- a/src/modules/navigation-bar/NavigationBar.constants.ts +++ b/src/modules/navigation-bar/NavigationBar.constants.ts @@ -77,7 +77,7 @@ const NAVIGATION_BAR_DESKTOP_ITEMS = [ moreGroup: NavBarItemMoreGroup.SETTING_INFO, }, { - path: AppRoutes.settings.childRoutes.about.path, + path: AppRoutes.about.path, title: 'settings.about.title', SelectedIconComponent: InfoIcon, IconComponent: InfoIcon,