From cd687d7ce9a1f348485d5ba1018c5d65d0f0768b Mon Sep 17 00:00:00 2001 From: emirsassan Date: Fri, 16 May 2025 11:25:43 +0300 Subject: [PATCH] refactor: adjust layout and remove redundant flex properties --- apps/onelauncher/frontend/src/routes/__root.tsx | 9 ++++++--- .../frontend/src/routes/onboarding/index.tsx | 2 +- .../frontend/src/routes/onboarding/route.tsx | 15 ++++++++------- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/apps/onelauncher/frontend/src/routes/__root.tsx b/apps/onelauncher/frontend/src/routes/__root.tsx index 8a877fb5..4fa5efba 100644 --- a/apps/onelauncher/frontend/src/routes/__root.tsx +++ b/apps/onelauncher/frontend/src/routes/__root.tsx @@ -29,11 +29,14 @@ function RootRoute() { navigate={(to, options) => router.navigate({ to, ...options })} useHref={to => router.buildLocation({ to }).href} > - + {/* questionable fix copied from old frontend but it works */} +
+ - + - + +
); diff --git a/apps/onelauncher/frontend/src/routes/onboarding/index.tsx b/apps/onelauncher/frontend/src/routes/onboarding/index.tsx index baed4aff..e600c137 100644 --- a/apps/onelauncher/frontend/src/routes/onboarding/index.tsx +++ b/apps/onelauncher/frontend/src/routes/onboarding/index.tsx @@ -6,7 +6,7 @@ export const Route = createFileRoute('/onboarding/')({ function RouteComponent() { return ( -
+

Welcome to {' '} diff --git a/apps/onelauncher/frontend/src/routes/onboarding/route.tsx b/apps/onelauncher/frontend/src/routes/onboarding/route.tsx index 67e71de1..1722640e 100644 --- a/apps/onelauncher/frontend/src/routes/onboarding/route.tsx +++ b/apps/onelauncher/frontend/src/routes/onboarding/route.tsx @@ -8,24 +8,24 @@ export const Route = createFileRoute('/onboarding')({ function RouteComponent() { const navigate = useNavigate() const routerState = useRouterState() - + const steps = [ '/onboarding/', ] - + const currentPath = routerState.location.pathname const currentStepIndex = steps.findIndex(path => currentPath === path || currentPath.startsWith(path)) - - const progressPercentage = steps.length > 1 - ? ((currentStepIndex + 1) / steps.length) * 100 + + const progressPercentage = steps.length > 1 + ? ((currentStepIndex + 1) / steps.length) * 100 : (currentStepIndex === 0 ? 100 : 0) - + const handleBack = () => { if (currentStepIndex > 0) { navigate({ to: steps[currentStepIndex - 1] }) } } - + const handleNext = () => { if (currentStepIndex < steps.length - 1) { navigate({ to: steps[currentStepIndex + 1] }) @@ -37,6 +37,7 @@ function RouteComponent() { return ( // remind me 2 hours! i'll fix this + // update: it's fixed!