10000 feat(account): user account page redesign by BryanBerger98 · Pull Request #206 · BryanBerger98/lodge-v2 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

feat(account): user account page redesign #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 28, 2023
Merged

feat(account): user account page redesign #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 132 additions & 0 deletions app/(app)/account/_components/profile/BirthDateButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
'use client';

import { zodResolver } from '@hookform/resolvers/zod';
import { format } from 'date-fns';
import { Loader2, Save } from 'lucide-react';
import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form';
import { z } from 'zod';

import { Button } from '@/components/ui/button';
import ButtonItem from '@/components/ui/Button/ButtonList/ButtonItem';
import DatePickerInput from '@/components/ui/DatePicker/DatePickerInput';
import { Dialog, DialogFooter, DialogHeader, DialogContent, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
import { Form, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import useAuth from '@/context/auth/useAuth';
import useCsrf from '@/context/csrf/useCsrf';
import useErrorToast from '@/hooks/error/useErrorToast';
import { updateAccount } from '@/services/auth.service';
import { ApiError } from '@/utils/api/error';

const BirthDateFormSchema = z.object({ birth_date: z.coerce.date().optional() });

type BirthDateFormValues = z.infer<typeof BirthDateFormSchema>;

export const BirthDateButton = () => {

const [ isLoading, setIsLoading ] = useState(false);
const [ isDialogOpen, setIsDialogOpen ] = useState(false);

const { currentUser, updateCurrentUser } = useAuth();
const { csrfToken } = useCsrf();
const { triggerErrorToast } = useErrorToast();

const form = useForm<BirthDateFormValues>({
resolver: zodResolver(BirthDateFormSchema),
defaultValues: { birth_date: currentUser?.birth_date || undefined },
mode: 'onTouched',
});

useEffect(() => {
if (currentUser) {
form.setValue('birth_date', currentUser?.birth_date || undefined);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ currentUser?.id ]);

const handleOpenDialog = () => setIsDialogOpen(true);

const handleSubmit = async ({ birth_date }: BirthDateFormValues) => {
if (!csrfToken) {
triggerErrorToast({
title: 'Error',
message: 'Invalid CSRF token.',
});
return;
}
try {
setIsLoading(true);
const updatedUser = await updateAccount({ birth_date }, { csrfToken });
await updateCurrentUser(updatedUser);
form.reset({ birth_date: updatedUser.birth_date || undefined });
setIsDialogOpen(false);
} catch (error) {
const apiError = error as ApiError<unknown>;
triggerErrorToast(apiError, form);
} finally {
setIsLoading(false);
}
};

const handleDialogOpenChange = (open: boolean) => {
if (!isLoading) {
setIsDialogOpen(open);
}
};

return (
<>
<Dialog
open={ isDialogOpen }
handleDialogOpenChange }
>
<DialogTrigger asChild>
<ButtonItem
value={ currentUser?.birth_date ? format(currentUser.birth_date, 'dd/MM/yyyy') : null }
handleOpenDialog }
>
Birth date
</ButtonItem>
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<Form { ...form }>
<form form.handleSubmit(handleSubmit) }>
<DialogHeader>
<DialogTitle>Birth date</DialogTitle>
</DialogHeader>
<div className="py-4 space-y-4">
<FormField
control={ form.control }
name="birth_date"
render={ ({ field: { onChange: handleChange, value } }) => (
<FormItem>
<FormLabel>Date de naissance</FormLabel>
<DatePickerInput
selected={ value }
initialFocus
handleChange }
/>
<FormMessage />
</FormItem>
) }
/>
</div>
<DialogFooter>
<Button
className="gap-2"
disabled={ isLoading }
type="submit"
>
{ isLoading ? <Loader2 className="h-4 w-4 animate-spin" /> : <Save size="16" /> }
Save
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
</>
);
};

export default BirthDateButton;
165 changes: 165 additions & 0 deletions app/(app)/account/_components/profile/EmailButton.tsx
View file
Open in desktop
EDBE
Original file line number Diff line number Diff line change
@@ -0,0 +1,165 @@
'use client';

