Skip to content
Snippets Groups Projects
Unverified Commit 30684a47 authored by Matiss Janis Aboltins's avatar Matiss Janis Aboltins Committed by GitHub
Browse files

:bug: (mobile) correct topbar color on settings page (#960)

Closes #935

Before: we render all the pages (even the inactive ones in some cases)

After: we render only the visible pages. Thus the topbar color is set
only 1x.. thus the settings page topbar has the correct color.
parent 4b712699
No related branches found
No related tags found
No related merge requests found
...@@ -80,46 +80,41 @@ function PageRoute({ path, component: Component }) { ...@@ -80,46 +80,41 @@ function PageRoute({ path, component: Component }) {
function Routes({ isMobile, location }) { function Routes({ isMobile, location }) {
return ( return (
<Switch location={location}> <Switch location={location}>
<Route path="/"> <Route path="/" exact render={() => <Redirect to="/budget" />} />
<Route path="/" exact render={() => <Redirect to="/budget" />} />
<PageRoute path="/reports" component={Reports} />
<PageRoute path="/reports" component={Reports} /> <PageRoute path="/budget" component={isMobile ? MobileBudget : Budget} />
<PageRoute
path="/budget" <Route path="/schedules" exact component={Schedules} />
component={isMobile ? MobileBudget : Budget} <Route path="/schedule/edit" exact component={EditSchedule} />
/> <Route path="/schedule/edit/:id" component={EditSchedule} />
<Route path="/schedule/link" component={LinkSchedule} />
<Route path="/schedules" exact component={Schedules} /> <Route path="/schedule/discover" component={DiscoverSchedules} />
<Route path="/schedule/edit" exact component={EditSchedule} /> <Route
<Route path="/schedule/edit/:id" component={EditSchedule} /> path="/schedule/posts-offline-notification"
<Route path="/schedule/link" component={LinkSchedule} /> component={PostsOfflineNotification}
<Route path="/schedule/discover" component={DiscoverSchedules} /> />
<Route
path="/schedule/posts-offline-notification" <Route path="/payees" exact component={ManagePayeesPage} />
component={PostsOfflineNotification} <Route path="/rules" exact component={ManageRulesPage} />
/> <Route path="/settings" component={Settings} />
<Route path="/nordigen/link" exact component={NordigenLink} />
<Route path="/payees" exact component={ManagePayeesPage} />
<Route path="/rules" exact component={ManageRulesPage} /> <Route
<Route path="/settings" component={Settings} /> path="/accounts/:id"
<Route path="/nordigen/link" exact component={NordigenLink} /> exact
children={props => {
<Route const AcctCmp = isMobile ? MobileAccount : Account;
path="/accounts/:id" return (
exact props.match && <AcctCmp key={props.match.params.id} {...props} />
children={props => { );
const AcctCmp = isMobile ? MobileAccount : Account; }}
return ( />
props.match && <AcctCmp key={props.match.params.id} {...props} /> <Route
); path="/accounts"
}} exact
/> component={isMobile ? MobileAccounts : Account}
<Route />
path="/accounts"
exact
component={isMobile ? MobileAccounts : Account}
/>
</Route>
</Switch> </Switch>
); );
} }
......
---
category: Bugfix
authors: [MatissJanis]
---
Mobile: use the correct top-bar background color in settings page
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment