fixed filter by tags + refactored search + bug fixed + settings page [WIP]
This commit is contained in:
+14
-27
@@ -1,10 +1,6 @@
|
||||
import Navbar from "@/components/Navbar";
|
||||
import Sidebar from "@/components/Sidebar";
|
||||
import { ReactNode, useEffect } from "react";
|
||||
import { useSession } from "next-auth/react";
|
||||
import Loader from "../components/Loader";
|
||||
import useRedirect from "@/hooks/useRedirect";
|
||||
import { useRouter } from "next/router";
|
||||
import ModalManagement from "@/components/ModalManagement";
|
||||
import useModalStore from "@/store/modals";
|
||||
|
||||
@@ -13,11 +9,6 @@ interface Props {
|
||||
}
|
||||
|
||||
export default function MainLayout({ children }: Props) {
|
||||
const { status, data } = useSession();
|
||||
const router = useRouter();
|
||||
const redirect = useRedirect();
|
||||
const routeExists = router.route === "/_error" ? false : true;
|
||||
|
||||
const { modal } = useModalStore();
|
||||
|
||||
useEffect(() => {
|
||||
@@ -26,24 +17,20 @@ export default function MainLayout({ children }: Props) {
|
||||
: (document.body.style.overflow = "auto");
|
||||
}, [modal]);
|
||||
|
||||
if (status === "authenticated" && !redirect && routeExists)
|
||||
return (
|
||||
<>
|
||||
<ModalManagement />
|
||||
return (
|
||||
<>
|
||||
<ModalManagement />
|
||||
|
||||
<div className="flex">
|
||||
<div className="hidden lg:block">
|
||||
<Sidebar className="fixed top-0" />
|
||||
</div>
|
||||
|
||||
<div className="w-full flex flex-col h-screen lg:ml-64 xl:ml-80">
|
||||
<Navbar />
|
||||
{children}
|
||||
</div>
|
||||
<div className="flex">
|
||||
<div className="hidden lg:block">
|
||||
<Sidebar className="fixed top-0" />
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
else if ((status === "unauthenticated" && !redirect) || !routeExists)
|
||||
return <>{children}</>;
|
||||
else return <></>;
|
||||
|
||||
<div className="w-full flex flex-col h-screen lg:ml-64 xl:ml-80">
|
||||
<Navbar />
|
||||
{children}
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user