fix: prevent two-pages-in-one layout bug on root and onboarding #24
+66
−56
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,48 @@ | ||
| "use client"; | ||
|
|
||
| import { useEffect, useState } from "react"; | ||
| import { useRouter } from "next/navigation"; | ||
| import { useGuestMode } from "@/hooks/useGuestMode"; | ||
| import { GuestOnboardingFlow } from "@/components/features/onboarding/GuestOnboardingFlow"; | ||
|
|
||
| const BG = "bg-[radial-gradient(circle_at_top_left,_rgba(124,92,255,0.16),_transparent_28rem),linear-gradient(180deg,_#fffefc,_#f7f2ff)]"; | ||
|
|
||
| function LoadingSpinner() { | ||
| return ( | ||
| <div className={`flex min-h-[100dvh] items-center justify-center ${BG}`}> | ||
| <div className="flex items-center gap-3 rounded-full border border-white/70 bg-white/80 px-4 py-3 shadow-xl backdrop-blur"> | ||
| <div className="h-4 w-4 animate-spin rounded-full border-2 border-primary border-t-transparent" /> | ||
| <span className="text-sm font-semibold text-foreground">Preparing your budget world</span> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| export default function RootPage() { | ||
| const router = useRouter(); | ||
| const { isGuest, enableGuestMode, guestData } = useGuestMode(); | ||
| const [mounted, setMounted] = useState(false); | ||
|
|
||
| useEffect(() => { | ||
| setMounted(true); | ||
| }, []); | ||
|
|
||
| useEffect(() => { | ||
| if (!mounted) return; | ||
| if (!isGuest) { | ||
| enableGuestMode(); | ||
| } else if (guestData.onboarding?.questions_answered) { | ||
| router.replace("/dashboard"); | ||
| } | ||
| }, [mounted, isGuest, guestData.onboarding?.questions_answered, enableGuestMode, router]); | ||
|
|
||
| if (!mounted || !isGuest) { | ||
| return <LoadingSpinner />; | ||
| } | ||
|
|
||
| if (guestData.onboarding?.questions_answered) { | ||
| return <LoadingSpinner />; | ||
| } | ||
|
|
||
| return <GuestOnboardingFlow onComplete={() => router.replace("/dashboard")} />; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -218,40 +218,42 @@ export function GuestOnboardingFlow({ onComplete }: GuestOnboardingFlowProps) { | |||||
| // ── Render ── | ||||||
|
|
||||||
| return ( | ||||||
| <div className="fixed inset-0 z-50 bg-[radial-gradient(circle_at_top_left,_rgba(124,92,255,0.16),_transparent_28rem),linear-gradient(180deg,_#fffefc,_#f7f2ff)]"> | ||||||
| <AnimatePresence mode="wait"> | ||||||
| {step === "questions" && ( | ||||||
| <motion.div key="questions" initial={{ x: 40, opacity: 0 }} animate={{ x: 0, opacity: 1 }} exit={{ x: -40, opacity: 0 }} | ||||||
| className="absolute inset-0"> | ||||||
|
There was a problem hiding this comment. The
Suggested change
|
||||||
| <OnboardingChat onComplete={handleQuestionsComplete} /> | ||||||
| </motion.div> | ||||||
| )} | ||||||
|
|
||||||
| {step === "analyzing" && ( | ||||||
| <motion.div key="analyzing" initial={{ opacity: 0 }} animate={{ opacity: 1 }} exit={{ opacity: 0 }} | ||||||
| className="absolute inset-0 flex items-center justify-center"> | ||||||
| <AnalyzingAnimation /> | ||||||
| </motion.div> | ||||||
| )} | ||||||
|
|
||||||
| {step === "statement" && ( | ||||||
| <motion.div key="statement" initial={{ x: 40, opacity: 0 }} animate={{ x: 0, opacity: 1 }} exit={{ x: -40, opacity: 0 }} | ||||||
| className="absolute inset-0"> | ||||||
|
There was a problem hiding this comment. The bank statement upload step should be scrollable to ensure that the upload button and any potential error messages remain accessible if the content overflows the screen.
Suggested change
|
||||||
| <BankStatementUpload onComplete={handleStatementComplete} onSkip={handleStatementSkip} /> | ||||||
| </motion.div> | ||||||
| )} | ||||||
|
|
||||||
| {step === "roast" && persona && ( | ||||||
| <motion.div key="roast" initial={{ opacity: 0, scale: 0.95 }} animate={{ opacity: 1, scale: 1 }} exit={{ opacity: 0, y: 50 }} | ||||||
| className="absolute inset-0"> | ||||||
|
There was a problem hiding this comment. The persona summary can contain a significant amount of text (roast, budget breakdown, etc.). Without
Suggested change
|
||||||
| <PersonaSummary | ||||||
| persona={persona} | ||||||
| estimatedBudget={budget} | ||||||
| xpEarned={totalXP} | ||||||
| hasRealData={!!scannedTxns.length} | ||||||
| /> | ||||||
| </motion.div> | ||||||
| )} | ||||||
| </AnimatePresence> | ||||||
| </div> | ||||||
| ); | ||||||
| } | ||||||
|
|
||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
justify-centeron a container withoverflow-y-autocan cause the top of the content to be clipped and unreachable if the content height exceeds the viewport. It is safer to removejustify-centerand rely on padding or a wrapper to ensure the content remains accessible on smaller screens, similar to the implementation in theresultphase (line 357).