diff --git a/src/components/layout/Navbar/index.tsx b/src/components/layout/Navbar/index.tsx index deddcbd2..0077e596 100644 --- a/src/components/layout/Navbar/index.tsx +++ b/src/components/layout/Navbar/index.tsx @@ -17,6 +17,7 @@ import styles from './style.module.scss'; interface NavbarProps { accessType?: UserAccessType; + /** Used on the onboarding screen to avoid a distracting double rainbow */ quiet?: boolean; } const Navbar = ({ accessType, quiet }: NavbarProps) => { diff --git a/src/components/onboarding/OnboardingScreen/index.tsx b/src/components/onboarding/OnboardingScreen/index.tsx index 0dfdf2cb..2a3eb8b3 100644 --- a/src/components/onboarding/OnboardingScreen/index.tsx +++ b/src/components/onboarding/OnboardingScreen/index.tsx @@ -1,7 +1,8 @@ -import { Button, Typography } from '@/components/common'; +import { Button, LinkButton, Typography } from '@/components/common'; import Communities from '@/components/onboarding/Communities'; import Intro from '@/components/onboarding/Intro'; import { CollectionSlider } from '@/components/store'; +import { config } from '@/lib'; import Step4 from '@/public/assets/graphics/store/step4.svg'; import { ReactNode, useState } from 'react'; import { AiOutlineClockCircle } from 'react-icons/ai'; @@ -56,8 +57,7 @@ const steps: Step[] = [ }, { title: 'That’s a glimpse on how we run ACM at UCSD.', - caption: - 'Let’s get started with setting up your account! You can earn your first 10 points by completing the tasks under the profile dashboard. ', + caption: 'Let’s get started with setting up your account!', // You can earn your first 10 points by completing the tasks under the profile dashboard. content: , }, ]; @@ -66,7 +66,7 @@ const TOTAL_STEPS = steps.length - 1; interface OnboardingScreenProps { onDismiss: () => void; - onFinish: () => void; + onFinish?: () => void; } const OnboardingScreen = ({ onDismiss, onFinish }: OnboardingScreenProps) => { @@ -103,9 +103,13 @@ const OnboardingScreen = ({ onDismiss, onFinish }: OnboardingScreenProps) => { > {step > 0 ? 'Back' : 'Maybe later'} - + {!onFinish && step === steps.length - 1 ? ( + Finish + ) : ( + + )} ); diff --git a/src/pages/onboard.tsx b/src/pages/onboard.tsx index 3e4a780a..fd26bfc1 100644 --- a/src/pages/onboard.tsx +++ b/src/pages/onboard.tsx @@ -17,7 +17,7 @@ const OnboardPage: NextPage = ({ destination }) => { return (
- +
); };