migration

src/components/wrappers/dashboard/profile/Avatar/AvatarWithUpload.tsx

@@ -1,32 +1,27 @@
-"use client"
-import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";
-import {User} from "@prisma/client";
-import {UploadIcon} from "lucide-react";
-import {toast} from "sonner";
-import {uploadImageAction} from "@/features/upload/public/upload.action";
-import {useMutation} from "@tanstack/react-query";
-import {prisma} from "@/prisma";
-import {updateImageUserAction} from "@/components/wrappers/dashboard/profile/Avatar/avatar.action";
-import {useRouter} from "next/navigation";
-import {useSession} from "next-auth/react";
+"use client";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { UploadIcon } from "lucide-react";
+import { toast } from "sonner";
+import { uploadImageAction } from "@/features/upload/public/upload.action";
+import { useMutation } from "@tanstack/react-query";
+import { updateImageUserAction } from "@/components/wrappers/dashboard/profile/Avatar/avatar.action";
+import { useRouter } from "next/navigation";
+import { User } from "@/db/schema/01_user";
 
 export type AvatarWithUploadProps = {
-    user: User
-}
-
+    user: User;
+};
 
 export const AvatarWithUpload = (props: AvatarWithUploadProps) => {
-    const user = props.user
+    const user = props.user;
     const router = useRouter();
-    const { data: session, update } = useSession();
-
 
     const submitImage = useMutation({
         mutationFn: async (file: File) => {
             const formData = new FormData();
             formData.set("file", file);
-            const uploadImage = await uploadImageAction(formData)
-            const data = uploadImage?.data?.data
+            const uploadImage = await uploadImageAction(formData);
+            const data = uploadImage?.data?.data;
 
             if (uploadImage?.serverError || !data) {
                 console.log(uploadImage?.serverError);
@@ -34,8 +29,8 @@ export const AvatarWithUpload = (props: AvatarWithUploadProps) => {
                 return;
             }
 
-            const updateUser = await updateImageUserAction(data.url)
-            const dataUser = updateUser?.data?.data
+            const updateUser = await updateImageUserAction(data.url);
+            const dataUser = updateUser?.data?.data;
 
             if (updateUser?.serverError || !dataUser) {
                 console.log(updateUser?.serverError);
@@ -43,42 +38,27 @@ export const AvatarWithUpload = (props: AvatarWithUploadProps) => {
                 return;
             }
 
-            const newSession = {
-                ...session,
-                user: {
-                    ...session?.user,
-                    image: data.url
-                },
-            };
-
-            await update(newSession);
             toast.success("Successfully uploaded user image!");
-            router.refresh()
-
-
-
-        }
-    })
+            router.refresh();
+        },
+    });
 
     const handleImageUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
         const file = event.target.files?.[0];
         if (!file) return;
         if (!file.type.includes("image")) {
-            toast.error("File not an image")
+            toast.error("File not an image");
             return;
         }
-        submitImage.mutate(file)
+        submitImage.mutate(file);
     };
 
-
     return (
-        <div className="relative " >
-                <Avatar className="size-14 mr-3 ">
-                    <AvatarFallback>{user.name?.[0]}</AvatarFallback>
-                    {user.image ? (
-                        <AvatarImage src={user.image} alt={`${user.name ?? "-"}'s profile picture`}/>
-                    ) : null}
-                </Avatar>
+        <div className="relative ">
+            <Avatar className="size-14 mr-3 ">
+                <AvatarFallback>{user.name[0]}</AvatarFallback>
+                {user.image ? <AvatarImage src={user.image} alt={`${user.name ?? "-"}'s profile picture`} /> : null}
+            </Avatar>
             <div
                 onClick={() => {
                     const fileInput = document.createElement("input");
@@ -90,8 +70,8 @@ export const AvatarWithUpload = (props: AvatarWithUploadProps) => {
                 }}
                 className="cursor-pointer absolute inset-0 flex justify-center items-center opacity-0 transition-opacity hover:opacity-100 hover:bg-gray-500 hover:bg-opacity-50 rounded-full size-14"
             >
-                <UploadIcon className="w-8 h-8 text-primary"/>
+                <UploadIcon className="w-8 h-8 text-primary" />
             </div>
         </div>
-    )
-}
+    );
+};

