Skip to content
Snippets Groups Projects
Commit 7fc967c1 authored by mcs22's avatar mcs22
Browse files

Issue/184/181-HOTFIX-sidebar

parent 59d0ce1a
No related branches found
No related tags found
1 merge request!182Issue/184/181-HOTFIX-sidebar
Pipeline #39546 passed
......@@ -12,6 +12,8 @@ import { usePathname, useRouter, useSearchParams } from "next/navigation";
import { Person } from "@mui/icons-material";
import { subjectsAvailable } from "./SubjectsAvailable";
import FileUploadIcon from '@mui/icons-material/FileUpload';
import { isLoggedIn } from "../handlers/loginHandler";
import NeedLoginModal from "../recurso/[id]/components/needLoginModal";
const acessoRapido = [
......@@ -141,8 +143,20 @@ export default function SideBar({ setFilterState, filterState, openMenu }) {
}
};
const [needLoginOpen, setNeedLoginOpen] = useState(false);
const handleOpenLoggin = () => {
if (!isLoggedIn()) {
setNeedLoginOpen(true);
}
};
return (
<>
<NeedLoginModal open={needLoginOpen} setOpen={setNeedLoginOpen} />
<div
className={`top-[125px] start-0 overflow-y-auto
max-sm:top-[96px]
......@@ -152,8 +166,7 @@ export default function SideBar({ setFilterState, filterState, openMenu }) {
bg-repeat
bg-fixed
text-base
${
!openMenu ? "-translate-x-full " : "translate-x-0"
${!openMenu ? "-translate-x-full " : "translate-x-0"
}`}
>
<div className="pt-4">
......@@ -163,16 +176,17 @@ export default function SideBar({ setFilterState, filterState, openMenu }) {
return (
<Link
id={item.id}
onClick={item.href === "/publicar" ? handleOpenLoggin : () => { }}
// id={item.id + '_open'}
href={item.href ==="/publicar" ? "/publicar" : ( item.href === "/sobre" ? item.href : "/busca?page=" + item.href)}
href={item.href === "/publicar" ? (isLoggedIn() ? "/publicar" : "") : (item.href === "/sobre" ? item.href : "/busca?page=" + item.href)}
key={index}
className={` pr-8 cursor-pointer rounded-xl ml-2 pb-1 pt-1 max-w-52 mb-1 ${pathname === item.href
className={` pr-8 pl-2 cursor-pointer rounded-xl ml-2 pb-1 pt-1 max-w-52 mb-1 ${(page === item.href) || (pathname === item.href)
? "bg-secondary text-white hover:bg-secondary-hover focus:bg-secondary-hover"
: " hover:bg-main-hover focus:bg-main-hover"
} `}
>
<item.icon
className={` cursor-pointer ${pathname === item.href
className={` cursor-pointer ${(page === item.href) || (pathname === item.href)
? " text-white hover:bg-secondary-hover focus:bg-secondary-hover"
: "hover:bg-main-hover text-gray-color focus:bg-main-hover"
}`}
......@@ -195,7 +209,7 @@ export default function SideBar({ setFilterState, filterState, openMenu }) {
{subjectsAvailable.map((item, index) => {
return (
<a
className={` flex cursor-pointer rounded-xl ml-0 mb-1 p-[1px] max-w-52 ${selectedSubject[index]
className={` cursor-pointer pl-2 rounded-xl ml-0 mb-1 p-[1px] max-w-52 ${filterState.subjects.some((l) => l.name === subjectsAvailable[index].name)
? "bg-secondary text-main hover:bg-secondary-hover"
: " hover:bg-main-hover"
}`}
......@@ -205,8 +219,7 @@ export default function SideBar({ setFilterState, filterState, openMenu }) {
}}
>
<LocalLibraryIcon
className={` cursor-pointer mt-1 ${
selectedSubject[index]
className={` cursor-pointer mt-1 ${filterState.subjects.some((l) => l.name === subjectsAvailable[index].name)
? " text-main"
: " text-gray-color "
}`}
......@@ -225,11 +238,12 @@ export default function SideBar({ setFilterState, filterState, openMenu }) {
return (
<Link
// id={item.id}
href={getHref(item.href)}
onClick={item.href === "/publicar" ? handleOpenLoggin : () => { }}
href={item.href === "/publicar" ? (isLoggedIn() ? "/publicar" : "") : getHref(item.href)}
key={index}
alt={item.title}
title={item.title}
className={`cursor-pointer hover:bg-main-hover focus:bg-main-hover text-center text-xs rounded-lg p-2 mb-0 ${pathname === item.href ? "bg-main-hover text-secondary-hover " : "text-gray-color"
className={`cursor-pointer hover:bg-main-hover focus:bg-main-hover text-center text-xs rounded-lg p-2 mb-0 ${(page === item.href) || (pathname === item.href) ? "bg-main-hover text-secondary-hover " : "text-gray-color"
}`}
>
<item.icon
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment