diff --git a/src/App.js b/src/App.js index fe58081..cb3dc6c 100644 --- a/src/App.js +++ b/src/App.js @@ -13,7 +13,7 @@ function App() { <> {loggedIn ? ( - + ) : ( diff --git a/src/Components/PageContent/index.js b/src/Components/PageContent/index.js index b65392b..fdafff8 100644 --- a/src/Components/PageContent/index.js +++ b/src/Components/PageContent/index.js @@ -1,4 +1,4 @@ -import { Content } from "antd/es/layout/layout"; +import { Content, Footer } from "antd/es/layout/layout"; import AppRoutes from "../AppRoutes"; function PageContent() { diff --git a/src/Components/SideMenu/index.js b/src/Components/SideMenu/index.js index 16ecdb3..9678fb3 100644 --- a/src/Components/SideMenu/index.js +++ b/src/Components/SideMenu/index.js @@ -1,10 +1,16 @@ -import { AppstoreOutlined, SnippetsOutlined } from "@ant-design/icons"; -import { Menu } from "antd"; +import { + AppstoreOutlined, + LogoutOutlined, + SnippetsOutlined, + UserOutlined, +} from "@ant-design/icons"; +import { Divider, Menu } from "antd"; import Sider from "antd/es/layout/Sider"; import { useEffect, useState } from "react"; import { useLocation, useNavigate } from "react-router-dom"; +import PropTypes from "prop-types"; -function SideMenu() { +export default function SideMenu({ setLoggedIn }) { const location = useLocation(); const [selectedKeys, setSelectedKeys] = useState("/"); @@ -19,29 +25,57 @@ function SideMenu() { theme="light" style={{ overflow: "auto", position: "fixed", height: "100vh" }} > -
JANEX
-
Admin Dashboard
- { - navigate(item.key); +
, - key: "/", - }, - { - label: "Group Tasks", - icon: , - key: "/group-tasks", - }, - ]} - >
+ > +
+
JANEX
+
Admin Dashboard
+ { + navigate(item.key); + }} + theme="light" + selectedKeys={[selectedKeys]} + items={[ + { + label: "Dashboard", + icon: , + key: "/", + }, + { + label: "Group Tasks", + icon: , + key: "/group-tasks", + }, + ]} + /> +
+
+ + , + onClick: () => setLoggedIn(false), + }, + ]} + /> +
+ ); } -export default SideMenu; + +SideMenu.propTypes = { + setLoggedIn: PropTypes.func.isRequired, +}; diff --git a/src/Pages/Login/index.js b/src/Pages/Login/index.js index 5904ae9..d687a54 100644 --- a/src/Pages/Login/index.js +++ b/src/Pages/Login/index.js @@ -1,4 +1,4 @@ -import { LockOutlined, UserOutlined } from "@ant-design/icons"; +import { LockOutlined, LoginOutlined, UserOutlined } from "@ant-design/icons"; import { Button, Form, Input } from "antd"; import PropTypes from "prop-types"; @@ -32,6 +32,7 @@ export default function Login({ setLoggedIn }) {