chore: release v1.4.21

* fix: .release-it.json

* fix: .release-it.json

* fix: .release-it.json

* fix: .release-it.json

---------

Co-authored-by: charlesgauthereau <charles.gauthereau@soluce-technologies.com>

.dockerignore

@@ -1,4 +1,25 @@
+# Ignore Docker-related configs
+.dockerignore
 docker-compose.yml
-README.md
+docker-compose*.yml
+
+# Development/Editor config
 .idea
-.next
+.vscode
+
+# Node-related
+node_modules
+npm-debug.log
+yarn-debug.log
+yarn-error.log
+pnpm-debug.log
+
+# Next.js build output
+.next
+out
+
+
+
+# Docs and markdowns
+README.md
+*.md

.env.example

@@ -0,0 +1,61 @@
+# Environment
+NODE_ENV=development
+
+# Database
+DATABASE_URL=postgresql://devuser:changeme@localhost:5433/devdb?schema=public
+
+# Project
+PROJECT_NAME="Portabase"
+PROJECT_DESCRIPTION="Portabase is a powerful database manager"
+PROJECT_URL=http://localhost:8887
+PROJECT_SECRET=
+
+# SMTP (email)
+SMTP_HOST=
+SMTP_PORT=
+SMTP_USER=
+SMTP_PASSWORD=
+SMTP_FROM=
+#SMTP_SECURE="true"
+#Port 587 -> secure: false
+#Port 465 -> secure: true
+#By default : true
+
+# OIDC SSO Authentification
+AUTH_OIDC_ID=""
+AUTH_OIDC_TITLE=""
+AUTH_OIDC_DESC=""
+AUTH_OIDC_ICON=""
+AUTH_OIDC_CLIENT=""
+AUTH_OIDC_SECRET=""
+AUTH_OIDC_ISSUER_URL=""
+AUTH_OIDC_HOST=""
+AUTH_OIDC_SCOPES=""
+AUTH_OIDC_DISCOVERY_ENDPOINT=""
+AUTH_OIDC_JWKS_ENDPOINT=""
+AUTH_OIDC_PKCE=true
+ALLOWED_GROUP="admin"
+AUTH_OIDC_ROLE_MAP=""
+
+AUTH_ALLOW_LINKING=true
+AUTH_ALLOW_UNLINKING=true
+
+
+# Social OAuth2 Authentification
+AUTH_SOCIAL_ID=""
+AUTH_SOCIAL_TITLE=""
+AUTH_SOCIAL_DESC=""
+AUTH_SOCIAL_ICON=""
+AUTH_SOCIAL_CLIENT=""
+AUTH_SOCIAL_SECRET=""
+AUTH_SOCIAL_APPLE_APP_BUNDLE_IDENTIFIER=""
+
+# If true, the user's role will be updated from OIDC claims on every login.
+# If false, the role is only set when the user is first created.
+AUTH_SYNC_OIDC_ROLES_ON_LOGIN=true
+AUTH_EMAIL_PASSWORD_ENABLED=true
+AUTH_SIGNUP_ENABLED=true
+AUTH_PASSKEY_ENABLED=true
+
+# Retention
+RETENTION_CRON="* * * * *"

.env.exemple

@@ -1,33 +0,0 @@
-# Environnement
-NODE_ENV=production
-
-# Base de données
-DATABASE_URL=postgresql://devuser:changeme@db:5432/devdb?schema=public
-
-# Projet
-NEXT_PUBLIC_PROJECT_NAME="Portabase"
-NEXT_PUBLIC_PROJECT_DESCRIPTION="Portabase is a powerful database manager"
-NEXT_PUBLIC_PROJECT_URL=http://app.portabase.io
-PROJECT_SECRET=
-
-# SMTP (email)
-SMTP_HOST=
-SMTP_PORT=587
-SMTP_USER=
-SMTP_PASSWORD=
-SMTP_FROM=
-
-# Google
-AUTH_GOOGLE_ID=
-AUTH_GOOGLE_SECRET=
-
-# S3
-S3_ENDPOINT=http://app.s3.portabase.io
-S3_ACCESS_KEY=
-S3_SECRET_KEY=
-S3_BUCKET_NAME=portabase
-S3_PORT=9000
-S3_USE_SSL=true
-
-# Storage Type (s3, local)
-STORAGE_TYPE=local

.github/CONTRIBUTING.md

@@ -26,7 +26,7 @@ Please take a moment to review this guide. It will help you understand how to co
 
 2. **Clone the repository**
    ```bash
-   git clone https://github.com/Soluce-Technologies/portabase
+   git clone https://github.com/Portabase/portabase
    ```
 
 3. **Set up the development environment**  
@@ -72,7 +72,7 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 3. **Push your branch**
    ```bash
-   git push origin feature/<feature-name>
+   git push origin feat/<feature-name>
    ```
 
 4. **Open a Pull Request (PR)**  
@@ -82,7 +82,7 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 ## Code Style Guidelines
 
-- Follow the [specific coding style guide] (e.g., Prettier, ESLint, PEP8).
+- Follow the [specific coding style guide] (e.g., Prettier, ESLint, PEP8,Biome).
 - Use meaningful variable names and include comments where necessary.
 - Tests before submitting your changes.
 
@@ -107,4 +107,4 @@ If you encounter a bug or have a suggestion for improvement, follow these steps:
 
 Thank you for contributing! 🙌
 
----
+---

.github/FUNDING.yml

@@ -0,0 +1,15 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
+polar: # Replace with a single Polar username
+buy_me_a_coffee: portabase
+thanks_dev: # Replace with a single thanks.dev username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/SECURITY.md

@@ -7,9 +7,9 @@
 
 We take security seriously and aim to support the following versions of the project with security updates:
 
-| Version   | Supported          |  
-|-----------|--------------------|  
-| 1.x       | ✅ Fully Supported |  
+| Version | Supported          |  
+|---------|--------------------|  
+| Latest  | ✅ Fully Supported |  
 
 ---
 

.github/workflows/auto-release.yml

@@ -0,0 +1,46 @@
+name: Auto Release bot
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - main
+
+jobs:
+  release:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/create-github-app-token@v1
+        id: app-token
+        with:
+          app-id: ${{ vars.APP_ID }}
+          private-key: ${{ secrets.APP_PRIVATE_KEY }}
+
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ steps.app-token.outputs.token }}
+          ref: ${{ github.base_ref }}
+
+      - uses: pnpm/action-setup@v4
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - run: pnpm install --frozen-lockfile
+
+      - run: git config --global user.name 'github-actions[bot]'
+      - run: git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+
+      - name: Run release-it
+        run: |
+          git pull origin main
+          pnpm exec release-it --ci
+        env:
+          GITHUB_TOKEN: ${{ steps.app-token.outputs.token }}

.github/workflows/discord.yml

@@ -0,0 +1,70 @@
+name: Discord Notification
+
+on:
+  workflow_call:
+    inputs:
+      discord_title:
+        required: true
+        type: string
+      discord_color:
+        required: true
+        type: number
+      discord_footer:
+        required: true
+        type: string
+    secrets:
+      DISCORD_WEBHOOK:
+        required: true
+      GH_TOKEN:
+        required: true
+
+jobs:
+  notify-discord:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send Discord Notification
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+          GH_TOKEN: ${{ secrets.GH_TOKEN }}
+        run: |
+          RELEASE_INFO=$(gh release view "${{ github.ref_name }}" -R ${{ github.repository }} --json name,url,body,author)
+
+          RELEASE_TITLE=$(echo "$RELEASE_INFO" | jq -r .name)
+          if [ -z "$RELEASE_TITLE" ] || [ "$RELEASE_TITLE" = "null" ]; then RELEASE_TITLE="${{ github.ref_name }}"; fi
+
+          RELEASE_URL=$(echo "$RELEASE_INFO" | jq -r .url)
+          RELEASE_BODY=$(echo "$RELEASE_INFO" | jq -r .body)
+
+          AUTHOR_NAME="Portabase"
+          AUTHOR_ICON="https://github.com/Portabase.png"
+
+          PAYLOAD=$(jq -n \
+            --arg title "$RELEASE_TITLE" \
+            --arg description "$RELEASE_BODY" \
+            --arg url "$RELEASE_URL" \
+            --arg author "$AUTHOR_NAME" \
+            --arg icon "$AUTHOR_ICON" \
+            --arg discord_title "${{ inputs.discord_title }}" \
+            --arg discord_footer "${{ inputs.discord_footer }}" \
+            --argjson discord_color ${{ inputs.discord_color }} \
+            '{
+              content: $discord_title,
+              embeds: [{
+                title: $title,
+                url: $url,
+                description: $description,
+                color: $discord_color,
+                author: {
+                  name: $author,
+                  icon_url: $icon
+                },
+                footer: {
+                  text: $discord_footer
+                }
+              }]
+            }'
+          )
+
+          curl -H "Content-Type: application/json" \
+               -d "$PAYLOAD" \
+               "$DISCORD_WEBHOOK"

.github/workflows/docker.yml

@@ -0,0 +1,114 @@
+name: Docker Publish
+
+on:
+  workflow_call:
+    inputs:
+      image_name:
+        required: false
+        type: string
+        default: "portabase/portabase"
+      add_latest:
+        required: false
+        type: boolean
+        default: false
+      target:
+        required: false
+        type: string
+        default: "prod"
+      dockerfile:
+        required: false
+        type: string
+        default: "./docker/dockerfile/Dockerfile"
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+
+jobs:
+  build:
+    name: Build architectures
+    runs-on: ${{ matrix.platform == 'linux/amd64' && 'ubuntu-latest' || 'ubuntu-24.04-arm' }}
+    strategy:
+      fail-fast: false
+      matrix:
+        platform: [linux/amd64, linux/arm64]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Prepare Image Tags
+        id: prep
+        run: |
+          ARCH=${{ matrix.platform == 'linux/amd64' && 'amd64' || 'arm64' }}
+          echo "image=${{ inputs.image_name }}:${GITHUB_REF#refs/tags/}-$ARCH" >> $GITHUB_OUTPUT
+          echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
+
+      - name: Build and push image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ${{ inputs.dockerfile }}
+          platforms: ${{ matrix.platform }}
+          push: true
+          tags: ${{ steps.prep.outputs.image }}
+          target: ${{ inputs.target }}
+          cache-from: type=gha,scope=build-${{ matrix.platform }}
+          cache-to: type=gha,mode=max,scope=build-${{ matrix.platform }}
+
+      - name: Save image name for manifest
+        run: echo "${{ steps.prep.outputs.image }}" > image.txt
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: image-${{ steps.prep.outputs.safe_platform }}
+          path: image.txt
+          retention-days: 1
+
+  create-manifest:
+    name: Create multi-arch manifest
+    runs-on: ubuntu-latest
+    needs: build
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          name: image-linux-amd64
+          path: /tmp/digests/amd64
+
+      - uses: actions/download-artifact@v4
+        with:
+          name: image-linux-arm64
+          path: /tmp/digests/arm64
+
+      - name: Login to Docker
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Extract Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ inputs.image_name }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=raw,value=latest,enable=${{ inputs.add_latest }}
+
+      - name: Create and push manifest list
+        working-directory: /tmp/digests
+        run: |
+          DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
+          TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
+          docker buildx imagetools create $DOCKER_IMAGES $TAG_ARGS

.github/workflows/pr-checker.yml

@@ -0,0 +1,47 @@
+name: PR Checker
+
+on:
+  pull_request:
+    branches:
+      - main
+      - dev
+
+jobs:
+  validate-code:
+    name: Code Integrity Check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "lts/*"
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
+      - name: Check code formatting
+        run: pnpm run format:check
+        continue-on-error: true
+
+      - name: Run Linter
+        run: pnpm run lint
+        continue-on-error: true
+
+      - name: Type Check
+        run: pnpm run typecheck
+        continue-on-error: true
+
+      - name: Run Tests
+        run: pnpm run test
+        continue-on-error: true
+
+      - name: Test Application Build
+        run: pnpm run build

.github/workflows/release-candidate.yml

@@ -0,0 +1,31 @@
+name: Publish Docker image for release candidate
+
+on:
+  push:
+    tags:
+      - "*.*.*-rc*"
+      - "!*-*-rc*"
+
+permissions:
+  contents: read
+  packages: write
+
+jobs:
+  docker_publish:
+    uses: ./.github/workflows/docker.yml
+    with:
+      add_latest: true
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
+
+  discord_notification:
+    needs: docker_publish
+    uses: ./.github/workflows/discord.yml
+    with:
+      discord_title: "New Release Candidate: ${{ github.ref_name }}"
+      discord_color: 2044800
+      discord_footer: "Portabase"
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -1,69 +1,45 @@
 name: Publish Docker image for release
 
 on:
-  release:
-    types: [published]
+  push:
+    tags:
+      - "*.*.*"
+      - "!*-*"
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
-  push_to_registry:
-    name: Push Docker image to Docker Hub
+  docker_publish:
+    uses: ./.github/workflows/docker.yml
+    with:
+      add_latest: true
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME_2 }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
+  publish_release:
+    needs: docker_publish
     runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-      attestations: write
-      id-token: write
     steps:
-      - name: Check out the repo
-        uses: actions/checkout@v4
+        - name: Checkout code
+          uses: actions/checkout@v4
+          with:
+            fetch-depth: 0
 
-      - name: Log in to Docker Hub
-        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+        - name: Publish GitHub Release
+          env:
+            GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          run: |
+            gh release edit ${{ github.ref_name }} --draft=false
 
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
-        with:
-          images: solucetechnologies/portabase
-
-      - name: Set tags
-        id: set-tags
-        run: |
-          echo "RELEASE_TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
-          TAGS="solucetechnologies/portabase:${GITHUB_REF#refs/tags/}"
-          if [ "${{ github.event.release.target_commitish }}" = "main" ]; then
-            TAGS="$TAGS,solucetechnologies/portabase:latest"
-          fi
-          echo "tags=$TAGS" >> $GITHUB_OUTPUT
-
-      - name: Build and push Docker image
-        id: push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./docker/dockerfile/Dockerfile
-          push: true
-          tags: ${{ steps.set-tags.outputs.tags }}
-          target: prod
-
-# Do not delete
-#      - name: Build and push Docker image
-#        id: push
-#        uses: docker/build-push-action@v6
-#        with:
-#          context: .
-#          file: ./docker/dockerfile/Dockerfile
-#          push: true
-#          tags: ${{ steps.meta.outputs.tags }}
-#          labels: ${{ steps.meta.outputs.labels }}
-#          target: prod
-
-#      - name: Generate artifact attestation
-#        uses: actions/attest-build-provenance@v2
-#        with:
-#          subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
-#          subject-digest: ${{ steps.push.outputs.digest }}
-#          push-to-registry: true
+  discord_notification:
+    needs: docker_publish
+    uses: ./.github/workflows/discord.yml
+    with:
+      discord_title: "New Release: ${{ github.ref_name }}"
+      discord_color: 3066993
+      discord_footer: "Portabase"
+    secrets:
+      DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/security.yml

@@ -0,0 +1,32 @@
+name: Security Checks
+on:
+  pull_request:
+  push:
+    branches: [ main ]
+
+jobs:
+  sca-deps:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: aquasecurity/trivy-action@0.20.0
+        with:
+          scan-type: 'fs'
+          format: 'table'
+          severity: 'CRITICAL,HIGH'
+          ignore-unfixed: true
+
+
+  secrets-gitleaks:
+    if: github.event.pull_request.head.repo.fork == false
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: gitleaks/gitleaks-action@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITLEAKS_LICENSE: ${{ secrets.GITLEAKS_LICENSE }}
+        with:
+          config-path: .gitleaks.toml

.gitignore

@@ -1,5 +1,6 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
+.idea
+.vscode
 # dependencies
 /node_modules
 /.pnp
