WIP feature/breadcrumb/fix_localize

This commit is contained in:
elforjani3
2020-05-13 00:02:21 +02:00
parent 4ab85eaf09
commit e6f63fbc88
69 changed files with 610 additions and 394 deletions

View File

@@ -11,13 +11,13 @@ export default function Dashboard() {
return (
<div className='dashboard'>
<Switch>
<Route path='/dashboard/preferences'>
<Route path='/preferences'>
<Sidebar />
<PreferencesSidebar />
<PreferencesContent />
</Route>
<Route path='/dashboard'>
<Route path='/'>
<Sidebar />
<DashboardContent />
</Route>

View File

@@ -1,11 +1,13 @@
import React from 'react';
import { Route, Switch } from 'react-router-dom';
import routes from 'routes/dashboard'
import Breadcrumbs from 'components/Breadcrumbs';
export default function DashboardContentRoute() {
return (
<Route pathname="/dashboard">
<Route pathname="/">
<Breadcrumbs/>
<Switch>
{ routes.map((route, index) => (
<Route

View File

@@ -24,7 +24,7 @@ function DashboardTopbar({
const history = useHistory();
const handlerClickEditView = () => {
history.push(`/dashboard/custom_views/${editViewId}/edit`);
history.push(`/custom_views/${editViewId}/edit`);
};
const maybleRenderPageSubtitle = pageSubtitle && <h3>{pageSubtitle}</h3>;
@@ -48,7 +48,7 @@ function DashboardTopbar({
role='img'
focusable='false'
>
<title>Menu</title>
<title><T id={'menu'}/></title>
<path
stroke='currentColor'
stroke-linecap='round'

View File

@@ -9,6 +9,7 @@ import {
Popover
} from '@blueprintjs/core';
import t from 'store/types';
import { FormattedMessage as T, useIntl } from 'react-intl';
function DashboardTopbarUser({ logout }) {
const history = useHistory();
@@ -20,12 +21,12 @@ function DashboardTopbarUser({ logout }) {
const userAvatarDropMenu = useMemo(() => (
<Menu>
<MenuItem icon="graph" text="Graph" />
<MenuItem icon="map" text="Map" />
<MenuItem icon="th" text="Table" shouldDismissPopover={false} />
<MenuItem icon="zoom-to-fit" text="Nucleus" disabled={true} />
<MenuItem icon="graph" text={<T id={'menu'}/>} />
<MenuItem icon="map" text={<T id={'graph'}/>} />
<MenuItem icon="th" text={<T id={'table'}/>} shouldDismissPopover={false} />
<MenuItem icon="zoom-to-fit" text={<T id={'nucleus'}/>} disabled={true} />
<MenuDivider />
<MenuItem icon="cog" text="Logout" onClick={onClickLogout} />
<MenuItem icon="cog" text={<T id={'logout'}/>} onClick={onClickLogout} />
</Menu>
), [onClickLogout]);