Merge pull request #152 from skni-kod/issue-151

Issue 151
skni-kod · Dec 9, 2024 · 845f7aa · 845f7aa
2 parents 33daa55 + 276c8c6
commit 845f7aa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/app/api/logout/route.ts b/src/app/api/logout/route.ts
@@ -4,7 +4,7 @@ import { NextRequest, NextResponse } from 'next/server';
 import AuthService from '@/services/auth/authService';
 
 const ACCESS_TOKEN_COOKIE = 'AUTH_CONTEXT';
-const REFRESH_TOKEN_COOKIE = 'AUTH_PERSIST';
+// const REFRESH_TOKEN_COOKIE = 'AUTH_PERSIST';
 
 const accessCookie = `${ACCESS_TOKEN_COOKIE}=; Path=/; Max-Age=0; SameSite=Lax;`;
 const refreshCookie = `${ACCESS_TOKEN_COOKIE}=; Path=/; Max-Age=0; SameSite=Lax;`;

diff --git a/src/components/ErrorBoundary.tsx b/src/components/ErrorBoundary.tsx
@@ -17,7 +17,7 @@ class ErrorBoundary extends React.Component<ErrorBoundaryProps, ErrorBoundarySta
 		this.state = { hasError: false };
 	}
 
-	static getDerivedStateFromError(error: Error): ErrorBoundaryState {
+	static getDerivedStateFromError(): ErrorBoundaryState {
 		// Update state so the next render will show the fallback UI
 		return { hasError: true };
 	}

diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
@@ -96,13 +96,14 @@ export default function Sidebar() {
 					<Link
 						key={id}
 						href={`/sections/${id}`}
+						onClick={sidebar.handleClose}
 						className="flex w-full cursor-pointer flex-row items-center bg-bg hover:bg-bgHover"
 					>
 						<div className="p-5">
 							<Image src={theme === 'light' ? icon.light : icon.dark} width={24} height={24} alt={name} />
 						</div>
 						<span
-							className={`relative text-secondary transition-all duration-300 ease-in-out ${!sidebar.isOpen ? '-left-96 w-0' : 'left-0 w-40'}`}
+							className={`relative text-secondary transition-all duration-300 ease-in-out ${!sidebar.isOpen ? '-left-96 z-0 w-0 opacity-0' : 'left-0 z-50 w-40 opacity-100'}`}
 						>
 							{name}
 						</span>

diff --git a/src/contexts/SidebarContext.tsx b/src/contexts/SidebarContext.tsx
@@ -4,6 +4,7 @@ import React, { useContext, useState } from 'react';
 type SidebarContextType = {
 	isOpen: boolean;
 	handleToggle: () => void;
+	handleClose: () => void;
 };
 
 const SidebarContext = React.createContext<SidebarContextType | undefined>(undefined);
@@ -15,11 +16,14 @@ export const SidebarProvider = ({ children }: { children: React.ReactNode }) =>
 
 	const handleToggle = () => setIsOpen((state) => !state);
 
+	const handleClose = () => setIsOpen(false);
+
 	return (
 		<SidebarContext.Provider
 			value={{
 				isOpen,
 				handleToggle,
+				handleClose,
 			}}
 		>
 			{children}