Authentication Workflow fixes. Redirection fixes (#832)

* auth integration fixes * auth integration fixes * auth integration fixes * auth integration fixes * dev: update user api to return fallback workspace and improve the structure of the response * dev: fix the issue keyerror and move onboarding logic to serializer method field * dev: use-user-auth hook imlemented for route access validation and build issues resolved effected by user payload * fix: global theme color fix * style: new onboarding ui , fix: use-user-auth hook implemented * fix: command palette, project invite modal and issue detail page mutation type fix * fix: onboarding redirection fix * dev: build isuue resolved * fix: use user auth hook fix * fix: sign in toast alert fix, sign out redirection fix and user theme error fix * fix: user response fix * fix: unAuthorizedStatus logic updated --------- Co-authored-by: pablohashescobar <nikhilschacko@gmail.com> Co-authored-by: gurusainath <gurusainath007@gmail.com> Co-authored-by: anmolsinghbhatia <anmolsinghbhatia@caravel.tech>
2023-05-30 09:44:35 -04:00 · 2023-05-30 09:44:35 -04:00 · 44f8ba407d
commit 44f8ba407d
parent 33db616767
43 changed files with 821 additions and 593 deletions
--- a/apiserver/plane/api/serializers/user.py
+++ b/apiserver/plane/api/serializers/user.py
@ -25,6 +25,10 @@ class UserSerializer(BaseSerializer):
        ]
        extra_kwargs = {"password": {"write_only": True}}

+        # If the user has already filled first name or last name then he is onboarded
+        def get_is_onboarded(self, obj):
+            return bool(obj.first_name) or bool(obj.last_name)
+

 class UserLiteSerializer(BaseSerializer):
    class Meta:
--- a/apiserver/plane/api/views/people.py
+++ b/apiserver/plane/api/views/people.py
@ -31,36 +31,61 @@ class UserEndpoint(BaseViewSet):

    def retrieve(self, request):
        try:
-            workspace = Workspace.objects.get(pk=request.user.last_workspace_id)
+            workspace = Workspace.objects.get(
+                pk=request.user.last_workspace_id, workspace_member__member=request.user
+            )
            workspace_invites = WorkspaceMemberInvite.objects.filter(
                email=request.user.email
            ).count()
            assigned_issues = Issue.objects.filter(assignees__in=[request.user]).count()

+            serialized_data = UserSerializer(request.user).data
+            serialized_data["workspace"] = {
+                "last_workspace_id": request.user.last_workspace_id,
+                "last_workspace_slug": workspace.slug,
+                "fallback_workspace_id": request.user.last_workspace_id,
+                "fallback_workspace_slug": workspace.slug,
+                "invites": workspace_invites,
+            }
+            serialized_data.setdefault("issues", {})["assigned_issues"] = assigned_issues
+
            return Response(
-                {
-                    "user": UserSerializer(request.user).data,
-                    "slug": workspace.slug,
-                    "workspace_invites": workspace_invites,
-                    "assigned_issues": assigned_issues,
-                },
+                serialized_data,
                status=status.HTTP_200_OK,
            )
        except Workspace.DoesNotExist:
+            # This exception will be hit even when the `last_workspace_id` is None
+
            workspace_invites = WorkspaceMemberInvite.objects.filter(
                email=request.user.email
            ).count()
            assigned_issues = Issue.objects.filter(assignees__in=[request.user]).count()
+
+            fallback_workspace = Workspace.objects.filter(
+                workspace_member__member=request.user
+            ).order_by("created_at").first()
+
+            serialized_data = UserSerializer(request.user).data
+
+            serialized_data["workspace"] = {
+                "last_workspace_id": None,
+                "last_workspace_slug": None,
+                "fallback_workspace_id": fallback_workspace.id
+                if fallback_workspace is not None
+                else None,
+                "fallback_workspace_slug": fallback_workspace.slug
+                if fallback_workspace is not None
+                else None,
+                "invites": workspace_invites,
+            }
+            serialized_data.setdefault("issues", {})["assigned_issues"] = assigned_issues
+
            return Response(
-                {
-                    "user": UserSerializer(request.user).data,
-                    "slug": None,
-                    "workspace_invites": workspace_invites,
-                    "assigned_issues": assigned_issues,
-                },
+                serialized_data,
                status=status.HTTP_200_OK,
            )
        except Exception as e:
