Skip to content

Commit

Permalink
refactor: onboarding workflow (#1286)
Browse files Browse the repository at this point in the history 
* chore: onboarding steps workflow verification

* chore: onboarding variable update
  • Loading branch information
@gurusainath
gurusainath authored Jun 14, 2023
1 parent 4b25b72 commit 6f7b563
Show file tree
Hide file tree
Showing 4 changed files with 96 additions and 98 deletions.
2 changes: 1 addition & 1 deletion apps/app/components/onboarding/invite-members.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { ICurrentUserResponse, IUser } from "types";
import { MultiInput, PrimaryButton, SecondaryButton } from "components/ui";

type Props = {
setStep: React.Dispatch<React.SetStateAction<number>>;
setStep: React.Dispatch<React.SetStateAction<number | null>>;
workspace: any;
user: ICurrentUserResponse | undefined;
};
Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/onboarding/user-details.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const defaultValues: Partial<IUser> = {

type Props = {
user?: IUser;
setStep: React.Dispatch<React.SetStateAction<number>>;
setStep: React.Dispatch<React.SetStateAction<number | null>>;
setUserRole: React.Dispatch<React.SetStateAction<string | null>>;
};

Expand Down
2 changes: 1 addition & 1 deletion apps/app/components/onboarding/workspace.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { PrimaryButton } from "components/ui";
import { getFirstCharacters, truncateText } from "helpers/string.helper";

type Props = {
setStep: React.Dispatch<React.SetStateAction<number>>;
setStep: React.Dispatch<React.SetStateAction<number | null>>;
setWorkspace: React.Dispatch<React.SetStateAction<any>>;
user: ICurrentUserResponse | undefined;
};
Expand Down
188 changes: 93 additions & 95 deletions apps/app/pages/onboarding.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState } from "react";
import { useEffect, useState } from "react";
// next imports
import Router from "next/router";
// services
Expand All @@ -24,121 +24,119 @@ import { ONBOARDING_CARDS } from "constants/workspace";
import type { NextPage } from "next";

const Onboarding: NextPage = () => {
const [step, setStep] = useState(1);
const [step, setStep] = useState<null | number>(null);
const [userRole, setUserRole] = useState<string | null>(null);
const [isLoading, setIsLoading] = useState(false);

const [workspace, setWorkspace] = useState();

const { user, isLoading: userLoading, mutateUser } = useUserAuth("onboarding");

useEffect(() => {
if (user && step === null) {
let currentStep: null | number = null;
if (user?.role) currentStep = 2;
if (user?.last_workspace_id) currentStep = 4;
if (currentStep != null) setStep(() => currentStep);
}
}, [step, user]);

return (
<DefaultLayout>
{userLoading ? (
{userLoading || isLoading || step === null ? (
<div className="grid h-screen place-items-center">
<Spinner />
</div>
) : (
<>
{isLoading ? (
<div className="grid h-screen place-items-center">
<Spinner />
<div className="relative grid h-full place-items-center p-5">
{step <= 3 ? (
<div className="h-full flex flex-col justify-center w-full py-4">
<div className="mb-7 flex items-center justify-center text-center">
<OnboardingLogo className="h-12 w-48 fill-current text-brand-base" />
</div>
{step === 1 ? (
<UserDetails user={user} setStep={setStep} setUserRole={setUserRole} />
) : step === 2 ? (
<Workspace setStep={setStep} setWorkspace={setWorkspace} user={user} />
) : (
step === 3 && <InviteMembers setStep={setStep} workspace={workspace} user={user} />
)}
</div>
) : (
<div className="relative grid h-full place-items-center p-5">
{step <= 3 ? (
<div className="h-full flex flex-col justify-center w-full py-4">
<div className="mb-7 flex items-center justify-center text-center">
<OnboardingLogo className="h-12 w-48 fill-current text-brand-base" />
</div>
{step === 1 ? (
<UserDetails user={user} setStep={setStep} setUserRole={setUserRole} />
) : step === 2 ? (
<Workspace setStep={setStep} setWorkspace={setWorkspace} user={user} />
) : (
step === 3 && (
<InviteMembers setStep={setStep} workspace={workspace} user={user} />
)
)}
</div>
) : (
<div className="flex w-full max-w-2xl flex-col gap-12">
<div className="flex flex-col items-center justify-center gap-7 rounded-[10px] bg-brand-base pb-7 text-center shadow-md">
{step === 4 ? (
<OnboardingCard data={ONBOARDING_CARDS.welcome} />
) : step === 5 ? (
<OnboardingCard data={ONBOARDING_CARDS.issue} gradient />
) : step === 6 ? (
<OnboardingCard data={ONBOARDING_CARDS.cycle} gradient />
) : step === 7 ? (
<OnboardingCard data={ONBOARDING_CARDS.module} gradient />
) : (
step === 8 && <OnboardingCard data={ONBOARDING_CARDS.commandMenu} />
)}
<div className="mx-auto flex h-1/4 items-end lg:w-1/2">
<PrimaryButton
type="button"
className="flex w-full items-center justify-center text-center "
size="md"
onClick={() => {
if (step === 8) {
setIsLoading(true);
userService
.updateUserOnBoard({ userRole }, user)
.then(async () => {
mutateUser();
const userWorkspaces = await workspaceService.userWorkspaces();
<div className="flex w-full max-w-2xl flex-col gap-12">
<div className="flex flex-col items-center justify-center gap-7 rounded-[10px] bg-brand-base pb-7 text-center shadow-md">
{step === 4 ? (
<OnboardingCard data={ONBOARDING_CARDS.welcome} />
) : step === 5 ? (
<OnboardingCard data={ONBOARDING_CARDS.issue} gradient />
) : step === 6 ? (
<OnboardingCard data={ONBOARDING_CARDS.cycle} gradient />
) : step === 7 ? (
<OnboardingCard data={ONBOARDING_CARDS.module} gradient />
) : (
step === 8 && <OnboardingCard data={ONBOARDING_CARDS.commandMenu} />
)}
<div className="mx-auto flex h-1/4 items-end lg:w-1/2">
<PrimaryButton
type="button"
className="flex w-full items-center justify-center text-center "
size="md"
onClick={() => {
if (step === 8) {
setIsLoading(true);
userService
.updateUserOnBoard({ userRole }, user)
.then(async () => {
mutateUser();
const userWorkspaces = await workspaceService.userWorkspaces();

const lastActiveWorkspace =
userWorkspaces.find(
(workspace) => workspace.id === user?.last_workspace_id
) ?? userWorkspaces[0];
const lastActiveWorkspace =
userWorkspaces.find(
(workspace) => workspace.id === user?.last_workspace_id
) ?? userWorkspaces[0];

if (lastActiveWorkspace) {
userService
.updateUser({
last_workspace_id: lastActiveWorkspace.id,
})
.then((res) => {
mutateUser();
})
.catch((err) => {
console.log(err);
});
Router.push(`/${lastActiveWorkspace.slug}`);
return;
} else {
const invitations =
await workspaceService.userWorkspaceInvitations();
if (invitations.length > 0) {
Router.push(`/invitations`);
return;
} else {
Router.push(`/create-workspace`);
return;
}
}
})
.catch((err) => {
setIsLoading(false);
console.log(err);
});
} else setStep((prevData) => prevData + 1);
}}
>
{step === 4 || step === 8 ? "Get Started" : "Next"}
</PrimaryButton>
</div>
</div>
if (lastActiveWorkspace) {
userService
.updateUser({
last_workspace_id: lastActiveWorkspace.id,
})
.then((res) => {
mutateUser();
})
.catch((err) => {
console.log(err);
});
Router.push(`/${lastActiveWorkspace.slug}`);
return;
} else {
const invitations = await workspaceService.userWorkspaceInvitations();
if (invitations.length > 0) {
Router.push(`/invitations`);
return;
} else {
Router.push(`/create-workspace`);
return;
}
}
})
.catch((err) => {
setIsLoading(false);
console.log(err);
});
} else setStep((prevData) => (prevData != null ? prevData + 1 : prevData));
}}
>
{step === 4 || step === 8 ? "Get Started" : "Next"}
</PrimaryButton>
</div>
)}
<div className="absolute flex flex-col gap-1 justify-center items-start left-5 top-5">
<span className="text-xs text-brand-secondary">Logged in:</span>
<span className="text-sm text-brand-base">{user?.email}</span>
</div>
</div>
)}
</>
<div className="absolute flex flex-col gap-1 justify-center items-start left-5 top-5">
<span className="text-xs text-brand-secondary">Logged in:</span>
<span className="text-sm text-brand-base">{user?.email}</span>
</div>
</div>
)}
</DefaultLayout>
);
Expand Down

1 comment on commit 6f7b563

@vercel
Copy link

@vercel vercel bot commented on 6f7b563 Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

plane-dev – ./apps/app

plane-dev-plane.vercel.app
plane-dev.vercel.app
plane-dev-git-develop-plane.vercel.app

Please sign in to comment.