diff --git a/src/pages/HomeView.tsx b/src/pages/HomeView.tsx index 25cedd4..55e5278 100644 --- a/src/pages/HomeView.tsx +++ b/src/pages/HomeView.tsx @@ -1,6 +1,6 @@ import React, {useState, useEffect} from 'react'; import {UploadOutlined, UserOutlined, BellOutlined} from '@ant-design/icons'; -import {Layout, Menu, theme, Typography, Button, Dropdown, MenuProps} from 'antd'; +import {Layout, Menu, theme, Typography, Button, Dropdown, MenuProps, Popover} from 'antd'; import {useAppDispatch, useAppSelector} from "../models/hooks"; import {getStaff, getToken, setStaff, setToken, store} from "../models/store"; import {Link, Outlet, useLocation, useNavigate} from "react-router-dom"; @@ -8,6 +8,7 @@ import Icon from '@ant-design/icons'; import {Logo} from "../assets/icons"; import axiosInstance from "../utils/axiosInstance"; import {Department, Staff, Token} from "../models/Staff"; +import MessageList from "./MessageList"; const {Title} = Typography; const {Header, Content, Footer, Sider} = Layout; @@ -29,13 +30,6 @@ function HeaderBar(props: any) { case 'password': break case 'logout': - dispatch(setToken({ - staffId: '', - accessToken: '', - refreshToken: '', - clientSecret: '' - })) - axiosInstance({ url: 'logout', method: 'post', @@ -44,11 +38,16 @@ function HeaderBar(props: any) { } }).then(response => { console.log(response.data) - navigate("/login") }).catch(function (error) { console.log(error) }) - + dispatch(setToken({ + staffId: '', + accessToken: '', + refreshToken: '', + clientSecret: '' + })) + navigate("/login") break } @@ -97,9 +96,7 @@ function HeaderBar(props: any) { flexDirection: 'row', alignItems: 'center', }}> - + + + ) +} + +export default MessageList \ No newline at end of file