Skip to content

BSL-51: bug fixes #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shreyaanchhabra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

BSL-51: bug fixes #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions components/Navbar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ export default function Navbar() {
if (p === "/" || p === "") return "home";
if (p.startsWith("/about")) return "about";
if (p.startsWith("/events")) return "events";
if (p.startsWith("/gallery")) return "gallery";
if (p.startsWith("/apply")) return "apply";
return "home";
}, [pathname]);
Expand All @@ -21,6 +22,7 @@ export default function Navbar() {
{ id: "home", label: "HOME", href: "/" },
{ id: "about", label: "ABOUT", href: "/about" },
{ id: "events", label: "EVENTS", href: "/events" },
{ id: "gallery", label: "GALLERY", href: "/gallery" },
{ id: "apply", label: "APPLY", href: "/apply" },
];

Expand Down
4 changes: 4 additions & 0 deletions components/admin/AdminLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ export default function AdminLayout({
}) {
const pathname = usePathname();

if (pathname === "/admin/login") {
return <>{children}</>;
}

return (
<div className="min-h-screen flex">
<aside className="w-64 border-r p-4">
Expand Down
6 changes: 1 addition & 5 deletions components/layout/PublicLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from "react";
import Navbar from "@/components/Navbar";
import AuthButton from "@/components/auth/AuthButton";
import Footer from "@/components/Footer";

export default function PublicLayout({
Expand All @@ -12,14 +11,11 @@ export default function PublicLayout({
<>
<header>
<Navbar />
<div className="flex items-center gap-4 px-4">
<AuthButton />
</div>
</header>

<main>{children}</main>

<Footer />
</>
);
}
}