diff --git a/public/landing/bg.svg b/public/landing/bg.svg index 5d9dbb5..09fff21 100644 --- a/public/landing/bg.svg +++ b/public/landing/bg.svg @@ -1,18 +1,23 @@ - - - - - + + + + + + + + + + - + - + - + diff --git a/src/app/admin/page.tsx b/src/app/admin/page.tsx index 844f662..c7564a9 100644 --- a/src/app/admin/page.tsx +++ b/src/app/admin/page.tsx @@ -57,42 +57,36 @@ export default function Login() { }; return ( -
- {/* Background Image */} - - -
-
-

Admin Login

+ <> +
+
+
+

Admin Login

Use the admin email and password to login.

- +
- + @@ -100,13 +94,13 @@ export default function Login() { Lost? Click to return to safety
-
+ ); } diff --git a/src/app/client-layout.tsx b/src/app/client-layout.tsx index 1f0186f..365cd5e 100644 --- a/src/app/client-layout.tsx +++ b/src/app/client-layout.tsx @@ -2,11 +2,12 @@ import { useAuthState } from "react-firebase-hooks/auth"; import { auth } from "@/lib/firebase/firebase"; -import Navbar from "@/components/Navbar/PublicNavbar"; +import Navbar from "@/components/Navbar/Navbar"; import Sidebar from "@/components/Navbar/Sidebar"; import { QueryClientProvider } from "@tanstack/react-query"; import { queryClient } from "@/lib/react-query/queryClient"; -import { useState } from "react"; +import { useEffect, useState } from "react"; +import { usePathname } from "next/navigation"; export default function ClientLayout({ children, @@ -16,9 +17,22 @@ export default function ClientLayout({ const [user] = useAuthState(auth); const [isCollapsed, setIsCollapsed] = useState(false); + // Set the body's background on client-view components. (Improves aesthetics on mobile browsers) + const pathname = usePathname(); + const isAdminRoute = pathname?.startsWith("/dashboard"); + + useEffect(() => { + if(isAdminRoute) { + document.body.style.backgroundColor = "#fff" + } + else { + document.body.style.backgroundColor = "#080d14" + } + },[isAdminRoute]) + return ( -
+
{user && ( )} diff --git a/src/app/dashboard/events/add/page.tsx b/src/app/dashboard/events/add/page.tsx index da6969a..904545f 100644 --- a/src/app/dashboard/events/add/page.tsx +++ b/src/app/dashboard/events/add/page.tsx @@ -7,9 +7,9 @@ import BackButton from "@/components/Buttons/BackButton"; export default function AddEvent() { return ( -
+
-

Create Event

+

Create Event

diff --git a/src/app/dashboard/events/page.tsx b/src/app/dashboard/events/page.tsx index c82f2a2..8a962e4 100644 --- a/src/app/dashboard/events/page.tsx +++ b/src/app/dashboard/events/page.tsx @@ -35,22 +35,22 @@ export default function EditEvents() { return ( -
-
-

Events

-
+
+
+

Events

+
-
-

+

+

Showing events for:{" "} {currentMonth} {currentYear}

-
+
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx index b24b099..af7c427 100644 --- a/src/app/dashboard/page.tsx +++ b/src/app/dashboard/page.tsx @@ -4,7 +4,7 @@ import { FaCalendarAlt, FaBoxOpen } from "react-icons/fa"; import { BsPcDisplay } from "react-icons/bs"; import Link from "next/link"; import ProtectedRoute from "@/components/admin/auth/ProtectedRoute"; -import SignOutButton from "@/components/admin/auth/SingOut"; +import SignOutButton from "@/components/admin/auth/SignOut"; export default function Dashboard() { return ( @@ -15,7 +15,7 @@ export default function Dashboard() {

-