From e770fcd1a9aff513d5f44fbd7067d3d96300b473 Mon Sep 17 00:00:00 2001
From: charles-gauthereau <charles.gauthereau@soluce-technologies.com>
Date: Sat, 23 Nov 2024 18:54:47 +0100
Subject: [PATCH] Correcting some bugs and working on responsive.

---
 app/(customer)/dashboard/layout.tsx           | 18 ++--
 app/(customer)/dashboard/profile/page.tsx     |  9 +-
 .../Settings/SettingsTabs/SettingsTabs.tsx    | 14 +--
 .../SettingsUsersTab/SettingsUsersTab.tsx     |  1 +
 src/components/wrappers/table/data-table.tsx  | 85 ++++++++++---------
 .../wrappers/table/table-pagination-size.tsx  | 17 ++--
 .../wrappers/table/table-pagination.tsx       |  8 +-
 7 files changed, 81 insertions(+), 71 deletions(-)

diff --git a/app/(customer)/dashboard/layout.tsx b/app/(customer)/dashboard/layout.tsx
index 1aa31257..6de904b3 100644
--- a/app/(customer)/dashboard/layout.tsx
+++ b/app/(customer)/dashboard/layout.tsx
@@ -12,7 +12,7 @@ export default async function Layout({children}: { children: React.ReactNode })
 
     const user = await currentUser()
     console.log(user)
