Skip to content

Commit 56b55be

Browse files
committed
Added better navbar UI, added pages for each link
1 parent f0abb82 commit 56b55be

5 files changed

Lines changed: 48 additions & 35 deletions

File tree

client/src/pages/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export default function Home() {
2626
fontSans.variable,
2727
)}
2828
>
29-
<h1 className="text-3xl text-primary">Test title</h1>
29+
<h1 className="text-3xl text-primary">HOME</h1>
3030
<Button onClick={() => setClicked(true)}>
3131
{isLoading ? "Loading" : "Ping"}
3232
</Button>

client/src/pages/layout.tsx

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,37 @@
1-
import { NavigationMenuLink } from "@radix-ui/react-navigation-menu";
1+
import { Bell,Home, Mail, User } from "lucide-react";
22
import Link from "next/link";
33

4-
import { Button } from "@/components/ui/button";
5-
import {
6-
NavigationMenu,
7-
NavigationMenuContent,
8-
NavigationMenuItem,
9-
NavigationMenuList,
10-
NavigationMenuTrigger,
11-
} from "@/components/ui/navigation-menu";
12-
134
type LayoutProps = {
145
children: React.ReactNode;
156
};
167

178
export default function Layout({ children }: LayoutProps) {
189
return (
1910
<>
20-
<div className="flex flex-row items-center justify-between gap-6 bg-blue-500 p-6">
21-
<NavigationMenu>
22-
<NavigationMenuList>
23-
<NavigationMenuItem>
24-
<NavigationMenuTrigger>Events</NavigationMenuTrigger>
25-
<NavigationMenuContent>
26-
<NavigationMenuLink asChild>
27-
<Link href="/">Index</Link>
28-
</NavigationMenuLink>
29-
</NavigationMenuContent>
30-
</NavigationMenuItem>
11+
<main className="pb-24">{children}</main>
3112

32-
<NavigationMenuItem>
33-
<NavigationMenuTrigger>Clubs</NavigationMenuTrigger>
34-
</NavigationMenuItem>
13+
<nav className="fixed bottom-6 left-1/2 z-50 -translate-x-1/2">
14+
<div className="flex items-center gap-8 rounded-full bg-[#000912] px-8 py-4 shadow-lg">
15+
<Link href="/" className="text-gray-300 hover:text-white">
16+
<Home className="h-6 w-6" />
17+
</Link>
3518

36-
<NavigationMenuItem>
37-
<NavigationMenuTrigger>About us</NavigationMenuTrigger>
38-
</NavigationMenuItem>
39-
</NavigationMenuList>
40-
</NavigationMenu>
19+
<Link href="/messages" className="text-gray-300 hover:text-white">
20+
<Mail className="h-6 w-6" />
21+
</Link>
4122

42-
<Button>Join or something</Button>
43-
</div>
23+
<Link href="/profile" className="text-gray-300 hover:text-white">
24+
<User className="h-6 w-6" />
25+
</Link>
4426

45-
<main>{children}</main>
27+
<Link
28+
href="/notifications"
29+
className="text-gray-300 hover:text-white"
30+
>
31+
<Bell className="h-6 w-6" />
32+
</Link>
33+
</div>
34+
</nav>
4635
</>
4736
);
4837
}

client/src/pages/messages.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Layout from "./layout";
2+
3+
export default function Home() {
4+
return (
5+
<Layout>
6+
<div className="p-6">
7+
<h1 className="text-2xl font-bold">Messages</h1>
8+
<p>This is the Messages page.</p>
9+
</div>
10+
</Layout>
11+
);
12+
}

client/src/pages/notification.tsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import Layout from "./layout";
2+
3+
export default function Home() {
4+
return (
5+
<Layout>
6+
<div className="p-6">
7+
<h1 className="text-2xl font-bold">Notifiocation</h1>
8+
<p>This is the Notification page.</p>
9+
</div>
10+
</Layout>
11+
);
12+
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ export default function Home() {
44
return (
55
<Layout>
66
<div className="p-6">
7-
<h1 className="text-2xl font-bold">Home</h1>
8-
<p>This is the home page.</p>
7+
<h1 className="text-2xl font-bold">Profile</h1>
8+
<p>Profile</p>
99
</div>
1010
</Layout>
1111
);

0 commit comments

Comments
 (0)