From 2e8effb0f9365ad15271f794ce18556c211068d2 Mon Sep 17 00:00:00 2001
From: TajwarSaiyeed <rjabid36@gmail.com>
Date: Fri, 1 Sep 2023 11:12:11 +0600
Subject: [PATCH] bug fix | update

---
 app/(auth)/signin/page.tsx  | 193 ++++++++++++++++++++++++------------
 app/(root)/profile/page.tsx | 139 +++++++++++++-------------
 app/api/users/route.ts      |   3 +-
 3 files changed, 199 insertions(+), 136 deletions(-)

diff --git a/app/(auth)/signin/page.tsx b/app/(auth)/signin/page.tsx
index e5598b9..a8ce7a1 100644
--- a/app/(auth)/signin/page.tsx
+++ b/app/(auth)/signin/page.tsx
@@ -3,23 +3,32 @@
 import {useState} from "react";
 import toast from "react-hot-toast";
 import Loader from "@/app/components/Loader/Loader";
-import { useSession, signIn } from "next-auth/react";
-import { redirect, useRouter } from "next/navigation";
+import {useSession, signIn} from "next-auth/react";
+import {redirect, useRouter} from "next/navigation";
 import LockOutlinedIcon from '@mui/icons-material/LockOutlined';
-import { createTheme, ThemeProvider } from '@mui/material/styles';
-import { FieldValues, SubmitHandler, useForm } from "react-hook-form";
-import {Avatar, Button, CssBaseline, TextField, Box, Typography,Container} from '@mui/material/';
+import {createTheme, ThemeProvider} from '@mui/material/styles';
+import {FieldValues, SubmitHandler, useForm} from "react-hook-form";
+import {Avatar, Button, CssBaseline, TextField, Box, Typography, Container} from '@mui/material/';
 
 const defaultTheme = createTheme();
 
 export default function SignInPage() {
     const [isSubmitting, setIsSubmitting] = useState<boolean>(false);
-    const { status } = useSession();
+
+    const [testUser, setTestUser] = useState<{
+        email: string,
+        password: string
+    }>({
+        email: "",
+        password: ""
+    })
+
+    const {status} = useSession();
 
     const {
         register,
         handleSubmit,
-        formState: { errors },
+        formState: {errors},
     } = useForm<FieldValues>({
         defaultValues: {
             email: "",
@@ -48,7 +57,7 @@ export default function SignInPage() {
     };
 
     if (status === "loading") {
-        return <Loader />;
+        return <Loader/>;
     }
 
     if (status === "authenticated") {
@@ -57,70 +66,122 @@ export default function SignInPage() {
 
     return (
         <ThemeProvider theme={defaultTheme}>
-        <Container component="main" maxWidth="xs">
-            <CssBaseline />
-            <Box
-                sx={{
-                    marginTop: 8,
-                    display: 'flex',
-                    flexDirection: 'column',
-                    alignItems: 'center',
-                }}
-            >
-                <Avatar sx={{ m: 1, backgroundColor: 'secondary.main' }}>
-                    <LockOutlinedIcon />
-                </Avatar>
-                <Typography component="h1" variant="h5">
-                    Sign in
-                </Typography>
-                <Box component="form" noValidate onSubmit={handleSubmit(handleSignIn)} sx={{ mt: 1 }}>
-                    <TextField
-                        margin="normal"
-                        required
-                        fullWidth
-                        id="email"
-                        label="Email Address"
-                        autoComplete="email"
-                        autoFocus
-                        {...register("email", {
-                            required: "This field is required",
-                        })}
-                        error={!!errors?.email?.message}
-                        helperText={
-                            errors.email && typeof errors.email.message === "string"
-                                ? errors.email.message
-                                : null
-                        }
-                    />
+            <Container component="main" maxWidth="sm">
+                <CssBaseline/>
+                <Box
+                    sx={{
+                        marginTop: 8,
+                        display: 'flex',
+                        flexDirection: 'column',
+                        alignItems: 'center',
+                    }}
+                >
+                    <Avatar sx={{m: 1, backgroundColor: 'secondary.main'}}>
+                        <LockOutlinedIcon/>
+                    </Avatar>
+                    <Typography component="h1" variant="h5">
+                        Sign in
+                    </Typography>
+                    <Box component="form" noValidate onSubmit={handleSubmit(handleSignIn)} sx={{mt: 1}}>
+                        <TextField
+                            margin="normal"
+                            value={testUser.email}
+                            required
+                            fullWidth
+                            id="email"
+                            label="Email Address"
+                            autoComplete="email"
+                            autoFocus
+                            {...register("email", {
+                                required: "This field is required",
+                            })}
+                            error={!!errors?.email?.message}
+                            helperText={
+                                errors?.email && typeof errors?.email?.message === "string"
+                                    ? errors?.email?.message
+                                    : null
+                            }
+                        />
+
+                        <TextField
+                            margin="normal"
+                            value={testUser.password}
+                            required
+                            fullWidth
+                            label="Password"
+                            type="password"
+                            id="password"
+                            autoComplete="current-password"
+                            {...register("password", {
+                                required: "This field is required",
+                            })}
+                            error={!!errors?.password?.message}
+                            helperText={
+                                errors?.password && typeof errors?.password?.message === "string"
+                                    ? errors?.password?.message
+                                    : null
+                            }
+                        />
 
-                    <TextField
-                        margin="normal"
-                        required
-                        fullWidth
-                        label="Password"
-                        type="password"
-                        id="password"
-                        autoComplete="current-password"
-                        {...register("password", { required: "This field is required" })}
-                        error={!!errors?.password?.message}
-                        helperText={
-                            errors.password && typeof errors.password.message === "string"
-                                ? errors.password.message
-                                : null
-                        }
-                    />
+                        <Button
+                            type="submit"
+                            fullWidth
+                            variant="contained"
+                            sx={{mt: 3, mb: 2}}
+                        >
+                            {isSubmitting ? "Signing in..." : "Sign in"}
+                        </Button>
+                    </Box>
+                </Box>
 
+                <Box sx={{
+                    display: "flex",
+                    justifyContent: "center",
+                    alignItems: "center",
+                    gap: 1,
+                    flexDirection: {
+                        xs: "column",
+                        sm: "row"
+                    }
+                }}>
+                    <Button
+                        onClick={() => {
+                            setTestUser({
+                                email: "rjabid36@gmail.com",
+                                password: '123456Abid'
+                            })
+                        }}
+                        size={'small'}
+                        variant="contained"
+                    >
+                        Role as Admin
+                    </Button>
+                    <Button
+                        onClick={() => {
+                            setTestUser({
+                                email: "test1@gmail.com",
+                                password: '123456Abid'
+                            })
+                        }}
+                        size={'small'}
+                        variant="contained"
+                    >
+                        Role as Trainer
+                    </Button>
                     <Button
-                        type="submit"
-                        fullWidth
+                        onClick={() => {
+                            setTestUser({
+                                email: "test2@gmail.com",
+                                password: '123456Abid'
+                            })
+                        }}
+                        size={'small'}
                         variant="contained"
-                        sx={{ mt: 3, mb: 2 }}
                     >
-                        {isSubmitting ? "Signing in..." : "Sign in"}
+                        Role as User
                     </Button>
                 </Box>
-            </Box>
-        </Container>
-    </ThemeProvider>
+            </Container>
+        </ThemeProvider>
     );
 }
\ No newline at end of file
diff --git a/app/(root)/profile/page.tsx b/app/(root)/profile/page.tsx
index 0ecaf1d..4160376 100644
--- a/app/(root)/profile/page.tsx
+++ b/app/(root)/profile/page.tsx
@@ -346,80 +346,81 @@ export default function ProfilePage() {
                                             <TableCell>
                                                 Password
                                             </TableCell>
-                                            <TableCell>
-                                                <TextField
-                                                    size={'small'}
-                                                    type="password"
-                                                    fullWidth
-                                                    id="password"
-                                                    label="Enter Password"
-                                                    autoFocus
-                                                    error={!!errors?.password?.message}
-                                                    helperText={
-                                                        errors?.password && typeof errors?.password?.message === "string"
-                                                            ? errors?.password?.message
-                                                            : null
-                                                    }
-                                                    {...register("password", {
-                                                        minLength: {
-                                                            value: 8,
-                                                            message: "Password must have at least 8 characters",
-                                                        },
-                                                        maxLength: {
-                                                            value: 20,
-                                                            message: "Password must have at most 20 characters",
-                                                        },
-                                                        pattern: {
-                                                            value: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,20}$/,
-                                                            message:
-                                                                "Password must contain at least one uppercase letter, one lowercase letter and one number",
-                                                        },
-                                                    })}
-                                                    onChange={(e) => {
-                                                        setValue("password", e.target.value);
-                                                        if (getValues("confirmPassword") === e.target.value) {
-                                                            setPasswordsMatch(true);
-                                                        } else {
-                                                            setPasswordsMatch(false);
-                                                        }
-                                                    }}
-                                                />
-                                            </TableCell>
+                                            <TableCell>Disabled for demo</TableCell>
+                                            {/*    <TextField*/}
+                                            {/*        size={'small'}*/}
+                                            {/*        type="password"*/}
+                                            {/*        fullWidth*/}
+                                            {/*        id="password"*/}
+                                            {/*        label="Enter Password"*/}
+                                            {/*        autoFocus*/}
+                                            {/*        error={!!errors?.password?.message}*/}
+                                            {/*        helperText={*/}
+                                            {/*            errors?.password && typeof errors?.password?.message === "string"*/}
+                                            {/*                ? errors?.password?.message*/}
+                                            {/*                : null*/}
+                                            {/*        }*/}
+                                            {/*        {...register("password", {*/}
+                                            {/*            minLength: {*/}
+                                            {/*                value: 8,*/}
+                                            {/*                message: "Password must have at least 8 characters",*/}
+                                            {/*            },*/}
+                                            {/*            maxLength: {*/}
+                                            {/*                value: 20,*/}
+                                            {/*                message: "Password must have at most 20 characters",*/}
+                                            {/*            },*/}
+                                            {/*            pattern: {*/}
+                                            {/*                value: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[a-zA-Z\d]{8,20}$/,*/}
+                                            {/*                message:*/}
+                                            {/*                    "Password must contain at least one uppercase letter, one lowercase letter and one number",*/}
+                                            {/*            },*/}
+                                            {/*        })}*/}
+                                            {/*        onChange={(e) => {*/}
+                                            {/*            setValue("password", e.target.value);*/}
+                                            {/*            if (getValues("confirmPassword") === e.target.value) {*/}
+                                            {/*                setPasswordsMatch(true);*/}
+                                            {/*            } else {*/}
+                                            {/*                setPasswordsMatch(false);*/}
+                                            {/*            }*/}
+                                            {/*        }}*/}
+                                            {/*    />*/}
+                                            {/*</TableCell>*/}
                                         </TableRow>
                                         <TableRow>
                                             <TableCell>
                                                 Confirm Password
                                             </TableCell>
-                                            <TableCell>
-                                                <TextField
-                                                    size={'small'}
-                                                    type="password"
-                                                    fullWidth
-                                                    id="confirm-password"
-                                                    label="Re-enter Password"
-                                                    autoFocus
-                                                    error={!!errors?.confirmPassword?.message || !passwordsMatch}
-                                                    helperText={
-                                                        !passwordsMatch
-                                                            ? "Passwords do not match"
-                                                            : (errors?.confirmPassword && typeof errors?.confirmPassword?.message === "string"
-                                                                ? errors?.confirmPassword?.message
-                                                                : null)
-                                                    }
-                                                    {...register("confirmPassword", {
-                                                        validate: (value) =>
-                                                            value === getValues("password") || "Passwords do not match",
-                                                    })}
-                                                    onChange={(e) => {
-                                                        setValue("confirmPassword", e.target.value);
-                                                        if (getValues("password") === e.target.value) {
-                                                            setPasswordsMatch(true);
-                                                        } else {
-                                                            setPasswordsMatch(false);
-                                                        }
-                                                    }}
-                                                />
-                                            </TableCell>
+                                            <TableCell>Disabled for demo</TableCell>
+                                            {/*<TableCell>*/}
+                                            {/*    <TextField*/}
+                                            {/*        size={'small'}*/}
+                                            {/*        type="password"*/}
+                                            {/*        fullWidth*/}
+                                            {/*        id="confirm-password"*/}
+                                            {/*        label="Re-enter Password"*/}
+                                            {/*        autoFocus*/}
+                                            {/*        error={!!errors?.confirmPassword?.message || !passwordsMatch}*/}
+                                            {/*        helperText={*/}
+                                            {/*            !passwordsMatch*/}
+                                            {/*                ? "Passwords do not match"*/}
+                                            {/*                : (errors?.confirmPassword && typeof errors?.confirmPassword?.message === "string"*/}
+                                            {/*                    ? errors?.confirmPassword?.message*/}
+                                            {/*                    : null)*/}
+                                            {/*        }*/}
+                                            {/*        {...register("confirmPassword", {*/}
+                                            {/*            validate: (value) =>*/}
+                                            {/*                value === getValues("password") || "Passwords do not match",*/}
+                                            {/*        })}*/}
+                                            {/*        onChange={(e) => {*/}
+                                            {/*            setValue("confirmPassword", e.target.value);*/}
+                                            {/*            if (getValues("password") === e.target.value) {*/}
+                                            {/*                setPasswordsMatch(true);*/}
+                                            {/*            } else {*/}
+                                            {/*                setPasswordsMatch(false);*/}
+                                            {/*            }*/}
+                                            {/*        }}*/}
+                                            {/*    />*/}
+                                            {/*</TableCell>*/}
                                         </TableRow>
                                     </TableBody>
                                 </Table>
diff --git a/app/api/users/route.ts b/app/api/users/route.ts
index 849d98e..7e80989 100644
--- a/app/api/users/route.ts
+++ b/app/api/users/route.ts
@@ -302,7 +302,8 @@ export async function PATCH(req: Request) {
                     height: body.height !== "" ? body.height : user.height,
                     goal: body.goal !== "" ? body.goal : user.goal,
                     level: body.level !== "" ? body.level :  user.level,
-                    hashedPassword
+                    hashedPassword,
+                    isActive: body.isActive
                 }
             })