fix: remove duplicate headers and unused theme toggle

- Providers now excludes login page from SiteHeader/SiteFooter
- Removed ThemeToggle from SiteHeader (not being used)
- Login page uses fixed viewport height to prevent scrolling
- DemoMode also uses fixed viewport height
This commit is contained in:
2026-06-02 16:31:40 +00:00
parent 1bf8f32525
commit 2c95ce9a19
4 changed files with 18 additions and 20 deletions
+3 -2
View File
@@ -66,10 +66,11 @@ function LoginForm() {
}, [forgotEmail]); }, [forgotEmail]);
return ( return (
<main className="min-h-screen flex flex-col relative overflow-hidden" style={{ backgroundColor: "#faf8f5" }}> <main className="min-h-screen flex flex-col relative overflow-hidden" style={{ backgroundColor: "#faf8f5", height: "100vh" }}>
{/* Google Fonts */} {/* Google Fonts */}
<style jsx global>{` <style jsx global>{`
@import url("https://fonts.googleapis.com/css2?family=Cormorant+Garamond:ital,wght@0,400;0,500;0,600;0,700;1,400&family=Plus+Jakarta+Sans:wght@400;500;600;700&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Cormorant+Garamond:ital,wght@0,400;0,500;0,600;0,700;1,400&family=Plus+Jakarta+Sans:wght@400;500;600;700&display=swap");
html, body { overflow: hidden; }
`}</style> `}</style>
{/* Organic background elements */} {/* Organic background elements */}
@@ -343,7 +344,7 @@ function LoginForm() {
// Demo mode wrapper // Demo mode wrapper
function DemoMode() { function DemoMode() {
return ( return (
<main className="min-h-screen flex flex-col relative overflow-hidden" style={{ backgroundColor: "#faf8f5" }}> <main className="min-h-screen flex flex-col relative overflow-hidden" style={{ backgroundColor: "#faf8f5", height: "100vh" }}>
{/* Organic background elements */} {/* Organic background elements */}
<div className="pointer-events-none absolute inset-0 overflow-hidden" aria-hidden="true"> <div className="pointer-events-none absolute inset-0 overflow-hidden" aria-hidden="true">
<div className="absolute -top-32 -right-32 w-96 h-96 rounded-full opacity-20" style={{ background: "radial-gradient(circle at 30% 30%, #c97a3e20 0%, transparent 70%)", filter: "blur(40px)" }} /> <div className="absolute -top-32 -right-32 w-96 h-96 rounded-full opacity-20" style={{ background: "radial-gradient(circle at 30% 30%, #c97a3e20 0%, transparent 70%)", filter: "blur(40px)" }} />
+3 -2
View File
@@ -13,6 +13,7 @@ export function Providers({ children }: { children: React.ReactNode }) {
const pathname = usePathname(); const pathname = usePathname();
const isBrandRoute = pathname?.startsWith("/tuxedo") || pathname?.startsWith("/indian-river-direct"); const isBrandRoute = pathname?.startsWith("/tuxedo") || pathname?.startsWith("/indian-river-direct");
const isLandingPage = pathname === "/" || pathname === "/brands"; const isLandingPage = pathname === "/" || pathname === "/brands";
const isAuthPage = pathname === "/login" || pathname === "/admin/login";
const [mounted, setMounted] = useState(false); const [mounted, setMounted] = useState(false);
useEffect(() => { useEffect(() => {
@@ -22,9 +23,9 @@ export function Providers({ children }: { children: React.ReactNode }) {
return ( return (
<ThemeProvider attribute="class" defaultTheme="light" enableSystem={false} disableTransitionOnChange> <ThemeProvider attribute="class" defaultTheme="light" enableSystem={false} disableTransitionOnChange>
<CartProvider> <CartProvider>
{!isBrandRoute && !isLandingPage && <SiteHeader />} {!isBrandRoute && !isLandingPage && !isAuthPage && <SiteHeader />}
{mounted ? children : <div style={{ visibility: 'hidden' }}>{children}</div>} {mounted ? children : <div style={{ visibility: 'hidden' }}>{children}</div>}
{!isBrandRoute && !isLandingPage && <SiteFooter />} {!isBrandRoute && !isLandingPage && !isAuthPage && <SiteFooter />}
<CartToast /> <CartToast />
<CartRestoredToast /> <CartRestoredToast />
</CartProvider> </CartProvider>
+12 -12
View File
@@ -33,56 +33,56 @@ export default function GlassModal({ title, titleIcon, subtitle, onClose, childr
return ( return (
<div <div
className="fixed inset-0 z-50 flex items-center justify-center p-4" className="fixed inset-0 z-50 flex items-center justify-center p-4 sm:p-6 md:p-8"
onClick={handleBackdropClick} onClick={handleBackdropClick}
style={{ backgroundColor: "rgba(60, 56, 37, 0.5)" }} style={{ backgroundColor: "rgba(60, 56, 37, 0.5)" }}
> >
{/* Modal card - solid white with shadow for high contrast */} {/* Modal card - solid white with shadow for high contrast */}
<div <div
className={`relative w-full ${maxWidth} rounded-2xl bg-white shadow-[0_25px_50px_-12px_rgba(0,0,0,0.15)]`} className={`relative w-full ${maxWidth} max-h-[calc(100vh-2rem)] sm:max-h-[calc(100vh-3rem)] md:max-h-[calc(100vh-4rem)] rounded-2xl bg-white shadow-[0_25px_50px_-12px_rgba(0,0,0,0.15)] flex flex-col`}
> >
{/* Subtle top border accent */} {/* Subtle top border accent */}
<div className="absolute top-0 left-0 right-0 h-1 bg-gradient-to-r from-[var(--admin-accent)] to-[var(--admin-accent-hover)] rounded-t-2xl" /> <div className="absolute top-0 left-0 right-0 h-1 bg-gradient-to-r from-[var(--admin-accent)] to-[var(--admin-accent-hover)] rounded-t-2xl" />
{/* Header */} {/* Header */}
<div <div
className="flex items-center justify-between px-8 py-6" className="flex items-center justify-between px-4 sm:px-6 md:px-8 py-4 sm:py-6 shrink-0"
style={{ borderBottom: "1px solid var(--admin-border-light)" }} style={{ borderBottom: "1px solid var(--admin-border-light)" }}
> >
<div className="flex items-center gap-3"> <div className="flex items-center gap-2 sm:gap-3 min-w-0">
{titleIcon && ( {titleIcon && (
<div <div
className="flex h-10 w-10 items-center justify-center rounded-xl" className="flex h-8 w-8 sm:h-10 sm:w-10 items-center justify-center rounded-xl shrink-0"
style={{ backgroundColor: "var(--admin-accent-light)" }} style={{ backgroundColor: "var(--admin-accent-light)" }}
> >
{titleIcon} {titleIcon}
</div> </div>
)} )}
<div> <div className="min-w-0">
<h2 <h2
className="text-xl font-semibold text-[var(--admin-text-primary)]" className="text-lg sm:text-xl font-semibold text-[var(--admin-text-primary)] truncate"
style={{ letterSpacing: "-0.02em" }} style={{ letterSpacing: "-0.02em" }}
> >
{title} {title}
</h2> </h2>
{subtitle && ( {subtitle && (
<p className="mt-0.5 text-sm text-[var(--admin-text-muted)]">{subtitle}</p> <p className="mt-0.5 text-xs sm:text-sm text-[var(--admin-text-muted)] hidden sm:block">{subtitle}</p>
)} )}
</div> </div>
</div> </div>
<button <button
onClick={onClose} onClick={onClose}
className="flex h-9 w-9 items-center justify-center rounded-full transition-all duration-150" className="flex h-8 w-8 sm:h-9 sm:w-9 items-center justify-center rounded-full transition-all duration-150 shrink-0 ml-2"
style={{ backgroundColor: "var(--admin-bg-subtle)", color: "var(--admin-text-muted)" }} style={{ backgroundColor: "var(--admin-bg-subtle)", color: "var(--admin-text-muted)" }}
> >
<svg className="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}> <svg className="h-4 w-4 sm:h-5 sm:w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor" strokeWidth={2}>
<path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" /> <path strokeLinecap="round" strokeLinejoin="round" d="M6 18L18 6M6 6l12 12" />
</svg> </svg>
</button> </button>
</div> </div>
{/* Content */} {/* Content - scrollable */}
<div className="relative px-8 py-8"> <div className="relative px-4 sm:px-6 md:px-8 py-4 sm:py-6 md:py-8 overflow-y-auto flex-1">
{children} {children}
</div> </div>
</div> </div>
-4
View File
@@ -2,7 +2,6 @@
import Link from "next/link"; import Link from "next/link";
import { usePathname } from "next/navigation"; import { usePathname } from "next/navigation";
import ThemeToggle from "@/components/shared/ThemeToggle";
const BRAND_NAMES: Record<string, string> = { const BRAND_NAMES: Record<string, string> = {
tuxedo: "Tuxedo Corn", tuxedo: "Tuxedo Corn",
@@ -98,9 +97,6 @@ export default function SiteHeader() {
Admin Admin
</Link> </Link>
)} )}
{/* Theme Toggle */}
<ThemeToggle />
</nav> </nav>
</div> </div>
</header> </header>