fix hot bugs.

This commit is contained in:
Ahmed Bouhuolia
2020-04-26 03:09:33 +02:00
parent d14ff872d4
commit e01ad95ac3
31 changed files with 251 additions and 350 deletions

View File

@@ -2,14 +2,14 @@ import React from 'react';
import PropTypes from 'prop-types';
import { IntlProvider } from 'react-intl';
import { connect } from 'react-redux';
import { Router } from 'react-router';
import { Router, Switch } from 'react-router';
import { createBrowserHistory } from 'history';
import PrivateRoute from 'components/PrivateRoute';
import Authentication from 'components/Authentication';
import Dashboard from 'components/Dashboard/Dashboard';
import { isAuthenticated } from 'store/authentication/authentication.reducer'
import messages from 'lang/en';
import 'style/App.scss';
import { createBrowserHistory } from 'history';
function App(props) {
const history = createBrowserHistory();

View File

@@ -1,12 +1,27 @@
import React from 'react';
import React, { useMemo, useCallback } from 'react';
import {connect} from 'react-redux';
import {Menu, MenuItem, MenuDivider, Button, Popover} from '@blueprintjs/core';
import {useHistory} from 'react-router-dom';
import {
Menu,
MenuItem,
MenuDivider,
Button,
Popover
} from '@blueprintjs/core';
import t from 'store/types';
function DashboardTopbarUser({ logout }) {
const onClickLogout = () => { logout(); };
const history = useHistory();
const onClickLogout = useCallback(() => {
logout();
const userAvatarDropMenu = (
setTimeout(() => {
history.push('/auth/login');
}, 100);
}, [history, logout]);
const userAvatarDropMenu = useMemo(() => (
<Menu>
<MenuItem icon="graph" text="Graph" />
<MenuItem icon="map" text="Map" />
@@ -15,7 +30,7 @@ function DashboardTopbarUser({ logout }) {
<MenuDivider />
<MenuItem icon="cog" text="Logout" onClick={onClickLogout} />
</Menu>
);
), [onClickLogout]);
return (
<Popover content={userAvatarDropMenu}>

View File

@@ -15,6 +15,7 @@ function PrivateRoute({
return (
<Route
{...rest}
path="/dashboard"
render={_props =>
isAuthenticated ? (<Component {..._props} />) :
(