src/components/wrappers/dashboard/profile/Avatar/avatar.action.ts

@@ -1,24 +1,14 @@
-"use server"
-import {userAction} from "@/safe-actions";
-import {z} from "zod";
-import {prisma} from "@/prisma";
+"use server";
+import { db } from "@/db";
+import { user as drizzleUser } from "@/db/schema";
+import { userAction } from "@/safe-actions";
+import { eq } from "drizzle-orm";
+import { z } from "zod";
 
+export const updateImageUserAction = userAction.schema(z.string()).action(async ({ parsedInput, ctx }) => {
+    const [updatedUser] = await db.update(drizzleUser).set({ image: parsedInput }).where(eq(drizzleUser.id, ctx.user.id)).returning();
 
-export const updateImageUserAction = userAction
-    .schema(z.string())
-    .action(async ({parsedInput, ctx}) => {
-
-        const user = await prisma.user.update({
-            where: {
-                id: ctx.user.id,
-            },
-            data: {
-                image: parsedInput,
-            }
-        })
-
-
-        return {
-            data: user,
-        }
-    });
+    return {
+        data: updatedUser,
+    };
+});

src/components/wrappers/dashboard/profile/ButtonDeleteAccount/ButtonDeleteAccount.tsx

@@ -1,34 +1,42 @@
-"use client"
+"use client";
 
-import {useMutation} from "@tanstack/react-query";
-import {signOutAction} from "@/features/auth/auth.action";
-import {deleteUserAction} from "@/components/wrappers/dashboard/profile/ButtonDeleteAccount/delete-account.action";
-import {Trash2} from "lucide-react";
-import {ButtonWithConfirm} from "@/components/wrappers/common/button/button-with-confirm";
+import { useMutation } from "@tanstack/react-query";
+import { Trash2 } from "lucide-react";
+import { ButtonWithConfirm } from "@/components/wrappers/common/button/button-with-confirm";
+import { signOut } from "@/lib/auth/auth-client";
+import { useRouter } from "next/navigation";
+import { deleteUserAction } from "./delete-account.action";
 
 export type ButtonDeleteAccountProps = {
-    text? : string
-}
+    text?: string;
+};
 
 export const ButtonDeleteAccount = (props: ButtonDeleteAccountProps) => {
+    const router = useRouter();
 
     const mutation = useMutation({
         mutationFn: () => deleteUserAction(""),
         onSuccess: async () => {
-            await signOutAction();
+            await signOut({
+                fetchOptions: {
+                    onSuccess: () => {
+                        router.push("/login");
+                    },
+                },
+            });
         },
-    })
+    });
 
     return (
         <ButtonWithConfirm
             text={props.text ? props.text : ""}
             onClick={() => {
-                mutation.mutate()
+                mutation.mutate();
             }}
             variant={"destructive"}
             isPending={mutation.isPending}
             className="gap-2"
-            icon={<Trash2/>}
+            icon={<Trash2 />}
         />
-    )
-}
+    );
+};

src/components/wrappers/dashboard/profile/ButtonDeleteAccount/delete-account.action.ts

@@ -1,44 +1,27 @@
-"use server"
-import {userAction} from "@/safe-actions";
-import {prisma} from "@/prisma";
-import {z} from "zod";
-import {v4 as uuidv4} from "uuid";
-import {EmailFormSchema} from "@/components/wrappers/dashboard/admin/AdminEmailTab/EmailForm/email-form.schema";
+"use server";
+import { userAction } from "@/safe-actions";
+import { z } from "zod";
+import { v4 as uuidv4 } from "uuid";
+import { db } from "@/db";
+import { user as drizzleUser } from "@/db/schema";
+import { eq } from "drizzle-orm";
 
