-
Notifications
You must be signed in to change notification settings - Fork 878
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(auth): enhance login modal with email login
Signed-off-by: Innei <tukon479@gmail.com>
- Loading branch information
Showing
4 changed files
with
230 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,198 @@ | ||
| import { Button } from "@follow/components/ui/button/index.js" | ||
| import { | ||
| Form, | ||
| FormControl, | ||
| FormField, | ||
| FormItem, | ||
| FormLabel, | ||
| FormMessage, | ||
| } from "@follow/components/ui/form/index.js" | ||
| import { Input } from "@follow/components/ui/input/Input.js" | ||
| import { loginHandler, signUp } from "@follow/shared/auth" | ||
| import { zodResolver } from "@hookform/resolvers/zod" | ||
| import { useForm } from "react-hook-form" | ||
| import { useTranslation } from "react-i18next" | ||
| import { Link } from "react-router" | ||
| import { toast } from "sonner" | ||
| import { z } from "zod" | ||
|
|
||
| import { useCurrentModal, useModalStack } from "~/components/ui/modal/stacked/hooks" | ||
|
|
||
| async function onSubmit(values: z.infer<typeof formSchema>) { | ||
| const res = await loginHandler("credential", "browser", values) | ||
| if (res?.error) { | ||
| toast.error(res.error.message) | ||
| return | ||
| } | ||
| window.location.reload() | ||
| } | ||
| const formSchema = z.object({ | ||
| email: z.string().email(), | ||
| password: z.string().max(128), | ||
| }) | ||
| export function LoginWithPassword() { | ||
| const { t } = useTranslation("app") | ||
| const form = useForm<z.infer<typeof formSchema>>({ | ||
| resolver: zodResolver(formSchema), | ||
| defaultValues: { | ||
| email: "", | ||
| password: "", | ||
| }, | ||
| }) | ||
| const { isValid } = form.formState | ||
|
|
||
| const { present } = useModalStack() | ||
| const { dismiss } = useCurrentModal() | ||
|
|
||
| return ( | ||
| <Form {...form}> | ||
| <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4"> | ||
| <FormField | ||
| control={form.control} | ||
| name="email" | ||
| render={({ field }) => ( | ||
| <FormItem> | ||
| <FormLabel>{t("login.email")}</FormLabel> | ||
| <FormControl> | ||
| <Input type="email" {...field} /> | ||
| </FormControl> | ||
| <FormMessage /> | ||
| </FormItem> | ||
| )} | ||
| /> | ||
| <FormField | ||
| control={form.control} | ||
| name="password" | ||
| render={({ field }) => ( | ||
| <FormItem className="mt-4"> | ||
| <FormLabel>{t("login.password")}</FormLabel> | ||
| <FormControl> | ||
| <Input type="password" {...field} /> | ||
| </FormControl> | ||
| <FormMessage /> | ||
| </FormItem> | ||
| )} | ||
| /> | ||
| <Link to="/forget-password" className="block py-1 text-xs text-accent hover:underline"> | ||
| {t("login.forget_password.note")} | ||
| </Link> | ||
| <Button | ||
| type="submit" | ||
| className="w-full" | ||
| buttonClassName="text-base !mt-3" | ||
| disabled={!isValid} | ||
| > | ||
| {t("login.continueWith", { provider: t("words.email") })} | ||
| </Button> | ||
| <Button | ||
| buttonClassName="!mt-3 text-base" | ||
| className="w-full" | ||
| variant="outline" | ||
| onClick={() => { | ||
| dismiss() | ||
| present({ | ||
| content: RegisterForm, | ||
| title: t("register.label", { app_name: APP_NAME }), | ||
| }) | ||
| }} | ||
| > | ||
| {t("login.signUp")} | ||
| </Button> | ||
| </form> | ||
| </Form> | ||
| ) | ||
| } | ||
|
|
||
| const registerFormSchema = z | ||
| .object({ | ||
| email: z.string().email(), | ||
| password: z.string().min(8).max(128), | ||
| confirmPassword: z.string(), | ||
| }) | ||
| .refine((data) => data.password === data.confirmPassword, { | ||
| message: "Passwords don't match", | ||
| path: ["confirmPassword"], | ||
| }) | ||
|
|
||
| function RegisterForm() { | ||
| const { t } = useTranslation("app") | ||
|
|
||
| const form = useForm<z.infer<typeof registerFormSchema>>({ | ||
| resolver: zodResolver(registerFormSchema), | ||
| defaultValues: { | ||
| email: "", | ||
| password: "", | ||
| confirmPassword: "", | ||
| }, | ||
| }) | ||
|
|
||
| const { isValid } = form.formState | ||
|
|
||
| function onSubmit(values: z.infer<typeof registerFormSchema>) { | ||
| return signUp.email({ | ||
| email: values.email, | ||
| password: values.password, | ||
| name: values.email.split("@")[0], | ||
| callbackURL: "/", | ||
| fetchOptions: { | ||
| onSuccess() { | ||
| window.location.reload() | ||
| }, | ||
| onError(context) { | ||
| toast.error(context.error.message) | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| return ( | ||
| <div className="relative"> | ||
| <Form {...form}> | ||
| <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4"> | ||
| <FormField | ||
| control={form.control} | ||
| name="email" | ||
| render={({ field }) => ( | ||
| <FormItem> | ||
| <FormLabel>{t("register.email")}</FormLabel> | ||
| <FormControl> | ||
| <Input type="email" {...field} /> | ||
| </FormControl> | ||
| <FormMessage /> | ||
| </FormItem> | ||
| )} | ||
| /> | ||
| <FormField | ||
| control={form.control} | ||
| name="password" | ||
| render={({ field }) => ( | ||
| <FormItem> | ||
| <FormLabel>{t("register.password")}</FormLabel> | ||
| <FormControl> | ||
| <Input type="password" {...field} /> | ||
| </FormControl> | ||
| <FormMessage /> | ||
| </FormItem> | ||
| )} | ||
| /> | ||
| <FormField | ||
| control={form.control} | ||
| name="confirmPassword" | ||
| render={({ field }) => ( | ||
| <FormItem> | ||
| <FormLabel>{t("register.confirm_password")}</FormLabel> | ||
| <FormControl> | ||
| <Input type="password" {...field} /> | ||
| </FormControl> | ||
| <FormMessage /> | ||
| </FormItem> | ||
| )} | ||
| /> | ||
| <Button disabled={!isValid} type="submit" className="w-full"> | ||
| {t("register.submit")} | ||
| </Button> | ||
| </form> | ||
| </Form> | ||
| </div> | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters