Merge remote-tracking branch 'origin/main'

app/(customer)/dashboard/agents/[agentId]/page.tsx

@@ -3,28 +3,12 @@ import {Page, PageActions, PageContent, PageDescription, PageHeader, PageTitle}
 import {Button} from "@/components/ui/button";
 import {Tabs, TabsContent, TabsList, TabsTrigger} from "@/components/ui/tabs";
 import {Card, CardContent, CardHeader} from "@/components/ui/card";
-import {backupColumns} from "@/features/backup/columns";
-import {restoreColumns} from "@/features/restore/columns";
+import {TablePagination} from "@/components/wrappers/table/table-pagination";
+import {columns} from "@/features/backup/columns";
 import {DataTableWithPagination} from "@/components/wrappers/table/data-table-with-pagination";
-import {prisma} from "@/prisma";
-import {GearIcon} from "@radix-ui/react-icons";
-import Link from "next/link";
 
 
-export default async function RoutePage(props: PageParams<{ agentId: string }>) {
-
-    // const agent = await prisma.agent.findUnique({
-    //     where: {
-    //         id: props.params.agentId,
-    //     },
-    // })
-
-    const agent = {
-        "id": props.params.agentId,
-        "name": "Agent 1",
-        "description": "My beautiful project!",
-        "lastContact": null,
-    }
+export default async function RoutePage(props: PageParams<{}>) {
 
     const backups = [
         {'id': 'backup-1', 'createdAt': '2023-11-27T11:26:54.870914Z', 'status': 'pending'},
@@ -62,81 +46,55 @@ export default async function RoutePage(props: PageParams<{ agentId: string }>)
         {'id': 'restore-10', 'backupId': 'backup-10', 'createdAt': '2023-11-25T11:26:54.871000Z', 'status': 'failed'}
     ]
 
-    const databaseId = 'db-123';
-
-    const totalBackups = await prisma.backup.count({
-        where: {
-            databaseId: databaseId,
-        },
-    });
-
-    const successfulBackups = await prisma.backup.count({
-        where: {
-            databaseId: databaseId,
-            status: 'success',
-        },
-    });
-
-    const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null
-
-
     return (
         <Page>
             <PageHeader>
                 <PageTitle>
-                    {agent.name}
-                    <Link href={`/dashboard/agents/${agent.id}/edit`}>
-                        <GearIcon className="w-7 h-7"/>
-                    </Link>
+                    Agent 1
                 </PageTitle>
-
                 <PageActions>
                     <Button>Backup</Button>
                     <Button>Restore</Button>
                 </PageActions>
             </PageHeader>
 
-            <PageDescription>{agent.description}</PageDescription>
+            <PageDescription>My beautiful project!</PageDescription>
 
-            <PageContent className="flex flex-col w-full h-full">
-                <div className="flex flex-row sm:justify-between gap-8 mb-6">
+            <PageContent>
+                <div className="flex flex-row sm:justify-between gap-6 mb-8">
                     <Card className="w-full">
-                        <CardHeader className="font-bold text-xl">
+                        <CardHeader>
                             Backups
                         </CardHeader>
                         <CardContent></CardContent>
                     </Card>
                     <Card className="w-full">
-                        <CardHeader className="font-bold text-xl">
+                        <CardHeader>
                             Success rate
                         </CardHeader>
-                        <CardContent>
-                            {successRate ?? "Unavailable for now."}
-                        </CardContent>
+                        <CardContent></CardContent>
                     </Card>
                     <Card className="w-full">
-                        <CardHeader className="font-bold text-xl">
+                        <CardHeader>
                             Last contact
                         </CardHeader>
-                        <CardContent>
-                            {agent.lastContact?.toDateString() ?? "Never connected"}
-                        </CardContent>
+                        <CardContent></CardContent>
                     </Card>
                 </div>
-                <Tabs className="flex flex-col flex-1" defaultValue="backup">
-
+                <Tabs defaultValue="backup">
                     <TabsList className="grid w-full grid-cols-2">
                         <TabsTrigger value="backup">Backup</TabsTrigger>
-                        <TabsTrigger value="restore">Backup</TabsTrigger>
+                        <TabsTrigger value="restore">Restore</TabsTrigger>
                     </TabsList>
 
-                    <TabsContent className="h-full justify-between" value="backup">
-                        <DataTableWithPagination columns={backupColumns} data={backups}/>
+                    <TabsContent className="flex flex-col gap-6" value="backup">
+                        <DataTableWithPagination columns={columns} data={backups}/>
                     </TabsContent>
 
-                    <TabsContent className="h-full justify-between" value="restore">
-                        <DataTableWithPagination columns={restoreColumns} data={restores}/>
+                    <TabsContent className="flex flex-col gap-6" value="restore">
+                        <DataTableWithPagination columns={columns} data={restores}/>
                     </TabsContent>
+
                 </Tabs>
             </PageContent>
         </Page>

app/(customer)/dashboard/agents/page.tsx

@@ -36,7 +36,7 @@ export default async function RoutePage(props: PageParams<{}>) {
                 </PageActions>
             </PageHeader>
 
-            <PageContent className="mt-10">
+            <PageContent>
                 <CardsWithPagination
                     data={agents}
                     cardItem={AgentCard}

app/(customer)/dashboard/layout.tsx

@@ -17,7 +17,7 @@ export default async function Layout({children}: { children: React.ReactNode })
             <AppSidebar/>
             <SidebarInset>
                 <Header/>
-                <main className="h-full">
+                <main>
                     {children}
                 </main>
             </SidebarInset>

app/(customer)/dashboard/profile/page.tsx

@@ -6,6 +6,11 @@ import {requiredCurrentUser} from "@/auth/current-user";
 import {UserForm} from "@/components/wrappers/Dashboard/Profile/UserForm/UserForm";
 import {prisma} from "@/prisma";
 import {Badge} from "@/components/ui/badge";
+import Link from "next/link";
+import {Button} from "@/components/ui/button";
+import {ButtonWithConfirm} from "@/components/wrappers/Button/ButtonWithConfirm/ButtonWithConfirm";
+import {ButtonDeleteAccount} from "@/components/wrappers/Dashboard/Profile/ButtonDeleteAccount/ButtonDeleteAccount";
+import {useIsMobile} from "@/hooks/use-mobile";
 
 export default async function RoutePage(props: PageParams<{}>) {
 
@@ -22,23 +27,32 @@ export default async function RoutePage(props: PageParams<{}>) {
 
     console.log(userInfo)
 
+    const test = () => {
+        console.log("test")
+    }
+
     return (
         <Page>
-            <PageHeader>
-                <PageTitle className="flex items-center">
-                    <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>
-                    {user.name}
-                    <Badge className="ml-3">{userInfo.authMethod}</Badge>
-                </PageTitle>
-            </PageHeader>
+            {/*<PageHeader>*/}
+                <div className="justify-between gap-2 sm:flex">
+                    <PageTitle className="flex items-center">
+                        <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>
+                        {user.name}
+                        <Badge className="ml-3 hidden lg:block">{userInfo.authMethod}</Badge>
+                    </PageTitle>
+                    <PageActions className={"mt-2"}>
+                        <ButtonDeleteAccount/>
+                    </PageActions>
+                </div>
+            {/*</PageHeader>*/}
             <PageContent>
-                <UserForm userId={userInfo.id} defaultValues={userInfo} />
+                <UserForm userId={userInfo.id} defaultValues={userInfo}/>
             </PageContent>
         </Page>
-)
+    )
 }

app/api/agent/[agentId]/status/route.ts

@@ -0,0 +1,47 @@
+import {prisma} from "@/prisma";
+import {NextResponse} from "next/server";
+
+export async function POST(
+    request: Request,
+    {params}: { params: Promise<{ agentId: string }> }
+) {
+    const agentId = (await params).agentId
+
+    const agent = await prisma.agent.findFirst({
+        where: {
+            id: agentId
+        }
+    })
+
+    if(!agent){
+        return NextResponse.json({error: "Agent not found"}, {status: 404})
+    }
+
+    await prisma.agent.update({
+        where: {
+            id: agent.id,
+        },
+        data: {
+            lastContact: new Date(),
+        }
+    });
+
+    const response = {
+        agent: {
+            id: agentId,
+            lastContact: agent.lastContact
+        },
+        backup: {
+            action: false,
+            cron : ""
+        },
+        restore: {
+            action: false,
+            file: ""
+        }
+    }
+
+    return Response.json({
+        message: response
+    })
+}