chore(release): 1.0.0-beta.13 [skip ci]

.env.example

@@ -12,8 +12,6 @@ AUTH_SECRET="supersecret"
 # or starting the project without any (which will show a randomly generated one).
 SECRET_ENCRYPTION_KEY=0000000000000000000000000000000000000000000000000000000000000000
 
-LOG_LEVEL='info'
-
 # This is how you can use the sqlite driver:
 DB_DRIVER='better-sqlite3'
 DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'
@@ -30,8 +28,7 @@ DB_URL='FULL_PATH_TO_YOUR_SQLITE_DB_FILE'
 # DB_PASSWORD='password'
 # DB_NAME='name-of-database'
 
-# The below path can be used to store trusted certificates during development, it is not required and can be left empty.
-# If it is used, please use the full path to the directory where the certificates are stored.
-# LOCAL_CERTIFICATE_PATH='FULL_PATH_TO_CERTIFICATES'
+TURBO_TELEMETRY_DISABLED=1
 
-TURBO_TELEMETRY_DISABLED=1
+# Configure logging to use winston logger
+NODE_OPTIONS='-r @homarr/log/override'

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -31,18 +31,6 @@ body:
       label: Version
       description: What version of Homarr are you running?
       options:
-        - 1.9.0
-        - 1.8.0
-        - 1.7.0
-        - 1.6.0
-        - 1.5.0
-        - 1.4.0
-        - 1.3.1
-        - 1.3.0
-        - 1.2.0
-        - 1.1.0
-        - 1.0.1
-        - 1.0.0
         - 1.0.0-beta
         - Other (describe in "additional information")
       default: 0
@@ -87,4 +75,4 @@ body:
         - Other (describe in "additional information")
       default: 0
     validations:
-      required: false
+      required: false

.github/pull_request_template.md

@@ -6,7 +6,7 @@
 
 **Thank you for your contribution. Please ensure that your pull request meets the following pull request:**
 
-- [ ] Builds without warnings or errors (``pnpm build``, autofix with ``pnpm format:fix``)
+- [ ] Builds without warnings or errors (``pnpm buid``, autofix with ``pnpm format:fix``)
 - [ ] Pull request targets ``dev`` branch
 - [ ] Commits follow the [conventional commits guideline](https://www.conventionalcommits.org/en/v1.0.0/)
 - [ ] No shorthand variable names are used (eg. ``x``, ``y``, ``i`` or any abbrevation)

.github/renovate.json5

@@ -6,11 +6,6 @@
       matchPackagePatterns: ["^@homarr/"],
       enabled: false,
     },
-    // 15.2.0 crashes with turbopack error (panic)
-    {
-      matchPackagePatterns: ["^next$", "^@next/eslint-plugin-next$"],
-      enabled: false,
-    },
     {
       matchUpdateTypes: ["minor", "patch", "pin", "digest"],
       automerge: true,

.github/workflows/deployment-docker-image.yml

@@ -15,14 +15,13 @@ on:
         description: Send notifications
 
 permissions:
-  contents: write # Required to update package.json version
-  packages: write # Required for pushing to GHCR
+  contents: write
+  packages: write
 
 env:
   SKIP_ENV_VALIDATION: true
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  GHCR_REPO: ghcr.io/${{ github.repository }}
   TURBO_TELEMETRY_DISABLED: 1
 
 concurrency:
@@ -97,129 +96,64 @@ jobs:
         run: |
           git config user.name "Releases Homarr"
           git config user.email "175486441+homarr-releases[bot]@users.noreply.github.com"
-          git remote set-url origin https://x-access-token:${{ steps.obtainToken.outputs.token }}@github.com/${{ github.repository }}.git
           git fetch origin dev
           git checkout dev
           git pull origin dev
-          git rebase ${{ github.ref_name }}
+          git merge ${{ github.ref_name }}
           git push origin dev
-  build-amd64:
-    name: Build docker image for amd64
+  deploy:
+    name: Deploy docker image
     needs: release
     runs-on: ubuntu-latest
-    outputs:
-      digest: ${{ steps.build.outputs.digest }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.release.outputs.git_ref }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: "${{ env.GHCR_REPO }}"
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          network: host
-          platforms: linux/amd64
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
-        env:
-          SKIP_ENV_VALIDATION: true
-
-  build-arm64:
-    name: Build docker image for arm64
-    needs: release
-    runs-on: ubuntu-24.04-arm
-    outputs:
-      digest: ${{ steps.build.outputs.digest }}
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.release.outputs.git_ref }}
-
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: "${{ env.GHCR_REPO }}"
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push by digest
-        id: build
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          network: host
-          platforms: linux/arm64
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true
-        env:
-          SKIP_ENV_VALIDATION: true
-
-  publish:
-    name: Complete deployment and notify
-    needs: [release, build-amd64, build-arm64]
-    runs-on: ubuntu-latest
     env:
       NEXT_VERSION: ${{ needs.release.outputs.version }}
       DEPLOY_LATEST: ${{ github.ref_name == 'main' }}
       DEPLOY_BETA: ${{ github.ref_name == 'beta' }}
     steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.release.outputs.git_ref }}
+      - name: Discord notification
+        if: ${{ github.events.inputs.send-notifications != false }}
+        env:
+          DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+        uses: Ilshidur/action-discord@master
+        with:
+          args: "Deployment of an image for version '${{env.NEXT_VERSION}}' has been triggered: [run ${{ github.run_number }}](<${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}>)"
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish beta
-        if: env.DEPLOY_BETA == 'true'
-        run: |
-          docker buildx imagetools create -t ${{ env.GHCR_REPO }}:beta \
-            ${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}
-
-      - name: Publish latest
-        if: env.DEPLOY_LATEST == 'true'
-        run: |
-          docker buildx imagetools create -t ${{ env.GHCR_REPO }}:latest \
-            ${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}
-
-      - name: Publish version
-        run: |
-          docker buildx imagetools create -t ${{ env.GHCR_REPO }}:${{ env.NEXT_VERSION }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-amd64.outputs.digest }} \
-            ${{ env.GHCR_REPO }}@${{ needs.build-arm64.outputs.digest }}
-
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: "${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}"
+          tags: |
+            ${{ env.DEPLOY_LATEST == 'true' && 'type=raw,value=latest' || null }}
+            ${{ env.DEPLOY_BETA == 'true' && 'type=raw,value=beta' || null }}
+            type=raw,value=${{ env.NEXT_VERSION }}
+      - name: Build and push
+        id: buildPushAction
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          context: .
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          network: host
+        env:
+          SKIP_ENV_VALIDATION: true
       - name: Discord notification
         env:
           DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
         uses: Ilshidur/action-discord@master
         with:
-          args: "Successfully deployed images for branch **${{ github.ref_name }}**. Tagged as **${{env.NEXT_VERSION}}**."
+          args: "Deployment of image has completed for branch ${{ github.ref_name }}. Image ID is '${{ steps.buildPushAction.outputs.imageid }}'."

.github/workflows/deployment-weekly-release.yml

@@ -37,7 +37,7 @@ jobs:
           token: ${{ github.token }}
           branch: dev
       - name: Create pull request
-        run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base main --head dev --label automerge'
+        run: 'gh pr create --title "chore(release): automatic release ${{ steps.semver.outputs.next }}" --body "**This is an automatic release**.<br/>Manual action may be required for major bumps.<br/>Detected change to be ``${{ steps.semver.outputs.bump }}``<br/>Bump version from ``${{ steps.semver.outputs.current }}`` to ``${{ steps.semver.outputs.next }}``" --base beta --head dev --label automerge'
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
       - name: Discord notification

.gitignore

@@ -64,4 +64,4 @@ packages/cli/cli.cjs
 e2e/shared/tmp
 
 #personal backgrounds
-apps/nextjs/public/images/background.png
+apps/nextjs/public/images/background.png

.nvmrc

@@ -1 +1 @@
-22.14.0
+22.13.0

.run/typecheck.run.xml

@@ -1,13 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="typecheck" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="typecheck" />
-    </scripts>
-    <node-interpreter value="project" />
-    <package-manager value="pnpm" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:22.14.0-alpine AS base
+FROM node:22.13.0-alpine AS base
 
 FROM base AS builder
 RUN apk add --no-cache libc6-compat
@@ -10,8 +10,6 @@ RUN apk add --no-cache libc6-compat curl bash
 RUN apk update
 COPY . .
 
-# Install working version of corepack (See https://github.com/nodejs/corepack/issues/612)
-RUN npm install -g corepack@0.31.0 && corepack --version
 RUN corepack enable pnpm && pnpm install --recursive --frozen-lockfile
 
 # Copy static data as it is not part of the build
@@ -19,8 +17,6 @@ COPY static-data ./static-data
 ARG SKIP_ENV_VALIDATION='true'
 ARG CI='true'
 ARG DISABLE_REDIS_LOGS='true'
-# Install working version of corepack (See https://github.com/nodejs/corepack/issues/612)
-RUN npm install -g corepack@0.31.0 && corepack --version
 RUN corepack enable pnpm && pnpm build
 
 FROM base AS runner
@@ -67,7 +63,6 @@ ENV DB_URL='/appdata/db/db.sqlite'
 ENV DB_DIALECT='sqlite'
 ENV DB_DRIVER='better-sqlite3'
 ENV AUTH_PROVIDERS='credentials'
-ENV NODE_ENV='production'
 
 ENTRYPOINT [ "/app/entrypoint.sh" ]
-CMD ["sh", "run.sh"]
+CMD ["sh", "run.sh"]

apps/nextjs/next.config.ts

@@ -2,13 +2,13 @@
 import "@homarr/auth/env";
 import "@homarr/db/env";
 import "@homarr/common/env";
-import "@homarr/log/env";
-import "@homarr/docker/env";
 
 import type { NextConfig } from "next";
 import MillionLint from "@million/lint";
 import createNextIntlPlugin from "next-intl/plugin";
 
+import "./src/env.ts";
+
 // Package path does not work... so we need to use relative path
 const withNextIntl = createNextIntlPlugin("../../packages/translation/src/request.ts");
 

apps/nextjs/package.json

@@ -15,24 +15,15 @@
   },
   "prettier": "@homarr/prettier-config",
   "dependencies": {
-    "@dnd-kit/core": "^6.3.1",
-    "@dnd-kit/modifiers": "^9.0.0",
-    "@dnd-kit/sortable": "^10.0.0",
-    "@dnd-kit/utilities": "^3.2.2",
     "@homarr/analytics": "workspace:^0.1.0",
     "@homarr/api": "workspace:^0.1.0",
     "@homarr/auth": "workspace:^0.1.0",
-    "@homarr/boards": "workspace:^0.1.0",
-    "@homarr/certificates": "workspace:^0.1.0",
     "@homarr/common": "workspace:^0.1.0",
     "@homarr/cron-job-status": "workspace:^0.1.0",
     "@homarr/db": "workspace:^0.1.0",
     "@homarr/definitions": "workspace:^0.1.0",
-    "@homarr/docker": "workspace:^0.1.0",
     "@homarr/form": "workspace:^0.1.0",
-    "@homarr/forms-collection": "workspace:^0.1.0",
-    "@homarr/gridstack": "^1.12.0",
-    "@homarr/icons": "workspace:^0.1.0",
+    "@homarr/gridstack": "^1.11.3",
     "@homarr/integrations": "workspace:^0.1.0",
     "@homarr/log": "workspace:^",
     "@homarr/modals": "workspace:^0.1.0",
@@ -42,23 +33,23 @@
     "@homarr/old-schema": "workspace:^0.1.0",
     "@homarr/redis": "workspace:^0.1.0",
     "@homarr/server-settings": "workspace:^0.1.0",
-    "@homarr/settings": "workspace:^0.1.0",
     "@homarr/spotlight": "workspace:^0.1.0",
     "@homarr/translation": "workspace:^0.1.0",
     "@homarr/ui": "workspace:^0.1.0",
     "@homarr/validation": "workspace:^0.1.0",
     "@homarr/widgets": "workspace:^0.1.0",
-    "@mantine/colors-generator": "^7.17.1",
-    "@mantine/core": "^7.17.1",
-    "@mantine/dropzone": "^7.17.1",
-    "@mantine/hooks": "^7.17.1",
-    "@mantine/modals": "^7.17.1",
-    "@mantine/tiptap": "^7.17.1",
+    "@mantine/colors-generator": "^7.16.0",
+    "@mantine/core": "^7.16.0",
+    "@mantine/dropzone": "^7.16.0",
+    "@mantine/hooks": "^7.16.0",
+    "@mantine/modals": "^7.16.0",
+    "@mantine/tiptap": "^7.16.0",
     "@million/lint": "1.0.14",
-    "@tabler/icons-react": "^3.31.0",
-    "@tanstack/react-query": "^5.67.2",
-    "@tanstack/react-query-devtools": "^5.67.2",
-    "@tanstack/react-query-next-experimental": "^5.67.2",
+    "@t3-oss/env-nextjs": "^0.11.1",
+    "@tabler/icons-react": "^3.28.1",
+    "@tanstack/react-query": "^5.64.1",
+    "@tanstack/react-query-devtools": "^5.64.1",
+    "@tanstack/react-query-next-experimental": "5.64.1",
     "@trpc/client": "next",
     "@trpc/next": "next",
     "@trpc/react-query": "next",
@@ -70,37 +61,36 @@
     "clsx": "^2.1.1",
     "dayjs": "^1.11.13",
     "dotenv": "^16.4.7",
-    "flag-icons": "^7.3.2",
+    "flag-icons": "^7.2.3",
     "glob": "^11.0.1",
-    "jotai": "^2.12.1",
-    "mantine-react-table": "2.0.0-beta.9",
-    "next": "15.1.7",
+    "jotai": "^2.11.0",
+    "mantine-react-table": "2.0.0-beta.8",
+    "next": "15.1.4",
     "postcss-preset-mantine": "^1.17.0",
     "prismjs": "^1.29.0",
     "react": "19.0.0",
     "react-dom": "19.0.0",
     "react-error-boundary": "^5.0.0",
     "react-simple-code-editor": "^0.14.1",
-    "sass": "^1.85.1",
+    "sass": "^1.83.4",
     "superjson": "2.2.2",
-    "swagger-ui-react": "^5.20.0",
-    "use-deep-compare-effect": "^1.8.1",
-    "zod": "^3.24.2"
+    "swagger-ui-react": "^5.18.2",
+    "use-deep-compare-effect": "^1.8.1"
   },
   "devDependencies": {
     "@homarr/eslint-config": "workspace:^0.2.0",
     "@homarr/prettier-config": "workspace:^0.1.0",
     "@homarr/tsconfig": "workspace:^0.1.0",
-    "@types/chroma-js": "3.1.1",
-    "@types/node": "^22.13.9",
+    "@types/chroma-js": "3.1.0",
+    "@types/node": "^22.10.6",
     "@types/prismjs": "^1.26.5",
-    "@types/react": "19.0.10",
-    "@types/react-dom": "19.0.4",
-    "@types/swagger-ui-react": "^5.18.0",
+    "@types/react": "19.0.7",
+    "@types/react-dom": "19.0.3",
+    "@types/swagger-ui-react": "^4.18.3",
     "concurrently": "^9.1.2",
-    "eslint": "^9.21.0",
+    "eslint": "^9.18.0",
     "node-loader": "^2.1.0",
-    "prettier": "^3.5.3",
-    "typescript": "^5.8.2"
+    "prettier": "^3.4.2",
+    "typescript": "^5.7.3"
   }
 }

apps/nextjs/src/app/[locale]/_client-providers/trpc.tsx

@@ -18,9 +18,10 @@ import superjson from "superjson";
 import type { SuperJSONResult } from "superjson";
 
 import type { AppRouter } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { createHeadersCallbackForSource, getTrpcUrl } from "@homarr/api/shared";
