forked from github/plane
chore: space sign in workflow improvement
This commit is contained in:
parent
a0e18e191f
commit
08b0d15350
@ -6,3 +6,4 @@ export * from "./google-login";
|
|||||||
export * from "./onboarding-form";
|
export * from "./onboarding-form";
|
||||||
export * from "./sign-in";
|
export * from "./sign-in";
|
||||||
export * from "./user-logged-in";
|
export * from "./user-logged-in";
|
||||||
|
export * from "./sign-in-forms";
|
||||||
|
130
space/components/accounts/sign-in-forms/create-password.tsx
Normal file
130
space/components/accounts/sign-in-forms/create-password.tsx
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { Controller, useForm } from "react-hook-form";
|
||||||
|
// services
|
||||||
|
import authService from "services/authentication.service";
|
||||||
|
// hooks
|
||||||
|
import useToast from "hooks/use-toast";
|
||||||
|
// ui
|
||||||
|
import { Button, Input } from "@plane/ui";
|
||||||
|
// helpers
|
||||||
|
import { checkEmailValidity } from "helpers/string.helper";
|
||||||
|
// constants
|
||||||
|
import { ESignInSteps } from "components/accounts";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
email: string;
|
||||||
|
handleStepChange: (step: ESignInSteps) => void;
|
||||||
|
handleSignInRedirection: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
type TCreatePasswordFormValues = {
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const defaultValues: TCreatePasswordFormValues = {
|
||||||
|
email: "",
|
||||||
|
password: "",
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CreatePasswordForm: React.FC<Props> = (props) => {
|
||||||
|
const { email, handleSignInRedirection } = props;
|
||||||
|
// toast alert
|
||||||
|
const { setToastAlert } = useToast();
|
||||||
|
// form info
|
||||||
|
const {
|
||||||
|
control,
|
||||||
|
formState: { errors, isSubmitting, isValid },
|
||||||
|
handleSubmit,
|
||||||
|
} = useForm<TCreatePasswordFormValues>({
|
||||||
|
defaultValues: {
|
||||||
|
...defaultValues,
|
||||||
|
email,
|
||||||
|
},
|
||||||
|
mode: "onChange",
|
||||||
|
reValidateMode: "onChange",
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleCreatePassword = async (formData: TCreatePasswordFormValues) => {
|
||||||
|
const payload = {
|
||||||
|
password: formData.password,
|
||||||
|
};
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.setPassword(payload)
|
||||||
|
.then(async () => {
|
||||||
|
setToastAlert({
|
||||||
|
type: "success",
|
||||||
|
title: "Success!",
|
||||||
|
message: "Password created successfully.",
|
||||||
|
});
|
||||||
|
await handleSignInRedirection();
|
||||||
|
})
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
|
||||||
|
Let{"'"}s get a new password
|
||||||
|
</h1>
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit(handleCreatePassword)} className="mt-11 sm:w-96 mx-auto space-y-4">
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="email"
|
||||||
|
rules={{
|
||||||
|
required: "Email is required",
|
||||||
|
validate: (value) => checkEmailValidity(value) || "Email is invalid",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange, ref } }) => (
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
ref={ref}
|
||||||
|
hasError={Boolean(errors.email)}
|
||||||
|
placeholder="orville.wright@firstflight.com"
|
||||||
|
className="w-full h-[46px] text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<div>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="password"
|
||||||
|
rules={{
|
||||||
|
required: "Password is required",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange, ref } }) => (
|
||||||
|
<Input
|
||||||
|
type="password"
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
ref={ref}
|
||||||
|
hasError={Boolean(errors.password)}
|
||||||
|
placeholder="Create password"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<p className="text-xs text-onboarding-text-200 mt-3">
|
||||||
|
Whatever you choose now will be your account{"'"}s password until you change it.
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<Button type="submit" variant="primary" className="w-full" size="xl" disabled={!isValid} loading={isSubmitting}>
|
||||||
|
{isSubmitting ? "Submitting..." : "Go to workspace"}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
148
space/components/accounts/sign-in-forms/email-form.tsx
Normal file
148
space/components/accounts/sign-in-forms/email-form.tsx
Normal file
@ -0,0 +1,148 @@
|
|||||||
|
import React, { useState } from "react";
|
||||||
|
import { Controller, useForm } from "react-hook-form";
|
||||||
|
import { XCircle } from "lucide-react";
|
||||||
|
// services
|
||||||
|
import authService from "services/authentication.service";
|
||||||
|
// hooks
|
||||||
|
import useToast from "hooks/use-toast";
|
||||||
|
// ui
|
||||||
|
import { Button, Input } from "@plane/ui";
|
||||||
|
// helpers
|
||||||
|
import { checkEmailValidity } from "helpers/string.helper";
|
||||||
|
// types
|
||||||
|
import { IEmailCheckData, TEmailCheckTypes } from "types/auth";
|
||||||
|
// constants
|
||||||
|
import { ESignInSteps } from "components/accounts";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
handleStepChange: (step: ESignInSteps) => void;
|
||||||
|
updateEmail: (email: string) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
type TEmailCodeFormValues = {
|
||||||
|
email: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const EmailForm: React.FC<Props> = (props) => {
|
||||||
|
const { handleStepChange, updateEmail } = props;
|
||||||
|
// states
|
||||||
|
const [isCheckingEmail, setIsCheckingEmail] = useState<TEmailCheckTypes | null>(null);
|
||||||
|
|
||||||
|
const { setToastAlert } = useToast();
|
||||||
|
|
||||||
|
const {
|
||||||
|
control,
|
||||||
|
formState: { errors, isValid },
|
||||||
|
handleSubmit,
|
||||||
|
watch,
|
||||||
|
} = useForm<TEmailCodeFormValues>({
|
||||||
|
defaultValues: {
|
||||||
|
email: "",
|
||||||
|
},
|
||||||
|
mode: "onChange",
|
||||||
|
reValidateMode: "onChange",
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleEmailCheck = async (type: TEmailCheckTypes) => {
|
||||||
|
setIsCheckingEmail(type);
|
||||||
|
|
||||||
|
const email = watch("email");
|
||||||
|
|
||||||
|
const payload: IEmailCheckData = {
|
||||||
|
email,
|
||||||
|
type,
|
||||||
|
};
|
||||||
|
|
||||||
|
// update the global email state
|
||||||
|
updateEmail(email);
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.emailCheck(payload)
|
||||||
|
.then((res) => {
|
||||||
|
// if type is magic_code, send the user to magic sign in
|
||||||
|
if (type === "magic_code") handleStepChange(ESignInSteps.UNIQUE_CODE);
|
||||||
|
// if type is password, check if the user has a password set
|
||||||
|
if (type === "password") {
|
||||||
|
// if password is autoset, send them to set new password link
|
||||||
|
if (res.is_password_autoset) handleStepChange(ESignInSteps.SET_PASSWORD_LINK);
|
||||||
|
// if password is not autoset, send them to password form
|
||||||
|
else handleStepChange(ESignInSteps.PASSWORD);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
)
|
||||||
|
.finally(() => setIsCheckingEmail(null));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1 className="text-center text-2xl font-semibold text-onboarding-text-100">Get on your flight deck!</h1>
|
||||||
|
<p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
|
||||||
|
Sign in with the email you used to sign up for Plane
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit(() => {})} className="mt-5 sm:w-96 mx-auto">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="email"
|
||||||
|
rules={{
|
||||||
|
required: "Email is required",
|
||||||
|
validate: (value) => checkEmailValidity(value) || "Email is invalid",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange, ref } }) => (
|
||||||
|
<div className="flex items-center relative rounded-md bg-onboarding-background-200">
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
ref={ref}
|
||||||
|
hasError={Boolean(errors.email)}
|
||||||
|
placeholder="orville.wright@firstflight.com"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
{value.length > 0 && (
|
||||||
|
<XCircle
|
||||||
|
className="h-5 w-5 absolute stroke-custom-text-400 hover:cursor-pointer right-3"
|
||||||
|
onClick={() => onChange("")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="grid grid-cols-2 gap-2.5 mt-4">
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="primary"
|
||||||
|
className="w-full"
|
||||||
|
size="xl"
|
||||||
|
onClick={() => handleEmailCheck("magic_code")}
|
||||||
|
disabled={!isValid}
|
||||||
|
loading={Boolean(isCheckingEmail)}
|
||||||
|
>
|
||||||
|
{isCheckingEmail === "magic_code" ? "Sending code..." : "Send unique code"}
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline-primary"
|
||||||
|
className="w-full"
|
||||||
|
size="xl"
|
||||||
|
onClick={() => handleEmailCheck("password")}
|
||||||
|
disabled={!isValid}
|
||||||
|
loading={Boolean(isCheckingEmail)}
|
||||||
|
>
|
||||||
|
{isCheckingEmail === "password" ? "Loading..." : "Use password"}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
8
space/components/accounts/sign-in-forms/index.ts
Normal file
8
space/components/accounts/sign-in-forms/index.ts
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
export * from "./create-password";
|
||||||
|
export * from "./email-form";
|
||||||
|
export * from "./o-auth-options";
|
||||||
|
export * from "./optional-set-password";
|
||||||
|
export * from "./unique-code";
|
||||||
|
export * from "./password";
|
||||||
|
export * from "./root";
|
||||||
|
export * from "./set-password-link";
|
73
space/components/accounts/sign-in-forms/o-auth-options.tsx
Normal file
73
space/components/accounts/sign-in-forms/o-auth-options.tsx
Normal file
@ -0,0 +1,73 @@
|
|||||||
|
import { observer } from "mobx-react-lite";
|
||||||
|
|
||||||
|
import useSWR from "swr";
|
||||||
|
|
||||||
|
// services
|
||||||
|
import UserService from "services/user.service";
|
||||||
|
import authService from "services/authentication.service";
|
||||||
|
import { AppConfigService } from "services/app-config.service";
|
||||||
|
// hooks
|
||||||
|
import useToast from "hooks/use-toast";
|
||||||
|
// components
|
||||||
|
import { ESignInSteps, GoogleLoginButton } from "components/accounts";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
updateEmail: (email: string) => void;
|
||||||
|
handleStepChange: (step: ESignInSteps) => void;
|
||||||
|
handleSignInRedirection: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
// services
|
||||||
|
const userService = new UserService();
|
||||||
|
const appConfig = new AppConfigService();
|
||||||
|
|
||||||
|
export const OAuthOptions: React.FC<Props> = observer((props) => {
|
||||||
|
const { updateEmail, handleStepChange, handleSignInRedirection } = props;
|
||||||
|
// toast alert
|
||||||
|
const { setToastAlert } = useToast();
|
||||||
|
|
||||||
|
const { data: envConfig } = useSWR("APP_CONFIG", () => appConfig.envConfig());
|
||||||
|
|
||||||
|
const handleGoogleSignIn = async ({ clientId, credential }: any) => {
|
||||||
|
try {
|
||||||
|
if (clientId && credential) {
|
||||||
|
const socialAuthPayload = {
|
||||||
|
medium: "google",
|
||||||
|
credential,
|
||||||
|
clientId,
|
||||||
|
};
|
||||||
|
const response = await authService.socialAuth(socialAuthPayload);
|
||||||
|
|
||||||
|
if (response) {
|
||||||
|
const currentUser = await userService.currentUser();
|
||||||
|
|
||||||
|
updateEmail(currentUser.email);
|
||||||
|
|
||||||
|
if (currentUser.is_password_autoset) handleStepChange(ESignInSteps.OPTIONAL_SET_PASSWORD);
|
||||||
|
else handleSignInRedirection();
|
||||||
|
}
|
||||||
|
} else throw Error("Cant find credentials");
|
||||||
|
} catch (err: any) {
|
||||||
|
setToastAlert({
|
||||||
|
title: "Error signing in!",
|
||||||
|
type: "error",
|
||||||
|
message: err?.error || "Something went wrong. Please try again later or contact the support team.",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="flex sm:w-96 items-center mt-4 mx-auto">
|
||||||
|
<hr className={`border-onboarding-border-100 w-full`} />
|
||||||
|
<p className="text-center text-sm text-onboarding-text-400 mx-3 flex-shrink-0">Or continue with</p>
|
||||||
|
<hr className={`border-onboarding-border-100 w-full`} />
|
||||||
|
</div>
|
||||||
|
<div className="flex flex-col items-center justify-center gap-4 pt-7 sm:flex-row sm:w-96 mx-auto overflow-hidden">
|
||||||
|
{envConfig?.google_client_id && (
|
||||||
|
<GoogleLoginButton clientId={envConfig?.google_client_id} handleSignIn={handleGoogleSignIn} />
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
});
|
@ -0,0 +1,94 @@
|
|||||||
|
import React, { useState } from "react";
|
||||||
|
import { Controller, useForm } from "react-hook-form";
|
||||||
|
// ui
|
||||||
|
import { Button, Input } from "@plane/ui";
|
||||||
|
// helpers
|
||||||
|
import { checkEmailValidity } from "helpers/string.helper";
|
||||||
|
// constants
|
||||||
|
import { ESignInSteps } from "components/accounts";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
email: string;
|
||||||
|
handleStepChange: (step: ESignInSteps) => void;
|
||||||
|
handleSignInRedirection: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const OptionalSetPasswordForm: React.FC<Props> = (props) => {
|
||||||
|
const { email, handleStepChange, handleSignInRedirection } = props;
|
||||||
|
// states
|
||||||
|
const [isGoingToWorkspace, setIsGoingToWorkspace] = useState(false);
|
||||||
|
|
||||||
|
const {
|
||||||
|
control,
|
||||||
|
formState: { errors, isValid },
|
||||||
|
} = useForm({
|
||||||
|
defaultValues: {
|
||||||
|
email,
|
||||||
|
},
|
||||||
|
mode: "onChange",
|
||||||
|
reValidateMode: "onChange",
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleGoToWorkspace = async () => {
|
||||||
|
setIsGoingToWorkspace(true);
|
||||||
|
|
||||||
|
await handleSignInRedirection().finally(() => setIsGoingToWorkspace(false));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">Set a password</h1>
|
||||||
|
<p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
|
||||||
|
If you{"'"}d to do away with codes, set a password here.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form className="mt-5 sm:w-96 mx-auto">
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="email"
|
||||||
|
rules={{
|
||||||
|
required: "Email is required",
|
||||||
|
validate: (value) => checkEmailValidity(value) || "Email is invalid",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange, ref } }) => (
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
ref={ref}
|
||||||
|
hasError={Boolean(errors.email)}
|
||||||
|
placeholder="orville.wright@firstflight.com"
|
||||||
|
className="w-full h-[46px] text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
disabled
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<div className="grid grid-cols-2 gap-2.5 mt-4">
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="primary"
|
||||||
|
onClick={() => handleStepChange(ESignInSteps.CREATE_PASSWORD)}
|
||||||
|
className="w-full"
|
||||||
|
size="xl"
|
||||||
|
disabled={!isValid}
|
||||||
|
>
|
||||||
|
Create password
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="outline-primary"
|
||||||
|
className="w-full"
|
||||||
|
size="xl"
|
||||||
|
onClick={handleGoToWorkspace}
|
||||||
|
disabled={!isValid}
|
||||||
|
loading={isGoingToWorkspace}
|
||||||
|
>
|
||||||
|
{isGoingToWorkspace ? "Going to app..." : "Go to workspace"}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
199
space/components/accounts/sign-in-forms/password.tsx
Normal file
199
space/components/accounts/sign-in-forms/password.tsx
Normal file
@ -0,0 +1,199 @@
|
|||||||
|
import React from "react";
|
||||||
|
import { Controller, useForm } from "react-hook-form";
|
||||||
|
import { XCircle } from "lucide-react";
|
||||||
|
// services
|
||||||
|
import authService from "services/authentication.service";
|
||||||
|
// hooks
|
||||||
|
import useToast from "hooks/use-toast";
|
||||||
|
// ui
|
||||||
|
import { Button, Input } from "@plane/ui";
|
||||||
|
// helpers
|
||||||
|
import { checkEmailValidity } from "helpers/string.helper";
|
||||||
|
// types
|
||||||
|
import { IEmailCheckData, IPasswordSignInData } from "types/auth";
|
||||||
|
// constants
|
||||||
|
import { ESignInSteps } from "components/accounts";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
email: string;
|
||||||
|
updateEmail: (email: string) => void;
|
||||||
|
handleStepChange: (step: ESignInSteps) => void;
|
||||||
|
handleSignInRedirection: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
type TPasswordFormValues = {
|
||||||
|
email: string;
|
||||||
|
password: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const defaultValues: TPasswordFormValues = {
|
||||||
|
email: "",
|
||||||
|
password: "",
|
||||||
|
};
|
||||||
|
|
||||||
|
export const PasswordForm: React.FC<Props> = (props) => {
|
||||||
|
const { email, updateEmail, handleStepChange, handleSignInRedirection } = props;
|
||||||
|
// toast alert
|
||||||
|
const { setToastAlert } = useToast();
|
||||||
|
// form info
|
||||||
|
const {
|
||||||
|
control,
|
||||||
|
formState: { dirtyFields, errors, isSubmitting, isValid },
|
||||||
|
getValues,
|
||||||
|
handleSubmit,
|
||||||
|
reset,
|
||||||
|
setError,
|
||||||
|
} = useForm<TPasswordFormValues>({
|
||||||
|
defaultValues: {
|
||||||
|
...defaultValues,
|
||||||
|
email,
|
||||||
|
},
|
||||||
|
mode: "onChange",
|
||||||
|
reValidateMode: "onChange",
|
||||||
|
});
|
||||||
|
|
||||||
|
const handlePasswordSignIn = async (formData: TPasswordFormValues) => {
|
||||||
|
const payload: IPasswordSignInData = {
|
||||||
|
email: formData.email,
|
||||||
|
password: formData.password,
|
||||||
|
};
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.passwordSignIn(payload)
|
||||||
|
.then(async () => await handleSignInRedirection())
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleEmailCheck = async (formData: TPasswordFormValues) => {
|
||||||
|
const payload: IEmailCheckData = {
|
||||||
|
email: formData.email,
|
||||||
|
type: "password",
|
||||||
|
};
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.emailCheck(payload)
|
||||||
|
.then((res) => {
|
||||||
|
if (res.is_password_autoset) handleStepChange(ESignInSteps.SET_PASSWORD_LINK);
|
||||||
|
else
|
||||||
|
reset({
|
||||||
|
email: formData.email,
|
||||||
|
password: "",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleFormSubmit = async (formData: TPasswordFormValues) => {
|
||||||
|
if (dirtyFields.email) await handleEmailCheck(formData);
|
||||||
|
else await handlePasswordSignIn(formData);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleForgotPassword = async () => {
|
||||||
|
const emailFormValue = getValues("email");
|
||||||
|
|
||||||
|
const isEmailValid = checkEmailValidity(emailFormValue);
|
||||||
|
|
||||||
|
if (!isEmailValid) {
|
||||||
|
setError("email", { message: "Email is invalid" });
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
authService
|
||||||
|
.sendResetPasswordLink({ email: emailFormValue })
|
||||||
|
.then(() => handleStepChange(ESignInSteps.SET_PASSWORD_LINK))
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
|
||||||
|
Get on your flight deck
|
||||||
|
</h1>
|
||||||
|
<form onSubmit={handleSubmit(handleFormSubmit)} className="mt-11 sm:w-96 mx-auto space-y-4">
|
||||||
|
<div>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="email"
|
||||||
|
rules={{
|
||||||
|
required: "Email is required",
|
||||||
|
validate: (value) => checkEmailValidity(value) || "Email is invalid",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange } }) => (
|
||||||
|
<div className="flex items-center relative rounded-md bg-onboarding-background-200">
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
value={value}
|
||||||
|
onChange={(e) => {
|
||||||
|
updateEmail(e.target.value);
|
||||||
|
onChange(e.target.value);
|
||||||
|
}}
|
||||||
|
onBlur={() => {
|
||||||
|
if (dirtyFields.email) handleEmailCheck(getValues());
|
||||||
|
}}
|
||||||
|
hasError={Boolean(errors.email)}
|
||||||
|
placeholder="orville.wright@firstflight.com"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
{value.length > 0 && (
|
||||||
|
<XCircle
|
||||||
|
className="h-5 w-5 absolute stroke-custom-text-400 hover:cursor-pointer right-3"
|
||||||
|
onClick={() => onChange("")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="password"
|
||||||
|
rules={{
|
||||||
|
required: dirtyFields.email ? false : "Password is required",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange } }) => (
|
||||||
|
<Input
|
||||||
|
type="password"
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
hasError={Boolean(errors.password)}
|
||||||
|
placeholder="Enter password"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={handleForgotPassword}
|
||||||
|
className="text-xs font-medium text-right w-full text-custom-primary-100"
|
||||||
|
>
|
||||||
|
Forgot your password?
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<Button type="submit" variant="primary" className="w-full" size="xl" disabled={!isValid} loading={isSubmitting}>
|
||||||
|
{isSubmitting ? "Signing in..." : "Go to workspace"}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
84
space/components/accounts/sign-in-forms/root.tsx
Normal file
84
space/components/accounts/sign-in-forms/root.tsx
Normal file
@ -0,0 +1,84 @@
|
|||||||
|
import React, { useState } from "react";
|
||||||
|
// components
|
||||||
|
import {
|
||||||
|
EmailForm,
|
||||||
|
UniqueCodeForm,
|
||||||
|
PasswordForm,
|
||||||
|
SetPasswordLink,
|
||||||
|
OAuthOptions,
|
||||||
|
OptionalSetPasswordForm,
|
||||||
|
CreatePasswordForm,
|
||||||
|
} from "components/accounts";
|
||||||
|
|
||||||
|
export enum ESignInSteps {
|
||||||
|
EMAIL = "EMAIL",
|
||||||
|
PASSWORD = "PASSWORD",
|
||||||
|
SET_PASSWORD_LINK = "SET_PASSWORD_LINK",
|
||||||
|
UNIQUE_CODE = "UNIQUE_CODE",
|
||||||
|
OPTIONAL_SET_PASSWORD = "OPTIONAL_SET_PASSWORD",
|
||||||
|
CREATE_PASSWORD = "CREATE_PASSWORD",
|
||||||
|
}
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
handleSignInRedirection: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const SignInRoot: React.FC<Props> = (props) => {
|
||||||
|
const { handleSignInRedirection } = props;
|
||||||
|
// states
|
||||||
|
const [signInStep, setSignInStep] = useState<ESignInSteps>(ESignInSteps.EMAIL);
|
||||||
|
const [email, setEmail] = useState("");
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<div className="mx-auto flex flex-col">
|
||||||
|
{signInStep === ESignInSteps.EMAIL && (
|
||||||
|
<EmailForm
|
||||||
|
handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
|
||||||
|
updateEmail={(newEmail) => setEmail(newEmail)}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{signInStep === ESignInSteps.PASSWORD && (
|
||||||
|
<PasswordForm
|
||||||
|
email={email}
|
||||||
|
updateEmail={(newEmail) => setEmail(newEmail)}
|
||||||
|
handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
|
||||||
|
handleSignInRedirection={handleSignInRedirection}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{signInStep === ESignInSteps.SET_PASSWORD_LINK && (
|
||||||
|
<SetPasswordLink email={email} updateEmail={(newEmail) => setEmail(newEmail)} />
|
||||||
|
)}
|
||||||
|
{signInStep === ESignInSteps.UNIQUE_CODE && (
|
||||||
|
<UniqueCodeForm
|
||||||
|
email={email}
|
||||||
|
updateEmail={(newEmail) => setEmail(newEmail)}
|
||||||
|
handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
|
||||||
|
handleSignInRedirection={handleSignInRedirection}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{signInStep === ESignInSteps.OPTIONAL_SET_PASSWORD && (
|
||||||
|
<OptionalSetPasswordForm
|
||||||
|
email={email}
|
||||||
|
handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
|
||||||
|
handleSignInRedirection={handleSignInRedirection}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
{signInStep === ESignInSteps.CREATE_PASSWORD && (
|
||||||
|
<CreatePasswordForm
|
||||||
|
email={email}
|
||||||
|
handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
|
||||||
|
handleSignInRedirection={handleSignInRedirection}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{signInStep !== ESignInSteps.OPTIONAL_SET_PASSWORD && (
|
||||||
|
<OAuthOptions
|
||||||
|
updateEmail={(newEmail) => setEmail(newEmail)}
|
||||||
|
handleStepChange={(step: ESignInSteps) => setSignInStep(step)}
|
||||||
|
handleSignInRedirection={handleSignInRedirection}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
120
space/components/accounts/sign-in-forms/set-password-link.tsx
Normal file
120
space/components/accounts/sign-in-forms/set-password-link.tsx
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
import React, { useState } from "react";
|
||||||
|
import { Controller, useForm } from "react-hook-form";
|
||||||
|
import { XCircle } from "lucide-react";
|
||||||
|
// services
|
||||||
|
import authService from "services/authentication.service";
|
||||||
|
// hooks
|
||||||
|
import useToast from "hooks/use-toast";
|
||||||
|
// ui
|
||||||
|
import { Button, Input } from "@plane/ui";
|
||||||
|
// helpers
|
||||||
|
import { checkEmailValidity } from "helpers/string.helper";
|
||||||
|
// types
|
||||||
|
import { IEmailCheckData } from "types/auth";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
email: string;
|
||||||
|
updateEmail: (email: string) => void;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const SetPasswordLink: React.FC<Props> = (props) => {
|
||||||
|
const { email, updateEmail } = props;
|
||||||
|
// states
|
||||||
|
const [isSendingNewLink, setIsSendingNewLink] = useState(false);
|
||||||
|
|
||||||
|
const { setToastAlert } = useToast();
|
||||||
|
|
||||||
|
const {
|
||||||
|
control,
|
||||||
|
formState: { errors, isValid },
|
||||||
|
watch,
|
||||||
|
} = useForm({
|
||||||
|
defaultValues: {
|
||||||
|
email,
|
||||||
|
},
|
||||||
|
mode: "onChange",
|
||||||
|
reValidateMode: "onChange",
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleSendNewLink = async () => {
|
||||||
|
setIsSendingNewLink(true);
|
||||||
|
|
||||||
|
const payload: IEmailCheckData = {
|
||||||
|
email: watch("email"),
|
||||||
|
type: "password",
|
||||||
|
};
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.emailCheck(payload)
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
)
|
||||||
|
.finally(() => setIsSendingNewLink(false));
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
|
||||||
|
Get on your flight deck!
|
||||||
|
</h1>
|
||||||
|
<p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
|
||||||
|
We have sent a link to <span className="font-medium text-custom-primary-100">{email},</span> so you can set a
|
||||||
|
password
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form className="mt-5 sm:w-96 mx-auto">
|
||||||
|
<div className="space-y-1">
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="email"
|
||||||
|
rules={{
|
||||||
|
required: "Email is required",
|
||||||
|
validate: (value) => checkEmailValidity(value) || "Email is invalid",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange, ref } }) => (
|
||||||
|
<div className="flex items-center relative rounded-md bg-onboarding-background-200">
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
value={value}
|
||||||
|
onChange={(e) => {
|
||||||
|
updateEmail(e.target.value);
|
||||||
|
onChange(e.target.value);
|
||||||
|
}}
|
||||||
|
ref={ref}
|
||||||
|
hasError={Boolean(errors.email)}
|
||||||
|
placeholder="orville.wright@firstflight.com"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
{value.length > 0 && (
|
||||||
|
<XCircle
|
||||||
|
className="h-5 w-5 absolute stroke-custom-text-400 hover:cursor-pointer right-3"
|
||||||
|
onClick={() => onChange("")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div className="mt-4">
|
||||||
|
<Button
|
||||||
|
type="button"
|
||||||
|
variant="primary"
|
||||||
|
className="w-full"
|
||||||
|
size="xl"
|
||||||
|
onClick={handleSendNewLink}
|
||||||
|
disabled={!isValid}
|
||||||
|
loading={isSendingNewLink}
|
||||||
|
>
|
||||||
|
{isSendingNewLink ? "Sending new link..." : "Get link again"}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
231
space/components/accounts/sign-in-forms/unique-code.tsx
Normal file
231
space/components/accounts/sign-in-forms/unique-code.tsx
Normal file
@ -0,0 +1,231 @@
|
|||||||
|
import React, { useState } from "react";
|
||||||
|
import { Controller, useForm } from "react-hook-form";
|
||||||
|
import { CornerDownLeft, XCircle } from "lucide-react";
|
||||||
|
// services
|
||||||
|
import authService from "services/authentication.service";
|
||||||
|
import UserService from "services/user.service";
|
||||||
|
// hooks
|
||||||
|
import useToast from "hooks/use-toast";
|
||||||
|
import useTimer from "hooks/use-timer";
|
||||||
|
// ui
|
||||||
|
import { Button, Input } from "@plane/ui";
|
||||||
|
// helpers
|
||||||
|
import { checkEmailValidity } from "helpers/string.helper";
|
||||||
|
// types
|
||||||
|
import { IEmailCheckData, IMagicSignInData } from "types/auth";
|
||||||
|
// constants
|
||||||
|
import { ESignInSteps } from "components/accounts";
|
||||||
|
|
||||||
|
type Props = {
|
||||||
|
email: string;
|
||||||
|
updateEmail: (email: string) => void;
|
||||||
|
handleStepChange: (step: ESignInSteps) => void;
|
||||||
|
handleSignInRedirection: () => Promise<void>;
|
||||||
|
};
|
||||||
|
|
||||||
|
type TUniqueCodeFormValues = {
|
||||||
|
email: string;
|
||||||
|
token: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
const defaultValues: TUniqueCodeFormValues = {
|
||||||
|
email: "",
|
||||||
|
token: "",
|
||||||
|
};
|
||||||
|
|
||||||
|
// services
|
||||||
|
const userService = new UserService();
|
||||||
|
|
||||||
|
export const UniqueCodeForm: React.FC<Props> = (props) => {
|
||||||
|
const { email, updateEmail, handleStepChange, handleSignInRedirection } = props;
|
||||||
|
// states
|
||||||
|
const [isRequestingNewCode, setIsRequestingNewCode] = useState(false);
|
||||||
|
// toast alert
|
||||||
|
const { setToastAlert } = useToast();
|
||||||
|
// timer
|
||||||
|
const { timer: resendTimerCode, setTimer: setResendCodeTimer } = useTimer();
|
||||||
|
// form info
|
||||||
|
const {
|
||||||
|
control,
|
||||||
|
formState: { dirtyFields, errors, isSubmitting, isValid },
|
||||||
|
getValues,
|
||||||
|
handleSubmit,
|
||||||
|
reset,
|
||||||
|
} = useForm<TUniqueCodeFormValues>({
|
||||||
|
defaultValues: {
|
||||||
|
...defaultValues,
|
||||||
|
email,
|
||||||
|
},
|
||||||
|
mode: "onChange",
|
||||||
|
reValidateMode: "onChange",
|
||||||
|
});
|
||||||
|
|
||||||
|
const handleUniqueCodeSignIn = async (formData: TUniqueCodeFormValues) => {
|
||||||
|
const payload: IMagicSignInData = {
|
||||||
|
email: formData.email,
|
||||||
|
key: `magic_${formData.email}`,
|
||||||
|
token: formData.token,
|
||||||
|
};
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.magicSignIn(payload)
|
||||||
|
.then(async () => {
|
||||||
|
const currentUser = await userService.currentUser();
|
||||||
|
|
||||||
|
if (currentUser.is_password_autoset) handleStepChange(ESignInSteps.OPTIONAL_SET_PASSWORD);
|
||||||
|
else await handleSignInRedirection();
|
||||||
|
})
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleSendNewLink = async (formData: TUniqueCodeFormValues) => {
|
||||||
|
const payload: IEmailCheckData = {
|
||||||
|
email: formData.email,
|
||||||
|
type: "magic_code",
|
||||||
|
};
|
||||||
|
|
||||||
|
await authService
|
||||||
|
.emailCheck(payload)
|
||||||
|
.then(() => {
|
||||||
|
setToastAlert({
|
||||||
|
type: "success",
|
||||||
|
title: "Success!",
|
||||||
|
message: "A new unique code has been sent to your email.",
|
||||||
|
});
|
||||||
|
|
||||||
|
reset({
|
||||||
|
email: formData.email,
|
||||||
|
token: "",
|
||||||
|
});
|
||||||
|
})
|
||||||
|
.catch((err) =>
|
||||||
|
setToastAlert({
|
||||||
|
type: "error",
|
||||||
|
title: "Error!",
|
||||||
|
message: err?.error ?? "Something went wrong. Please try again.",
|
||||||
|
})
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleFormSubmit = async (formData: TUniqueCodeFormValues) => {
|
||||||
|
if (dirtyFields.email) await handleSendNewLink(formData);
|
||||||
|
else await handleUniqueCodeSignIn(formData);
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleRequestNewCode = async () => {
|
||||||
|
setIsRequestingNewCode(true);
|
||||||
|
|
||||||
|
await handleSendNewLink(getValues())
|
||||||
|
.then(() => setResendCodeTimer(30))
|
||||||
|
.finally(() => setIsRequestingNewCode(false));
|
||||||
|
};
|
||||||
|
|
||||||
|
const isRequestNewCodeDisabled = isRequestingNewCode || resendTimerCode > 0;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<h1 className="text-center text-2xl sm:text-2.5xl font-semibold text-onboarding-text-100">
|
||||||
|
Moving to the runway
|
||||||
|
</h1>
|
||||||
|
<p className="text-center text-sm text-onboarding-text-200 px-20 mt-3">
|
||||||
|
Paste the code you got at <span className="font-medium text-custom-primary-100">{email}</span> below.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<form onSubmit={handleSubmit(handleFormSubmit)} className="mt-5 sm:w-96 mx-auto space-y-4">
|
||||||
|
<div>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="email"
|
||||||
|
rules={{
|
||||||
|
required: "Email is required",
|
||||||
|
validate: (value) => checkEmailValidity(value) || "Email is invalid",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange, ref } }) => (
|
||||||
|
<div className="flex items-center relative rounded-md bg-onboarding-background-200">
|
||||||
|
<Input
|
||||||
|
id="email"
|
||||||
|
name="email"
|
||||||
|
type="email"
|
||||||
|
value={value}
|
||||||
|
onChange={(e) => {
|
||||||
|
updateEmail(e.target.value);
|
||||||
|
onChange(e.target.value);
|
||||||
|
}}
|
||||||
|
onBlur={() => {
|
||||||
|
if (dirtyFields.email) handleSendNewLink(getValues());
|
||||||
|
}}
|
||||||
|
ref={ref}
|
||||||
|
hasError={Boolean(errors.email)}
|
||||||
|
placeholder="orville.wright@firstflight.com"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
{value.length > 0 && (
|
||||||
|
<XCircle
|
||||||
|
className="h-5 w-5 absolute stroke-custom-text-400 hover:cursor-pointer right-3"
|
||||||
|
onClick={() => onChange("")}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
{dirtyFields.email && (
|
||||||
|
<button
|
||||||
|
type="submit"
|
||||||
|
className="text-xs text-onboarding-text-300 mt-1.5 flex items-center gap-1 outline-none bg-transparent border-none"
|
||||||
|
>
|
||||||
|
Hit <CornerDownLeft className="h-2.5 w-2.5" /> or <span className="italic">Tab</span> to get a new code
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name="token"
|
||||||
|
rules={{
|
||||||
|
required: dirtyFields.email ? false : "Code is required",
|
||||||
|
}}
|
||||||
|
render={({ field: { value, onChange } }) => (
|
||||||
|
<Input
|
||||||
|
value={value}
|
||||||
|
onChange={onChange}
|
||||||
|
hasError={Boolean(errors.token)}
|
||||||
|
placeholder="gets-sets-flys"
|
||||||
|
className="w-full h-[46px] placeholder:text-onboarding-text-400 border border-onboarding-border-100 pr-12"
|
||||||
|
/>
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
onClick={handleRequestNewCode}
|
||||||
|
className={`text-xs text-right w-full text-onboarding-text-200 ${
|
||||||
|
isRequestNewCodeDisabled ? "" : "hover:text-custom-primary-100"
|
||||||
|
}`}
|
||||||
|
disabled={isRequestNewCodeDisabled}
|
||||||
|
>
|
||||||
|
{resendTimerCode > 0
|
||||||
|
? `Request new code in ${resendTimerCode}s`
|
||||||
|
: isRequestingNewCode
|
||||||
|
? "Requesting new code..."
|
||||||
|
: "Request new code"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<Button
|
||||||
|
type="submit"
|
||||||
|
variant="primary"
|
||||||
|
className="w-full"
|
||||||
|
size="xl"
|
||||||
|
disabled={!isValid || dirtyFields.email}
|
||||||
|
loading={isSubmitting}
|
||||||
|
>
|
||||||
|
{isSubmitting ? "Signing in..." : "Confirm"}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
@ -1,18 +1,117 @@
|
|||||||
|
import { useCallback } from "react";
|
||||||
|
import { useRouter } from "next/router";
|
||||||
|
|
||||||
|
import Link from "next/link";
|
||||||
|
import Image from "next/image";
|
||||||
|
|
||||||
// mobx
|
// mobx
|
||||||
import { observer } from "mobx-react-lite";
|
import { observer } from "mobx-react-lite";
|
||||||
import { useMobxStore } from "lib/mobx/store-provider";
|
import { useMobxStore } from "lib/mobx/store-provider";
|
||||||
// components
|
// components
|
||||||
import { SignInView, UserLoggedIn } from "components/accounts";
|
import { SignInRoot, UserLoggedIn } from "components/accounts";
|
||||||
|
import { Loader } from "@plane/ui";
|
||||||
|
// types
|
||||||
|
import { IUser } from "types/user";
|
||||||
|
import { Lightbulb } from "lucide-react";
|
||||||
|
// images
|
||||||
|
import BluePlaneLogoWithoutText from "public/plane-logos/blue-without-text.png";
|
||||||
|
import signInIssues from "public/onboarding/onboarding-issues.svg";
|
||||||
|
|
||||||
export const LoginView = observer(() => {
|
export const LoginView = observer(() => {
|
||||||
const { user: userStore } = useMobxStore();
|
// store
|
||||||
|
const {
|
||||||
|
user: { currentUser, fetchCurrentUser, loader },
|
||||||
|
} = useMobxStore();
|
||||||
|
// router
|
||||||
|
const router = useRouter();
|
||||||
|
const { next_path } = router.query as { next_path: string };
|
||||||
|
|
||||||
|
const handleSignInRedirection = useCallback(
|
||||||
|
async (user: IUser) => {
|
||||||
|
const isOnboard = user?.is_onboarded || false;
|
||||||
|
|
||||||
|
if (isOnboard) {
|
||||||
|
if (next_path) router.push(next_path);
|
||||||
|
else router.push("/login");
|
||||||
|
} else {
|
||||||
|
if (next_path) router.push(`/onboarding?next_path=${next_path}`);
|
||||||
|
else router.push("/onboarding");
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[router, next_path]
|
||||||
|
);
|
||||||
|
|
||||||
|
const mutateUserInfo = useCallback(async () => {
|
||||||
|
await fetchCurrentUser().then(async (user) => {
|
||||||
|
await handleSignInRedirection(user);
|
||||||
|
});
|
||||||
|
}, [fetchCurrentUser, handleSignInRedirection]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{userStore?.loader ? (
|
{loader ? (
|
||||||
<div className="relative flex h-screen w-screen items-center justify-center">Loading</div> // TODO: Add spinner instead
|
<div className="relative flex h-screen w-screen items-center justify-center">Loading</div> // TODO: Add spinner instead
|
||||||
) : (
|
) : (
|
||||||
<>{userStore.currentUser ? <UserLoggedIn /> : <SignInView />}</>
|
<>
|
||||||
|
{currentUser ? (
|
||||||
|
<UserLoggedIn />
|
||||||
|
) : (
|
||||||
|
<div className={`bg-onboarding-gradient-100 h-full w-full`}>
|
||||||
|
<div className="flex items-center justify-between sm:py-5 px-8 pb-4 sm:px-16 lg:px-28 ">
|
||||||
|
<div className="flex gap-x-2 py-10 items-center">
|
||||||
|
<Image src={BluePlaneLogoWithoutText} height={30} width={30} alt="Plane Logo" className="mr-2" />
|
||||||
|
<span className="font-semibold text-2xl sm:text-3xl">Plane</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="h-full bg-onboarding-gradient-100 md:w-2/3 sm:w-4/5 px-4 pt-4 rounded-t-md mx-auto shadow-sm border-x border-t border-custom-border-200 ">
|
||||||
|
<div className="px-7 sm:px-0 bg-onboarding-gradient-200 h-full pt-24 pb-56 rounded-t-md overflow-auto">
|
||||||
|
{!true ? (
|
||||||
|
<div className="pt-10 mx-auto flex justify-center">
|
||||||
|
<div>
|
||||||
|
<Loader className="space-y-4 w-full pb-4 mx-auto">
|
||||||
|
<Loader.Item height="46px" width="360px" />
|
||||||
|
<Loader.Item height="46px" width="360px" />
|
||||||
|
</Loader>
|
||||||
|
|
||||||
|
<Loader className="space-y-4 w-full pt-4 mx-auto">
|
||||||
|
<Loader.Item height="46px" width="360px" />
|
||||||
|
<Loader.Item height="46px" width="360px" />
|
||||||
|
</Loader>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<>
|
||||||
|
<SignInRoot handleSignInRedirection={mutateUserInfo} />
|
||||||
|
|
||||||
|
<div className="flex py-2 bg-onboarding-background-100 border border-onboarding-border-200 mx-auto rounded-[3.5px] sm:w-96 mt-16">
|
||||||
|
<Lightbulb className="h-7 w-7 mr-2 mx-3" />
|
||||||
|
<p className="text-sm text-left text-onboarding-text-100">
|
||||||
|
Pages gets a facelift! Write anything and use Galileo to help you start.{" "}
|
||||||
|
<Link
|
||||||
|
href="https://plane.so/changelog"
|
||||||
|
target="_blank"
|
||||||
|
rel="noopener noreferrer"
|
||||||
|
className="font-medium text-sm underline hover:cursor-pointer"
|
||||||
|
>
|
||||||
|
Learn more
|
||||||
|
</Link>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<div className="flex justify-center border border-onboarding-border-200 sm:w-96 sm:h-52 object-cover mt-8 mx-auto rounded-md bg-onboarding-background-100 ">
|
||||||
|
<Image
|
||||||
|
src={signInIssues}
|
||||||
|
alt="Plane Issues"
|
||||||
|
className={`flex object-cover rounded-md bg-custom-primary-70 `}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</>
|
||||||
)}
|
)}
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
@ -3,3 +3,4 @@ export * from "./deactivate-account-modal";
|
|||||||
export * from "./github-login-button";
|
export * from "./github-login-button";
|
||||||
export * from "./google-login";
|
export * from "./google-login";
|
||||||
export * from "./email-signup-form";
|
export * from "./email-signup-form";
|
||||||
|
export * from "./sign-in-forms";
|
||||||
|
Loading…
Reference in New Issue
Block a user