diff --git a/src/pages/LecturerPage/LecturerReportPage.tsx b/src/pages/LecturerPage/LecturerReportPage.tsx index 4cfb77c..f205ed1 100644 --- a/src/pages/LecturerPage/LecturerReportPage.tsx +++ b/src/pages/LecturerPage/LecturerReportPage.tsx @@ -40,9 +40,9 @@ const LecturerReportCard = styled.div` `; const NotFoundMessage = styled.p` font-size: ${({ theme }) => theme.fontSize.subtitle}; - font-weight: 600; color: ${({ theme }) => theme.colors.caution}; text-align: center; + padding: 20px; `; const LoadingContainer = styled.div` diff --git a/src/redux/token/tokenSlice.ts b/src/redux/token/tokenSlice.ts index 0d5995f..0dca7ea 100644 --- a/src/redux/token/tokenSlice.ts +++ b/src/redux/token/tokenSlice.ts @@ -3,6 +3,7 @@ import { createSlice, createAsyncThunk } from "@reduxjs/toolkit"; import type { PayloadAction } from "@reduxjs/toolkit"; import { logoutRequest } from "../../api/Auth/authApi"; import { resetUserInfo } from "../Auth/authSlice"; +import { clearLecturerSession } from "../../utils/sessionStorage/consulting"; interface TokenState { accessToken: string; @@ -28,6 +29,7 @@ export const logoutUsingToken = createAsyncThunk( try { const data = await logoutRequest(); dispatch(resetUserInfo()); + clearLecturerSession(); return data; } catch (error) { return rejectWithValue(error || "Logout failed"); @@ -51,24 +53,28 @@ const tokenSlice = createSlice({ state.isMaintenance = false; }, logout: (state) => { + clearLecturerSession(); Object.assign(state, { ...initialState, isExpired: true, }); }, triggerBan: (state) => { + clearLecturerSession(); Object.assign(state, { ...initialState, isBanned: true, }); }, maintenance: (state) => { + clearLecturerSession(); Object.assign(state, { ...initialState, isMaintenance: true, }); }, reset: (state) => { + clearLecturerSession(); Object.assign(state, initialState); }, }, diff --git a/src/utils/sessionStorage/consulting.ts b/src/utils/sessionStorage/consulting.ts index 140dc31..3aa46be 100644 --- a/src/utils/sessionStorage/consulting.ts +++ b/src/utils/sessionStorage/consulting.ts @@ -126,3 +126,8 @@ const getLecturerReportFromSession = () => { return null; } }; + +export const clearLecturerSession = () => { + sessionStorage.removeItem("lecturerDashboard"); + sessionStorage.removeItem("lecturerReport"); +};