-import { env } from "@homarr/common/env";
+import { clientApi, getTrpcUrl } from "@homarr/api/client";
+import { createHeadersCallbackForSource } from "@homarr/api/shared";
+
+import { env } from "~/env";
 
 const getWebSocketProtocol = () => {
   // window is not defined on server side
@@ -65,7 +66,7 @@ export function TRPCReactProvider(props: PropsWithChildren) {
       links: [
         loggerLink({
           enabled: (opts) =>
-            env.NODE_ENV === "development" || (opts.direction === "down" && opts.result instanceof Error),
+            process.env.NODE_ENV === "development" || (opts.direction === "down" && opts.result instanceof Error),
         }),
         splitLink({
           condition: ({ type }) => type === "subscription",
@@ -93,7 +94,6 @@ export function TRPCReactProvider(props: PropsWithChildren) {
             false: unstable_httpBatchStreamLink({
               transformer: superjson,
               url: getTrpcUrl(),
-              maxURLLength: 2083, // Suggested by tRPC: https://trpc.io/docs/client/links/httpBatchLink#setting-a-maximum-url-length
               headers: createHeadersCallbackForSource("nextjs-react (json)"),
             }),
           }),

apps/nextjs/src/app/[locale]/auth/invite/[id]/_registration-form.tsx

@@ -2,13 +2,13 @@
 
 import { useRouter } from "next/navigation";
 import { Button, PasswordInput, Stack, TextInput } from "@mantine/core";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
 import { CustomPasswordInput } from "@homarr/ui";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 interface RegistrationFormProps {

apps/nextjs/src/app/[locale]/auth/login/_login-form.tsx

@@ -5,7 +5,6 @@ import { useCallback, useEffect, useRef, useState } from "react";
 import { useRouter } from "next/navigation";
 import { Anchor, Button, Card, Code, Collapse, Divider, PasswordInput, Stack, Text, TextInput } from "@mantine/core";
 import { useDisclosure } from "@mantine/hooks";
-import { z } from "zod";
 
 import { signIn } from "@homarr/auth/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
@@ -13,7 +12,7 @@ import type { useForm } from "@homarr/form";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
-import { validation } from "@homarr/validation";
+import { validation, z } from "@homarr/validation";
 
 interface LoginFormProps {
   providers: string[];

apps/nextjs/src/app/[locale]/boards/(content)/_client.tsx

@@ -5,13 +5,12 @@ import { Box, LoadingOverlay, Stack } from "@mantine/core";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
-import { useCurrentLayout, useRequiredBoard } from "@homarr/boards/context";
 
 import { BoardCategorySection } from "~/components/board/sections/category-section";
 import { BoardEmptySection } from "~/components/board/sections/empty-section";
 import { BoardBackgroundVideo } from "~/components/layout/background";
 import { fullHeightWithoutHeaderAndFooter } from "~/constants";
-import { useIsBoardReady } from "./_ready-context";
+import { useIsBoardReady, useRequiredBoard } from "./_context";
 
 let boardName: string | null = null;
 
@@ -43,7 +42,6 @@ export const useUpdateBoard = () => {
 
 export const ClientBoard = () => {
   const board = useRequiredBoard();
-  const currentLayoutId = useCurrentLayout();
   const isReady = useIsBoardReady();
 
   const fullWidthSortedSections = board.sections
@@ -64,10 +62,9 @@ export const ClientBoard = () => {
       <Stack ref={ref} h="100%" style={{ visibility: isReady ? "visible" : "hidden" }}>
         {fullWidthSortedSections.map((section) =>
           section.kind === "empty" ? (
-            // Unique keys per layout to always reinitialize the gridstack
-            <BoardEmptySection key={`${currentLayoutId}-${section.id}`} section={section} />
+            <BoardEmptySection key={section.id} section={section} />
           ) : (
-            <BoardCategorySection key={`${currentLayoutId}-${section.id}`} section={section} />
+            <BoardCategorySection key={section.id} section={section} />
           ),
         )}
       </Stack>

apps/nextjs/src/app/[locale]/boards/(content)/_context.tsx

@@ -1,16 +1,20 @@
 "use client";
 
-import type { PropsWithChildren } from "react";
+import type { Dispatch, PropsWithChildren, SetStateAction } from "react";
 import { createContext, useCallback, useContext, useEffect, useState } from "react";
 import { usePathname } from "next/navigation";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 
-import { updateBoardName } from "./updater";
+import { updateBoardName } from "./_client";
 
 const BoardContext = createContext<{
-  board: RouterOutputs["board"]["getBoardByName"];
+  board: RouterOutputs["board"]["getHomeBoard"];
+  isReady: boolean;
+  markAsReady: (id: string) => void;
+  isEditMode: boolean;
+  setEditMode: Dispatch<SetStateAction<boolean>>;
 } | null>(null);
 
 export const BoardProvider = ({
@@ -19,6 +23,10 @@ export const BoardProvider = ({
 }: PropsWithChildren<{
   initialBoard: RouterOutputs["board"]["getBoardByName"];
 }>) => {
+  const pathname = usePathname();
+  const utils = clientApi.useUtils();
+  const [readySections, setReadySections] = useState<string[]>([]);
+  const [isEditMode, setEditMode] = useState(false);
   const { data } = clientApi.board.getBoardByName.useQuery(
     { name: initialBoard.name },
     {
@@ -27,25 +35,35 @@ export const BoardProvider = ({
       refetchOnReconnect: false,
     },
   );
-
   // Update the board name so it can be used within updateBoard method
   updateBoardName(initialBoard.name);
 
-  const pathname = usePathname();
-  const utils = clientApi.useUtils();
-
   // Invalidate the board when the pathname changes
   // This allows to refetch the board when it might have changed - e.g. if someone else added an item
   useEffect(() => {
     return () => {
+      setReadySections([]);
       void utils.board.getBoardByName.invalidate({ name: initialBoard.name });
     };
   }, [pathname, utils, initialBoard.name]);
 
+  useEffect(() => {
+    setReadySections((previous) => previous.filter((id) => data.sections.some((section) => section.id === id)));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [data.sections.length, setReadySections]);
+
+  const markAsReady = useCallback((id: string) => {
+    setReadySections((previous) => (previous.includes(id) ? previous : [...previous, id]));
+  }, []);
+
   return (
     <BoardContext.Provider
       value={{
         board: data,
+        isReady: data.sections.length === readySections.length,
+        markAsReady,
+        isEditMode,
+        setEditMode,
       }}
     >
       {children}
@@ -53,6 +71,26 @@ export const BoardProvider = ({
   );
 };
 
+export const useMarkSectionAsReady = () => {
+  const context = useContext(BoardContext);
+
+  if (!context) {
+    throw new Error("Board is required");
+  }
+
+  return context.markAsReady;
+};
+
+export const useIsBoardReady = () => {
+  const context = useContext(BoardContext);
+
+  if (!context) {
+    throw new Error("Board is required");
+  }
+
+  return context.isReady;
+};
+
 export const useRequiredBoard = () => {
   const optionalBoard = useOptionalBoard();
 
@@ -66,45 +104,15 @@ export const useRequiredBoard = () => {
 export const useOptionalBoard = () => {
   const context = useContext(BoardContext);
 
-  return context?.board ?? null;
+  return context?.board;
 };
 
-export const getCurrentLayout = (board: RouterOutputs["board"]["getBoardByName"]) => {
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  if (typeof window === "undefined") return board.layouts.at(0)!.id;
+export const useEditMode = () => {
+  const context = useContext(BoardContext);
 
-  const sortedLayouts = board.layouts.sort((layoutA, layoutB) => layoutB.breakpoint - layoutA.breakpoint);
+  if (!context) {
+    throw new Error("Board is required");
+  }
 
-  // Fallback to smallest if none exists with breakpoint smaller than window width
-  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-  return sortedLayouts.find((layout) => layout.breakpoint <= window.innerWidth)?.id ?? sortedLayouts.at(0)!.id;
-};
-
-export const useCurrentLayout = () => {
-  const board = useRequiredBoard();
-  const [currentLayout, setCurrentLayout] = useState(getCurrentLayout(board));
-
-  const onResize = useCallback(() => {
-    setCurrentLayout(getCurrentLayout(board));
-  }, [board]);
-
-  useEffect(() => {
-    if (typeof window === "undefined") return;
-    window.addEventListener("resize", onResize);
-
-    return () => {
-      window.removeEventListener("resize", onResize);
-    };
-  }, [onResize]);
-
-  return currentLayout;
-};
-
-export const getBoardLayouts = (board: RouterOutputs["board"]["getBoardByName"]) =>
-  board.layouts.map((layout) => layout.id);
-
-export const useLayouts = () => {
-  const board = useRequiredBoard();
-
-  return getBoardLayouts(board);
+  return [context.isEditMode, context.setEditMode] as const;
 };

apps/nextjs/src/app/[locale]/boards/(content)/_creator.tsx

@@ -7,13 +7,12 @@ import "~/styles/gridstack.scss";
 import { IntegrationProvider } from "@homarr/auth/client";
 import { auth } from "@homarr/auth/next";
 import { getIntegrationsWithPermissionsAsync } from "@homarr/auth/server";
-import { isNullOrWhitespace } from "@homarr/common";
 import { getI18n } from "@homarr/translation/server";
 
 import { createMetaTitle } from "~/metadata";
 import { createBoardLayout } from "../_layout-creator";
 import type { Board } from "../_types";
-import { DynamicClientBoard } from "./_dynamic-client";
+import { ClientBoard } from "./_client";
 import { BoardContentHeaderActions } from "./_header-actions";
 
 export type Params = Record<string, unknown>;
@@ -37,25 +36,23 @@ export const createBoardContentPage = <TParams extends Record<string, unknown>>(
 
       return (
         <IntegrationProvider integrations={integrations}>
-          <DynamicClientBoard />
+          <ClientBoard />
         </IntegrationProvider>
       );
     },
-    generateMetadataAsync: async ({ params }: { params: Promise<TParams> }): Promise<Metadata> => {
+    generateMetadataAsync: async ({ params }: { params: TParams }): Promise<Metadata> => {
       try {
-        const board = await getInitialBoard(await params);
+        const board = await getInitialBoard(params);
         const t = await getI18n();
 
         return {
           title: board.metaTitle ?? createMetaTitle(t("board.content.metaTitle", { boardName: board.name })),
           icons: {
-            icon: !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : undefined,
-            apple: !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : undefined,
+            icon: board.faviconImageUrl ? board.faviconImageUrl : undefined,
+            apple: board.faviconImageUrl ? board.faviconImageUrl : undefined,
           },
           appleWebApp: {
-            startupImage: {
-              url: !isNullOrWhitespace(board.faviconImageUrl) ? board.faviconImageUrl : "/logo/logo.png",
-            },
+            startupImage: { url: board.faviconImageUrl ? board.faviconImageUrl : "/logo/logo.png" },
           },
         };
       } catch (error) {

apps/nextjs/src/app/[locale]/boards/(content)/_custom-css.tsx

@@ -1,6 +1,6 @@
 "use client";
 
-import { useRequiredBoard } from "@homarr/boards/context";
+import { useRequiredBoard } from "./_context";
 
 export const CustomCss = () => {
   const board = useRequiredBoard();

apps/nextjs/src/app/[locale]/boards/(content)/_dynamic-client.tsx

@@ -1,7 +0,0 @@
-"use client";
-
-import dynamic from "next/dynamic";
-
-export const DynamicClientBoard = dynamic(() => import("./_client").then((mod) => mod.ClientBoard), {
-  ssr: false,
-});

apps/nextjs/src/app/[locale]/boards/(content)/_header-actions.tsx

@@ -2,28 +2,22 @@
 
 import type { MouseEvent } from "react";
 import { useCallback, useEffect } from "react";
-import Link from "next/link";
 import { useRouter } from "next/navigation";
-import { Group, Menu, ScrollArea } from "@mantine/core";
+import { Group, Menu } from "@mantine/core";
 import { useHotkeys } from "@mantine/hooks";
 import {
   IconBox,
   IconBoxAlignTop,
   IconChevronDown,
-  IconLayoutBoard,
   IconPencil,
   IconPencilOff,
   IconPlus,
-  IconReplace,
   IconResize,
   IconSettings,
 } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
-import { useRequiredBoard } from "@homarr/boards/context";
-import { useEditMode } from "@homarr/boards/edit-mode";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import { env } from "@homarr/common/env";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
@@ -34,6 +28,8 @@ import { useCategoryActions } from "~/components/board/sections/category/categor
 import { CategoryEditModal } from "~/components/board/sections/category/category-edit-modal";
 import { useDynamicSectionActions } from "~/components/board/sections/dynamic/dynamic-actions";
 import { HeaderButton } from "~/components/layout/header/button";
+import { env } from "~/env";
+import { useEditMode, useRequiredBoard } from "./_context";
 
 export const BoardContentHeaderActions = () => {
   const [isEditMode] = useEditMode();
@@ -53,8 +49,6 @@ export const BoardContentHeaderActions = () => {
       <HeaderButton href={`/boards/${board.name}/settings`}>
         <IconSettings stroke={1.5} />
       </HeaderButton>
-
-      <SelectBoardsMenu />
     </>
   );
 };
@@ -120,7 +114,7 @@ const AddMenu = () => {
 };
 
 const EditModeMenu = () => {
-  const [isEditMode, { open, close }] = useEditMode();
+  const [isEditMode, setEditMode] = useEditMode();
   const board = useRequiredBoard();
   const utils = clientApi.useUtils();
   const t = useScopedI18n("board.action.edit");
@@ -132,7 +126,7 @@ const EditModeMenu = () => {
       });
       void utils.board.getBoardByName.invalidate({ name: board.name });
       void revalidatePathActionAsync(`/boards/${board.name}`);
-      close();
+      setEditMode(false);
     },
     onError() {
       showErrorNotification({
@@ -144,8 +138,8 @@ const EditModeMenu = () => {
 
   const toggle = useCallback(() => {
     if (isEditMode) return saveBoard(board);
-    open();
-  }, [board, isEditMode, saveBoard, open]);
+    setEditMode(true);
+  }, [board, isEditMode, saveBoard, setEditMode]);
 
   useHotkeys([["mod+e", toggle]]);
   usePreventLeaveWithDirty(isEditMode);
@@ -157,34 +151,6 @@ const EditModeMenu = () => {
   );
 };
 
-const SelectBoardsMenu = () => {
-  const { data: boards = [] } = clientApi.board.getAllBoards.useQuery();
-
-  return (
-    <Menu position="bottom-end" withArrow>
-      <Menu.Target>
-        <HeaderButton w="auto" px={4}>
-          <IconReplace stroke={1.5} />
-        </HeaderButton>
-      </Menu.Target>
-      <Menu.Dropdown style={{ transform: "translate(-7px, 0)" }}>
-        <ScrollArea.Autosize mah={300}>
-          {boards.map((board) => (
-            <Menu.Item
-              key={board.id}
-              component={Link}
-              href={`/boards/${board.name}`}
-              leftSection={<IconLayoutBoard size={20} />}
-            >
-              {board.name}
-            </Menu.Item>
-          ))}
-        </ScrollArea.Autosize>
-      </Menu.Dropdown>
-    </Menu>
-  );
-};
-
 const usePreventLeaveWithDirty = (isDirty: boolean) => {
   const t = useI18n();
   const { openConfirmModal } = useConfirmModal();

apps/nextjs/src/app/[locale]/boards/(content)/_ready-context.tsx

@@ -1,67 +0,0 @@
-"use client";
-
-import type { PropsWithChildren } from "react";
-import { createContext, useCallback, useContext, useEffect, useState } from "react";
-import { usePathname } from "next/navigation";
-
-import { clientApi } from "@homarr/api/client";
-import { useRequiredBoard } from "@homarr/boards/context";
-
-const BoardReadyContext = createContext<{
-  isReady: boolean;
-  markAsReady: (id: string) => void;
-} | null>(null);
-
-export const BoardReadyProvider = ({ children }: PropsWithChildren) => {
-  const pathname = usePathname();
-  const utils = clientApi.useUtils();
-  const board = useRequiredBoard();
-  const [readySections, setReadySections] = useState<string[]>([]);
-
-  // Reset sections required for ready state
-  useEffect(() => {
-    return () => {
-      setReadySections([]);
-    };
-  }, [pathname, utils]);
-
-  useEffect(() => {
-    setReadySections((previous) => previous.filter((id) => board.sections.some((section) => section.id === id)));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [board.sections.length, setReadySections]);
-
-  const markAsReady = useCallback((id: string) => {
-    setReadySections((previous) => (previous.includes(id) ? previous : [...previous, id]));
-  }, []);
-
-  return (
-    <BoardReadyContext.Provider
-      value={{
-        isReady: board.sections.length === readySections.length,
-        markAsReady,
-      }}
-    >
-      {children}
-    </BoardReadyContext.Provider>
-  );
-};
-
-export const useMarkSectionAsReady = () => {
-  const context = useContext(BoardReadyContext);
-
-  if (!context) {
-    throw new Error("BoardReadyProvider is required");
-  }
-
-  return context.markAsReady;
-};
-
-export const useIsBoardReady = () => {
-  const context = useContext(BoardReadyContext);
-
-  if (!context) {
-    throw new Error("BoardReadyProvider is required");
-  }
-
-  return context.isReady;
-};

apps/nextjs/src/app/[locale]/boards/(content)/_theme.tsx

@@ -2,12 +2,12 @@
 
 import type { PropsWithChildren } from "react";
 import type { MantineColorsTuple } from "@mantine/core";
-import { colorsTuple, createTheme, darken, lighten, MantineProvider } from "@mantine/core";
+import { createTheme, darken, lighten, MantineProvider } from "@mantine/core";
 
-import { useRequiredBoard } from "@homarr/boards/context";
 import type { ColorScheme } from "@homarr/definitions";
 
 import { useColorSchemeManager } from "../../_client-providers/mantine";
+import { useRequiredBoard } from "./_context";
 
 export const BoardMantineProvider = ({
   children,
@@ -20,7 +20,6 @@ export const BoardMantineProvider = ({
     colors: {
       primaryColor: generateColors(board.primaryColor),
       secondaryColor: generateColors(board.secondaryColor),
-      iconColor: board.iconColor ? generateColors(board.iconColor) : colorsTuple("#000000"),
     },
     primaryColor: "primaryColor",
     autoContrast: true,

apps/nextjs/src/app/[locale]/boards/[name]/settings/_behavior.tsx

@@ -1,48 +0,0 @@
-"use client";
-
-import { Button, Group, Stack, Switch } from "@mantine/core";
-
-import { useForm } from "@homarr/form";
-import { useI18n } from "@homarr/translation/client";
-
-import type { Board } from "../../_types";
-import { useSavePartialSettingsMutation } from "./_shared";
-
-interface Props {
-  board: Board;
-}
-
-export const BehaviorSettingsContent = ({ board }: Props) => {
-  const t = useI18n();
-  const { mutate: savePartialSettings, isPending } = useSavePartialSettingsMutation(board);
-  const form = useForm({
-    initialValues: {
-      disableStatus: board.disableStatus,
-    },
-  });
-
-  return (
-    <form
-      onSubmit={form.onSubmit((values) => {
-        savePartialSettings({
-          id: board.id,
-          ...values,
-        });
-      })}
-    >
-      <Stack>
-        <Switch
-          label={t("board.field.disableStatus.label")}
-          description={t("board.field.disableStatus.description")}
-          {...form.getInputProps("disableStatus", { type: "checkbox" })}
-        />
-
-        <Group justify="end">
-          <Button type="submit" loading={isPending} color="teal">
-            {t("common.action.saveChanges")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-};

apps/nextjs/src/app/[locale]/boards/[name]/settings/_colors.tsx

@@ -10,7 +10,6 @@ import {
   Group,
   InputWrapper,
   isLightColor,
-  Select,
   Slider,
   Stack,
   Text,
@@ -40,8 +39,6 @@ export const ColorSettingsContent = ({ board }: Props) => {
       primaryColor: board.primaryColor,
       secondaryColor: board.secondaryColor,
       opacity: board.opacity,
-      iconColor: board.iconColor ?? "",
-      itemRadius: board.itemRadius,
     },
   });
   const [showPreview, { toggle }] = useDisclosure(false);
@@ -101,26 +98,6 @@ export const ColorSettingsContent = ({ board }: Props) => {
               />
             </InputWrapper>
           </Grid.Col>
-          <Grid.Col span={{ sm: 12, md: 6 }}>
-            <ColorInput
-              label={t("board.field.iconColor.label")}
-              format="hex"
-              swatches={Object.values(theme.colors).map((color) => color[6])}
-              {...form.getInputProps("iconColor")}
-            />
-            <Select
-              label={t("board.field.itemRadius.label")}
-              description={t("board.field.itemRadius.description")}
-              data={[
-                { label: t("board.field.itemRadius.option.xs"), value: "xs" },
-                { label: t("board.field.itemRadius.option.sm"), value: "sm" },
-                { label: t("board.field.itemRadius.option.md"), value: "md" },
-                { label: t("board.field.itemRadius.option.lg"), value: "lg" },
-                { label: t("board.field.itemRadius.option.xl"), value: "xl" },
-              ]}
-              {...form.getInputProps("itemRadius")}
-            />
-          </Grid.Col>
         </Grid>
         <Group justify="end">
           <Button type="submit" loading={isPending} color="teal">

apps/nextjs/src/app/[locale]/boards/[name]/settings/_danger.tsx

@@ -5,11 +5,11 @@ import { useRouter } from "next/navigation";
 import { Button, Divider, Group, Stack, Text } from "@mantine/core";
 
 import { clientApi } from "@homarr/api/client";
-import { useRequiredBoard } from "@homarr/boards/context";
 import { useConfirmModal, useModalAction } from "@homarr/modals";
 import { useScopedI18n } from "@homarr/translation/client";
 
 import { BoardRenameModal } from "~/components/board/modals/board-rename-modal";
+import { useRequiredBoard } from "../../(content)/_context";
 import classes from "./danger.module.css";
 
 export const DangerZoneSettingsContent = ({ hideVisibility }: { hideVisibility: boolean }) => {

apps/nextjs/src/app/[locale]/boards/[name]/settings/_general.tsx

@@ -5,13 +5,13 @@ import { Button, Grid, Group, Loader, Stack, TextInput, Tooltip } from "@mantine
 import { useDebouncedValue, useDocumentTitle, useFavicon } from "@mantine/hooks";
 import { IconAlertTriangle } from "@tabler/icons-react";
 
-import { useUpdateBoard } from "@homarr/boards/updater";
 import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
 import { validation } from "@homarr/validation";
 
 import { createMetaTitle } from "~/metadata";
 import type { Board } from "../../_types";
+import { useUpdateBoard } from "../../(content)/_client";
 import { useSavePartialSettingsMutation } from "./_shared";
 
 interface Props {

apps/nextjs/src/app/[locale]/boards/[name]/settings/_layout.tsx

@@ -1,109 +1,43 @@
 "use client";
 
-import { Button, Fieldset, Grid, Group, Input, NumberInput, Slider, Stack, Text, TextInput } from "@mantine/core";
+import { Button, Grid, Group, Input, Slider, Stack } from "@mantine/core";
 
-import { clientApi } from "@homarr/api/client";
-import { createId } from "@homarr/db/client";
 import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
 import { validation } from "@homarr/validation";
 
 import type { Board } from "../../_types";
+import { useSavePartialSettingsMutation } from "./_shared";
 
 interface Props {
   board: Board;
 }
 export const LayoutSettingsContent = ({ board }: Props) => {
   const t = useI18n();
-  const utils = clientApi.useUtils();
-  const { mutate: saveLayouts, isPending } = clientApi.board.saveLayouts.useMutation({
-    onSettled() {
-      void utils.board.getBoardByName.invalidate({ name: board.name });
-      void utils.board.getHomeBoard.invalidate();
-    },
-  });
-  const form = useZodForm(validation.board.saveLayouts.omit({ id: true }).required(), {
+  const { mutate: savePartialSettings, isPending } = useSavePartialSettingsMutation(board);
+  const form = useZodForm(validation.board.savePartialSettings.pick({ columnCount: true }).required(), {
     initialValues: {
-      layouts: board.layouts,
+      columnCount: board.columnCount,
     },
   });
 
   return (
     <form
       onSubmit={form.onSubmit((values) => {
-        saveLayouts({
+        savePartialSettings({
           id: board.id,
           ...values,
         });
       })}
     >
       <Stack>
-        <Stack gap="sm">
-          <Group justify="space-between" align="center">
-            <Text fw={500}>{t("board.setting.section.layout.responsive.title")}</Text>
-            <Button
-              variant="subtle"
-              onClick={() => {
-                form.setValues({
-                  layouts: [
-                    ...form.values.layouts,
-                    {
-                      id: createId(),
-                      name: "",
-                      columnCount: 10,
-                      breakpoint: 0,
-                    },
-                  ],
-                });
-              }}
-            >
-              {t("board.setting.section.layout.responsive.action.add")}
-            </Button>
-          </Group>
-
-          {form.values.layouts.map((layout, index) => (
-            <Fieldset key={layout.id} legend={layout.name} bg="transparent">
-              <Grid>
-                <Grid.Col span={{ sm: 12, md: 6 }}>
-                  <TextInput {...form.getInputProps(`layouts.${index}.name`)} label={t("layout.field.name.label")} />
-                </Grid.Col>
-
-                <Grid.Col span={{ sm: 12, md: 6 }}>
-                  <Input.Wrapper label={t("layout.field.columnCount.label")}>
-                    <Slider mt="xs" min={1} max={24} step={1} {...form.getInputProps(`layouts.${index}.columnCount`)} />
-                  </Input.Wrapper>
-                </Grid.Col>
-
-                <Grid.Col span={{ sm: 12, md: 6 }}>
-                  <NumberInput
-                    {...form.getInputProps(`layouts.${index}.breakpoint`)}
-                    label={t("layout.field.breakpoint.label")}
-                    description={t("layout.field.breakpoint.description")}
-                  />
-                </Grid.Col>
-              </Grid>
-              {form.values.layouts.length >= 2 && (
-                <Group justify="end">
-                  <Button
-                    variant="subtle"
-                    onClick={() => {
-                      form.setValues((previous) =>
-                        previous.layouts !== undefined && previous.layouts.length >= 2
-                          ? {
-                              layouts: form.values.layouts.filter((filteredLayout) => filteredLayout.id !== layout.id),
-                            }
-                          : previous,
-                      );
-                    }}
-                  >
-                    {t("common.action.remove")}
-                  </Button>
-                </Group>
-              )}
-            </Fieldset>
-          ))}
-        </Stack>
-
+        <Grid>
+          <Grid.Col span={{ sm: 12, md: 6 }}>
+            <Input.Wrapper label={t("board.field.columnCount.label")}>
+              <Slider mt="xs" min={1} max={24} step={1} {...form.getInputProps("columnCount")} />
+            </Input.Wrapper>
+          </Grid.Col>
+        </Grid>
         <Group justify="end">
           <Button type="submit" loading={isPending} color="teal">
             {t("common.action.saveChanges")}

apps/nextjs/src/app/[locale]/boards/[name]/settings/page.tsx

@@ -4,7 +4,6 @@ import { AccordionControl, AccordionItem, AccordionPanel, Container, Stack, Text
 import {
   IconAlertTriangle,
   IconBrush,
-  IconClick,
   IconFileTypeCss,
   IconLayout,
   IconPhoto,
@@ -23,10 +22,9 @@ import type { TablerIcon } from "@homarr/ui";
 
 import { getBoardPermissionsAsync } from "~/components/board/permissions/server";
 import { ActiveTabAccordion } from "../../../../../components/active-tab-accordion";
-import { ColorSettingsContent } from "./_appereance";
 import { BackgroundSettingsContent } from "./_background";
-import { BehaviorSettingsContent } from "./_behavior";
 import { BoardAccessSettings } from "./_board-access";
+import { ColorSettingsContent } from "./_colors";
 import { CustomCssSettingsContent } from "./_customCss";
 import { DangerZoneSettingsContent } from "./_danger";
 import { GeneralSettingsContent } from "./_general";
@@ -91,15 +89,12 @@ export default async function BoardSettingsPage(props: Props) {
           <AccordionItemFor value="background" icon={IconPhoto}>
             <BackgroundSettingsContent board={board} />
           </AccordionItemFor>
-          <AccordionItemFor value="appearance" icon={IconBrush}>
+          <AccordionItemFor value="color" icon={IconBrush}>
             <ColorSettingsContent board={board} />
           </AccordionItemFor>
           <AccordionItemFor value="customCss" icon={IconFileTypeCss}>
             <CustomCssSettingsContent board={board} />
           </AccordionItemFor>
-          <AccordionItemFor value="behavior" icon={IconClick}>
-            <BehaviorSettingsContent board={board} />
-          </AccordionItemFor>
           {hasFullAccess && (
             <>
               <AccordionItemFor value="access" icon={IconUser}>

apps/nextjs/src/app/[locale]/boards/_header-actions.tsx

@@ -2,9 +2,8 @@
 
 import { IconLayoutBoard } from "@tabler/icons-react";
 
-import { useRequiredBoard } from "@homarr/boards/context";
-
 import { HeaderButton } from "~/components/layout/header/button";
+import { useRequiredBoard } from "./(content)/_context";
 
 export const BoardOtherHeaderActions = () => {
   const board = useRequiredBoard();

apps/nextjs/src/app/[locale]/boards/_layout-creator.tsx

@@ -1,11 +1,8 @@
 import type { JSX, PropsWithChildren } from "react";
-import { notFound, redirect } from "next/navigation";
+import { notFound } from "next/navigation";
 import { AppShellMain } from "@mantine/core";
 import { TRPCError } from "@trpc/server";
 
-import { auth } from "@homarr/auth/next";
-import { BoardProvider } from "@homarr/boards/context";
-import { EditModeProvider } from "@homarr/boards/edit-mode";
 import { logger } from "@homarr/log";
 
 import { MainHeader } from "~/components/layout/header";
@@ -13,9 +10,9 @@ import { BoardLogoWithTitle } from "~/components/layout/logo/board-logo";
 import { ClientShell } from "~/components/layout/shell";
 import { getCurrentColorSchemeAsync } from "~/theme/color-scheme";
 import type { Board } from "./_types";
+import { BoardProvider } from "./(content)/_context";
 import type { Params } from "./(content)/_creator";
 import { CustomCss } from "./(content)/_custom-css";
-import { BoardReadyProvider } from "./(content)/_ready-context";
 import { BoardMantineProvider } from "./(content)/_theme";
 
 interface CreateBoardLayoutProps<TParams extends Params> {
@@ -33,14 +30,8 @@ export const createBoardLayout = <TParams extends Params>({
   }: PropsWithChildren<{
     params: Promise<TParams>;
   }>) => {
-    const session = await auth();
     const initialBoard = await getInitialBoard(await params).catch((error) => {
       if (error instanceof TRPCError && error.code === "NOT_FOUND") {
-        if (!session) {
-          logger.debug("No home board found for anonymous user, redirecting to login");
-          redirect("/auth/login");
-        }
-
         logger.warn(error);
         notFound();
       }
@@ -51,21 +42,17 @@ export const createBoardLayout = <TParams extends Params>({
 
     return (
       <BoardProvider initialBoard={initialBoard}>
-        <BoardReadyProvider>
-          <EditModeProvider>
-            <BoardMantineProvider defaultColorScheme={colorScheme}>
-              <CustomCss />
-              <ClientShell hasNavigation={false}>
-                <MainHeader
-                  logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
-                  actions={headerActions}
-                  hasNavigation={false}
-                />
-                <AppShellMain>{children}</AppShellMain>
-              </ClientShell>
-            </BoardMantineProvider>
-          </EditModeProvider>
-        </BoardReadyProvider>
+        <BoardMantineProvider defaultColorScheme={colorScheme}>
+          <CustomCss />
+          <ClientShell hasNavigation={false}>
+            <MainHeader
+              logo={<BoardLogoWithTitle size="md" hideTitleOnMobile />}
+              actions={headerActions}
+              hasNavigation={false}
+            />
+            <AppShellMain>{children}</AppShellMain>
+          </ClientShell>
+        </BoardMantineProvider>
       </BoardProvider>
     );
   };

apps/nextjs/src/app/[locale]/boards/_types.ts

@@ -3,14 +3,10 @@ import type { WidgetKind } from "@homarr/definitions";
 
 export type Board = RouterOutputs["board"]["getHomeBoard"];
 export type Section = Board["sections"][number];
-export type Item = Board["items"][number];
-export type ItemLayout = Item["layouts"][number];
-export type SectionItem = Omit<Item, "layouts"> & ItemLayout & { type: "item" };
+export type Item = Section["items"][number];
 
 export type CategorySection = Extract<Section, { kind: "category" }>;
 export type EmptySection = Extract<Section, { kind: "empty" }>;
 export type DynamicSection = Extract<Section, { kind: "dynamic" }>;
-export type DynamicSectionLayout = DynamicSection["layouts"][number];
-export type DynamicSectionItem = Omit<DynamicSection, "layouts"> & DynamicSectionLayout & { type: "section" };
 
 export type ItemOfKind<TKind extends WidgetKind> = Extract<Item, { kind: TKind }>;

apps/nextjs/src/app/[locale]/init/_steps/group/init-group.tsx

@@ -2,12 +2,12 @@
 
 import { Button, Card, Stack, TextInput } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 export const InitGroup = () => {

apps/nextjs/src/app/[locale]/init/_steps/settings/init-settings.tsx

@@ -3,7 +3,6 @@
 import { startTransition } from "react";
 import { Button, Card, Group, Stack, Switch, Text } from "@mantine/core";
 import { IconArrowRight } from "@tabler/icons-react";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
@@ -12,6 +11,7 @@ import type { CheckboxProps } from "@homarr/form/types";
 import { defaultServerSettings } from "@homarr/server-settings";
 import type { TranslationObject } from "@homarr/translation";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 export const InitSettings = () => {

apps/nextjs/src/app/[locale]/init/_steps/user/init-user-form.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { Button, PasswordInput, Stack, TextInput } from "@mantine/core";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
@@ -9,6 +8,7 @@ import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useScopedI18n } from "@homarr/translation/client";
 import { CustomPasswordInput } from "@homarr/ui";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 export const InitUserForm = () => {

apps/nextjs/src/app/[locale]/layout.tsx

@@ -9,14 +9,10 @@ import "~/styles/scroll-area.scss";
 import { notFound } from "next/navigation";
 import { NextIntlClientProvider } from "next-intl";
 
-import { api } from "@homarr/api/server";
 import { env } from "@homarr/auth/env";
 import { auth } from "@homarr/auth/next";
-import { db } from "@homarr/db";
-import { getServerSettingsAsync } from "@homarr/db/queries";
 import { ModalProvider } from "@homarr/modals";
 import { Notifications } from "@homarr/notifications";
-import { SettingsProvider } from "@homarr/settings";
 import { SpotlightProvider } from "@homarr/spotlight";
 import type { SupportedLanguage } from "@homarr/translation";
 import { isLocaleRTL, isLocaleSupported } from "@homarr/translation";
@@ -77,8 +73,6 @@ export default async function Layout(props: {
   }
 
   const session = await auth();
-  const user = session ? await api.user.getById({ userId: session.user.id }).catch(() => null) : null;
-  const serverSettings = await getServerSettingsAsync(db);
   const colorScheme = await getCurrentColorSchemeAsync();
   const direction = isLocaleRTL((await props.params).locale) ? "rtl" : "ltr";
   const i18nMessages = await getI18nMessages();
@@ -87,21 +81,6 @@ export default async function Layout(props: {
     (innerProps) => {
       return <AuthProvider session={session} logoutUrl={env.AUTH_LOGOUT_REDIRECT_URL} {...innerProps} />;
     },
-    (innerProps) => (
-      <SettingsProvider
-        user={user}
-        serverSettings={{
-          board: {
-            homeBoardId: serverSettings.board.homeBoardId,
-            mobileHomeBoardId: serverSettings.board.mobileHomeBoardId,
-            enableStatusByDefault: serverSettings.board.enableStatusByDefault,
-            forceDisableStatus: serverSettings.board.forceDisableStatus,
-          },
-          search: { defaultSearchEngineId: serverSettings.search.defaultSearchEngineId },
-        }}
-        {...innerProps}
-      />
-    ),
     (innerProps) => <JotaiProvider {...innerProps} />,
     (innerProps) => <TRPCReactProvider {...innerProps} />,
     (innerProps) => <DayJsLoader {...innerProps} />,

apps/nextjs/src/app/[locale]/manage/_components/hero-banner.module.css

@@ -1,5 +1,5 @@
 .bannerContainer {
-  border-radius: 16px;
+  border-radius: 8px;
   overflow: hidden;
   @mixin dark {
     background: linear-gradient(

apps/nextjs/src/app/[locale]/manage/apps/_form.tsx

@@ -0,0 +1,55 @@
+"use client";
+
+import Link from "next/link";
+import { Button, Group, Stack, Textarea, TextInput } from "@mantine/core";
+
+import { useZodForm } from "@homarr/form";
+import type { TranslationFunction } from "@homarr/translation";
+import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
+import { validation } from "@homarr/validation";
+
+import { IconPicker } from "~/components/icons/picker/icon-picker";
+
+type FormType = z.infer<typeof validation.app.manage>;
+
+interface AppFormProps {
+  submitButtonTranslation: (t: TranslationFunction) => string;
+  initialValues?: FormType;
+  handleSubmit: (values: FormType) => void;
+  isPending: boolean;
+}
+
+export const AppForm = (props: AppFormProps) => {
+  const { submitButtonTranslation, handleSubmit, initialValues, isPending } = props;
+  const t = useI18n();
+
+  const form = useZodForm(validation.app.manage, {
+    initialValues: initialValues ?? {
+      name: "",
+      description: "",
+      iconUrl: "",
+      href: "",
+    },
+  });
+
+  return (
+    <form onSubmit={form.onSubmit(handleSubmit)}>
+      <Stack>
+        <TextInput {...form.getInputProps("name")} withAsterisk label={t("app.field.name.label")} />
+        <IconPicker initialValue={initialValues?.iconUrl} {...form.getInputProps("iconUrl")} />
+        <Textarea {...form.getInputProps("description")} label={t("app.field.description.label")} />
+        <TextInput {...form.getInputProps("href")} label={t("app.field.url.label")} />
+
+        <Group justify="end">
+          <Button variant="default" component={Link} href="/manage/apps">
+            {t("common.action.backToOverview")}
+          </Button>
+          <Button type="submit" loading={isPending}>
+            {submitButtonTranslation(t)}
+          </Button>
+        </Group>
+      </Stack>
+    </form>
+  );
+};

apps/nextjs/src/app/[locale]/manage/apps/edit/[id]/_app-edit-form.tsx

@@ -2,30 +2,30 @@
 
 import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import type { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import { AppForm } from "@homarr/forms-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n, useScopedI18n } from "@homarr/translation/client";
-import type { validation } from "@homarr/validation";
+import type { TranslationFunction } from "@homarr/translation";
+import { useScopedI18n } from "@homarr/translation/client";
+import type { validation, z } from "@homarr/validation";
+
+import { AppForm } from "../../_form";
 
 interface AppEditFormProps {
   app: RouterOutputs["app"]["byId"];
 }
 
 export const AppEditForm = ({ app }: AppEditFormProps) => {
-  const tScoped = useScopedI18n("app.page.edit.notification");
-  const t = useI18n();
+  const t = useScopedI18n("app.page.edit.notification");
   const router = useRouter();
 
   const { mutate, isPending } = clientApi.app.update.useMutation({
     onSuccess: () => {
       showSuccessNotification({
-        title: tScoped("success.title"),
-        message: tScoped("success.message"),
+        title: t("success.title"),
+        message: t("success.message"),
       });
       void revalidatePathActionAsync("/manage/apps").then(() => {
         router.push("/manage/apps");
@@ -33,8 +33,8 @@ export const AppEditForm = ({ app }: AppEditFormProps) => {
     },
     onError: () => {
       showErrorNotification({
-        title: tScoped("error.title"),
-        message: tScoped("error.message"),
+        title: t("error.title"),
+        message: t("error.message"),
       });
     },
   });
@@ -49,15 +49,14 @@ export const AppEditForm = ({ app }: AppEditFormProps) => {
     [mutate, app.id],
   );
 
+  const submitButtonTranslation = useCallback((t: TranslationFunction) => t("common.action.save"), []);
+
   return (
     <AppForm
-      buttonLabels={{
-        submit: t("common.action.save"),
-      }}
+      submitButtonTranslation={submitButtonTranslation}
       initialValues={app}
       handleSubmit={handleSubmit}
       isPending={isPending}
-      showBackToOverview
     />
   );
 };

apps/nextjs/src/app/[locale]/manage/apps/new/_app-new-form.tsx

@@ -0,0 +1,49 @@
+"use client";
+
+import { useCallback } from "react";
+import { useRouter } from "next/navigation";
+
+import { clientApi } from "@homarr/api/client";
+import { revalidatePathActionAsync } from "@homarr/common/client";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
+import type { TranslationFunction } from "@homarr/translation";
+import { useScopedI18n } from "@homarr/translation/client";
+import type { validation, z } from "@homarr/validation";
+
+import { AppForm } from "../_form";
+
+export const AppNewForm = () => {
+  const t = useScopedI18n("app.page.create.notification");
+  const router = useRouter();
+
+  const { mutate, isPending } = clientApi.app.create.useMutation({
+    onSuccess: () => {
+      showSuccessNotification({
+        title: t("success.title"),
+        message: t("success.message"),
+      });
+      void revalidatePathActionAsync("/manage/apps").then(() => {
+        router.push("/manage/apps");
+      });
+    },
+    onError: () => {
+      showErrorNotification({
+        title: t("error.title"),
+        message: t("error.message"),
+      });
+    },
+  });
+
+  const handleSubmit = useCallback(
+    (values: z.infer<typeof validation.app.manage>) => {
+      mutate(values);
+    },
+    [mutate],
+  );
+
+  const submitButtonTranslation = useCallback((t: TranslationFunction) => t("common.action.create"), []);
+
+  return (
+    <AppForm submitButtonTranslation={submitButtonTranslation} handleSubmit={handleSubmit} isPending={isPending} />
+  );
+};

apps/nextjs/src/app/[locale]/manage/apps/new/page.tsx

@@ -2,10 +2,10 @@ import { notFound } from "next/navigation";
 import { Container, Stack, Title } from "@mantine/core";
 
 import { auth } from "@homarr/auth/next";
-import { AppNewForm } from "@homarr/forms-collection";
 import { getI18n } from "@homarr/translation/server";
 
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
+import { AppNewForm } from "./_app-new-form";
 
 export default async function AppNewPage() {
   const session = await auth();
@@ -22,7 +22,7 @@ export default async function AppNewPage() {
       <Container>
         <Stack>
           <Title>{t("app.page.create.title")}</Title>
-          <AppNewForm showBackToOverview showCreateAnother />
+          <AppNewForm />
         </Stack>
       </Container>
     </>

apps/nextjs/src/app/[locale]/manage/apps/page.tsx

@@ -2,7 +2,6 @@ import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconBox, IconPencil } from "@tabler/icons-react";
-import { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -10,6 +9,7 @@ import { auth } from "@homarr/auth/next";
 import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 import { SearchInput, TablePagination } from "@homarr/ui";
+import { z } from "@homarr/validation";
 
 import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
@@ -45,7 +45,7 @@ export default async function AppsPage(props: AppsPageProps) {
       <Stack>
         <Title>{t("page.list.title")}</Title>
         <Group justify="space-between" align="center">
-          <SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} flexExpand />
+          <SearchInput placeholder={`${t("search")}...`} defaultValue={searchParams.search} />
           {session.user.permissions.includes("app-create") && (
             <MobileAffixButton component={Link} href="/manage/apps/new">
               {t("page.create.title")}
@@ -61,8 +61,7 @@ export default async function AppsPage(props: AppsPageProps) {
           </Stack>
         )}
 
-        {/* Added margin to not hide pagination behind affix-button */}
-        <Group justify="end" mb={48}>
+        <Group justify="end">
           <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
         </Group>
       </Stack>
@@ -81,7 +80,7 @@ const AppCard = async ({ app }: AppCardProps) => {
   return (
     <Card withBorder>
       <Group justify="space-between" wrap="nowrap">
-        <Group align="top" justify="start" wrap="nowrap" style={{ flex: "1" }}>
+        <Group align="top" justify="start" wrap="nowrap">
           <Avatar
             size="sm"
             src={app.iconUrl}
@@ -92,7 +91,7 @@ const AppCard = async ({ app }: AppCardProps) => {
               },
             }}
           />
-          <Stack gap={0} style={{ flex: "1" }}>
+          <Stack gap={0}>
             <Text fw={500} lineClamp={1}>
               {app.name}
             </Text>
@@ -102,7 +101,7 @@ const AppCard = async ({ app }: AppCardProps) => {
               </Text>
             )}
             {app.href && (
-              <Anchor href={app.href} lineClamp={1} size="sm" style={{ wordBreak: "break-all" }}>
+              <Anchor href={app.href} lineClamp={1} size="sm" w="min-content">
                 {app.href}
               </Anchor>
             )}

apps/nextjs/src/app/[locale]/manage/boards/page.tsx

@@ -67,7 +67,7 @@ const BoardCard = async ({ board }: BoardCardProps) => {
   const VisibilityIcon = board.isPublic ? IconWorld : IconLock;
 
   return (
-    <Card radius="lg" withBorder>
+    <Card withBorder>
       <CardSection p="sm" withBorder>
         <Group justify="space-between" align="center">
           <Group gap="sm">
@@ -106,25 +106,15 @@ const BoardCard = async ({ board }: BoardCardProps) => {
         </Group>
       </CardSection>
 
-      <CardSection>
-        <Group gap={0} wrap="nowrap">
-          <Button
-            style={{ border: "none", borderRadius: 0 }}
-            component={Link}
-            href={`/boards/${board.name}`}
-            variant="default"
-            fullWidth
-          >
+      <CardSection p="sm">
+        <Group wrap="nowrap">
+          <Button component={Link} href={`/boards/${board.name}`} variant="default" fullWidth>
             {t("action.open.label")}
           </Button>
           {isMenuVisible && (
             <Menu position="bottom-end">
               <MenuTarget>
-                <ActionIcon
-                  style={{ borderTop: "none", borderBottom: "none", borderRight: "none", borderRadius: 0 }}
-                  variant="default"
-                  size="lg"
-                >
+                <ActionIcon variant="default" size="lg">
                   <IconDotsVertical size={16} stroke={1.5} />
                 </ActionIcon>
               </MenuTarget>

apps/nextjs/src/app/[locale]/manage/integrations/_components/secrets/integration-secret-icons.ts

@@ -1,4 +1,4 @@
-import { IconGrid3x3, IconKey, IconPassword, IconServer, IconUser } from "@tabler/icons-react";
+import { IconKey, IconPassword, IconUser } from "@tabler/icons-react";
 
 import type { IntegrationSecretKind } from "@homarr/definitions";
 import type { TablerIcon } from "@homarr/ui";
@@ -7,6 +7,4 @@ export const integrationSecretIcons = {
   username: IconUser,
   apiKey: IconKey,
   password: IconPassword,
-  realm: IconServer,
-  tokenId: IconGrid3x3,
 } satisfies Record<IntegrationSecretKind, TablerIcon>;

apps/nextjs/src/app/[locale]/manage/integrations/edit/[id]/_integration-edit-form.tsx

@@ -3,7 +3,6 @@
 import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { Button, Fieldset, Group, Stack, TextInput } from "@mantine/core";
-import type { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -14,6 +13,7 @@ import { convertIntegrationTestConnectionError } from "@homarr/integrations/clie
 import { useConfirmModal } from "@homarr/modals";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 import { SecretCard } from "../../_components/secrets/integration-secret-card";
@@ -70,9 +70,9 @@ export const EditIntegrationForm = ({ integration }: EditIntegrationForm) => {
           if (testConnectionError) {
             showErrorNotification({
               title: t(`integration.testConnection.notification.${testConnectionError.key}.title`),
-              message:
-                testConnectionError.message ??
-                t(`integration.testConnection.notification.${testConnectionError.key}.message`),
+              message: testConnectionError.message
+                ? testConnectionError.message
+                : t(`integration.testConnection.notification.${testConnectionError.key}.message`),
             });
             return;
           }

apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-dropdown.tsx

@@ -15,9 +15,7 @@ export const IntegrationCreateDropdownContent = () => {
   const [search, setSearch] = useState("");
 
   const filteredKinds = useMemo(() => {
-    return integrationKinds.filter((kind) =>
-      getIntegrationName(kind).toLowerCase().includes(search.toLowerCase().trim()),
-    );
+    return integrationKinds.filter((kind) => kind.includes(search.toLowerCase()));
   }, [search]);
 
   const handleSearch = React.useCallback(
@@ -31,9 +29,7 @@ export const IntegrationCreateDropdownContent = () => {
         leftSection={<IconSearch stroke={1.5} size={20} />}
         placeholder={t("integration.page.list.search")}
         value={search}
-        data-autofocus
         onChange={handleSearch}
-        variant="filled"
       />
 
       {filteredKinds.length > 0 ? (

apps/nextjs/src/app/[locale]/manage/integrations/new/_integration-new-form.tsx

@@ -5,7 +5,6 @@ import Link from "next/link";
 import { useRouter } from "next/navigation";
 import { Alert, Button, Checkbox, Fieldset, Group, SegmentedControl, Stack, Text, TextInput } from "@mantine/core";
 import { IconInfoCircle } from "@tabler/icons-react";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
@@ -16,6 +15,7 @@ import { useZodForm } from "@homarr/form";
 import { convertIntegrationTestConnectionError } from "@homarr/integrations/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 import { IntegrationSecretInput } from "../_components/secrets/integration-secret-inputs";
@@ -63,9 +63,9 @@ export const NewIntegrationForm = ({ searchParams }: NewIntegrationFormProps) =>
           if (testConnectionError) {
             showErrorNotification({
               title: t(`integration.testConnection.notification.${testConnectionError.key}.title`),
-              message:
-                testConnectionError.message ??
-                t(`integration.testConnection.notification.${testConnectionError.key}.message`),
+              message: testConnectionError.message
+                ? testConnectionError.message
+                : t(`integration.testConnection.notification.${testConnectionError.key}.message`),
             });
             return;
           }

apps/nextjs/src/app/[locale]/manage/integrations/new/page.tsx

@@ -1,6 +1,5 @@
 import { notFound } from "next/navigation";
 import { Container, Group, Stack, Title } from "@mantine/core";
-import { z } from "zod";
 
 import { auth } from "@homarr/auth/next";
 import type { IntegrationKind } from "@homarr/definitions";
@@ -8,6 +7,7 @@ import { getIntegrationName, integrationKinds } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 import { IntegrationAvatar } from "@homarr/ui";
 import type { validation } from "@homarr/validation";
+import { z } from "@homarr/validation";
 
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
 import { NewIntegrationForm } from "./_integration-new-form";

apps/nextjs/src/app/[locale]/manage/integrations/page.module.css

@@ -1,36 +0,0 @@
-.root {
-  border-radius: var(--mantine-radius-lg);
-  background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6));
-}
-
-.item {
-  background-color: light-dark(var(--mantine-color-gray-0), var(--mantine-color-dark-6));
-  border: 1px solid transparent;
-  position: relative;
-  z-index: 0;
-  transition: transform 150ms ease;
-  overflow: hidden;
-
-  &[data-first="true"] {
-    border-radius: var(--mantine-radius-lg) var(--mantine-radius-lg) 0 0;
-  }
-
-  &[data-last="true"] {
-    border-radius: 0 0 var(--mantine-radius-lg) var(--mantine-radius-lg);
-  }
-
-  &[data-active] {
-    transform: scale(1.01);
-    z-index: 1;
-    background-color: var(--mantine-color-body);
-    border-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
-    box-shadow: var(--mantine-shadow-md);
-    border-radius: var(--mantine-radius-lg);
-  }
-}
-
-.chevron {
-  &[data-rotate] {
-    transform: rotate(180deg);
-  }
-}

apps/nextjs/src/app/[locale]/manage/integrations/page.tsx

@@ -44,7 +44,6 @@ import { NoResults } from "~/components/no-results";
 import { ActiveTabAccordion } from "../../../../components/active-tab-accordion";
 import { DeleteIntegrationActionButton } from "./_integration-buttons";
 import { IntegrationCreateDropdownContent } from "./new/_integration-new-dropdown";
-import classes from "./page.module.css";
 
 interface IntegrationsPageProps {
   searchParams: Promise<{
@@ -103,15 +102,7 @@ export default async function IntegrationsPage(props: IntegrationsPageProps) {
 
 const IntegrationSelectMenu = ({ children }: PropsWithChildren) => {
   return (
-    <Menu
-      width={256}
-      trapFocus
-      position="bottom-end"
-      withinPortal
-      shadow="md"
-      keepMounted={false}
-      withInitialFocusPlaceholder={false}
-    >
+    <Menu width={256} trapFocus position="bottom-end" withinPortal shadow="md" keepMounted={false}>
       {children}
       <MenuDropdown>
         <IntegrationCreateDropdownContent />
@@ -134,7 +125,7 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
     return <NoResults icon={IconPlugX} title={t("page.list.noResults.title")} />;
   }
 
-  const groupedIntegrations = integrations.reduce(
+  const grouppedIntegrations = integrations.reduce(
     (acc, integration) => {
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
       if (!acc[integration.kind]) {
@@ -148,13 +139,11 @@ const IntegrationList = async ({ integrations, activeTab }: IntegrationListProps
     {} as Record<IntegrationKind, RouterOutputs["integration"]["all"]>,
   );
 
-  const entries = objectEntries(groupedIntegrations);
-
   return (
-    <ActiveTabAccordion defaultValue={activeTab} radius="lg" classNames={classes}>
-      {entries.map(([kind, integrations], index) => (
-        <AccordionItem key={kind} value={kind} data-first={index === 0} data-last={index === entries.length - 1}>
-          <AccordionControl icon={<IntegrationAvatar size="sm" kind={kind} radius="sm" />}>
+    <ActiveTabAccordion defaultValue={activeTab} variant="separated">
+      {objectEntries(grouppedIntegrations).map(([kind, integrations]) => (
+        <AccordionItem key={kind} value={kind}>
+          <AccordionControl icon={<IntegrationAvatar size="sm" kind={kind} />}>
             <Group>
               <Text>{getIntegrationName(kind)}</Text>
               <CountBadge count={integrations.length} />

apps/nextjs/src/app/[locale]/manage/layout.tsx

@@ -1,26 +1,25 @@
 import type { PropsWithChildren } from "react";
 import { AppShellMain } from "@mantine/core";
 import {
-  IconAffiliateFilled,
   IconBook2,
   IconBox,
   IconBrandDiscord,
   IconBrandDocker,
   IconBrandGithub,
-  IconBrandTablerFilled,
-  IconCertificate,
-  IconClipboardListFilled,
-  IconDirectionsFilled,
   IconGitFork,
-  IconHelpSquareRoundedFilled,
-  IconHomeFilled,
-  IconLayoutDashboardFilled,
+  IconHome,
+  IconInfoSmall,
+  IconLayoutDashboard,
+  IconLogs,
   IconMailForward,
-  IconPhotoFilled,
-  IconPointerFilled,
+  IconPhoto,
+  IconPlug,
+  IconQuestionMark,
+  IconReport,
   IconSearch,
-  IconSettingsFilled,
-  IconUserFilled,
+  IconSettings,
+  IconTool,
+  IconUser,
   IconUsers,
   IconUsersGroup,
 } from "@tabler/icons-react";
@@ -31,7 +30,6 @@ import { createDocumentationLink } from "@homarr/definitions";
 import { getScopedI18n } from "@homarr/translation/server";
 
 import { MainHeader } from "~/components/layout/header";
-import { homarrLogoPath } from "~/components/layout/logo/homarr-logo";
 import type { NavigationLink } from "~/components/layout/navigation";
 import { MainNavigation } from "~/components/layout/navigation";
 import { ClientShell } from "~/components/layout/shell";
@@ -42,11 +40,11 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
   const navigationLinks: NavigationLink[] = [
     {
       label: t("items.home"),
-      icon: IconHomeFilled,
+      icon: IconHome,
       href: "/manage",
     },
     {
-      icon: IconLayoutDashboardFilled,
+      icon: IconLayoutDashboard,
       href: "/manage/boards",
       label: t("items.boards"),
     },
@@ -55,12 +53,9 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       href: "/manage/apps",
       label: t("items.apps"),
       hidden: !session,
-      iconProps: {
-        strokeWidth: 2.5,
-      },
     },
     {
-      icon: IconAffiliateFilled,
+      icon: IconPlug,
       href: "/manage/integrations",
       label: t("items.integrations"),
       hidden: !session,
@@ -70,18 +65,15 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
       href: "/manage/search-engines",
       label: t("items.searchEngies"),
       hidden: !session,
-      iconProps: {
-        strokeWidth: 2.5,
-      },
     },
     {
-      icon: IconPhotoFilled,
+      icon: IconPhoto,
       href: "/manage/medias",
       label: t("items.medias"),
       hidden: !session,
     },
     {
-      icon: IconUserFilled,
+      icon: IconUser,
       label: t("items.users.label"),
       hidden: !session?.user.permissions.includes("admin"),
       items: [
@@ -105,7 +97,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
     },
     {
       label: t("items.tools.label"),
-      icon: IconPointerFilled,
+      icon: IconTool,
       // As permissions always include there children permissions, we can check other-view-logs as admin includes it
       hidden: !session?.user.permissions.includes("other-view-logs"),
       items: [
@@ -117,25 +109,19 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
         },
         {
           label: t("items.tools.items.api"),
-          icon: IconDirectionsFilled,
+          icon: IconPlug,
           href: "/manage/tools/api",
           hidden: !session?.user.permissions.includes("admin"),
         },
         {
           label: t("items.tools.items.logs"),
-          icon: IconBrandTablerFilled,
+          icon: IconLogs,
           href: "/manage/tools/logs",
           hidden: !session?.user.permissions.includes("other-view-logs"),
         },
-        {
-          label: t("items.tools.items.certificates"),
-          icon: IconCertificate,
-          href: "/manage/tools/certificates",
-          hidden: !session?.user.permissions.includes("admin"),
-        },
         {
           label: t("items.tools.items.tasks"),
-          icon: IconClipboardListFilled,
+          icon: IconReport,
           href: "/manage/tools/tasks",
           hidden: !session?.user.permissions.includes("admin"),
         },
@@ -144,12 +130,12 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
     {
       label: t("items.settings"),
       href: "/manage/settings",
-      icon: IconSettingsFilled,
+      icon: IconSettings,
       hidden: !session?.user.permissions.includes("admin"),
     },
     {
       label: t("items.help.label"),
-      icon: IconHelpSquareRoundedFilled,
+      icon: IconQuestionMark,
       items: [
         {
           label: t("items.help.items.documentation"),
@@ -160,7 +146,7 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
         {
           label: t("items.help.items.submitIssue"),
           icon: IconBrandGithub,
-          href: "https://github.com/homarr-labs/homarr/issues/new/choose",
+          href: "https://github.com/ajnart/homarr/issues/new/choose",
           external: true,
         },
         {
@@ -172,14 +158,14 @@ export default async function ManageLayout({ children }: PropsWithChildren) {
         {
           label: t("items.help.items.sourceCode"),
           icon: IconGitFork,
-          href: "https://github.com/homarr-labs/homarr",
+          href: "https://github.com/ajnart/homarr",
           external: true,
         },
       ],
     },
     {
       label: t("items.about"),
-      icon: homarrLogoPath,
+      icon: IconInfoSmall,
       href: "/manage/about",
     },
   ];

apps/nextjs/src/app/[locale]/manage/medias/_actions/copy-media.tsx

@@ -15,11 +15,6 @@ export const CopyMedia = ({ media }: CopyMediaProps) => {
 
   const url = typeof window !== "undefined" ? `${window.location.origin}/api/user-medias/${media.id}` : "";
 
-  // Clipboard only works on localhost or secure connections (https)
-  if (url.startsWith("http://") && !url.startsWith("http://localhost")) {
-    return null;
-  }
-
   return (
     <CopyButton value={url}>
       {({ copy, copied }) => (

apps/nextjs/src/app/[locale]/manage/medias/_actions/upload-media.tsx

@@ -1,11 +1,15 @@
 "use client";
 
-import { Button } from "@mantine/core";
+import type { JSX } from "react";
+import { Button, FileButton } from "@mantine/core";
 import { IconUpload } from "@tabler/icons-react";
 
+import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import { UploadMedia } from "@homarr/forms-collection";
+import type { MaybePromise } from "@homarr/common/types";
+import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
+import { supportedMediaUploadFormats } from "@homarr/validation";
 
 export const UploadMediaButton = () => {
   const t = useI18n();
@@ -23,3 +27,45 @@ export const UploadMediaButton = () => {
     </UploadMedia>
   );
 };
+
+interface UploadMediaProps {
+  children: (props: { onClick: () => void; loading: boolean }) => JSX.Element;
+  onSettled?: () => MaybePromise<void>;
+  onSuccess?: (media: { id: string; url: string }) => MaybePromise<void>;
+}
+
+export const UploadMedia = ({ children, onSettled, onSuccess }: UploadMediaProps) => {
+  const t = useI18n();
+  const { mutateAsync, isPending } = clientApi.media.uploadMedia.useMutation();
+
+  const handleFileUploadAsync = async (file: File | null) => {
+    if (!file) return;
+    const formData = new FormData();
+    formData.append("file", file);
+    await mutateAsync(formData, {
+      async onSuccess(mediaId) {
+        showSuccessNotification({
+          message: t("media.action.upload.notification.success.message"),
+        });
+        await onSuccess?.({
+          id: mediaId,
+          url: `/api/user-medias/${mediaId}`,
+        });
+      },
+      onError() {
+        showErrorNotification({
+          message: t("media.action.upload.notification.error.message"),
+        });
+      },
+      async onSettled() {
+        await onSettled?.();
+      },
+    });
+  };
+
+  return (
+    <FileButton onChange={handleFileUploadAsync} accept={supportedMediaUploadFormats.join(",")}>
+      {({ onClick }) => children({ onClick, loading: isPending })}
+    </FileButton>
+  );
+};

apps/nextjs/src/app/[locale]/manage/medias/page.tsx

@@ -1,31 +1,16 @@
+import Image from "next/image";
 import Link from "next/link";
 import { notFound } from "next/navigation";
-import {
-  ActionIcon,
-  Anchor,
-  Group,
-  Image,
-  Stack,
-  Table,
-  TableTbody,
-  TableTd,
-  TableTh,
-  TableThead,
-  TableTr,
-  Title,
-  Tooltip,
-} from "@mantine/core";
-import { IconExternalLink } from "@tabler/icons-react";
-import { z } from "zod";
+import { Anchor, Group, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Title } from "@mantine/core";
 
 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
 import { humanFileSize } from "@homarr/common";
 import type { inferSearchParamsFromSchema } from "@homarr/common/types";
-import { createLocalImageUrl } from "@homarr/icons/local";
 import { getI18n } from "@homarr/translation/server";
 import { SearchInput, TablePagination, UserAvatar } from "@homarr/ui";
+import { z } from "@homarr/validation";
 
 import { ManageContainer } from "~/components/manage/manage-container";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
@@ -61,7 +46,7 @@ export default async function GroupsListPage(props: MediaListPageProps) {
   const { items: medias, totalCount } = await api.media.getPaginated(searchParams);
 
   return (
-    <ManageContainer>
+    <ManageContainer size="xl">
       <DynamicBreadcrumb />
       <Stack>
         <Title>{t("media.plural")}</Title>
@@ -92,8 +77,7 @@ export default async function GroupsListPage(props: MediaListPageProps) {
           </TableTbody>
         </Table>
 
-        {/* Added margin to not hide pagination behind affix-button */}
-        <Group justify="end" mb={48}>
+        <Group justify="end">
           <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
         </Group>
       </Stack>
@@ -107,19 +91,17 @@ interface RowProps {
 
 const Row = async ({ media }: RowProps) => {
   const session = await auth();
-  const t = await getI18n();
   const canDelete = media.creatorId === session?.user.id || session?.user.permissions.includes("media-full-all");
 
   return (
     <TableTr>
       <TableTd w={64}>
         <Image
-          // Switched to mantine image because next/image doesn't support svgs
-          src={createLocalImageUrl(media.id)}
+          src={`/api/user-medias/${media.id}`}
           alt={media.name}
-          w={64}
-          h={64}
-          fit="contain"
+          width={64}
+          height={64}
+          style={{ objectFit: "contain" }}
         />
       </TableTd>
       <TableTd>{media.name}</TableTd>
@@ -139,17 +121,6 @@ const Row = async ({ media }: RowProps) => {
       <TableTd w={64}>
         <Group wrap="nowrap" gap="xs">
           <CopyMedia media={media} />
-          <Tooltip label={t("media.action.open.label")} openDelay={500}>
-            <ActionIcon
-              component="a"
-              href={createLocalImageUrl(media.id)}
-              target="_blank"
-              color="gray"
-              variant="subtle"
-            >
-              <IconExternalLink size={16} stroke={1.5} />
-            </ActionIcon>
-          </Tooltip>
           {canDelete && <DeleteMedia media={media} />}
         </Group>
       </TableTd>

apps/nextjs/src/app/[locale]/manage/page.tsx

@@ -83,7 +83,7 @@ export default async function ManagementPage() {
         {links.map(
           (link) =>
             !link.hidden && (
-              <Card component={Link} href={link.href} key={link.href} radius="lg">
+              <Card component={Link} href={link.href} key={link.href} withBorder>
                 <Group justify="space-between" wrap="nowrap">
                   <Group wrap="nowrap">
                     <Text size="2.4rem" fw="bolder">

apps/nextjs/src/app/[locale]/manage/search-engines/_form.tsx

@@ -4,16 +4,17 @@ import Link from "next/link";
 import type { SegmentedControlItem } from "@mantine/core";
 import { Button, Fieldset, Grid, Group, SegmentedControl, Stack, Textarea, TextInput } from "@mantine/core";
 import { WidgetIntegrationSelect } from "node_modules/@homarr/widgets/src/widget-integration-select";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { searchEngineTypes } from "@homarr/definitions";
 import { useZodForm } from "@homarr/form";
-import { IconPicker } from "@homarr/forms-collection";
 import type { TranslationFunction } from "@homarr/translation";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
+import { IconPicker } from "~/components/icons/picker/icon-picker";
+
 type FormType = z.infer<typeof validation.searchEngine.manage>;
 
 interface SearchEngineFormProps {
@@ -57,7 +58,7 @@ export const SearchEngineForm = (props: SearchEngineFormProps) => {
             />
           </Grid.Col>
         </Grid>
-        <IconPicker {...form.getInputProps("iconUrl")} />
+        <IconPicker initialValue={initialValues?.iconUrl} {...form.getInputProps("iconUrl")} />
 
         <Fieldset legend={t("search.engine.page.edit.configControl")}>
           <SegmentedControl

apps/nextjs/src/app/[locale]/manage/search-engines/edit/[id]/_search-engine-edit-form.tsx

@@ -2,7 +2,6 @@
 
 import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import type { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -10,7 +9,7 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import type { TranslationFunction } from "@homarr/translation";
 import { useScopedI18n } from "@homarr/translation/client";
-import type { validation } from "@homarr/validation";
+import type { validation, z } from "@homarr/validation";
 
 import { SearchEngineForm } from "../../_form";
 

apps/nextjs/src/app/[locale]/manage/search-engines/new/_search-engine-new-form.tsx

@@ -2,14 +2,13 @@
 
 import { useCallback } from "react";
 import { useRouter } from "next/navigation";
-import type { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import type { TranslationFunction } from "@homarr/translation";
 import { useScopedI18n } from "@homarr/translation/client";
-import type { validation } from "@homarr/validation";
+import type { validation, z } from "@homarr/validation";
 
 import { SearchEngineForm } from "../_form";
 

apps/nextjs/src/app/[locale]/manage/search-engines/page.tsx

@@ -2,7 +2,6 @@ import Link from "next/link";
 import { redirect } from "next/navigation";
 import { ActionIcon, ActionIconGroup, Anchor, Avatar, Card, Group, Stack, Text, Title } from "@mantine/core";
 import { IconPencil, IconSearch } from "@tabler/icons-react";
-import { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
@@ -10,6 +9,7 @@ import { auth } from "@homarr/auth/next";
 import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
 import { SearchInput, TablePagination } from "@homarr/ui";
+import { z } from "@homarr/validation";
 
 import { ManageContainer } from "~/components/manage/manage-container";
 import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
@@ -45,7 +45,7 @@ export default async function SearchEnginesPage(props: SearchEnginesPageProps) {
       <Stack>
         <Title>{tEngine("page.list.title")}</Title>
         <Group justify="space-between" align="center">
-          <SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} flexExpand />
+          <SearchInput placeholder={`${tEngine("search")}...`} defaultValue={searchParams.search} />
           {session.user.permissions.includes("search-engine-create") && (
             <MobileAffixButton component={Link} href="/manage/search-engines/new">
               {tEngine("page.create.title")}
@@ -61,8 +61,7 @@ export default async function SearchEnginesPage(props: SearchEnginesPageProps) {
           </Stack>
         )}
 
-        {/* Added margin to not hide pagination behind affix-button */}
-        <Group justify="end" mb={48}>
+        <Group justify="end">
           <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
         </Group>
       </Stack>

apps/nextjs/src/app/[locale]/manage/settings/_components/board-settings-form.tsx

@@ -1,12 +1,13 @@
 "use client";
 
-import { Switch, Text } from "@mantine/core";
+import { Group, Text } from "@mantine/core";
+import { IconLayoutDashboard } from "@tabler/icons-react";
 
 import { clientApi } from "@homarr/api/client";
 import type { ServerSettings } from "@homarr/server-settings";
 import { useScopedI18n } from "@homarr/translation/client";
+import { SelectWithCustomItems } from "@homarr/ui";
 
-import { BoardSelect } from "~/components/board/board-select";
 import { CommonSettingsForm } from "./common-form";
 
 export const BoardSettingsForm = ({ defaultValues }: { defaultValues: ServerSettings["board"] }) => {
@@ -17,33 +18,44 @@ export const BoardSettingsForm = ({ defaultValues }: { defaultValues: ServerSett
     <CommonSettingsForm settingKey="board" defaultValues={defaultValues}>
       {(form) => (
         <>
-          <BoardSelect
+          <SelectWithCustomItems
             label={tBoard("homeBoard.label")}
             description={tBoard("homeBoard.description")}
-            clearable
-            boards={selectableBoards}
+            data={selectableBoards.map((board) => ({
+              value: board.id,
+              label: board.name,
+              image: board.logoImageUrl,
+            }))}
+            SelectOption={({ label, image }: { value: string; label: string; image: string | null }) => (
+              <Group>
+                {/* eslint-disable-next-line @next/next/no-img-element */}
+                {image ? <img width={16} height={16} src={image} alt={label} /> : <IconLayoutDashboard size={16} />}
+                <Text fz="sm" fw={500}>
+                  {label}
+                </Text>
+              </Group>
+            )}
             {...form.getInputProps("homeBoardId")}
           />
-
-          <BoardSelect
+          <SelectWithCustomItems
             label={tBoard("homeBoard.mobileLabel")}
             description={tBoard("homeBoard.description")}
-            clearable
-            boards={selectableBoards}
+            data={selectableBoards.map((board) => ({
+              value: board.id,
+              label: board.name,
+              image: board.logoImageUrl,
+            }))}
+            SelectOption={({ label, image }: { value: string; label: string; image: string | null }) => (
+              <Group>
+                {/* eslint-disable-next-line @next/next/no-img-element */}
+                {image ? <img width={16} height={16} src={image} alt={label} /> : <IconLayoutDashboard size={16} />}
+                <Text fz="sm" fw={500}>
+                  {label}
+                </Text>
+              </Group>
+            )}
             {...form.getInputProps("mobileHomeBoardId")}
           />
-
-          <Text fw={500}>{tBoard("status.title")}</Text>
-          <Switch
-            {...form.getInputProps("enableStatusByDefault", { type: "checkbox" })}
-            label={tBoard("status.enableStatusByDefault.label")}
-            description={tBoard("status.enableStatusByDefault.description")}
-          />
-          <Switch
-            {...form.getInputProps("forceDisableStatus", { type: "checkbox" })}
-            label={tBoard("status.forceDisableStatus.label")}
-            description={tBoard("status.forceDisableStatus.description")}
-          />
         </>
       )}
     </CommonSettingsForm>

apps/nextjs/src/app/[locale]/manage/tools/api/components/api-keys.tsx

@@ -1,15 +1,14 @@
 "use client";
 
-import { useCallback, useMemo } from "react";
-import { ActionIcon, Button, Group, Stack, Text, Title } from "@mantine/core";
-import { IconTrash } from "@tabler/icons-react";
+import { useMemo } from "react";
+import { Button, Group, Stack, Text, Title } from "@mantine/core";
 import type { MRT_ColumnDef } from "mantine-react-table";
 import { MantineReactTable, useMantineReactTable } from "mantine-react-table";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useConfirmModal, useModalAction } from "@homarr/modals";
+import { useModalAction } from "@homarr/modals";
 import { useScopedI18n } from "@homarr/translation/client";
 import { UserAvatar } from "@homarr/ui";
 
@@ -21,8 +20,7 @@ interface ApiKeysManagementProps {
 
 export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
   const { openModal } = useModalAction(CopyApiKeyModal);
-  const { openConfirmModal } = useConfirmModal();
-  const { mutate: mutateCreate, isPending: isPendingCreate } = clientApi.apiKeys.create.useMutation({
+  const { mutate, isPending } = clientApi.apiKeys.create.useMutation({
     async onSuccess(data) {
       openModal({
         apiKey: data.apiKey,
@@ -30,26 +28,7 @@ export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
       await revalidatePathActionAsync("/manage/tools/api");
     },
   });
-  const { mutateAsync: mutateDeleteAsync, isPending: isPendingDelete } = clientApi.apiKeys.delete.useMutation({
-    async onSuccess() {
-      await revalidatePathActionAsync("/manage/tools/api");
-    },
-  });
-
   const t = useScopedI18n("management.page.tool.api.tab.apiKey");
-  const handleDelete = useCallback(
-    (id: string) => {
-      openConfirmModal({
-        title: t("modal.delete.title"),
-        children: t("modal.delete.text"),
-        // eslint-disable-next-line no-restricted-syntax
-        async onConfirm() {
-          await mutateDeleteAsync({ apiKeyId: id });
-        },
-      });
-    },
-    [t, openConfirmModal, mutateDeleteAsync],
-  );
 
   const columns = useMemo<MRT_ColumnDef<RouterOutputs["apiKeys"]["getAll"][number]>[]>(
     () => [
@@ -67,18 +46,8 @@ export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
           </Group>
         ),
       },
-      {
-        header: t("table.header.actions"),
-        Cell: ({ row }) => (
-          <Group gap="xs">
-            <ActionIcon onClick={() => handleDelete(row.original.id)} loading={isPendingDelete} c="red">
-              <IconTrash size="1rem" />
-            </ActionIcon>
-          </Group>
-        ),
-      },
     ],
-    [t, handleDelete, isPendingDelete],
+    [t],
   );
 
   const table = useMantineReactTable({
@@ -87,9 +56,9 @@ export const ApiKeysManagement = ({ apiKeys }: ApiKeysManagementProps) => {
     renderTopToolbarCustomActions: () => (
       <Button
         onClick={() => {
-          mutateCreate();
+          mutate();
         }}
-        loading={isPendingCreate}
+        loading={isPending}
       >
         {t("button.createApiToken")}
       </Button>

apps/nextjs/src/app/[locale]/manage/tools/api/swagger-ui-dark.css

@@ -1434,30 +1434,26 @@
     }
 
     ::-webkit-scrollbar-button:vertical:start:decrement {
-      background:
-        linear-gradient(130deg, #696969 40%, rgba(255, 0, 0, 0) 41%),
+      background: linear-gradient(130deg, #696969 40%, rgba(255, 0, 0, 0) 41%),
         linear-gradient(230deg, #696969 40%, transparent 41%), linear-gradient(0deg, #696969 40%, transparent 31%);
       background-color: #b6b6b6;
     }
 
     ::-webkit-scrollbar-button:vertical:end:increment {
-      background:
-        linear-gradient(310deg, #696969 40%, transparent 41%), linear-gradient(50deg, #696969 40%, transparent 41%),
-        linear-gradient(180deg, #696969 40%, transparent 31%);
+      background: linear-gradient(310deg, #696969 40%, transparent 41%),
+        linear-gradient(50deg, #696969 40%, transparent 41%), linear-gradient(180deg, #696969 40%, transparent 31%);
       background-color: #b6b6b6;
     }
 
     ::-webkit-scrollbar-button:horizontal:end:increment {
-      background:
-        linear-gradient(210deg, #696969 40%, transparent 41%), linear-gradient(330deg, #696969 40%, transparent 41%),
-        linear-gradient(90deg, #696969 30%, transparent 31%);
+      background: linear-gradient(210deg, #696969 40%, transparent 41%),
+        linear-gradient(330deg, #696969 40%, transparent 41%), linear-gradient(90deg, #696969 30%, transparent 31%);
       background-color: #b6b6b6;
     }
 
     ::-webkit-scrollbar-button:horizontal:start:decrement {
-      background:
-        linear-gradient(30deg, #696969 40%, transparent 41%), linear-gradient(150deg, #696969 40%, transparent 41%),
-        linear-gradient(270deg, #696969 30%, transparent 31%);
+      background: linear-gradient(30deg, #696969 40%, transparent 41%),
+        linear-gradient(150deg, #696969 40%, transparent 41%), linear-gradient(270deg, #696969 30%, transparent 31%);
       background-color: #b6b6b6;
     }
 
@@ -1685,32 +1681,28 @@
     }
 
     ::-webkit-scrollbar-button:vertical:start:decrement {
-      background:
-        linear-gradient(130deg, #696969 40%, rgba(255, 0, 0, 0) 41%),
+      background: linear-gradient(130deg, #696969 40%, rgba(255, 0, 0, 0) 41%),
         linear-gradient(230deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(0deg, #696969 40%, rgba(0, 0, 0, 0) 31%);
       background-color: #b6b6b6;
     }
 
     ::-webkit-scrollbar-button:vertical:end:increment {
-      background:
-        linear-gradient(310deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
+      background: linear-gradient(310deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(50deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(180deg, #696969 40%, rgba(0, 0, 0, 0) 31%);
       background-color: #b6b6b6;
     }
 
     ::-webkit-scrollbar-button:horizontal:end:increment {
-      background:
-        linear-gradient(210deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
+      background: linear-gradient(210deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(330deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(90deg, #696969 30%, rgba(0, 0, 0, 0) 31%);
       background-color: #b6b6b6;
     }
 
     ::-webkit-scrollbar-button:horizontal:start:decrement {
-      background:
-        linear-gradient(30deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
+      background: linear-gradient(30deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(150deg, #696969 40%, rgba(0, 0, 0, 0) 41%),
         linear-gradient(270deg, #696969 30%, rgba(0, 0, 0, 0) 31%);
       background-color: #b6b6b6;

apps/nextjs/src/app/[locale]/manage/tools/certificates/_components/add-certificate.tsx

@@ -1,82 +0,0 @@
-"use client";
-
-import { Button, FileInput, Group, Stack } from "@mantine/core";
-import { IconCertificate } from "@tabler/icons-react";
-import { z } from "zod";
-
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useZodForm } from "@homarr/form";
-import { createModal, useModalAction } from "@homarr/modals";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { superRefineCertificateFile } from "@homarr/validation";
-
-export const AddCertificateButton = () => {
-  const { openModal } = useModalAction(AddCertificateModal);
-  const t = useI18n();
-
-  const handleClick = () => {
-    openModal({});
-  };
-
-  return <Button onClick={handleClick}>{t("certificate.action.create.label")}</Button>;
-};
-
-const AddCertificateModal = createModal(({ actions }) => {
-  const t = useI18n();
-  const form = useZodForm(
-    z.object({
-      file: z.instanceof(File).nullable().superRefine(superRefineCertificateFile),
-    }),
-    {
-      initialValues: {
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        file: null!,
-      },
-    },
-  );
-  const { mutateAsync } = clientApi.certificates.addCertificate.useMutation();
-
-  return (
-    <form
-      onSubmit={form.onSubmit(async (values) => {
-        const formData = new FormData();
-        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-        formData.set("file", values.file!);
-        await mutateAsync(formData, {
-          async onSuccess() {
-            showSuccessNotification({
-              title: t("certificate.action.create.notification.success.title"),
-              message: t("certificate.action.create.notification.success.message"),
-            });
-            await revalidatePathActionAsync("/manage/tools/certificates");
-            actions.closeModal();
-          },
-          onError() {
-            showErrorNotification({
-              title: t("certificate.action.create.notification.error.title"),
-              message: t("certificate.action.create.notification.error.message"),
-            });
-          },
-        });
-      })}
-    >
-      <Stack>
-        <FileInput leftSection={<IconCertificate size={16} />} {...form.getInputProps("file")} />
-        <Group justify="end">
-          <Button onClick={actions.closeModal} variant="subtle" color="gray">
-            {t("common.action.cancel")}
-          </Button>
-          <Button type="submit" loading={form.submitting}>
-            {t("common.action.add")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-}).withOptions({
-  defaultTitle(t) {
-    return t("certificate.action.create.label");
-  },
-});

apps/nextjs/src/app/[locale]/manage/tools/certificates/_components/remove-certificate.tsx

@@ -1,54 +0,0 @@
-"use client";
-
-import { ActionIcon } from "@mantine/core";
-import { IconTrash } from "@tabler/icons-react";
-
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { useConfirmModal } from "@homarr/modals";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-
-interface RemoveCertificateProps {
-  fileName: string;
-}
-
-export const RemoveCertificate = ({ fileName }: RemoveCertificateProps) => {
-  const { openConfirmModal } = useConfirmModal();
-  const { mutateAsync } = clientApi.certificates.removeCertificate.useMutation();
-  const t = useI18n();
-
-  const handleClick = () => {
-    openConfirmModal({
-      title: t("certificate.action.remove.label"),
-      children: t("certificate.action.remove.confirm"),
-      // eslint-disable-next-line no-restricted-syntax
-      async onConfirm() {
-        await mutateAsync(
-          { fileName },
-          {
-            async onSuccess() {
-              showSuccessNotification({
-                title: t("certificate.action.remove.notification.success.title"),
-                message: t("certificate.action.remove.notification.success.message"),
-              });
-              await revalidatePathActionAsync("/manage/tools/certificates");
-            },
-            onError() {
-              showErrorNotification({
-                title: t("certificate.action.remove.notification.error.title"),
-                message: t("certificate.action.remove.notification.error.message"),
-              });
-            },
-          },
-        );
-      },
-    });
-  };
-
-  return (
-    <ActionIcon onClick={handleClick} color="red" variant="subtle">
-      <IconTrash color="red" size={16} />
-    </ActionIcon>
-  );
-};

apps/nextjs/src/app/[locale]/manage/tools/certificates/page.tsx

@@ -1,104 +0,0 @@
-import { X509Certificate } from "node:crypto";
-import { notFound } from "next/navigation";
-import { Card, Group, SimpleGrid, Stack, Text, Title } from "@mantine/core";
-import { IconCertificate, IconCertificateOff } from "@tabler/icons-react";
-import dayjs from "dayjs";
-
-import { auth } from "@homarr/auth/next";
-import { loadCustomRootCertificatesAsync } from "@homarr/certificates/server";
-import { getMantineColor } from "@homarr/common";
-import type { SupportedLanguage } from "@homarr/translation";
-import { getI18n } from "@homarr/translation/server";
-
-import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { NoResults } from "~/components/no-results";
-import { AddCertificateButton } from "./_components/add-certificate";
-import { RemoveCertificate } from "./_components/remove-certificate";
-
-interface CertificatesPageProps {
-  params: Promise<{
-    locale: SupportedLanguage;
-  }>;
-}
-
-export default async function CertificatesPage({ params }: CertificatesPageProps) {
-  const session = await auth();
-  if (!session?.user.permissions.includes("admin")) {
-    notFound();
-  }
-
-  const { locale } = await params;
-  const t = await getI18n();
-  const certificates = await loadCustomRootCertificatesAsync();
-  const x509Certificates = certificates
-    .map((cert) => ({
-      ...cert,
-      x509: new X509Certificate(cert.content),
-    }))
-    .sort((certA, certB) => certA.x509.validToDate.getTime() - certB.x509.validToDate.getTime());
-
-  return (
-    <>
-      <DynamicBreadcrumb />
-
-      <Stack>
-        <Group justify="space-between">
-          <Stack gap={4}>
-            <Title>{t("certificate.page.list.title")}</Title>
-            <Text>{t("certificate.page.list.description")}</Text>
-          </Stack>
-
-          <AddCertificateButton />
-        </Group>
-
-        {x509Certificates.length === 0 && (
-          <NoResults icon={IconCertificateOff} title={t("certificate.page.list.noResults.title")} />
-        )}
-
-        <SimpleGrid cols={{ sm: 1, lg: 2, xl: 3 }} spacing="lg">
-          {x509Certificates.map((cert) => (
-            <Card key={cert.x509.fingerprint} withBorder>
-              <Group wrap="nowrap">
-                <IconCertificate
-                  color={getMantineColor(iconColor(cert.x509.validToDate), 6)}
-                  style={{ minWidth: 32 }}
-                  size={32}
-                  stroke={1.5}
-                />
-                <Stack flex={1} gap="xs" maw="calc(100% - 48px)">
-                  <Group justify="space-between" wrap="nowrap">
-                    <Text fw={500} lineClamp={1} style={{ wordBreak: "break-all" }}>
-                      {cert.x509.subject}
-                    </Text>
-                    <Text c="gray.6" ta="end" size="sm">
-                      {cert.fileName}
-                    </Text>
-                  </Group>
-                  <Group justify="space-between">
-                    <Text size="sm" c="gray.6" title={cert.x509.validToDate.toISOString()}>
-                      {t("certificate.page.list.expires", {
-                        when: new Intl.RelativeTimeFormat(locale).format(
-                          dayjs(cert.x509.validToDate).diff(dayjs(), "days"),
-                          "days",
-                        ),
-                      })}
-                    </Text>
-                    <RemoveCertificate fileName={cert.fileName} />
-                  </Group>
-                </Stack>
-              </Group>
-            </Card>
-          ))}
-        </SimpleGrid>
-      </Stack>
-    </>
-  );
-}
-
-const iconColor = (validTo: Date) => {
-  const daysUntilInvalid = dayjs(validTo).diff(new Date(), "days");
-  if (daysUntilInvalid < 1) return "red";
-  if (daysUntilInvalid < 7) return "orange";
-  if (daysUntilInvalid < 30) return "yellow";
-  return "green";
-};

apps/nextjs/src/app/[locale]/manage/tools/docker/docker-table.tsx

@@ -16,7 +16,7 @@ import { MantineReactTable } from "mantine-react-table";
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
 import { useTimeAgo } from "@homarr/common";
-import type { ContainerState } from "@homarr/docker";
+import type { DockerContainerState } from "@homarr/definitions";
 import { useModalAction } from "@homarr/modals";
 import { AddDockerAppToHomarr } from "@homarr/modals-collection";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
@@ -35,13 +35,7 @@ const createColumns = (
     Cell({ renderedCellValue, row }) {
       return (
         <Group gap="xs">
-          <Avatar
-            variant="outline"
-            radius="lg"
-            size="md"
-            styles={{ image: { objectFit: "contain" } }}
-            src={row.original.iconUrl}
-          >
+          <Avatar variant="outline" radius="lg" size="md" src={row.original.iconUrl}>
             {row.original.name.at(0)?.toUpperCase()}
           </Avatar>
           <Text>{renderedCellValue}</Text>
@@ -252,9 +246,9 @@ const containerStates = {
   exited: "red",
   removing: "pink",
   dead: "dark",
-} satisfies Record<ContainerState, MantineColor>;
+} satisfies Record<DockerContainerState, MantineColor>;
 
-const ContainerStateBadge = ({ state }: { state: ContainerState }) => {
+const ContainerStateBadge = ({ state }: { state: DockerContainerState }) => {
   const t = useScopedI18n("docker.field.state.option");
 
   return (

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-default-search-engine.tsx

@@ -1,7 +1,6 @@
 "use client";
 
-import { Button, Group, Select, Stack, Switch } from "@mantine/core";
-import type { z } from "zod";
+import { Button, Group, Select, Stack } from "@mantine/core";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -9,38 +8,37 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
-interface ChangeSearchPreferencesFormProps {
+interface ChangeDefaultSearchEngineFormProps {
   user: RouterOutputs["user"]["getById"];
   searchEnginesData: { value: string; label: string }[];
 }
 
-export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeSearchPreferencesFormProps) => {
+export const ChangeDefaultSearchEngineForm = ({ user, searchEnginesData }: ChangeDefaultSearchEngineFormProps) => {
   const t = useI18n();
-  const { mutate, isPending } = clientApi.user.changeSearchPreferences.useMutation({
+  const { mutate, isPending } = clientApi.user.changeDefaultSearchEngine.useMutation({
     async onSettled() {
       await revalidatePathActionAsync(`/manage/users/${user.id}`);
     },
     onSuccess(_, variables) {
       form.setInitialValues({
         defaultSearchEngineId: variables.defaultSearchEngineId,
-        openInNewTab: variables.openInNewTab,
       });
       showSuccessNotification({
-        message: t("user.action.changeSearchPreferences.notification.success.message"),
+        message: t("user.action.changeDefaultSearchEngine.notification.success.message"),
       });
     },
     onError() {
       showErrorNotification({
-        message: t("user.action.changeSearchPreferences.notification.error.message"),
+        message: t("user.action.changeDefaultSearchEngine.notification.error.message"),
       });
     },
   });
-  const form = useZodForm(validation.user.changeSearchPreferences, {
+  const form = useZodForm(validation.user.changeDefaultSearchEngine, {
     initialValues: {
-      defaultSearchEngineId: user.defaultSearchEngineId,
-      openInNewTab: user.openSearchInNewTab,
+      defaultSearchEngineId: user.defaultSearchEngineId ?? "",
     },
   });
 
@@ -54,16 +52,7 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS
   return (
     <form onSubmit={form.onSubmit(handleSubmit)}>
       <Stack gap="md">
-        <Select
-          label={t("user.field.defaultSearchEngine.label")}
-          w="100%"
-          data={searchEnginesData}
-          {...form.getInputProps("defaultSearchEngineId")}
-        />
-        <Switch
-          label={t("user.field.openSearchInNewTab.label")}
-          {...form.getInputProps("openInNewTab", { type: "checkbox" })}
-        />
+        <Select w="100%" data={searchEnginesData} {...form.getInputProps("defaultSearchEngineId")} />
 
         <Group justify="end">
           <Button type="submit" color="teal" loading={isPending}>
@@ -75,4 +64,4 @@ export const ChangeSearchPreferencesForm = ({ user, searchEnginesData }: ChangeS
   );
 };
 
-type FormType = z.infer<typeof validation.user.changeSearchPreferences>;
+type FormType = z.infer<typeof validation.user.changeDefaultSearchEngine>;

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_change-home-board.tsx

@@ -1,7 +1,6 @@
 "use client";
 
-import { Button, Group, Stack } from "@mantine/core";
-import type { z } from "zod";
+import { Button, Group, Select, Stack } from "@mantine/core";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -9,14 +8,12 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
-import type { Board } from "~/app/[locale]/boards/_types";
-import { BoardSelect } from "~/components/board/board-select";
-
 interface ChangeHomeBoardFormProps {
   user: RouterOutputs["user"]["getById"];
-  boardsData: Pick<Board, "id" | "name" | "logoImageUrl">[];
+  boardsData: { value: string; label: string }[];
 }
 
 export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormProps) => {
@@ -42,8 +39,8 @@ export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormPro
   });
   const form = useZodForm(validation.user.changeHomeBoards, {
     initialValues: {
-      homeBoardId: user.homeBoardId,
-      mobileHomeBoardId: user.mobileHomeBoardId,
+      homeBoardId: user.homeBoardId ?? "",
+      mobileHomeBoardId: user.mobileHomeBoardId ?? "",
     },
   });
 
@@ -57,18 +54,16 @@ export const ChangeHomeBoardForm = ({ user, boardsData }: ChangeHomeBoardFormPro
   return (
     <form onSubmit={form.onSubmit(handleSubmit)}>
       <Stack gap="md">
-        <BoardSelect
+        <Select
           label={t("management.page.user.setting.general.item.board.type.general")}
-          clearable
-          boards={boardsData}
           w="100%"
+          data={boardsData}
           {...form.getInputProps("homeBoardId")}
         />
-        <BoardSelect
+        <Select
           label={t("management.page.user.setting.general.item.board.type.mobile")}
-          clearable
-          boards={boardsData}
           w="100%"
+          data={boardsData}
           {...form.getInputProps("mobileHomeBoardId")}
         />
 

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_first-day-of-week.tsx

@@ -4,7 +4,6 @@ import { Button, Group, Radio, Stack } from "@mantine/core";
 import type { DayOfWeek } from "@mantine/dates";
 import dayjs from "dayjs";
 import localeData from "dayjs/plugin/localeData";
-import type { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -12,6 +11,7 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 dayjs.extend(localeData);

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/_components/_ping-icons-enabled.tsx

@@ -1,7 +1,6 @@
 "use client";
 
 import { Button, Group, Stack, Switch } from "@mantine/core";
-import type { z } from "zod";
 
 import type { RouterOutputs } from "@homarr/api";
 import { clientApi } from "@homarr/api/client";
@@ -9,6 +8,7 @@ import { revalidatePathActionAsync } from "@homarr/common/client";
 import { useZodForm } from "@homarr/form";
 import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
 import { useI18n } from "@homarr/translation/client";
+import type { z } from "@homarr/validation";
 import { validation } from "@homarr/validation";
 
 interface PingIconsEnabledProps {
@@ -51,10 +51,7 @@ export const PingIconsEnabled = ({ user }: PingIconsEnabledProps) => {
   return (
     <form onSubmit={form.onSubmit(handleSubmit)}>
       <Stack gap="md">
-        <Switch
-          {...form.getInputProps("pingIconsEnabled", { type: "checkbox" })}
-          label={t("user.field.pingIconsEnabled.label")}
-        />
+        <Switch {...form.getInputProps("pingIconsEnabled")} label={t("user.field.pingIconsEnabled.label")} />
 
         <Group justify="end">
           <Button type="submit" color="teal" loading={isPending}>

apps/nextjs/src/app/[locale]/manage/users/[userId]/general/page.tsx

@@ -11,8 +11,8 @@ import { DangerZoneItem, DangerZoneRoot } from "~/components/manage/danger-zone"
 import { catchTrpcNotFound } from "~/errors/trpc-catch-error";
 import { createMetaTitle } from "~/metadata";
 import { canAccessUserEditPage } from "../access";
+import { ChangeDefaultSearchEngineForm } from "./_components/_change-default-search-engine";
 import { ChangeHomeBoardForm } from "./_components/_change-home-board";
-import { ChangeSearchPreferencesForm } from "./_components/_change-search-preferences";
 import { DeleteUserButton } from "./_components/_delete-user-button";
 import { FirstDayOfWeek } from "./_components/_first-day-of-week";
 import { PingIconsEnabled } from "./_components/_ping-icons-enabled";
@@ -83,28 +83,25 @@ export default async function EditUserPage(props: Props) {
         </Box>
       </Group>
 
-      {session?.user.id === user.id && (
-        <Stack mb="lg">
-          <Title order={2}>{tGeneral("item.language")}</Title>
-          <CurrentLanguageCombobox />
-        </Stack>
-      )}
+      <Stack mb="lg">
+        <Title order={2}>{tGeneral("item.language")}</Title>
+        <CurrentLanguageCombobox />
+      </Stack>
 
       <Stack mb="lg">
         <Title order={2}>{tGeneral("item.board.title")}</Title>
         <ChangeHomeBoardForm
           user={user}
           boardsData={boards.map((board) => ({
-            id: board.id,
-            name: board.name,
-            logoImageUrl: board.logoImageUrl,
+            value: board.id,
+            label: board.name,
           }))}
         />
       </Stack>
 
       <Stack mb="lg">
-        <Title order={2}>{tGeneral("item.search")}</Title>
-        <ChangeSearchPreferencesForm user={user} searchEnginesData={searchEngines} />
+        <Title order={2}>{tGeneral("item.defaultSearchEngine")}</Title>
+        <ChangeDefaultSearchEngineForm user={user} searchEnginesData={searchEngines} />
       </Stack>
 
       <Stack mb="lg">

apps/nextjs/src/app/[locale]/manage/users/create/_components/create-user-stepper.tsx

@@ -17,7 +17,6 @@ import {
 } from "@mantine/core";
 import { useListState } from "@mantine/hooks";
 import { IconPlus, IconUserCheck } from "@tabler/icons-react";
-import { z } from "zod";
 
 import { clientApi } from "@homarr/api/client";
 import { everyoneGroup, groupPermissions } from "@homarr/definitions";
@@ -27,7 +26,7 @@ import { useModalAction } from "@homarr/modals";
 import { showErrorNotification } from "@homarr/notifications";
 import { useI18n, useScopedI18n } from "@homarr/translation/client";
 import { CustomPasswordInput, UserAvatar } from "@homarr/ui";
-import { validation } from "@homarr/validation";
+import { validation, z } from "@homarr/validation";
 import { createCustomErrorParams } from "@homarr/validation/form";
 
 import { GroupSelectModal } from "~/components/access/group-select-modal";

apps/nextjs/src/app/[locale]/manage/users/groups/[id]/layout.tsx

@@ -1,7 +1,7 @@
 import type { PropsWithChildren } from "react";
 import Link from "next/link";
 import { Button, Grid, GridCol, Group, Stack, Text, Title } from "@mantine/core";
-import { IconId, IconLock, IconSettings, IconUsersGroup } from "@tabler/icons-react";
+import { IconLock, IconSettings, IconUsersGroup } from "@tabler/icons-react";
 
 import { api } from "@homarr/api/server";
 import { getI18n, getScopedI18n } from "@homarr/translation/server";
@@ -42,11 +42,6 @@ export default async function Layout(props: PropsWithChildren<LayoutProps>) {
               <NavigationLink
                 href={`/manage/users/groups/${params.id}`}
                 label={tGroup("setting.general.title")}
-                icon={<IconId size="1rem" stroke={1.5} />}
-              />
-              <NavigationLink
-                href={`/manage/users/groups/${params.id}/settings`}
-                label={tGroup("setting.setting.title")}
                 icon={<IconSettings size="1rem" stroke={1.5} />}
               />
               <NavigationLink

apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/_group-home-boards.tsx

@@ -1,81 +0,0 @@
-"use client";
-
-import { Button, Group, Stack } from "@mantine/core";
-
-import { clientApi } from "@homarr/api/client";
-import { useZodForm } from "@homarr/form";
-import { showErrorNotification, showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { validation } from "@homarr/validation";
-
-import { BoardSelect } from "~/components/board/board-select";
-
-interface GroupHomeBoardsProps {
-  homeBoardId: string | null;
-  mobileHomeBoardId: string | null;
-  groupId: string;
-}
-
-export const GroupHomeBoards = ({ homeBoardId, mobileHomeBoardId, groupId }: GroupHomeBoardsProps) => {
-  const t = useI18n();
-  const [availableBoards] = clientApi.board.getBoardsForGroup.useSuspenseQuery({ groupId });
-  const form = useZodForm(validation.group.settings.pick({ homeBoardId: true, mobileHomeBoardId: true }), {
-    initialValues: {
-      homeBoardId,
-      mobileHomeBoardId,
-    },
-  });
-  const { mutateAsync, isPending } = clientApi.group.savePartialSettings.useMutation();
-
-  const handleSubmit = form.onSubmit(async (values) => {
-    await mutateAsync(
-      {
-        id: groupId,
-        settings: values,
-      },
-      {
-        onSuccess() {
-          form.setInitialValues(values);
-          showSuccessNotification({
-            title: t("group.action.settings.board.notification.success.title"),
-            message: t("group.action.settings.board.notification.success.message"),
-          });
-        },
-        onError() {
-          showErrorNotification({
-            title: t("group.action.settings.board.notification.error.title"),
-            message: t("group.action.settings.board.notification.error.message"),
-          });
-        },
-      },
-    );
-  });
-
-  return (
-    <form onSubmit={handleSubmit}>
-      <Stack gap="md">
-        <BoardSelect
-          label={t("group.field.homeBoard.label")}
-          description={t("group.field.homeBoard.description")}
-          clearable
-          boards={availableBoards}
-          {...form.getInputProps("homeBoardId")}
-        />
-
-        <BoardSelect
-          label={t("group.field.mobileBoard.label")}
-          description={t("group.field.mobileBoard.description")}
-          clearable
-          boards={availableBoards}
-          {...form.getInputProps("mobileHomeBoardId")}
-        />
-
-        <Group justify="end">
-          <Button type="submit" color="teal" loading={isPending}>
-            {t("common.action.save")}
-          </Button>
-        </Group>
-      </Stack>
-    </form>
-  );
-};

apps/nextjs/src/app/[locale]/manage/users/groups/[id]/settings/page.tsx

@@ -1,41 +0,0 @@
-import { notFound } from "next/navigation";
-import { Alert, Stack, Title } from "@mantine/core";
-import { IconExclamationCircle } from "@tabler/icons-react";
-
-import { api } from "@homarr/api/server";
-import { auth } from "@homarr/auth/next";
-import { getI18n } from "@homarr/translation/server";
-
-import { GroupHomeBoards } from "./_group-home-boards";
-
-interface GroupSettingsPageProps {
-  params: Promise<{
-    id: string;
-  }>;
-}
-
-export default async function GroupPermissionsPage(props: GroupSettingsPageProps) {
-  const params = await props.params;
-  const session = await auth();
-
-  if (!session?.user.permissions.includes("admin")) {
-    notFound();
-  }
-
-  const group = await api.group.getById({ id: params.id });
-  const t = await getI18n();
-
-  return (
-    <Stack>
-      <Title>{t("management.page.group.setting.setting.title")}</Title>
-
-      <Alert color="cyan" icon={<IconExclamationCircle size="1rem" stroke={1.5} />}>
-        {t("management.page.group.setting.setting.alert")}
-      </Alert>
-
-      <Title order={3}>{t("management.page.group.setting.setting.board.title")}</Title>
-
-      <GroupHomeBoards homeBoardId={group.homeBoardId} mobileHomeBoardId={group.mobileHomeBoardId} groupId={group.id} />
-    </Stack>
-  );
-}

apps/nextjs/src/app/[locale]/manage/users/groups/_add-group.tsx

@@ -0,0 +1,24 @@
+"use client";
+
+import { useCallback } from "react";
+
+import { useModalAction } from "@homarr/modals";
+import { AddGroupModal } from "@homarr/modals-collection";
+import { useI18n } from "@homarr/translation/client";
+
+import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
+
+export const AddGroup = () => {
+  const t = useI18n();
+  const { openModal } = useModalAction(AddGroupModal);
+
+  const handleAddGroup = useCallback(() => {
+    openModal();
+  }, [openModal]);
+
+  return (
+    <MobileAffixButton onClick={handleAddGroup} color="teal">
+      {t("group.action.create.label")}
+    </MobileAffixButton>
+  );
+};

apps/nextjs/src/app/[locale]/manage/users/groups/_client.tsx

@@ -1,65 +0,0 @@
-"use client";
-
-import { useCallback, useMemo, useState } from "react";
-import { Group, TextInput } from "@mantine/core";
-import { IconSearch } from "@tabler/icons-react";
-
-import type { RouterOutputs } from "@homarr/api";
-import { useModalAction } from "@homarr/modals";
-import { AddGroupModal } from "@homarr/modals-collection";
-import { useI18n } from "@homarr/translation/client";
-
-import { MobileAffixButton } from "~/components/manage/mobile-affix-button";
-import { GroupsTable } from "./_groups-table";
-
-interface GroupsListProps {
-  groups: RouterOutputs["group"]["getAll"];
-}
-
-export const GroupsList = ({ groups }: GroupsListProps) => {
-  const [search, setSearch] = useState("");
-  const initialGroupIds = useMemo(
-    () => groups.sort((groupA, groupB) => groupA.position - groupB.position).map((group) => group.id),
-    [groups],
-  );
-  const filteredGroups = useMemo(
-    () =>
-      groups
-        .filter((group) => group.name.toLowerCase().includes(search.toLowerCase()))
-        .sort((groupA, groupB) => groupA.position - groupB.position),
-    [groups, search],
-  );
-  const t = useI18n();
-
-  return (
-    <>
-      <Group justify="space-between">
-        <TextInput
-          leftSection={<IconSearch size={20} stroke={1.5} />}
-          value={search}
-          onChange={(event) => setSearch(event.currentTarget.value)}
-          placeholder={`${t("group.search")}...`}
-          style={{ flex: 1 }}
-        />
-        <AddGroup />
-      </Group>
-
-      <GroupsTable groups={filteredGroups} initialGroupIds={initialGroupIds} hasFilter={search.length !== 0} />
-    </>
-  );
-};
-
-const AddGroup = () => {
-  const t = useI18n();
-  const { openModal } = useModalAction(AddGroupModal);
-
-  const handleAddGroup = useCallback(() => {
-    openModal();
-  }, [openModal]);
-
-  return (
-    <MobileAffixButton onClick={handleAddGroup} color="teal">
-      {t("group.action.create.label")}
-    </MobileAffixButton>
-  );
-};

apps/nextjs/src/app/[locale]/manage/users/groups/_groups-table.tsx

@@ -1,277 +0,0 @@
-"use client";
-
-import type { ReactNode } from "react";
-import { useMemo, useState } from "react";
-import Link from "next/link";
-import type { DragEndEvent, DraggableAttributes, DragStartEvent } from "@dnd-kit/core";
-import {
-  closestCenter,
-  DndContext,
-  DragOverlay,
-  KeyboardSensor,
-  MouseSensor,
-  TouchSensor,
-  useSensor,
-  useSensors,
-} from "@dnd-kit/core";
-import type { SyntheticListenerMap } from "@dnd-kit/core/dist/hooks/utilities";
-import { restrictToVerticalAxis } from "@dnd-kit/modifiers";
-import { arrayMove, SortableContext, useSortable, verticalListSortingStrategy } from "@dnd-kit/sortable";
-import { CSS } from "@dnd-kit/utilities";
-import {
-  Anchor,
-  Box,
-  Button,
-  Card,
-  Flex,
-  Group,
-  Table,
-  TableTbody,
-  TableTd,
-  TableTh,
-  TableThead,
-  TableTr,
-  Text,
-  Transition,
-} from "@mantine/core";
-import { IconGripVertical } from "@tabler/icons-react";
-
-import type { RouterOutputs } from "@homarr/api";
-import { clientApi } from "@homarr/api/client";
-import { revalidatePathActionAsync } from "@homarr/common/client";
-import { showSuccessNotification } from "@homarr/notifications";
-import { useI18n } from "@homarr/translation/client";
-import { UserAvatarGroup } from "@homarr/ui";
-
-interface GroupsTableProps {
-  initialGroupIds: string[];
-  groups: RouterOutputs["group"]["getAll"];
-  hasFilter: boolean;
-}
-
-export const GroupsTable = ({ groups, initialGroupIds, hasFilter }: GroupsTableProps) => {
-  const t = useI18n();
-  const [activeId, setActiveId] = useState<string | null>(null);
-  const [groupIds, setGroupIds] = useState(groups.map((group) => group.id));
-  const isDirty = useMemo(
-    () => initialGroupIds.some((groupId, index) => groupIds.indexOf(groupId) !== index),
-    [groupIds, initialGroupIds],
-  );
-  const { mutateAsync, isPending } = clientApi.group.savePositions.useMutation();
-  const handleSavePositionsAsync = async () => {
-    await mutateAsync(
-      { positions: groupIds },
-      {
-        async onSuccess() {
-          showSuccessNotification({
-            message: t("group.action.changePosition.notification.success.message"),
-          });
-          await revalidatePathActionAsync("/manage/users/groups");
-        },
-        onError() {
-          showSuccessNotification({
-            message: t("group.action.changePosition.notification.error.message"),
-          });
-        },
-      },
-    );
-  };
-
-  const sensors = useSensors(useSensor(MouseSensor, {}), useSensor(TouchSensor, {}), useSensor(KeyboardSensor, {}));
-
-  const handleDragStart = (event: DragStartEvent) => {
-    setActiveId(event.active.id as string);
-  };
-
-  function handleDragEnd(event: DragEndEvent) {
-    const { active, over } = event;
-    if (!over || active.id === over.id) {
-      setActiveId(null);
-      return;
-    }
-
-    setGroupIds((groupIds) => {
-      const oldIndex = groupIds.indexOf(active.id as string);
-      const newIndex = groupIds.indexOf(over.id as string);
-      return arrayMove(groupIds, oldIndex, newIndex);
-    });
-  }
-
-  function handleDragCancel() {
-    setActiveId(null);
-  }
-
-  const selectedRow = useMemo(() => {
-    if (!activeId) return null;
-
-    const current = groups.find((group) => group.id === activeId);
-    if (!current) return null;
-
-    return <Row group={current} handle={<DragHandle attributes={undefined} listeners={undefined} active />} />;
-  }, [activeId, groups]);
-
-  return (
-    <>
-      <DndContext
-        sensors={sensors}
-        onDragEnd={handleDragEnd}
-        onDragStart={handleDragStart}
-        onDragCancel={handleDragCancel}
-        collisionDetection={closestCenter}
-        modifiers={[restrictToVerticalAxis]}
-        id="groups-table"
-      >
-        <Table striped highlightOnHover>
-          <TableThead>
-            <TableTr>
-              <TableTh>{t("group.field.name")}</TableTh>
-              <TableTh>{t("group.field.members")}</TableTh>
-            </TableTr>
-          </TableThead>
-          <TableTbody>
-            <SortableContext items={groupIds} strategy={verticalListSortingStrategy}>
-              {groupIds.map((groupId) => {
-                const group = groups.find(({ id }) => id === groupId);
-                if (!group) return null;
-
-                return <DraggableRow key={group.id} group={group} disabled={hasFilter} />;
-              })}
-            </SortableContext>
-          </TableTbody>
-        </Table>
-
-        <DragOverlay>
-          {activeId && (
-            <Table w="100%">
-              <TableTbody>{selectedRow}</TableTbody>
-            </Table>
-          )}
-        </DragOverlay>
-      </DndContext>
-      <SaveAffix
-        visible={isDirty}
-        onDiscard={() => setGroupIds(initialGroupIds)}
-        isPending={isPending}
-        onSave={handleSavePositionsAsync}
-      />
-    </>
-  );
-};
-
-interface DraggableRowProps {
-  group: RouterOutputs["group"]["getAll"][number];
-  disabled?: boolean;
-}
-
-const DraggableRow = ({ group, disabled }: DraggableRowProps) => {
-  const { attributes, listeners, transform, transition, setNodeRef, isDragging } = useSortable({
-    id: group.id,
-  });
-
-  const style = {
-    transform: CSS.Transform.toString(transform),
-    transition,
-  };
-
-  if (isDragging) {
-    return (
-      <TableTr ref={setNodeRef} style={style}>
-        <TableTd colSpan={2}>&nbsp;</TableTd>
-      </TableTr>
-    );
-  }
-
-  return (
-    <Row
-      group={group}
-      setNodeRef={setNodeRef}
-      style={style}
-      handle={<DragHandle attributes={attributes} listeners={listeners} active={false} disabled={disabled} />}
-    />
-  );
-};
-
-interface RowProps {
-  group: RouterOutputs["group"]["getAll"][number];
-  handle?: ReactNode;
-  setNodeRef?: (node: HTMLElement | null) => void;
-  style?: React.CSSProperties;
-}
-
-const Row = ({ group, handle, setNodeRef, style }: RowProps) => {
-  return (
-    <TableTr ref={setNodeRef} style={style}>
-      <TableTd>
-        <Group>
-          {handle}
-          <Anchor component={Link} href={`/manage/users/groups/${group.id}`}>
-            {group.name}
-          </Anchor>
-        </Group>
-      </TableTd>
-      <TableTd>
-        <UserAvatarGroup users={group.members} size="sm" limit={5} />
-      </TableTd>
-    </TableTr>
-  );
-};
-
-interface DragHandleProps {
-  attributes: DraggableAttributes | undefined;
-  listeners: SyntheticListenerMap | undefined;
-  active: boolean;
-  disabled?: boolean;
-}
-
-const DragHandle = ({ attributes, listeners, active, disabled }: DragHandleProps) => {
-  if (disabled) {
-    return <Box w={40} h="100%" />;
-  }
-
-  return (
-    <Flex
-      align="center"
-      justify="center"
-      h="100%"
-      w={40}
-      style={{ cursor: active ? "grabbing" : "grab" }}
-      {...attributes}
-      {...listeners}
-    >
-      <IconGripVertical size={18} stroke={1.5} />
-    </Flex>
-  );
-};
-
-interface SaveAffixProps {
-  visible: boolean;
-  isPending: boolean;
-  onDiscard: () => void;
-  onSave: () => void;
-}
-
-const SaveAffix = ({ visible, isPending, onDiscard, onSave }: SaveAffixProps) => {
-  const t = useI18n();
-
-  return (
-    <div style={{ position: "sticky", bottom: 20 }}>
-      <Transition transition="slide-up" mounted={visible}>
-        {(transitionStyles) => (
-          <Card style={transitionStyles} withBorder>
-            <Group justify="space-between">
-              <Text fw={500}>{t("common.unsavedChanges")}</Text>
-              <Group>
-                <Button disabled={isPending} onClick={onDiscard}>
-                  {t("common.action.discard")}
-                </Button>
-                <Button color="teal" loading={isPending} onClick={onSave}>
-                  {t("common.action.saveChanges")}
-                </Button>
-              </Group>
-            </Group>
-          </Card>
-        )}
-      </Transition>
-    </div>
-  );
-};

apps/nextjs/src/app/[locale]/manage/users/groups/groups.module.css

@@ -1,7 +0,0 @@
-.everyoneGroup {
-  background-color: light-dark(var(--mantine-color-gray-1), var(--mantine-color-dark-6));
-}
-
-.everyoneGroup:hover {
-  background-color: light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-5));
-}

apps/nextjs/src/app/[locale]/manage/users/groups/page.tsx

@@ -1,19 +1,30 @@
 import Link from "next/link";
 import { notFound } from "next/navigation";
-import { Card, Group, Stack, Text, ThemeIcon, Title, UnstyledButton } from "@mantine/core";
-import { IconChevronRight, IconUsersGroup } from "@tabler/icons-react";
+import { Anchor, Group, Stack, Table, TableTbody, TableTd, TableTh, TableThead, TableTr, Title } from "@mantine/core";
 
+import type { RouterOutputs } from "@homarr/api";
 import { api } from "@homarr/api/server";
 import { auth } from "@homarr/auth/next";
-import { everyoneGroup } from "@homarr/definitions";
+import type { inferSearchParamsFromSchema } from "@homarr/common/types";
 import { getI18n } from "@homarr/translation/server";
+import { SearchInput, TablePagination, UserAvatarGroup } from "@homarr/ui";
+import { z } from "@homarr/validation";
 
 import { ManageContainer } from "~/components/manage/manage-container";
 import { DynamicBreadcrumb } from "~/components/navigation/dynamic-breadcrumb";
-import { GroupsList } from "./_client";
-import classes from "./groups.module.css";
+import { AddGroup } from "./_add-group";
 
-export default async function GroupsListPage() {
+const searchParamsSchema = z.object({
+  search: z.string().optional(),
+  pageSize: z.string().regex(/\d+/).transform(Number).catch(10),
+  page: z.string().regex(/\d+/).transform(Number).catch(1),
+});
+
+interface GroupsListPageProps {
+  searchParams: Promise<inferSearchParamsFromSchema<typeof searchParamsSchema>>;
+}
+
+export default async function GroupsListPage(props: GroupsListPageProps) {
   const session = await auth();
 
   if (!session?.user.permissions.includes("admin")) {
@@ -21,38 +32,55 @@ export default async function GroupsListPage() {
   }
 
   const t = await getI18n();
-  const groups = await api.group.getAll();
-  const dbEveryoneGroup = groups.find((group) => group.name === everyoneGroup);
-  const groupsWithoutEveryone = groups.filter((group) => group.name !== everyoneGroup);
+  const searchParams = searchParamsSchema.parse(await props.searchParams);
+  const { items: groups, totalCount } = await api.group.getPaginated(searchParams);
 
   return (
     <ManageContainer size="xl">
       <DynamicBreadcrumb />
       <Stack>
         <Title>{t("group.title")}</Title>
+        <Group justify="space-between">
+          <SearchInput placeholder={`${t("group.search")}...`} defaultValue={searchParams.search} />
+          <AddGroup />
+        </Group>
+        <Table striped highlightOnHover>
+          <TableThead>
+            <TableTr>
+              <TableTh>{t("group.field.name")}</TableTh>
+              <TableTh>{t("group.field.members")}</TableTh>
+            </TableTr>
+          </TableThead>
+          <TableTbody>
+            {groups.map((group) => (
+              <Row key={group.id} group={group} />
+            ))}
+          </TableTbody>
+        </Table>
 
-        {dbEveryoneGroup && (
-          <UnstyledButton component={Link} href={`/manage/users/groups/${dbEveryoneGroup.id}`}>
-            <Card className={classes.everyoneGroup}>
-              <Group align="center">
-                <ThemeIcon radius="xl" variant="light">
-                  <IconUsersGroup size={16} />
-                </ThemeIcon>
-
-                <Stack gap={0} flex={1}>
-                  <Text fw={500}>{t("group.defaultGroup.name")}</Text>
-                  <Text size="sm" c="gray.6">
-                    {t("group.defaultGroup.description", { name: everyoneGroup })}
-                  </Text>
-                </Stack>
-                <IconChevronRight size={20} />
-              </Group>
-            </Card>
-          </UnstyledButton>
-        )}
-
-        <GroupsList groups={groupsWithoutEveryone} />
+        <Group justify="end">
+          <TablePagination total={Math.ceil(totalCount / searchParams.pageSize)} />
+        </Group>
       </Stack>
     </ManageContainer>
   );
 }
+
+interface RowProps {
+  group: RouterOutputs["group"]["getPaginated"]["items"][number];
+}
+
+const Row = ({ group }: RowProps) => {
+  return (
+    <TableTr>
+      <TableTd>
+        <Anchor component={Link} href={`/manage/users/groups/${group.id}`}>
+          {group.name}
+        </Anchor>
+      </TableTd>
+      <TableTd>
+        <UserAvatarGroup users={group.members} size="sm" limit={5} />
+      </TableTd>
+    </TableTr>
+  );
+};

apps/nextjs/src/app/[locale]/widgets/[kind]/_content.tsx

@@ -9,7 +9,6 @@ import { ErrorBoundary } from "react-error-boundary";
 import type { IntegrationKind, WidgetKind } from "@homarr/definitions";
 import { useModalAction } from "@homarr/modals";
 import { showSuccessNotification } from "@homarr/notifications";
-import { useSettings } from "@homarr/settings";
 import { useScopedI18n } from "@homarr/translation/client";
 import type { BoardItemAdvancedOptions } from "@homarr/validation";
 import { loadWidgetDynamic, reduceWidgetOptionsWithDefaultValues, widgetImports } from "@homarr/widgets";
@@ -30,7 +29,6 @@ interface WidgetPreviewPageContentProps {
 }
 
 export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPreviewPageContentProps) => {
-  const settings = useSettings();
   const t = useScopedI18n("widgetPreview");
   const { openModal: openWidgetEditModal } = useModalAction(WidgetEditModal);
   const { openModal: openPreviewDimensionsModal } = useModalAction(PreviewDimensionsModal);
@@ -45,7 +43,7 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
     integrationIds: string[];
     advancedOptions: BoardItemAdvancedOptions;
   }>({
-    options: reduceWidgetOptionsWithDefaultValues(kind, settings, {}),
+    options: reduceWidgetOptionsWithDefaultValues(kind, {}),
     integrationIds: [],
     advancedOptions: {
       customCssClasses: [],
@@ -65,9 +63,8 @@ export const WidgetPreviewPageContent = ({ kind, integrationData }: WidgetPrevie
           (currentDefinition.supportedIntegrations as string[]).some((kind) => kind === integration.kind),
       ),
       integrationSupport: "supportedIntegrations" in currentDefinition,
-      settings,
     });
-  }, [currentDefinition, integrationData, kind, openWidgetEditModal, settings, state]);
+  }, [currentDefinition, integrationData, kind, openWidgetEditModal, state]);
 
   const Comp = loadWidgetDynamic(kind);
 

apps/nextjs/src/app/[locale]/widgets/[kind]/page.tsx

@@ -1,11 +1,11 @@
 import { notFound } from "next/navigation";
 import { Center } from "@mantine/core";
 
-import { env } from "@homarr/common/env";
 import { db } from "@homarr/db";
 import type { WidgetKind } from "@homarr/definitions";
 import { widgetImports } from "@homarr/widgets";
 
+import { env } from "~/env";
 import { WidgetPreviewPageContent } from "./_content";
 
 interface Props {

apps/nextjs/src/app/api/trpc/[trpc]/route.ts

@@ -1,7 +1,6 @@
 import { fetchRequestHandler } from "@trpc/server/adapters/fetch";
 
 import { appRouter, createTRPCContext } from "@homarr/api";
-import { trpcPath } from "@homarr/api/shared";
 import { auth } from "@homarr/auth/next";
 import { logger } from "@homarr/log";
 
@@ -26,14 +25,12 @@ export function OPTIONS() {
 
 const handler = auth(async (req) => {
   const response = await fetchRequestHandler({
-    endpoint: trpcPath,
+    endpoint: "/api/trpc",
     router: appRouter,
     req,
     createContext: () => createTRPCContext({ session: req.auth, headers: req.headers }),
     onError({ error, path, type }) {
-      logger.error(
-        `tRPC Error with ${type} on '${path}': (${error.code}) - ${error.message}\n${error.stack}\n${error.cause}`,
-      );
+      logger.error(`tRPC Error with ${type} on '${path}': (${error.code}) - ${error.message}`);
     },
   });
 

apps/nextjs/src/components/board/board-select.tsx

@@ -1,33 +0,0 @@
-import { Group, Text } from "@mantine/core";
-import { IconLayoutDashboard } from "@tabler/icons-react";
-
-import type { SelectWithCustomItemsProps } from "@homarr/ui";
-import { SelectWithCustomItems } from "@homarr/ui";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-
-interface BoardSelectProps extends Omit<SelectWithCustomItemsProps<{ value: string; label: string }>, "data"> {
-  boards: Pick<Board, "id" | "name" | "logoImageUrl">[];
-}
-
-export const BoardSelect = ({ boards, ...props }: BoardSelectProps) => {
-  return (
-    <SelectWithCustomItems
-      {...props}
-      data={boards.map((board) => ({
-        value: board.id,
-        label: board.name,
-        image: board.logoImageUrl,
-      }))}
-      SelectOption={({ label, image }: { value: string; label: string; image: string | null }) => (
-        <Group>
-          {/* eslint-disable-next-line @next/next/no-img-element */}
-          {image ? <img width={16} height={16} src={image} alt={label} /> : <IconLayoutDashboard size={16} />}
-          <Text fz="sm" fw={500}>
-            {label}
-          </Text>
-        </Group>
-      )}
-    />
-  );
-};

apps/nextjs/src/components/board/items/actions/create-item.ts

@@ -1,69 +0,0 @@
-import { getBoardLayouts } from "@homarr/boards/context";
-import type { Modify } from "@homarr/common/types";
-import { createId } from "@homarr/db/client";
-import type { WidgetKind } from "@homarr/definitions";
-
-import type { Board, EmptySection, Item, ItemLayout } from "~/app/[locale]/boards/_types";
-import { getFirstEmptyPosition } from "./empty-position";
-import { getSectionElements } from "./section-elements";
-
-export interface CreateItemInput {
-  kind: WidgetKind;
-}
-
-export const createItemCallback =
-  ({ kind }: CreateItemInput) =>
-  (previous: Board): Board => {
-    const firstSection = previous.sections
-      .filter((section): section is EmptySection => section.kind === "empty")
-      .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
-      .at(0);
-
-    if (!firstSection) return previous;
-
-    const widget = {
-      id: createId(),
-      kind,
-      options: {},
-      layouts: createItemLayouts(previous, firstSection),
-      integrationIds: [],
-      advancedOptions: {
-        customCssClasses: [],
-      },
-    } satisfies Modify<
-      Item,
-      {
-        kind: WidgetKind;
-      }
-    >;
-
-    return {
-      ...previous,
-      items: previous.items.concat(widget),
-    };
-  };
-
-const createItemLayouts = (board: Board, currentSection: EmptySection): ItemLayout[] => {
-  const layouts = getBoardLayouts(board);
-
-  return layouts.map((layoutId) => {
-    const boardLayout = board.layouts.find((layout) => layout.id === layoutId);
-    const elements = getSectionElements(board, { sectionId: currentSection.id, layoutId });
-
-    const emptyPosition = boardLayout
-      ? getFirstEmptyPosition(elements, boardLayout.columnCount)
-      : { xOffset: 0, yOffset: 0 };
-
-    if (!emptyPosition) {
-      throw new Error("Your board is full");
-    }
-
-    return {
-      width: 1,
-      height: 1,
-      ...emptyPosition,
-      sectionId: currentSection.id,
-      layoutId,
-    };
-  });
-};

apps/nextjs/src/components/board/items/actions/duplicate-item.ts

@@ -1,88 +0,0 @@
-import { createId } from "@homarr/db/client";
-
-import type { Board, EmptySection, ItemLayout, Section } from "~/app/[locale]/boards/_types";
-import { getFirstEmptyPosition } from "./empty-position";
-import { getSectionElements } from "./section-elements";
-
-export interface DuplicateItemInput {
-  itemId: string;
-}
-
-export const duplicateItemCallback =
-  ({ itemId }: DuplicateItemInput) =>
-  (previous: Board): Board => {
-    const itemToDuplicate = previous.items.find((item) => item.id === itemId);
-    if (!itemToDuplicate) return previous;
-
-    const clonedItem = structuredClone(itemToDuplicate);
-
-    return {
-      ...previous,
-      items: previous.items.concat({
-        ...clonedItem,
-        id: createId(),
-        layouts: clonedItem.layouts.map((layout) => ({
-          ...layout,
-          ...getNextPosition(previous, layout),
-        })),
-      }),
-    };
-  };
-
-const getNextPosition = (board: Board, layout: ItemLayout): { xOffset: number; yOffset: number; sectionId: string } => {
-  const currentSection = board.sections.find((section) => section.id === layout.sectionId);
-  if (currentSection) {
-    const emptySectionPosition = getEmptySectionPosition(board, layout, currentSection);
-    if (emptySectionPosition) {
-      return {
-        ...emptySectionPosition,
-        sectionId: currentSection.id,
-      };
-    }
-  }
-
-  const firstSection = board.sections
-    .filter((section): section is EmptySection => section.kind === "empty")
-    .sort((sectionA, sectionB) => sectionA.yOffset - sectionB.yOffset)
-    .at(0);
-
-  if (!firstSection) {
-    throw new Error("Your board is full. reason='no first section'");
-  }
-
-  const emptySectionPosition = getEmptySectionPosition(board, layout, firstSection);
-
-  if (!emptySectionPosition) {
-    throw new Error("Your board is full. reason='no empty positions'");
-  }
-
-  return {
-    ...emptySectionPosition,
-    sectionId: firstSection.id,
-  };
-};
-
-const getEmptySectionPosition = (
-  board: Board,
-  layout: ItemLayout,
-  section: Section,
-): { xOffset: number; yOffset: number } | undefined => {
-  const boardLayout = board.layouts.find((boardLayout) => boardLayout.id === layout.layoutId);
-  if (!boardLayout) return;
-
-  const sectionElements = getSectionElements(board, { sectionId: layout.sectionId, layoutId: layout.layoutId });
-  if (section.kind !== "dynamic") {
-    return getFirstEmptyPosition(sectionElements, boardLayout.columnCount, undefined, {
-      width: layout.width,
-      height: layout.height,
-    });
-  }
-
-  const sectionLayout = section.layouts.find((sectionLayout) => sectionLayout.layoutId === layout.layoutId);
-  if (!sectionLayout) return;
-
-  return getFirstEmptyPosition(sectionElements, sectionLayout.width, sectionLayout.height, {
-    width: layout.width,
-    height: layout.height,
-  });
-};

apps/nextjs/src/components/board/items/actions/empty-position.ts

@@ -1,25 +0,0 @@
-import type { SectionItem } from "~/app/[locale]/boards/_types";
-
-export const getFirstEmptyPosition = (
-  elements: Pick<SectionItem, "yOffset" | "xOffset" | "width" | "height">[],
-  columnCount: number,
-  rowCount = 9999,
-  size: { width: number; height: number } = { width: 1, height: 1 },
-) => {
-  for (let yOffset = 0; yOffset < rowCount + 1 - size.height; yOffset++) {
-    for (let xOffset = 0; xOffset < columnCount; xOffset++) {
-      const isOccupied = elements.some(
-        (element) =>
-          element.yOffset < yOffset + size.height &&
-          element.yOffset + element.height > yOffset &&
-          element.xOffset < xOffset + size.width &&
-          element.xOffset + element.width > xOffset,
-      );
-
-      if (!isOccupied) {
-        return { xOffset, yOffset };
-      }
-    }
-  }
-  return undefined;
-};

apps/nextjs/src/components/board/items/actions/move-and-resize-item.ts

@@ -1,36 +0,0 @@
-import { getCurrentLayout } from "@homarr/boards/context";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-
-export interface MoveAndResizeItemInput {
-  itemId: string;
-  xOffset: number;
-  yOffset: number;
-  width: number;
-  height: number;
-}
-
-export const moveAndResizeItemCallback =
-  ({ itemId, ...layoutInput }: MoveAndResizeItemInput) =>
-  (previous: Board): Board => {
-    const currentLayout = getCurrentLayout(previous);
-
-    return {
-      ...previous,
-      items: previous.items.map((item) =>
-        item.id !== itemId
-          ? item
-          : {
-              ...item,
-              layouts: item.layouts.map((layout) =>
-                layout.layoutId !== currentLayout
-                  ? layout
-                  : {
-                      ...layout,
-                      ...layoutInput,
-                    },
-              ),
-            },
-      ),
-    };
-  };

apps/nextjs/src/components/board/items/actions/move-item-to-section.ts

@@ -1,37 +0,0 @@
-import { getCurrentLayout } from "@homarr/boards/context";
-
-import type { Board } from "~/app/[locale]/boards/_types";
-
-export interface MoveItemToSectionInput {
-  itemId: string;
-  sectionId: string;
-  xOffset: number;
-  yOffset: number;
-  width: number;
-  height: number;
-}
-
-export const moveItemToSectionCallback =
-  ({ itemId, ...layoutInput }: MoveItemToSectionInput) =>
-  (board: Board): Board => {
-    const currentLayout = getCurrentLayout(board);
-
-    return {
-      ...board,
-      items: board.items.map((item) =>
-        item.id !== itemId
-          ? item
-          : {
-              ...item,
-              layouts: item.layouts.map((layout) =>
-                layout.layoutId !== currentLayout
-                  ? layout
-                  : {
-                      ...layout,
-                      ...layoutInput,
-                    },
-              ),
-            },
-      ),
-    };
-  };

apps/nextjs/src/components/board/items/actions/remove-item.ts

@@ -1,12 +0,0 @@
-import type { Board } from "~/app/[locale]/boards/_types";
-
-export interface RemoveItemInput {
-  itemId: string;
-}
-
-export const removeItemCallback =
-  ({ itemId }: RemoveItemInput) =>
-  (board: Board): Board => ({
-    ...board,
-    items: board.items.filter((item) => item.id !== itemId),
-  });

apps/nextjs/src/components/board/items/actions/section-elements.ts

@@ -1,18 +0,0 @@
-import type { Board } from "~/app/[locale]/boards/_types";
-
-export const getSectionElements = (board: Board, { sectionId, layoutId }: { sectionId: string; layoutId: string }) => {
-  const dynamicSectionsOfFirstSection = board.sections
-    .filter((section) => section.kind === "dynamic")
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    .map(({ layouts, ...section }) => ({ ...section, ...layouts.find((layout) => layout.layoutId === layoutId)! }))
-    .filter((section) => section.parentSectionId === sectionId);
-  const items = board.items
-    .map(({ layouts, ...item }) => ({
-      ...item,
-      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-      ...layouts.find((layout) => layout.layoutId === layoutId)!,
-    }))
-    .filter((item) => item.sectionId === sectionId);
-
-  return [...items, ...dynamicSectionsOfFirstSection];
-};

apps/nextjs/src/components/board/items/actions/test/create-item.spec.ts

@@ -1,109 +0,0 @@
-import { describe, expect, test, vi } from "vitest";
-
-import * as boardContext from "@homarr/boards/context";
-
-import { createItemCallback } from "../create-item";
-import * as emptyPositionModule from "../empty-position";
-import { BoardMockBuilder } from "./mocks/board-mock";
-import { DynamicSectionMockBuilder } from "./mocks/dynamic-section-mock";
-import { ItemMockBuilder } from "./mocks/item-mock";
-import { LayoutMockBuilder } from "./mocks/layout-mock";
-
-describe("item actions create-item", () => {
-  test("should add it to first section", () => {
-    // Arrange
-    const itemKind = "clock";
-    const emptyPosition = { xOffset: 5, yOffset: 5 };
-    const firstSectionId = "2";
-    const layoutId = "1";
-
-    const layout = new LayoutMockBuilder({ id: layoutId, columnCount: 4 }).build();
-    const board = new BoardMockBuilder()
-      .addLayout(layout)
-      .addLayout()
-      .addEmptySection({ id: "1", yOffset: 2 })
-      .addEmptySection({ id: firstSectionId, yOffset: 0 })
-      .addEmptySection({ id: "3", yOffset: 1 })
-      .build();
-
-    const emptyPositionSpy = vi.spyOn(emptyPositionModule, "getFirstEmptyPosition");
-    emptyPositionSpy.mockReturnValue(emptyPosition);
-    const layoutsSpy = vi.spyOn(boardContext, "getBoardLayouts");
-    layoutsSpy.mockReturnValue([layoutId]);
-
-    // Act
-    const result = createItemCallback({
-      kind: itemKind,
-    })(board);
-
-    // Assert
-    const item = result.items.at(0);
-    expect(item).toEqual(
-      expect.objectContaining({
-        kind: itemKind,
-        layouts: [
-          {
-            layoutId,
-            height: 1,
-            width: 1,
-            ...emptyPosition,
-            sectionId: firstSectionId,
-          },
-        ],
-      }),
-    );
-    expect(emptyPositionSpy).toHaveBeenCalledWith([], layout.columnCount);
-  });
-  test("should correctly pass dynamic section and items to getFirstEmptyPosition", () => {
-    // Arrange
-    const itemKind = "clock";
-    const emptyPosition = { xOffset: 5, yOffset: 5 };
-    const firstSectionId = "2";
-    const layoutId = "1";
-    const itemAndSectionPosition = { height: 2, width: 3, yOffset: 2, xOffset: 1 };
-
-    const layout = new LayoutMockBuilder({ id: layoutId, columnCount: 4 }).build();
-    const dynamicSectionInFirstSection = new DynamicSectionMockBuilder({ id: "4" })
-      .addLayout({ ...itemAndSectionPosition, layoutId, parentSectionId: firstSectionId })
-      .build();
-    const itemInFirstSection = new ItemMockBuilder({ id: "12" })
-      .addLayout({ ...itemAndSectionPosition, layoutId, sectionId: firstSectionId })
-      .build();
-    const otherDynamicSection = new DynamicSectionMockBuilder({ id: "5" }).addLayout({ layoutId }).build();
-    const otherItem = new ItemMockBuilder({ id: "13" }).addLayout({ layoutId }).build();
-    const board = new BoardMockBuilder()
-      .addLayout(layout)
-      .addEmptySection({ id: "1", yOffset: 2 })
-      .addEmptySection({ id: firstSectionId, yOffset: 0 })
-      .addEmptySection({ id: "3", yOffset: 1 })
-      .addSection(dynamicSectionInFirstSection)
-      .addSection(otherDynamicSection)
-      .addItem(itemInFirstSection)
-      .addItem(otherItem)
-      .build();
-
-    const spy = vi.spyOn(emptyPositionModule, "getFirstEmptyPosition");
-    spy.mockReturnValue(emptyPosition);
-    const layoutsSpy = vi.spyOn(boardContext, "getBoardLayouts");
-    layoutsSpy.mockReturnValue([layoutId]);
-
-    // Act
-    const result = createItemCallback({
-      kind: itemKind,
-    })(board);
-
-    // Assert
-    expect(result.items.length).toBe(3);
-    const item = result.items.find((item) => item.id !== itemInFirstSection.id && item.id !== otherItem.id);
-    expect(item).toEqual(
-      expect.objectContaining({
-        kind: itemKind,
-        layouts: [{ ...emptyPosition, height: 1, width: 1, sectionId: firstSectionId, layoutId }],
-      }),
-    );
-    expect(spy).toHaveBeenCalledWith(
-      [expect.objectContaining(itemAndSectionPosition), expect.objectContaining(itemAndSectionPosition)],
-      layout.columnCount,
-    );
-  });
-});

apps/nextjs/src/components/board/items/actions/test/duplicate-item.spec.ts

@@ -1,64 +0,0 @@
-import { describe, expect, test, vi } from "vitest";
-
-import { duplicateItemCallback } from "../duplicate-item";
-import * as emptyPositionModule from "../empty-position";
-import { BoardMockBuilder } from "./mocks/board-mock";
-import { ItemMockBuilder } from "./mocks/item-mock";
-import { LayoutMockBuilder } from "./mocks/layout-mock";
-
-describe("item actions duplicate-item", () => {
-  test("should copy it in the same section", () => {
-    // Arrange
-    const itemKind = "minecraftServerStatus";
-    const emptyPosition = { xOffset: 5, yOffset: 5 };
-    const currentSectionId = "2";
-    const layoutId = "1";
-    const currentItemSize = { height: 2, width: 3 };
-
-    const layout = new LayoutMockBuilder({ id: layoutId, columnCount: 4 }).build();
-    const currentItem = new ItemMockBuilder({
-      kind: itemKind,
-      integrationIds: ["1"],
-      options: { address: "localhost" },
-      advancedOptions: { customCssClasses: ["test"] },
-    })
-      .addLayout({ layoutId, sectionId: currentSectionId, ...currentItemSize })
-      .build();
-    const otherItem = new ItemMockBuilder({ id: "2" }).addLayout({ layoutId }).build();
-
-    const board = new BoardMockBuilder()
-      .addLayout(layout)
-      .addItem(currentItem)
-      .addItem(otherItem)
-      .addEmptySection({ id: "1", yOffset: 2 })
-      .addEmptySection({ id: currentSectionId, yOffset: 0 })
-      .addEmptySection({ id: "3", yOffset: 1 })
-      .build();
-
-    const spy = vi.spyOn(emptyPositionModule, "getFirstEmptyPosition");
-    spy.mockReturnValue(emptyPosition);
-
-    // Act
-    const result = duplicateItemCallback({ itemId: currentItem.id })(board);
-
-    // Assert
-    expect(result.items.length).toBe(3);
-    const duplicatedItem = result.items.find((item) => item.id !== currentItem.id && item.id !== otherItem.id);
-
-    expect(duplicatedItem).toEqual(
-      expect.objectContaining({
-        kind: itemKind,
-        integrationIds: currentItem.integrationIds,
-        options: currentItem.options,
-        advancedOptions: currentItem.advancedOptions,
-        layouts: [
-          expect.objectContaining({
-            ...emptyPosition,
-            ...currentItemSize,
-            sectionId: currentSectionId,
-          }),
-        ],
-      }),
-    );
-  });
-});

apps/nextjs/src/components/board/items/actions/test/empty-position.spec.ts

@@ -1,138 +0,0 @@
-import { describe, expect, test } from "vitest";
-
-import type { Item } from "~/app/[locale]/boards/_types";
-import { getFirstEmptyPosition } from "../empty-position";
-
-describe("get first empty position", () => {
-  test.each([
-    [[[" ", " ", " ", " "]], [1, 1], 0, 0],
-    [[["a", " ", " ", " "]], [1, 1], 1, 0],
-    [[[" ", "a", " ", " "]], [1, 1], 0, 0],
-    [
-      [
-        ["a", "a", " ", " "],
-        ["a", "a", " ", " "],
-      ],
-      [1, 1],
-      2,
-      0,
-    ],
-    [[["a", "a", "a", "a"]], [1, 1], 0, 1],
-    [
-      [
-        ["a", "a", "a", "a"],
-        ["a", "a", "a", "a"],
-      ],
-      [1, 1],
-      0,
-      2,
-    ],
-    [
-      [
-        ["a", "a", " ", "b", "b"],
-        ["a", "a", " ", "b", "b"],
-      ],
-      [1, 2],
-      2,
-      0,
-    ],
-    [
-      [
-        ["a", "a", " ", " ", "b", "b"],
-        ["a", "a", " ", " ", "b", "b"],
-      ],
-      [2, 2],
-      2,
-      0,
-    ],
-    [
-      [
-        ["a", "a", " ", "d", "b", "b"],
-        ["a", "a", "c", "e", "b", "b"],
-      ],
-      [1, 1],
-      2,
-      0,
-    ],
-    [
-      [
-        ["a", "a", " ", " ", "b", "b"],
-        ["a", "a", " ", "e", "b", "b"],
-      ],
-      [2, 2],
-      0,
-      2,
-    ],
-  ])("should return the first empty position", (layout, size, expectedX, expectedY) => {
-    const elements = createElementsFromLayout(layout);
-
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const result = getFirstEmptyPosition(elements, layout[0]!.length, undefined, { width: size[0]!, height: size[1]! });
-
-    expect(result).toEqual({ xOffset: expectedX, yOffset: expectedY });
-  });
-
-  test.each([
-    [[[" ", " "]], [1, 1], 0, 0, 1],
-    [[["a", " "]], [1, 1], 1, 0, 1],
-    [[["a", "a"]], [1, 1], undefined, undefined, 1],
-    [[["a", "a"]], [1, 1], 0, 1, 2],
-    [
-      [
-        ["a", "b", " ", " "],
-        ["a", "c", " ", "d"],
-      ],
-      [2, 2],
-      undefined,
-      undefined,
-      3,
-    ],
-    [
-      [
-        ["a", "b", " ", " "],
-        ["a", "c", " ", "d"],
-      ],
-      [2, 2],
-      0,
-      2,
-      4,
-    ],
-    [[["a", "b"]], [2, 1], 0, 1, 2],
-  ])("should return the first empty position with limited rows", (layout, size, expectedX, expectedY, rowCount) => {
-    const elements = createElementsFromLayout(layout);
-
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const result = getFirstEmptyPosition(elements, layout[0]!.length, rowCount, { width: size[0]!, height: size[1]! });
-
-    expect(result).toEqual(expectedX !== undefined ? { xOffset: expectedX, yOffset: expectedY } : undefined);
-  });
-});
-
-const createElementsFromLayout = (layout: string[][]) => {
-  const elements: (Pick<Item["layouts"][number], "xOffset" | "yOffset" | "width" | "height"> & { char: string })[] = [];
-  for (let yOffset = 0; yOffset < layout.length; yOffset++) {
-    const row = layout[yOffset];
-    if (!row) continue;
-    for (let xOffset = 0; xOffset < row.length; xOffset++) {
-      const item = row[xOffset];
-      if (item === " " || !item) continue;
-
-      const existing = elements.find((element) => element.char === item);
-      if (existing) {
-        existing.height = yOffset - existing.yOffset + 1;
-        existing.width = xOffset - existing.xOffset + 1;
-        continue;
-      }
-
-      elements.push({
-        yOffset,
-        xOffset,
-        width: 1,
-        height: 1,
-        char: item,
-      });
-    }
-  }
-
-  return elements;
-};

apps/nextjs/src/components/board/items/actions/test/mocks/board-mock.ts

@@ -1,90 +0,0 @@
-import { createId } from "@homarr/db";
-
-import type { Board, DynamicSection, EmptySection, Item, Section } from "~/app/[locale]/boards/_types";
-import { DynamicSectionMockBuilder } from "./dynamic-section-mock";
-import { EmptySectionMockBuilder } from "./empty-section-mock";
-import { ItemMockBuilder } from "./item-mock";
-import { LayoutMockBuilder } from "./layout-mock";
-
-export class BoardMockBuilder {
-  private readonly board: Board;
-
-  constructor(board?: Partial<Omit<Board, "groupPermissions" | "userPermissions" | "sections" | "items" | "layouts">>) {
-    this.board = {
-      id: createId(),
-      backgroundImageRepeat: "no-repeat",
-      backgroundImageAttachment: "scroll",
-      backgroundImageSize: "cover",
-      backgroundImageUrl: null,
-      primaryColor: "#ffffff",
-      secondaryColor: "#000000",
-      iconColor: null,
-      itemRadius: "lg",
-      pageTitle: "Board",
-      metaTitle: "Board",
-      logoImageUrl: null,
-      faviconImageUrl: null,
-      name: "board",
-      opacity: 100,
-      isPublic: true,
-      disableStatus: false,
-      customCss: "",
-      creatorId: createId(),
-      creator: {
-        id: createId(),
-        image: null,
-        name: "User",
-      },
-      groupPermissions: [],
-      userPermissions: [],
-      sections: [],
-      items: [],
-      layouts: [
-        {
-          id: createId(),
-          name: "Base",
-          columnCount: 12,
-          breakpoint: 0,
-        },
-      ],
-      ...board,
-    };
-  }
-
-  public addEmptySection(emptySection?: Partial<EmptySection>): BoardMockBuilder {
-    return this.addSection(new EmptySectionMockBuilder(emptySection).build());
-  }
-
-  public addDynamicSection(dynamicSection?: Partial<DynamicSection>): BoardMockBuilder {
-    return this.addSection(new DynamicSectionMockBuilder(dynamicSection).build());
-  }
-
-  public addSection(section: Section): BoardMockBuilder {
-    this.board.sections.push(section);
-    return this;
-  }
-
-  public addSections(sections: Section[]): BoardMockBuilder {
-    this.board.sections.push(...sections);
-    return this;
-  }
-
-  public addItem(item?: Partial<Item>): BoardMockBuilder {
-    this.board.items.push(new ItemMockBuilder(item).build());
-    return this;
-  }
-
-  public addItems(items: Item[]): BoardMockBuilder {
-    this.board.items.push(...items);
-    return this;
-  }
-
-  public addLayout(layout?: Partial<Board["layouts"][number]>): BoardMockBuilder {
-    this.board.layouts.push(new LayoutMockBuilder(layout).build());
-    return this;
-  }
-
-  public build(): Board {
-    return this.board;
-  }
-}

apps/nextjs/src/components/board/items/actions/test/mocks/category-section-mock.ts

@@ -1,23 +0,0 @@
-import { createId } from "@homarr/db";
-
-import type { CategorySection } from "~/app/[locale]/boards/_types";
-
-export class CategorySectionMockBuilder {
-  private readonly section: CategorySection;
-
-  constructor(section?: Partial<CategorySection>) {
-    this.section = {
-      id: createId(),
-      kind: "category",
-      xOffset: 0,
-      yOffset: 0,
-      name: "Category",
-      collapsed: false,
-      ...section,
-    } satisfies CategorySection;
-  }
-
-  public build(): CategorySection {
-    return this.section;
-  }
-}

apps/nextjs/src/components/board/items/actions/test/mocks/dynamic-section-mock.ts

@@ -1,36 +0,0 @@
-import { createId } from "@homarr/db";
-
-import type { DynamicSection } from "~/app/[locale]/boards/_types";
-
-export class DynamicSectionMockBuilder {
-  private readonly section: DynamicSection;
-
-  constructor(section?: Partial<DynamicSection>) {
-    this.section = {
-      id: createId(),
-      kind: "dynamic",
-      options: {
-        borderColor: "",
-      },
-      layouts: [],
-      ...section,
-    } satisfies DynamicSection;
-  }
-
-  public addLayout(layout?: Partial<DynamicSection["layouts"][0]>): DynamicSectionMockBuilder {
-    this.section.layouts.push({
-      layoutId: "1",
-      height: 1,
-      width: 1,
-      xOffset: 0,
-      yOffset: 0,
-      parentSectionId: "0",
-      ...layout,
-    } satisfies DynamicSection["layouts"][0]);
-    return this;
-  }
-
-  public build(): DynamicSection {
-    return this.section;
-  }
-}

apps/nextjs/src/components/board/items/actions/test/mocks/empty-section-mock.ts

@@ -1,21 +0,0 @@
-import { createId } from "@homarr/db";
-
-import type { EmptySection } from "~/app/[locale]/boards/_types";
-
-export class EmptySectionMockBuilder {
-  private readonly section: EmptySection;
-
-  constructor(section?: Partial<EmptySection>) {
-    this.section = {
-      id: createId(),
-      kind: "empty",
-      xOffset: 0,
-      yOffset: 0,
-      ...section,
-    } satisfies EmptySection;
-  }
-
-  public build(): EmptySection {
-    return this.section;
-  }
-}

apps/nextjs/src/components/board/items/actions/test/mocks/item-mock.ts

@@ -1,38 +0,0 @@
-import { createId } from "@homarr/db";
-
-import type { Item } from "~/app/[locale]/boards/_types";
-
-export class ItemMockBuilder {
-  private readonly item: Item;
-
-  constructor(item?: Partial<Item>) {
-    this.item = {
-      id: createId(),
-      kind: "app",
-      options: {},
-      layouts: [],
-      integrationIds: [],
-      advancedOptions: {
-        customCssClasses: [],
-      },
-      ...item,
-    } satisfies Item;
-  }
-
-  public addLayout(layout?: Partial<Item["layouts"][0]>): ItemMockBuilder {
-    this.item.layouts.push({
-      layoutId: "1",
-      height: 1,
-      width: 1,
-      xOffset: 0,
-      yOffset: 0,
-      sectionId: "0",
-      ...layout,
-    } satisfies Item["layouts"][0]);
-    return this;
-  }
-
-  public build(): Item {
-    return this.item;
-  }
-}