@@ -39,5 +40,10 @@ public/uploads/*
 !public/uploads/
 
 private/uploads/*
+private/keys/*
 
 /.env
+
+seeds/pocket-id/*.db
+
+certificates

.gitleaks.toml

@@ -0,0 +1,8 @@
+title = "Custom gitleaks config"
+
+[allowlist]
+# Global allowlist patterns (won’t be flagged)
+regexes = []
+paths = [
+    "src/utils/init.ts"
+]

.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/portabase.iml" filepath="$PROJECT_DIR$/.idea/portabase.iml" />
-    </modules>
-  </component>
-</project>

.idea/portabase.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/backend" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/venv" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-  </component>
-</project>

.pre-commit-config.yaml

@@ -0,0 +1,5 @@
+repos:
+  - repo: https://github.com/gitleaks/gitleaks
+    rev: v8.24.2
+    hooks:
+      - id: gitleaks

.release-it.json

@@ -0,0 +1,62 @@
+{
+  "git": {
+    "commit": true,
+    "commitMessage": "chore: release v${version}",
+    "requireCleanWorkingDir": true,
+    "tag": true,
+    "tagName": "${version}",
+    "push": true
+  },
+  "github": {
+    "release": true,
+    "tokenRef": "GITHUB_TOKEN",
+    "draft": true,
+    "tagName": "${version}",
+    "push": true
+  },
+  "hooks": {
+    "after:git:push": "sleep 5"
+  },
+  "plugins": {
+    "@release-it/conventional-changelog": {
+      "preset": {
+        "name": "conventionalcommits",
+        "types": [
+          {
+            "type": "feat",
+            "section": "✨ Features"
+          },
+          {
+            "type": "fix",
+            "section": "🐛 Bug Fixes"
+          },
+          {
+            "type": "perf",
+            "section": "⚡️ Performance Improvements"
+          },
+          {
+            "type": "revert",
+            "section": "⏪️ Reverts"
+          },
+          {
+            "type": "docs",
+            "section": "📝 Documentation",
+            "hidden": true
+          },
+          {
+            "type": "chore",
+            "section": "🔧 Chores",
+            "hidden": true
+          }
+        ]
+      }
+    },
+    "@release-it/bumper": {
+      "out": {
+        "file": "CITATION.cff",
+        "path": "version",
+        "type": "text/yaml"
+      }
+    }
+  }
+}

.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-    "WillLuke.nextjs.hasPrompted": true
-}

.yarnrc.yml

@@ -1,2 +0,0 @@
-nodeLinker: node-modules
-

CITATION.cff

@@ -0,0 +1,35 @@
+cff-version: 1.2.0
+title: Portabase
+message: If you use this software, please cite it as below.
+type: software
+authors:
+  - family-names: Gauthereau
+    given-names: Charles
+  - family-names: Larcher
+    given-names: Killian
+repository-code: https://github.com/Portabase/portabase
+url: https://portabase.io
+abstract: >-
+  Portabase is a free, open-source, self-hosted solution for database
+  administration, providing backup and restore capabilities, scheduling,
+  retention policies, notifications, and support for multiple storage backends.
+  Its headless agent architecture enables connection to multiple database
+  instances securely and efficiently.
+keywords:
+  - docker
+  - kubernetes
+  - backups
+  - postgresql
+  - mysql
+  - mariadb
+  - devops
+  - database
+  - monitoring
+  - s3
+  - self-hosted
+  - system-administration
+  - web-ui
+  - agent
+license: Apache-2.0
+version: 1.4.21
+date-released: '2026-03-02'

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Soluce Technologies
+   Copyright 2024 Portabase
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

Makefile

@@ -1,2 +1,48 @@
-migrate:
-	docker compose run --rm app
+CLUSTER_SCRIPT=docker/entrypoints/app-dev-entrypoint.sh
+
+up:
+	@bash $(CLUSTER_SCRIPT)
+
+seed-keycloak:
+	@[ $$(ls -1 seeds/keycloak/*.json 2>/dev/null | wc -l) -gt 0 ] || (echo "No realm export found in seeds/keycloak. Add an export from Keycloak first."; exit 1)
+	@docker compose -f docker-compose.func.yml stop keycloak >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml rm -f -s keycloak >/dev/null 2>&1 || true
+	@docker volume rm portabase-dev-func_keycloak-data >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml up -d keycloak
+	@echo "Keycloak seed import triggered from seeds/keycloak/*.json"
+
+seed-pocket:
+	@[ -f seeds/pocket-id/portabase.zip ] || (echo "No export found in seeds/pocket-id. Add an export from Pocket ID first."; exit 1)
+	@docker compose -f docker-compose.func.yml stop pocket-id >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml rm -f -s pocket-id >/dev/null 2>&1 || true
+	@docker volume rm portabase-dev-func_pocket-id-data >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml run --rm -v ./seeds/pocket-id/portabase.zip:/tmp/portabase.zip pocket-id ./pocket-id import --yes --path /tmp/portabase.zip >/dev/null
+	@docker compose -f docker-compose.func.yml up -d pocket-id
+	@sleep 2
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
+	@echo "Pocket ID data restored from seeds/pocket-id/portabase.zip"
+
+seed-auth: seed-keycloak seed-pocket
+
+pocket-token:
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id one-time-access-token admin
+
+export-pocket:
+	@echo "Exporting Pocket ID data to seeds/pocket-id/portabase.zip..."
+	@mkdir -p ./seeds/pocket-id
+	@docker compose -f docker-compose.func.yml exec pocket-id ./pocket-id export --path /tmp/portabase-export.zip
+	@docker compose -f docker-compose.func.yml cp pocket-id:/tmp/portabase-export.zip ./seeds/pocket-id/portabase.zip
+	@docker compose -f docker-compose.func.yml exec pocket-id rm /tmp/portabase-export.zip
+	@echo "Pocket ID data exported to seeds/pocket-id/portabase.zip"
+
+export-keycloak:
+	@echo "Exporting Keycloak configuration and users to seeds/keycloak/*.json..."
+	@mkdir -p ./seeds/keycloak
+	@rm -f ./seeds/keycloak/*.json
+	@docker compose -f docker-compose.func.yml stop keycloak >/dev/null 2>&1
+	@docker rm -f kc-exporter >/dev/null 2>&1 || true
+	@docker compose -f docker-compose.func.yml run --name kc-exporter keycloak export --dir /tmp/kc-export --users realm_file
+	@docker cp kc-exporter:/tmp/kc-export/. ./seeds/keycloak/
+	@docker rm -f kc-exporter >/dev/null 2>&1
+	@docker compose -f docker-compose.func.yml start keycloak >/dev/null 2>&1
+	@echo "Keycloak configuration and users exported to seeds/keycloak/*.json"

README.md

@@ -1,223 +1,90 @@
 <br />
 <div align="center">
   <a href="https://portabase.io">
-    <img src="images/logo.png" alt="Logo" width="80" height="80">
+    <img src="/.github/assets/logo.png" alt="Logo" width="80" height="80">
   </a>
 
-  <h3 align="center">Portabase</h3>
+<h3 align="center">Portabase</h3>
 
-  <p align="center">
-    Easily backup and restore your database instances with Portabase
-    <br />
-    <a href="https://portabase.io"><strong>Explore the Docs »</strong></a>
-    <br />
-    <br />
-    <a href="https://portabase.io">View Demo</a>
-    ·
-    <a href="https://github.com/Soluce-Technologies/portabase/issues/new?labels=bug&template=bug-report---.md">Report Bug</a>
-    ·
-    <a href="https://github.com/Soluce-Technologies/portabase/issues/new?labels=enhancement&template=feature-request---.md">Request Feature</a>
+  <p align="center" style="margin-top: 20px; font-style: italic;">
+  <i>Portabase is a tool designed to simplify the backup and restoration of your database instances. It integrates seamlessly with <a href="https://github.com/Portabase/agent-rust">Portabase agents</a> for managing operations securely and efficiently.</i>
   </p>
+
+
+[![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/Portabase/portabase)
+[![Support Portabase](https://img.shields.io/badge/Support-Portabase-orange)](https://www.buymeacoffee.com/portabase)
+
+[![PostgreSQL](https://img.shields.io/badge/PostgreSQL-336791?logo=postgresql&logoColor=white)](https://www.postgresql.org/)
+[![MySQL](https://img.shields.io/badge/MySQL-4479A1?logo=mysql&logoColor=white)](https://www.mysql.com/)
+[![MariaDB](https://img.shields.io/badge/MariaDB-003545?logo=mariadb&logoColor=white)](https://mariadb.org/)
+[![SQLite](https://img.shields.io/badge/-SQLite-blue?logo=sqlite&logoColor=white)](https://sqlite.org/)
+[![MongoDB](https://img.shields.io/badge/-MongoDB-13aa52?logo=mongodb&logoColor=white)](https://www.mongodb.com/)
+[![Self Hosted](https://img.shields.io/badge/self--hosted-yes-brightgreen)](https://github.com/Portabase/portabase)
+[![Open Source](https://img.shields.io/badge/open%20source-❤️-red)](https://github.com/Portabase/portabase)
+
+[![NextJS][NextJS]][NextJS-url]
+[![BetterAuth][BetterAuth]][BetterAuth-url]
+[![Drizzle][Drizzle]][Drizzle-url]
+[![ShadcnUI][ShadcnUI]][ShadcnUI-url]
+[![Docker][Docker]][Docker-url]
+
+  <p>
+    <strong>
+        <a href="https://portabase.io">Website</a> •
+        <a href="https://portabase.io/docs">Documentation</a> •
+        <a href="https://www.youtube.com/watch?v=nSTzT27GgAg">Demo</a> •
+        <a href="https://portabase.io/docs/dashboard/setup">Installation</a> •
+        <a href="https://github.com/Portabase/portabase/issues/new?labels=bug&template=bug-report---.md">Report Bug</a> •
+        <a href="https://github.com/Portabase/portabase/issues/new?labels=enhancement&template=feature-request---.md">Request Feature</a>
+    </strong>
+  </p>
+
+![portabase-dashboard](https://github.com/user-attachments/assets/8f2c69d6-f1f9-4b80-b51c-01f6f13b9b62)
+
+
 </div>
 
-## 📚 Table of Contents
+## Installation
 
-- [About The Project](#about-the-project)
-    - [Built With](#built-with)
-- [Getting Started](#getting-started)
-    - [Prerequisites](#prerequisites)
-    - [Installation](#installation)
-- [Usage](#usage)
-- [Roadmap](#roadmap)
-- [Contributing](#contributing)
-- [License](#license)
-- [Contact](#contact)
-- [Acknowledgments](#acknowledgments)
+You have 4 ways to install Portabase:
 
----
+- Automated CLI (recommended) - [details](https://portabase.io/docs/dashboard/setup#cli)
+- Docker Run - [details](https://portabase.io/docs/dashboard/setup#docker)
+- Docker Compose setup - [details](https://portabase.io/docs/dashboard/setup#docker-compose)
+- Kubernetes with Helm (soon)
+- Development setup - [details](https://portabase.io/docs/dashboard/setup#development)
 
-## About The Project
+**Ensure Docker is installed on your machine before getting started.**
 
-**Portabase** is a server dashboard tool designed to simplify the backup and restoration of your database instances. It integrates seamlessly with Portabase agents for managing operations securely and efficiently.
+## Contributors
 
-GitHub Repository: [Portabase](https://github.com/Soluce-Technologies/portabase)
+[![Contributors](https://contrib.rocks/image?repo=Portabase/portabase)](https://github.com/Portabase/portabase/graphs/contributors)
 
-### 🔧 Built With
+[!["Support Portabase"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/portabase)
 
-- [![NextJS][NextJS]][NextJS-url] (v15 with App Router)
-- [![Drizzle][Drizzle]][Drizzle-url]
-- [![ShadcnUI][ShadcnUI]][ShadcnUI-url]
-- BetterAuth
-- React Email
-
----
-
-## 🚀 Getting Started
-
-### Prerequisites
-
-Ensure Docker is installed on your machine before getting started.
-
-### Installation
-
-To run Portabase locally:
-
-1. Clone the repository:
-    ```bash
-    git clone https://github.com/Soluce-Technologies/portabase
-    cd portabase
-    ```
-2. Start the development environment:
-    ```bash
-    docker compose up
-    ```
-
----
-
-## 🛠️ Usage
-
-Portabase provides a dashboard to manage database instances and backups. It supports:
-
-- PostgreSQL (current)
-- MongoDB (coming soon)
-- MySQL (coming soon)
-
-You can access the dashboard at `http://localhost:3000` after starting the project.
-
----
-
-## 🗺️ Roadmap
-
-- [ ] Add changelog
-- [ ] Enhance documentation
-- [ ] Implement testing procedures
-- [ ] Include release file
-- [ ] Improve security
-- [ ] Enhance UX/UI
-- [ ] Improve workspace management system
-- [x] Migrate to Drizzle ORM
-- [ ] Add multi-language support
-- [ ] Extend multi-database support:
-    - [x] PostgreSQL
-    - [ ] MongoDB
-    - [ ] MySQL
-
-Check out [open issues](https://github.com/Soluce-Technologies/portabase/issues) for more.
-
----
-
-## 🤝 Contributing
-
-Contributions are welcome and appreciated! Here's how to get started:
-
-1. Fork the repository
-2. Create a new branch:
-    ```bash
-    git checkout -b feature/YourFeature
-    ```
-3. Commit your changes:
-    ```bash
-    git commit -m "Add YourFeature"
-    ```
-4. Push to the branch:
-    ```bash
-    git push origin feature/YourFeature
-    ```
-5. Open a pull request
-
-Give the project a ⭐ if you like it!
-
-### Top Contributors
-
-[![Contributors](https://contrib.rocks/image?repo=Soluce-Technologies/portabase)](https://github.com/Soluce-Technologies/portabase/graphs/contributors)
-
----
-
-## Developer Notes
-
-### Environment Variables
-
-```yml
-# Environment
-NODE_ENV=production
-
-# Database
-DATABASE_URL=postgresql://devuser:changeme@db:5432/devdb?schema=public
-
-# Project Info
-NEXT_PUBLIC_PROJECT_NAME="Portabase"
-NEXT_PUBLIC_PROJECT_DESCRIPTION="Portabase is a powerful database manager"
-NEXT_PUBLIC_PROJECT_URL=http://app.portabase.io
-PROJECT_SECRET=
-
-# SMTP (Email)
-SMTP_HOST=
-SMTP_PORT=587
-SMTP_USER=
-SMTP_PASSWORD=
-SMTP_FROM=
-
-# Google OAuth
-AUTH_GOOGLE_ID=
-AUTH_GOOGLE_SECRET=
-
-# S3/MinIO Configuration
-S3_ENDPOINT=http://app.s3.portabase.io
-S3_ACCESS_KEY=
-S3_SECRET_KEY=
-S3_BUCKET_NAME=portabase
-S3_PORT=9000
-S3_USE_SSL=true
-
-# Storage Backend: 'local' or 's3'
-STORAGE_TYPE=local
-```
-
-### Semantic Versioning
-
-Use the following format for Docker image versioning:
-
-```bash
-major.minor.patch-rc.release
-# Example: 1.0.0-rc.1
-
-major.minor.patch-rc.release-tag
-# Example: 1.0.0-rc.1-dev
-```
-
-### Zenstack Support
-
-To regenerate schema:
-
-```bash
-zenstack generate
-```
-
----
-
-## 📄 License
+## License
 
 Distributed under the Apache License. See `LICENSE.txt` for more details.
 
----
 
-## 📬 Contact
-
-- Killian Larcher - killian.larcher@soluce-technologies.com
-- Charles Gauthereau - charles.gauthereau@soluce-technologies.com
-- Project Link: [Portabase GitHub](https://github.com/Soluce-Technologies/portabase)
-
----
-
-## 🙏 Acknowledgments
-
-Thanks to all contributors and the open-source community!
-
----
+[Docker]: https://img.shields.io/badge/Docker-2496ED?logo=docker&logoColor=fff&style=for-the-badge
 
 [NextJS]: https://img.shields.io/badge/next.js-000000?style=for-the-badge&logo=nextdotjs&logoColor=white
+
+[BetterAuth]: https://img.shields.io/badge/Better%20Auth-FFF?logo=betterauth&logoColor=000&style=for-the-badge
+
 [Drizzle]: https://img.shields.io/badge/Drizzle-111?style=for-the-badge&logo=Drizzle&logoColor=c5f74f
+
 [ShadcnUI]: https://img.shields.io/badge/shadcn/ui-000000?style=for-the-badge&logo=shadcn/ui&logoColor=white
+
 [NextJS-url]: https://nextjs.org/
+
+[BetterAuth-url]: https://www.better-auth.com/
+
 [Drizzle-url]: https://orm.drizzle.team/
+
 [ShadcnUI-url]: https://ui.shadcn.com/
+
+[Docker-url]: https://www.docker.com/

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

@@ -0,0 +1,29 @@
+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 { env } from "@/env.mjs";
+import { CardAuth } from "@/features/layout/card-auth";
+import { redirect } from "next/navigation";
+
+export default async function RoutePage(props: { searchParams: Promise<{ callbackUrl: string | undefined }> }) {
+    if (env.AUTH_EMAIL_PASSWORD_ENABLED !== "true") {
+        redirect("/login");
+    }
+
+    return (
+        <TooltipProvider>
+            <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>
+                    </div>
+                </CardHeader>
+                <CardContent>
+                    <ForgotPasswordForm />
+                </CardContent>
+            </CardAuth>
+        </TooltipProvider>
+    );
+}

app/(auth)/guard/page.tsx

@@ -0,0 +1,33 @@
+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() {
+
+    const cookieStore = await cookies();
+    const token = cookieStore.get("better-auth.two_factor")?.value || cookieStore.get("__Secure-better-auth.two_factor")?.value;
+    
+    if (!token) {
+        redirect("/login");
+    }
+
+    return (
+        <TooltipProvider>
+            <CardAuth className="w-full">
+                <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>
+                    </div>
+                </CardHeader>
+                <CardContent>
+                    <GuardForm/>
+                </CardContent>
+            </CardAuth>
+        </TooltipProvider>
+    );
+}

app/(auth)/layout.tsx

@@ -1,19 +1,38 @@
-import React from "react";
-import {LayoutAdmin} from "@/components/layout";
+import React, { Suspense } from "react";
+import { redirect } from "next/navigation";
+import { currentUser } from "@/lib/auth/current-user";
+import { AuthLogoSection } from "@/components/wrappers/auth/auth-logo-section";
+import { env } from "@/env.mjs";
+import { Heart } from "lucide-react";
+import { ErrorLayout } from "@/components/wrappers/common/error-layout";
 
+export default async function Layout({
+  children,
+}: {
+  children: React.ReactNode;
+}) {
+  const user = await currentUser();
 
-export default async function Layout({children}: { children: React.ReactNode }) {
+  if (user && !user.banned && user.role !== "pending") {
+    redirect("/dashboard/home");
+  }
 
-
-    return (
-        <LayoutAdmin>
-            <div
-                className="w-full h-full grid "
-            >
-                <div className="flex items-center justify-center py-12">
-                    {children}
-                </div>
-            </div>
-        </LayoutAdmin>
-    )
-}
+  return (
+    <div className="flex min-h-screen flex-col justify-between py-10 sm:px-6 lg:px-8 ">
+      <div className="flex flex-col items-center justify-center flex-1">
+        <div className="mx-auto w-full max-w-md">
+          <AuthLogoSection />
+          <div className="mt-4">{children}</div>
+        </div>
+      </div>
+      <footer className="mt-8 text-center text-xs text-muted-foreground flex flex-col gap-1">
+        <p className="flex items-center justify-center gap-1">
+          Made with{" "}
+          <Heart className="size-3 fill-red-500 text-red-500 animate-pulse" />{" "}
+          by <span className="font-medium text-foreground">Portabase</span>
+        </p>
+        <p>v{env.NEXT_PUBLIC_PROJECT_VERSION}</p>
+      </footer>
+    </div>
+  );
+}

app/(auth)/login/page.tsx

@@ -1,29 +1,60 @@
-"use client"
+import { LoginForm } from "@/components/wrappers/auth/login/login-form/login-form";
+import { Metadata } from "next";
+import { SUPPORTED_PROVIDERS } from "@/lib/auth/config";
+import { SocialAuthButtons } from "@/components/wrappers/auth/social-buttons";
+import { TooltipProvider } from "@/components/ui/tooltip";
+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";
+import { env } from "@/env.mjs";
+import { en } from "zod/v4/locales";
 
-import {useEffect, useRef} from "react";
-import {useSearchParams} from "next/navigation";
+export const metadata: Metadata = {
+  title: "Login",
+};
 
-import {LoginForm} from "@/components/wrappers/auth/login/loginForm/LoginForm";
-import {toast} from "sonner";
+export default async function SignInPage() {
+  return (
+    <TooltipProvider>
+      <CardAuth className="w-full">
+        <CardHeader>
+          <div className="grid gap-2 text-center mb-2">
+            <h1 className="text-3xl font-bold">Login</h1>
+            <p className="text-balance text-muted-foreground">
+              Fill your login informations
+            </p>
+          </div>
+        </CardHeader>
+        <CardContent className="space-y-4">
+          {env.AUTH_EMAIL_PASSWORD_ENABLED === "true" && (
+            <LoginForm isPasskeyEnabled={env.AUTH_PASSKEY_ENABLED === "true"} />
+          )}
 
-export default function SignInPage(props: {
-    searchParams: Promise<{ callbackUrl: string | undefined }>
-}) {
+          {env.AUTH_EMAIL_PASSWORD_ENABLED === "true" &&
+            SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive)
+              .length > 0 && (
+              <div className="relative my-4 flex items-center justify-center overflow-hidden">
+                <Separator />
+                <div className="px-2 text-center  text-sm">OR</div>
+                <Separator />
+              </div>
+            )}
 
-    const searchParams = useSearchParams();
-    const error = searchParams.get("error");
-    const isFirstRender = useRef(true);
+          {SUPPORTED_PROVIDERS.filter((p) => !p.isManual && p.isActive).length >
+            0 && <SocialAuthButtons providers={SUPPORTED_PROVIDERS} />}
 
-    useEffect(() => {
-        if (isFirstRender.current && error) {
-            toast.error("Error occurred.");
-            isFirstRender.current = false;
-        }
-    }, [error]);
-
-    return (
-        <div className="mx-auto grid w-[350px] gap-6">
-            <LoginForm/>
-        </div>
-    )
-}
+          {env.AUTH_SIGNUP_ENABLED !== "true" ||
+            (env.AUTH_EMAIL_PASSWORD_ENABLED === "true" && (
+              <div className="mt-4 text-center text-sm">
+                Don&apos;t have an account ?{" "}
+                <Link href="/register" className="underline">
+                  Sign up
+                </Link>
+              </div>
+            ))}
+        </CardContent>
+      </CardAuth>
+    </TooltipProvider>
+  );
+}

app/(auth)/register/page.tsx

@@ -1,10 +1,24 @@
-import {PageParams} from "@/types/next";
-import {RegisterForm} from "@/components/wrappers/auth/register/register-form/register-form";
+import { PageParams } from "@/types/next";
+import { RegisterForm } from "@/components/wrappers/auth/register/register-form/register-form";
+import { Metadata } from "next";
+import { redirect } from "next/navigation";
+import { env } from "@/env.mjs";
+
+export const metadata: Metadata = {
+  title: "Register",
+};
 
 export default async function RoutePage(props: PageParams<{}>) {
-    return (
-        <div className="mx-auto grid w-[350px] gap-6">
-            <RegisterForm/>
-        </div>
-    )
-}
+  if (
+    env.AUTH_SIGNUP_ENABLED !== "true" ||
+    env.AUTH_EMAIL_PASSWORD_ENABLED !== "true"
+  ) {
+    redirect("/login");
+  }
+
+  return (
+    <div className="mx-auto grid w-full gap-6">
+      <RegisterForm />
+    </div>
+  );
+}

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

@@ -0,0 +1,64 @@
+import { 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";
+import { CardAuth } from "@/features/layout/card-auth";
+import { env } from "@/env.mjs";
+
+export default async function RoutePage(props: { searchParams: Promise<{ token: string | undefined }> }) {
+    if (env.AUTH_EMAIL_PASSWORD_ENABLED !== "true") {
+        return redirect("/login");
+    }
+
+    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);
+
+    return (
+        <TooltipProvider>
+            <CardAuth className="w-full">
+                <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>
+            </CardAuth>
+        </TooltipProvider>
+    );
+}

app/(customer)/dashboard/(admin)/admin/organizations/[organizationId]/page.tsx

@@ -0,0 +1,47 @@
+import {notFound} from "next/navigation";
+import {eq} from "drizzle-orm";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {PageParams} from "@/types/next";
+import {Page} from "@/features/layout/page";
+import {OrganizationManagement} from "@/components/wrappers/dashboard/admin/organizations/organization/organization-management";
+import {buildOrganizationWithMembers} from "@/utils/common";
+import {isUUID} from "@/utils/text";
+import {user} from "@/db/schema/02_user";
+import {invitation} from "@/db/schema/05_invitation";
+import {member} from "@/db/schema/04_member";
+import {organization} from "@/db/schema/03_organization";
+import {user as drizzleUser} from "@/db/schema/02_user";
+
+
+export default async function RoutePage(props: PageParams<{ organizationId: string }>) {
+    const {organizationId} = await props.params;
+
+    if (!organizationId) {
+        return notFound();
+    }
+
+    if (!isUUID(organizationId)) {
+        return notFound();
+    }
+
+    const users = await db.select().from(drizzleUser);
+
+    const organizationData = await db
+        .select({organization, member, user, invitation})
+        .from(organization)
+        .leftJoin(member, eq(drizzleDb.schemas.organization.id, member.organizationId))
+        .leftJoin(invitation, eq(drizzleDb.schemas.invitation.id, invitation.organizationId))
+        .leftJoin(user, eq(drizzleDb.schemas.member.userId, user.id))
+        .where(eq(organization.id, organizationId));
+
+    const formattedData = buildOrganizationWithMembers(organizationData);
+
+    if (!formattedData) return notFound();
+
+    return (
+        <Page>
+            <OrganizationManagement organization={formattedData} users={users}/>
+        </Page>
+    );
+}

app/(customer)/dashboard/(admin)/admin/organizations/page.tsx

@@ -0,0 +1,35 @@
+import {PageParams} from "@/types/next";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {db} from "@/db";
+import {
+    AdminOrganizationAddModal
+} from "@/components/wrappers/dashboard/admin/organizations/organization/admin-organization-add-modal";
+import {AdminOrganizationList} from "@/components/wrappers/dashboard/admin/organizations/organization/admin-orgnization-list";
+import {isNull} from "drizzle-orm";
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const organizations = await db.query.organization.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+        with: {
+            members: true,
+        },
+    });
+
+
+    return (
+        <Page>
+            <PageHeader className="flex flex-col">
+                <div className="flex justify-between">
+                    <PageTitle className="mb-3">Active organizations</PageTitle>
+                    <PageActions>
+                        <AdminOrganizationAddModal/>
+                    </PageActions>
+                </div>
+            </PageHeader>
+            <PageContent className="flex flex-col gap-5">
+                <AdminOrganizationList organizations={organizations}/>
+            </PageContent>
+        </Page>
+    );
+}

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

@@ -1,34 +0,0 @@
-import { PageParams } from "@/types/next";
-import * as drizzleDb from "@/db";
-
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { AdminTabs } from "@/components/wrappers/dashboard/admin/admin-tabs";
-import { currentUser } from "@/lib/auth/current-user";
-import { db } from "@/db";
-import {eq, isNotNull, isNull} from "drizzle-orm";
-
-
-export default async function RoutePage(props: PageParams<{}>) {
-    const user = await currentUser();
-
-    const users = await db.query.user.findMany({
-        where: (fields) => isNull(fields.deletedAt)
-    });
-    // const users = await db.query.user.findMany();
-    console.log("users",users);
-
-    const settings = await db.query.setting.findFirst({
-        where: (fields, { eq }) => eq(fields.name, "system"),
-    });
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Administration Panel</PageTitle>
-            </PageHeader>
-            <PageContent className="mt-10">
-                <AdminTabs settings={settings!} users={users} />
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(admin)/admin/settings/page.tsx

@@ -0,0 +1,40 @@
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {db} from "@/db";
+import {notFound} from "next/navigation";
+import {SettingsTabs} from "@/components/wrappers/dashboard/admin/settings/settings-tabs";
+import {desc, isNull} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const settings = await db.query.setting.findFirst({
+        where: (fields, {eq}) => eq(fields.name, "system"),
+    });
+
+    const storageChannels = await db.query.storageChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.storageChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.storageChannel.createdAt)
+    }) as StorageChannelWith[]
+
+    if (!settings || !storageChannels ) {
+        notFound()
+    }
+
+    return (
+        <Page>
+            <PageHeader className="flex flex-col">
+                <div className="flex justify-between">
+                    <PageTitle className="mb-3">System settings</PageTitle>
+                </div>
+            </PageHeader>
+            <PageContent className="flex flex-col gap-5">
+                <SettingsTabs storageChannels={storageChannels} settings={settings} />
+            </PageContent>
+        </Page>
+    );
+}

app/(customer)/dashboard/(admin)/admin/users/page.tsx

@@ -0,0 +1,45 @@
+import {PageParams} from "@/types/next";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {db} from "@/db";
+import {desc, isNull} from "drizzle-orm";
+import {AdminUserList} from "@/components/wrappers/dashboard/admin/users/admin-user-list";
+import {AdminUserAddModal} from "@/components/wrappers/dashboard/admin/users/admin-user-add-modal";
+import {SUPPORTED_PROVIDERS} from "@/lib/auth/config";
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const users = await db.query.user.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+        with: {
+            accounts: true
+        },
+        orderBy: (fields) => desc(fields.createdAt),
+
+    });
+    const organizations = await db.query.organization.findMany({
+        with: {
+            members: true,
+        },
+    });
+
+    const credentialProvider = SUPPORTED_PROVIDERS.find(p => p.id === 'credential');
+    const isPasswordAuthEnabled = credentialProvider?.isActive || false;
+
+    return (
+        <Page>
+            <PageHeader className="flex flex-col">
+                <div className="flex justify-between">
+                    <PageTitle className="mb-3">Active users</PageTitle>
+                    <PageActions>
+                        <AdminUserAddModal organizations={organizations}/>
+                    </PageActions>
+                </div>
+            </PageHeader>
+            <PageContent className="flex flex-col gap-5">
+                <AdminUserList users={users} isPasswordAuthEnabled={isPasswordAuthEnabled}/>
+            </PageContent>
+        </Page>
+    );
+}
+
+

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

@@ -1,32 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { AgentForm } from "@/components/wrappers/dashboard/agent/AgentForm/AgentForm";
-import { notFound } from "next/navigation";
-import { db } from "@/db";
-
-export default async function RoutePage(
-    props: PageParams<{
-        agentId: string;
-    }>
-) {
-    const { agentId } = await props.params;
-
-    const agent = await db.query.agent.findFirst({
-        where: (fields, { eq }) => eq(fields.id, agentId),
-    });
-
-    if (!agent) {
-        notFound();
-    }
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {agent.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <AgentForm defaultValues={agent} agentId={agent.id} />
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,117 +1,69 @@
-import Link from "next/link";
-import {GearIcon} from "@radix-ui/react-icons";
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {formatDateLastContact} from "@/utils/date-formatting";
-import {buttonVariants} from "@/components/ui/button";
-import {Card, CardContent, CardHeader} from "@/components/ui/card";
-import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {DatabaseCard} from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard";
-import {AgentCardKey} from "@/components/wrappers/dashboard/agent/AgentCardKey/AgentCardKey";
+import { PageParams } from "@/types/next";
+import {
+  Page,
+  PageContent,
+  PageDescription,
+  PageTitle,
+} from "@/features/layout/page";
 import { db } from "@/db";
 import * as drizzleDb from "@/db";
-import {and, eq} from "drizzle-orm";
-import {notFound} from "next/navigation";
+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 { generateEdgeKey } from "@/utils/edge_key";
+import { getServerUrl } from "@/utils/get-server-url";
+import { AgentContentPage } from "@/components/wrappers/dashboard/agent/agent-content";
+import { AgentDialog } from "@/features/agents/components/agent.dialog";
+import { AgentType } from "@/features/agents/agents.schema";
 
+export default async function RoutePage(
+  props: PageParams<{ agentId: string }>,
+) {
+  const { agentId } = await props.params;
 
-export default async function RoutePage(props: PageParams<{ agentId: string }>) {
+  const agent = await db.query.agent.findFirst({
+    where: eq(drizzleDb.schemas.agent.id, agentId),
+    with: {
+      databases: true,
+    },
+  });
 
-    const {agentId} = await props.params
+  if (!agent) {
+    notFound();
+  }
 
-    const agent = await db.query.agent.findFirst({
-        where: eq(drizzleDb.schemas.agent.id, agentId),
-        with: {
-            databases: true
-        }
-    })
-    //
-    console.log(agent)
-
-    if (!agent) {
-        notFound()
-    }
-    //
-    // const databaseId = 'db-123';
-    //
-    // const totalBackupsResult = await db
-    //     .select({ count: drizzleDb.schemas.backup.id })
-    //     .from(drizzleDb.schemas.backup)
-    //     .where(eq(drizzleDb.schemas.backup.databaseId, databaseId))
-    //     .execute();
-    //
-    // const totalBackups = totalBackupsResult.length;
-    //
-    // const successfulBackupsResult = await db
-    //     .select({ count: drizzleDb.schemas.backup.id })
-    //     .from(drizzleDb.schemas.backup)
-    //     .where(
-    //         and(
-    //             eq(drizzleDb.schemas.backup.databaseId, databaseId),
-    //             eq(drizzleDb.schemas.backup.status, "success")
-    //         )
-    //     )
-    //     .execute();
-    //
-    //
-    // const successfulBackups = successfulBackupsResult.length;
-    //
-    // const successRate =
-    //     totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
-
-    return (
-        <Page>
-            <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex items-center">
-                    {agent.name}
-                    <Link className={buttonVariants({variant: "outline"})}
-                          href={`/dashboard/agents/${agent.id}/edit`}>
-                        <GearIcon className="w-7 h-7"/>
-                    </Link>
-                    {/*<AgentModalKey agent={agent}>*/}
-                    {/*    <Button variant="outline">*/}
-                    {/*        <KeyRound/>*/}
-                    {/*    </Button>*/}
-                    {/*</AgentModalKey>*/}
-                </PageTitle>
+  const edgeKey = await generateEdgeKey(getServerUrl(), agent.id);
 
