Merge pull request #346 from hngprojects/feat/116-User-Dashboard-Pass…

…word-Settings-Page feat(116):user-dashboard-password-settings (completed password update…
hngprojects · Jul 22, 2024 · d90fcd9 · d90fcd9
2 parents 9abe1d4 + e2567c6
commit d90fcd9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/root.tsx b/app/root.tsx
@@ -6,6 +6,7 @@ import {
   Outlet,
   Scripts,
   ScrollRestoration,
+  useLocation,
 } from "@remix-run/react";
 import type { ReactNode } from "react";
 
@@ -19,6 +20,9 @@ export const links: LinksFunction = () => [
 ];
 
 export function Layout({ children }: { children: ReactNode }) {
+  const location = useLocation();
+  const pagesWithNoFooter = ["/dashboard/password-settings"];
+  const showFooter = !pagesWithNoFooter.includes(location.pathname);
   return (
     <html lang="en">
       <head>
@@ -32,7 +36,7 @@ export function Layout({ children }: { children: ReactNode }) {
           <main>
             <Header />
             {children}
-            <FooterLight />
+            {showFooter && <FooterLight />}
           </main>
           <ScrollRestoration />
           <Scripts />

diff --git a/app/routes/dashboard.password-settings/route.tsx b/app/routes/dashboard.password-settings/route.tsx
@@ -1,11 +1,9 @@
 import PasswordUpdate from "~/components/dashboard/PasswordUpdate";
 import { AdminSideNavBar } from "~/components/SuperAdminSideBar/SuperAdminSideNavBar";
-import Header from "~/components/ui/header";
 
 const DaashboardPasswordSettings = () => {
   return (
     <>
-      <Header />
       <div className="flex">
         <AdminSideNavBar />
         <PasswordUpdate />