Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 16 additions & 6 deletions src/app/profile/create/ProfileCreationHandler.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
'use client';

import { Box, CircularProgress, Typography } from '@mui/material';
import { useRouter, useSearchParams } from 'next/navigation';
import { useEffect, useState } from 'react';

Expand Down Expand Up @@ -203,12 +204,21 @@ export function ProfileCreationHandler({
return (
<>
{loadingUser ? (
<div className="min-h-screen flex items-center justify-center">
<div className="text-center">
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-indigo-600 mx-auto mb-4"></div>
<p className="text-gray-600">Preparing your profile…</p>
</div>
</div>
<Box
sx={{
minHeight: '100dvh',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
justifyContent: 'center',
gap: 2,
}}
>
<CircularProgress />
<Typography sx={{ color: 'text.secondary' }}>
Preparing your profile…
</Typography>
</Box>
) : (
<ProfileWizard
onComplete={handleProfileComplete}
Expand Down
5 changes: 3 additions & 2 deletions src/components/ConditionalFooter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,11 @@ export function ConditionalFooter() {
const pathname = usePathname();
const { data: session } = useSession();

// Don't show footer on auth pages
// Don't show the marketing footer on focused flows (auth + onboarding).
const isAuthPage = pathname.startsWith('/auth/');
const isProfileCreation = pathname.startsWith('/profile/create');

if (isAuthPage) {
if (isAuthPage || isProfileCreation) {
return null;
}

Expand Down
32 changes: 2 additions & 30 deletions src/components/GlobalHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import {
ArrowBack as ArrowBackIcon,
AddAPhotoTwoTone as AddIcon,
FeedbackOutlined as FeedbackOutlinedIcon,
} from '@mui/icons-material';
import {
AppBar,
Expand Down Expand Up @@ -93,20 +92,6 @@ export function GlobalHeader({
flex: '0 0 auto',
}}
>
{/* Feedback - Desktop Only */}
<IconButton
component={Link}
href="/feedback"
sx={{
color: brandColors.charcoal,
display: { xs: 'none', md: 'flex' },
'&:hover': { backgroundColor: 'rgba(30, 58, 95, 0.08)' },
}}
aria-label="Feedback"
>
<FeedbackOutlinedIcon />
</IconButton>

{showBackButton && (
<IconButton
onClick={handleBackClick}
Expand Down Expand Up @@ -161,7 +146,8 @@ export function GlobalHeader({
)}
</Box>

{/* Right Section - Feedback, Add Button, Notifications & User Avatar */}
{/* Right Section - Add Button, Notifications & User Avatar.
Feedback lives in the single floating button (bottom-right). */}
<Box
sx={{
display: 'flex',
Expand All @@ -170,20 +156,6 @@ export function GlobalHeader({
flex: '0 0 auto',
}}
>
{/* Feedback - Desktop Only */}
<IconButton
component={Link}
href="/feedback"
sx={{
color: brandColors.charcoal,
display: { xs: 'none', md: 'flex' },
'&:hover': { backgroundColor: 'rgba(30, 58, 95, 0.08)' },
}}
aria-label="Feedback"
>
<FeedbackOutlinedIcon />
</IconButton>

{/* Add Stuff Button - Desktop Only */}
<IconButton
component={Link}
Expand Down
Loading