+  return (
+    <Page>
+      <div className="justify-between gap-2 sm:flex">
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+          <div className="min-w-full md:min-w-fit ">
+            {capitalizeFirstLetter(agent.name)}
+          </div>
+          <div className="flex items-center gap-2 md:justify-between w-full ">
+            <div className="flex items-center gap-2">
+              <AgentDialog
+                agent={agent as AgentType & { id: string }}
+                typeTrigger={"edit"}
+              />
             </div>
-            <PageDescription className="mt-5 sm:mt-0">{agent.description}</PageDescription>
-            <PageContent className="flex flex-col w-full h-full">
-                <div className="flex flex-col sm:flex-row sm:justify-between gap-8 mb-6">
-                    <Card className="w-full sm:w-auto flex-1">
-                        <CardHeader className="font-bold text-xl">
-                            Backups
-                        </CardHeader>
-                        <CardContent></CardContent>
-                    </Card>
-                    <Card className="w-full sm:w-auto flex-1">
-                        <CardHeader className="font-bold text-xl">
-                            Success rate
-                        </CardHeader>
-                        <CardContent>
-                            {/*{successRate ?? "Unavailable for now."}*/}
-                        </CardContent>
-                    </Card>
-                    <Card className="w-full sm:w-auto flex-1">
-                        <CardHeader className="font-bold text-xl">
-                            Last contact
-                        </CardHeader>
-                        <CardContent>
-                            {formatDateLastContact(agent.lastContact)}
-                        </CardContent>
-                    </Card>
+            <div className="flex items-center gap-2">
+              <ButtonDeleteAgent agentId={agentId} text={"Delete Agent"} />
+            </div>
+          </div>
+        </PageTitle>
+      </div>
 
-                </div>
-                <Card className="w-full sm:w-auto flex-1">
-                    <CardHeader className="font-bold text-xl">
-                        Edge Key
-                    </CardHeader>
-                    <CardContent>
-                        <AgentCardKey agent={agent}/>
-                    </CardContent>
-                </Card>
-                <CardsWithPagination data={agent.databases} cardItem={DatabaseCard}/>
-            </PageContent>
-        </Page>
-    )
-}
+      {agent.description && (
+        <PageDescription className="mt-5 sm:mt-0">
+          {agent.description}
+        </PageDescription>
+      )}
+      <PageContent className="flex flex-col w-full h-full justify-between gap-6">
+        <AgentContentPage agent={agent} edgeKey={edgeKey} />
+      </PageContent>
+    </Page>
+  );
+}

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

@@ -1,16 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { AgentForm } from "@/components/wrappers/dashboard/agent/AgentForm/AgentForm";
-
-export default async function RoutePage(props: PageParams<{}>) {
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Create new agent</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <AgentForm />
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,15 +1,27 @@
-import { PageParams } from "@/types/next";
-import { AgentCard } from "@/components/wrappers/dashboard/agent/AgentCard/AgentCard";
-import { CardsWithPagination } from "@/components/wrappers/common/cards-with-pagination";
-import { Button } from "@/components/ui/button";
-import Link from "next/link";
-import { Page, PageActions, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { notFound } from "next/navigation";
-import { db } from "@/db";
-export const dynamic = "force-dynamic";
+import {PageParams} from "@/types/next";
+import {AgentCard} from "@/components/wrappers/dashboard/agent/agent-card/agent-card";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {notFound} from "next/navigation";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {desc, eq, not} from "drizzle-orm";
+import {Metadata} from "next";
+import {AgentDialog} from "@/features/agents/components/agent.dialog";
+
+export const metadata: Metadata = {
+    title: "Agents",
+};
 
 export default async function RoutePage(props: PageParams<{}>) {
-    const agents = await db.query.agent.findMany();
+
+    const agents = await db.query.agent.findMany({
+        where: not(eq(drizzleDb.schemas.agent.isArchived, true)),
+        with: {
+            databases: true
+        },
+        orderBy: (fields) => desc(fields.lastContact),
+    });
 
     if (!agents) {
         notFound();
@@ -21,24 +33,17 @@ export default async function RoutePage(props: PageParams<{}>) {
                 <PageTitle>Agents</PageTitle>
                 {agents.length > 0 && (
                     <PageActions>
-                        <Link href={"/dashboard/agents/new"}>
-                            <Button>+ Create Agent</Button>
-                        </Link>
+                         <AgentDialog typeTrigger={"create"} />
                     </PageActions>
                 )}
             </PageHeader>
-            <PageContent className="mt-10">
+            <PageContent>
                 {agents.length > 0 ? (
-                    <CardsWithPagination data={agents} cardItem={AgentCard} cardsPerPage={4} numberOfColumns={1} />
+                    <CardsWithPagination data={agents} cardItem={AgentCard} cardsPerPage={4} numberOfColumns={1}/>
                 ) : (
-                    <Link
-                        href={"/dashboard/agents/new"}
-                        className="  flex item-center justify-center border-2 border-dashed transition-colors border-primary p-8 lg:p-12 w-full rounded-md"
-                    >
-                        Create new Agent
-                    </Link>
+                     <AgentDialog typeTrigger="empty"/>
                 )}
             </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(admin)/notifications/channels/page.tsx

@@ -0,0 +1,47 @@
+import {PageParams} from "@/types/next";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Metadata} from "next";
+import {db} from "@/db";
+import {notificationChannel, NotificationChannelWith} from "@/db/schema/09_notification-channel";
+import {desc, isNull} from "drizzle-orm";
+import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
+import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+import * as drizzleDb from "@/db";
+
+export const metadata: Metadata = {
+    title: "Notification Channels",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const notificationChannels = await db.query.notificationChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.notificationChannel.organizationId),
+        orderBy: desc(notificationChannel.createdAt)
+    }) as NotificationChannelWith[]
+
+    const organizations = await db.query.organization.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+        with: {
+            members: true,
+        },
+    });
+
+
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle>Notification channels</PageTitle>
+                <PageActions>
+                    <ChannelAddEditModal kind="notification" adminView={false}/>
+                </PageActions>
+            </PageHeader>
+            <PageContent>
+                <ChannelsSection kind="notification" organizations={organizations}
+                                 channels={notificationChannels}/>
+            </PageContent>
+        </Page>
+    );
+}

app/(customer)/dashboard/(admin)/notifications/logs/page.tsx

@@ -0,0 +1,30 @@
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Metadata} from "next";
+import {NotificationLogsList} from "@/components/wrappers/dashboard/admin/notifications/logs/notification-logs-list";
+import {notFound} from "next/navigation";
+import {getNotificationHistory} from "@/db/services/notification-log";
+
+export const metadata: Metadata = {
+    title: "Activity logs",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const notificationLogs = await getNotificationHistory()
+
+    if (!notificationLogs) {
+        notFound();
+    }
+
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle>Activity logs</PageTitle>
+            </PageHeader>
+            <PageContent>
+                <NotificationLogsList notificationLogs={notificationLogs} />
+            </PageContent>
+        </Page>
+    );
+}

app/(customer)/dashboard/(admin)/storages/channels/page.tsx

@@ -0,0 +1,50 @@
+import {PageParams} from "@/types/next";
+import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Metadata} from "next";
+import {ChannelsSection} from "@/components/wrappers/dashboard/admin/channels/channels-section";
+import {db} from "@/db";
+import {desc, eq, isNull} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {StorageChannelWith} from "@/db/schema/12_storage-channel";
+import {ChannelAddEditModal} from "@/components/wrappers/dashboard/admin/channels/channel/channel-add-edit-modal";
+
+export const metadata: Metadata = {
+    title: "Storage Channels",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const storageChannels = await db.query.storageChannel.findMany({
+        with: {
+            organizations: true
+        },
+        where: isNull(drizzleDb.schemas.storageChannel.organizationId),
+        orderBy: desc(drizzleDb.schemas.storageChannel.createdAt)
+    }) as StorageChannelWith[]
+
+    const organizations = await db.query.organization.findMany({
+        where: (fields) => isNull(fields.deletedAt),
+        with: {
+            members: true,
+        },
+    });
+
+    const settings = await db.query.setting.findFirst({
+        where: eq(drizzleDb.schemas.setting.name, "system"),
+    });
+
+
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle>Storage channels</PageTitle>
+                <PageActions>
+                    <ChannelAddEditModal kind={"storage"} adminView={false}/>
+                </PageActions>
+            </PageHeader>
+            <PageContent>
+                <ChannelsSection defaultStorageChannelId={settings?.defaultStorageChannelId} kind={"storage"} organizations={organizations} channels={storageChannels}/>
+            </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/RestoreForm";
-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)/home/page.tsx

@@ -1,20 +0,0 @@
-"use client";
-import { authClient } from "@/lib/auth/auth-client";
-import { PageParams } from "@/types/next";
-
-export default function RoutePage(props: PageParams<{}>) {
-    const { data: activeOrganization } = authClient.useActiveOrganization();
-
-    return (
-        <div className="flex flex-1 flex-col gap-4 p-4">
-            <div className="grid auto-rows-min gap-4 md:grid-cols-3">
-                <div className="aspect-video rounded-xl bg-muted/50" />
-                <div className="aspect-video rounded-xl bg-muted/50" />
-                <div className="aspect-video rounded-xl bg-muted/50" />
-            </div>
-            <div className="min-h-[100vh] flex-1 rounded-xl bg-muted/50 md:min-h-min" />
-            {JSON.stringify(activeOrganization)}
-            {activeOrganization?.name}
-        </div>
-    );
-}

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

