fix issues.

This commit is contained in:
Ahmed Bouhuolia
2020-05-05 04:21:37 +02:00
parent 3b25056cbe
commit bd7eb0eb76
41 changed files with 364 additions and 216 deletions

View File

@@ -1,10 +1,14 @@
import React from 'react';
import { Route, Switch, useRouteMatch } from 'react-router-dom';
import { Route, Switch, Redirect } from 'react-router-dom';
import preferencesRoutes from 'routes/preferences'
export default function DashboardContentRoute() {
const defaultTab = '/dashboard/preferences/general';
return (
<Route pathname="/dashboard/preferences">
<Redirect from='/dashboard/preferences' to={defaultTab} />
<Switch>
{ preferencesRoutes.map((route, index) => (
<Route

View File

@@ -1,11 +1,31 @@
import React from 'react';
import { Route, Switch } from 'react-router-dom';
import DashboardTopbarUser from 'components/Dashboard/TopbarUser';
import UsersActions from 'containers/Dashboard/Preferences/UsersActions';
import CurrenciesActions from 'containers/Dashboard/Preferences/CurrenciesActions';
export default function PreferencesTopbar() {
return (
<div class="dashboard__preferences-topbar">
<h2>Accounts</h2>
<div class="preferences__topbar-actions">
<Route pathname="/dashboard/preferences">
<Switch>
<Route
exact
path={'/dashboard/preferences/users'}
component={UsersActions} />
<Route
exact
path={'/dashboard/preferences/currencies'}
component={CurrenciesActions} />
</Switch>
</Route>
</div>
<div class="dashboard__topbar-user">
<DashboardTopbarUser />
</div>