Started modifying chart components. Removed chartjs and added Nivo. Fixed signout functionality.

This commit is contained in:
Patrick Fic
2020-03-03 13:29:08 -08:00
parent cb0b5c552c
commit 64595664c9
12 changed files with 354 additions and 52 deletions

View File

@@ -1,10 +1,9 @@
import { CalendarFilled, CarFilled, GlobalOutlined, HomeFilled, TeamOutlined } from "@ant-design/icons";
import { Avatar, Col, Menu, Row } from "antd";
import {GlobalOutlined, HomeFilled, TeamOutlined, CalendarFilled, CarFilled} from "@ant-design/icons";
import React from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import UserImage from "../../assets/User.svg";
import { signOutStart } from "../../redux/user/user.actions";
import ManageSignInButton from "../manage-sign-in-button/manage-sign-in-button.component";
export default ({
@@ -12,7 +11,8 @@ export default ({
selectedNavItem,
logo,
handleMenuClick,
currentUser
currentUser,
signOutStart
}) => {
const { t } = useTranslation();
//TODO Add
@@ -50,7 +50,7 @@ export default ({
</div>
}
>
<Menu.Item onClick={signOutStart()}>
<Menu.Item onClick={() => signOutStart()}>
{t("user.actions.signout")}
</Menu.Item>
<Menu.Item>
@@ -61,7 +61,7 @@ export default ({
<Menu.SubMenu
title={
<span>
<GlobalOutlined/>
<GlobalOutlined />
<span>{t("menus.currentuser.languageselector")}</span>
</span>
}
@@ -111,7 +111,7 @@ export default ({
<Menu.SubMenu title={t("menus.header.customers")}>
<Menu.Item key="owners">
<Link to="/manage/owners">
<TeamOutlined/>
<TeamOutlined />
{t("menus.header.owners")}
</Link>
</Menu.Item>
@@ -148,7 +148,7 @@ export default ({
</div>
}
>
<Menu.Item onClick={signOutStart()}>
<Menu.Item onClick={() => signOutStart()}>
{t("user.actions.signout")}
</Menu.Item>
<Menu.Item>