import { zodResolver } from '@hookform/resolvers/zod';
import { Loader2, Save } from 'lucide-react';
import { useEffect, useState } from 'react';
import { useForm } from 'react-hook-form';
import { z } from 'zod';

import { Button } from '@/components/ui/button';
import ButtonItem from '@/components/ui/Button/ButtonList/ButtonItem';
import { Dialog, DialogFooter, DialogHeader, DialogContent, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/components/ui/form';
import { Input } from '@/components/ui/input';
import useAuth from '@/context/auth/useAuth';
import useCsrf from '@/context/csrf/useCsrf';
import useErrorToast from '@/hooks/error/useErrorToast';
import { AuthenticationProvider } from '@/schemas/authentication-provider';
import { updateUserEmail } from '@/services/auth.service';
import { ApiError } from '@/utils/api/error';

const EmailFormSchema = z.object({
email: z.string().email().min(1, 'Required.'),
password: z.string().min(1, 'Required.'),
});

type EmailFormValues = z.infer<typeof EmailFormSchema>;

export const EmailButton = () => {

const [ isLoading, setIsLoading ] = useState(false);
const [ isDialogOpen, setIsDialogOpen ] = useState(false);

const { currentUser, updateCurrentUser } = useAuth();
const { csrfToken } = useCsrf();
const { triggerErrorToast } = useErrorToast();

const form = useForm<EmailFormValues>({
resolver: zodResolver(EmailFormSchema),
defaultValues: {
email: currentUser?.email || '',
password: '',
},
mode: 'onTouched',
});

useEffect(() => {
if (currentUser) {
form.setValue('email', currentUser.email);
form.setValue('password', '');
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [ currentUser?.id ]);

const handleOpenDialog = () => setIsDialogOpen(true);

const handleSubmit = async (values: EmailFormValues) => {
if (!csrfToken) {
triggerErrorToast({
title: 'Error',
message: 'Invalid CSRF token.',
});
return;
}
try {
setIsLoading(true);
const updatedUser = await updateUserEmail(values, { csrfToken });
await updateCurrentUser(updatedUser);
form.reset({
email: updatedUser.email,
password: '',
});
setIsDialogOpen(false);
} catch (error) {
const apiError = error as ApiError<unknown>;
triggerErrorToast(apiError, form);
} finally {
setIsLoading(false);
}
};

const handleDialogOpenChange = (open: boolean) => {
if (!isLoading) {
setIsDialogOpen(open);
}
};

return (
<>
<Dialog
open={ isDialogOpen }
handleDialogOpenChange }
>
<DialogTrigger asChild>
<ButtonItem
disabled={ currentUser?.provider_data !== AuthenticationProvider.EMAIL }
value={ currentUser?.email }
handleOpenDialog }
>
Email
</ButtonItem>
</DialogTrigger>
<DialogContent className="sm:max-w-[425px]">
<Form { ...form }>
<form form.handleSubmit(handleSubmit) }>
<DialogHeader>
<DialogTitle>Email</DialogTitle>
</DialogHeader>
<div className="py-4 space-y-4">
<FormField
control={ form.control }
name="email"
render={ ({ field }) => (
<FormItem>
<FormLabel>Email</FormLabel>
<FormControl>
<Input
placeholder="example@example.com"
type="email"
{ ...field }
/>
</FormControl>
<FormMessage />
</FormItem>
) }
/>
<FormField
control={ form.control }
name="password"
render={ ({ field }) => (
<FormItem>
<FormLabel>Password</FormLabel>
<FormControl>
<Input
placeholder="********"
type="password"
{ ...field }
/>
</FormControl>
<FormDescription>
To update your email, you need to enter your password.
</FormDescription>
<FormMessage />
</FormItem>
) }
/>
</div>
<DialogFooter>
<Button
className="gap-2"
disabled={ isLoading || !form.formState.isDirty || !form.formState.isValid }
type="submit"
>
{ isLoading ? <Loader2 className="h-4 w-4 animate-spin" /> : <Save size="16" /> }
Save
</Button>
</DialogFooter>
</form>
</Form>
</DialogContent>
</Dialog>
</>
);
};

export default EmailButton;
Loading
0