+export const deleteUserAction = userAction.schema(z.string()).action(async ({ parsedInput, ctx }) => {
+    const userId = parsedInput.length > 0 ? parsedInput : ctx.user.id;
+    const uuid = uuidv4();
 
-export const deleteUserAction = userAction
-    .schema(z.string())
-    .action(async ({parsedInput, ctx}) => {
-        const userId = parsedInput.length > 0 ? parsedInput : ctx.user.id;
-
-        const uuid = uuidv4()
-
-        const user = await prisma.user.update({
-            where: {
-                id: userId,
-            },
-            data: {
-                email: `${uuid}@portabase.com`,
-                name: `${uuid}`,
-                deleted: true
-            }
+    const [updatedUser] = await db
+        .update(drizzleUser)
+        .set({
+            email: `${uuid}@portabase.com`,
+            name: `${uuid}`,
+            //deleted: true,
+            //todo: add deleted
         })
+        .where(eq(drizzleUser.id, userId))
+        .returning();
 
-        const account = await prisma.account.findFirst({
-            where: {
-                userId: userId,
-            }
-        })
-        if (account) {
-            await prisma.account.delete({
-                where: {
-                    id: account.id
-                }
-
-            })
-        }
-        return {
-            data: user,
-        }
-    });
-
+    return {
+        data: updatedUser,
+    };
+});

src/components/wrappers/dashboard/profile/UserAvatar/UserAvatar.tsx

@@ -1,21 +1,22 @@
-import {currentUser, requiredCurrentUser} from "@/auth/current-user";
-import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";
+import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
+import { currentUser } from "@/lib/auth/current-user";
+import { notFound } from "next/navigation";
 
-export type UserAvatarProps = {}
+export type UserAvatarProps = {};
 
 export const UserAvatar = async () => {
+    const user = await currentUser();
 
-    const user = await currentUser()
-
+    if (!user) {
+        return notFound();
+    }
 
     return (
         <div>
             <Avatar className="size-6">
-                <AvatarFallback>{user.name?.[0]}</AvatarFallback>
-                {user.image ? (
-                    <AvatarImage src={user.image} alt={`${user.name ?? "-"}'s profile picture`}/>
-                ) : null}
+                <AvatarFallback>{user.name[0]}</AvatarFallback>
+                {user.image ? <AvatarImage src={user.image} alt={`${user.name ?? "-"}'s profile picture`} /> : null}
             </Avatar>
         </div>
-    )
-}
+    );
+};

src/components/wrappers/dashboard/profile/UserForm/UserForm.tsx

@@ -1,28 +1,24 @@
 "use client";
 
