diff --git a/client/public/manifest.json b/client/public/manifest.json
index ef4478843..da7573171 100644
--- a/client/public/manifest.json
+++ b/client/public/manifest.json
@@ -8,7 +8,7 @@
"type": "image/x-icon"
},
{
- "src": "logo1240.png",
+ "src": "logo240.png",
"type": "image/png",
"sizes": "192x192"
},
diff --git a/client/src/App/App.container.jsx b/client/src/App/App.container.jsx
index b48fba907..da9c2acad 100644
--- a/client/src/App/App.container.jsx
+++ b/client/src/App/App.container.jsx
@@ -76,16 +76,6 @@ export default function Auth() {
});
}, []);
- const signOut = async () => {
- try {
- setAuthState({ status: "loading" });
- await firebase.auth().signOut();
- setAuthState({ status: "out" });
- } catch (error) {
- console.log(error);
- }
- };
-
let content;
if (authState.status === "loading") {
content = ;
diff --git a/client/src/App/App.js b/client/src/App/App.js
index 701677aae..0d808c328 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -16,6 +16,7 @@ import Manage from "../pages/manage/manage.page";
import PrivateRoute from "../utils/private-route";
import SignInContainer from "../pages/sign-in/sign-in.container";
+import Unauthorized from "../pages/unauthorized/unauthorized.component";
const graphqlEndpoint = process.env.REACT_APP_GRAPHQL_ENDPOINT;
@@ -47,15 +48,22 @@ export default function App({ authState }) {
return (
+ {authState.status}
+
- authState ? :
+ authState.status == "in" ? (
+
+ ) : (
+
+ )
}
/>
+ {/* */}
diff --git a/client/src/components/header/header.component.jsx b/client/src/components/header/header.component.jsx
index 07b39e639..981f3411a 100644
--- a/client/src/components/header/header.component.jsx
+++ b/client/src/components/header/header.component.jsx
@@ -1,36 +1,36 @@
-import React, { Component } from "react";
+import React, { Component, useState } from "react";
import { Link } from "react-router-dom";
import { Menu, Icon } from "antd";
import "./header.styles.scss";
+import SignOut from "../sign-out/sign-out.component";
-class Header extends Component {
- handleClick = e => {
+export default ({ selectedNavItem, navItems }) => {
+ const handleClick = e => {
console.log("click ", e);
this.setState({
current: e.key
});
};
- render() {
- const { selectedNavItem, navItems } = this.props;
- return (
-
- );
- }
-}
+ return (
+
+ );
+};
diff --git a/client/src/components/header/header.container.jsx b/client/src/components/header/header.container.jsx
index 1e4dbbd76..dac8e0608 100644
--- a/client/src/components/header/header.container.jsx
+++ b/client/src/components/header/header.container.jsx
@@ -27,7 +27,6 @@ const HeaderContainer = ({ landingHeader }) => {
if (loading) return ;
if (error) return ;
const parsedNavItems = JSON.parse(data.masterdata_by_pk.value);
- console.log("::1", landingHeader);
return (