feat: location.pathname based bar navigation + admin layout + separate
auth routes
This commit is contained in:
42
web/src/layout/AdminLayout.tsx
Normal file
42
web/src/layout/AdminLayout.tsx
Normal file
@ -0,0 +1,42 @@
|
||||
import { useAuth } from "@/store/auth";
|
||||
import type { FC } from "react";
|
||||
import { Navigate, Outlet } from "react-router";
|
||||
|
||||
const AdminLayout: FC = () => {
|
||||
const profile = useAuth((state) => state.profile);
|
||||
|
||||
if (!profile) {
|
||||
<div className="w-screen h-screen flex flex-1 items-center justify-center flex-col">
|
||||
<div role="status">
|
||||
<svg
|
||||
aria-hidden="true"
|
||||
className="w-10 h-10 text-gray-400 animate-spin fill-white"
|
||||
viewBox="0 0 100 101"
|
||||
fill="none"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
>
|
||||
<path
|
||||
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
|
||||
fill="currentColor"
|
||||
/>
|
||||
<path
|
||||
d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
|
||||
fill="currentFill"
|
||||
/>
|
||||
</svg>
|
||||
<span className="sr-only">Loading...</span>
|
||||
</div>
|
||||
<p className="text-gray-200 dark:text-gray-400 mt-4 text-lg">
|
||||
Loading...
|
||||
</p>
|
||||
</div>;
|
||||
}
|
||||
|
||||
if (!profile?.isAdmin) {
|
||||
return <Navigate to="/" />;
|
||||
}
|
||||
|
||||
return <Outlet />;
|
||||
};
|
||||
|
||||
export default AdminLayout;
|
@ -45,8 +45,7 @@ const AuthLayout = () => {
|
||||
const navigate = useNavigate();
|
||||
|
||||
const isAuthPage = useMemo(() => {
|
||||
const allowedPaths = ["/login", "/register", "/authenticate"];
|
||||
return allowedPaths.some((p) => location.pathname.startsWith(p));
|
||||
return location.pathname.startsWith("/auth");
|
||||
}, [location.pathname]);
|
||||
|
||||
const loading = useMemo(() => {
|
||||
@ -116,7 +115,7 @@ const AuthLayout = () => {
|
||||
if (signInRequired && !isAuthPage) {
|
||||
return (
|
||||
<Navigate
|
||||
to={hasAccounts ? "/authenticate" : "/login"}
|
||||
to={hasAccounts ? "/auth/authenticate" : "/auth/login"}
|
||||
state={{ from: location.pathname }}
|
||||
/>
|
||||
);
|
||||
|
41
web/src/layout/DashboardLayout.tsx
Normal file
41
web/src/layout/DashboardLayout.tsx
Normal file
@ -0,0 +1,41 @@
|
||||
import Sidebar from "@/components/Home/Sidebar";
|
||||
import TopBar from "@/components/Home/TopBar";
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { type FC } from "react";
|
||||
import { Outlet } from "react-router";
|
||||
|
||||
const DashboardLayout: FC = () => {
|
||||
return (
|
||||
<div className="relative z-10 flex items-center justify-center min-h-screen">
|
||||
<Card className="overflow-y-auto min-h-screen w-full min-w-full shadow-lg bg-white/85 dark:bg-black/85 backdrop-blur-md sm:rounded-none">
|
||||
<div className="flex flex-col items-center sm:pt-0 relative">
|
||||
<div className="flex flex-row items-center absolute left-4 top-4">
|
||||
<img src="/icon.png" alt="icon" className="w-6 h-6" />
|
||||
|
||||
<div className="ml-2">
|
||||
<p className="text-sm text-gray-600 text-left dark:text-gray-500">
|
||||
Home Guard
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<CardContent className="w-full space-y-4 flex-1" spacing={false}>
|
||||
<div className="flex flex-row">
|
||||
<Sidebar />
|
||||
<div className="sm:p-4 max-w-full flex-1">
|
||||
<div className="flex flex-col w-full items-center gap-2">
|
||||
<TopBar />
|
||||
</div>
|
||||
<div className="p-4">
|
||||
<Outlet />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</CardContent>
|
||||
</div>
|
||||
</Card>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
export default DashboardLayout;
|
Reference in New Issue
Block a user