diff --git a/apps/web/.env.development b/apps/web/.env.development index 9921337..ac3fcf0 100644 --- a/apps/web/.env.development +++ b/apps/web/.env.development @@ -1,2 +1,3 @@ NEXT_PUBLIC_DOMAIN=http://localhost:3000 -NEXT_PUBLIC_API_URL=https://dev-api.vook.app \ No newline at end of file +NEXT_PUBLIC_API_URL=https://dev-api.vook.app +NEXT_PUBLIC_GOOGLE_LOGIN_URL=https://dev-api.vook.app/oauth2/authorization/google \ No newline at end of file diff --git a/apps/web/src/app/(beforeLogin)/auth/token/page.tsx b/apps/web/src/app/(beforeLogin)/auth/token/page.tsx index d693004..d6b86ba 100644 --- a/apps/web/src/app/(beforeLogin)/auth/token/page.tsx +++ b/apps/web/src/app/(beforeLogin)/auth/token/page.tsx @@ -40,10 +40,14 @@ const AuthCallbackPage = ({ const checkUserRegistered = async () => { const userInfo = await userService.userInfo(queryClient) const isRegistered = userInfo.result.status === UserStatus.Registered + const isOnboardingCompleted = userInfo.result.onboardingCompleted - if (isRegistered) { - router.push('/workspace') + if (!isOnboardingCompleted) { + router.push('/onboarding/funnel') + return + } + if (isRegistered && isOnboardingCompleted) { const sendToken = () => { window.postMessage( { @@ -59,9 +63,12 @@ const AuthCallbackPage = ({ sendToken() } - return + router.push('/workspace') + } + + if (userInfo.result.onboardingCompleted) { + router.push('/signup') } - router.push('/signup') } checkUserRegistered() diff --git a/apps/web/src/app/(onboarding)/onboarding/job/page.tsx b/apps/web/src/app/(onboarding)/onboarding/job/page.tsx index 466bd4b..2819315 100644 --- a/apps/web/src/app/(onboarding)/onboarding/job/page.tsx +++ b/apps/web/src/app/(onboarding)/onboarding/job/page.tsx @@ -10,11 +10,13 @@ import React from 'react' import { OnboardingJob, useOnboardingMutation } from '@vook-client/api' import { useRouter } from 'next/navigation' +import { Link } from '@/components/Link' + import { SelectBoxGroup } from '../_components/SelectBoxGroup' import { useOnBoarding } from '../_context/useOnboarding' import { OnboardingHeader } from '../_components/OnboardingHeader' -import { buttonGroup, header, jobGroup, skipButton } from './page.css' +import { buttonGroup, header, jobGroup } from './page.css' const JOBS: Array<{ icon: ButtonProps['prefixIcon'] @@ -114,13 +116,8 @@ const OnboardingJobPage = () => { ))} -