Merge remote-tracking branch 'origin/feature/breadcrumb/fix_localize'

This commit is contained in:
Ahmed Bouhuolia
2020-05-20 07:06:15 +02:00
78 changed files with 833 additions and 538 deletions

View File

@@ -4,11 +4,11 @@ import preferencesRoutes from 'routes/preferences'
export default function DashboardContentRoute() {
const defaultTab = '/dashboard/preferences/general';
const defaultTab = '/preferences/general';
return (
<Route pathname="/dashboard/preferences">
<Redirect from='/dashboard/preferences' to={defaultTab} />
<Route pathname="/preferences">
<Redirect from='/preferences' to={defaultTab} />
<Switch>
{ preferencesRoutes.map((route, index) => (

View File

@@ -11,16 +11,16 @@ export default function PreferencesTopbar() {
<h2>Accounts</h2>
<div class="preferences__topbar-actions">
<Route pathname="/dashboard/preferences">
<Route pathname="/preferences">
<Switch>
<Route
exact
path={'/dashboard/preferences/users'}
path={'/preferences/users'}
component={UsersActions} />
<Route
exact
path={'/dashboard/preferences/currencies'}
path={'/preferences/currencies'}
component={CurrenciesActions} />
</Switch>
</Route>