@@ -1,35 +0,0 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { notFound } from "next/navigation";
-import { DatabaseForm } from "@/components/wrappers/dashboard/database/DatabaseForm/DatabaseForm";
-
-import { db } from "@/db";
-import * as drizzleDb from "@/db";
-
-import { eq } from "drizzle-orm";
-
-export default async function RoutePage(props: PageParams<{ databaseId: string }>) {
-    const { databaseId } = await props.params;
-
-    const dbItem = await db.query.database.findFirst({
-        where: eq(drizzleDb.schemas.database.id, databaseId),
-    });
-
-    if (!dbItem) {
-        notFound();
-    }
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {dbItem.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <DatabaseForm
-                    databaseId={databaseId}
-                    defaultValues={{ ...dbItem, dbms: dbItem.dbms ?? "inactive", description: dbItem.description ?? undefined }}
-                />
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,31 +1,55 @@
 import {PageParams} from "@/types/next";
-import {notFound} from "next/navigation";
-import {Page, PageActions, PageContent, PageDescription, PageTitle} from "@/features/layout/page";
-import {BackupButton} from "@/components/wrappers/dashboard/backup/backup-button/backup-button";
-import {DatabaseTabs} from "@/components/wrappers/dashboard/projects/Database/DatabaseTabs";
-import {DatabaseKpi} from "@/components/wrappers/dashboard/projects/Database/DatabaseKpi";
-import {EditButton} from "@/components/wrappers/dashboard/database/EditButton/EditButton";
-import {CronButton} from "@/components/wrappers/dashboard/database/CronButton/CronButton";
-
+import {notFound, redirect} from "next/navigation";
+import {Page} from "@/features/layout/page";
 import {db} from "@/db";
-import {eq, and} from "drizzle-orm";
+import {eq, and, inArray} from "drizzle-orm";
 import * as drizzleDb from "@/db";
+import {getOrganizationProjectDatabases} from "@/lib/services";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import {BackupModalProvider} from "@/components/wrappers/dashboard/database/backup/backup-modal-context";
+import {DatabaseContent} from "@/components/wrappers/dashboard/projects/database/database-content";
 
-export default async function RoutePage(props: PageParams<{ databaseId: string }>) {
-    const {databaseId} = await props.params;
+export default async function RoutePage(props: PageParams<{
+    projectId: string;
+    databaseId: string
+}>) {
+    const {projectId, databaseId} = await props.params;
+
+    const organization = await getOrganization({});
+    const activeMember = await getActiveMember()
+
+    if (!organization || !activeMember) {
+        notFound();
+    }
+
+    const databasesProject = await getOrganizationProjectDatabases({
+        organizationSlug: organization.slug,
+        projectId: projectId
+    })
 
     const dbItem = await db.query.database.findFirst({
-        where: eq(drizzleDb.schemas.database.id, databaseId),
+        where: and(inArray(drizzleDb.schemas.backup.id, databasesProject.ids ?? []), eq(drizzleDb.schemas.database.id, databaseId), eq(drizzleDb.schemas.database.projectId, projectId)),
+        with: {
+            project: true,
+            retentionPolicy: true,
+            alertPolicies: true,
+            storagePolicies: true
+        }
     });
 
     if (!dbItem) {
-        notFound();
+        redirect("/dashboard/projects");
     }
 
     const backups = await db.query.backup.findMany({
         where: eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
         with: {
             restorations: true,
+            storages: {
+                with: {
+                    storageChannel: true
+                }
+            }
         },
         orderBy: (b, {desc}) => [desc(b.createdAt)],
     });
@@ -35,41 +59,53 @@ export default async function RoutePage(props: PageParams<{ databaseId: string }
         orderBy: (r, {desc}) => [desc(r.createdAt)],
     });
 
-    const isAlreadyBackup = backups.some((b) => b.status === "waiting");
+    const isAlreadyBackup = backups.some((b) => b.status === "waiting" || b.status === "ongoing");
     const isAlreadyRestore = restorations.some((r) => r.status === "waiting");
 
-    const [totalBackups, successfulBackups] = await Promise.all([
-        db
-            .select({count: drizzleDb.schemas.backup.id})
-            .from(drizzleDb.schemas.backup)
-            .where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
-            .then((rows) => rows.length),
-        db
-            .select({count: drizzleDb.schemas.backup.id})
-            .from(drizzleDb.schemas.backup)
-            .where(and(eq(drizzleDb.schemas.backup.databaseId, dbItem.id), eq(drizzleDb.schemas.backup.status, "success")))
-            .then((rows) => rows.length),
-    ]);
+    const totalBackups = await db.select({count: drizzleDb.schemas.backup.id})
+        .from(drizzleDb.schemas.backup)
+        .where(eq(drizzleDb.schemas.backup.databaseId, dbItem.id))
+        .then(rows => rows.length);
+
+    const availableBackups = backups.filter(b => !b.deletedAt).length;
+
+    const successfulBackups = await db.select({count: drizzleDb.schemas.backup.id})
+        .from(drizzleDb.schemas.backup)
+        .where(and(
+            eq(drizzleDb.schemas.backup.databaseId, dbItem.id),
+            eq(drizzleDb.schemas.backup.status, "success")
+        ))
+        .then(rows => rows.length);
+
+
+    const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
+    if (!settings) {
+        notFound();
+    }
+
 
     const successRate = totalBackups > 0 ? (successfulBackups / totalBackups) * 100 : null;
 
+    const isMember = activeMember?.role === "member";
+
     return (
         <Page>
-            <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex items-center">
-                    {dbItem.name}
-                    <EditButton/>
-                    <CronButton database={dbItem}/>
-                </PageTitle>
-                <PageActions className="justify-between">
-                    <BackupButton disable={isAlreadyBackup} databaseId={databaseId}/>
-                </PageActions>
-            </div>
-            <PageDescription className="mt-5 sm:mt-0">{dbItem.description}</PageDescription>
-            <PageContent className="flex flex-col w-full h-full">
-                <DatabaseKpi successRate={successRate} database={dbItem} totalBackups={totalBackups} />
-                <DatabaseTabs database={dbItem} isAlreadyRestore={isAlreadyRestore} backups={backups} restorations={restorations} />
-            </PageContent>
+            <BackupModalProvider>
+                <DatabaseContent
+                    activeMember={activeMember}
+                    settings={settings}
+                    database={dbItem}
+                    isAlreadyRestore={isAlreadyRestore}
+                    restorations={restorations}
+                    backups={backups}
+                    totalBackups={totalBackups}
+                    availableBackups={availableBackups}
+                    successRate={successRate}
+                    organizationId={organization.id}
+                    activeOrganizationChannels={[]}
+                    activeOrganizationStorageChannels={[]}
+                />
+            </BackupModalProvider>
         </Page>
     );
-}
+}

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

@@ -1,66 +0,0 @@
-import {notFound} from "next/navigation";
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectForm} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm";
-import * as drizzleDb from "@/db";
-
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {DatabaseWith} from "@/db/schema/06_database";
-
-export default async function RoutePage(props: PageParams<{ projectId: string }>) {
-    const {projectId} = await props.params;
-
-    const proj = await db.query.project.findFirst({
-        where: eq(drizzleDb.schemas.project.id, projectId),
-        with: {
-            databases: true,
-        },
-    });
-
-    if (!proj) {
-        notFound();
-    }
-
-
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, "default"),
-    });
-
-    if (!org) {
-        notFound();
-    }
-
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    );
-        // .filter((db): db is DatabaseWith => db.project !== null);
-
-    console.log("ici34",availableDatabases);
-
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Edit {proj.name}</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <ProjectForm
-                    organization={org}
-                    databases={availableDatabases as DatabaseWith[]}
-                    defaultValues={{name: proj.name, slug: proj.slug, databases: proj.databases.map((db) => db.id)}}
-                    projectId={proj.id}
-                />
-            </PageContent>
-        </Page>
-    );
-}

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

@@ -1,27 +1,36 @@
-import { PageParams } from "@/types/next";
-import { Page, PageActions, PageContent, PageDescription, PageTitle } from "@/features/layout/page";
-import { buttonVariants } from "@/components/ui/button";
-import { GearIcon } from "@radix-ui/react-icons";
-import Link from "next/link";
-import { ButtonDeleteProject } from "@/components/wrappers/dashboard/projects/ButtonDeleteProject/ButtonDeleteProject";
-import { CardsWithPagination } from "@/components/wrappers/common/cards-with-pagination";
-import { ProjectDatabaseCard } from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectDatabaseCard";
-import { notFound } from "next/navigation";
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageTitle} from "@/features/layout/page";
+import {
+    ButtonDeleteProject
+} from "@/components/wrappers/dashboard/projects/button-delete-project/button-delete-project";
+import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
+import {ProjectDatabaseCard} from "@/components/wrappers/dashboard/projects/project-card/project-database-card";
+import {notFound, redirect} from "next/navigation";
 
-import { db } from "@/db";
-import { eq } from "drizzle-orm";
-import {getOrganization} from "@/lib/auth/auth";
+import {db} from "@/db";
+import {eq} from "drizzle-orm";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
 import * as drizzleDb from "@/db";
+import {capitalizeFirstLetter} from "@/utils/text";
+import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {DatabaseWith} from "@/db/schema/07_database";
+import {ProjectWith} from "@/db/schema/06_project";
+import {isUuidv4} from "@/utils/verify-uuid";
+
 
 export default async function RoutePage(props: PageParams<{
-    // slug: string;
     projectId: string
 }>) {
     const {
-        // slug: organizationSlug,
-        projectId } = await props.params;
+        projectId
+    } = await props.params;
+
+    if (!isUuidv4(projectId)) {
+        notFound()
+    }
 
     const organization = await getOrganization({});
+    const activeMember = await getActiveMember()
 
     if (!organization) {
         notFound();
@@ -33,42 +42,77 @@ export default async function RoutePage(props: PageParams<{
     if (!org) notFound();
 
     const proj = await db.query.project.findFirst({
-        where: (proj, { and, eq, not }) => and(eq(proj.id, projectId), eq(proj.organizationId, org.id), not(eq(proj.isArchived, true))),
+        where: (proj, {
+            and,
+            eq,
+            not
+        }) => and(eq(proj.id, projectId), eq(proj.organizationId, org.id), not(eq(proj.isArchived, true))),
         with: {
             databases: true,
         },
     });
 
-    if (!proj) notFound();
+    if (!proj) {
+        redirect("/dashboard/projects");
+    }
+
+    const availableDatabases = (
+        await db.query.database.findMany({
+            where: (db, {or, eq, isNull}) => or(isNull(db.projectId), eq(db.projectId, proj.id)),
+            with: {
+                agent: true,
+                project: true,
+                backups: true,
+                restorations: true,
+            },
+            orderBy: (db, {desc}) => [desc(db.createdAt)],
+        })
+    ) as DatabaseWith[];
+
+    const isMember = activeMember?.role === "member";
 
     return (
         <Page>
             <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex items-center">
-                    {proj.name}
-                    <Link className={buttonVariants({ variant: "outline" })} href={`/dashboard/projects/${proj.id}/edit`}>
-                        <GearIcon className="w-7 h-7" />
-                    </Link>
+                <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+                    <div className="min-w-full md:min-w-fit ">
+                        {capitalizeFirstLetter(proj.name)}
+                    </div>
+                    {!isMember && (
+                        <div className="flex items-center gap-2 md:justify-between w-full ">
+                            <div className="flex items-center gap-2">
+                                <ProjectDialog
+                                    databases={availableDatabases}
+                                    organization={org}
+                                    project={proj as ProjectWith}
+                                    isEdit={true}
+                                />
+                            </div>
+                            <div className="flex items-center gap-2">
+                                <ButtonDeleteProject projectId={projectId} text={"Delete Project"}/>
+                            </div>
+                        </div>
+                    )}
                 </PageTitle>
-                <PageActions className="justify-between">
-                    <ButtonDeleteProject projectId={projectId} text={"Delete Project"} />
-                </PageActions>
             </div>
-
-            <PageDescription>The list of associated databases</PageDescription>
-
             <PageContent className="flex flex-col w-full h-full">
                 {proj.databases.length > 0 ? (
                     <CardsWithPagination
                         data={proj.databases}
                         organizationSlug={organization.slug}
+                        // @ts-ignore
                         cardItem={ProjectDatabaseCard}
-                        cardsPerPage={4}
-                        numberOfColumns={1}
+                        cardsPerPage={6}
+                        numberOfColumns={3}
                         extendedProps={proj}
                     />
-                ) : null}
+                ) : (
+                    <div className="flex flex-col items-center justify-center h-full text-muted-foreground py-20">
+                        <p className="text-lg font-medium">No databases found</p>
+                        <p className="text-sm mt-2">You haven’t added any databases to this project yet.</p>
+                    </div>
+                )}
             </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/projects/new/page.tsx

@@ -1,48 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectForm} from "@/components/wrappers/dashboard/projects/ProjectsForm/ProjectForm";
-import {notFound} from "next/navigation";
-import {db} from "@/db";
-import {eq} from "drizzle-orm";
-import {getOrganization} from "@/lib/auth/auth";
-import * as drizzleDb from "@/db";
-import {DatabaseWith} from "@/db/schema/06_database";
-
-export default async function RoutePage(props: PageParams<{  }>) {
-
-    const organization = await getOrganization({});
-
-    if (!organization ) {
-        notFound();
-    }
-
-    const availableDatabases = (
-        await db.query.database.findMany({
-            where: (db, {isNull}) => isNull(db.projectId),
-            with: {
-                agent: true,
-                project: true,
-                backups: true,
-                restorations: true,
-            },
-            orderBy: (db, {desc}) => [desc(db.createdAt)],
-        })
-    ).filter((db) => db.project !== null) as DatabaseWith[];
-
-    const org = await db.query.organization.findFirst({
-        where: eq(drizzleDb.schemas.organization.slug, organization.slug),
-    });
-
-    if (!org) notFound();
-
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle>Create new project</PageTitle>
-            </PageHeader>
-            <PageContent>
-                <ProjectForm databases={availableDatabases} organization={org}/>
-            </PageContent>
-        </Page>
-    );
-}

app/(customer)/dashboard/(organization)/projects/page.tsx

@@ -1,17 +1,23 @@
-import Link from "next/link";
-
 import {PageParams} from "@/types/next";
 import {CardsWithPagination} from "@/components/wrappers/common/cards-with-pagination";
-import {Button} from "@/components/ui/button";
 import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {ProjectCard} from "@/components/wrappers/dashboard/projects/ProjectCard/ProjectCard";
+import {ProjectCard} from "@/components/wrappers/dashboard/projects/project-card/project-card";
 import {db} from "@/db";
 import {notFound} from "next/navigation";
-import {getOrganization} from "@/lib/auth/auth";
+import {getActiveMember, getOrganization} from "@/lib/auth/auth";
+import {EmptyStatePlaceholder} from "@/components/wrappers/common/empty-state-placeholder";
+import {Metadata} from "next";
+import {ProjectDialog} from "@/features/projects/components/project.dialog";
+import {DatabaseWith} from "@/db/schema/07_database";
 
-export default async function RoutePage(props: PageParams<{ }>) {
+export const metadata: Metadata = {
+    title: "Projects",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
 
     const organization = await getOrganization({});
+    const activeMember = await getActiveMember()
 
     if (!organization) {
         notFound();
@@ -27,33 +33,48 @@ export default async function RoutePage(props: PageParams<{ }>) {
             databases: true,
         },
     });
+    const isMember = activeMember?.role === "member";
+
+    const availableDatabases = (
+        await db.query.database.findMany({
+            where: (db, {isNull}) => isNull(db.projectId),
+            with: {
+                agent: true,
+                project: true,
+                backups: true,
+                restorations: true,
+            },
+            orderBy: (db, {desc}) => [desc(db.createdAt)],
+        })
+    ).filter((db) => db.project == null) as DatabaseWith[];
+
 
     return (
         <Page>
             <PageHeader>
                 <PageTitle>Projects</PageTitle>
-                {projects.length > 0 && (
+                {(projects.length > 0 && !isMember) && (
                     <PageActions>
-                        <Link href={`/dashboard/projects/new`}>
-                            <Button>+ Create Project</Button>
-                        </Link>
+                        <ProjectDialog databases={availableDatabases} organization={organization}/>
                     </PageActions>
                 )}
             </PageHeader>
 
-            <PageContent className="mt-10">
+            <PageContent>
                 {projects.length > 0 ? (
-                    <CardsWithPagination organizationSlug={organization.slug} data={projects} cardItem={ProjectCard}
-                                         cardsPerPage={4} numberOfColumns={1}/>
+                    <CardsWithPagination
+                        organizationSlug={organization.slug}
+                        data={projects}
+                        cardItem={ProjectCard}
+                        cardsPerPage={9}
+                        numberOfColumns={3}
+                    />
+                ) : isMember ? (
+                    <EmptyStatePlaceholder text="No project available"/>
                 ) : (
-                    <Link
-                        href={`/dashboard/projects/new`}
-                        className="  flex item-center justify-center border-2 border-dashed transition-colors border-primary p-8 lg:p-12 w-full rounded-md"
-                    >
-                        Create new Project
-                    </Link>
+                    <ProjectDialog databases={availableDatabases} organization={organization} isEmpty={true}/>
                 )}
             </PageContent>
         </Page>
     );
-}
+}

app/(customer)/dashboard/(organization)/settings/edit/page.tsx

@@ -1,29 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {notFound} from "next/navigation";
-import {OrganizationForm} from "@/components/wrappers/dashboard/organization/OrganizationForm/OrganizationForm";
-import {getOrganization} from "@/lib/auth/auth";
-
-
-export default async function RoutePage(props: PageParams<{
-
-}>) {
-    const organization = await getOrganization({});
-
-    if (!organization) {
-        notFound();
-    }
-
-    return(
-        <Page>
-            <PageHeader>
-                <PageTitle>
-                    Edit {organization.name}
-                </PageTitle>
-            </PageHeader>
-            <PageContent>
-                <OrganizationForm members={organization.members} defaultValues={organization}/>
-            </PageContent>
-        </Page>
-    )
-}

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -1,43 +1,95 @@
-import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageDescription, PageHeader, PageTitle} from "@/features/layout/page";
-import {currentUser} from "@/lib/auth/current-user";
-import {getOrganization} from "@/lib/auth/auth";
-import {notFound} from "next/navigation";
+import { PageParams } from "@/types/next";
 import {
-    DeleteOrganizationButton
-} from "@/components/wrappers/dashboard/organization/DeleteOrganization/DeleteOrganizationButton";
-import {EditButtonSettings} from "@/components/wrappers/dashboard/settings/EditButtonSettings/EditButtonSettings";
+  Page,
+  PageActions,
+  PageContent,
+  PageHeader,
+  PageTitle,
+} from "@/features/layout/page";
+import { currentUser } from "@/lib/auth/current-user";
+import { getActiveMember, getOrganization } from "@/lib/auth/auth";
+import { notFound } from "next/navigation";
+import { Metadata } from "next";
+import { OrganizationTabs } from "@/components/wrappers/dashboard/organization/tabs/organization-tabs";
+import { getOrganizationChannels } from "@/db/services/notification-channel";
+import { computeOrganizationPermissions } from "@/lib/acl/organization-acl";
+import { getOrganizationStorageChannels } from "@/db/services/storage-channel";
+import { DeleteOrganizationButton } from "@/components/wrappers/dashboard/organization/delete-organization-button";
+import { EditOrganizationDialog } from "@/features/organization/components/edit-organization.dialog";
+import { db } from "@/db";
+import { isNull } from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import { eq } from "drizzle-orm";
 
+export const metadata: Metadata = {
+  title: "Settings",
+};
 
 export default async function RoutePage(props: PageParams<{ slug: string }>) {
-    const organization = await getOrganization({});
-    const user = await currentUser();
+  const organization = await getOrganization({});
+  const user = await currentUser();
+  const activeMember = await getActiveMember();
 
-    if (!organization) {
-        notFound();
-    }
+  if (!organization || !activeMember || !user) {
+    notFound();
+  }
 
-    return (
-        <Page>
-            <PageHeader>
-                <PageTitle className="flex items-center">
-                    Settings
-                    {organization.slug != "default" ?
-                        <EditButtonSettings/>
-                        : null}
-                </PageTitle>
-                <PageActions>
-                    {organization.slug != "default" ?
-                        <DeleteOrganizationButton organizationSlug={organization.slug}/>
-                        : null}
-                </PageActions>
-            </PageHeader>
-            <PageDescription>
-                Manage your organization settings.
-            </PageDescription>
-            <PageContent>
-            {/*    TODO add the list of organisation members (add, remove, edit) */}
-            </PageContent>
-        </Page>
-    )
-}
+  const notificationChannels = await getOrganizationChannels(organization.id);
+  const storageChannels = await getOrganizationStorageChannels(organization.id);
+  const permissions = computeOrganizationPermissions(activeMember);
+
+  const users = await db.query.user.findMany({
+    where: (fields) => isNull(fields.deletedAt),
+  });
+
+  const organizationWithMembers = await db.query.organization.findFirst({
+    where: eq(drizzleDb.schemas.organization.id, organization.id),
+    with: {
+      members: {
+        with: {
+          user: true,
+        },
+      },
+    },
+  });
+
+  if (!organizationWithMembers) notFound();
+
+  return (
+    <Page>
+      <PageHeader>
+        <PageTitle className="flex flex-col md:flex-row items-center justify-between w-full ">
+          <div className="min-w-full md:min-w-fit ">Organization settings</div>
+          <div className="flex items-center gap-2 md:justify-between w-full ">
+            <div className="flex items-center gap-2">
+              {permissions.canManageSettings &&
+                organization.slug !== "default" && (
+                  <EditOrganizationDialog
+                    organization={organizationWithMembers}
+                    users={users}
+                    currentUser={user}
+                  />
+                )}
+            </div>
+            <div className="flex items-center gap-2">
+              {permissions.canManageDangerZone &&
+                organization.slug !== "default" && (
+                  <DeleteOrganizationButton
+                    organizationSlug={organization.slug}
+                  />
+                )}
+            </div>
+          </div>
+        </PageTitle>
+      </PageHeader>
+      <PageContent>
+        <OrganizationTabs
+          activeMember={activeMember}
+          organization={organization}
+          notificationChannels={notificationChannels}
+          storageChannels={storageChannels}
+        />
+      </PageContent>
+    </Page>
+  );
+}

app/(customer)/dashboard/(organization)/statistics/page.tsx

@@ -1,15 +1,21 @@
-import { PageParams } from "@/types/next";
-import { Page, PageContent, PageHeader, PageTitle } from "@/features/layout/page";
-import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
-import { EvolutionLineChart } from "@/components/wrappers/dashboard/statistics/charts/evolution-line-chart";
-import { PercentageLineChart } from "@/components/wrappers/dashboard/statistics/charts/percentage-line-chart";
-import { notFound } from "next/navigation";
-import { db } from "@/db";
-import { asc, count, eq, inArray } from "drizzle-orm";
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
+import {EvolutionLineChart} from "@/components/wrappers/dashboard/statistics/charts/evolution-line-chart";
+import {PercentageLineChart} from "@/components/wrappers/dashboard/statistics/charts/percentage-line-chart";
+import {notFound} from "next/navigation";
+import {db} from "@/db";
+import {and, asc, count, eq, inArray} from "drizzle-orm";
 import * as drizzleDb from "@/db";
 import {getOrganization} from "@/lib/auth/auth";