+            capture_exception(e)
            return Response(
                {"error": "Something went wrong please try again later"},
                status=status.HTTP_400_BAD_REQUEST,
--- a/apps/app/components/account/email-code-form.tsx
+++ b/apps/app/components/account/email-code-form.tsx
@ -66,8 +66,12 @@ export const EmailCodeForm = ({ onSuccess }: any) => {
  const handleSignin = async (formData: EmailCodeFormValues) => {
    await authenticationService
      .magicSignIn(formData)
-      .then((response) => {
-        onSuccess(response);
+      .then(() => {
+        setToastAlert({
+          title: "Success",
+          type: "success",
+          message: "Successfully logged in!",
+        });
      })
      .catch((error) => {
        setToastAlert({
--- a/apps/app/components/account/email-signin-form.tsx
+++ b/apps/app/components/account/email-signin-form.tsx
@ -1,24 +0,0 @@
-import { useState, FC } from "react";
-import { KeyIcon } from "@heroicons/react/24/outline";
-// components
-import { EmailCodeForm, EmailPasswordForm } from "components/account";
-
-export interface EmailSignInFormProps {
-  handleSuccess: () => void;
-}
-
-export const EmailSignInForm: FC<EmailSignInFormProps> = (props) => {
-  const { handleSuccess } = props;
-  // states
-  const [useCode, setUseCode] = useState(true);
-
-  return (
-    <>
-      {useCode ? (
-        <EmailCodeForm onSuccess={handleSuccess} />
-      ) : (
-        <EmailPasswordForm onSuccess={handleSuccess} />
-      )}
-    </>
-  );
-};
--- a/apps/app/components/account/github-login-button.tsx
+++ b/apps/app/components/account/github-login-button.tsx
@ -29,7 +29,7 @@ export const GithubLoginButton: FC<GithubLoginButtonProps> = (props) => {
  useEffect(() => {
    const origin =
      typeof window !== "undefined" && window.location.origin ? window.location.origin : "";
-    setLoginCallBackURL(`${origin}/signin` as any);
+    setLoginCallBackURL(`${origin}/` as any);
  }, []);

  return (
--- a/apps/app/components/account/index.ts
+++ b/apps/app/components/account/index.ts
@ -2,4 +2,3 @@ export * from "./google-login";
 export * from "./email-code-form";
 export * from "./email-password-form";
 export * from "./github-login-button";
-export * from "./email-signin-form";
--- a/apps/app/components/auth-screens/not-authorized-view.tsx
+++ b/apps/app/components/auth-screens/not-authorized-view.tsx
@ -39,7 +39,7 @@ export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
          {user ? (
            <p>
              You have signed in as {user.email}. <br />
-              <Link href={`/signin?next=${currentPath}`}>
+              <Link href={`/?next=${currentPath}`}>
                <a className="font-medium text-brand-base">Sign in</a>
              </Link>{" "}
              with different account that has access to this page.
@ -47,7 +47,7 @@ export const NotAuthorizedView: React.FC<Props> = ({ actionButton, type }) => {
          ) : (
            <p>
              You need to{" "}
-              <Link href={`/signin?next=${currentPath}`}>
+              <Link href={`/?next=${currentPath}`}>
                <a className="font-medium text-brand-base">Sign in</a>
              </Link>{" "}
              with an account that has access to this page.
--- a/apps/app/components/breadcrumbs/index.tsx
+++ b/apps/app/components/breadcrumbs/index.tsx
@ -3,6 +3,7 @@ import { useRouter } from "next/router";
 import Link from "next/link";
 // icons
 import { ArrowLeftIcon } from "@heroicons/react/24/outline";
+import { Icon } from "components/ui";

 type BreadcrumbsProps = {
  children: any;
@ -16,10 +17,13 @@ const Breadcrumbs = ({ children }: BreadcrumbsProps) => {
      <div className="flex items-center">
        <button
          type="button"
-          className="grid h-8 w-8 flex-shrink-0 cursor-pointer place-items-center rounded border border-brand-base text-center text-sm hover:bg-brand-surface-1"
+          className="group grid h-7 w-7 flex-shrink-0 cursor-pointer place-items-center rounded border border-brand-base text-center text-sm hover:bg-brand-surface-1"
          onClick={() => router.back()}
        >
-          <ArrowLeftIcon className="h-3 w-3" />
+          <Icon
+            iconName="keyboard_backspace"
+            className="text-base leading-4 text-brand-secondary group-hover:text-brand-base"
+          />
        </button>
        {children}
      </div>
--- a/apps/app/components/command-palette/change-issue-assignee.tsx
+++ b/apps/app/components/command-palette/change-issue-assignee.tsx
@ -57,12 +57,15 @@ export const ChangeIssueAssignee: React.FC<Props> = ({ setIsPaletteOpen, issue }
    async (formData: Partial<IIssue>) => {
      if (!workspaceSlug || !projectId || !issueId) return;

-      mutate(
+      mutate<IIssue>(
        ISSUE_DETAILS(issueId as string),
-        (prevData: IIssue) => ({
+        async (prevData) => {
+          if (!prevData) return prevData;
+          return {
            ...prevData,
            ...formData,
-        }),
+          };
+        },
        false
      );

@ -80,7 +83,7 @@ export const ChangeIssueAssignee: React.FC<Props> = ({ setIsPaletteOpen, issue }
  );

  const handleIssueAssignees = (assignee: string) => {
-    const updatedAssignees = issue.assignees ?? [];
+    const updatedAssignees = issue.assignees_list ?? [];

    if (updatedAssignees.includes(assignee)) {
      updatedAssignees.splice(updatedAssignees.indexOf(assignee), 1);
--- a/apps/app/components/command-palette/change-issue-priority.tsx
+++ b/apps/app/components/command-palette/change-issue-priority.tsx
@ -27,12 +27,16 @@ export const ChangeIssuePriority: React.FC<Props> = ({ setIsPaletteOpen, issue }
    async (formData: Partial<IIssue>) => {
      if (!workspaceSlug || !projectId || !issueId) return;

-      mutate(
+      mutate<IIssue>(
        ISSUE_DETAILS(issueId as string),
-        (prevData: IIssue) => ({
+        async (prevData) => {
+          if (!prevData) return prevData;
+
+          return {
            ...prevData,
            ...formData,
-        }),
+          };
+        },
        false
      );

--- a/apps/app/components/command-palette/change-issue-state.tsx
+++ b/apps/app/components/command-palette/change-issue-state.tsx
@ -39,12 +39,15 @@ export const ChangeIssueState: React.FC<Props> = ({ setIsPaletteOpen, issue }) =
    async (formData: Partial<IIssue>) => {
      if (!workspaceSlug || !projectId || !issueId) return;

-      mutate(
+      mutate<IIssue>(
        ISSUE_DETAILS(issueId as string),
-        (prevData: IIssue) => ({
+        async (prevData) => {
+          if (!prevData) return prevData;
+          return {
            ...prevData,
            ...formData,
-        }),
+          };
+        },
        false
      );

--- a/apps/app/components/command-palette/command-pallette.tsx
+++ b/apps/app/components/command-palette/command-pallette.tsx
@ -120,12 +120,17 @@ export const CommandPalette: React.FC = () => {
    async (formData: Partial<IIssue>) => {
      if (!workspaceSlug || !projectId || !issueId) return;

-      mutate(
+      mutate<IIssue>(
        ISSUE_DETAILS(issueId as string),
-        (prevData: IIssue) => ({
+
+        (prevData) => {
+          if (!prevData) return prevData;
+
+          return {
            ...prevData,
            ...formData,
-        }),
+          };
+        },
        false
      );

--- a/apps/app/components/onboarding/invite-members.tsx
+++ b/apps/app/components/onboarding/invite-members.tsx
@ -45,8 +45,9 @@ export const InviteMembers: React.FC<Props> = ({ setStep, workspace }) => {
    >
      <div className="flex w-full max-w-xl flex-col gap-12">
        <div className="flex flex-col gap-6 rounded-[10px] bg-brand-base p-7 shadow-md">
-          <h2 className="text-xl font-medium">Invite your team to your workspace.</h2>
+          <h2 className="text-xl font-medium">Invite co-workers to your team</h2>
          <div className="flex flex-col items-start justify-center gap-2.5">
+            <span>Email</span>
            <div className="w-full">
              <MultiInput
                name="emails"
--- a/apps/app/components/onboarding/onboarding-card.tsx
+++ b/apps/app/components/onboarding/onboarding-card.tsx
@ -16,7 +16,7 @@ type Props = {
 export const OnboardingCard: React.FC<Props> = ({ data, gradient = false }) => (
  <div
    className={`flex flex-col items-center justify-center gap-7 rounded-[10px] px-14 pt-10 text-center ${
-      gradient ? "bg-gradient-to-b from-[#2C8DFF]/50 via-brand-base to-transparent" : ""
+      gradient ? "bg-gradient-to-b from-[#C1DDFF] via-brand-base to-transparent" : ""
    }`}
  >
    <div className="h-44 w-full">
--- a/apps/app/components/onboarding/user-details.tsx
+++ b/apps/app/components/onboarding/user-details.tsx
@ -66,10 +66,17 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>

  return (
    <form className="flex w-full items-center justify-center" onSubmit={handleSubmit(onSubmit)}>
-      <div className="flex w-full max-w-xl flex-col gap-12">
+      <div className="flex w-full max-w-xl flex-col gap-7">
        <div className="flex flex-col rounded-[10px] bg-brand-base shadow-md">
-          <div className="flex flex-col justify-between gap-3 px-10 py-7 sm:flex-row">
-            <div className="flex flex-col items-start justify-center gap-2.5">
+          <div className="flex flex-col gap-2 justify-center px-7 pt-7 pb-3.5">
+            <h3 className="text-base font-semibold text-brand-base">User Details</h3>
+            <p className="text-sm text-brand-secondary">
+              Enter your details as a first step to open your Plane account.
+            </p>
+          </div>
+
+          <div className="flex flex-col justify-between gap-4 px-7 py-3.5 sm:flex-row">
+            <div className="flex flex-col items-start justify-center gap-2.5 w-full sm:w-1/2">
              <span>First name</span>
              <Input
                name="first_name"
@ -81,7 +88,7 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>
                error={errors.first_name}
              />
            </div>
-            <div className="flex flex-col items-start justify-center gap-2.5">
+            <div className="flex flex-col items-start justify-center gap-2.5 w-full sm:w-1/2">
              <span>Last name</span>
              <Input
                name="last_name"
@ -94,7 +101,8 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>
              />
            </div>
          </div>
-          <div className="flex flex-col items-start justify-center gap-2.5 border-t border-brand-base px-10 py-7">
+
+          <div className="flex flex-col items-start justify-center gap-2.5 border-t border-brand-base px-7 pt-3.5 pb-7">
            <span>What is your role?</span>
            <div className="w-full">
              <Controller
@ -123,6 +131,7 @@ export const UserDetails: React.FC<Props> = ({ user, setStep, setUserRole }) =>
            </div>
          </div>
        </div>
+
        <div className="flex w-full items-center justify-center ">
          <PrimaryButton
            type="submit"
--- a/apps/app/components/onboarding/workspace.tsx
+++ b/apps/app/components/onboarding/workspace.tsx
@ -16,6 +16,7 @@ import { USER_WORKSPACE_INVITATIONS } from "constants/fetch-keys";
 import { CreateWorkspaceForm } from "components/workspace";
 // ui
 import { PrimaryButton } from "components/ui";
+import { getFirstCharacters, truncateText } from "helpers/string.helper";

 type Props = {
  setStep: React.Dispatch<React.SetStateAction<number>>;
@ -30,6 +31,7 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
    slug: "",
    company_size: null,
  });
+  const [currentTab, setCurrentTab] = useState("create");

  const { data: invitations, mutate } = useSWR(USER_WORKSPACE_INVITATIONS, () =>
    workspaceService.userWorkspaceInvitations()
@ -64,53 +66,72 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
      });
  };

+  const currentTabValue = (tab: string | null) => {
+    switch (tab) {
+      case "join":
+        return 0;
+      case "create":
+        return 1;
+      default:
+        return 1;
+    }
+  };
+
+  console.log("invitations:", invitations);
+
  return (
-    <div className="grid min-h-[490px] w-full place-items-center">
+    <div className="grid w-full place-items-center">
      <Tab.Group
        as="div"
-        className="flex h-full w-full max-w-xl flex-col justify-between rounded-[10px] bg-brand-base shadow-md"
-      >
-        <Tab.List
-          as="div"
-          className="text-gray-8 flex items-center justify-start gap-3 px-4 pt-4 text-sm"
+        className="flex h-[417px] w-full max-w-xl flex-col justify-between rounded-[10px] bg-brand-base shadow-md"
+        defaultIndex={currentTabValue(currentTab)}
+        onChange={(i) => {
+          switch (i) {
+            case 0:
+              return setCurrentTab("join");
+            case 1:
+              return setCurrentTab("create");
+            default:
+              return setCurrentTab("create");
+          }
+        }}
      >
+        <Tab.List as="div" className="flex flex-col gap-3 px-7 pt-7 pb-3.5">
+          <div className="flex flex-col gap-2 justify-center">
+            <h3 className="text-base font-semibold text-brand-base">Workspaces</h3>
+            <p className="text-sm text-brand-secondary">
+              Create or join the workspace to get started with Plane.
+            </p>
+          </div>
+          <div className="text-gray-8 flex items-center justify-start gap-3  text-sm">
            <Tab
              className={({ selected }) =>
                `rounded-3xl border px-4 py-2 outline-none ${
                  selected
-                  ? "border-brand-accent bg-brand-accent text-white"
-                  : "border-brand-base bg-brand-surface-2 hover:bg-brand-surface-1"
-              }`
-            }
-          >
-            New Workspace
-          </Tab>
-          <Tab
-            className={({ selected }) =>
-              `rounded-3xl border px-5 py-2 outline-none ${
-                selected
-                  ? "border-brand-accent bg-brand-accent text-white"
-                  : "border-brand-base bg-brand-surface-2 hover:bg-brand-surface-1"
+                    ? "border-brand-accent bg-brand-accent text-white font-medium"
+                    : "border-brand-base bg-brand-base hover:bg-brand-surface-2"
                }`
              }
            >
              Invited Workspace
            </Tab>
+            <Tab
+              className={({ selected }) =>
+                `rounded-3xl border px-4 py-2 outline-none ${
+                  selected
+                    ? "border-brand-accent bg-brand-accent text-white font-medium"
+                    : "border-brand-base bg-brand-base hover:bg-brand-surface-2"
+                }`
+              }
+            >
+              New Workspace
+            </Tab>
+          </div>
        </Tab.List>
        <Tab.Panels as="div" className="h-full">
-          <Tab.Panel>
-            <CreateWorkspaceForm
-              onSubmit={(res) => {
-                setWorkspace(res);
-                setStep(3);
-              }}
-              defaultValues={defaultValues}
-              setDefaultValues={setDefaultValues}
-            />
-          </Tab.Panel>
          <Tab.Panel className="h-full">
-            <div className="flex h-full w-full flex-col justify-between">
-              <div className="divide-y px-4 py-7">
+            <div className="flex h-full w-full flex-col">
+              <div className="h-[255px] overflow-y-auto px-7">
                {invitations && invitations.length > 0 ? (
                  invitations.map((invitation) => (
                    <div key={invitation.id}>
@ -129,34 +150,62 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
                                alt={invitation.workspace.name}
                              />
                            ) : (
-                              <span className="flex h-full w-full items-center justify-center rounded bg-gray-700 p-4 uppercase text-white">
-                                {invitation.workspace.name.charAt(0)}
+                              <span className="flex h-full w-full items-center justify-center rounded-xl bg-gray-700 p-4 uppercase text-white">
+                                {getFirstCharacters(invitation.workspace.name)}
                              </span>
                            )}
                          </span>
                        </div>
                        <div className="min-w-0 flex-1">
-                          <div className="text-sm font-medium">{invitation.workspace.name}</div>
+                          <div className="text-sm font-medium">
+                            {truncateText(invitation.workspace.name, 30)}
+                          </div>
                          <p className="text-sm text-brand-secondary">
                            Invited by {invitation.workspace.owner.first_name}
                          </p>
                        </div>
                        <div className="flex-shrink-0 self-center">
-                          <input
-                            id={invitation.id}
-                            aria-describedby="workspaces"
-                            name={invitation.id}
-                            checked={invitationsRespond.includes(invitation.id)}
-                            value={invitation.workspace.name}
-                            onChange={(e) => {
+                          <button
+                            className={`${
+                              invitationsRespond.includes(invitation.id)
+                                ? "bg-brand-surface-2 text-brand-secondary"
+                                : "bg-brand-accent text-white"
+                            } text-sm px-4 py-2 border border-brand-base rounded-3xl`}
+                            onClick={(e) => {
                              handleInvitation(
                                invitation,
                                invitationsRespond.includes(invitation.id) ? "withdraw" : "accepted"
                              );
                            }}
-                            type="checkbox"
-                            className="h-4 w-4 rounded border-brand-base text-brand-accent focus:ring-brand-accent"
-                          />
+                          >
+                            {invitationsRespond.includes(invitation.id)
+                              ? "Invitation Accepted"
+                              : "Accept Invitation"}
+                          </button>
+                          {/* <input
+                            id={invitation.id}
+                            aria-describedby="workspaces"
+                            name={invitation.id}
+                            value={
+                              invitationsRespond.includes(invitation.id)
+                                ? "Invitation Accepted"
+                                : "Accept Invitation"
+                            }
+                            onClick={(e) => {
+                              handleInvitation(
+                                invitation,
+                                invitationsRespond.includes(invitation.id) ? "withdraw" : "accepted"
+                              );
+                            }}
+                            type="button"
+                            className={`${
+                              invitationsRespond.includes(invitation.id)
+                                ? "bg-brand-surface-2 text-brand-secondary"
+                                : "bg-brand-accent text-white"
+                            } text-sm px-4 py-2 border border-brand-base rounded-3xl`}
+
+                            // className="h-4 w-4 rounded border-brand-base text-brand-accent focus:ring-brand-accent"
+                          /> */}
                        </div>
                      </label>
                    </div>
@ -167,7 +216,7 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
                  </div>
                )}
              </div>
-              <div className="flex w-full items-center justify-center rounded-b-[10px] py-7">
+              <div className="flex w-full items-center justify-center rounded-b-[10px] pt-10">
                <PrimaryButton
                  type="submit"
                  className="w-1/2 text-center"
@ -180,6 +229,16 @@ export const Workspace: React.FC<Props> = ({ setStep, setWorkspace }) => {
              </div>
            </div>
          </Tab.Panel>
+          <Tab.Panel className="h-full">
+            <CreateWorkspaceForm
+              onSubmit={(res) => {
+                setWorkspace(res);
+                setStep(3);
+              }}
+              defaultValues={defaultValues}
+              setDefaultValues={setDefaultValues}
+            />
+          </Tab.Panel>
        </Tab.Panels>
      </Tab.Group>
    </div>
--- a/apps/app/components/project/send-project-invitation-modal.tsx
+++ b/apps/app/components/project/send-project-invitation-modal.tsx
@ -73,9 +73,12 @@ const SendProjectInvitationModal: React.FC<Props> = ({ isOpen, setIsOpen, member
      .inviteProject(workspaceSlug as string, projectId as string, formData)
      .then((response) => {
        setIsOpen(false);
-        mutate(
+        mutate<any[]>(
          PROJECT_INVITATIONS,
-          (prevData: any[]) => [{ ...formData, ...response }, ...(prevData ?? [])],
+          (prevData) => {
+            if (!prevData) return prevData;
+            return [{ ...formData, ...response }, ...(prevData ?? [])];
+          },
          false
        );
        setToastAlert({
--- a/apps/app/components/ui/icon.tsx
+++ b/apps/app/components/ui/icon.tsx
@ -0,0 +1,12 @@
+import React from "react";
+
+type Props = {
+  iconName: string;
+  className?: string;
+};
+
+export const Icon: React.FC<Props> = ({ iconName, className = "" }) => (
+  <span className={`material-symbols-rounded text-lg leading-5 font-light ${className}`}>
+    {iconName}
+  </span>
+);
--- a/apps/app/components/ui/index.ts
+++ b/apps/app/components/ui/index.ts
@ -25,3 +25,4 @@ export * from "./markdown-to-component";
 export * from "./product-updates-modal";
 export * from "./integration-and-import-export-banner";
 export * from "./range-datepicker";
+export * from "./icon";
--- a/apps/app/components/workspace/create-workspace-form.tsx
+++ b/apps/app/components/workspace/create-workspace-form.tsx
@ -99,13 +99,9 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
  );

  return (
-    <form
-      className="flex w-full items-center justify-center"
-      onSubmit={handleSubmit(handleCreateWorkspace)}
-    >
-      <div className="flex w-full max-w-xl flex-col">
-        <div className="flex flex-col rounded-[10px] bg-brand-base">
-          <div className="flex flex-col justify-between gap-3 px-4 py-7">
+    <form className="flex h-full w-full flex-col" onSubmit={handleSubmit(handleCreateWorkspace)}>
+      <div className="divide-y h-[255px]">
+        <div className="flex flex-col justify-between gap-3.5 px-7 pb-3.5">
          <div className="flex flex-col items-start justify-center gap-2.5">
            <span className="text-sm">Workspace name</span>
            <Input
@ -157,7 +153,7 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
          </div>
        </div>

-          <div className="flex flex-col items-start justify-center gap-2.5 border-t border-brand-base px-4 py-7">
+        <div className="flex flex-col items-start justify-center gap-2.5 border-t border-brand-base px-7 pt-3.5 ">
          <span className="text-sm">How large is your company?</span>
          <div className="w-full">
            <Controller
@ -191,8 +187,9 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
            )}
          </div>
        </div>
+      </div>

-          <div className="flex w-full items-center justify-center rounded-b-[10px] py-7">
+      <div className="flex w-full items-center justify-center rounded-b-[10px] pt-10">
        <PrimaryButton
          type="submit"
          className="flex w-1/2 items-center justify-center text-center"
@ -202,8 +199,6 @@ export const CreateWorkspaceForm: React.FC<Props> = ({
          {isSubmitting ? "Creating..." : "Create Workspace"}
        </PrimaryButton>
      </div>
-        </div>
-      </div>
    </form>
  );
 };
--- a/apps/app/components/workspace/sidebar-dropdown.tsx
+++ b/apps/app/components/workspace/sidebar-dropdown.tsx
@ -67,11 +67,13 @@ export const WorkspaceSidebarDropdown = () => {
  };

  const handleSignOut = async () => {
-    router.push("/signin").then(() => {
-      mutateUser();
-    });
-
-    await authenticationService.signOut().catch(() =>
+    await authenticationService
+      .signOut()
+      .then(() => {
+        mutateUser(undefined);
+        router.push("/");
+      })
+      .catch(() =>
        setToastAlert({
          type: "error",
          title: "Error!",
@ -137,8 +139,8 @@ export const WorkspaceSidebarDropdown = () => {
          border border-brand-base bg-brand-surface-2 shadow-lg focus:outline-none"
          >
            <div className="flex flex-col items-start justify-start gap-3 p-3">
-              <div className="text-sm text-brand-secondary">{user?.email}</div>
-              <span className="text-sm font-semibold text-brand-secondary">Workspace</span>
+              <div className="text-sm text-gray-500">{user?.email}</div>
+              <span className="text-sm font-semibold text-gray-500">Workspace</span>
              {workspaces ? (
                <div className="flex h-full w-full flex-col items-start justify-start gap-3.5">
                  {workspaces.length > 0 ? (
--- a/apps/app/components/workspace/single-invitation.tsx
+++ b/apps/app/components/workspace/single-invitation.tsx
@ -1,4 +1,5 @@
 // next
+import { getFirstCharacters, truncateText } from "helpers/string.helper";
 import Image from "next/image";
 // react
 import { useState } from "react";
@ -22,9 +23,7 @@ const SingleInvitation: React.FC<Props> = ({
    <>
      <li>
        <label
-          className={`group relative flex cursor-pointer items-start space-x-3 border-2 border-transparent px-4 py-4 ${
-            isChecked ? "rounded-lg border-theme" : ""
-          }`}
+          className={`group relative flex cursor-pointer items-start space-x-3 border-2 border-transparent py-4`}
          htmlFor={invitation.id}
        >
          <div className="flex-shrink-0">
@ -38,35 +37,36 @@ const SingleInvitation: React.FC<Props> = ({
                  alt={invitation.workspace.name}
                />
              ) : (
-                <span className="flex h-full w-full items-center justify-center rounded bg-gray-700 p-4 uppercase text-white">
-                  {invitation.workspace.name.charAt(0)}
+                <span className="flex h-full w-full items-center justify-center rounded-xl bg-gray-700 p-4 uppercase text-white">
+                  {getFirstCharacters(invitation.workspace.name)}
                </span>
              )}
            </span>
          </div>
          <div className="min-w-0 flex-1">
-            <div className="text-sm font-medium text-brand-base">{invitation.workspace.name}</div>
+            <div className="text-sm font-medium">{truncateText(invitation.workspace.name, 30)}</div>
            <p className="text-sm text-brand-secondary">
              Invited by {invitation.workspace.owner.first_name}
            </p>
          </div>
          <div className="flex-shrink-0 self-center">
-            <input
-              id={invitation.id}
-              aria-describedby="workspaces"
-              name={invitation.id}
-              checked={invitationsRespond.includes(invitation.id)}
-              value={invitation.workspace.name}
-              onChange={(e) => {
+            <button
+              className={`${
+                invitationsRespond.includes(invitation.id)
+                  ? "bg-brand-surface-2 text-brand-secondary"
+                  : "bg-brand-accent text-white"
+              } text-sm px-4 py-2 border border-brand-base rounded-3xl`}
+              onClick={(e) => {
                handleInvitation(
                  invitation,
                  invitationsRespond.includes(invitation.id) ? "withdraw" : "accepted"
                );
-                setIsChecked(e.target.checked);
              }}
-              type="checkbox"
-              className="h-4 w-4 rounded border-brand-base text-brand-accent focus:ring-indigo-500"
-            />
+            >
+              {invitationsRespond.includes(invitation.id)
+                ? "Invitation Accepted"
+                : "Accept Invitation"}
+            </button>
          </div>
        </label>
      </li>
--- a/apps/app/helpers/string.helper.ts
+++ b/apps/app/helpers/string.helper.ts
@ -109,3 +109,12 @@ export const generateRandomColor = (string: string): string => {

  return randomColor;
 };
+
+export const getFirstCharacters = (str: string) => {
+  const words = str.trim().split(" ");
+  if (words.length === 1) {
+    return words[0].charAt(0);
+  } else {
+    return words[0].charAt(0) + words[1].charAt(0);
+  }
+};
--- a/apps/app/hooks/use-user-auth.tsx
+++ b/apps/app/hooks/use-user-auth.tsx
@ -0,0 +1,107 @@
+import { useEffect, useState } from "react";
+// next imports
+import { useRouter } from "next/router";
+// swr
+import useSWR from "swr";
+// keys
+import { CURRENT_USER } from "constants/fetch-keys";
+// services
+import userService from "services/user.service";
+import workspaceService from "services/workspace.service";
+// types
+import type { IWorkspace, ICurrentUserResponse } from "types";
+
+const useUserAuth = (routeAuth: "sign-in" | "onboarding" | "admin" | null = "admin") => {
+  const router = useRouter();
+  const [isRouteAccess, setIsRouteAccess] = useState(true);
+
+  const {
+    data: user,
+    isLoading,
+    error,
+    mutate,
+  } = useSWR<ICurrentUserResponse>(CURRENT_USER, () => userService.currentUser());
+
+  useEffect(() => {
+    const handleWorkSpaceRedirection = async () => {
+      workspaceService.userWorkspaces().then(async (userWorkspaces) => {
+        const lastActiveWorkspace = userWorkspaces.find(
+          (workspace: IWorkspace) => workspace.id === user?.last_workspace_id
+        );
+        if (lastActiveWorkspace) {
+          router.push(`/${lastActiveWorkspace.slug}`);
+          return;
+        } else if (userWorkspaces.length > 0) {
+          router.push(`/${userWorkspaces[0].slug}`);
+          return;
+        } else {
+          const invitations = await workspaceService.userWorkspaceInvitations();
+          if (invitations.length > 0) {
+            router.push(`/invitations`);
+            return;
+          } else {
+            router.push(`/create-workspace`);
+            return;
+          }
+        }
+      });
+    };
+
+    const handleUserRouteAuthentication = async () => {
+      console.log("user", user);
+
+      if (user && user.is_active) {
+        if (routeAuth === "sign-in") {
+          if (user.is_onboarded) handleWorkSpaceRedirection();
+          else {
+            router.push("/onboarding");
+            return;
+          }
+        } else if (routeAuth === "onboarding") {
+          if (user.is_onboarded) handleWorkSpaceRedirection();
+          else {
+            setIsRouteAccess(() => false);
+            return;
+          }
+        } else {
+          if (!user.is_onboarded) {
+            router.push("/onboarding");
+            return;
+          } else {
+            setIsRouteAccess(() => false);
+            return;
+          }
+        }
+      } else {
+        // user is not active and we can redirect to no access page
+        // router.push("/no-access");
+        // remove token
+        return;
+      }
+    };
+
+    if (!isLoading) {
+      setIsRouteAccess(() => true);
+      if (user) handleUserRouteAuthentication();
+      else {
+        if (routeAuth === "sign-in") {
+          setIsRouteAccess(() => false);
+          return;
+        } else {
+          router.push("/");
+          return;
+        }
+      }
+    }
+  }, [user, isLoading, routeAuth, router]);
+
+  return {
+    isLoading: isRouteAccess,
+    user: error ? undefined : user,
+    mutateUser: mutate,
+    assignedIssuesLength: user?.assigned_issues ?? 0,
+    workspaceInvitesLength: user?.workspace_invites ?? 0,
+  };
+};
+
+export default useUserAuth;
--- a/apps/app/hooks/use-user.tsx
+++ b/apps/app/hooks/use-user.tsx
@ -1,13 +1,55 @@
-import { useContext } from "react";
+import { useEffect } from "react";
+import { useRouter } from "next/router";
+import useSWR from "swr";
+// services
+import userService from "services/user.service";
+// constants
+import { CURRENT_USER } from "constants/fetch-keys";
+// types
+import type { ICurrentUserResponse, IUser } from "types";

-// context
-import { UserContext } from "contexts/user.context";
+export default function useUser({ redirectTo = "", redirectIfFound = false, options = {} } = {}) {
+  const router = useRouter();
+  // API to fetch user information
+  const { data, isLoading, error, mutate } = useSWR<ICurrentUserResponse>(
+    CURRENT_USER,
+    () => userService.currentUser(),
+    options
+  );

-const useUser = () => {
-  // context
-  const contextData = useContext(UserContext);
+  const user = error ? undefined : data;
+  // console.log("useUser", user);

-  return { ...contextData };
+  useEffect(() => {
+    // if no redirect needed, just return (example: already on /dashboard)
+    // if user data not yet there (fetch in progress, logged in or not) then don't do anything yet
+    if (!redirectTo || !user) return;
+
+    if (
+      // If redirectTo is set, redirect if the user was not found.
+      (redirectTo && !redirectIfFound) ||
+      // If redirectIfFound is also set, redirect if the user was found
+      (redirectIfFound && user)
+    ) {
+      router.push(redirectTo);
+      return;
+      // const nextLocation = router.asPath.split("?next=")[1];
+      // if (nextLocation) {
+      //   router.push(nextLocation as string);
+      //   return;
+      // } else {
+      //   router.push("/");
+      //   return;
+      // }
+    }
+  }, [user, redirectIfFound, redirectTo, router]);
+
+  return {
+    user,
+    isUserLoading: isLoading,
+    mutateUser: mutate,
+    userError: error,
+    assignedIssuesLength: user?.assigned_issues ?? 0,
+    workspaceInvitesLength: user?.workspace_invites ?? 0,
  };
-
-export default useUser;
+}
--- a/apps/app/layouts/auth-layout/user-authorization-wrapper.tsx
+++ b/apps/app/layouts/auth-layout/user-authorization-wrapper.tsx
@ -32,7 +32,7 @@ export const UserAuthorizationLayout: React.FC<Props> = ({ children }) => {
  if (error) {
    const redirectTo = router.asPath;

-    router.push(`/signin?next=${redirectTo}`);
+    router.push(`/?next=${redirectTo}`);
    return null;
  }

--- a/apps/app/lib/auth.ts
+++ b/apps/app/lib/auth.ts
@ -104,7 +104,7 @@ export const homePageRedirect = async (cookie?: string) => {
  if (!user)
    return {
      redirect: {
-        destination: "/signin",
+        destination: "/",
        permanent: false,
      },
    };
--- a/apps/app/package.json
+++ b/apps/app/package.json
@ -48,7 +48,7 @@
    "react-markdown": "^8.0.7",
    "recharts": "^2.3.2",
    "remirror": "^2.0.23",
-    "swr": "^1.3.0",
+    "swr": "^2.1.3",
    "tlds": "^1.238.0",
    "uuid": "^9.0.0"
  },
--- a/apps/app/pages/[workspaceSlug]/me/profile/index.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/profile/index.tsx
@ -8,7 +8,7 @@ import { Controller, useForm } from "react-hook-form";
 import fileService from "services/file.service";
 import userService from "services/user.service";
 // hooks
-import useUser from "hooks/use-user";
+import useUserAuth from "hooks/use-user-auth";
 import useToast from "hooks/use-toast";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
@ -50,7 +50,7 @@ const Profile: NextPage = () => {
  } = useForm<IUser>({ defaultValues });

  const { setToastAlert } = useToast();
-  const { user: myProfile, mutateUser } = useUser();
+  const { user: myProfile, mutateUser } = useUserAuth();

  useEffect(() => {
    reset({ ...defaultValues, ...myProfile });
--- a/apps/app/pages/[workspaceSlug]/me/profile/preferences.tsx
+++ b/apps/app/pages/[workspaceSlug]/me/profile/preferences.tsx
@ -2,7 +2,7 @@ import { useEffect, useState } from "react";
 import { useTheme } from "next-themes";

 // hooks
-import useUser from "hooks/use-user";
+import useUserAuth from "hooks/use-user-auth";
 // layouts
 import { WorkspaceAuthorizationLayout } from "layouts/auth-layout";
 import SettingsNavbar from "layouts/settings-navbar";
@ -15,7 +15,7 @@ import { BreadcrumbItem, Breadcrumbs } from "components/breadcrumbs";
 import { ICustomTheme } from "types";

 const ProfilePreferences = () => {
-  const { user: myProfile } = useUser();
+  const { user: myProfile } = useUserAuth();
  const { theme } = useTheme();
  const [customThemeSelectorOptions, setCustomThemeSelectorOptions] = useState(false);
  const [preLoadedData, setPreLoadedData] = useState<ICustomTheme | null>(null);
--- a/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
+++ b/apps/app/pages/[workspaceSlug]/projects/[projectId]/issues/[issueId].tsx
@ -78,12 +78,15 @@ const IssueDetailsPage: NextPage = () => {
    async (formData: Partial<IIssue>) => {
      if (!workspaceSlug || !projectId || !issueId) return;

-      mutate(
+      mutate<IIssue>(
        ISSUE_DETAILS(issueId as string),
-        (prevData: IIssue) => ({
+        (prevData) => {
+          if (!prevData) return prevData;
+          return {
            ...prevData,
            ...formData,
-        }),
+          };
+        },
        false
      );

--- a/apps/app/pages/_app.tsx
+++ b/apps/app/pages/_app.tsx
@ -44,31 +44,14 @@ Router.events.on("routeChangeComplete", NProgress.done);

 function MyApp({ Component, pageProps }: AppProps) {
  return (
-    <ThemeProvider themes={THEMES} defaultTheme="light">
-      <UserProvider>
+    // <UserProvider>
    <ToastContextProvider>
      <ThemeContextProvider>
-            <CrispWithNoSSR />{" "}
-            <Head>
-              <title>{SITE_TITLE}</title>
-              <meta property="og:site_name" content={SITE_NAME} />
-              <meta property="og:title" content={SITE_TITLE} />
-              <meta property="og:url" content={SITE_URL} />
-              <meta name="description" content={SITE_DESCRIPTION} />
-              <meta property="og:description" content={SITE_DESCRIPTION} />
-              <meta name="keywords" content={SITE_KEYWORDS} />
-              <meta name="twitter:site" content={`@${TWITTER_USER_NAME}`} />
-              <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png" />
-              <link rel="icon" type="image/png" sizes="32x32" href="/favicon/favicon-32x32.png" />
-              <link rel="icon" type="image/png" sizes="16x16" href="/favicon/favicon-16x16.png" />
-              <link rel="manifest" href="/site.webmanifest.json" />
-              <link rel="shortcut icon" href="/favicon/favicon.ico" />
-            </Head>
+        <CrispWithNoSSR />
        <Component {...pageProps} />
      </ThemeContextProvider>
    </ToastContextProvider>
-      </UserProvider>
-    </ThemeProvider>
+    // </UserProvider>
  );
 }

--- a/apps/app/pages/_error.tsx
+++ b/apps/app/pages/_error.tsx
@ -26,7 +26,7 @@ const CustomErrorComponent = () => {
          message: "Failed to sign out. Please try again.",
        })
      )
-      .finally(() => router.push("/signin"));
+      .finally(() => router.push("/"));
  };

  return (
--- a/apps/app/pages/create-workspace.tsx
+++ b/apps/app/pages/create-workspace.tsx
@ -2,7 +2,10 @@ import React from "react";

 import { useRouter } from "next/router";
 import Image from "next/image";
-
+// hooks
+import useUser from "hooks/use-user";
+// components
+import { OnboardingLogo } from "components/onboarding";
 // layouts
 import DefaultLayout from "layouts/default-layout";
 import { UserAuthorizationLayout } from "layouts/auth-layout/user-authorization-wrapper";
@ -21,13 +24,24 @@ const CreateWorkspace: NextPage = () => {
    company_size: null,
  };

+  const { user } = useUser();
  return (
    <UserAuthorizationLayout>
      <DefaultLayout>
-        <div className="grid h-full place-items-center p-5">
-          <div className="w-full space-y-4">
-            <div className="mb-8 text-center">
-              <Image src={Logo} height="50" alt="Plane Logo" />
+        <div className="relative grid h-full place-items-center p-5">
+          <div className="h-full flex flex-col items-center 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>
+
+            <div className="flex h-[366px] w-full max-w-xl flex-col justify-between rounded-[10px] bg-brand-base shadow-md">
+              <div className="flex items-center justify-start gap-3 px-7 pt-7 pb-3.5 text-gray-8 text-sm">
+                <div className="flex flex-col gap-2 justify-center ">
+                  <h3 className="text-base font-semibold text-brand-base">Create Workspace</h3>
+                  <p className="text-sm text-brand-secondary">
+                    Create or join the workspace to get started with Plane.
+                  </p>
+                </div>
              </div>
              <CreateWorkspaceForm
                defaultValues={defaultValues}
@ -36,6 +50,12 @@ const CreateWorkspace: NextPage = () => {
              />
            </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>
    </UserAuthorizationLayout>
  );
--- a/apps/app/pages/index.tsx
+++ b/apps/app/pages/index.tsx
@ -1,66 +1,116 @@
-import { useEffect } from "react";
-
-import Router from "next/router";
-
+import React from "react";
+// next imports
+import Image from "next/image";
+// next types
+import type { NextPage } from "next";
+// layouts
+import DefaultLayout from "layouts/default-layout";
+// hooks
+import useUserAuth from "hooks/use-user-auth";
+import useToast from "hooks/use-toast";
 // services
-import userService from "services/user.service";
-import workspaceService from "services/workspace.service";
+import authenticationService from "services/authentication.service";
+// social auth buttons
+import {
+  GoogleLoginButton,
+  GithubLoginButton,
+  EmailCodeForm,
+  EmailPasswordForm,
+} from "components/account";
 // ui
 import { Spinner } from "components/ui";
-// types
-import type { NextPage } from "next";
+// icons
+import Logo from "public/logo.png";

-const redirectUserTo = async () => {
-  const user = await userService
-    .currentUser()
-    .then((res) => res)
-    .catch(() => {
-      Router.push("/signin");
-      return;
-    });
+const HomePage: NextPage = () => {
+  const { user, isLoading, mutateUser } = useUserAuth("sign-in");

-  if (!user) {
-    Router.push("/signin");
-    return;
-  } else if (!user.user.is_onboarded) {
-    Router.push("/onboarding");
-    return;
-  } else {
-    const userWorkspaces = await workspaceService.userWorkspaces();
+  const { setToastAlert } = useToast();

-    const lastActiveWorkspace = userWorkspaces.find(
-      (workspace) => workspace.id === user.user.last_workspace_id
+  const handleGoogleSignIn = async ({ clientId, credential }: any) => {
+    try {
+      if (clientId && credential) {
+        mutateUser(
+          await authenticationService.socialAuth({
+            medium: "google",
+            credential,
+            clientId,
+          })
        );
-
-    if (lastActiveWorkspace) {
-      Router.push(`/${lastActiveWorkspace.slug}`);
-      return;
-    } else if (userWorkspaces.length > 0) {
-      Router.push(`/${userWorkspaces[0].slug}`);
-      return;
      } else {
-      const invitations = await workspaceService.userWorkspaceInvitations();
-      if (invitations.length > 0) {
-        Router.push(`/invitations`);
-        return;
-      } else {
-        Router.push(`/create-workspace`);
-        return;
-      }
+        throw Error("Cant find credentials");
      }
+    } catch (error) {
+      console.log(error);
+      setToastAlert({
+        title: "Error signing in!",
+        type: "error",
+        message: "Something went wrong. Please try again later or contact the support team.",
+      });
    }
  };

-const Home: NextPage = () => {
-  useEffect(() => {
-    redirectUserTo();
-  }, []);
+  const handleGithubSignIn = async (credential: string) => {
+    try {
+      if (process.env.NEXT_PUBLIC_GITHUB_ID && credential) {
+        mutateUser(
+          await authenticationService.socialAuth({
+            medium: "github",
+            credential,
+            clientId: process.env.NEXT_PUBLIC_GITHUB_ID,
+          })
+        );
+      } else {
+        throw Error("Cant find credentials");
+      }
+    } catch (error) {
+      console.log(error);
+      setToastAlert({
+        title: "Error signing in!",
+        type: "error",
+        message: "Something went wrong. Please try again later or contact the support team.",
+      });
+    }
+  };

  return (
+    <DefaultLayout>
+      {isLoading ? (
        <div className="grid h-screen place-items-center">
          <Spinner />
        </div>
+      ) : (
+        <div className="flex h-screen w-full items-center justify-center overflow-auto bg-gray-50">
+          <div className="flex min-h-full w-full flex-col justify-center py-12 px-6 lg:px-8">
+            <div className="flex flex-col gap-10 sm:mx-auto sm:w-full sm:max-w-md">
+              <div className="flex flex-col items-center justify-center gap-10">
+                <Image src={Logo} height={80} width={80} alt="Plane Web Logo" />
+                <div className="text-center text-xl font-medium text-black">
+                  Sign In to your Plane Account
+                </div>
+              </div>
+
+              <div className="flex flex-col rounded-[10px] bg-white  shadow-md">
+                {parseInt(process.env.NEXT_PUBLIC_ENABLE_OAUTH || "0") ? (
+                  <>
+                    <EmailCodeForm />
+                    <div className="flex flex-col gap-3 py-5 px-5 border-t items-center justify-center border-gray-300 ">
+                      <GoogleLoginButton handleSignIn={handleGoogleSignIn} />
+                      <GithubLoginButton handleSignIn={handleGithubSignIn} />
+                    </div>
+                  </>
+                ) : (
+                  <>
+                    <EmailPasswordForm />
+                  </>
+                )}
+              </div>
+            </div>
+          </div>
+        </div>
+      )}
+    </DefaultLayout>
  );
 };

-export default Home;
+export default HomePage;
--- a/apps/app/pages/invitations.tsx
+++ b/apps/app/pages/invitations.tsx
@ -15,6 +15,7 @@ import DefaultLayout from "layouts/default-layout";
 import { UserAuthorizationLayout } from "layouts/auth-layout/user-authorization-wrapper";
 // components
 import SingleInvitation from "components/workspace/single-invitation";
+import { OnboardingLogo } from "components/onboarding";
 // ui
 import { Spinner, EmptySpace, EmptySpaceItem, SecondaryButton, PrimaryButton } from "components/ui";
 // icons
@ -81,25 +82,26 @@ const OnBoard: NextPage = () => {
  return (
    <UserAuthorizationLayout>
      <DefaultLayout>
-        <div className="flex min-h-full flex-col items-center justify-center p-4 sm:p-0">
-          {user && (
-            <div className="mb-10 w-96 rounded-lg bg-brand-accent/20 p-2 text-brand-accent">
-              <p className="text-center text-sm">logged in as {user.email}</p>
+        <div className="relative grid h-full place-items-center p-5">
+          <div className="h-full flex flex-col items-center 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>
-          )}

-          <div className="w-full rounded-lg p-8 md:w-2/3 lg:w-1/3">
+            <div className="flex h-[436px] w-full max-w-xl rounded-[10px] p-7 bg-brand-base shadow-md">
              {invitations && workspaces ? (
                invitations.length > 0 ? (
-                <div>
-                  <h2 className="text-lg font-medium">Workspace Invitations</h2>
-                  <p className="mt-1 text-sm text-brand-secondary">
-                    Select invites that you want to accept.
+                  <div className="flex w-full flex-col gap-3 justify-between">
+                    <div className="flex flex-col gap-2 justify-center ">
+                      <h3 className="text-base font-semibold text-brand-base">
+                        Workspace Invitations
+                      </h3>
+                      <p className="text-sm text-brand-secondary">
+                        Create or join the workspace to get started with Plane.
                      </p>
-                  <ul
-                    role="list"
-                    className="mt-6 divide-y divide-brand-base border-t border-b border-brand-base"
-                  >
+                    </div>
+
+                    <ul role="list" className="h-[255px] w-full overflow-y-auto">
                      {invitations.map((invitation) => (
                        <SingleInvitation
                          key={invitation.id}
@ -109,7 +111,8 @@ const OnBoard: NextPage = () => {
                        />
                      ))}
                    </ul>
-                  <div className="mt-6 flex items-center gap-2">
+
+                    <div className="flex items-center gap-3">
                      <Link href="/">
                        <a className="w-full">
                          <SecondaryButton className="w-full">Go Home</SecondaryButton>
@ -163,6 +166,11 @@ const OnBoard: NextPage = () => {
              )}
            </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>
    </UserAuthorizationLayout>
  );
--- a/apps/app/pages/onboarding.tsx
+++ b/apps/app/pages/onboarding.tsx
@ -1,14 +1,15 @@
 import { useState } from "react";

 import Image from "next/image";
-import { useRouter } from "next/router";
+import Router, { useRouter } from "next/router";

 import { mutate } from "swr";

 // services
 import userService from "services/user.service";
+import workspaceService from "services/workspace.service";
 // hooks
-import useUser from "hooks/use-user";
+import useUserAuth from "hooks/use-user-auth";
 // layouts
 import DefaultLayout from "layouts/default-layout";
 import { UserAuthorizationLayout } from "layouts/auth-layout/user-authorization-wrapper";
@ -38,15 +39,17 @@ const Onboarding: NextPage = () => {

  const router = useRouter();

-  const { user } = useUser();
+  const { user } = useUserAuth("onboarding");
+
+  console.log("user", user);

  return (
    <UserAuthorizationLayout>
      <DefaultLayout>
-        <div className="grid h-full place-items-center p-5">
+        <div className="relative grid h-full place-items-center p-5">
          {step <= 3 ? (
-            <div className="w-full">
-              <div className="mb-8 flex items-center justify-center text-center">
+            <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 ? (
@ -59,7 +62,7 @@ const Onboarding: NextPage = () => {
            </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-10 text-center shadow-md">
+              <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 ? (
@ -80,7 +83,7 @@ const Onboarding: NextPage = () => {
                      if (step === 8) {
                        userService
                          .updateUserOnBoard({ userRole })
-                          .then(() => {
+                          .then(async () => {
                            mutate<ICurrentUserResponse>(
                              CURRENT_USER,
                              (prevData) => {
@ -96,7 +99,28 @@ const Onboarding: NextPage = () => {
                              },
                              false
                            );
-                            router.push("/");
+                            const userWorkspaces = await workspaceService.userWorkspaces();
+
+                            const lastActiveWorkspace = userWorkspaces.find(
+                              (workspace) => workspace.id === user?.last_workspace_id
+                            );
+
+                            if (lastActiveWorkspace) {
+                              Router.push(`/${lastActiveWorkspace.slug}`);
+                              return;
+                            } else if (userWorkspaces.length > 0) {
+                              Router.push(`/${userWorkspaces[0].slug}`);
+                              return;
+                            } else {
+                              const invitations = await workspaceService.userWorkspaceInvitations();
+                              if (invitations.length > 0) {
+                                Router.push(`/invitations`);
+                                return;
+                              } else {
+                                Router.push(`/create-workspace`);
+                                return;
+                              }
+                            }
                          })
                          .catch((err) => {
                            console.log(err);
@ -110,6 +134,10 @@ const Onboarding: NextPage = () => {
              </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>
    </UserAuthorizationLayout>
--- a/apps/app/pages/signin.tsx
+++ b/apps/app/pages/signin.tsx
@ -1,135 +0,0 @@
-import React, { useCallback, useState } from "react";
-import { useRouter } from "next/router";
-import Image from "next/image";
-// hooks
-import useUser from "hooks/use-user";
-import useToast from "hooks/use-toast";
-// services
-import authenticationService from "services/authentication.service";
-// layouts
-import DefaultLayout from "layouts/default-layout";
-// social button
-import {
-  GoogleLoginButton,
-  GithubLoginButton,
-  EmailSignInForm,
-  EmailPasswordForm,
-} from "components/account";
-// ui
-import { Spinner } from "components/ui";
-// icons
-import Logo from "public/logo.png";
-// types
-import type { NextPage } from "next";
-
-const SignInPage: NextPage = () => {
-  // router
-  const router = useRouter();
-  // user hook
-  const { mutateUser } = useUser();
-  // states
-  const [isLoading, setLoading] = useState(false);
-
-  const { setToastAlert } = useToast();
-
-  const onSignInSuccess = useCallback(async () => {
-    setLoading(true);
-    await mutateUser();
-    const nextLocation = router.asPath.split("?next=")[1];
-    if (nextLocation) await router.push(nextLocation as string);
-    else await router.push("/");
-  }, [mutateUser, router]);
-
-  const handleGoogleSignIn = ({ clientId, credential }: any) => {
-    if (clientId && credential) {
-      setLoading(true);
-      authenticationService
-        .socialAuth({
-          medium: "google",
-          credential,
-          clientId,
-        })
-        .then(async () => {
-          await onSignInSuccess();
-        })
-        .catch((err) => {
-          console.log(err);
-          setToastAlert({
-            title: "Error signing in!",
-            type: "error",
-            message: "Something went wrong. Please try again later or contact the support team.",
-          });
-          setLoading(false);
-        });
-    }
-  };
-
-  const handleGithubSignIn = useCallback(
-    (credential: string) => {
-      setLoading(true);
-      authenticationService
-        .socialAuth({
-          medium: "github",
-          credential,
-          clientId: process.env.NEXT_PUBLIC_GITHUB_ID,
-        })
-        .then(async () => {
-          await onSignInSuccess();
-        })
-        .catch((err) => {
-          console.log(err);
-          setToastAlert({
-            title: "Error signing in!",
-            type: "error",
-            message: "Something went wrong. Please try again later or contact the support team.",
-          });
-          setLoading(false);
-        });
-    },
-    [onSignInSuccess, setToastAlert]
-  );
-
-  return (
-    <DefaultLayout>
-      {isLoading ? (
-        <div className="absolute top-0 left-0 z-50 flex h-full w-full flex-col items-center justify-center gap-y-3">
-          <h2 className="text-xl text-brand-base">Signing in. Please wait...</h2>
-          <Spinner />
-        </div>
-      ) : (
-        <div className="flex h-screen w-full items-center justify-center overflow-auto">
-          <div className="flex min-h-full w-full flex-col justify-center py-12 px-6 lg:px-8">
-            <div className="flex flex-col gap-10 sm:mx-auto sm:w-full sm:max-w-md">
-              <div className="flex flex-col items-center justify-center gap-10">
-                <Image src={Logo} height={80} width={80} alt="Plane Web Logo" />
-                <h2 className="text-center text-xl font-medium text-brand-base">
-                  Sign In to your Plane Account
-                </h2>
-              </div>
-
-              <div className="flex flex-col rounded-[10px] bg-brand-base shadow-md">
-                {parseInt(process.env.NEXT_PUBLIC_ENABLE_OAUTH || "0") ? (
-                  <>
-                    <EmailSignInForm handleSuccess={onSignInSuccess} />
-
-                    <div className="flex flex-col items-center justify-center gap-3 border-t border-brand-base py-5 px-5 ">
-                      <GoogleLoginButton handleSignIn={handleGoogleSignIn} />
-
-                      <GithubLoginButton handleSignIn={handleGithubSignIn} />
-                    </div>
-                  </>
-                ) : (
-                  <>
-                    <EmailPasswordForm onSuccess={onSignInSuccess} />
-                  </>
-                )}
-              </div>
-            </div>
-          </div>
-        </div>
-      )}
-    </DefaultLayout>
-  );
-};
-
-export default SignInPage;
--- a/apps/app/pages/workspace-member-invitation/[invitationId].tsx
+++ b/apps/app/pages/workspace-member-invitation/[invitationId].tsx
@ -49,7 +49,7 @@ const WorkspaceInvitation: NextPage = () => {
        if (email === user?.email) {
          router.push("/invitations");
        } else {
-          router.push("/signin");
+          router.push("/");
        }
      })
      .catch((err) => console.error(err));
@ -108,7 +108,7 @@ const WorkspaceInvitation: NextPage = () => {
                Icon={UserIcon}
                title="Sign in to continue"
                action={() => {
-                  router.push("/signin");
+                  router.push("/");
                }}
              />
            ) : (
--- a/apps/app/services/api.service.ts
+++ b/apps/app/services/api.service.ts
@ -9,7 +9,8 @@ axios.interceptors.response.use(
    if (unAuthorizedStatus.includes(status)) {
      Cookies.remove("refreshToken", { path: "/" });
      Cookies.remove("accessToken", { path: "/" });
-      if (window.location.pathname != "/signin") window.location.href = "/signin";
+      if (window.location.pathname != "/")
+        window.location.href = "/?next_url=window.location.pathname";
    }
    return Promise.reject(error);
  }
--- a/apps/app/styles/globals.css
+++ b/apps/app/styles/globals.css
@ -17,9 +17,9 @@
  }

  :root {
-    --color-bg-base: 243, 244, 246;
+    --color-bg-base: 255, 255, 255;
    --color-bg-surface-1: 249, 250, 251;
-    --color-bg-surface-2: 255, 255, 255;
+    --color-bg-surface-2: 243, 244, 246;

    --color-border: 229, 231, 235;
    --color-bg-sidebar: 255, 255, 255;
--- a/apps/app/types/users.d.ts
+++ b/apps/app/types/users.d.ts
@ -41,10 +41,11 @@ export interface ICustomTheme {
  textSecondary: string;
 }

-export interface ICurrentUserResponse {
+export interface ICurrentUserResponse extends IUser {
  assigned_issues: number;
-  user: IUser;
+  // user: IUser;
  workspace_invites: number;
+  is_onboarded: boolean;
 }

 export interface IUserLite {
--- a/yarn.lock
+++ b/yarn.lock
@ -8212,10 +8212,12 @@ svgmoji@^3.2.0:
    "@svgmoji/openmoji" "^3.2.0"
    "@svgmoji/twemoji" "^3.2.0"

-swr@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/swr/-/swr-1.3.0.tgz#c6531866a35b4db37b38b72c45a63171faf9f4e8"
-  integrity sha512-dkghQrOl2ORX9HYrMDtPa7LTVHJjCTeZoB1dqTbnnEDlSvN8JEKpYIYurDfvbQFUUS8Cg8PceFVZNkW0KNNYPw==
+swr@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/swr/-/swr-2.1.3.tgz#ae3608d4dc19f75121e0b51d1982735fbf02f52e"
+  integrity sha512-g3ApxIM4Fjbd6vvEAlW60hJlKcYxHb+wtehogTygrh6Jsw7wNagv9m4Oj5Gq6zvvZw0tcyhVGL9L0oISvl3sUw==
+  dependencies:
+    use-sync-external-store "^1.2.0"

 table@^6.0.9:
  version "6.8.1"
@ -8680,7 +8682,7 @@ use-sidecar@^1.1.2:
    detect-node-es "^1.1.0"
    tslib "^2.0.0"

-use-sync-external-store@1.2.0:
+use-sync-external-store@1.2.0, use-sync-external-store@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/use-sync-external-store/-/use-sync-external-store-1.2.0.tgz#7dbefd6ef3fe4e767a0cf5d7287aacfb5846928a"
  integrity sha512-eEgnFxGQ1Ife9bzYs6VLi8/4X6CObHMw9Qr9tPY43iKwsPw8xE8+EFsf/2cFZ5S3esXgpWgtSCtLNS41F+sKPA==