Ready for 1.1.6-rc.1

README.md

@@ -9,7 +9,7 @@
     Free, open-source, and self-hosted solution for automated backup and restoration of your database instances.
   </p>
 
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
+[![License: Apache](https://img.shields.io/badge/License-apache-yellow.svg)](LICENSE)
 [![Docker Pulls](https://img.shields.io/docker/pulls/solucetechnologies/portabase?color=brightgreen)](https://hub.docker.com/r/solucetechnologies/portabase)
 [![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/RostislavDugin/postgresus)
 
@@ -86,7 +86,7 @@ services:
     ports:
       - '8887:80'
     environment:
-      - TIME_ZONE="Europe/Paris"
+      - TZ="Europe/Paris"
     volumes:
       - portabase-private:/app/private
     depends_on:

app/(auth)/forgot-password/page.tsx

@@ -1,23 +1,25 @@
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import {CardContent, CardHeader} from "@/components/ui/card";
 
-import { TooltipProvider } from "@/components/ui/tooltip";
-import { ForgotPasswordForm } from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
+import {TooltipProvider} from "@/components/ui/tooltip";
+import {ForgotPasswordForm} from "@/components/wrappers/auth/login/forgot-password-form/forgot-password-form";
+import {CardAuth} from "@/features/layout/card-auth";
 
 export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) {
 
     return (
         <TooltipProvider>
-            <Card className="w-full">
+            <CardAuth className="w-full">
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Reset password</h1>
-                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a link to reset your password.</p>
+                        <p className="text-balance text-muted-foreground">Enter your email address and we'll send you a
+                            link to reset your password.</p>
                     </div>
                 </CardHeader>
                 <CardContent>
-                    <ForgotPasswordForm />
+                    <ForgotPasswordForm/>
                 </CardContent>
-            </Card>
+            </CardAuth>
         </TooltipProvider>
     );
 }

app/(auth)/guard/page.tsx

@@ -1,8 +1,9 @@
-import { Card, CardContent, CardHeader } from "@/components/ui/card";
-import { TooltipProvider } from "@/components/ui/tooltip";
-import { GuardForm } from "@/components/wrappers/auth/guard/guard-form";
-import { cookies } from "next/headers";
-import { redirect } from "next/navigation";
+import {CardContent, CardHeader} from "@/components/ui/card";
+import {TooltipProvider} from "@/components/ui/tooltip";
+import {GuardForm} from "@/components/wrappers/auth/guard/guard-form";
+import {cookies} from "next/headers";
+import {redirect} from "next/navigation";
+import {CardAuth} from "@/features/layout/card-auth";
 
 export default async function GuardPage() {
 
@@ -13,20 +14,20 @@ export default async function GuardPage() {
         redirect("/login");
     }
 
-
     return (
         <TooltipProvider>
-            <Card className="w-full max-w-md">
+            <CardAuth className="w-full max-w-md">
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Two-factor verification</h1>
-                        <p className="text-balance text-muted-foreground">Please enter the verification code generated by your authentication app.</p>
+                        <p className="text-balance text-muted-foreground">Please enter the verification code generated
+                            by your authentication app.</p>
                     </div>
                 </CardHeader>
                 <CardContent>
-                    <GuardForm />
+                    <GuardForm/>
                 </CardContent>
-            </Card>
+            </CardAuth>
         </TooltipProvider>
     );
 }

app/(auth)/login/page.tsx

@@ -3,9 +3,10 @@ import {Metadata} from "next";
 import {SUPPORTED_PROVIDERS} from "../../../portabase.config";
 import {SocialAuthButtons} from "@/components/wrappers/auth/social-buttons";
 import {TooltipProvider} from "@/components/ui/tooltip";
-import {Card, CardContent, CardHeader} from "@/components/ui/card";
+import {CardContent, CardHeader} from "@/components/ui/card";
 import Link from "next/link";
 import {Separator} from "@/components/ui/separator";
+import {CardAuth} from "@/features/layout/card-auth";
 
 export const metadata: Metadata = {
     title: "Login",
@@ -15,7 +16,7 @@ export default async function SignInPage() {
 
     return (
         <TooltipProvider>
-            <Card className="w-full">
+            <CardAuth className="w-full">
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Login</h1>
@@ -30,7 +31,7 @@ export default async function SignInPage() {
 
                             <div className="relative my-4 flex items-center justify-center overflow-hidden">
                                 <Separator/>
-                                <div className="px-2 text-center bg-card text-sm">OR</div>
+                                <div className="px-2 text-center  text-sm">OR</div>
                                 <Separator/>
                             </div>
 
@@ -45,7 +46,7 @@ export default async function SignInPage() {
                         </Link>
                     </div>
                 </CardContent>
-            </Card>
+            </CardAuth>
         </TooltipProvider>
 
 

app/(auth)/reset-password/page.tsx

@@ -1,15 +1,59 @@
-import {PageParams} from "@/types/next";
-import {Metadata} from "next";
-import {ResetPasswordSection} from "@/components/wrappers/auth/reset-password/reset-password-section";
+import { Card, CardContent, CardHeader } from "@/components/ui/card";
+import { TooltipProvider } from "@/components/ui/tooltip";
+import { ResetPasswordForm } from "@/components/wrappers/auth/login/reset-password-form/reset-password-form";
+import { redirect } from "next/navigation";
+import { auth } from "@/lib/auth/auth";
+import { Avatar, AvatarImage, AvatarFallback } from "@radix-ui/react-avatar";
 
-export const metadata: Metadata = {
-    title: "Reset Password",
-};
+export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) {
+
+    const { token } = await props.searchParams;
+
+    if (!token) {
+        return redirect(`/login?error=invalid_or_expired_token`);
+    }
+
+    const verification = await (await auth.$context).internalAdapter.findVerificationValue(`reset-password:${token}`);
+
+    if (!verification || verification.expiresAt < new Date()) {
+        return redirect(`/login?error=invalid_or_expired_token`);
+    }
+
+    const user = await (await auth.$context).internalAdapter.findUserById(verification.value);
 
-export default async function RoutePage(props: PageParams<{}>) {
     return (
-        <div className="mx-auto grid w-full gap-6">
-            <ResetPasswordSection/>
-        </div>
-    )
-}
+        <TooltipProvider>
+            <Card className="w-full max-w-md shadow-lg">
+                <CardHeader className="space-y-4">
+                    <div className="space-y-1 text-center">
+                        <h1 className="text-2xl font-bold tracking-tight">Set a new password</h1>
+                        <p className="text-sm text-muted-foreground text-balance">Please enter your new password below.</p>
+                    </div>
+
+                    <div className="flex flex-col items-center space-y-2 text-center">
+                        <Avatar className="relative flex h-16 w-16 shrink-0 overflow-hidden rounded-full border">
+                            <AvatarImage src={user!.image ?? ""} alt={user!.name} className="aspect-square h-full w-full object-cover" />
+                            <AvatarFallback className="flex h-full w-full items-center justify-center rounded-full bg-muted text-2xl font-medium text-muted-foreground">
+                                {user!.name
+                                    .split(" ")
+                                    .map((n) => n[0])
+                                    .join("")
+                                    .toUpperCase()
+                                    .slice(0, 2)}
+                            </AvatarFallback>
+                        </Avatar>
+
+                        <div className="flex flex-col items-center">
+                            <div className="font-semibold text-lg">{user!.name}</div>
+                            <div className="text-sm text-muted-foreground">{user!.email}</div>
+                        </div>
+                    </div>
+                </CardHeader>
+
+                <CardContent>
+                    <ResetPasswordForm />
+                </CardContent>
+            </Card>
+        </TooltipProvider>
+    );
+}

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

@@ -2,21 +2,16 @@ import Link from "next/link";
 import {GearIcon} from "@radix-ui/react-icons";
 import {PageParams} from "@/types/next";
 import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {formatDateLastContact} from "@/utils/date-formatting";
 import {buttonVariants} from "@/components/ui/button";
-import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {DatabaseCard} from "@/components/wrappers/dashboard/projects/project-card/project-database-card";
-import {AgentCardKey} from "@/components/wrappers/dashboard/agent/agent-card-key/agent-card-key";
 import {db} from "@/db";
 import * as drizzleDb from "@/db";
 import {eq} from "drizzle-orm";
 import {notFound} from "next/navigation";
 import {ButtonDeleteAgent} from "@/components/wrappers/dashboard/agent/button-delete-agent/button-delete-agent";
 import {capitalizeFirstLetter} from "@/utils/text";
-import {Server} from "lucide-react";
 import {generateEdgeKey} from "@/utils/edge_key";
 import {getServerUrl} from "@/utils/get-server-url";
+import {AgentContentPage} from "@/components/wrappers/dashboard/agent/agent-content";
 
 export default async function RoutePage(props: PageParams<{ agentId: string }>) {
 
@@ -54,42 +49,10 @@ export default async function RoutePage(props: PageParams<{ agentId: string }>)
                 <PageDescription className="mt-5 sm:mt-0">{agent.description}</PageDescription>
             )}
             <PageContent className="flex flex-col w-full h-full justify-between gap-6">
-                <div className="flex flex-col sm:flex-row sm:justify-between gap-6 ">
-                    <Card className="w-full sm:w-auto flex-1">
-                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-                            <CardTitle className="text-sm font-medium">Databases</CardTitle>
-                            <Server className="h-4 w-4 text-muted-foreground"/>
-                        </CardHeader>
-                        <CardContent>
-                            <div className="text-2xl font-bold">{agent.databases.length}</div>
-                            <p className="text-xs text-muted-foreground">Databases linked to this agent</p>
-                        </CardContent>
-                    </Card>
-
-                    <Card className="w-full sm:w-auto flex-1">
-                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-                            <CardTitle className="text-sm font-medium">Last contact</CardTitle>
-                            <Server className="h-4 w-4 text-muted-foreground"/>
-                        </CardHeader>
-                        <CardContent>
-                            <div className="text-2xl font-bold">{formatDateLastContact(agent.lastContact)}</div>
-                            <p className="text-xs text-muted-foreground">Last contact with agent</p>
-                        </CardContent>
-                    </Card>
-
-                </div>
-                <Card className="w-full sm:w-auto flex-1 ">
-                    <CardHeader className="font-bold text-xl">
-                        Edge Key
-                    </CardHeader>
-                    <CardContent>
-                        <AgentCardKey
-                            edgeKey={edgeKey}
-                        />
-                    </CardContent>
-                </Card>
-                <CardsWithPagination cardsPerPage={4} numberOfColumns={2} data={agent.databases}
-                                     cardItem={DatabaseCard}/>
+                <AgentContentPage
+                    agent={agent}
+                    edgeKey={edgeKey}
+                />
             </PageContent>
         </Page>
     )

app/(customer)/dashboard/(organization)/_databases/[databaseId]/restore/page.tsx

@@ -1,41 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {notFound} from "next/navigation";
-// import {RestoreForm} from "@/components/wrappers/dashboard/database/restore-form";
-import {currentUser} from "@/lib/auth/current-user";
-
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import * as drizzleDb from "@/db";
-
-
-export default async function RoutePage(
-    props: PageParams<{
-        databaseId: string;
-    }>
-) {
-    const {databaseId} = await props.params;
-
-    const user = await currentUser();
-    if (!user) notFound();
-
-    const [dbToRestore] = await db.select().from(drizzleDb.schemas.database).where(eq(drizzleDb.schemas.database.id, databaseId));
-
-    if (!dbToRestore) {
-        notFound();
-    }
-
-    const dbsOfSameType = await db.select().from(drizzleDb.schemas.database).where(eq(drizzleDb.schemas.database.dbms!, dbToRestore.dbms!));
-    const successfulBackups = await db.select().from(drizzleDb.schemas.backup).where(eq(drizzleDb.schemas.backup.status, "success"));
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Restore {dbToRestore.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                {/*<RestoreForm databaseToRestore={dbToRestore} databases={dbsOfSameType} backups={successfulBackups}/>*/}
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(organization)/projects/[projectId]/database/[databaseId]/page.tsx

@@ -14,6 +14,7 @@ import {RetentionPolicySheet} from "@/components/wrappers/dashboard/database/ret
 import {capitalizeFirstLetter} from "@/utils/text";
 import {AlertPolicyModal} from "@/components/wrappers/dashboard/database/alert-policy/alert-policy-modal";
 import {getOrganizationChannels} from "@/db/services/notification-channel";
+import {ImportModal} from "@/components/wrappers/dashboard/database/import/import-modal";
 
 export default async function RoutePage(props: PageParams<{
     projectId: string;
@@ -107,6 +108,7 @@ export default async function RoutePage(props: PageParams<{
                                 <CronButton database={dbItem}/>
                                 <AlertPolicyModal database={dbItem} notificationChannels={activeOrganizationChannels}
                                                   organizationId={organization.id}/>
+                                <ImportModal database={dbItem}/>
                             </div>
                             <div className="flex items-center gap-2">
                                 <BackupButton disable={isAlreadyBackup} databaseId={databaseId}/>

app/(customer)/dashboard/layout.tsx

@@ -1,26 +1,26 @@
-import React from "react";
+import React, {ReactNode} from "react";
 import {redirect} from "next/navigation";
 
 import {SidebarInset, SidebarProvider} from "@/components/ui/sidebar";
 import {AppSidebar} from "@/components/wrappers/dashboard/common/sidebar/app-sidebar";
 import {Header} from "@/features/layout/Header";
 import {currentUser} from "@/lib/auth/current-user";
+import {ThemeMetaUpdater} from "@/features/browser/theme-meta-updater";
 
-export default async function Layout({children}: { children: React.ReactNode }) {
+export default async function Layout({children}: { children: ReactNode }) {
     const user = await currentUser();
     if (!user) redirect("/login");
 
     return (
-        <>
-            <SidebarProvider>
-                <div className="flex flex-col lg:flex-row w-full">
-                    <AppSidebar/>
-                    <SidebarInset>
-                        <Header/>
-                        <main className="h-full">{children}</main>
-                    </SidebarInset>
-                </div>
-            </SidebarProvider>
-        </>
+        <SidebarProvider>
+            <div className="flex flex-col lg:flex-row w-full">
+                <ThemeMetaUpdater/>
+                <AppSidebar/>
+                <SidebarInset>
+                    <Header/>
+                    <main className="h-full">{children}</main>
+                </SidebarInset>
+            </div>
+        </SidebarProvider>
     );
 }

app/layout.tsx

@@ -16,19 +16,22 @@ export const metadata: Metadata = {
     description: process.env.PROJECT_DESCRIPTION ?? undefined,
 };
 
-export default function RootLayout({
-                                       children,
-                                   }: Readonly<{
+export default async function RootLayout({
+                                             children,
+                                         }: Readonly<{
     children: React.ReactNode;
 }>) {
+
     return (
         <html lang="en" suppressHydrationWarning>
         <head>
-            <meta name="apple-mobile-web-app-title" content="Portabase"/>
+            <meta name="apple-mobile-web-app-title" content={title}/>
         </head>
         <body className={cn(inter.className, "h-full")}>
         <ConsoleSilencer/>
-        <Providers>{children}</Providers>
+        <Providers>
+            {children}
+        </Providers>
         </body>
         </html>
     );

app/providers.tsx

@@ -1,10 +1,12 @@
 "use client";
 
-import { PropsWithChildren, Suspense } from "react";
-import { ThemeProvider } from "@/features/theme/theme-provider";
+import {PropsWithChildren, Suspense} from "react";
+import {ThemeProvider} from "@/features/theme/theme-provider";
+
+import {Toaster} from "@/components/ui/sonner";
+import {QueryClient, QueryClientProvider} from "@tanstack/react-query";
+import {ThemeMetaUpdaterRoot} from "@/features/browser/theme-meta-updater-root";
 
-import { Toaster } from "@/components/ui/sonner";
-import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 
 export type ProviderProps = PropsWithChildren<{}>;
 const queryClient = new QueryClient();
@@ -12,9 +14,14 @@ const queryClient = new QueryClient();
 export const Providers = (props: ProviderProps) => {
     return (
         <Suspense fallback={null}>
-            <ThemeProvider attribute="class" defaultTheme="system" enableSystem>
+            <ThemeProvider
+                attribute="class"
+                defaultTheme="system"
+                enableSystem
+            >
+                <ThemeMetaUpdaterRoot/>
                 <QueryClientProvider client={queryClient}>
-                    <Toaster />
+                    <Toaster/>
                     {props.children}
                 </QueryClientProvider>
             </ThemeProvider>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "portabase",
-  "version": "1.1.5",
+  "version": "1.1.6",
   "private": true,
   "scripts": {
     "dev": "next dev --turbopack -p 8887",

portabase.config.ts

@@ -81,6 +81,7 @@ export const SUPPORTED_PROVIDERS: AuthProviderConfig[] = [
     {
         id: "google",
         icon: Chrome,
+        // isManual: true,
         credentials: {
             clientId: process.env.GOOGLE_CLIENT_ID || "",
             clientSecret: process.env.GOOGLE_CLIENT_SECRET || "",

src/components/emails/auth/email-forgot-password.tsx

@@ -0,0 +1,38 @@
+import * as React from "react";
+import EmailLayout from "../email-layout";
+import {Heading, Text, Section, Button} from "@react-email/components";
+import {getServerUrl} from "@/utils/get-server-url";
+
+interface EmailCreateUserProps {
+    firstname?: string;
+    token: string;
+}
+
+export const EmailForgotPassword = ({firstname, token}: EmailCreateUserProps) => {
+    const baseUrl = getServerUrl();
+
+    return (
+        <EmailLayout preview="Portabase - Forgot Password">
+            <Heading className="mx-0 my-[30px] p-0 text-center font-normal text-[24px] text-black">
+                Hello <strong>{firstname}</strong>,
+            </Heading>
+            <Text className="text-[14px] text-black leading-[24px]">
+                We received a request to reset the password for your account associated with this email.
+            </Text>
+            <Text className="text-[14px] text-black leading-[24px]">
+                If you did not request this password reset, please ignore this email. Your current password
+                will remain unchanged. If this seems suspicious, please contact your administrator.
+            </Text>
+            <Section className="mt-[32px] mb-[32px] text-center">
+                <Button
+                    className="rounded bg-[#000000] px-5 py-3 text-center font-semibold text-[12px] text-white no-underline"
+                    href={`${baseUrl}/reset-password?token=${token}`}
+                >
+                    Reset my password
+                </Button>
+            </Section>
+        </EmailLayout>
+    );
+};
+
+export default EmailForgotPassword;

src/components/emails/auth/email-new-login.tsx

@@ -0,0 +1,32 @@
+import * as React from "react";
+import EmailLayout from "../email-layout";
+import {Heading, Text} from "@react-email/components";
+
+interface EmailCreateUserProps {
+    firstname?: string;
+    os: string;
+    browser: string;
+    ipAddress?: string;
+}
+
+export const EmailNewLogin = ({firstname, ipAddress, os, browser}: EmailCreateUserProps) => {
+    return (
+        <EmailLayout preview="Portabase - New Login">
+            <Heading className="mx-0 my-[30px] p-0 text-center font-normal text-[24px] text-black">
+                Hello <strong>{firstname}</strong>,
+            </Heading>
+            <Text className="text-[14px] text-black leading-[24px]">
+                We detected a new login to your account.
+            </Text>
+            <Text className="text-[14px] text-black leading-[24px]">
+                <strong>Login details:</strong>
+                <br/>
+                Device: {os} - {browser}
+                <br/>
+                IP Address: {ipAddress}
+            </Text>
+        </EmailLayout>
+    );
+};
+
+export default EmailNewLogin;

src/components/emails/email-layout.tsx

@@ -13,7 +13,7 @@ export const EmailLayout = ({ children, preview }: PropsWithChildren<{ preview?:
                 {preview ? <Preview>{preview}</Preview> : <Preview>Please check your mails</Preview>}
                 <Body className="bg-gray-100 py-4" style={{ fontFamily: "Arial, sans-serif" }}>
                     <Container className="bg-white border border-gray-200 p-12">
-                        <Img src={`${baseUrl}/images/logo-black.png`} width="200" height="auto" alt="Logo" />
+                        <Img src={`${baseUrl}/images/logo-dark.png`} width="200" height="auto" alt="Logo" />
                         <Section>{children}</Section>
                     </Container>
                 </Body>

src/components/emails/email-reset-password.tsx

@@ -1,30 +0,0 @@
-import * as React from "react";
-import EmailLayout from "./email-layout";
-import {Text, Section, Button} from "@react-email/components";
-
-export interface EmailResetPasswordProps {
-    url: string;
-}
-
-export const EmailResetPassword = ({url}: EmailResetPasswordProps) => {
-    return (
-        <EmailLayout preview="Email for password reset of your Portabase account">
-            <Text className="text-base   font-bold ">Hello !</Text>
-            <Text className="text-base font-light  ">You are receiving this email because we
-                received a password reset request for your account.</Text>{" "}
-            <Section className="mt-[32px] mb-[32px] text-center">
-                <Button
-                    className="rounded bg-[#000000] px-5 py-3 text-center font-semibold text-[12px] text-white no-underline"
-                    href={url}
-                >
-                    Reset Password
-                </Button>
-            </Section>
-            <Text className="text-base font-light  ">If you did not request a password reset, no
-                further action is required.</Text>
-            <Text className="text-base font-light  ">Regards,<br/>Portabase</Text>
-        </EmailLayout>
-    );
-};
-
-export default EmailResetPassword;

src/components/ui/dropzone.tsx

@@ -0,0 +1,850 @@
+"use client"
+import {cn} from "@/lib/utils";
+import {
+    createContext,
+    forwardRef,
+    useCallback,
+    useContext,
+    useId,
+    useMemo,
+    useReducer,
+    useState,
+} from "react";
+import {
+    Accept,
+    FileRejection,
+    useDropzone as rootUseDropzone,
+} from "react-dropzone";
+import {Button, ButtonVariantsProps} from "@/components/ui/button";
+
+type DropzoneResult<TUploadRes, TUploadError> =
+    | {
+    status: "pending";
+}
+    | {
+    status: "error";
+    error: TUploadError;
+}
+    | {
+    status: "success";
+    result: TUploadRes;
+};
+
+export type FileStatus<TUploadRes, TUploadError> = {
+    id: string;
+    fileName: string;
+    file: File;
+    tries: number;
+} & (
+    | {
+    status: "pending";
+    result?: undefined;
+    error?: undefined;
+}
+    | {
+    status: "error";
+    error: TUploadError;
+    result?: undefined;
+}
+    | {
+    status: "success";
+    result: TUploadRes;
+    error?: undefined;
+}
+    );
+
+const fileStatusReducer = <TUploadRes, TUploadError>(
+    state: FileStatus<TUploadRes, TUploadError>[],
+    action:
+        | {
+        type: "add";
+        id: string;
+        fileName: string;
+        file: File;
+    }
+        | {
+        type: "remove";
+        id: string;
+    }
+        | ({
+        type: "update-status";
+        id: string;
+    } & DropzoneResult<TUploadRes, TUploadError>),
+): FileStatus<TUploadRes, TUploadError>[] => {
+    switch (action.type) {
+        case "add":
+            return [
+                ...state,
+                {
+                    id: action.id,
+                    fileName: action.fileName,
+                    file: action.file,
+                    status: "pending",
+                    tries: 1,
+                },
+            ];
+        case "remove":
+            return state.filter((fileStatus) => fileStatus.id !== action.id);
+        case "update-status":
+            return state.map((fileStatus) => {
+                if (fileStatus.id === action.id) {
+                    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                    const {id, type, ...rest} = action;
+                    return {
+                        ...fileStatus,
+                        ...rest,
+                        tries:
+                            action.status === "pending"
+                                ? fileStatus.tries + 1
+                                : fileStatus.tries,
+                    } as FileStatus<TUploadRes, TUploadError>;
+                }
+                return fileStatus;
+            });
+    }
+};
+type DropZoneErrorCode = (typeof dropZoneErrorCodes)[number];
+const dropZoneErrorCodes = [
+    "file-invalid-type",
+    "file-too-large",
+    "file-too-small",
+    "too-many-files",
+] as const;
+
+const getDropZoneErrorCodes = (fileRejections: FileRejection[]) => {
+    const errors = fileRejections.map((rejection) => {
+        return rejection.errors
+            .filter((error) =>
+                dropZoneErrorCodes.includes(error.code as DropZoneErrorCode),
+            )
+            .map((error) => error.code) as DropZoneErrorCode[];
+    });
+    return Array.from(new Set(errors.flat()));
+};
+
+const getRootError = (
+    errorCodes: DropZoneErrorCode[],
+    limits: {
+        accept?: Accept;
+        maxSize?: number;
+        minSize?: number;
+        maxFiles?: number;
+    },
+) => {
+    const errors = errorCodes.map((error) => {
+        switch (error) {
+            case "file-invalid-type":
+                const acceptedTypes = Object.values(limits.accept ?? {})
+                    .flat()
+                    .join(", ");
+                return `only ${acceptedTypes} are allowed`;
+            case "file-too-large":
+                const maxMb = limits.maxSize
+                    ? (limits.maxSize / (1024 * 1024)).toFixed(2)
+                    : "infinite?";
+                return `max size is ${maxMb}MB`;
+            case "file-too-small":
+                const roundedMinSize = limits.minSize
+                    ? (limits.minSize / (1024 * 1024)).toFixed(2)
+                    : "negative?";
+                return `min size is ${roundedMinSize}MB`;
+            case "too-many-files":
+                return `max ${limits.maxFiles} files`;
+        }
+    });
+    const joinedErrors = errors.join(", ");
+    return joinedErrors.charAt(0).toUpperCase() + joinedErrors.slice(1);
+};
+
+type UseDropzoneProps<TUploadRes, TUploadError> = {
+    onDropFile: (
+        file: File,
+    ) => Promise<
+        Exclude<DropzoneResult<TUploadRes, TUploadError>, { status: "pending" }>
+    >;
+    onRemoveFile?: (id: string) => void | Promise<void>;
+    onFileUploaded?: (result: TUploadRes) => void;
+    onFileUploadError?: (error: TUploadError) => void;
+    onAllUploaded?: () => void;
+    onRootError?: (error: string | undefined) => void;
+    maxRetryCount?: number;
+    autoRetry?: boolean;
+    validation?: {
+        accept?: Accept;
+        minSize?: number;
+        maxSize?: number;
+        maxFiles?: number;
+    };
+    shiftOnMaxFiles?: boolean;
+} & (TUploadError extends string
+    ? {
+        shapeUploadError?: (error: TUploadError) => string | void;
+    }
+    : {
+        shapeUploadError: (error: TUploadError) => string | void;
+    });
+
+interface UseDropzoneReturn<TUploadRes, TUploadError> {
+    getRootProps: ReturnType<typeof rootUseDropzone>["getRootProps"];
+    getInputProps: ReturnType<typeof rootUseDropzone>["getInputProps"];
+    onRemoveFile: (id: string) => Promise<void>;
+    onRetry: (id: string) => Promise<void>;
+    canRetry: (id: string) => boolean;
+    fileStatuses: FileStatus<TUploadRes, TUploadError>[];
+    isInvalid: boolean;
+    isDragActive: boolean;
+    rootError: string | undefined;
+    inputId: string;
+    rootMessageId: string;
+    rootDescriptionId: string;
+    getFileMessageId: (id: string) => string;
+}
+
+const useDropzone = <TUploadRes, TUploadError = string>(
+    props: UseDropzoneProps<TUploadRes, TUploadError>,
+): UseDropzoneReturn<TUploadRes, TUploadError> => {
+    const {
+        onDropFile: pOnDropFile,
+        onRemoveFile: pOnRemoveFile,
+        shapeUploadError: pShapeUploadError,
+        onFileUploaded: pOnFileUploaded,
+        onFileUploadError: pOnFileUploadError,
+        onAllUploaded: pOnAllUploaded,
+        onRootError: pOnRootError,
+        maxRetryCount,
+        autoRetry,
+        validation,
+        shiftOnMaxFiles,
+    } = props;
+
+    const inputId = useId();
+    const rootMessageId = `${inputId}-root-message`;
+    const rootDescriptionId = `${inputId}-description`;
+    const [rootError, _setRootError] = useState<string | undefined>(undefined);
+
+    const setRootError = useCallback(
+        (error: string | undefined) => {
+            _setRootError(error);
+            if (pOnRootError !== undefined) {
+                pOnRootError(error);
+            }
+        },
+        [pOnRootError, _setRootError],
+    );
+
+    const [fileStatuses, dispatch] = useReducer(fileStatusReducer, []);
+
+    const isInvalid = useMemo(() => {
+        return (
+            fileStatuses.filter((file) => file.status === "error").length > 0 ||
+            rootError !== undefined
+        );
+    }, [fileStatuses, rootError]);
+
+    const _uploadFile = useCallback(
+        async (file: File, id: string, tries = 0) => {
+            const result = await pOnDropFile(file);
+
+            if (result.status === "error") {
+                if (autoRetry === true && tries < (maxRetryCount ?? Infinity)) {
+                    dispatch({type: "update-status", id, status: "pending"});
+                    return _uploadFile(file, id, tries + 1);
+                }
+
+                dispatch({
+                    type: "update-status",
+                    id,
+                    status: "error",
+                    error:
+                        pShapeUploadError !== undefined
+                            ? pShapeUploadError(result.error)
+                            : result.error,
+                });
+                if (pOnFileUploadError !== undefined) {
+                    pOnFileUploadError(result.error);
+                }
+                return;
+            }
+            if (pOnFileUploaded !== undefined) {
+                pOnFileUploaded(result.result);
+            }
+            dispatch({
+                type: "update-status",
+                id,
+                ...result,
+            });
+        },
+        [
+            autoRetry,
+            maxRetryCount,
+            pOnDropFile,
+            pShapeUploadError,
+            pOnFileUploadError,
+            pOnFileUploaded,
+        ],
+    );
+
+    const onRemoveFile = useCallback(
+        async (id: string) => {
+            await pOnRemoveFile?.(id);
+            dispatch({type: "remove", id});
+        },
+        [pOnRemoveFile],
+    );
+
+    const canRetry = useCallback(
+        (id: string) => {
+            const fileStatus = fileStatuses.find((file) => file.id === id);
+            return (
+                fileStatus?.status === "error" &&
+                fileStatus.tries < (maxRetryCount ?? Infinity)
+            );
+        },
+        [fileStatuses, maxRetryCount],
+    );
+
+    const onRetry = useCallback(
+        async (id: string) => {
+            if (!canRetry(id)) {
+                return;
+            }
+            dispatch({type: "update-status", id, status: "pending"});
+            const fileStatus = fileStatuses.find((file) => file.id === id);
+            if (!fileStatus || fileStatus.status !== "error") {
+                return;
+            }
+            await _uploadFile(fileStatus.file, id);
+        },
+        [canRetry, fileStatuses, _uploadFile],
+    );
+
+    const getFileMessageId = (id: string) => `${inputId}-${id}-message`;
+
+    const dropzone = rootUseDropzone({
+        accept: validation?.accept,
+        minSize: validation?.minSize,
+        maxSize: validation?.maxSize,
+        onDropAccepted: async (newFiles) => {
+            setRootError(undefined);
+
+            // useDropzone hook only checks max file count per group of uploaded files, allows going over if in multiple batches
+            const fileCount = fileStatuses.length;
+            const maxNewFiles =
+                validation?.maxFiles === undefined
+                    ? Infinity
+                    : validation?.maxFiles - fileCount;
+
+            if (maxNewFiles < newFiles.length) {
+                if (shiftOnMaxFiles === true) {
+                } else {
+                    setRootError(getRootError(["too-many-files"], validation ?? {}));
+                }
+            }
+
+            const slicedNewFiles =
+                shiftOnMaxFiles === true ? newFiles : newFiles.slice(0, maxNewFiles);
+
+            const onDropFilePromises = slicedNewFiles.map(async (file, index) => {
+                if (fileCount + 1 > maxNewFiles) {
+                    await onRemoveFile(fileStatuses[index].id);
+                }
+
+                const id = crypto.randomUUID();
+                dispatch({type: "add", fileName: file.name, file, id});
+                await _uploadFile(file, id);
+            });
+
+            await Promise.all(onDropFilePromises);
+            if (pOnAllUploaded !== undefined) {
+                pOnAllUploaded();
+            }
+        },
+        onDropRejected: (fileRejections) => {
+            const errorMessage = getRootError(
+                getDropZoneErrorCodes(fileRejections),
+                validation ?? {}
+            );
+            setRootError(errorMessage);
+        },
+    });
+
+    return {
+        getRootProps: dropzone.getRootProps,
+        getInputProps: dropzone.getInputProps,
+        inputId,
+        rootMessageId,
+        rootDescriptionId,
+        getFileMessageId,
+        onRemoveFile,
+        onRetry,
+        canRetry,
+        fileStatuses: fileStatuses as FileStatus<TUploadRes, TUploadError>[],
+        isInvalid,
+        rootError,
+        isDragActive: dropzone.isDragActive,
+    };
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const DropZoneContext = createContext<UseDropzoneReturn<any, any>>({
+    getRootProps: () => ({}) as never,
+    getInputProps: () => ({}) as never,
+    onRemoveFile: async () => {
+    },
+    onRetry: async () => {
+    },
+    canRetry: () => false,
+    fileStatuses: [],
+    isInvalid: false,
+    isDragActive: false,
+    rootError: undefined,
+    inputId: "",
+    rootMessageId: "",
+    rootDescriptionId: "",
+    getFileMessageId: () => "",
+});
+
+const useDropzoneContext = <TUploadRes, TUploadError>() => {
+    return useContext(DropZoneContext) as UseDropzoneReturn<
+        TUploadRes,
+        TUploadError
+    >;
+};
+
+interface DropzoneProps<TUploadRes, TUploadError>
+    extends UseDropzoneReturn<TUploadRes, TUploadError> {
+    children: React.ReactNode;
+}
+
+const Dropzone = <TUploadRes, TUploadError>(
+    props: DropzoneProps<TUploadRes, TUploadError>,
+) => {
+    const {children, ...rest} = props;
+    return (
+        <DropZoneContext.Provider value={rest}>{children}</DropZoneContext.Provider>
+    );
+};
+Dropzone.displayName = "Dropzone";
+
+interface DropZoneAreaProps extends React.HTMLAttributes<HTMLDivElement> {
+}
+
+const DropZoneArea = forwardRef<HTMLDivElement, DropZoneAreaProps>(
+    ({className, children, ...props}, forwardedRef) => {
+        const context = useDropzoneContext();
+
+        if (!context) {
+            throw new Error("DropzoneArea must be used within a Dropzone");
+        }
+
+        const {onFocus, onBlur, onDragEnter, onDragLeave, onDrop, ref} =
+            context.getRootProps();
+
+        return (
+            // A11y behavior is handled through Trigger. All of these are only relevant to drag and drop which means this should be fine?
+            // eslint-disable-next-line jsx-a11y/no-static-element-interactions
+            <div
+                ref={(instance) => {
+                    // TODO: test if this actually works?
+                    ref.current = instance;
+                    if (typeof forwardedRef === "function") {
+                        forwardedRef(instance);
+                    } else if (forwardedRef) {
+                        forwardedRef.current = instance;
+                    }
+                }}
+                onFocus={onFocus}
+                onBlur={onBlur}
+                onDragEnter={onDragEnter}
+                onDragLeave={onDragLeave}
+                onDrop={onDrop}
+                {...props}
+                aria-label="dropzone"
+                className={cn(
+                    "flex items-center justify-center rounded-md border border-input bg-background px-4 py-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+                    context.isDragActive && "animate-pulse bg-black/5",
+                    context.isInvalid && "border-destructive",
+                    className,
+                )}
+            >
+                {children}
+            </div>
+        );
+    },
+);
+DropZoneArea.displayName = "DropZoneArea";
+
+export interface DropzoneDescriptionProps
+    extends React.HTMLAttributes<HTMLParagraphElement> {
+}
+
+const DropzoneDescription = forwardRef<
+    HTMLParagraphElement,
+    DropzoneDescriptionProps
+>((props, ref) => {
+    const {className, ...rest} = props;
+    const context = useDropzoneContext();
+    if (!context) {
+        throw new Error("DropzoneDescription must be used within a Dropzone");
+    }
+
+    return (
+        <p
+            ref={ref}
+            id={context.rootDescriptionId}
+            {...rest}
+            className={cn("pb-1 text-sm text-muted-foreground", className)}
+        />
+    );
+});
+DropzoneDescription.displayName = "DropzoneDescription";
+
+interface DropzoneFileListContext<TUploadRes, TUploadError> {
+    onRemoveFile: () => Promise<void>;
+    onRetry: () => Promise<void>;
+    fileStatus: FileStatus<TUploadRes, TUploadError>;
+    canRetry: boolean;
+    dropzoneId: string;
+    messageId: string;
+}
+
+const DropzoneFileListContext = createContext<
+    DropzoneFileListContext<unknown, unknown>
+>({
+    onRemoveFile: async () => {
+    },
+    onRetry: async () => {
+    },
+    fileStatus: {} as FileStatus<unknown, unknown>,
+    canRetry: false,
+    dropzoneId: "",
+    messageId: "",
+});
+
+const useDropzoneFileListContext = () => {
+    return useContext(DropzoneFileListContext);
+};
+
+interface DropZoneFileListProps
+    extends React.OlHTMLAttributes<HTMLOListElement> {
+}
+
+const DropzoneFileList = forwardRef<HTMLOListElement, DropZoneFileListProps>(
+    (props, ref) => {
+        const context = useDropzoneContext();
+        if (!context) {
+            throw new Error("DropzoneFileList must be used within a Dropzone");
+        }
+        return (
+            <ol
+                ref={ref}
+                aria-label="dropzone-file-list"
+                {...props}
+                className={cn("flex flex-col gap-4", props.className)}
+            >
+                {props.children}
+            </ol>
+        );
+    },
+);
+DropzoneFileList.displayName = "DropzoneFileList";
+
+interface DropzoneFileListItemProps<TUploadRes, TUploadError>
+    extends React.LiHTMLAttributes<HTMLLIElement> {
+    file: FileStatus<TUploadRes, TUploadError>;
+}
+
+const DropzoneFileListItem = forwardRef<
+    HTMLLIElement,
+    DropzoneFileListItemProps<unknown, unknown>
+>(({className, ...props}, ref) => {
+    const fileId = props.file.id;
+    const {
+        onRemoveFile: cOnRemoveFile,
+        onRetry: cOnRetry,
+        getFileMessageId: cGetFileMessageId,
+        canRetry: cCanRetry,
+        inputId: cInputId,
+    } = useDropzoneContext();
+
+    const onRemoveFile = useCallback(
+        () => cOnRemoveFile(fileId),
+        [fileId, cOnRemoveFile],
+    );
+    const onRetry = useCallback(() => cOnRetry(fileId), [fileId, cOnRetry]);
+    const messageId = cGetFileMessageId(fileId);
+    const isInvalid = props.file.status === "error";
+    const canRetry = useMemo(() => cCanRetry(fileId), [fileId, cCanRetry]);
+    return (
+        <DropzoneFileListContext.Provider
+            value={{
+                onRemoveFile,
+                onRetry,
+                fileStatus: props.file,
+                canRetry,
+                dropzoneId: cInputId,
+                messageId,
+            }}
+        >
+            <li
+                ref={ref}
+                aria-label="dropzone-file-list-item"
+                aria-describedby={isInvalid ? messageId : undefined}
+                className={cn(
+                    "flex flex-col justify-center gap-2 rounded-md bg-muted/40 px-4 py-2",
+                    className,
+                )}
+            >
+                {props.children}
+            </li>
+        </DropzoneFileListContext.Provider>
+    );
+});
+DropzoneFileListItem.displayName = "DropzoneFileListItem";
+
+interface DropzoneFileMessageProps
+    extends React.HTMLAttributes<HTMLParagraphElement> {
+}
+
+const DropzoneFileMessage = forwardRef<
+    HTMLParagraphElement,
+    DropzoneFileMessageProps
+>((props, ref) => {
+    const {children, ...rest} = props;
+    const context = useDropzoneFileListContext();
+    if (!context) {
+        throw new Error(
+            "DropzoneFileMessage must be used within a DropzoneFileListItem",
+        );
+    }
+
+    const body =
+        context.fileStatus.status === "error"
+            ? String(context.fileStatus.error)
+            : children;
+    return (
+        <p
+            ref={ref}
+            id={context.messageId}
+            {...rest}
+            className={cn(
+                "h-5 text-[0.8rem] font-medium text-destructive",
+                rest.className,
+            )}
+        >
+            {body}
+        </p>
+    );
+});
+DropzoneFileMessage.displayName = "DropzoneFileMessage";
+
+interface DropzoneMessageProps
+    extends React.HTMLAttributes<HTMLParagraphElement> {
+}
+
+const DropzoneMessage = forwardRef<HTMLParagraphElement, DropzoneMessageProps>(
+    (props, ref) => {
+        const {children, ...rest} = props;
+        const context = useDropzoneContext();
+        if (!context) {
+            throw new Error("DropzoneRootMessage must be used within a Dropzone");
+        }
+
+        const body = context.rootError ? String(context.rootError) : children;
+        return (
+            <p
+                ref={ref}
+                id={context.rootMessageId}
+                {...rest}
+                className={cn(
+                    "h-5 text-[0.8rem] font-medium text-destructive",
+                    rest.className,
+                )}
+            >
+                {body}
+            </p>
+        );
+    },
+);
+DropzoneMessage.displayName = "DropzoneMessage";
+
+interface DropzoneRemoveFileProps extends ButtonVariantsProps {
+    className?: string;
+    children?: React.ReactNode;
+}
+
+const DropzoneRemoveFile = forwardRef<
+    HTMLButtonElement,
+    DropzoneRemoveFileProps
+>(({className, ...props}, ref) => {
+    const context = useDropzoneFileListContext();
+    if (!context) {
+        throw new Error(
+            "DropzoneRemoveFile must be used within a DropzoneFileListItem",
+        );
+    }
+    return (
+        <Button
+            ref={ref}
+            onClick={context.onRemoveFile}
+            type="button"
+            size="icon"
+            {...props}
+            className={cn(
+                "aria-disabled:pointer-events-none aria-disabled:opacity-50",
+                className,
+            )}
+        >
+            {props.children}
+            <span className="sr-only">Remove file</span>
+        </Button>
+    );
+});
+DropzoneRemoveFile.displayName = "DropzoneRemoveFile";
+
+interface DropzoneRetryFileProps extends ButtonVariantsProps {
+    className?: string;
+    children?: React.ReactNode;
+}
+
+const DropzoneRetryFile = forwardRef<HTMLButtonElement, DropzoneRetryFileProps>(
+    ({className, ...props}, ref) => {
+        const context = useDropzoneFileListContext();
+
+        if (!context) {
+            throw new Error(
+                "DropzoneRetryFile must be used within a DropzoneFileListItem",
+            );
+        }
+
+        const canRetry = context.canRetry;
+
+        return (
+            <Button
+                ref={ref}
+                aria-disabled={!canRetry}
+                aria-label="retry"
+                onClick={context.onRetry}
+                type="button"
+                size="icon"
+                {...props}
+                className={cn(
+                    "aria-disabled:pointer-events-none aria-disabled:opacity-50",
+                    className,
+                )}
+            >
+                {props.children}
+                <span className="sr-only">Retry</span>
+            </Button>
+        );
+    },
+);
+DropzoneRetryFile.displayName = "DropzoneRetryFile";
+
+interface DropzoneTriggerProps
+    extends React.LabelHTMLAttributes<HTMLLabelElement> {
+}
+
+const DropzoneTrigger = forwardRef<HTMLLabelElement, DropzoneTriggerProps>(
+    ({className, children, ...props}, ref) => {
+        const context = useDropzoneContext();
+        if (!context) {
+            throw new Error("DropzoneTrigger must be used within a Dropzone");
+        }
+
+        const {fileStatuses, getFileMessageId} = context;
+
+        const fileMessageIds = useMemo(
+            () =>
+                fileStatuses
+                    .filter((file) => file.status === "error")
+                    .map((file) => getFileMessageId(file.id)),
+            [fileStatuses, getFileMessageId],
+        );
+
+        return (
+            <label
+                ref={ref}
+                {...props}
+                className={cn(
+                    "cursor-pointer rounded-sm bg-secondary px-4 py-2 font-medium ring-offset-background transition-colors focus-within:outline-none hover:bg-secondary/80 has-[input:focus-visible]:ring-2 has-[input:focus-visible]:ring-ring has-[input:focus-visible]:ring-offset-2",
+                    className,
+                )}
+            >
+                {children}
+                <input
+                    {...context.getInputProps({
+                        style: {
+                            display: undefined,
+                        },
+                        className: "sr-only",
+                        tabIndex: undefined,
+                    })}
+                    aria-describedby={
+                        context.isInvalid
+                            ? [context.rootMessageId, ...fileMessageIds].join(" ")
+                            : undefined
+                    }
+                    aria-invalid={context.isInvalid}
+                />
+            </label>
+        );
+    },
+);
+DropzoneTrigger.displayName = "DropzoneTrigger";
+
+interface InfiniteProgressProps extends React.HTMLAttributes<HTMLDivElement> {
+    status: "pending" | "success" | "error";
+}
+
+const valueTextMap = {
+    pending: "indeterminate",
+    success: "100%",
+    error: "error",
+};
+
+const InfiniteProgress = forwardRef<HTMLDivElement, InfiniteProgressProps>(
+    ({className, ...props}, ref) => {
+        const done = props.status === "success" || props.status === "error";
+        const error = props.status === "error";
+        return (
+            <div
+                ref={ref}
+                role="progressbar"
+                aria-valuemin={0}
+                aria-valuemax={100}
+                aria-valuetext={valueTextMap[props.status]}
+                {...props}
+                className={cn(
+                    "relative h-2 w-full overflow-hidden rounded-full bg-muted",
+                    className,
+                )}
+            >
+                <div
+                    //   TODO: add proper done transition
+                    className={cn(
+                        "h-full w-full rounded-full bg-primary",
+                        done ? "translate-x-0" : "animate-infinite-progress",
+                        error && "bg-destructive",
+                    )}
+                />
+            </div>
+        );
+    },
+);
+InfiniteProgress.displayName = "InfiniteProgress";
+
+export {
+    Dropzone,
+    DropZoneArea,
+    DropzoneDescription,
+    DropzoneFileList,
+    DropzoneFileListItem,
+    DropzoneFileMessage,
+    DropzoneMessage,
+    DropzoneRemoveFile,
+    DropzoneRetryFile,
+    DropzoneTrigger,
+    InfiniteProgress,
+    useDropzone,
+};

src/components/wrappers/auth/auth-logo-section.tsx

@@ -1,31 +1,49 @@
-"use client"
-import {env} from "@/env.mjs";
-import React, {useEffect, useState} from "react";
-import {useTheme} from "next-themes";
+"use client";
 
+import {env} from "@/env.mjs";
+import {useTheme} from "next-themes";
+import Image from "next/image";
+import {useEffect, useState} from "react";
 
 export const AuthLogoSection = () => {
-
     const {resolvedTheme} = useTheme();
     const [mounted, setMounted] = useState(false);
+    const [loaded, setLoaded] = useState(false);
 
     useEffect(() => {
         setMounted(true);
     }, []);
 
-    if (!mounted) return null;
+    const imageTheme =
+        resolvedTheme === "dark"
+            ? "/images/logo-dark.png"
+            : "/images/logo-light.png";
 
+    const handleLoad = () => setLoaded(true);
+
+    const style = {
+        transition: "opacity 0.3s ease-in-out",
+        opacity: loaded ? 1 : 0,
+    };
 
-    const imageTheme = resolvedTheme === "dark" ? "/images/logo-white.png" : "/images/logo-black.png";
 
     return (
-        <div className="sm:mx-auto sm:w-full sm:max-w-md flex items-center justify-center space-x-2">
-            <img
-                className="p-12 text-black dark:text-white"
-                src={imageTheme}
-                alt="Logo"
-            />
-            <span className="text-sm text-muted-foreground -ml-12 -mb-12">v{env.NEXT_PUBLIC_PROJECT_VERSION}</span>
+        <div className="sm:mx-auto sm:w-full sm:max-w-md relative flex items-center justify-center h-[160px]">
+            {mounted && (
+                <Image
+                    src={imageTheme}
+                    alt="Logo"
+                    fill
+                    priority
+                    className="object-contain p-10"
+                    onLoad={handleLoad}
+                    style={style}
+
+                />
+            )}
+            <span className="absolute bottom-10 right-5 text-sm text-muted-foreground" style={style}>
+                v{env.NEXT_PUBLIC_PROJECT_VERSION}
+            </span>
         </div>
-    )
-}
+    );
+};

src/components/wrappers/auth/login/forgot-password-form/forgot-password-form.tsx

@@ -30,7 +30,7 @@ export const ForgotPasswordForm = (props: ForgotPasswordFormProps) => {
                 },
                 {
                     onSuccess: () => {
-                        toast.success("Password reset successfully.");
+                        toast.success("If an account with this email address exists, you will receive an email with instructions to reset your password.");
                     },
                     onError: (error) => {
                         toast.error(error.error.message);

src/components/wrappers/auth/login/login-form/login-form.tsx

@@ -63,6 +63,7 @@ export const LoginForm = (props: loginFormProps) => {
                         toast.success("Login success");
                     },
                     onError: (error) => {
+                        console.log(error);
                         toast.error(error.error.message);
                     },
                 }

src/components/wrappers/auth/register/register-form/register-form.tsx

@@ -15,6 +15,7 @@ import {RegisterSchema, RegisterType} from "@/components/wrappers/auth/register/
 import {PasswordInput} from "@/components/ui/password-input";
 import {signUp} from "@/lib/auth/auth-client";
 import Link from "next/link";
+import {CardAuth} from "@/features/layout/card-auth";
 
 export type registerFormProps = {
     defaultValues?: RegisterType;
@@ -45,7 +46,7 @@ export const RegisterForm = (props: registerFormProps) => {
 
     return (
         <TooltipProvider>
-            <Card>
+            <CardAuth>
                 <CardHeader>
                     <div className="grid gap-2 text-center mb-2">
                         <h1 className="text-3xl font-bold">Create an account</h1>
@@ -144,7 +145,7 @@ export const RegisterForm = (props: registerFormProps) => {
 
                     </Form>
                 </CardContent>
-            </Card>
+            </CardAuth>
         </TooltipProvider>
     );
 };

src/components/wrappers/auth/reset-password/reset-password-form.tsx

@@ -10,6 +10,7 @@ import {Card, CardContent, CardHeader} from "@/components/ui/card";
 import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
 import {authClient} from "@/lib/auth/auth-client";
 import {toast} from "sonner";
+import {CardAuth} from "@/features/layout/card-auth";
 
 type ResetPasswordFormProps = {
     token: string;
@@ -43,7 +44,7 @@ export const ResetPasswordForm = ({token}: ResetPasswordFormProps) => {
     });
 
     return (
-        <Card>
+        <CardAuth>
             <CardHeader>
                 <div className="grid gap-2 text-center mb-2">
                     <h1 className="text-3xl font-bold">Reset Password</h1>
@@ -89,6 +90,6 @@ export const ResetPasswordForm = ({token}: ResetPasswordFormProps) => {
                     </ButtonWithLoading>
                 </Form>
             </CardContent>
-        </Card>
+        </CardAuth>
     );
 };

src/components/wrappers/common/combobox.tsx

@@ -60,6 +60,7 @@ export function ComboBox<T = string>(props: ComboBoxProps<T>) {
                     align="start"
                     sideOffset={4}
                     style={{ width: 'var(--radix-popover-trigger-width)' }}
+
                 >
                     <Command>
                         {searchField && <CommandInput placeholder="Search choice..." className="h-9"/>}

src/components/wrappers/common/dropzone/dropzone-file.tsx

@@ -0,0 +1,137 @@
+"use client";
+
+import {
+    CircleCheck,
+    CircleX,
+    CloudUploadIcon,
+    Loader2,
+    Trash2Icon,
+} from "lucide-react";
+import {
+    DropZoneArea,
+    DropzoneDescription,
+    DropzoneFileList,
+    DropzoneFileListItem,
+    DropzoneMessage,
+    DropzoneRemoveFile,
+    DropzoneTrigger,
+    useDropzone,
+    Dropzone,
+} from "@/components/ui/dropzone";
+
+type DropZoneFileProps = {
+    onFileDropAction?: (file: File) => Promise<void> | void;
+    onFileRemoveAction?: (file: File) => void;
+    accept?: Record<string, string[]>;
+    maxSize?: number;
+    maxFiles?: number;
+    description?: string;
+    fileKind?: string;
+    dragMessage?: string;
+    fileList?: boolean;
+};
+
+
+export const DropZoneFile = ({
+                                 onFileDropAction,
+                                 onFileRemoveAction,
+                                 accept = {"application/pdf": [".pdf"]},
+                                 maxSize = 50 * 1024 * 1024,
+                                 maxFiles = 1,
+                                 description = "Please select a file",
+                                 fileKind = "Upload files (.pdf)",
+                                 dragMessage = "Click here or drag & drop to upload",
+                                 fileList = true
+                             }: DropZoneFileProps) => {
+    const dropzone = useDropzone({
+        onDropFile: async (file: File) => {
+            onFileDropAction?.(file);
+
+            return {
+                status: "success",
+                result: URL.createObjectURL(file),
+            };
+        },
+        validation: {
+            accept,
+            maxSize,
+            maxFiles,
+        },
+    });
+
+    const handleRemove = (file: any) => {
+        dropzone.onRemoveFile(file.id);
+        onFileRemoveAction?.(file.file);
+    };
+
+    return (
+        <div className="not-prose flex flex-col gap-4 h-full">
+            <Dropzone {...dropzone}>
+                <div className="h-full">
+                    {dropzone.fileStatuses.length < maxFiles && (
+                        <div className="flex flex-col h-full">
+                            <div className="flex justify-between">
+                                <DropzoneDescription>{description}</DropzoneDescription>
+                                <DropzoneMessage/>
+                            </div>
+                            <DropZoneArea className="flex-1 px-0 py-0 mt-2">
+                                <DropzoneTrigger
+                                    className="flex h-full w-full flex-col items-center justify-center gap-4 bg-transparent p-10 text-center text-sm">
+                                    <CloudUploadIcon className="size-8"/>
+                                    <div>
+                                        <p className="font-semibold">{fileKind}</p>
+                                        <p className="text-sm text-muted-foreground">
+                                            {dragMessage}
+                                        </p>
+                                    </div>
+                                </DropzoneTrigger>
+                            </DropZoneArea>
+                        </div>
+                    )}
+                </div>
+                {fileList && (
+                    <DropzoneFileList className="grid gap-3 p-0">
+                        {dropzone.fileStatuses.map((file) => (
+                            <DropzoneFileListItem
+                                key={file.id}
+                                file={file}
+                                className="overflow-hidden rounded-md bg-secondary p-0 shadow-sm"
+                            >
+                                <div className="flex items-center justify-between p-2 pl-4">
+                                    <div className="flex overflow-hidden items-center gap-3">
+                                        <div>
+                                            {file.status === "pending" ? (
+                                                <Loader2 className="animate-spin" size={16}/>
+                                            ) : file.status === "error" ? (
+                                                <CircleX className="text-red-600" size={16}/>
+                                            ) : (
+                                                <CircleCheck className="text-green-700" size={16}/>
+                                            )}
+                                        </div>
+                                        <div className="min-w-0">
+                                            <div className="truncate text-sm flex">
+                                                <span>{file.fileName}</span>
+                                            </div>
+                                            <p className="text-xs text-muted-foreground">
+                                                {(file.file.size / (1024 * 1024)).toFixed(2)} MB
+                                            </p>
+                                        </div>
+                                    </div>
+                                    <DropzoneRemoveFile
+                                        variant="ghost"
+                                        className="shrink-0 hover:outline"
+                                        // @ts-ignore
+                                        onClick={() => handleRemove(file)}
+                                    >
+                                        <Trash2Icon className="size-4"/>
+                                    </DropzoneRemoveFile>
+                                </div>
+                            </DropzoneFileListItem>
+                        ))}
+                    </DropzoneFileList>
+                )}
+
+            </Dropzone>
+        </div>
+    );
+};

src/components/wrappers/dashboard/agent/agent-content.tsx

@@ -0,0 +1,79 @@
+"use client"
+
+import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
+import {Server} from "lucide-react";
+import {formatDateLastContact} from "@/utils/date-formatting";
+import {AgentCardKey} from "@/components/wrappers/dashboard/agent/agent-card-key/agent-card-key";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {DatabaseCard} from "@/components/wrappers/dashboard/projects/project-card/project-database-card";
+import {AgentWithDatabases} from "@/db/schema/08_agent";
+import {eventUpdate} from "@/types/events";
+import {useAutoRefresh} from "@/hooks/use-auto-refresh";
+
+type AgentContentPageProps = {
+    edgeKey: string;
+    agent: AgentWithDatabases
+
+}
+
+export const AgentContentPage = ({edgeKey, agent}: AgentContentPageProps) => {
+
+    useAutoRefresh({
+        poll: {
+            enabled: true,
+            intervalMs: 5000,
+        },
+        sse: {
+            enabled: true,
+            url: "/api/events",
+            eventName: "modification",
+            shouldRefresh: (data) => {
+                const update = data as eventUpdate;
+                return Boolean(update?.update);
+            },
+        },
+    });
+
+
+    return (
+        <>
+            <div className="flex flex-col sm:flex-row sm:justify-between gap-6 ">
+                <Card className="w-full sm:w-auto flex-1">
+                    <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                        <CardTitle className="text-sm font-medium">Databases</CardTitle>
+                        <Server className="h-4 w-4 text-muted-foreground"/>
+                    </CardHeader>
+                    <CardContent>
+                        <div className="text-2xl font-bold">{agent.databases.length}</div>
+                        <p className="text-xs text-muted-foreground">Databases linked to this agent</p>
+                    </CardContent>
+                </Card>
+
+                <Card className="w-full sm:w-auto flex-1">
+                    <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                        <CardTitle className="text-sm font-medium">Last contact</CardTitle>
+                        <Server className="h-4 w-4 text-muted-foreground"/>
+                    </CardHeader>
+                    <CardContent>
+                        <div className="text-2xl font-bold">{formatDateLastContact(agent.lastContact)}</div>
+                        <p className="text-xs text-muted-foreground">Last contact with agent</p>
+                    </CardContent>
+                </Card>
+
+            </div>
+            <Card className="w-full sm:w-auto flex-1 ">
+                <CardHeader className="font-bold text-xl">
+                    Edge Key
+                </CardHeader>
+                <CardContent>
+                    <AgentCardKey
+                        edgeKey={edgeKey}
+                    />
+                </CardContent>
+            </Card>
+            <CardsWithPagination cardsPerPage={4} numberOfColumns={2} data={agent.databases}
+                                 cardItem={DatabaseCard}/>
+
+        </>
+    )
+}

src/components/wrappers/dashboard/common/logged-in/logged-in-button.server.tsx

@@ -0,0 +1,23 @@
+import {currentUser} from "@/lib/auth/current-user";
+import {getAccounts, getSession, getSessions} from "@/lib/auth/auth";
+import {LoggedInButtonClient} from "./logged-in-button";
+
+export const LoggedInButton = async () => {
+    const user = await currentUser();
+    const sessions = await getSessions();
+    const currentSession = await getSession();
+    const accounts = await getAccounts();
+
+
+    if (!user) return null;
+
+    return (
+        <LoggedInButtonClient
+            user={user}
+            sessions={sessions}
+             // @ts-ignore
+            currentSession={currentSession.session}
+            accounts={accounts}
+        />
+    );
+};

src/components/wrappers/dashboard/common/logged-in/logged-in-button.tsx

@@ -1,43 +1,83 @@
-import { ChevronUp } from "lucide-react";
+// import { ChevronUp } from "lucide-react";
+//
+// import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";
+// import { currentUser } from "@/lib/auth/current-user";
+// import { SidebarMenuButton } from "@/components/ui/sidebar";
+// import { getAccounts, getSession, getSessions } from "@/lib/auth/auth";
+// import {LoggedInDropdown} from "@/components/wrappers/dashboard/common/logged-in/logged-in-dropdown";
+//
+// export const LoggedInButton = async () => {
+//     const user = await currentUser();
+//     const sessions = await getSessions();
+//     const currentSession = await getSession();
+//     const accounts = await getAccounts();
+//
+//     if (!user) return null;
+//
+//
+//     return (
+//         <>
+//             <LoggedInDropdown
+//                 // @ts-ignore
+//                 user={user}
+//                 // @ts-ignore
+//                 sessions={sessions}
+//                 // @ts-ignore
+//                 currentSession={currentSession.session}
+//                 // @ts-ignore
+//                 accounts={accounts}
+//             >
+//                 <SidebarMenuButton>
+//
+//                     <Avatar className="size-6">
+//                         <AvatarFallback>{user?.name[0].toUpperCase()}</AvatarFallback>
+//                         {user?.image ? <AvatarImage src={user?.image} alt={`${user.name ?? "-"}'s profile picture`} /> : null}
+//                     </Avatar>
+//
+//                     <span className="first-letter:capitalize">{user?.name}</span>
+//                     <ChevronUp className="ml-auto" />
+//                 </SidebarMenuButton>
+//             </LoggedInDropdown>
+//         </>
+//     );
+// };
+"use client";
 
+import {ChevronUp} from "lucide-react";
 import {Avatar, AvatarFallback, AvatarImage} from "@/components/ui/avatar";
-import { currentUser } from "@/lib/auth/current-user";
-import { SidebarMenuButton } from "@/components/ui/sidebar";
-import { getAccounts, getSession, getSessions } from "@/lib/auth/auth";
-import {LoggedInDropdown} from "@/components/wrappers/dashboard/common/logged-in/logged-in-dropdown";
+import {SidebarMenuButton} from "@/components/ui/sidebar";
+import {LoggedInDropdown} from "./logged-in-dropdown";
+import {Account, Session, User} from "better-auth";
 
-export const LoggedInButton = async () => {
-    const user = await currentUser();
-    const sessions = await getSessions();
-    const currentSession = await getSession();
-    const accounts = await getAccounts();
-
-    // if (!user) return null;
+type LoggedInButtonClientProps = {
+    user: User;
+    sessions: Session[];
+    currentSession: Session;
+    accounts: Account[];
+}
 
+export const LoggedInButtonClient = ({user, sessions, currentSession, accounts}: LoggedInButtonClientProps) => {
 
     return (
-        <>
-            <LoggedInDropdown
-                // @ts-ignore
-                user={user}
-                // @ts-ignore
-                sessions={sessions}
-                // @ts-ignore
-                currentSession={currentSession.session}
-                // @ts-ignore
-                accounts={accounts}
-            >
-                <SidebarMenuButton>
+        <LoggedInDropdown
+            // @ts-ignore
+            user={user}
+            // @ts-ignore
+            sessions={sessions}
+            // @ts-ignore
+            currentSession={currentSession}
+            // @ts-ignore
+            accounts={accounts}
+        >
+            <SidebarMenuButton type="button">
+                <Avatar className="size-6">
+                    <AvatarFallback>{user.name[0].toUpperCase()}</AvatarFallback>
+                    {user.image && <AvatarImage src={user.image}/>}
+                </Avatar>
 
-                    <Avatar className="size-6">
-                        <AvatarFallback>{user?.name[0].toUpperCase()}</AvatarFallback>
-                        {user?.image ? <AvatarImage src={user?.image} alt={`${user.name ?? "-"}'s profile picture`} /> : null}
-                    </Avatar>
-
-                    <span className="first-letter:capitalize">{user?.name}</span>
-                    <ChevronUp className="ml-auto" />
-                </SidebarMenuButton>
-            </LoggedInDropdown>
-        </>
+                <span className="first-letter:capitalize">{user.name}</span>
+                <ChevronUp className="ml-auto"/>
+            </SidebarMenuButton>
+        </LoggedInDropdown>
     );
 };

src/components/wrappers/dashboard/common/sidebar/app-sidebar.tsx

@@ -9,13 +9,13 @@ import {SidebarLogo} from "@/components/wrappers/dashboard/common/sidebar/logo-s
 import {SidebarMenuCustomMain} from "@/components/wrappers/dashboard/common/sidebar/menu-sidebar-main";
 import {SideBarFooterCredit} from "@/components/wrappers/dashboard/common/sidebar/side-bar-footer-credit";
 import {OrganizationCombobox} from "@/components/wrappers/dashboard/organization/organization-combobox";
-import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button";
 import {env} from "@/env.mjs";
+import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button.server";
 
 export function AppSidebar() {
     const projectName = env.PROJECT_NAME;
     return (
-        <Sidebar collapsible="icon">
+        <Sidebar collapsible="icon" >
             <SidebarHeader>
                 <SidebarMenu>
                     <SidebarMenuItem>

src/components/wrappers/dashboard/common/sidebar/logo-sidebar.tsx

@@ -1,48 +1,64 @@
-"use client"
+"use client";
 
 import { useSidebar } from "@/components/ui/sidebar";
 import Link from "next/link";
 import { useTheme } from "next-themes";
 import Image from "next/image";
 import { useEffect, useState } from "react";
+import {Skeleton} from "@/components/ui/skeleton";
 
-export const SidebarLogo = ({projectName}: {
-    projectName: string;
-}) => {
+export const SidebarLogo = ({ projectName }: { projectName: string }) => {
     const { state, isMobile } = useSidebar();
     const { resolvedTheme } = useTheme();
 
     const [mounted, setMounted] = useState(false);
+    const [loaded, setLoaded] = useState(false);
 
     useEffect(() => {
         setMounted(true);
     }, []);
 
-    if (!mounted) return null;
+    if (!mounted) return(
+        <div className="m-4 w-[190px] h-[45px]">
+            <Skeleton className="w-full h-full bg-transparent" />
+        </div>
+    );
 
-    const imageTheme = resolvedTheme === "dark" ? "/images/logo-white.png" : "/images/logo-black.png";
+    const imageTheme =
+        resolvedTheme === "dark" ? "/images/logo-dark.png" : "/images/logo-light.png";
+
+    const handleLoad = () => setLoaded(true);
+
+    const style = {
+        transition: "opacity 0.3s ease-in-out",
+        opacity: loaded ? 1 : 0,
+    };
 
     return (
         <div className="ml-1 flex items-center justify-center">
-            <Link href={"/dashboard/home"}>
-                {state === 'collapsed' && !isMobile ? (
+            <Link href="/dashboard/home">
+                {state === "collapsed" && !isMobile ? (
                     <Image
-                        loading="eager"
-                        src={"/images/logo.png"}
+                        src="/images/logo.png"
                         alt={`Logo ${projectName}`}
-                        className="h-10 w-10 object-contain"
-                        height={10}
-                        width={10}
+                        width={40}
+                        height={40}
+                        loading="eager"
+                        priority
+                        style={style}
+                        onLoad={handleLoad}
                     />
                 ) : (
-                    <div className="m-4">
+                    <div className="m-4 w-[190px] h-[45px] ">
                         <Image
-                            loading="eager"
                             src={imageTheme}
                             alt={`Logo ${projectName}`}
-                            className="object-contain"
                             width={190}
                             height={90}
+                            loading="eager"
+                            priority
+                            style={style}
+                            onLoad={handleLoad}
                         />
                     </div>
                 )}

src/components/wrappers/dashboard/database/import/import-modal.tsx

@@ -0,0 +1,46 @@
+"use client"
+
+import {useState} from "react";
+import {
+    Dialog,
+    DialogContent,
+    DialogDescription,
+    DialogHeader,
+    DialogTitle,
+    DialogTrigger
+} from "@/components/ui/dialog";
+import {Button} from "@/components/ui/button";
+import {DatabaseWith} from "@/db/schema/07_database";
+import {Separator} from "@/components/ui/separator";
+import {Import} from "lucide-react";
+import {UploadBackupZone} from "@/components/wrappers/dashboard/database/import/upload-backup-zone";
+
+type ImportModalProps = {
+    database: DatabaseWith;
+}
+
+export const ImportModal = ({database}: ImportModalProps) => {
+    const [open, setOpen] = useState(false);
+
+    return (
+        <Dialog open={open} onOpenChange={setOpen}>
+            <DialogTrigger asChild>
+                <Button variant="outline" onClick={() => setOpen(true)}>
+                    <Import/>
+                </Button>
+            </DialogTrigger>
+            <DialogContent>
+                <DialogHeader>
+                    <DialogTitle>Import Backup</DialogTitle>
+                    <DialogDescription>
+                        Import backup file of your choice.
+                    </DialogDescription>
+                    <Separator className="mt-3 "/>
+                    <UploadBackupZone
+                        onSuccessAction={() => setOpen(false)}
+                        databaseId={database.id}/>
+                </DialogHeader>
+            </DialogContent>
+        </Dialog>
+    )
+}

src/components/wrappers/dashboard/database/import/upload-backup-zone.tsx

@@ -0,0 +1,108 @@
+"use client";
+
+import {DropZoneFile} from "@/components/wrappers/common/dropzone/dropzone-file";
+import {useMutation} from "@tanstack/react-query";
+import {useState} from "react";
+import {Loader2} from "lucide-react";
+import {useRouter} from "next/navigation";
+import {ButtonWithLoading} from "@/components/wrappers/common/button/button-with-loading";
+import {toast} from "sonner";
+import {uploadBackupAction} from "@/components/wrappers/dashboard/database/import/upload-backup.action";
+import {Card, CardContent} from "@/components/ui/card";
+
+type UploadRetentionZoneProps = {
+    onSuccessAction?: () => void;
+    databaseId: string;
+};
+
+export const UploadBackupZone = ({onSuccessAction, databaseId}: UploadRetentionZoneProps) => {
+    const router = useRouter();
+
+    const [isProcessing, setIsProcessing] = useState(false);
+    const [file, setFile] = useState<File | null>(null);
+
+    const mutationUpload = useMutation({
+        mutationFn: async (file: File) => {
+
+            try {
+                setIsProcessing(true);
+
+                const formData = new FormData();
+                formData.append("file", file);
+                formData.append("databaseId", databaseId);
+
+                const result = await uploadBackupAction(formData)
+
+                const inner = result?.data;
+                if (inner?.success) {
+                    toast.success(inner.actionSuccess?.message);
+                    onSuccessAction?.()
+                    router.refresh();
+                } else {
+                    toast.error(inner?.actionError?.message);
+                }
+            } catch (err) {
+                console.error(err);
+                toast.error("An error occurred while upload in the backup");
+            } finally {
+                router.refresh();
+                setIsProcessing(false);
+            }
+        },
+    });
+
+
+    const acceptDbImportFiles: Record<string, string[]> = {
+        "application/sql": [".sql"],
+        "application/x-sql": [".sql"],
+        "text/plain": [".sql"],
+        "application/octet-stream": [".dump"],
+    };
+
+    return (
+        <>
+            {isProcessing ? (
+                <UploadLoader label="Uploading database backup…"/>
+            ) : (
+                <DropZoneFile
+                    accept={acceptDbImportFiles}
+                    maxSize={500 * 1024 * 1024}
+                    maxFiles={1}
+                    description="Import database backup"
+                    fileKind="Database file (.sql, .dump)"
+                    dragMessage="Click or drag a database dump here"
+                    onFileDropAction={(file: File) => setFile(file)}
+                />
+            )}
+
+            {(!isProcessing && file) && (
+                <div className="flex gap-4 justify-end">
+                    <ButtonWithLoading
+                        onClick={() => mutationUpload.mutateAsync(file)}
+                        isPending={false}>
+                        Upload
+                    </ButtonWithLoading>
+                </div>
+            )}
+
+
+        </>
+    );
+};
+
+
+const UploadLoader = ({label = "Processing uploading..."}: { label?: string }) => {
+    return (
+        <Card className="w-full border">
+            <CardContent className="flex flex-col items-center justify-center gap-3 py-10 text-muted-foreground">
+                <div className="relative">
+                    <Loader2 className="w-8 h-8 animate-spin inset-0"/>
+                </div>
+                <p className="text-sm font-medium">{label}</p>
+                <p className="text-xs text-muted-foreground">
+                    Do not close this window
+                </p>
+            </CardContent>
+        </Card>
+    );
+};

src/components/wrappers/dashboard/database/import/upload-backup.action.ts

@@ -0,0 +1,111 @@
+"use server"
+import {userAction} from "@/lib/safe-actions/actions";
+import {ServerActionResult} from "@/types/action-type";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {Backup} from "@/db/schema/07_database";
+import {getFileExtension} from "../../../../../../app/api/agent/[agentId]/backup/helpers";
+import {v4 as uuidv4} from "uuid";
+import {eq} from "drizzle-orm";
+import {uploadLocalPrivate, uploadS3Private} from "@/features/upload/private/upload.action";
+import {z} from "zod";
+import {env} from "@/env.mjs";
+
+
+export const uploadBackupAction = userAction
+    .schema(z.instanceof(FormData))
+    .action(async ({parsedInput: formData}): Promise<ServerActionResult<Backup>> => {
+        try {
+            const file = formData.get("file") as File;
+            const databaseId = formData.get("databaseId") as string;
+
+            const database = await db.query.database.findFirst({
+                where: eq(drizzleDb.schemas.database.id, databaseId),
+                with: {
+                    project: true,
+                    alertPolicies: true
+                }
+            });
+
+            if (!database) {
+                return {
+                    success: false,
+                    actionError: {
+                        message: "Database does not exist",
+                        status: 500,
+                        cause: "Unknown error",
+                    },
+                };
+            }
+
+            const fileExtension = getFileExtension(database.dbms)
+
+            const arrayBuffer = await file.arrayBuffer();
+
+            const uuid = uuidv4();
+            const fileName = `imported_${uuid}${fileExtension}`;
+            const buffer = Buffer.from(arrayBuffer);
+
+            const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
+
+            if (!settings) {
+                return {
+                    success: false,
+                    actionError: {
+                        message: "Settings not set",
+                        status: 500,
+                        cause: "Unknown error",
+                    },
+                };
+            }
+
+            let success: boolean, message: string, filePath: string;
+
+            const result =
+                settings.storage === "local"
+                    ? await uploadLocalPrivate(fileName, buffer)
+                    : await uploadS3Private(`${database.project?.slug}/${fileName}`, buffer, env.S3_BUCKET_NAME!);
+
+            ({success, message, filePath} = result);
+
+            if (!success) {
+                return {
+                    success: false,
+                    actionError: {
+                        message: "An error has occurred while uploading file",
+                        status: 500,
+                        cause: "Unknown error",
+                    },
+                };
+            }
+
+            const [backup] = await db
+                .insert(drizzleDb.schemas.backup)
+                .values({
+                    status: 'success',
+                    databaseId: database.id,
+                    file: fileName,
+                })
+                .returning();
+
+
+            return {
+                success: true,
+                value: backup,
+                actionSuccess: {
+                    message: `Backup successfully imported`,
+                },
+            };
+
+        } catch (error) {
+            return {
+                success: false,
+                actionError: {
+                    message: "Failed to import backup.",
+                    status: 500,
+                    cause: error instanceof Error ? error.message : "Unknown error",
+                },
+            };
+        }
+    });
+

src/components/wrappers/dashboard/organization/organization-combobox.tsx

@@ -13,9 +13,12 @@ export function OrganizationCombobox() {
     const {data: activeOrganization, refetch: refetchActiveOrga} = authClient.useActiveOrganization();
     const [openModal, setOpenModal] = useState(false);
 
-    if (!organizations) return null;
+    // if (!organizations) return null;
+
+    // const values = organizations.map(org => ({ value: org.slug, label: org.name }));
+    const values = organizations?.map(org => ({ value: org.slug, label: org.name })) ?? [];
+
 
-    const values = organizations.map(org => ({ value: org.slug, label: org.name }));
 
     const onValueChange = async (slug: string) => {
         await authClient.organization.setActive({ organizationSlug: slug });

src/components/wrappers/dashboard/profile/modal/setup-2fa-modal.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import {useState} from "react";
+import React, {useState} from "react";
 import {Button} from "@/components/ui/button";
 import {
     Dialog,
@@ -24,6 +24,7 @@ import z from "zod";
 import {zPassword} from "@/lib/zod";
 import {BackupCodesList} from "../components/backup-codes-list";
 import {PasswordInput} from "@/components/ui/password-input";
+import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
 
 const PasswordSchema = z.object({
     password: zPassword(),
@@ -34,9 +35,10 @@ type Password = z.infer<typeof PasswordSchema>;
 type Setup2FAModalProps = {
     onOpenChange: (open: boolean) => void;
     open: boolean;
+    disabled: boolean;
 };
 
-export function Setup2FAProfileProviderModal({onOpenChange, open}: Setup2FAModalProps) {
+export function Setup2FAProfileProviderModal({onOpenChange, open, disabled}: Setup2FAModalProps) {
 
     const router = useRouter();
     const [step, setStep] = useState<"PASSWORD" | "QR" | "BACKUP">("PASSWORD");
@@ -113,10 +115,9 @@ export function Setup2FAProfileProviderModal({onOpenChange, open}: Setup2FAModal
     };
 
 
-
     return (
         <Dialog open={open} onOpenChange={(v) => (!v ? handleClose() : onOpenChange(v))}>
-            <DialogTrigger asChild>
+            <DialogTrigger asChild disabled={disabled}>
                 <Button variant="outline" size="sm">
                     <ShieldCheck className="w-4 h-4 mr-2"/>
                     Enable Two-Factor
@@ -177,7 +178,8 @@ export function Setup2FAProfileProviderModal({onOpenChange, open}: Setup2FAModal
                             </div>
 
                             <div className="w-full space-y-2">
-                                <p className="text-xs text-muted-foreground text-center">If you are unable to scan the QR code, you can manually enter the secret key into your authentication app :</p>
+                                <p className="text-xs text-muted-foreground text-center">If you are unable to scan the
+                                    QR code, you can manually enter the secret key into your authentication app :</p>
                                 <div className="flex items-center gap-2">
                                     <code
                                         className="flex-1 bg-muted p-2 rounded text-xs font-mono break-all text-center">{secret}</code>
@@ -237,7 +239,8 @@ export function Setup2FAProfileProviderModal({onOpenChange, open}: Setup2FAModal
                                className="border-green-200 bg-green-50 dark:bg-green-900/20 dark:border-green-900">
                             <CheckCircle2 className="h-4 w-4 text-green-600 dark:text-green-400"/>
                             <AlertDescription
-                                className="text-green-700 dark:text-green-400">Two Factor Authentication is now enabled on your account.</AlertDescription>
+                                className="text-green-700 dark:text-green-400">Two Factor Authentication is now enabled
+                                on your account.</AlertDescription>
                         </Alert>
 
                         <BackupCodesList codes={backupCodes}/>

src/components/wrappers/dashboard/profile/profile-apperance.tsx

@@ -40,7 +40,7 @@ function ThemeSelector() {
                         )}
                         onClick={async () => {
                             // setTheme(item.value)
-                            // await authClient.updateUser({theme: item.value});
+                            await authClient.updateUser({theme: item.value});
                         }}
                     >
                         <div

src/components/wrappers/dashboard/profile/profile-providers.tsx

@@ -21,39 +21,44 @@ interface ProfileProviderProps {
 export function ProfileProviders({accounts}: ProfileProviderProps) {
     const router = useRouter();
     const totalConnected = accounts.length;
+    const [loadingProvider, setLoadingProvider] = useState<string | null>(null);
 
     const [isPasswordDialogOpen, setIsPasswordDialogOpen] = useState(false);
 
-    const {mutate: unlinkAccount, isPending: isUnlinking} = useMutation({
+    const {mutate: unlinkAccount} = useMutation({
         mutationFn: async (providerId: string) => {
-            const {error} = await authClient.unlinkAccount({
-                providerId,
-            });
+            setLoadingProvider(providerId);
+            const {error} = await authClient.unlinkAccount({ providerId });
             if (error) throw error;
         },
         onSuccess: () => {
             toast.success("Provider successfully unlinked!");
+            setLoadingProvider(null);
             router.refresh();
         },
         onError: () => {
             toast.error("An error occurred while unlinking provider.");
+            setLoadingProvider(null);
         },
     });
 
-    const {mutate: linkAccount, isPending: isLinking} = useMutation({
+    const {mutate: linkAccount} = useMutation({
         mutationFn: async (providerId: string) => {
+            setLoadingProvider(providerId);
             const {error} = await authClient.signIn.social({
-                provider: providerId as "google" | "github",
+                provider: providerId as "google" | "github" | "credential",
                 callbackURL: "/dashboard",
             });
             if (error) throw error;
         },
         onSuccess: () => {
             toast.success("Provider successfully Linked!");
+            setLoadingProvider(null);
             router.refresh();
         },
         onError: () => {
-            toast.error("An error occurred while linked provider.");
+            toast.error("An error occurred while linking provider.");
+            setLoadingProvider(null);
         },
     });
 
@@ -68,9 +73,10 @@ export function ProfileProviders({accounts}: ProfileProviderProps) {
                 {SUPPORTED_PROVIDERS.map((provider) => {
                     const linkedAccount = accounts.find((acc) => acc.providerId === provider.id);
                     const isConnected = !!linkedAccount;
-
-                    const canUnlink = totalConnected > 1 || (totalConnected === 1 && !provider.isManual);
-                    const isLoading = isUnlinking || isLinking;
+                    // const canUnlink = totalConnected > 1 || (totalConnected === 1 && !provider.isManual);
+                    const canUnlink = totalConnected > 1 ;
+                    // const isLoading = isUnlinking || isLinking;
+                    const isLoading = loadingProvider === provider.id;
 
                     return (
                         <div key={provider.id}

src/components/wrappers/dashboard/profile/profile-security.tsx

@@ -74,11 +74,9 @@ export function ProfileSecurity({user, sessions, credentialAccount, currentSessi
                         <div className="space-y-1">
                             <div className="font-medium">Password</div>
                             <div className="text-sm text-muted-foreground">
-                                {/*{user.lastChangedPasswordAt*/}
-                                {/*    ? t("sections.authentication.password.description.last_changed", {*/}
-                                {/*          date: timeAgo(new Date(user.lastChangedPasswordAt), locale),*/}
-                                {/*      })*/}
-                                {/*    : "Never changed"}*/}
+                                {user.lastChangedPasswordAt
+                                    ?  `Last changed ${timeAgo(new Date(user.lastChangedPasswordAt))}`
+                                    : "Never changed"}
                             </div>
                         </div>
                         {credentialAccount ? (
@@ -116,8 +114,11 @@ export function ProfileSecurity({user, sessions, credentialAccount, currentSessi
                                                                 onOpenChange={setIsDisable2FADialogOpen}/>
                             </div>
                         ) : (
-                            <Setup2FAProfileProviderModal open={isSetup2FADialogOpen}
-                                                          onOpenChange={setIsSetup2FADialogOpen}/>
+                            <Setup2FAProfileProviderModal
+                                disabled={!credentialAccount}
+                                open={isSetup2FADialogOpen}
+                                onOpenChange={setIsSetup2FADialogOpen}
+                            />
                         )}
                     </div>
                 </div>

src/components/wrappers/dashboard/projects/database/database-backup-list.tsx

@@ -38,8 +38,6 @@ export const DatabaseBackupList = (props: DatabaseBackupListProps) => {
         if (!props.backups) return [];
 
         return props.backups.filter(backup => {
-
-            // --- Status Filter ---
             if (selectedFilters.length > 0) {
                 const selectedValues = selectedFilters.map(f => f.value);
                 const status = backup.deletedAt != null ? "deleted" : "available";

src/db/migrations/0014_strong_galactus.sql

@@ -0,0 +1,24 @@
+CREATE TABLE "passkey" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"name" text,
+	"publicKey" text NOT NULL,
+	"userId" uuid NOT NULL,
+	"credentialId" text NOT NULL,
+	"counter" integer NOT NULL,
+	"deviceType" text NOT NULL,
+	"backedUp" boolean NOT NULL,
+	"transports" text,
+	"updated_at" timestamp,
+	"created_at" timestamp DEFAULT now() NOT NULL,
+	"deleted_at" timestamp
+);
+--> statement-breakpoint
+CREATE TABLE "two_factor" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"secret" text NOT NULL,
+	"backup_codes" text NOT NULL,
+	"user_id" uuid NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "passkey" ADD CONSTRAINT "passkey_userId_user_id_fk" FOREIGN KEY ("userId") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;--> statement-breakpoint
+ALTER TABLE "two_factor" ADD CONSTRAINT "two_factor_user_id_user_id_fk" FOREIGN KEY ("user_id") REFERENCES "public"."user"("id") ON DELETE cascade ON UPDATE no action;

src/db/migrations/0015_absurd_next_avengers.sql

@@ -0,0 +1,2 @@
+CREATE TYPE "public"."user_themes" AS ENUM('light', 'dark', 'system');--> statement-breakpoint
+ALTER TABLE "user" ADD COLUMN "theme" "user_themes" DEFAULT 'light' NOT NULL;

src/db/migrations/meta/_journal.json

@@ -99,6 +99,20 @@
       "when": 1766327760039,
       "tag": "0013_past_logan",
       "breakpoints": true
+    },
+    {
+      "idx": 14,
+      "version": "7",
+      "when": 1766424611387,
+      "tag": "0014_strong_galactus",
+      "breakpoints": true
+    },
+    {
+      "idx": 15,
+      "version": "7",
+      "when": 1766426190521,
+      "tag": "0015_absurd_next_avengers",
+      "breakpoints": true
     }
   ]
 }

src/db/schema/02_user.ts

@@ -1,5 +1,5 @@
 import {relations} from "drizzle-orm";
-import {boolean, pgTable, text, timestamp, uuid} from "drizzle-orm/pg-core";
+import {boolean, integer, pgEnum, pgTable, text, timestamp, uuid} from "drizzle-orm/pg-core";
 import {createSelectSchema} from "drizzle-zod";
 import {z} from "zod";
 import {project} from "./06_project";
@@ -9,6 +9,9 @@ import {organization} from "@/db/schema/03_organization";
 import {Account as BetterAuthAccount} from "better-auth";
 import {timestamps} from "@/db/schema/00_common";
 
+export const userThemeEnum = pgEnum("user_themes", ["light", "dark", "system"]);
+
+
 export const user = pgTable("user", {
     id: uuid("id").defaultRandom().primaryKey(),
     name: text("name").notNull(),
@@ -16,6 +19,7 @@ export const user = pgTable("user", {
     emailVerified: boolean("email_verified").notNull(),
     image: text("image"),
     role: text("role"),
+    theme: userThemeEnum().notNull().default("light"),
     banned: boolean("banned"),
     banReason: text("ban_reason"),
     banExpires: timestamp("ban_expires"),
@@ -66,6 +70,31 @@ export const verification = pgTable("verification", {
 
 });
 
+export const passkey = pgTable("passkey", {
+    id: uuid().defaultRandom().primaryKey(),
+    name: text(),
+    publicKey: text().notNull(),
+    userId: uuid()
+        .notNull()
+        .references(() => user.id, {onDelete: "cascade"}),
+    credentialId: text().notNull(),
+    counter: integer().notNull(),
+    deviceType: text().notNull(),
+    backedUp: boolean().notNull(),
+    transports: text(),
+
+    ...timestamps,
+});
+
+export const twoFactor = pgTable("two_factor", {
+    id: uuid().defaultRandom().primaryKey(),
+    secret: text("secret").notNull(),
+    backupCodes: text("backup_codes").notNull(),
+    userId: uuid("user_id")
+        .notNull()
+        .references(() => user.id, {onDelete: "cascade"}),
+});
+
 export const userRelations = relations(user, ({many}) => ({
     sessions: many(session),
     accounts: many(account),

src/db/schema/08_agent.ts

@@ -28,3 +28,7 @@ export const agentRelations = relations(agent, ({many}) => ({
 export type AgentWith = Agent & {
     databases?: Database[] | null;
 };
+
+export type AgentWithDatabases = Agent & {
+    databases: Database[] | [];
+};

src/features/browser/theme-meta-updater-root.tsx

@@ -0,0 +1,28 @@
+"use client";
+
+import {useTheme} from "next-themes";
+import {useEffect, useState} from "react";
+
+export function ThemeMetaUpdaterRoot() {
+    const {resolvedTheme} = useTheme();
+    const [mounted, setMounted] = useState(false);
+
+    useEffect(() => {
+        setMounted(true);
+    }, []);
+
+    useEffect(() => {
+        if (!mounted || !resolvedTheme) return;
+
+        const color = resolvedTheme === "dark" ? "#000000" : "#ffffff";
+        let tag = document.querySelector<HTMLMetaElement>('meta[name="theme-color"]');
+        if (!tag) {
+            tag = document.createElement("meta");
+            tag.name = "theme-color";
+            document.head.appendChild(tag);
+        }
+        tag.content = color;
+    }, [mounted, resolvedTheme]);
+
+    return null;
+}

src/features/browser/theme-meta-updater.tsx

@@ -0,0 +1,35 @@
+"use client";
+
+import {useTheme} from "next-themes";
+import {useEffect, useState} from "react";
+import {authClient} from "@/lib/auth/auth-client";
+
+export function ThemeMetaUpdater() {
+    const {setTheme, resolvedTheme} = useTheme();
+    const {data: session, isPending} = authClient.useSession();
+    const [mounted, setMounted] = useState(false);
+
+    useEffect(() => {
+        setMounted(true);
+    }, []);
+
+    useEffect(() => {
+        if (isPending || !session?.user?.theme) return;
+        setTheme(session.user.theme);
+    }, [session, isPending, setTheme]);
+
+    useEffect(() => {
+        if (!mounted || !resolvedTheme) return;
+
+        const color = resolvedTheme === "dark" ? "#000000" : "#ffffff";
+        let tag = document.querySelector<HTMLMetaElement>('meta[name="theme-color"]');
+        if (!tag) {
+            tag = document.createElement("meta");
+            tag.name = "theme-color";
+            document.head.appendChild(tag);
+        }
+        tag.content = color;
+    }, [mounted, resolvedTheme]);
+
+    return null;
+}

src/features/dashboard/backup/columns.tsx

@@ -31,6 +31,7 @@ import {cn} from "@/lib/utils";
 import {Tooltip, TooltipContent, TooltipProvider, TooltipTrigger} from "@/components/ui/tooltip";
 import {MemberWithUser} from "@/db/schema/03_organization";
 import {formatLocalizedDate} from "@/utils/date-formatting";
+import {isImportedFilename} from "@/utils/text";
 
 
 export function backupColumns(
@@ -63,6 +64,14 @@ export function backupColumns(
         {
             accessorKey: "id",
             header: "Reference",
+            cell: ({row}) => {
+                const fileName = row.original.file
+                console.log(row.original)
+                const reference = row.original.id
+                const isImported = isImportedFilename(`${fileName}`)
+                console.log(isImported)
+                return isImported ? `${reference} (imported)` : `${reference}`
+            },
         },
         {
             accessorKey: "createdAt",

src/features/layout/Header.tsx

@@ -1,11 +1,11 @@
 import {notFound} from "next/navigation";
 
 import {SidebarTrigger} from "@/components/ui/sidebar";
-import {ModeToggle} from "@/features/theme/ModeToggle";
+import {ModeToggle} from "@/features/theme/mode-toggle";
 import {currentUser} from "@/lib/auth/current-user";
 import {BreadCrumbsWrapper} from "@/components/wrappers/common/bread-crumbs/bread-crumbs";
 import GitHubStarsButtonCustom from "@/components/wrappers/common/github/github-button";
-import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button";
+import {LoggedInButton} from "@/components/wrappers/dashboard/common/logged-in/logged-in-button.server";
 
 export const Header = async () => {
     const user = await currentUser();

src/features/layout/card-auth.tsx

@@ -0,0 +1,17 @@
+import {cn} from "@/lib/utils";
+import * as React from "react";
+
+
+export function CardAuth({ className, ...props }: React.ComponentProps<"div">) {
+    return (
+        <div
+            data-slot="card"
+            className={cn(
+                "bg-transparent border-none py-3",
+                "md:bg-card text-card-foreground flex flex-col gap-6 rounded-xl md:border-solid md:border md:py-6 md:shadow-sm",
+                className
+            )}
+            {...props}
+        />
+    )
+}

src/features/notifications/providers/smtp.ts

@@ -1,70 +1,8 @@
-// "use server"
-// import type {EventPayload, DispatchResult} from '../types';
-// import nodemailer from 'nodemailer';
-// import TestEmailSettings from "@/components/emails/email-settings-test"
-//
-// export async function sendSmtp(
-//     config: {
-//         host: string;
-//         port: number;
-//         secure: boolean;
-//         user: string;
-//         password: string;
-//         from: string;
-//         to: string | string[];
-//     },
-//     payload: EventPayload
-// ): Promise<DispatchResult> {
-//     console.log(config)
-//     const transporter = nodemailer.createTransport({
-//         pool: true,
-//         host: config.host,
-//         port: config.port,
-//         // secure: config.secure,
-//         secure: true,
-//         auth: {user: config.user, pass: config.password},
-//     });
-//
-//
-//
-//     const result = await transporter.verify();
-//     console.log(result);
-//
-//       const html = `
-//       <h2>${payload.title}</h2>
-//       <p><strong>Level:</strong> ${payload.level}</p>
-//       <p>${payload.message.replace(/\n/g, '<br>')}</p>
-//       ${payload.data ? `<pre>${JSON.stringify(payload.data, null, 2)}</pre>` : ''}
-//     `;
-//
-//     const info = await transporter.sendMail({
-//         from: config.from,
-//         to: Array.isArray(config.to) ? config.to.join(', ') : config.to,
-//         // to: config.from,
-//         subject: `[${payload.level.toUpperCase()}] ${payload.title}`,
-//         html,
-//         // subject: "Portabase",
-//         // html: await render(TestEmailSettings(), {}),
-//     });
-//
-//     console.log(info);
-//
-//     return {
-//         success: true,
-//         provider: 'smtp',
-//         // message: `Email sent: ${info.messageId}`,
-//         message: `Email sent: ${config.to}`,
-//         response: info,
-//     };
-// }
-
-
 "use server";
 import { render } from "@react-email/render";
 import nodemailer from "nodemailer";
 import type { EventPayload, DispatchResult } from '../types';
 import EmailNotification from "@/components/emails/email-notification";
-import EmailResetPassword from "@/components/emails/email-reset-password";
 
 export async function sendSmtp(
     config: {

src/features/theme/mode-toggle.tsx

@@ -2,13 +2,17 @@
 
 import * as React from "react"
 import {Moon, Sun} from "lucide-react"
-import {useTheme} from "next-themes"
-
 import {Button} from "@/components/ui/button"
 import {DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger} from "@/components/ui/dropdown-menu"
+import {authClient} from "@/lib/auth/auth-client";
+import {toast} from "sonner";
 
 export function ModeToggle() {
-    const {setTheme} = useTheme()
+
+    const setTheme = async (theme: "light" | "dark" | "system") => {
+        toast.success("Your theme preference has been updated.");
+        await authClient.updateUser({theme: theme});
+    };
 
     return (
         <DropdownMenu>
@@ -33,3 +37,5 @@ export function ModeToggle() {
         </DropdownMenu>
     )
 }
+
+

src/hooks/use-auto-refresh.tsx

@@ -0,0 +1,71 @@
+"use client";
+
+import {useEffect, useRef} from "react";
+import {useRouter} from "next/navigation";
+
+type UseAutoRefreshOptions = {
+    poll?: {
+        intervalMs: number;
+        enabled?: boolean;
+    };
+    sse?: {
+        url: string;
+        eventName?: string;
+        enabled?: boolean;
+        shouldRefresh?: (data: unknown) => boolean;
+    };
+};
+
+export function useAutoRefresh(options: UseAutoRefreshOptions) {
+    const router = useRouter();
+    const eventSourceRef = useRef<EventSource | null>(null);
+
+    useEffect(() => {
+        if (!options.poll?.enabled) return;
+        if (!options.poll.intervalMs) return;
+
+        const interval = setInterval(() => {
+            router.refresh();
+        }, options.poll.intervalMs);
+
+        return () => clearInterval(interval);
+    }, [options.poll?.enabled, options.poll?.intervalMs, router]);
+
+    useEffect(() => {
+        if (!options.sse?.enabled) return;
+        if (!options.sse.url) return;
+
+        const eventSource = new EventSource(options.sse.url);
+        eventSourceRef.current = eventSource;
+
+        const eventName = options.sse.eventName ?? "message";
+
+        eventSource.addEventListener(eventName, (event: MessageEvent) => {
+            let payload: unknown = event.data;
+
+            try {
+                payload = JSON.parse(event.data);
+            } catch {
+                // keep raw payload
+            }
+
+            const shouldRefresh =
+                options.sse?.shouldRefresh?.(payload) ?? true;
+
+            if (shouldRefresh) {
+                console.log("Received event source", eventSource);
+                router.refresh();
+            }
+        });
+
+        return () => {
+            eventSource.close();
+            eventSourceRef.current = null;
+        };
+    }, [
+        options.sse?.enabled,
+        options.sse?.url,
+        options.sse?.eventName,
+        router,
+    ]);
+}

src/lib/auth/auth.ts

@@ -11,22 +11,25 @@ import {count, eq} from "drizzle-orm";
 import {MemberWithUser, OrganizationWithMembersAndUsers} from "@/db/schema/03_organization";
 import {sendEmail} from "@/lib/email/email-helper";
 import {render} from "@react-email/render";
-import EmailResetPassword from "@/components/emails/email-reset-password";
 import {SUPPORTED_PROVIDERS} from "../../../portabase.config";
 import {withUpdatedAt} from "@/db/utils";
-import EmailVerification from "@/components/emails/email-verification";
+import EmailVerification from "@/components/emails/auth/email-verification";
+import EmailForgotPassword from "@/components/emails/auth/email-forgot-password";
+import {getDeviceDetails} from "@/utils/detection";
+import EmailNewLogin from "@/components/emails/auth/email-new-login";
 
 export const auth = betterAuth({
     database: drizzleAdapter(db, {
         provider: "pg",
         schema: drizzleDb.schemas,
     }),
+    appName: env.PROJECT_NAME!,
     baseURL: env.PROJECT_URL,
     secret: env.PROJECT_SECRET,
     emailAndPassword: {
         enabled: true,
         requireEmailVerification: false,
-        sendResetPassword: async ({user, url, token}, request) => {
+        sendResetPassword: async ({user, token}, request) => {
 
             const [updatedUser] = await db.update(drizzleDb.schemas.user).set(withUpdatedAt({
                 emailVerified: true,
@@ -35,7 +38,13 @@ export const auth = betterAuth({
             await sendEmail({
                 to: user.email,
                 subject: "Reset your password",
-                html: await render(EmailResetPassword({url: url})),
+                html: await render(
+                    EmailForgotPassword({
+                        firstname: user.name!,
+                        token,
+                    }),
+                    {}
+                ),
             });
 
         },
@@ -70,8 +79,6 @@ export const auth = betterAuth({
             });
         },
     },
-
-
     socialProviders: SUPPORTED_PROVIDERS.reduce((acc: any, provider: any) => {
         if (provider.id === "credential") return acc;
         if (provider.id === "google") {
@@ -85,10 +92,11 @@ export const auth = betterAuth({
     account: {
         accountLinking: {
             enabled: true,
+            trustedProviders: ["google", "github", "credential"],
+            allowDifferentEmails: false
         },
     },
 
-
     plugins: [
         openAPI(),
         nextCookies(),
@@ -131,6 +139,15 @@ export const auth = betterAuth({
                 nullable: true,
                 required: false,
             },
+            theme: {
+                type: "string",
+            },
+            lastConnectedAt: {
+                type: "date",
+            },
+            lastChangedPasswordAt: {
+                type: "date",
+            },
         },
     },
     databaseHooks: {
@@ -139,6 +156,7 @@ export const auth = betterAuth({
                 async before(user, context) {
                     const userCount = (await db.select({count: count()}).from(drizzleDb.schemas.user))[0].count;
                     const role = userCount === 0 ? "superadmin" : "pending";
+                    // const role =  "admin";
                     return {
                         data: {
                             ...user,
@@ -166,7 +184,6 @@ export const auth = betterAuth({
                     } else {
                         console.warn("Default organization not found. Cannot assign member.");
                     }
-
                 },
             },
         },
@@ -175,38 +192,78 @@ export const auth = betterAuth({
                 before: async (session, context) => {
                     const userId = session.userId;
 
-
                     let memberships = await db.query.member.findMany({
                         where: eq(drizzleDb.schemas.member.userId, userId),
                     });
 
-                    // if (!memberships.length) {
-                    //     const defaultOrgSlug = "default";
-                    //     const defaultOrg = await db.query.organization.findFirst({
-                    //         where: eq(drizzleDb.schemas.organization.slug, defaultOrgSlug),
-                    //     });
-                    //
-                    //     if (!defaultOrg) {
-                    //         throw new Error("No organization found. Cannot assign member.");
-                    //     }
-                    //
-                    //     await db.insert(drizzleDb.schemas.member).values({
-                    //         userId,
-                    //         organizationId: defaultOrg.id,
-                    //         role: "member",
-                    //     });
-                    //
-                    //     memberships = await db.query.member.findMany({
-                    //         where: eq(drizzleDb.schemas.member.userId, userId),
-                    //     });
-                    // }
-
                     return {
                         data: {
                             activeOrganizationId: memberships[0].organizationId,
                         },
                     };
                 },
+                // after: async (session) => {
+                //     const user = await db.query.user.findFirst({
+                //         where: eq(drizzleDb.schemas.user.id, session.userId),
+                //     });
+                //
+                //     if (user && user.role != "pending") {
+                //         const deviceInfo = getDeviceDetails(session.userAgent);
+                //         await sendEmail({
+                //             to: user.email,
+                //             subject: "New login to your account",
+                //             html: await render(
+                //                 EmailNewLogin({
+                //                     firstname: user.name!,
+                //                     os: deviceInfo.os,
+                //                     browser: deviceInfo.browser,
+                //                     ipAddress: session.ipAddress!,
+                //                 }),
+                //                 {}
+                //             ),
+                //         });
+                //
+                //         (await auth.$context).internalAdapter.updateUser(user.id, {
+                //             lastConnectedAt: new Date(),
+                //         });
+                //     }
+                // },
+                after: async (session) => {
+                    const user = await db.query.user.findFirst({
+                        where: eq(drizzleDb.schemas.user.id, session.userId),
+                    });
+
+                    if (!user) return;
+
+                    const createdAtDiff = new Date(session.createdAt).getTime() - new Date(user.createdAt).getTime();
+
+                    if (createdAtDiff < 5000) {
+                        console.log(`Skipping new login email for freshly created user ${user.email}`);
+                        return;
+                    }
+
+                    if (user.role === "pending") return;
+
+                    const deviceInfo = getDeviceDetails(session.userAgent);
+
+                    await sendEmail({
+                        to: user.email,
+                        subject: "New login to your account",
+                        html: await render(
+                            EmailNewLogin({
+                                firstname: user.name!,
+                                os: deviceInfo.os,
+                                browser: deviceInfo.browser,
+                                ipAddress: session.ipAddress!,
+                            }),
+                            {}
+                        ),
+                    });
+
+                    (await auth.$context).internalAdapter.updateUser(user.id, {
+                        lastConnectedAt: new Date(),
+                    });
+                },
             },
         },
 

src/utils/text.ts

@@ -11,4 +11,8 @@ export function capitalizeFirstLetter(text: string): string {
 
 export function isUUID(str: string) {
     return /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(str);
+}
+
+export function isImportedFilename(name: string): boolean {
+    return name.startsWith("imported_");
 }