+import {Building2, DatabaseBackup, Folder, RefreshCcw} from "lucide-react";
+import {Metadata} from "next";
 
-export default async function RoutePage(props: PageParams<{ }>) {
+export const metadata: Metadata = {
+    title: "Statistics",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
     const organization = await getOrganization({});
 
     if (!organization) {
@@ -26,7 +32,13 @@ export default async function RoutePage(props: PageParams<{ }>) {
         where: eq(drizzleDb.schemas.project.organizationId, org.id),
     });
 
-    const projectsCount = projects.length;
+    const projectIds = projects.map(project => project.id);
+
+    const databasesOfAllProjects = await db.query.database.findMany({
+        where: inArray(drizzleDb.schemas.database.projectId, projectIds),
+    })
+    const databaseIds = databasesOfAllProjects.map((database) => database.id);
+
 
     const backupsEvolution = await db.query.backup.findMany({
         columns: {
@@ -34,6 +46,7 @@ export default async function RoutePage(props: PageParams<{ }>) {
             createdAt: true,
         },
         orderBy: [asc(drizzleDb.schemas.backup.id)],
+        where: inArray(drizzleDb.schemas.backup.databaseId, databaseIds),
     });
 
 
@@ -44,56 +57,77 @@ export default async function RoutePage(props: PageParams<{ }>) {
             _count: count(),
         })
         .from(drizzleDb.schemas.backup)
-        .where(inArray(drizzleDb.schemas.backup.status, ["success", "failed"]))
+        .where(and(inArray(drizzleDb.schemas.backup.status, ["success", "failed"]), inArray(drizzleDb.schemas.backup.databaseId, databaseIds)))
         .groupBy(drizzleDb.schemas.backup.createdAt, drizzleDb.schemas.backup.status)
         .orderBy(drizzleDb.schemas.backup.createdAt);
 
-    console.log(backupsRate);
+
+    const restorationsCountResult = await db
+        .select({
+            count: count(),
+        })
+        .from(drizzleDb.schemas.restoration)
+        .where(inArray(drizzleDb.schemas.restoration.databaseId, databaseIds));
+
+
+    const restorationsCount = restorationsCountResult[0]?.count ?? 0;
+    const projectsCount = projects.length;
+    const backupsEvolutionCount = backupsEvolution.length;
+
+    const sortedBackupsEvolution = backupsEvolution.sort(
+        (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+    );
 
 
     return (
         <Page>
             <PageHeader>
-                <PageTitle>Statistics</PageTitle>
+                <PageTitle>Statistics Overview</PageTitle>
             </PageHeader>
+
             <PageContent className="flex flex-col gap-y-4">
-                <div className="flex flex-col md:flex-row gap-4">
+                <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
                     <Card className="w-full">
-                        <CardHeader>
-                            <CardTitle>Projects</CardTitle>
+                        <CardHeader className="flex flex-row items-center justify-between pb-2">
+                            <CardTitle className="text-sm font-medium">Projects</CardTitle>
+                            <Building2 className="h-4 w-4 text-muted-foreground"/>
                         </CardHeader>
-                        <CardContent>{projectsCount}</CardContent>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{projectsCount}</div>
+                            <p className="text-xs text-muted-foreground">Active projects in this organization</p>
+                        </CardContent>
                     </Card>
+
                     <Card className="w-full">
-                        <CardHeader>
-                            <CardTitle>KPI 2</CardTitle>
+                        <CardHeader className="flex flex-row items-center justify-between pb-2">
+                            <CardTitle className="text-sm font-medium">Backups</CardTitle>
+                            <DatabaseBackup className="h-4 w-4 text-muted-foreground"/>
                         </CardHeader>
-                        <CardContent></CardContent>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{backupsEvolutionCount}</div>
+                            <p className="text-xs text-muted-foreground">Total backups executed across all databases</p>
+                        </CardContent>
                     </Card>
+
                     <Card className="w-full">
-                        <CardHeader>
-                            <CardTitle>KPI 3</CardTitle>
+                        <CardHeader className="flex flex-row items-center justify-between pb-2">
+                            <CardTitle className="text-sm font-medium">Restorations</CardTitle>
+                            <RefreshCcw className="h-4 w-4 text-muted-foreground"/>
                         </CardHeader>
-                        <CardContent></CardContent>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{restorationsCount}</div>
+                            <p className="text-xs text-muted-foreground">Total restoration operations performed</p>
+                        </CardContent>
                     </Card>
                 </div>
+
                 <div className="flex flex-col md:flex-row gap-4">
-                    <Card className="w-full">
-                        <CardHeader>
-                            <CardTitle>Evolution of the number of backups</CardTitle>
-                        </CardHeader>
-                        <CardContent>
-                            <EvolutionLineChart data={backupsEvolution} />
-                        </CardContent>
-                    </Card>
-                    <Card className="w-full">
-                        <CardHeader>
-                            <CardTitle>Success rate of backups</CardTitle>
-                        </CardHeader>
-                        <CardContent>
-                            <PercentageLineChart data={backupsRate} />
-                        </CardContent>
-                    </Card>
+                    <EvolutionLineChart
+                        data={sortedBackupsEvolution}
+                    />
+
+                    <PercentageLineChart
+                        data={backupsRate}/>
                 </div>
             </PageContent>
         </Page>

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

@@ -0,0 +1,139 @@
+import {PageParams} from "@/types/next";
+import {Page, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
+import {Card, CardContent, CardHeader, CardTitle} from "@/components/ui/card";
+import {Building2, Database, DatabaseBackup, Folder, RefreshCcw, Server, Workflow} from "lucide-react";
+import {currentUser} from "@/lib/auth/current-user";
+import {notFound} from "next/navigation";
+import {db} from "@/db";
+import {asc, inArray} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {listOrganizations} from "@/lib/auth/auth";
+import {Metadata} from "next";
+
+export const metadata: Metadata = {
+    title: "Home",
+};
+
+export default async function RoutePage(props: PageParams<{}>) {
+
+    const user = await currentUser();
+    const organizations = await listOrganizations()
+
+    if (!user || !organizations) notFound();
+
+    const organizationIds = organizations.map(project => project.id);
+
+    const agents = await db.query.agent.findMany({});
+
+    const projects = await db.query.project.findMany({
+        where: inArray(drizzleDb.schemas.project.organizationId, organizationIds),
+    });
+
+    const projectIds = projects.map(project => project.id);
+
+
+    const databasesOfAllProjects = await db.query.database.findMany({
+        where: inArray(drizzleDb.schemas.database.projectId, projectIds),
+    })
+    const databaseIds = databasesOfAllProjects.map((database) => database.id);
+
+
+    const backupsEvolution = await db.query.backup.findMany({
+        columns: {
+            id: true,
+            createdAt: true,
+            deletedAt: true,
+        },
+        orderBy: [asc(drizzleDb.schemas.backup.id)],
+        where: inArray(drizzleDb.schemas.backup.databaseId, databaseIds),
+    });
+
+    const availableBackups = backupsEvolution.filter(backup => backup.deletedAt == null);
+
+
+    return (
+        <Page>
+            <PageHeader>
+                <PageTitle>Dashboard</PageTitle>
+            </PageHeader>
+            <PageContent className="flex flex-col gap-y-4">
+                <div className="grid grid-cols-1 md:grid-cols-3 gap-4">
+                    <Card className="w-full">
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Organizations</CardTitle>
+                            <Building2 className="h-4 w-4 text-muted-foreground"/>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{organizations.length}</div>
+                            <p className="text-xs text-muted-foreground">Number of organizations</p>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="w-full">
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Projects</CardTitle>
+                            <Folder className="h-4 w-4 text-muted-foreground"/>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{projects.length}</div>
+                            <p className="text-xs text-muted-foreground">Number of projects</p>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="w-full">
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Databases</CardTitle>
+                            <Database className="h-4 w-4 text-muted-foreground"/>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{databasesOfAllProjects.length}</div>
+                            <p className="text-xs text-muted-foreground">Databases across all projects</p>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="w-full">
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Agents</CardTitle>
+                            <Workflow className="h-4 w-4 text-muted-foreground"/>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{agents.length}</div>
+                            <p className="text-xs text-muted-foreground">Registered agents</p>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="w-full">
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Total Backups</CardTitle>
+                            <DatabaseBackup className="h-4 w-4 text-muted-foreground"/>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{backupsEvolution.length}</div>
+                            <p className="text-xs text-muted-foreground">All backups recorded</p>
+                        </CardContent>
+                    </Card>
+
+                    <Card className="w-full">
+                        <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+                            <CardTitle className="text-sm font-medium">Available Backups</CardTitle>
+                            <RefreshCcw className="h-4 w-4 text-muted-foreground"/>
+                        </CardHeader>
+                        <CardContent>
+                            <div className="text-2xl font-bold">{availableBackups.length}</div>
+                            <p className="text-xs text-muted-foreground">Currently active backups</p>
+                        </CardContent>
+                    </Card>
+                </div>
+                {/*Do not delete*/}
+                {/*<div className="flex flex-1 flex-col gap-4">*/}
+                {/*    <div className="grid auto-rows-min gap-4 md:grid-cols-3">*/}
+                {/*        <div className="aspect-video rounded-xl bg-muted/50"/>*/}
+                {/*        <div className="aspect-video rounded-xl bg-muted/50"/>*/}
+                {/*        <div className="aspect-video rounded-xl bg-muted/50"/>*/}
+                {/*    </div>*/}
+                {/*</div>*/}
+            </PageContent>
+        </Page>
+
+    );
+}

app/(customer)/dashboard/layout.tsx

@@ -1,26 +1,26 @@
-import React from "react";
-import {redirect} from "next/navigation";
+import { ReactNode } from "react";
+import { redirect } from "next/navigation";
 
-import {SidebarInset, SidebarProvider} from "@/components/ui/sidebar";
-import {AppSidebar} from "@/components/wrappers/dashboard/sideBar/app-sidebar";
-import {Header} from "@/features/layout/Header";
-import {currentUser} from "@/lib/auth/current-user";
+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 }) {
-    const user = await currentUser();
-    if (!user) redirect("/login");
+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>
-        </>
-    );
+  return (
+    <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/(customer)/dashboard/loading.tsx

@@ -1,4 +1,4 @@
-import { LoadingSpinner } from "@/components/wrappers/common/loading/LoadingSpinner";
+import { LoadingSpinner } from "@/components/wrappers/common/loading/loading-spinner";
 
 export default function Loading() {
     return (

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

@@ -1,64 +0,0 @@
-import {PageParams} from "@/types/next";
-import {Page, PageActions, PageContent, PageHeader, PageTitle} from "@/features/layout/page";
-import {notFound} from "next/navigation";
-import {UserForm} from "@/components/wrappers/dashboard/profile/UserForm/UserForm";
-import {Badge} from "@/components/ui/badge";
-import {ButtonDeleteAccount} from "@/components/wrappers/dashboard/profile/ButtonDeleteAccount/ButtonDeleteAccount";
-import {AvatarWithUpload} from "@/components/wrappers/dashboard/profile/Avatar/AvatarWithUpload";
-import {currentUser} from "@/lib/auth/current-user";
-import {getAccounts, getSessions} from "@/lib/auth/auth";
-//import { getAccounts, getSessions } from "@/lib/auth/auth";
-
-export default async function RoutePage(props: PageParams<{}>) {
-    const user = await currentUser();
-    console.log("my user",user);
-    if (!user) {
-        return notFound();
-    }
-
-
-    if (user.role !== "user" && user.role !== "admin" && user.role !== "superadmin") {
-        return notFound();
-    }
-
-    // const sessions = await getSessions();
-    // const accounts = await getAccounts();
-
-    return (
-        <Page>
-            <div className="justify-between gap-2 sm:flex">
-                <PageTitle className="flex items-center">
-                    <AvatarWithUpload
-                        user={{
-                            ...user,
-                            image: user.image ?? null,
-                            role: user.role ?? null,
-                            banned: user.banned ?? null,
-                            banReason: user.banReason ?? null,
-                            banExpires: user.banExpires ?? null,
-                            deletedAt: user.deletedAt ? new Date(user.deletedAt) : null,
-                        }}
-                    />
-                    {user.name}
-                    <Badge className="ml-3 hidden lg:block">{user.role}</Badge>
-                </PageTitle>
-                <PageActions className="mt-2 hidden sm:block">
-                    <ButtonDeleteAccount text="Delete my account"/>
-                </PageActions>
-            </div>
-            <PageContent>
-                <UserForm
-                    userId={user.id}
-                    defaultValues={{
-                        name: user.name,
-                        email: user.email,
-                        role: user.role ?? undefined,
-                    }}
-                />
-                <div className="mt-4 sm:hidden">
-                    <ButtonDeleteAccount text="Delete my account"/>
-                </div>
-            </PageContent>
-        </Page>
-    );
-}

app/(landing)/page.tsx

@@ -6,7 +6,7 @@ export default async function Index() {
     const user = await currentUser();
     if (user) {
         const currentOrganizationSlug = await getCurrentOrganizationSlug();
-        redirect(`/dashboard/${currentOrganizationSlug}/projects`);
+        redirect(`/dashboard/home`);
     }
     redirect("/login");
     //Do not delete

app/api/agent/[agentId]/backup/helpers.ts

@@ -1,2 +1,52 @@
+import { NextResponse } from "next/server";
+import { eq } from "drizzle-orm";
+import { db } from "@/db";
+import * as drizzleDb from "@/db";
+
+export function withAgentCheck(handler: Function) {
+    return async (request: Request, context: { params: Promise<{ agentId: string }> }) => {
+        try {
+            const agentId = (await context.params).agentId;
+
+            const agent = await db.query.agent.findFirst({
+                where: eq(drizzleDb.schemas.agent.id, agentId),
+            });
+
+            if (!agent) {
+                return NextResponse.json(
+                    { error: "Agent not found" },
+                    { status: 404 }
+                );
+            }
+
+            return handler(request, { ...context, agent });
+        } catch (err) {
+            console.error("Error in agent middleware:", err);
+            return NextResponse.json(
+                { error: "Internal server error" },
+                { status: 500 }
+            );
+        }
+    };
+}
 
 
+export async function getDatabaseOrThrow(generatedId: string) {
+    const database = await db.query.database.findFirst({
+        where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
+        with: {
+            project: true,
+            alertPolicies: true,
+            storagePolicies: true
+        }
+    });
+
+    if (!database) {
+        throw NextResponse.json(
+            { error: "Database associated with generatedId not found" },
+            { status: 404 }
+        );
+    }
+
+    return database;
+}

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

@@ -1,77 +1,63 @@
 import {NextResponse} from "next/server";
-import {isUuidv4} from "@/utils/verify-uuid";
-import {uploadLocalPrivate} from "@/features/upload/private/upload.action";
-import {v4 as uuidv4} from "uuid";
-import {eventEmitter} from "../../../events/route";
-import {db} from "@/db";
-import {Backup} from "@/db/schema/06_database";
 import {and, eq} from "drizzle-orm";
 import * as drizzleDb from "@/db";
+import {db as dbClient, db} from "@/db";
+import {getDatabaseOrThrow, withAgentCheck} from "./helpers";
+import {Backup} from "@/db/schema/07_database";
+import {withUpdatedAt} from "@/db/utils";
+import {eventEmitter} from "@/features/shared/event";
+import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {EventKind} from "@/features/notifications/types";
 
-export async function POST(
-    request: Request,
-    {params}: { params: Promise<{ agentId: string }> }
-) {
+export type BodyPost = {
+    method: "manual" | "automatic"
+    generatedId: string
+}
+
+export type BodyPatch = {
+    backupId: string
+    status: "success" | "failed"
+    size: number
+    generatedId: string
+}
+
+export const POST = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
     try {
-        const contentType = request.headers.get("Content-Type");
-
-        if (!contentType || !contentType.includes("multipart/form-data")) {
-            return NextResponse.json(
-                {error: "Unsupported or missing Content-Type"},
-                {status: 400}
-            );
-        }
-        eventEmitter.emit('modification', {update: true});
-
-        const agentId = (await params).agentId;
-        const formData = await request.formData();
-        const generatedId = formData.get("generatedId") as string | null;
-        const method = formData.get("method") as string | null;
-
-        if (!generatedId || !isUuidv4(generatedId)) {
-            return NextResponse.json(
-                {error: "generatedId is not a valid UUID"},
-                {status: 400}
-            );
-        }
-
-        const agent = await db.query.agent.findFirst({
-            where: eq(drizzleDb.schemas.agent.id, agentId),
-        });
-
-        if (!agent) {
-            return NextResponse.json(
-                {error: "Agent not found"},
-                {status: 404}
-            );
-        }
-
-        const database = await db.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, generatedId),
-        });
-
-        if (!database) {
-            return NextResponse.json(
-                {error: "Database associated with generatedId not found"},
-                {status: 404}
-            );
-        }
+        const body: BodyPost = await request.json();
+        const method = body.method
+        const database = await getDatabaseOrThrow(body.generatedId);
 
         let backup: Backup | null | undefined = null;
 
         if (method === "automatic") {
-            [backup] = await db
-                .insert(drizzleDb.schemas.backup)
-                .values({
-                    status: 'ongoing',
-                    databaseId: database.id,
-                })
-                .returning();
 
+            const ongoingBackup = await db.query.backup.findFirst({
+                where: and(
+                    eq(drizzleDb.schemas.backup.status, 'ongoing'),
+                    eq(drizzleDb.schemas.backup.databaseId, database.id),
+                ),
+            });
 
-            if (!backup) {
+            if (!ongoingBackup) {
+                [backup] = await db
+                    .insert(drizzleDb.schemas.backup)
+                    .values({
+                        status: 'ongoing',
+                        databaseId: database.id,
+                    })
+                    .returning();
+                if (!backup) {
+                    return NextResponse.json(
+                        {error: "Unable to create an automatic backup"},
+                        {status: 500}
+                    );
+                }
+            } else {
                 return NextResponse.json(
-                    {error: "Unable to create an automatic backup"},
+                    {error: "A backup is already ongoing"},
                     {status: 500}
                 );
             }
@@ -83,7 +69,6 @@ export async function POST(
                 ),
             });
 
-
             if (!backup) {
                 return NextResponse.json(
                     {error: "Unable to find the corresponding backup"},
@@ -92,68 +77,78 @@ export async function POST(
             }
         }
 
-        const status = formData.get("status") as string | null;
 
-        if (status === "success") {
-            const file = formData.get("file") as File | null;
+        eventEmitter.emit('modification', {update: true});
 
-            if (!file) {
-                return NextResponse.json(
-                    {error: "File is required for successful backup"},
-                    {status: 400}
-                );
-            }
-
-            const uuid = uuidv4();
-            const fileName = `${uuid}.dump`;
-            const buffer = Buffer.from(await file.arrayBuffer());
-
-            const {success, message, filePath} = await uploadLocalPrivate(fileName, buffer);
-
-            if (!success) {
-                return NextResponse.json(
-                    {error: message},
-                    {status: 500}
-                );
-            }
-
-            await db
-                .update(drizzleDb.schemas.backup)
-                .set({
-                    file: fileName,
-                    status: 'success',
-                })
-                .where(eq(drizzleDb.schemas.backup.id, backup.id));
-
-            eventEmitter.emit('modification', {update: true});
-
-            return NextResponse.json(
-                {
-                    message: "Backup successfully uploaded",
-                },
-                {status: 200}
-            );
-        } else {
-
-            await db
-                .update(drizzleDb.schemas.backup)
-                .set({status: 'failed'})
-                .where(eq(drizzleDb.schemas.backup.id, backup.id));
-
-            eventEmitter.emit('modification', {update: true});
-
-            return NextResponse.json(
-                {
-                    message: "Backup successfully updated with status failed",
-                },
-                {status: 200}
-            );
-        }
+        return NextResponse.json(
+            {
+                message: "Init backup success",
+                backup: backup,
+            },
+            {status: 200}
+        );
     } catch (error) {
-        console.error("Error in POST handler:", error);
+        console.error("Error in POST for INIT backup:", error);
         return NextResponse.json(
             {error: "Internal server error"},
             {status: 500}
         );
     }
-}
+});
+
+export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
+    try {
+        const body: BodyPatch = await request.json();
+        console.log("body", body);
+
+        const status = body.status
+        const backupId = body.backupId
+        const backupSize = body.size
+
+        const database = await getDatabaseOrThrow(body.generatedId);
+
+        const backup = await db.query.backup.findFirst({
+            where: eq(drizzleDb.schemas.backup.id, backupId),
+        });
+
+        if (!backup) {
+            return NextResponse.json(
+                {error: "No backup found"},
+                {status: 500}
+            );
+        }
+
+        const [backupUpdated] = await dbClient
+            .update(drizzleDb.schemas.backup)
+            .set(withUpdatedAt({
+                status: status,
+                fileSize: backupSize
+            }))
+            .where(eq(drizzleDb.schemas.backup.id, backup.id))
+            .returning();
+
+
+        eventEmitter.emit('modification', {update: true});
+        await sendNotificationsBackupRestore(database, status == "failed" ? "error_backup" : "success_backup" as EventKind);
+
+        return NextResponse.json(
+            {
+                message: "Backup successfully updated",
+                backup: backupUpdated,
+            },
+            {status: 200}
+        );
+    } catch (error) {
+
+
+        console.error("Error in PATCH backup:", error);
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

app/api/agent/[agentId]/backup/upload/init/route.ts

@@ -0,0 +1,76 @@
+import {NextResponse} from "next/server";
+import {and, eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {db} from "@/db";
+import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
+import {isUuidv4} from "@/utils/verify-uuid";
+import {eventEmitter} from "@/features/shared/event";
+
+export type Body = {
+    generatedId: string
+    storageChannelId: string
+    backupId: string
+}
+export const POST = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
+    try {
+        const body: Body = await request.json();
+
+        console.log("body", body);
+
+        const generatedId = body.generatedId;
+        const storageChannelId = body.storageChannelId;
+        const backupId = body.backupId;
+
+        if (!generatedId || !isUuidv4(generatedId)) {
+            return NextResponse.json(
+                {error: "generatedId is not a valid UUID"},
+                {status: 400}
+            );
+        }
+
+        const database = await getDatabaseOrThrow(generatedId);
+
+        const backup = await db.query.backup.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.backup.id, backupId),
+                eq(drizzleDb.schemas.backup.databaseId, database.id),
+            ),
+        });
+
+        if (!backup) {
+            return NextResponse.json(
+                {error: "Unable to find the corresponding backup"},
+                {status: 404}
+            );
+        }
+
+        const [backupStorage] = await db
+            .insert(drizzleDb.schemas.backupStorage)
+            .values({
+                backupId: backup.id,
+                storageChannelId: storageChannelId,
+                status: "pending",
+            })
+            .returning();
+
+        eventEmitter.emit('modification', {update: true});
+
+        return NextResponse.json(
+            {
+                message: "Backup storage successfully created",
+                backupStorage: backupStorage
+            },
+            {status: 200}
+        );
+    } catch (error) {
+        console.error("Error in POST for INIT backup:", error);
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

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

@@ -0,0 +1,95 @@
+import {NextResponse} from "next/server";
+import {and, eq} from "drizzle-orm";
+import * as drizzleDb from "@/db";
+import {db as dbClient, db} from "@/db";
+import {withUpdatedAt} from "@/db/utils";
+import {getDatabaseOrThrow, withAgentCheck} from "../../helpers";
+import {eventEmitter} from "@/features/shared/event";
+
+export type Body = {
+    generatedId: string
+    status: "success" | "failed"
+    backupStorageId: string
+    path: string
+    size: number
+    backupId: string
+}
+export const PATCH = withAgentCheck(async (request: Request, {params, agent}: {
+    params: Promise<{ agentId: string }>,
+    agent: any
+}) => {
+    try {
+        const body: Body = await request.json();
+        const generatedId = body.generatedId;
+        const status = body.status;
+        const filePath = body.path;
+        const fileSize = body.size;
+        const backupStorageId = body.backupStorageId;
+        const backupId = body.backupId;
+
+
+        console.log("body", body);
+
+        const database = await getDatabaseOrThrow(generatedId);
+
+        const backup = await db.query.backup.findFirst({
+            where: and(
+                eq(drizzleDb.schemas.backup.id, backupId),
+                eq(drizzleDb.schemas.backup.databaseId, database.id),
+            ),
+            with: {
+                storages: true
+            }
+        });
+
+        if (!backup) {
+            return NextResponse.json(
+                {error: "Unable to find the corresponding backup"},
+                {status: 404}
+            );
+        }
+
+        const [backupStorage] = await dbClient
+            .update(drizzleDb.schemas.backupStorage)
+            .set(withUpdatedAt({
+                status: status,
+                path: filePath,
+                size: fileSize
+            }))
+            .where(eq(drizzleDb.schemas.backupStorage.id, backupStorageId))
+            .returning();
+
+
+        if (backup.storages.length > 0) {
+            const hasSuccessfulStorage = backup.storages.some(
+                (storage) => storage.status === "success"
+            );
+
+            if (hasSuccessfulStorage && backup.status !== "success") {
+                await db
+                    .update(drizzleDb.schemas.backup)
+                    .set({
+                        status: "success",
+                        fileSize: fileSize,
+                    })
+                    .where(eq(drizzleDb.schemas.backup.id, backup.id));
+            }
+        }
+
+        eventEmitter.emit('modification', {update: true});
+
+        return NextResponse.json({
+                message: "Backup status successfully updated",
+                backupStorage: backupStorage
+            },
+            {status: 200}
+        );
+    } catch (error) {
+        console.error("Error in POST for INIT backup:", error);
+        return NextResponse.json(
+            {error: "Internal server error"},
+            {status: 500}
+        );
+    }
+});
+

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

@@ -1,10 +1,10 @@
 import {NextResponse} from "next/server";
 import {isUuidv4} from "@/utils/verify-uuid";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {and, eq} from "drizzle-orm";
-
+import {sendNotificationsBackupRestore} from "@/features/notifications/helpers";
+import {eventEmitter} from "@/features/shared/event";
 
 export type BodyResultRestore = {
     generatedId: string
@@ -13,21 +13,16 @@ export type BodyResultRestore = {
 type RestorationStatus = 'waiting' | 'ongoing' | 'failed' | 'success';
 
 
-
 export async function POST(
     request: Request,
     {params}: { params: Promise<{ agentId: string }> }
 ) {
 
     try {
-        eventEmitter.emit('modification', {update: true});
 
         const agentId = (await params).agentId
         const body: BodyResultRestore = await request.json();
 
-        console.log(body)
-        console.log(agentId)
-
 
         if (!isUuidv4(body.generatedId)) {
             return NextResponse.json(
@@ -44,8 +39,10 @@ export async function POST(
         }
 
         const database = await db.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, body.generatedId)
-
+            where: eq(drizzleDb.schemas.database.agentDatabaseId, body.generatedId),
+            with: {
+                alertPolicies: true
+            }
         })
 
         if (!database) {
@@ -60,22 +57,21 @@ export async function POST(
             return NextResponse.json({error: "Unable to fin the corresponding restoration"}, {status: 404})
         }
 
+
         await db
             .update(drizzleDb.schemas.restoration)
-            .set({ status: body.status as RestorationStatus })
+            .set({status: body.status as RestorationStatus})
             .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
 
+        await sendNotificationsBackupRestore(database, body.status == "failed" ? "error_restore" : "success_restore");
+
         const response = {
             message: true,
             details: "Restoration successfully updated"
         }
 
-        eventEmitter.emit('modification', {update: true});
-
 
         return Response.json(response, {status: 200})
-
-
     } catch (error) {
         console.error('Error in POST handler:', error);
         return NextResponse.json(

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

@@ -1,20 +1,25 @@
 import {NextResponse} from "next/server";
 import {Body} from "./route";
 import {isUuidv4} from "@/utils/verify-uuid";
-import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
-import {Agent} from "@/db/schema/07_agent";
-import {Database} from "@/db/schema/06_database";
+import {Agent} from "@/db/schema/08_agent";
+import {Database, DatabaseWith} from "@/db/schema/07_database";
 import * as drizzleDb from "@/db";
-import {db as dbClient} from "@/db";
-import {and, eq} from "drizzle-orm";
+import {db, db as dbClient} from "@/db";
+import {and, eq, inArray} from "drizzle-orm";
 import {dbmsEnumSchema, EDbmsSchema} from "@/db/schema/types";
+import {withUpdatedAt} from "@/db/utils";
+import type {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/dispatch";
+import {Setting} from "@/db/schema/01_setting";
 
-export async function handleDatabases(body: Body, agent: Agent, lastContact: Date) {
+export async function handleDatabases(body: Body, agent: Agent, lastContact: Date, settings: Setting) {
     const databasesResponse = [];
 
-    const formatDatabase = (database: Database, backupAction: boolean, restoreAction: boolean, UrlBackup: string) => ({
+    const formatDatabase = (database: DatabaseWith, backupAction: boolean, restoreAction: boolean, UrlBackup: string | null, storages: PingDatabaseStorageChannels[], urlMeta: string | null) => ({
         generatedId: database.agentDatabaseId,
         dbms: database.dbms,
+        storages: storages,
+        encrypt: settings.encryption,
         data: {
             backup: {
                 action: backupAction,
@@ -23,6 +28,7 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
             restore: {
                 action: restoreAction,
                 file: UrlBackup,
+                metaFile: urlMeta
             },
         },
     });
@@ -30,22 +36,30 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
     for (const db of body.databases) {
 
         const existingDatabase = await dbClient.query.database.findFirst({
-            where: eq(drizzleDb.schemas.database.agentDatabaseId, db.generatedId)
+            where: eq(drizzleDb.schemas.database.agentDatabaseId, db.generatedId),
+            with: {
+                project: true
+            }
         });
 
         let backupAction: boolean = false
         let restoreAction: boolean = false
-        let UrlBackup: string = ""
+        let urlBackup: string | null = null;
+        let urlMeta: string | null = null
 
         if (!existingDatabase) {
             if (!isUuidv4(db.generatedId)) {
                 return NextResponse.json(
-                    { error: "generatedId is not a valid uuid" },
-                    { status: 500 }
+                    {error: "generatedId is not a valid uuid"},
+                    {status: 500}
                 );
             }
-            console.log(db)
-            console.log(dbmsEnumSchema.parse(db.dbms))
+
+            if (!dbmsEnumSchema.safeParse(db.dbms).success) {
+                console.log(`Database type not available: ${db.dbms}`);
+                continue;
+            }
+
             const [databaseCreated] = await dbClient
                 .insert(drizzleDb.schemas.database)
                 .values({
@@ -57,63 +71,178 @@ export async function handleDatabases(body: Body, agent: Agent, lastContact: Dat
                 })
                 .returning();
 
+
             if (databaseCreated) {
-                databasesResponse.push(formatDatabase(databaseCreated, backupAction,restoreAction, UrlBackup));
+                const storages = await getDatabaseStorageChannels(databaseCreated.id)
+
+                databasesResponse.push(formatDatabase(databaseCreated, backupAction, restoreAction, urlBackup, storages, null));
             }
         } else {
 
-
-
             const [databaseUpdated] = await dbClient
                 .update(drizzleDb.schemas.database)
-                .set({ lastContact: lastContact })
+                .set(withUpdatedAt({
+                    name: db.name,
+                    agentId: agent.id,
+                    lastContact: lastContact
+                }))
                 .where(eq(drizzleDb.schemas.database.id, existingDatabase.id))
                 .returning();
 
-
-
-            const backup = await dbClient.query.backup.findFirst({
-                where: and(eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.backup.status,"waiting"))
+            const activeBackup = await dbClient.query.backup.findFirst({
+                where: and(
+                    eq(drizzleDb.schemas.backup.databaseId, databaseUpdated.id),
+                    inArray(drizzleDb.schemas.backup.status, ["waiting", "ongoing"])
+                )
             })
 
-
             const restoration = await dbClient.query.restoration.findFirst({
-                where: and(eq(drizzleDb.schemas.restoration.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.restoration.status,"waiting"))
+                where: and(eq(drizzleDb.schemas.restoration.databaseId, databaseUpdated.id), eq(drizzleDb.schemas.restoration.status, "waiting")),
+                with: {
+                    backupStorage: true
+                }
             })
 
-
-            if(backup){
+            if (activeBackup && activeBackup.status == "waiting") {
                 backupAction = true
 
                 await dbClient
                     .update(drizzleDb.schemas.backup)
-                    .set({ status: "ongoing" })
-                    .where(eq(drizzleDb.schemas.backup.id, backup.id));
+                    .set(withUpdatedAt({status: "ongoing"}))
+                    .where(eq(drizzleDb.schemas.backup.id, activeBackup.id));
             }
 
-            if(restoration){
+            if (restoration) {
                 restoreAction = true
 
+                if (!restoration.backupStorage || restoration.backupStorage.status != "success" || !restoration.backupStorage.path) {
+                    restoreAction = false
+                    continue;
+                }
 
-                const backupToRestore = await dbClient.query.backup.findFirst({
-                    where: eq(drizzleDb.schemas.backup.id, restoration.backupId),
-                })
+                const input: StorageInput = {
+                    action: "get",
+                    data: {
+                        path: restoration.backupStorage.path,
+                        signedUrl: true,
+                    },
+                    metadata: {
+                        storageId: restoration.backupStorage.storageChannelId,
+                        fileKind: "backups"
+                    }
+                };
+
+                const inputMeta: StorageInput = {
+                    action: "get",
+                    data: {
+                        path: `${restoration.backupStorage.path}.meta`,
+                        signedUrl: true,
+                    },
+                    metadata: {
+                        storageId: restoration.backupStorage.storageChannelId,
+                        fileKind: "backups"
+                    }
+                };
 
 
-                const fileName = backupToRestore?.file
-                UrlBackup = await getFileUrlPresignedLocal(fileName ?? "")
+                try {
+                    const result = await dispatchStorage(input, undefined, restoration.backupStorage.storageChannelId);
+                    const resultMeta = await dispatchStorage(inputMeta, undefined, restoration.backupStorage.storageChannelId);
+
+                    if (result.success) {
+                        urlBackup = result.url ?? null;
+                        urlMeta = resultMeta.url ?? null
+                    } else {
+                        await dbClient
+                            .update(drizzleDb.schemas.restoration)
+                            .set({status: "failed"})
+                            .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
+
+                        const errorMessage = "Failed to get backup URL";
+                        console.error("Restoration failed: ", errorMessage);
+                        continue;
+                    }
+                } catch (err) {
+                    console.error("Restoration crashed unexpectedly:", err);
+                    await dbClient
+                        .update(drizzleDb.schemas.restoration)
+                        .set({status: "failed"})
+                        .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
+                    continue;
+                }
 
                 await dbClient
                     .update(drizzleDb.schemas.restoration)
-                    .set({ status: "ongoing" })
+                    .set({status: "ongoing"})
                     .where(eq(drizzleDb.schemas.restoration.id, restoration.id));
-
             }
-
-
-            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, UrlBackup));
+            const storages = await getDatabaseStorageChannels(databaseUpdated.id)
+            databasesResponse.push(formatDatabase(databaseUpdated, backupAction, restoreAction, urlBackup, storages, urlMeta));
         }
     }
 
     return databasesResponse;
-}
+}
+
+
+type PingDatabaseStorageChannels = {
+    id: string;
+    config: any
+    provider: string
+}
+
+async function getDatabaseStorageChannels(databaseId: string): Promise<PingDatabaseStorageChannels[]> {
+
+    const database = await db.query.database.findFirst({
+        where: eq(drizzleDb.schemas.database.id, databaseId),
+        with: {
+            project: true,
+            retentionPolicy: true,
+            alertPolicies: true,
+            storagePolicies: true
+        }
+    });
+
+    if (!database) {
+        return []
+    }
+
+    const settings = await db.query.setting.findFirst({
+        where: eq(drizzleDb.schemas.setting.name, "system"),
+        with: {storageChannel: true},
+    });
+
+    const defaultStorageChannel: PingDatabaseStorageChannels[] = settings?.storageChannel
+        ? [{
+            id: settings.storageChannel.id,
+            provider: settings.storageChannel.provider,
+            config: settings.storageChannel.config,
+        }]
+        : [];
+
+
+    const enabledDatabaseStorageChannels = await Promise.all(
+        (database.storagePolicies ?? [])
+            .filter(p => p.enabled)
+            .map(async policy => {
+                const storageChannel = await db.query.storageChannel.findFirst({
+                    where: eq(drizzleDb.schemas.storageChannel.id, policy.storageChannelId),
+                });
+
+                if (!storageChannel) return null;
+
+                return {
+                    id: storageChannel.id,
+                    config: storageChannel.config,
+                    provider: storageChannel.provider,
+                } as PingDatabaseStorageChannels;
+            })
+    );
+
+    const filteredChannels: PingDatabaseStorageChannels[] = enabledDatabaseStorageChannels.filter(
+        (c): c is PingDatabaseStorageChannels => c !== null
+    );
+
+    return filteredChannels.length > 0 ? filteredChannels : defaultStorageChannel;
+}
+

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

@@ -1,12 +1,13 @@
 import {NextResponse} from "next/server";
-import {getFileUrlPresignedLocal} from "@/features/upload/private/upload.action";
 import {handleDatabases} from "./helpers";
-import {eventEmitter} from "../../../events/route";
 import * as drizzleDb from "@/db";
 import {db} from "@/db";
 import {EDbmsSchema} from "@/db/schema/types";
 import {eq} from "drizzle-orm";
 import {isUuidv4} from "@/utils/verify-uuid";
+import {withUpdatedAt} from "@/db/utils";
+import {eventEmitter} from "@/features/shared/event";
+import {notFound} from "next/navigation";
 
 export type databaseAgent = {
     name: string,
@@ -15,51 +16,56 @@ export type databaseAgent = {
 }
 
 export type Body = {
+    version: string,
     databases: databaseAgent[]
 }
 
 
-export async function GET(request: Request) {
-    const url = await getFileUrlPresignedLocal("d4a7fa35-2506-4d01-a612-a8ef2e2cc1c5.dump")
-    return Response.json({
-        message: url
-    })
-}
-
 export async function POST(
     request: Request,
     {params}: { params: Promise<{ agentId: string }> }
 ) {
     try {
         const agentId = (await params).agentId
+        console.log(agentId)
         const body: Body = await request.json();
         const lastContact = new Date();
+        let message: string
 
         if (!isUuidv4(agentId)) {
+            message = "agentId is not a valid uuid"
+            console.error(message)
             return NextResponse.json(
                 {error: "agentId is not a valid uuid"},
                 {status: 500}
             );
         }
 
-
-
         const agent = await db.query.agent.findFirst({
             where: eq(drizzleDb.schemas.agent.id, agentId),
         })
 
         if (!agent) {
-            return NextResponse.json({error: "Agent not found"}, {status: 404})
+            message = "Agent not found"
+            return NextResponse.json({error: message}, {status: 404})
         }
-        const databasesResponse = await handleDatabases(body, agent, lastContact)
 
+        const [settings] = await db.select().from(drizzleDb.schemas.setting).where(eq(drizzleDb.schemas.setting.name, "system")).limit(1);
+        if (!settings) {
+            return NextResponse.json({error: "An error occured"}, {status: 404})
+        }
+
+
+        const databasesResponse = await handleDatabases(body, agent, lastContact, settings)
 
         await db
             .update(drizzleDb.schemas.agent)
-            .set({ lastContact: lastContact })
+            .set(withUpdatedAt({
+                version: body.version,
+                lastContact: lastContact
+            }))
             .where(eq(drizzleDb.schemas.agent.id, agentId));
 
-        eventEmitter.emit('modification', {update: true});
 
         const response = {
             agent: {
@@ -68,7 +74,8 @@ export async function POST(
             },
             databases: databasesResponse
         }
-        console.log(response)
+
+
         return Response.json(response)
     } catch (error) {
         console.error('Error in POST handler:', error);

app/api/config/route.ts

@@ -0,0 +1,9 @@
+import { NextResponse } from "next/server";
+
+export async function GET() {
+  return NextResponse.json({
+    PROJECT_URL: process.env.PROJECT_URL,
+    PROJECT_NAME: process.env.PROJECT_NAME,
+    PROJECT_DESCRIPTION: process.env.PROJECT_DESCRIPTION,
+  });
+}

app/api/events/route.ts

@@ -1,15 +1,22 @@
-import { EventEmitter } from 'events';
-
-export const eventEmitter = new EventEmitter();
+import {auth} from "@/lib/auth/auth";
+import {headers} from "next/headers";
+import {NextResponse} from "next/server";
+import {eventEmitter} from "@/features/shared/event";
 
 export async function GET(request: Request) {
-    console.log('GET request received');
+
+    const session = await auth.api.getSession({
+        headers: await headers(),
+    });
+
+    if (!session) {
+        return NextResponse.json({error: "Unauthorized"}, {status: 403});
+    }
 
     return new Response(
         new ReadableStream({
             start(controller) {
                 console.log('Stream started');
-
                 const handleModification = (data: any) => {
                     console.log('Modification event triggered:', data);
                     controller.enqueue(`event: modification\n`);
@@ -18,7 +25,6 @@ export async function GET(request: Request) {
 
                 eventEmitter.on('modification', handleModification);
 
-                // Handle client disconnect
                 request.signal.addEventListener('abort', () => {
                     console.log('Client disconnected');
                     controller.close();
@@ -35,15 +41,4 @@ export async function GET(request: Request) {
             },
         }
     );
-}
-
-export async function POST(request: Request) {
-    console.log('POST request received');
-    const data = await request.json();
-    console.log('Data received:', data);
-
-    // Emit the event to all connected clients
-    eventEmitter.emit('modification', data);
-
-    return new Response('Event sent', { status: 200 });
 }

app/api/files/backups/route.ts

@@ -1,29 +1,46 @@
-import * as fs from "node:fs";
 import {NextResponse} from "next/server";
 import path from "path";
+import type {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/dispatch";
+import {Readable} from "node:stream";
 
 export async function GET(
     request: Request,
-    {params}: { params: Promise<{ fileName: string }> }
 ) {
 
     const {searchParams} = new URL(request.url);
     const token = searchParams.get('token');
     const expires = searchParams.get('expires');
-    const fileName = (await params).fileName
+    const pathFromUrl = searchParams.get('path');
+    const storageId = searchParams.get('storageId');
 
-    const privateLocalDir = "private/uploads/files/";
-    const filePath = path.join(privateLocalDir, fileName);
-
-    const crypto = require('crypto');
-
-    if (!fs.existsSync(filePath)) {
-        return NextResponse.json(
-            {error: 'File not found'},
-            {status: 404}
-        );
+    if (!pathFromUrl || !storageId) {
+        return NextResponse.json({error: "Missing search params"}, {status: 404})
     }
 
+    const input: StorageInput = {
+        action: "get",
+        data: {
+            path: pathFromUrl,
+            signedUrl: true,
+        },
+        metadata: {
+            storageId: storageId,
+            fileKind: "backups",
+        }
+    };
+
+    console.debug(input);
+
+    const result = await dispatchStorage(input, undefined, storageId);
+
+    if (!result.success) {
+        return NextResponse.json({error: "Enable to get file from provided storage channel, an error occurred !"})
+    }
+
+    const fileName = path.basename(pathFromUrl);
+
+    const crypto = require('crypto');
     const expectedToken = crypto.createHash('sha256').update(`${fileName}${expires}`).digest('hex');
     if (token !== expectedToken) {
         return NextResponse.json(
@@ -31,8 +48,8 @@ export async function GET(
             {status: 403}
         );
     }
-    //@ts-ignore
-    const expiresAt = parseInt(expires, 10);
+
+    const expiresAt = parseInt(expires!, 10);
     if (Date.now() > expiresAt) {
         return NextResponse.json(
             {error: 'Signed token expired'},
@@ -40,7 +57,15 @@ export async function GET(
         );
     }
 
-    const fileStream = fs.createReadStream(filePath);
+    if (!result.file || !(result.file instanceof Readable)) {
+        return NextResponse.json(
+            {error: "Invalid file payload"},
+            {status: 500}
+        );
+    }
+
+    const fileStream = Readable.from(result.file as Readable);
+
     const stream = new ReadableStream({
         start(controller) {
             fileStream.on('data', (chunk) => controller.enqueue(chunk));

app/api/files/images/[fileName]/route.ts

@@ -0,0 +1,88 @@
+import {NextResponse} from "next/server";
+import {auth} from "@/lib/auth/auth";
+import {headers} from "next/headers";
+import {db} from "@/db";
+import * as drizzleDb from "@/db";
+import {eq} from "drizzle-orm";
+import {StorageInput} from "@/features/storages/types";
+import {dispatchStorage} from "@/features/storages/dispatch";
+import {Readable} from "node:stream";
+
+export async function GET(
+    req: Request,
+    {params}: { params: Promise<{ fileName: string }> }
+) {
+    const {searchParams} = new URL(req.url);
+    const fileName = (await params).fileName;
+    const storageId = searchParams.get('storageId');
+
+    if (!fileName) return NextResponse.json({error: "Missing file parameter"}, {status: 400});
+
+    const session = await auth.api.getSession({headers: await headers()});
+    if (!session) return NextResponse.json({error: "Unauthorized"}, {status: 403});
+
+
+    if (!storageId) {
+        return NextResponse.json({error: "Missing storageId in search params"}, {status: 404})
+    }
+
+    const ext = fileName.split(".").pop()?.toLowerCase();
+    const contentType =
+        ext === "png"
+            ? "image/png"
+            : ext === "jpg" || ext === "jpeg"
+                ? "image/jpeg"
+                : ext === "gif"
+                    ? "image/gif"
+                    : ext === "webp"
+                        ? "image/webp"
+                        : "application/octet-stream";
+
+    try {
+
+        const path = `images/${fileName}`;
+
+        const input: StorageInput = {
+            action: "get",
+            data: {
+                path: path,
+            },
+            metadata: {
+                storageId: storageId,
+                fileKind: "images"
+            }
+        }
+
+        const result = await dispatchStorage(input, undefined, storageId);
+
+        if (!result.file || !(result.file instanceof Readable)) {
+            console.error(`An error occurred while getting file :`, result);
+            return NextResponse.json(
+                {error: "Invalid file payload"},
+                {status: 500}
+            );
+        }
+
+        const fileStream = Readable.from(result.file as Readable);
+
+        const stream = new ReadableStream({
+            start(controller) {
+                fileStream.on('data', (chunk) => controller.enqueue(chunk));
+                fileStream.on('end', () => controller.close());
+                fileStream.on('error', (err) => controller.error(err));
+            },
+        });
+
+        return new NextResponse(stream, {
+            headers: {
+                'Content-Disposition': `inline; filename="${fileName}"`,
+                "Cache-Control": "no-store",
+                "Content-Type": contentType,
+            },
+        });
+
+    } catch (err) {
+        console.error("Error streaming image:", err);
+        return NextResponse.json({error: "Error fetching file"}, {status: 500});
+    }
+}

app/api/google/drive/callback/route.ts

@@ -0,0 +1,23 @@
+export async function GET(request: Request) {
+    const url = new URL(request.url);
+    const code = url.searchParams.get("code");
+
+    const success = Boolean(code);
+
+    return new Response(
+        `
+        <!DOCTYPE html>
+        <html>
+            <body>
+                <h1>${success ? "Success" : "Failed"}</h1>
+            </body>
+        </html>
+        `,
+        {
+            status: success ? 200 : 400,
+            headers: {
+                "Content-Type": "text/html; charset=utf-8",
+            },
+        }
+    );
+}

app/api/images/[fileName]/route.ts

@@ -1,30 +0,0 @@
-import path from "path";
-import fs from "fs/promises";
-import { NextResponse } from "next/server";
-
-export async function GET({ params }: { params: Promise<{ fileName: string }> }) {
-    try {
-        const fileName = (await params).fileName;
-        const filePath = path.join(process.cwd(), "private/uploads/images", fileName);
-
-        // Check if the file exists
-        try {
-            await fs.access(filePath); // Ensures the file exists
-        } catch {
-            return NextResponse.json({ error: "File not found" }, { status: 404 });
-        }
-
-        // Read the file
-        const fileContent = await fs.readFile(filePath); // Returns a Buffer
-
-        return new NextResponse(fileContent, {
-            headers: {
-                "Content-Disposition": `attachment; filename="${fileName}"`,
-                "Content-Type": "application/octet-stream", // Adjust MIME type as needed
-            },
-        });
-    } catch (error) {
-        console.error("Error reading file:", error);
-        return NextResponse.json({ error: "Internal Server Error" }, { status: 500 });
-    }
-}

app/api/init/route.ts

@@ -1,23 +0,0 @@
-import { NextResponse } from "next/server";
-
-export type BodyInit = {
-    initialize: boolean;
-};
-
-export async function POST(request: Request) {
-    try {
-        const body: BodyInit = await request.json();
-
-        console.log(body);
-
-        return NextResponse.json(
-            {
-                message: "Initialization successfully done!",
-            },
-            { status: 200 }
-        );
-    } catch (error) {
-        console.error("Error in POST initialization:", error);
-        return NextResponse.json({ error: "Internal server error" }, { status: 500 });
-    }
-}

app/api/tus/hooks/route.ts

@@ -0,0 +1,80 @@
+import {NextResponse} from "next/server";
+import fs from "fs";
+import path from "path";
+import {env} from "@/env.mjs";
+
+
+export async function POST(request: Request) {
+    try {
+        const body = await request.json();
+        const event = body.Event
+        const headers = event.HTTPRequest.Header
+        const uploadLength = headers["X-File-Size"]?.[0];
+        const uploadOffset = headers["Upload-Offset"]?.[0];
+        const status = headers["X-Status"]?.[0];
+
+        console.log(`Upload ID : ${event.Upload.ID} (${uploadOffset}/${uploadLength})`);
+
+        if (status === "success") {
+            if (
+                body.Type === "post-receive" &&
+                event.Upload.SizeIsDeferred === false &&
+                event.Upload.Offset === event.Upload.Size
+            ) {
+                const id = event.Upload.ID;
+                const fileName = headers["X-File-Name"]?.[0];
+                const filePath = headers["X-File-Path"]?.[0];
+
+                if (!filePath) {
+                    return NextResponse.json({error: "Missing X-File-Path"}, {status: 500});
+                }
+
+
+                // const uploadDir = path.join(process.cwd(), "/private/uploads/");
+                const uploadDir = path.join(env.PRIVATE_PATH, "/uploads/");
+
+                const oldFilePath = path.join(uploadDir, "tmp", id);
+                const newFilePath = path.join(uploadDir, filePath);
+
+                fs.mkdirSync(path.dirname(newFilePath), {recursive: true});
+
+                let retries = 10;
+                while (!fs.existsSync(oldFilePath)) {
+                    if (retries-- === 0) {
+                        return NextResponse.json({error: `Upload file not found: ${oldFilePath}`}, {status: 500});
+                    }
+                    await new Promise(r => setTimeout(r, 200));
+                }
+
+                fs.renameSync(oldFilePath, newFilePath);
+
+                const infoFilePath = `${oldFilePath}.info`;
+                if (fs.existsSync(infoFilePath)) {
+                    fs.unlinkSync(infoFilePath);
+                }
+
+                const metadataHeaderB64 = headers["Upload-Metadata"]?.[0];
+
+                if (metadataHeaderB64) {
+                    const metadataHeader = Buffer.from(metadataHeaderB64, "base64").toString("utf-8");
+                    if (metadataHeader) {
+                        const tomlContent = metadataHeader
+                            .split(",")
+                            .map((pair) => {
+                                const [key, value] = pair.split(" ");
+                                const escapedValue = value.replace(/"/g, '\\"');
+                                return `${key} = "${escapedValue}"`;
+                            })
+                            .join("\n");
+                        const metaFilePath = `${newFilePath}.meta`;
+                        fs.writeFileSync(metaFilePath, tomlContent, "utf-8");
+                    }
+                }
+            }
+        }
+        return NextResponse.json({});
+    } catch (error) {
+        console.error("Hook error:", error);
+        return NextResponse.json({error: "Internal server error"}, {status: 500});
+    }
+}

app/error/page.tsx

@@ -1,85 +1,33 @@
-// "use client"
-//
-// import {useSearchParams} from "next/navigation"
-//
-// enum Error {
-//     Configuration = "Configuration",
-// }
-//
-// const errorMap = {
-//     [Error.Configuration]: (
-//         <p>
-//             There was a problem when trying to authenticate. Please contact us if this
-//             error persists. Unique error code:{" "}
-//             <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-//         </p>
-//     ),
-// }
-//
-// export default function AuthErrorPage() {
-//     const search = useSearchParams()
-//     const error = search.get("error") as Error
-//
-//     return (
-//         <div className="flex h-screen w-full flex-col items-center justify-center">
-//             <a
-//                 href="#"
-//                 className="block max-w-sm rounded-lg border border-gray-200 bg-white p-6 text-center shadow-sm hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"
-//             >
-//                 <h5 className="mb-2 flex flex-row items-center justify-center gap-2 text-xl font-bold tracking-tight text-gray-900 dark:text-white">
-//                     Something went wrong
-//                 </h5>
-//                 <div className="font-normal text-gray-700 dark:text-gray-400">
-//                     {errorMap[error] || "Please contact us if this error persists."}
-//                 </div>
-//             </a>
-//         </div>
-//     )
-// }
-"use client"
+"use client";
 
-import { useSearchParams } from "next/navigation"
-import React, { Suspense } from "react"
+import { Loader2 } from "lucide-react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+import { useSession } from "@/lib/auth/auth-client";
 
-enum Error {
-    Configuration = "Configuration",
+export default function ErrorPage() {
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const { data: session, isPending } = useSession();
+
+  useEffect(() => {
+    if (isPending) {
+      return;
+    }
+
+    const error = searchParams.get("error");
+    const params = new URLSearchParams();
+    if (error) {
+      params.set("error", error);
+    }
+
+    const destination = session ? "/dashboard/home" : "/login";
+    router.replace(`${destination}?${params.toString()}`);
+  }, [isPending, session, router, searchParams]);
+
+  return (
+    <div className="flex h-screen w-full items-center justify-center">
+      <Loader2 className="h-8 w-8 animate-spin" />
+    </div>
+  );
 }
-
-const errorMap = {
-    [Error.Configuration]: (
-        <p>
-            There was a problem when trying to authenticate. Please contact us if this
-            error persists. Unique error code:{" "}
-            <code className="rounded-sm bg-slate-100 p-1 text-xs">Configuration</code>
-        </p>
-    ),
-}
-
-function AuthErrorPageContent() {
-    const search = useSearchParams()
-    const error = search.get("error") as Error
-
-    return (
-        <div className="flex h-screen w-full flex-col items-center justify-center">
-            <a
-                href="#"
-                className="block max-w-sm rounded-lg border border-gray-200 bg-white p-6 text-center shadow-sm hover:bg-gray-100 dark:border-gray-700 dark:bg-gray-800 dark:hover:bg-gray-700"
-            >
-                <h5 className="mb-2 flex flex-row items-center justify-center gap-2 text-xl font-bold tracking-tight text-gray-900 dark:text-white">
-                    Something went wrong
-                </h5>
-                <div className="font-normal text-gray-700 dark:text-gray-400">
-                    {errorMap[error] || "Please contact us if this error persists."}
-                </div>
-            </a>
-        </div>
-    )
-}
-
-export default function AuthErrorPage() {
-    return (
-        <Suspense fallback={<div>Loading...</div>}>
-            <AuthErrorPageContent />
-        </Suspense>
-    )
-}

app/globals.css

@@ -6,8 +6,11 @@
 @theme inline {
     --color-background: var(--background);
     --color-foreground: var(--foreground);
-    --font-sans: var(--font-geist-sans);
+    --font-sans: var(--font-poppins), ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+    --font-title: var(--font-poppins), var(--font-poppins), sans-serif;
     --font-mono: var(--font-geist-mono);
+    --font-author: var(--font-author);
+    --font-poppins: var(--font-poppins);
     --color-sidebar-ring: var(--sidebar-ring);
     --color-sidebar-border: var(--sidebar-border);
     --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
@@ -71,7 +74,7 @@
     --card-foreground: oklch(0.145 0 0);
     --popover: oklch(1 0 0);
     --popover-foreground: oklch(0.145 0 0);
-    --primary: oklch(0.205 0 0);
+    --primary: oklch(0.611 0.204 42.149);
     --primary-foreground: oklch(0.985 0 0);
     --secondary: oklch(0.97 0 0);
     --secondary-foreground: oklch(0.205 0 0);
@@ -82,7 +85,7 @@
     --destructive: oklch(0.577 0.245 27.325);
     --border: oklch(0.922 0 0);
     --input: oklch(0.922 0 0);
-    --ring: oklch(0.708 0 0);
+    --ring: oklch(0.611 0.204 42.149);
     --chart-1: oklch(0.646 0.222 41.116);
     --chart-2: oklch(0.6 0.118 184.704);
     --chart-3: oklch(0.398 0.07 227.392);
@@ -90,12 +93,12 @@
     --chart-5: oklch(0.769 0.188 70.08);
     --sidebar: oklch(0.985 0 0);
     --sidebar-foreground: oklch(0.145 0 0);
-    --sidebar-primary: oklch(0.205 0 0);
+    --sidebar-primary: oklch(0.611 0.204 42.149);
     --sidebar-primary-foreground: oklch(0.985 0 0);
     --sidebar-accent: oklch(0.97 0 0);
     --sidebar-accent-foreground: oklch(0.205 0 0);
     --sidebar-border: oklch(0.922 0 0);
-    --sidebar-ring: oklch(0.708 0 0);
+    --sidebar-ring: oklch(0.611 0.204 42.149);
 }
 
 .dark {
@@ -105,8 +108,8 @@
     --card-foreground: oklch(0.985 0 0);
     --popover: oklch(0.205 0 0);
     --popover-foreground: oklch(0.985 0 0);
-    --primary: oklch(0.922 0 0);
-    --primary-foreground: oklch(0.205 0 0);
+    --primary: oklch(0.704 0.191 47.132);
+    --primary-foreground: oklch(0.985 0 0);
     --secondary: oklch(0.269 0 0);
     --secondary-foreground: oklch(0.985 0 0);
     --muted: oklch(0.269 0 0);
@@ -116,7 +119,7 @@
     --destructive: oklch(0.704 0.191 22.216);
     --border: oklch(1 0 0 / 10%);
     --input: oklch(1 0 0 / 15%);
-    --ring: oklch(0.556 0 0);
+    --ring: oklch(0.704 0.191 47.132);
     --chart-1: oklch(0.488 0.243 264.376);
     --chart-2: oklch(0.696 0.17 162.48);
     --chart-3: oklch(0.769 0.188 70.08);
@@ -124,12 +127,12 @@
     --chart-5: oklch(0.645 0.246 16.439);
     --sidebar: oklch(0.205 0 0);
     --sidebar-foreground: oklch(0.985 0 0);
-    --sidebar-primary: oklch(0.488 0.243 264.376);
+    --sidebar-primary: oklch(0.704 0.191 47.132);
     --sidebar-primary-foreground: oklch(0.985 0 0);
     --sidebar-accent: oklch(0.269 0 0);
     --sidebar-accent-foreground: oklch(0.985 0 0);
     --sidebar-border: oklch(1 0 0 / 10%);
-    --sidebar-ring: oklch(0.556 0 0);
+    --sidebar-ring: oklch(0.704 0.191 47.132);
 }
 
 @layer base {
@@ -137,6 +140,18 @@
         @apply border-border outline-ring/50;
     }
     body {
-        @apply bg-background text-foreground;
+        @apply bg-background text-foreground font-sans;
+    }
+    h1, h2, h3, h4, h5, h6 {
+        @apply font-title;
+    }
+
+    .scrollbar-hide {
+        -ms-overflow-style: none;
+        scrollbar-width: none;
+    }
+
+    .scrollbar-hide::-webkit-scrollbar {
+        display: none;
     }
 }

app/layout.tsx

@@ -1,31 +1,42 @@
-import React from "react";
-import type {Metadata} from "next";
-import {Inter} from "next/font/google";
-
+import type { Metadata } from "next";
+import type React from "react";
 import "./globals.css";
-import {Providers} from "./providers";
-import {cn} from "@/lib/utils";
+import { ConsoleSilencer } from "@/components/wrappers/common/console-silencer";
+import { author, geistMono, poppins } from "@/fonts/fonts";
+import { cn } from "@/lib/utils";
+import { Providers } from "./providers";
 
-const inter = Inter({subsets: ["latin"]});
+const title = process.env.PROJECT_NAME ?? "App Title";
 
 export const metadata: Metadata = {
-    title: process.env.NEXT_PUBLIC_PROJECT_NAME ?? "App Title",
-    description: process.env.NEXT_PUBLIC_PROJECT_DESCRIPTION ?? undefined,
+  title: {
+    default: title,
+    template: `%s - ${title}`,
+  },
+  description: process.env.PROJECT_DESCRIPTION ?? undefined,
 };
 
-export default function RootLayout({
-                                       children,
-                                   }: Readonly<{
-    children: React.ReactNode;
+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"/>
-        </head>
-        <body className={cn(inter.className, "h-full")}>
+  return (
+    <html lang="en" suppressHydrationWarning>
+      <head>
+        <meta name="apple-mobile-web-app-title" content={title} />
+      </head>
+      <body
+        className={cn(
+          poppins.variable,
+          author.variable,
+          geistMono.variable,
+          "font-sans h-full",
+        )}
+      >
+        <ConsoleSilencer />
         <Providers>{children}</Providers>
-        </body>
-        </html>
-    );
+      </body>
+    </html>
+  );
 }

app/not-found.tsx

@@ -1,10 +1,19 @@
-import { redirect } from "next/navigation";
+import BackButton from "@/components/wrappers/common/button/back-button";
 
 export default async function NotFound() {
-    // redirect("/dashboard/profile");
-    return(
-        <>
-            Error
-        </>
-    )
+  return (
+    <div className="flex items-center min-h-screen px-4 py-12 sm:px-6 md:px-8 lg:px-12 xl:px-16">
+      <div className="w-full space-y-6 text-center">
+        <div className="space-y-3">
+          <h1 className="scroll-m-20 text-4xl font-extrabold tracking-tight lg:text-5xl">
+            Not found
+          </h1>
+          <p className="leading-7 not-first:mt-6">
+            The content you are trying to view is not available.
+          </p>
+        </div>
+        <BackButton>Go home</BackButton>
+      </div>
+    </div>
+  );
 }

app/providers.tsx

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

components.json

@@ -10,11 +10,15 @@
     "cssVariables": true,
     "prefix": ""
   },
+  "iconLibrary": "radix",
   "aliases": {
     "components": "@/components",
     "utils": "@/lib/utils",
     "ui": "@/components/ui",
     "lib": "@/lib",
     "hooks": "@/hooks"
+  },
+  "registries": {
+    "@reui": "https://reui.io/r/{name}.json"
   }
-}
+}

docker-compose.func.yml

@@ -0,0 +1,35 @@
+name: portabase-dev-func
+
+services:
+  keycloak:
+    image: quay.io/keycloak/keycloak:latest
+    command: start-dev --import-realm
+    # environment:
+    #   KC_BOOTSTRAP_ADMIN_USERNAME: admin
+    #   KC_BOOTSTRAP_ADMIN_PASSWORD: admin
+    ports:
+      - "3056:8080"
+    volumes:
+      - keycloak-data:/opt/keycloak/data
+      - ./seeds/keycloak:/opt/keycloak/data/import:ro
+      - ./export:/tmp/export
+  pocket-id:
+    image: ghcr.io/pocket-id/pocket-id
+    restart: unless-stopped
+    environment:
+      - APP_URL=http://localhost:3055
+      - ENCRYPTION_KEY=QwHyjbZvSsDUAcjpdmSPsuYxaH6vET6OeBaeLwXccCb43L6Om3W1AoU5pKIJTzYr
+    ports:
+      - 3055:1411
+    volumes:
+      - pocket-id-data:/app/data
+      - ./seeds/pocket-id:/seed:ro
+    healthcheck:
+      test: "curl -f http://localhost:1411/healthz"
+      interval: 1m30s
+      timeout: 5s
+      retries: 2
+      start_period: 10s
+volumes:
+  keycloak-data:
+  pocket-id-data:

docker-compose.prod.yml

@@ -1,25 +1,23 @@
-name: portabase-prod
-
 services:
-
   app:
-    build:
-      context: .
-      dockerfile: docker/dockerfile/Dockerfile
-      target: prod
-
+#        build:
+#          context: .
+#          dockerfile: docker/dockerfile/Dockerfile
+#          target: prod
+    image: portabase/portabase:1.4.0
     ports:
       - '8887:80'
+    environment:
+      TZ: "Europe/Paris"
     env_file:
       - .env
-
+    volumes:
+      - portabase-data:/data
     depends_on:
       db:
         condition: service_healthy
-
     container_name: portabase-app-prod
 
-
   db:
     image: postgres:16-alpine
     ports:
@@ -36,20 +34,6 @@ services:
       timeout: 5s
       retries: 5
 
-
-  s3:
-    image: docker.io/bitnami/minio:latest
-    ports:
-      - '9000:9000'
-      - '9001:9001'
-    volumes:
-      - minio_data:/data
-    environment:
-      - MINIO_ROOT_USER=${S3_ACCESS_KEY}
-      - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
-      - MINIO_DEFAULT_BUCKETS=${S3_BUCKET_NAME}
-
-
 volumes:
+  portabase-data:
   postgres-data:
-  minio_data:

docker-compose.yml

@@ -1,77 +1,36 @@
 name: portabase-dev
 
 services:
-    app:
-        build:
-            context: .
-            dockerfile: docker/dockerfile/Dockerfile
-            target: dev
-        ports:
-            - "8887:80"
-        environment:
-            - TIME_ZONE="Europe/Paris"
-            - NODE_ENV=development
-        depends_on:
-            db:
-                condition: service_healthy
-        volumes:
-            - .:/app
-            - /app/node_modules
-        container_name: portabase-app
+  db:
+    image: postgres:17-alpine
+    ports:
+      - "5433:5432"
+    volumes:
+      - postgres-data:/var/lib/postgresql/data
+    environment:
+      - POSTGRES_DB=devdb
+      - POSTGRES_USER=devuser
+      - POSTGRES_PASSWORD=changeme
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
 
-        develop:
-            watch:
-                - action: sync
-                  path: .
-                  target: /app
-                - action: rebuild
-                  path: package.json
-
-    db:
-        image: postgres:16-alpine
-        ports:
-            - "5433:5432"
-        volumes:
-            - postgres-data:/var/lib/postgresql/data
-        environment:
-            - POSTGRES_DB=devdb
-            - POSTGRES_USER=devuser
-            - POSTGRES_PASSWORD=changeme
-        healthcheck:
-            test: ["CMD-SHELL", "pg_isready -U devuser -d devdb"]
-            interval: 10s
-            timeout: 5s
-            retries: 5
-
-    db-pgadmin:
-        image: dpage/pgadmin4
-        environment:
-            PGADMIN_DEFAULT_EMAIL: "devuser@devuser.devuser"
-            PGADMIN_DEFAULT_PASSWORD: "changeme"
-            PGADMIN_CONFIG_SERVER_MODE: "False"
-            POSTGRES_USER: "devuser"
-            POSTGRES_PASSWORD: "changeme"
-        volumes:
-            - pgadmin-data:/var/lib/pgadmin
-        ports:
-            - "8080:80"
-        restart: unless-stopped
-        depends_on:
-            - db
-
-    s3:
-        image: docker.io/bitnami/minio:latest
-        ports:
-            - "9000:9000"
-            - "9001:9001"
-        volumes:
-            - minio_data:/data
-        environment:
-            - MINIO_ROOT_USER=${S3_ACCESS_KEY}
-            - MINIO_ROOT_PASSWORD=${S3_SECRET_KEY}
-            - MINIO_DEFAULT_BUCKETS=${S3_BUCKET_NAME}
+  tusd:
+    image: tusproject/tusd:v2.8.0
+    ports:
+      - "1080:8080"
+    command: >
+      -upload-dir /data/uploads/tmp
+      -hooks-http http://localhost:8887/api/tus/hooks
+      -max-size 21474836480
+      -base-path /tus/files/
+    extra_hosts:
+      - "localhost:host-gateway"
+    volumes:
+      - ./private/uploads/tmp:/data/uploads/tmp
+    user: "1000:1000"
 
 volumes:
-    postgres-data:
-    minio_data:
-    pgadmin-data:
+  postgres-data:

docker/dockerfile/Dockerfile

@@ -1,109 +1,124 @@
-FROM node:23-alpine AS base
+FROM --platform=$BUILDPLATFORM node:22-bullseye AS base
 
-ENV YARN_VERSION=4.9.1
-
-RUN apk add --update --no-cache \
-    build-base \
-    libc6-compat \
-    openssl \
-    make \
+RUN apt-get update && apt-get install -y \
+    curl \
+    ca-certificates \
+    bash \
+    tzdata \
+    libc6 \
+    build-essential \
     g++ \
-    jpeg-dev \
-    cairo-dev \
-    giflib-dev \
-    pango-dev \
-    libtool \
+    make \
     autoconf \
     automake \
-    libpng
-
-RUN corepack enable && corepack prepare yarn@${YARN_VERSION}
-RUN yarn set version ${YARN_VERSION}
+    libtool \
+    git \
+    nginx \
+    && rm -rf /var/lib/apt/lists/*
 
 
-FROM base AS deps
+RUN mkdir -p /etc/apt/keyrings \
+    && curl -fsSL https://www.postgresql.org/media/keys/ACCC4CF8.asc \
+    | gpg --dearmor -o /etc/apt/keyrings/postgresql.gpg \
+    && echo "deb [signed-by=/etc/apt/keyrings/postgresql.gpg] http://apt.postgresql.org/pub/repos/apt bullseye-pgdg main" \
+    > /etc/apt/sources.list.d/pgdg.list
+
+RUN apt-get update && apt-get install -y \
+    postgresql-18 \
+    postgresql-client-18 \
+    postgresql-contrib-18 \
+    && rm -rf /var/lib/apt/lists/*
+
+ENV PATH="/usr/lib/postgresql/18/bin:${PATH}"
+
+
+FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS tusd-base
+
+ARG TUSD_VERSION=2.8.0
+
+RUN apt-get update && apt-get install -y --no-install-recommends git ca-certificates \
+    && rm -rf /var/lib/apt/lists/*
+
+WORKDIR /build
+
+RUN git clone https://github.com/tus/tusd.git . \
+    && git checkout v${TUSD_VERSION}
+
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=${TARGETARCH} \
+    go build -ldflags="-s -w" -o /tusddist/tusd ./cmd/tusd
+
+FROM scratch AS tusd-dist
+COPY --from=tusd-base /tusddist/tusd /tusd
+
+
+FROM base AS build-env
+
+RUN corepack enable && corepack prepare pnpm@latest --activate
+
+FROM build-env AS deps
 
 WORKDIR /app
 
-COPY .yarn ./.yarn
-COPY .yarnrc.yml ./
-COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+RUN pnpm i --frozen-lockfile
 
-
-RUN \
-  if [ -f yarn.lock ]; then yarn; \
-  elif [ -f package-lock.json ]; then npm ci; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm i --frozen-lockfile; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
-
-
-FROM base AS dev
-
-WORKDIR /app
+FROM build-env AS dev
 
 COPY --from=deps /app/node_modules ./node_modules
+COPY --from=tusd-base /usr/local/bin/tusd /usr/local/bin/tusd
+WORKDIR /app
 COPY . .
 
 USER root
-
 RUN chmod +x /app/docker/entrypoints/app-dev-entrypoint.sh
+
 ENTRYPOINT ["sh","/app/docker/entrypoints/app-dev-entrypoint.sh"]
 
-
-# Rebuild the source code only when needed
-FROM base AS builder
+FROM build-env AS builder
 
 WORKDIR /app
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1
-
-RUN \
-  if [ -f yarn.lock ]; then yarn run build; \
-  elif [ -f package-lock.json ]; then npm run build; \
-  elif [ -f pnpm-lock.yaml ]; then corepack enable pnpm && pnpm run build; \
-  else echo "Lockfile not found." && exit 1; \
-  fi
-
+RUN pnpm run build
 
 FROM base AS prod
 
 WORKDIR /app
-
 ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
+ENV PORT=80
+ENV HOSTNAME="0.0.0.0"
+ENV PGDATA=/data/postgres
+ENV PRIVATE_PATH=/data/private
+
 
 RUN addgroup --system --gid 1001 nodejs
 RUN adduser --system --uid 1001 nextjs
 
 COPY --from=builder /app/public ./public
-
-RUN mkdir .next
-RUN chown nextjs:nodejs .next
-
 COPY --from=builder /app/next.config.ts ./
+COPY --from=builder /app/portabase.config.ts ./
 COPY --from=builder /app/drizzle.config.ts ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-COPY --chown=nextjs:nodejs src/db ./src/db
+COPY --from=builder --chown=1001:1001 /app/.next/standalone ./
+COPY --from=builder --chown=1001:1001 /app/.next/static ./.next/static
+COPY --chown=1001:1001 src/db ./src/db
+COPY --from=deps /app/node_modules ./node_modules
+
+COPY --from=tusd-dist /tusd /usr/local/bin/tusd
+RUN chmod +x /usr/local/bin/tusd
+
+COPY docker/nginx/nginx.conf /etc/nginx/nginx.conf
 
 
+RUN mkdir -p .next /data/private/uploads \
+    && chown -R nextjs:nodejs .next /data/private /app/public
 
 
 USER root
-
 COPY ./docker/entrypoints/app-prod-entrypoint.sh /app/app-prod-entrypoint.sh
 RUN chmod +x /app/app-prod-entrypoint.sh
 
 EXPOSE 80
-
-ENV PORT=80
-
-ENV HOSTNAME="0.0.0.0"
-
-USER nextjs
-
 ENTRYPOINT ["sh","/app/app-prod-entrypoint.sh"]
-

docker/entrypoints/app-dev-entrypoint.sh

@@ -1,11 +1,12 @@
 #!/bin/bash
 
-npm install -g npm@11.0.0
-npm -v
+set -euo pipefail
 
-npx drizzle-kit generate
-npx drizzle-kit migrate
+echo "▶ Running Drizzle codegen..."
+pnpm drizzle-kit generate
 
-npm run dev
+echo "▶ Applying migrations..."
+pnpm drizzle-kit migrate
 
-exec "$@"
+echo "▶ Starting Next.js dev server..."
+exec pnpm dev

docker/entrypoints/app-prod-entrypoint.sh

@@ -1,15 +1,83 @@
 #!/bin/bash
 
-echo "     ____             __        __                        "
-echo "    / __ \____  _____/ /_____ _/ /_  ____ _________       "
-echo "   / /_/ / __ \/ ___/ __/ __  / __ \/ __  / ___/ _ \      "
-echo "  / ____/ /_/ / /  / /_/ /_/ / /_/ / /_/ (__  )  __/      "
-echo " /_/    \____/_/   \__/\__,_/_.___/\__,_/____/\___/       "
-echo "                                                          "
-echo " Community Edition v1.0.0                                 "
-echo "                                                          "
+if [ -n "$TZ" ]; then
+    echo "[INFO] Application timezone set to $TZ (environment only)"
+    export TZ="$TZ"
+else
+    echo "[WARN] No TZ provided, using default container timezone"
+fi
+
+POSTGRES_BIN=$(ls -d /usr/lib/postgresql/*/bin | head -n 1)
+
+if [ -z "$POSTGRES_BIN" ]; then
+    echo "PostgreSQL binaries not found"
+    exit 1
+fi
+
+export PATH="$POSTGRES_BIN:$PATH"
+
+if [ -z "$DATABASE_URL" ]; then
+    echo "[INFO] No DATABASE_URL provided, starting internal Postgres..."
+
+    mkdir -p "$PGDATA"
+    chown -R postgres:postgres "$PGDATA"
+
+    if [ ! -f "$PGDATA/PG_VERSION" ]; then
+        echo "[INFO] Initializing database cluster..."
+        if ! su postgres -c "initdb -D '$PGDATA'" > /dev/null 2>&1; then
+            echo "[ERROR] initdb failed"
+            exit 1
+        fi
+    fi
+
+    if ! su postgres -c "pg_ctl -D '$PGDATA' \
+        -o \"-c listen_addresses='localhost' -c logging_collector=on\" \
+        -l $PGDATA/postgres.log -w start" > /dev/null 2>&1; then
+        echo "[ERROR] PostgreSQL failed to start"
+        exit 1
+    fi
+
+    until su postgres -c "pg_isready -h 127.0.0.1 -p 5432" > /dev/null 2>&1; do
+        sleep 1
+    done
+
+    echo "[INFO] PostgreSQL server is up and accepting connections"
+
+    DB_USER="${POSTGRES_USER:-portabase_user}"
+    DB_PASS="${POSTGRES_PASSWORD:-JaB6b1SUtIWYvt7srnOt}"
+    DB_NAME="${POSTGRES_DB:-portabase_db}"
+
+    USER_EXISTS=$(su postgres -c "psql -tAc \"SELECT 1 FROM pg_roles WHERE rolname='$DB_USER'\"" 2>/dev/null)
+    if [ "$USER_EXISTS" != "1" ]; then
+        if ! su postgres -c "psql -c \"CREATE USER $DB_USER WITH PASSWORD '$DB_PASS';\"" > /dev/null 2>&1; then
+            echo "[ERROR] Failed creating user"
+            exit 1
+        fi
+    fi
+
+    DB_EXISTS=$(su postgres -c "psql -tAc \"SELECT 1 FROM pg_database WHERE datname='$DB_NAME'\"" 2>/dev/null)
+    if [ "$DB_EXISTS" != "1" ]; then
+        if ! su postgres -c "psql -c \"CREATE DATABASE $DB_NAME OWNER $DB_USER;\"" > /dev/null 2>&1; then
+            echo "[ERROR] Failed creating database"
+            exit 1
+        fi
+    fi
+
+    export DATABASE_URL="postgres://$DB_USER:$DB_PASS@127.0.0.1:5432/$DB_NAME"
+
+    echo "[SUCCESS] Internal PostgreSQL started successfully"
+    echo "[SUCCESS] Database: $DB_NAME | User: $DB_USER | Host: 127.0.0.1:5432"
+fi
 
 
-node server.js
+mkdir -p /data/private/uploads/tmp
+echo "▶ Starting tusd server..."
+tusd --base-path /tus/files/ --upload-dir /data/private/uploads/tmp --hooks-http http://127.0.0.1:3000/api/tus/hooks --port 1080 --max-size 21474836480 &
+
+echo "▶ Starting Next.js server..."
+PORT=3000 node server.js &
+
+echo "▶ Starting nginx..."
+exec nginx -g "daemon off;"
+
 
-exec "$@"

docker/nginx/nginx.conf

@@ -0,0 +1,41 @@
+events {}
+
+http {
+    client_max_body_size 20G;
+    ignore_invalid_headers  off;
+
+    server {
+        listen 80;
+
+       location /tus/ {
+            proxy_pass http://127.0.0.1:1080/tus/;
+
+            proxy_pass_request_headers on;
+
+            proxy_request_buffering  off;
+            proxy_buffering          off;
+            proxy_http_version       1.1;
+
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-Host $http_host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+            proxy_set_header         Upgrade $http_upgrade;
+            proxy_set_header         Connection "upgrade";
+        }
+
+        location / {
+            proxy_pass http://127.0.0.1:3000;
+
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+
+            proxy_set_header Host $http_host;
+            proxy_set_header X-Forwarded-Host $http_host;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+    }
+}

emails/Button.tsx

@@ -1,6 +0,0 @@
-import { Button as ReactEmailButton } from "@react-email/components";
-import { ComponentPropsWithoutRef } from "react";
-
-export const Button = (props: ComponentPropsWithoutRef<typeof ReactEmailButton>) => {
-    return <ReactEmailButton className="block w-52 rounded bg-blue-600 py-3.5 text-center text-sm font-normal text-white no-underline " {...props} />;
-};

emails/EmailLayout.tsx

@@ -1,25 +0,0 @@
-import { Body, Container, Head, Html, Img, Preview, Section, Tailwind } from "@react-email/components";
-import * as React from "react";
-import { PropsWithChildren } from "react";
-import { getServerUrl } from "@/utils/get-server-url";
-
-const baseUrl = getServerUrl();
-
-export const EmailLayout = ({ children, preview }: PropsWithChildren<{ preview?: string }>) => {
-    return (
-        <Tailwind>
-            <Html>
-                <Head />
-                {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}/logo-title-black.png`} width="200" height="auto" alt="Logo" />
-                        <Section>{children}</Section>
-                    </Container>
-                </Body>
-            </Html>
-        </Tailwind>
-    );
-};
-
-export default EmailLayout;

emails/HelloEmail.tsx

@@ -1,13 +0,0 @@
-import { Button } from "@react-email/button";
-import { Html } from "@react-email/html";
-import * as React from "react";
-
-export default function HelloEmail() {
-    return (
-        <Html>
-            <Button href="https://example.com" style={{ background: "#000", color: "#fff" }}>
-                Hello,
-            </Button>
-        </Html>
-    );
-}

emails/TestEmailSettings.tsx

@@ -1,16 +0,0 @@
-import { Text } from "@react-email/components";
-import * as React from "react";
-import EmailLayout from "./EmailLayout";
-import { Button } from "@react-email/button";
-
-export const TestEmailSettings = () => {
-    return (
-        <EmailLayout preview="Email Setup">
-            <Text className="text-base font-light leading-8 text-green-800 ">Hi, your email settings are setup !</Text>
-            <Text className="text-base font-light leading-8 text-green-800 ">Best regard,</Text>{" "}
-            <Text className="text-base font-light leading-8 text-green-800 ">Portabase</Text>
-        </EmailLayout>
-    );
-};
-
-export default TestEmailSettings;