-    if(user){
+    if (user) {
         const userInfo = await prisma.user.findUnique({
             where: {
                 email: user?.email
@@ -25,13 +25,15 @@ export default async function Layout({children}: { children: React.ReactNode })
 
     return (
         <SidebarProvider>
-            <AppSidebar/>
-            <SidebarInset>
-                <Header/>
-                <main className="h-full">
-                    {children}
-                </main>
-            </SidebarInset>
+            <div className="flex flex-col lg:flex-row w-full">
+                <AppSidebar/>
+                <SidebarInset>
+                    <Header/>
+                    <main className="h-full">
+                        {children}
+                    </main>
+                </SidebarInset>
+            </div>
         </SidebarProvider>
     )
 }
\ No newline at end of file
diff --git a/app/(customer)/dashboard/profile/page.tsx b/app/(customer)/dashboard/profile/page.tsx
index e9846af0..170153c3 100644
--- a/app/(customer)/dashboard/profile/page.tsx
+++ b/app/(customer)/dashboard/profile/page.tsx
@@ -27,13 +27,18 @@ export default async function RoutePage(props: PageParams<{}>) {
                         <AvatarWithUpload user={userInfo}/>
                         {user.name}
                         <Badge className="ml-3 hidden lg:block">{userInfo.authMethod}</Badge>
+                        <Badge className="ml-3 hidden lg:block">{userInfo.role}</Badge>
                     </PageTitle>
-                    <PageActions className={"mt-2"}>
+                    <PageActions className="mt-2 hidden sm:block">
                         <ButtonDeleteAccount text="Delete my account"/>
                     </PageActions>
                 </div>
             <PageContent>
-                <UserForm userId={userInfo.id} defaultValues={userInfo}/>
+                <UserForm  userId={userInfo.id} defaultValues={userInfo}/>
+                <div className="mt-4 sm:hidden">
+                    <ButtonDeleteAccount text="Delete my account" />
+                </div>
+
             </PageContent>
         </Page>
     )
diff --git a/src/components/wrappers/Dashboard/Settings/SettingsTabs/SettingsTabs.tsx b/src/components/wrappers/Dashboard/Settings/SettingsTabs/SettingsTabs.tsx
index 9beba942..143a320c 100644
--- a/src/components/wrappers/Dashboard/Settings/SettingsTabs/SettingsTabs.tsx
+++ b/src/components/wrappers/Dashboard/Settings/SettingsTabs/SettingsTabs.tsx
@@ -17,12 +17,13 @@ export type SettingsTabsProps = {
 export const SettingsTabs = (props: SettingsTabsProps) => {
 
     return(
+
         <Tabs defaultValue="informations" >
-            <TabsList className="w-full" >
-                <TabsTrigger className="w-full" value="informations">Informations</TabsTrigger>
-                <TabsTrigger className="w-full" value="users">Users</TabsTrigger>
-                <TabsTrigger className="w-full" value="email">Email</TabsTrigger>
-                <TabsTrigger className="w-full" value="storage">Storage</TabsTrigger>
+            <TabsList className="w-full">
+                <TabsTrigger className="w-full " value="informations">Info</TabsTrigger>
+                <TabsTrigger className="w-full " value="users">Users</TabsTrigger>
+                <TabsTrigger className="w-full " value="email">Email</TabsTrigger>
+                <TabsTrigger className="w-full " value="storage">Storage</TabsTrigger>
             </TabsList>
             <TabsContent value="informations">
                 <div className="flex flex-1 flex-col gap-4 py-4">
@@ -34,7 +35,7 @@ export const SettingsTabs = (props: SettingsTabsProps) => {
                     <div className="min-h-[100vh] flex-1 rounded-xl bg-muted/50 md:min-h-min"/>
                 </div>
             </TabsContent>
-            <TabsContent value="users" className="h-full justify-between">
+            <TabsContent value="users" >
                 <SettingsUsersTab users={props.users}/>
             </TabsContent>
             <TabsContent value="email">
@@ -44,5 +45,6 @@ export const SettingsTabs = (props: SettingsTabsProps) => {
                 <SettingsStorageTab settings={props.settings}/>
             </TabsContent>
         </Tabs>
+
     )
 }
diff --git a/src/components/wrappers/Dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx b/src/components/wrappers/Dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx
index cd6cc802..13fa5fff 100644
--- a/src/components/wrappers/Dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx
+++ b/src/components/wrappers/Dashboard/Settings/SettingsUsersTab/SettingsUsersTab.tsx
@@ -9,6 +9,7 @@ export type SettingsUsersTabProps = {
 
 export const SettingsUsersTab = (props: SettingsUsersTabProps) => {
     return (
+
         <div className="flex flex-col h-full  py-4">
             <div className="flex gap-4 h-fit justify-between">
                 <h1>List of Portabase users</h1>
diff --git a/src/components/wrappers/table/data-table.tsx b/src/components/wrappers/table/data-table.tsx
index 4eea740b..ae433b11 100644
--- a/src/components/wrappers/table/data-table.tsx
+++ b/src/components/wrappers/table/data-table.tsx
@@ -7,47 +7,50 @@ export type dataTableProps = {
 
 export const DataTable = ({table}: dataTableProps) => {
     return (
-        <Table>
-            <TableHeader>
-                {table.getHeaderGroups().map((headerGroup) => (
-                    <TableRow key={headerGroup.id}>
-                        {headerGroup.headers.map((header) => {
-                            return (
-                                <TableHead key={header.id}>
-                                    {header.isPlaceholder
-                                        ? null
-                                        : flexRender(
-                                            header.column.columnDef.header,
-                                            header.getContext()
-                                        )}
-                                </TableHead>
-                            )
-                        })}
-                    </TableRow>
-                ))}
-            </TableHeader>
-            <TableBody>
-                {table.getRowModel().rows?.length ? (
-                    table.getRowModel().rows.map((row) => (
-                        <TableRow
-                            key={row.id}
-                            data-state={row.getIsSelected() && "selected"}
-                        >
-                            {row.getVisibleCells().map((cell) => (
-                                <TableCell key={cell.id}>
-                                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                                </TableCell>
-                            ))}
+        <div className="rounded-md border w-full ">
+            <Table className="w-full">
+
+                <TableHeader>
+                    {table.getHeaderGroups().map((headerGroup) => (
+                        <TableRow key={headerGroup.id}>
+                            {headerGroup.headers.map((header) => {
+                                return (
+                                    <TableHead key={header.id}>
+                                        {header.isPlaceholder
+                                            ? null
+                                            : flexRender(
+                                                header.column.columnDef.header,
+                                                header.getContext()
+                                            )}
+                                    </TableHead>
+                                )
+                            })}
                         </TableRow>
-                    ))
-                ) : (
-                    <TableRow>
-                        <TableCell colSpan={table.getAllColumns().length} className="h-24 text-center">
-                            No results.
-                        </TableCell>
-                    </TableRow>
-                )}
-            </TableBody>
-        </Table>
+                    ))}
+                </TableHeader>
+                <TableBody>
+                    {table.getRowModel().rows?.length ? (
+                        table.getRowModel().rows.map((row) => (
+                            <TableRow
+                                key={row.id}
+                                data-state={row.getIsSelected() && "selected"}
+                            >
+                                {row.getVisibleCells().map((cell) => (
+                                    <TableCell key={cell.id}>
+                                        {flexRender(cell.column.columnDef.cell, cell.getContext())}
+                                    </TableCell>
+                                ))}
+                            </TableRow>
+                        ))
+                    ) : (
+                        <TableRow>
+                            <TableCell colSpan={table.getAllColumns().length} className="h-24 text-center">
+                                No results.
+                            </TableCell>
+                        </TableRow>
+                    )}
+                </TableBody>
+            </Table>
+        </div>
     )
 }
\ No newline at end of file
diff --git a/src/components/wrappers/table/table-pagination-size.tsx b/src/components/wrappers/table/table-pagination-size.tsx
index f9a20a7d..d4d08a27 100644
--- a/src/components/wrappers/table/table-pagination-size.tsx
+++ b/src/components/wrappers/table/table-pagination-size.tsx
@@ -8,26 +8,24 @@ export type tablePaginationSizeProps = {
     pageSizeOptions?: number[]
 }
 
-
 export const TablePaginationSize = (props: tablePaginationSizeProps) => {
-
-    const {className, table, pageSizeOptions = [10, 20, 30, 40, 50]} = props
+    const { className, table, pageSizeOptions = [10, 20, 30, 40, 50] } = props;
 
     useEffect(() => {
-        table.setPageSize(Number(pageSizeOptions[0]))
+        table.setPageSize(Number(pageSizeOptions[0]));
     }, []);
 
     return (
-        <div className={cn("flex items-center justify-center space-x-2", className)}>
+        <div className={cn("flex items-center justify-end sm:justify-center space-x-2", className)}>
             <p className="whitespace-nowrap text-sm font-medium">Rows per page</p>
             <Select
                 value={`${table.getState().pagination.pageSize}`}
                 onValueChange={(value) => {
-                    table.setPageSize(Number(value))
+                    table.setPageSize(Number(value));
                 }}
             >
                 <SelectTrigger className="h-8 w-[4.5rem]">
-                    <SelectValue placeholder={table.getState().pagination.pageSize}/>
+                    <SelectValue placeholder={table.getState().pagination.pageSize} />
                 </SelectTrigger>
                 <SelectContent side="top">
                     {pageSizeOptions.map((pageSize) => (
@@ -38,6 +36,5 @@ export const TablePaginationSize = (props: tablePaginationSizeProps) => {
                 </SelectContent>
             </Select>
         </div>
-    )
-
-}
\ No newline at end of file
+    );
+};
diff --git a/src/components/wrappers/table/table-pagination.tsx b/src/components/wrappers/table/table-pagination.tsx
index 912ca28c..f68f5e67 100644
--- a/src/components/wrappers/table/table-pagination.tsx
+++ b/src/components/wrappers/table/table-pagination.tsx
@@ -16,9 +16,9 @@ export function TablePagination(props: tablePaginationProps) {
     const {className, table, maxVisiblePages = 3, pageSizeOptions = [10, 20, 30, 40, 50]} = props
 
     return (
-        <div className={cn("flex mt-6", className)}>
-            <TablePaginationSize table={table} pageSizeOptions={pageSizeOptions}/>
-            <TablePaginationNavigation table={table} maxVisiblePages={maxVisiblePages} className="justify-end"/>
+        <div className={cn("flex flex-col sm:flex-row mt-6", className)}>
+            <TablePaginationSize table={table} pageSizeOptions={pageSizeOptions} />
+            <TablePaginationNavigation table={table} maxVisiblePages={maxVisiblePages} className="justify-end mt-5 sm:mt-0" />
         </div>
-    )
+    );
 }