-import {Card, CardContent, CardDescription, CardHeader, CardTitle} from "@/components/ui/card";
-import {
-    FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage, useZodForm
-} from "@/components/ui/form";
-import {Input} from "@/components/ui/input";
-import {Form} from "@/components/ui/form"
-import {Button} from "@/components/ui/button";
-import {useRouter} from "next/navigation";
-import {useMutation} from "@tanstack/react-query";
-import {TooltipProvider} from "@/components/ui/tooltip";
-import {UserSchema, UserType} from "@/components/wrappers/dashboard/profile/UserForm/user-form.schema";
-import {toast} from "sonner";
-import {updateUserAction} from "@/components/wrappers/dashboard/profile/UserForm/user-form.action";
-import { useSession } from "next-auth/react";
+import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
+import { FormControl, FormField, FormItem, FormLabel, FormMessage, useZodForm } from "@/components/ui/form";
+import { Input } from "@/components/ui/input";
+import { Form } from "@/components/ui/form";
+import { Button } from "@/components/ui/button";
+import { useRouter } from "next/navigation";
+import { useMutation } from "@tanstack/react-query";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { UserSchema, UserType } from "@/components/wrappers/dashboard/profile/UserForm/user-form.schema";
+import { toast } from "sonner";
+import { updateUserAction } from "@/components/wrappers/dashboard/profile/UserForm/user-form.action";
 
 export type userFormProps = {
     defaultValues?: UserType;
     userId?: string;
-}
+};
 
 export const UserForm = (props: userFormProps) => {
-
-    const isCreate = !Boolean(props.defaultValues)
+    const isCreate = !Boolean(props.defaultValues);
 
     const form = useZodForm({
         schema: UserSchema,
@@ -30,96 +26,73 @@ export const UserForm = (props: userFormProps) => {
     });
 
     const router = useRouter();
-    const { data: session, update } = useSession();
 
     const mutation = useMutation({
         mutationFn: async (values: UserType) => {
-            console.log("values", values)
-            console.log(props.userId)
+            console.log("values", values);
+            console.log(props.userId);
             const updateUser = await updateUserAction({
                 id: props.userId ?? "-",
-                data: values
-            })
+                data: values,
+            });
 
-            const data = updateUser?.data?.data
+            const data = updateUser?.data?.data;
             if (updateUser?.serverError || !data) {
-                console.log(updateUser?.serverError);
                 toast.error(updateUser?.serverError);
                 return;
             }
-            console.log("email:", values.email)
 
-            const newSession = {
-                ...session,
-                user: {
-                    ...session?.user,
-                    name: values.name,
-                    email: values.email
-                },
-            };
-
-            const updateSession = await update(newSession);
-            console.log(updateSession);
-            toast.success(`Success updating user informations`);
+            toast.success(`Profile updated successfully.`);
             router.push(`/dashboard/profile`);
-            router.refresh()
-        }
-    })
+            router.refresh();
+        },
+    });
 
     return (
         <TooltipProvider>
             <Card>
                 <CardHeader>
-                    <CardTitle>
-                        Account
-                    </CardTitle>
-                    <CardDescription>
-                        Your informations
-                    </CardDescription>
-
+                    <CardTitle>Account</CardTitle>
+                    <CardDescription>Your informations</CardDescription>
                 </CardHeader>
                 <CardContent>
-                    <Form form={form}
-                          className="flex flex-col gap-4"
-                          onSubmit={async (values) => {
-                              await mutation.mutateAsync(values);
-                          }}
+                    <Form
+                        form={form}
+                        className="flex flex-col gap-4"
+                        onSubmit={async (values) => {
+                            await mutation.mutateAsync(values);
+                        }}
                     >
                         <FormField
                             control={form.control}
                             name="name"
-                            render={({field}) => (
+                            render={({ field }) => (
                                 <FormItem>
                                     <FormLabel>Name</FormLabel>
                                     <FormControl>
-                                        <Input
-                                            placeholder={"Your Name"} {...field} />
+                                        <Input placeholder={"Your Name"} {...field} />
                                     </FormControl>
-                                    <FormMessage/>
+                                    <FormMessage />
                                 </FormItem>
                             )}
                         />
                         <FormField
                             control={form.control}
                             name="email"
-                            render={({field}) => (
+                            render={({ field }) => (
                                 <FormItem>
                                     <FormLabel>Email</FormLabel>
                                     <FormControl>
-                                        <Input
-                                            placeholder={'exemple@portabase.com'} disabled {...field}
-                                            value={field.value ?? ""}/>
+                                        <Input placeholder={"exemple@portabase.com"} disabled {...field} value={field.value ?? ""} />
                                     </FormControl>
-                                    <FormMessage/>
+                                    <FormMessage />
                                 </FormItem>
                             )}
                         />
-                        <Button>
-                            {isCreate ? `` : `Save`}
-                        </Button>
+                        <Button>{isCreate ? `` : `Save`}</Button>
                     </Form>
                 </CardContent>
             </Card>
         </TooltipProvider>
-    )
-}
+    );
+};

src/components/wrappers/dashboard/profile/UserForm/user-form.action.ts

@@ -1,26 +1,22 @@
-"use server"
-import {userAction} from "@/safe-actions";
-import {z} from "zod";
-import {prisma} from "@/prisma";
-import {UserSchema} from "@/components/wrappers/dashboard/profile/UserForm/user-form.schema";
+"use server";
+import { userAction } from "@/safe-actions";
+import { z } from "zod";
+import { UserSchema } from "@/components/wrappers/dashboard/profile/UserForm/user-form.schema";
+import { db } from "@/db";
+import { user as drizzleUser } from "@/db/schema";
+import { eq } from "drizzle-orm";
 
 export const updateUserAction = userAction
     .schema(
         z.object({
-                id: z.string(),
-                data: UserSchema,
-            }
-        )
-    )
-    .action(async ({parsedInput, ctx}) => {
-        const updatedUser = await prisma.user.update({
-            where: {
-                id: parsedInput.id,
-            },
-            data: parsedInput.data,
+            id: z.string(),
+            data: UserSchema,
         })
+    )
+    .action(async ({ parsedInput }) => {
+        const [updatedUser] = await db.update(drizzleUser).set(parsedInput.data).where(eq(drizzleUser.id, parsedInput.id)).returning();
+
         return {
             data: updatedUser,
-
-        }
-    })
+        };
+    });