fix: build pull request image only if source is in mealie repo

2026-01-19 19:59:40 -05:00 · 2025-04-08 18:44:31 +02:00
857 changed files with 67533 additions and 731225 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -8,14 +8,28 @@ FROM mcr.microsoft.com/devcontainers/python:${VARIANT}
 ARG NODE_VERSION="none"
 RUN if [ "${NODE_VERSION}" != "none" ]; then su vscode -c "umask 0002 && . /usr/local/share/nvm/nvm.sh && nvm install ${NODE_VERSION} 2>&1"; fi

+# install poetry - respects $POETRY_VERSION & $POETRY_HOME
+
 RUN echo "export PROMPT_COMMAND='history -a'" >> /home/vscode/.bashrc \
    && echo "export HISTFILE=~/commandhistory/.bash_history" >> /home/vscode/.bashrc \
    && chown vscode:vscode -R /home/vscode/

 RUN npm install -g @go-task/cli
-RUN npm install -g json-schema-to-typescript

-# Install additional OS packages
+ENV PYTHONUNBUFFERED=1 \
+    PYTHONDONTWRITEBYTECODE=1 \
+    PIP_NO_CACHE_DIR=off \
+    PIP_DISABLE_PIP_VERSION_CHECK=on \
+    PIP_DEFAULT_TIMEOUT=100 \
+    POETRY_HOME="/opt/poetry" \
+    POETRY_VIRTUALENVS_IN_PROJECT=true
+
+# prepend poetry and venv to path
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+RUN curl -sSL https://install.python-poetry.org | python3 -
+# RUN poetry config virtualenvs.create false
+
 RUN apt-get update \
    && apt-get install --no-install-recommends -y \
    curl \
@@ -25,9 +39,5 @@ RUN apt-get update \
    libsasl2-dev libldap2-dev libssl-dev \
    gnupg gnupg2 gnupg1

-# Install uv
-RUN pip install uv
-ENV UV_LINK_MODE=copy
-
-# Create directory for Docker Secrets
+# create directory used for Docker Secrets
 RUN mkdir -p /run/secrets
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -11,7 +11,7 @@
      // Use -bullseye variants on local on arm64/Apple Silicon.
      "VARIANT": "3.12-bullseye",
      // Options
-      "NODE_VERSION": "22"
+      "NODE_VERSION": "16"
    }
  },
  "mounts": [
@@ -23,6 +23,7 @@
      "settings": {
        "python.defaultInterpreterPath": "/usr/local/bin/python",
        "python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
+        "python.formatting.blackPath": "/usr/local/py-utils/bin/black",
        "python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
        "mypy.runUsingActiveInterpreter": true
      },
@@ -30,10 +31,10 @@
        "charliermarsh.ruff",
        "dbaeumer.vscode-eslint",
        "matangover.mypy",
+        "ms-python.black-formatter",
        "ms-python.pylint",
        "ms-python.python",
        "ms-python.vscode-pylance",
-        "streetsidesoftware.code-spell-checker-cspell-bundled-dictionaries",
        "Vue.volar"
      ]
    }
@@ -41,23 +42,18 @@
  // Use 'forwardPorts' to make a list of ports inside the container available locally.
  "forwardPorts": [
    3000,
-    8000, // used by mkdocs
    9000,
    9091, // used by docker production
    24678 // used by nuxt when hot-reloading using polling
  ],
  // Use 'onCreateCommand' to run commands at the end of container creation.
  // Use 'postCreateCommand' to run commands after the container is created.
-  "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules /home/vscode/commandhistory && task setup --force",
+  "onCreateCommand": "sudo chown -R vscode:vscode /workspaces/mealie/frontend/node_modules /home/vscode/commandhistory && task setup",
  // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
  "remoteUser": "vscode",
  "features": {
    "ghcr.io/devcontainers/features/docker-in-docker:2": {
      "dockerDashComposeVersion": "v2"
    }
-  },
-  "appPort": [
-    "3000:3000",
-    "9000:9000"
-  ]
+  }
 }
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,240 +0,0 @@
-# Mealie Development Guide for AI Agents
-
-## Project Overview
-
-Mealie is a self-hosted recipe manager, meal planner, and shopping list application with a FastAPI backend (Python 3.12) and Nuxt 3 frontend (Vue 3 + TypeScript). It uses SQLAlchemy ORM with support for SQLite and PostgreSQL databases.
-
-**Development vs Production:**
- **Development:** Frontend (port 3000) and backend (port 9000) run as separate processes
- **Production:** Frontend is statically generated and served via FastAPI's SPA module (`mealie/routes/spa/`) in a single container
-
-## Architecture & Key Patterns
-
-### Backend Architecture (mealie/)
-
-**Repository-Service-Controller Pattern:**
- **Controllers** (`mealie/routes/**/controller_*.py`): Inherit from `BaseUserController` or `BaseAdminController`, handle HTTP concerns, delegate to services
- **Services** (`mealie/services/`): Business logic layer, inherit from `BaseService`, coordinate repos and external dependencies
- **Repositories** (`mealie/repos/`): Data access layer using SQLAlchemy, accessed via `AllRepositories` factory
-  - Get repos via dependency injection: `repos: AllRepositories = Depends(get_repositories)`
-  - All repos scoped to group/household context automatically
-
-**Route Organization:**
- Routes in `mealie/routes/` organized by domain (auth, recipe, groups, households, admin)
- Use `APIRouter` with FastAPI dependency injection
- Apply `@router.get/post/put/delete` decorators with Pydantic response models
- Route controllers use `HttpRepo` mixin for common CRUD operations (see `mealie/routes/_base/mixins.py`)
-
-**Schemas & Type Generation:**
- Pydantic schemas in `mealie/schema/` with strict separation: `*In`, `*Out`, `*Create`, `*Update` suffixes
- Auto-exported from submodules via `__init__.py` files (generated by `task dev:generate`)
- TypeScript types auto-generated from Pydantic schemas - **never manually edit** `frontend/lib/api/types/`
-
-**Database & Sessions:**
- Session management via `Depends(generate_session)` in FastAPI routes
- Use `session_context()` context manager in services/scripts
- SQLAlchemy models in `mealie/db/models/`, migrations in `mealie/alembic/`
- Create migrations: `task py:migrate -- "description"`
-
-### Frontend Architecture (frontend/)
-
-**Component Organization (strict naming conventions):**
- **Domain Components** (`components/Domain/`): Feature-specific, prefix with domain (e.g., `AdminDashboard`)
- **Global Components** (`components/global/`): Reusable primitives, prefix with `Base` (e.g., `BaseButton`)
- **Layout Components** (`components/Layout/`): Layout-only, prefix with `App` if props or `The` if singleton
- **Page Components** (`components/` with page prefix): Last resort for breaking up complex pages
-
-**API Client Pattern:**
- API clients in `frontend/lib/api/` extend `BaseAPI`, `BaseCRUDAPI`, or `BaseCRUDAPIReadOnly`
- Types imported from auto-generated `frontend/lib/api/types/` (DO NOT EDIT MANUALLY)
- Composables in `frontend/composables/` for shared state and API logic (e.g., `use-mealie-auth.ts`)
- Use `useAuthBackend()` for authentication state, `useMealieAuth()` for user management
-
-**State Management:**
- Nuxt 3 composables for state (no Vuex)
- Auth state via `use-mealie-auth.ts` composable
- Prefer composables over global state stores
-
-## Essential Commands (via Task/Taskfile.yml)
-
-**Development workflow:**
-```bash
-task setup              # Install all dependencies (Python + Node)
-task dev:services       # Start Postgres & Mailpit containers
-task py                 # Start FastAPI backend (port 9000)
-task ui                 # Start Nuxt frontend (port 3000)
-task docs               # Start MkDocs documentation server
-```
-
-**Code generation (REQUIRED after schema changes):**
-```bash
-task dev:generate       # Generate TypeScript types, schema exports, test helpers
-```
-
-**Testing & Quality:**
-```bash
-task py:test            # Run pytest (supports args: task py:test -- -k test_name)
-task py:check           # Format + lint + type-check + test (full validation)
-task py:format          # Ruff format
-task py:lint            # Ruff check
-task py:mypy            # Type checking
-task ui:test            # Vitest frontend tests
-task ui:check           # Frontend lint + test
-```
-
-**Database:**
-```bash
-task py:migrate -- "description"  # Generate Alembic migration
-task py:postgres        # Run backend with PostgreSQL config
-```
-
-**Docker:**
-```bash
-task docker:prod        # Build and run production Docker compose
-```
-
-## Critical Development Practices
-
-### Python Backend
-
-1. **Always use `uv` for Python commands** (not `python` or `pip`):
-   ```bash
-   uv run python mealie/app.py
-   uv run pytest tests/
-   ```
-
-2. **Type hints are mandatory:** Use mypy-compatible annotations, handle Optional types explicitly
-
-3. **Dependency injection pattern:**
-   ```python
-   from fastapi import Depends
-   from mealie.repos.all_repositories import get_repositories, AllRepositories
-
-   def my_route(
-       repos: AllRepositories = Depends(get_repositories),
-       user: PrivateUser = Depends(get_current_user)
-   ):
-       recipe = repos.recipes.get_one(recipe_id)
-   ```
-
-4. **Settings & Configuration:**
-   - Get settings: `settings = get_app_settings()` (cached singleton)
-   - Get directories: `dirs = get_app_dirs()`
-   - Never instantiate `AppSettings()` directly
-
-5. **Testing:**
-   - Fixtures in `tests/fixtures/`
-   - Use `api_client` fixture for integration tests
-   - Follow existing patterns in `tests/integration_tests/` and `tests/unit_tests/`
-
-### Frontend
-
-1. **Run code generation after backend schema changes:** `task dev:generate`
-
-2. **TypeScript strict mode:** All code must pass type checking
-
-3. **Component naming:** Follow strict conventions (see Architecture section above)
-
-4. **API calls pattern:**
-   ```typescript
-   const api = useUserApi();
-   const recipe = await api.recipes.getOne(recipeId);
-   ```
-
-5. **Composables for shared logic:** Prefer composables in `composables/` over inline code duplication
-
-6. **Translations:** Only modify `en-US` locale files when adding new translation strings - other locales are managed via Crowdin and **must never be modified** (PRs modifying non-English locales will be rejected)
-
-### Cross-Cutting Concerns
-
-1. **Code generation is source of truth:** After Pydantic schema changes, run `task dev:generate` to update:
-   - TypeScript types (`frontend/lib/api/types/`)
-   - Schema exports (`mealie/schema/*/__init__.py`)
-   - Test data paths and routes
-
-2. **Multi-tenancy:** All data scoped to **groups** and **households**:
-   - Groups contain multiple households
-   - Households contain recipes, meal plans, shopping lists
-   - Repositories automatically filter by group/household context
-
-3. **Pre-commit hooks:** Install via `task setup:py`, enforces Ruff formatting/linting
-
-4. **Testing before PRs:** Run `task py:check` and `task ui:check` before submitting PRs
-
-## Pull Request Best Practices
-
-### Before Submitting a PR
-
-1. **Draft PRs are optional:** Create a draft PR early if you want feedback while working, or open directly as ready when complete
-2. **Verify code generation:** If you modified Pydantic schemas, ensure `task dev:generate` was run
-3. **Follow Conventional Commits:** Title your PR according to the conventional commits format (see PR template)
-4. **Add release notes:** Include user-facing changes in the PR description
-
-### What to Review
-
-**Architecture & Patterns:**
- Does the code follow the repository-service-controller pattern?
- Are controllers delegating business logic to services?
- Are services coordinating repositories, not accessing the database directly?
- Is dependency injection used properly (`Depends(get_repositories)`, `Depends(get_current_user)`)?
-
-**Data Scoping:**
- Are repositories correctly scoped to group/household context?
- Do route handlers properly validate group/household ownership before operations?
- Are multi-tenant boundaries enforced (users can't access other groups' data)?
-
-**Type Safety:**
- Are type hints present on all functions and methods?
- Are Pydantic schemas using correct suffixes (`*In`, `*Out`, `*Create`, `*Update`)?
- For frontend, does TypeScript code pass strict type checking?
-
-**Generated Files:**
- Verify `frontend/lib/api/types/` files weren't manually edited (they're auto-generated)
- Check that `mealie/schema/*/__init__.py` exports match actual schema files (auto-generated)
- If schemas changed, confirm generated files were updated via `task dev:generate`
-
-**Code Quality:**
- Is the code readable and well-organized?
- Are complex operations documented with clear comments?
- Do component names follow the strict naming conventions (Domain/Global/Layout/Page prefixes)?
- Are composables used for shared frontend logic instead of duplication?
-
-**Translations:**
- Were only `en-US` locale files modified for new translation strings?
- Verify no other locale files (managed by Crowdin) were touched
-
-**Database Changes:**
- Are Alembic migrations included for schema changes?
- Are migrations tested against both SQLite and PostgreSQL?
-
-### Review Etiquette
-
- Be constructive and specific in feedback
- Suggest code examples when proposing changes
- Focus on architecture and logic - formatting/linting is handled by CI
- Use "Approve" when ready to merge, "Request Changes" for blocking issues, "Comment" for non-blocking suggestions
-
-## Common Gotchas
-
- **Don't manually edit generated files:** `frontend/lib/api/types/`, schema `__init__.py` files
- **Repository context:** Repos are group/household-scoped - passing wrong IDs causes 404s
- **Session handling:** Don't create sessions manually, use dependency injection or `session_context()`
- **Schema changes require codegen:** After changing Pydantic models, run `task dev:generate`
- **Translation files:** Only modify `en-US` locale files - all other locales are managed by Crowdin
- **Dev containers:** This project uses VS Code dev containers - leverage the pre-configured environment
- **Task commands:** Use `task` commands instead of direct tool invocation for consistency
-
-## Key Files to Reference
-
- `Taskfile.yml` - All development commands and workflows
- `mealie/routes/_base/base_controllers.py` - Controller base classes and patterns
- `mealie/repos/repository_factory.py` - Repository factory and available repos
- `frontend/lib/api/base/base-clients.ts` - API client base classes
- `tests/conftest.py` - Test fixtures and setup
- `dev/code-generation/main.py` - Code generation entry point
-
-## Additional Resources
-
- [Documentation](https://docs.mealie.io/)
- [Contributors Guide](https://nightly.mealie.io/contributors/developers-guide/code-contributions/)
- [Discord](https://discord.gg/QuStdQGSGK)
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -19,7 +19,7 @@ jobs:
      - name: Setup node env 🏗
        uses: actions/setup-node@v4.0.0
        with:
-          node-version: 22
+          node-version: 16
          check-latest: true

      - name: Get yarn cache directory path 🛠
@@ -70,8 +70,13 @@ jobs:
        with:
          python-version: "3.12"

-      - name: Install uv
-        run: pip install uv
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          plugins: |
+            poetry-plugin-export

      - name: Retrieve built frontend
        uses: actions/download-artifact@v4
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -1,50 +0,0 @@
-name: Deploy Documentation
-
-on:
-  push:
-    branches: [mealie-next]
-    paths:
-      - 'docs/**'
-      - '.github/workflows/docs.yml'
-  workflow_dispatch:
-
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: pages
-  cancel-in-progress: false
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v4
-
-      - name: Install dependencies
-        run: uv sync --only-group docs --no-install-project
-
-      - name: Build docs
-        run: uv run --no-project mkdocs build -d site
-        working-directory: docs
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-        with:
-          path: docs/site
-
-  deploy:
-    needs: build
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -13,7 +13,7 @@ jobs:
    - uses: actions/checkout@v4
    - uses: actions/setup-node@v4
      with:
-        node-version: 22
+        node-version: 18
        cache: 'yarn'
        cache-dependency-path: ./tests/e2e/yarn.lock
    - name: Set up Docker Buildx
--- a/.github/workflows/locale-sync.yml
+++ b/.github/workflows/locale-sync.yml
@@ -1,112 +0,0 @@
-name: Automatic Locale Sync
-
-on:
-  schedule:
-    # Run every Sunday at 2 AM UTC
-    - cron: "0 2 * * 0"
-  workflow_dispatch:
-    # Allow manual triggering from the GitHub UI
-
-permissions:
-  contents: write # To checkout, commit, and push changes
-  pull-requests: write # To create pull requests
-
-jobs:
-  sync-locales:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Install uv
-        run: pip install uv
-
-      - name: Load cached venv
-        id: cached-python-dependencies
-        uses: actions/cache@v4
-        with:
-          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/uv.lock') }}
-
-      - name: Check venv cache
-        id: cache-validate
-        if: steps.cached-python-dependencies.outputs.cache-hit == 'true'
-        run: |
-          echo "import fastapi;print('venv good?')" > test.py && uv run python test.py && echo "cache-hit-success=true" >> $GITHUB_OUTPUT
-          rm test.py
-        continue-on-error: true
-
-      - name: Install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
-          uv sync --group dev
-        if: steps.cached-python-dependencies.outputs.cache-hit != 'true'
-
-      - name: Run locale generation
-        run: |
-          cd dev/code-generation
-          uv run python main.py locales
-        env:
-          CROWDIN_API_KEY: ${{ secrets.CROWDIN_API_KEY }}
-
-      - name: Check for changes
-        id: changes
-        run: |
-          if git diff --quiet; then
-            echo "has_changes=false" >> $GITHUB_OUTPUT
-          else
-            echo "has_changes=true" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Commit and create PR
-        if: steps.changes.outputs.has_changes == 'true'
-        run: |
-          # Configure git
-          git config --local user.email "action@github.com"
-          git config --local user.name "GitHub Action"
-
-          # Use the current branch as the base
-          BASE_BRANCH="${{ github.ref_name }}"
-          echo "Using base branch: $BASE_BRANCH"
-
-          # Create a new branch from the base branch
-          BRANCH_NAME="auto-locale-sync-$(date +%Y%m%d-%H%M%S)"
-          git checkout -b "$BRANCH_NAME"
-
-          # Add and commit changes
-          git add .
-          git commit -m "chore: crowdin locale sync"
-
-          # Push the branch
-          git push origin "$BRANCH_NAME"
-
-          sleep 2
-
-          # Create PR using GitHub CLI with explicit repository
-          gh pr create \
-            --repo "${{ github.repository }}" \
-            --title "chore(l10n): Crowdin locale sync" \
-            --base "$BASE_BRANCH" \
-            --head "$BRANCH_NAME" \
-            --label "l10n" \
-            --body "## Summary
-
-          Automatically generated locale updates from the weekly sync job.
-
-          ## Changes
-          - Updated frontend locale files
-          - Generated from latest translation sources" \
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: No changes detected
-        if: steps.changes.outputs.has_changes == 'false'
-        run: echo "No locale changes detected, skipping PR creation"
--- a/.github/workflows/pull-request-lint.yml
+++ b/.github/workflows/pull-request-lint.yml
@@ -31,7 +31,6 @@ jobs:
            deps
            auto
            l10n
-            config
          # Configure that a scope must always be provided.
          requireScope: false
          # If the PR contains one of these newline-delimited labels, the
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -5,75 +5,19 @@ on:
    types: [published]

 jobs:
-  commit-version-bump:
-    name: Commit version bump to repository
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    outputs:
-      commit-sha: ${{ steps.commit.outputs.commit-sha }}
-    steps:
-      - name: Generate GitHub App Token
-        id: app-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.COMMIT_BOT_APP_ID }}
-          private-key: ${{ secrets.COMMIT_BOT_APP_PRIVATE_KEY }}
-
-      - name: Checkout 🛎
-        uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-
-      - name: Extract Version From Tag Name
-        run: echo "VERSION_NUM=$(echo ${{ github.event.release.tag_name }} | sed 's/^v//')" >> $GITHUB_ENV
-
-      - name: Configure Git
-        run: |
-          git config user.name "mealie-commit-bot[bot]"
-          git config user.email "mealie-commit-bot[bot]@users.noreply.github.com"
-
-      - name: Update all version strings
-        run: |
-          sed -i 's/^version = "[^"]*"/version = "${{ env.VERSION_NUM }}"/' pyproject.toml
-          sed -i '/^name = "mealie"$/,/^version = / s/^version = "[^"]*"/version = "${{ env.VERSION_NUM }}"/' uv.lock
-          sed -i 's/\("version": "\)[^"]*"/\1${{ env.VERSION_NUM }}"/' frontend/package.json
-          sed -i 's/:v[0-9]*\.[0-9]*\.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/installation-checklist.md
-          sed -i 's/:v[0-9]*\.[0-9]*\.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/sqlite.md
-          sed -i 's/:v[0-9]*\.[0-9]*\.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/postgres.md
-
-      - name: Commit and push changes
-        id: commit
-        run: |
-          git add pyproject.toml frontend/package.json uv.lock docs/
-          git commit -m "chore: bump version to ${{ github.event.release.tag_name }}"
-          git push origin HEAD:${{ github.event.repository.default_branch }}
-          echo "commit-sha=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Move release tag to new commit
-        run: |
-          git tag -f ${{ github.event.release.tag_name }}
-          git push -f origin ${{ github.event.release.tag_name }}
-
  backend-tests:
    name: "Backend Server Tests"
    uses: ./.github/workflows/test-backend.yml
-    needs:
-      - commit-version-bump

  frontend-tests:
    name: "Frontend Tests"
    uses: ./.github/workflows/test-frontend.yml
-    needs:
-      - commit-version-bump

  build-package:
    name: Build Package
    uses: ./.github/workflows/build-package.yml
-    needs:
-      - commit-version-bump
    with:
-      tag: ${{ github.event.release.tag_name }}
+      tag: release

  publish:
    permissions:
@@ -99,48 +43,10 @@ jobs:
      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}

-  rollback-on-failure:
-    name: Rollback version commit if deployment fails
-    needs:
-      - commit-version-bump
-      - publish
-    if: always() && needs.publish.result == 'failure'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-    steps:
-      - name: Generate GitHub App Token
-        id: app-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ secrets.COMMIT_BOT_APP_ID }}
-          private-key: ${{ secrets.COMMIT_BOT_APP_PRIVATE_KEY }}
-
-      - name: Checkout 🛎
-        uses: actions/checkout@v4
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-          fetch-depth: 0
-
-      - name: Configure Git
-        run: |
-          git config user.name "mealie-commit-bot[bot]"
-          git config user.email "mealie-commit-bot[bot]@users.noreply.github.com"
-
-      - name: Delete release tag
-        run: |
-          git push --delete origin ${{ github.event.release.tag_name }}
-
-      - name: Revert version bump commit
-        run: |
-          git revert --no-edit ${{ needs.commit-version-bump.outputs.commit-sha }}
-          git push origin HEAD:${{ github.event.repository.default_branch }}
-
  notify-discord:
    name: Notify Discord
    needs:
      - publish
-    if: success()
    runs-on: ubuntu-latest
    steps:
      - name: Discord notification
@@ -149,3 +55,41 @@ jobs:
        uses: Ilshidur/action-discord@0.3.2
        with:
          args: "🚀  Version {{ EVENT_PAYLOAD.release.tag_name }} of Mealie has been released. See the release notes https://github.com/mealie-recipes/mealie/releases/tag/{{ EVENT_PAYLOAD.release.tag_name }}"
+
+  update-image-tags:
+    name: Update image tag in sample docker-compose files
+    needs:
+      - publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout 🛎
+        uses: actions/checkout@v4
+
+      - name: Extract Version From Tag Name
+        run: echo "VERSION_NUM=$(echo ${{ github.event.release.tag_name }} | sed 's/^v//')" >> $GITHUB_ENV
+
+      - name: Modify version strings
+        run: |
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/installation-checklist.md
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/sqlite.md
+          sed -i 's/:v[0-9]*.[0-9]*.[0-9]*/:v${{ env.VERSION_NUM }}/' docs/docs/documentation/getting-started/installation/postgres.md
+          sed -i 's/^version = "[^"]*"/version = "${{ env.VERSION_NUM }}"/' pyproject.toml
+          sed -i 's/^\s*"version": "[^"]*"/"version": "${{ env.VERSION_NUM }}"/' frontend/package.json
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v6
+        # This doesn't currently work for us because it creates the PR but the workflows don't run.
+        # TODO: Provide a personal access token as a parameter here, that solves that problem.
+        # https://github.com/peter-evans/create-pull-request
+        with:
+          commit-message: "Update image tag, for release ${{ github.event.release.tag_name }}"
+          branch: "docs/newrelease-update-version-${{ github.event.release.tag_name }}"
+          labels: |
+            documentation
+          delete-branch: true
+          base: mealie-next
+          title: "docs(auto): Update image tag, for release ${{ github.event.release.tag_name }}"
+          body: "Auto-generated by `.github/workflows/release.yml`, on publish of release ${{ github.event.release.tag_name }}"
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -16,13 +16,12 @@ jobs:
        with:
          stale-issue-label: 'stale'
          exempt-issue-labels: 'pinned,security,early-stages,bug: confirmed,feedback,task'
-          stale-issue-message: 'This issue has been automatically marked as stale because it has been open 90 days with no activity.'
-          days-before-issue-stale: 90
-          # This stops an issue from ever getting closed automatically.
-          days-before-issue-close: -1
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          days-before-issue-stale: 30
+          days-before-issue-close: 5
          stale-pr-label: 'stale'
-          stale-pr-message: 'This PR has been automatically marked as stale because it has been open 90 days with no activity.'
-          days-before-pr-stale: 90
+          stale-pr-message: 'This PR is stale because it has been open 45 days with no activity.'
+          days-before-pr-stale: 45
          # This stops a PR from ever getting closed automatically.
          days-before-pr-close: -1
          # If an issue/PR has a milestone, it's exempt from being marked as stale.
--- a/.github/workflows/test-backend.yml
+++ b/.github/workflows/test-backend.yml
@@ -49,21 +49,24 @@ jobs:
        with:
          python-version: "3.12"

-      - name: Install uv
-        run: pip install uv
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true

      - name: Load cached venv
-        id: cached-python-dependencies
+        id: cached-poetry-dependencies
        uses: actions/cache@v4
        with:
          path: .venv
-          key: venv-${{ runner.os }}-${{ hashFiles('**/uv.lock') }}
+          key: venv-${{ runner.os }}-${{ hashFiles('**/poetry.lock') }}

      - name: Check venv cache
        id: cache-validate
-        if: steps.cached-python-dependencies.outputs.cache-hit == 'true'
+        if: steps.cached-poetry-dependencies.outputs.cache-hit == 'true'
        run: |
-          echo "import fastapi;print('venv good?')" > test.py && uv run python test.py && echo "cache-hit-success=true" >> $GITHUB_OUTPUT
+          echo "import fastapi;print('venv good?')" > test.py && poetry run python test.py && echo "cache-hit-success=true" >> $GITHUB_OUTPUT
          rm test.py
        continue-on-error: true

@@ -71,12 +74,13 @@ jobs:
        run: |
          sudo apt-get update
          sudo apt-get install libsasl2-dev libldap2-dev libssl-dev
-          uv sync --group dev --extra pgsql
-        if: steps.cached-python-dependencies.outputs.cache-hit != 'true' || steps.cache-validate.outputs.cache-hit-success != 'true'
+          poetry install
+          poetry add "psycopg2-binary==2.9.9"
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true' || steps.cache-validate.outputs.cache-hit-success != 'true'

      - name: Formatting (Ruff)
        run: |
-          uv run ruff format . --check
+          poetry run ruff format . --check

      - name: Lint (Ruff)
        run: |
--- a/.github/workflows/test-frontend.yml
+++ b/.github/workflows/test-frontend.yml
@@ -14,7 +14,7 @@ jobs:
      - name: Setup node env 🏗
        uses: actions/setup-node@v4.0.0
        with:
-          node-version: 22
+          node-version: 16
          check-latest: true

      - name: Get yarn cache directory path 🛠
@@ -34,12 +34,8 @@ jobs:
        run: yarn
        working-directory: "frontend"

-      - name: Prepare nuxt 🚀
-        run: yarn nuxt prepare
-        working-directory: "frontend"
-
      - name: Run linter 👀
-        run: yarn lint --max-warnings=0
+        run: yarn lint
        working-directory: "frontend"

      - name: Run tests 🧪
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,6 @@ docs/site/
 *temp/*
 .secret
 frontend/dist/
-frontend/.output/*
-frontend/.yarn/*
-frontend/.yarnrc.yml

 dev/code-generation/generated/*
 dev/data/mealie.db-journal
@@ -20,7 +17,6 @@ dev/data/backups/*
 dev/data/debug/*
 dev/data/img/*
 dev/data/migration/*
-dev/data/templates/*
 dev/data/users/*
 dev/data/groups/*

@@ -70,11 +66,8 @@ wheels/
 .installed.cfg
 *.egg

-# packaged output - temporarily written here by `uv build`
-/mealie-*
-
 # frontend copied into Python module for packaging purposes
-/mealie/frontend
+/mealie/frontend/

 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -171,5 +164,3 @@ dev/code-generation/openapi.json

 .run/
 .task/*
-.dev.env
-frontend/eslint.config.deprecated.js
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v6.0.0
+    rev: v5.0.0
    hooks:
      - id: check-yaml
        exclude: "mkdocs.yml"
@@ -12,7 +12,7 @@ repos:
        exclude: ^tests/data/
  - repo: https://github.com/astral-sh/ruff-pre-commit
    # Ruff version.
-    rev: v0.14.13
+    rev: v0.11.4
    hooks:
      - id: ruff
      - id: ruff-format
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -18,7 +18,6 @@
    "source.organizeImports": "never"
  },
  "editor.formatOnSave": true,
-  "eslint.useFlatConfig": true,
  "eslint.workingDirectories": [
    "./frontend"
  ],
@@ -55,15 +54,12 @@
  "explorer.fileNesting.enabled": true,
  "explorer.fileNesting.patterns": {
    "package.json": "package-lock.json, yarn.lock, .eslintrc.js, tsconfig.json, .prettierrc, .editorconfig",
-    "pyproject.toml": "uv.lock, alembic.ini, .pylintrc",
+    "pyproject.toml": "poetry.lock, alembic.ini, .pylintrc",
    "netlify.toml": "runtime.txt",
    "README.md": "LICENSE, SECURITY.md"
  },
-  "[typescript]": {
-    "editor.formatOnSave": true
-  },
  "[vue]": {
-    "editor.formatOnSave": true
+    "editor.formatOnSave": false
  },
  "[python]": {
    "editor.formatOnSave": true,
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -28,7 +28,7 @@ tasks:
  docs:gen:
    desc: runs the API documentation generator
    cmds:
-      - uv run python dev/code-generation/gen_docs_api.py
+      - poetry run python dev/code-generation/gen_docs_api.py

  docs:
    desc: runs the documentation server
@@ -36,7 +36,7 @@ tasks:
    deps:
      - docs:gen
    cmds:
-      - uv run python -m mkdocs serve
+      - poetry run python -m mkdocs serve

  setup:ui:
    desc: setup frontend dependencies
@@ -54,10 +54,10 @@ tasks:
    desc: setup python dependencies
    run: once
    cmds:
-      - uv sync --extra pgsql --group dev
-      - uv run pre-commit install
+      - poetry install --with main,dev,postgres
+      - poetry run pre-commit install
    sources:
-      - uv.lock
+      - poetry.lock
      - pyproject.toml
      - .pre-commit-config.yaml

@@ -70,8 +70,7 @@ tasks:
  dev:generate:
    desc: run code generators
    cmds:
-      - uv run python dev/code-generation/main.py {{ .CLI_ARGS }}
-      - task: docs:gen
+      - poetry run python dev/code-generation/main.py
      - task: py:format

  dev:services:
@@ -88,30 +87,28 @@ tasks:
      - rm -r ./dev/data/recipes/
      - rm -r ./dev/data/users/
      - rm -f ./dev/data/mealie*.db
-      - rm -f ./dev/data/mealie*.db-shm
-      - rm -f ./dev/data/mealie*.db-wal
      - rm -f ./dev/data/mealie.log
      - rm -f ./dev/data/.secret

  py:mypy:
    desc: runs python type checking
    cmds:
-      - uv run mypy mealie
+      - poetry run mypy mealie

  py:test:
    desc: runs python tests (support args after '--')
    cmds:
-      - uv run pytest {{ .CLI_ARGS }}
+      - poetry run pytest {{ .CLI_ARGS }}

  py:format:
    desc: runs python code formatter
    cmds:
-      - uv run ruff format .
+      - poetry run ruff format .

  py:lint:
    desc: runs python linter
    cmds:
-      - uv run ruff check mealie
+      - poetry run ruff check mealie

  py:check:
    desc: runs all linters, type checkers, and formatters
@@ -124,10 +121,10 @@ tasks:
  py:coverage:
    desc: runs python coverage and generates html report
    cmds:
-      - uv run pytest
-      - uv run coverage report -m
-      - uv run coveragepy-lcov
-      - uv run coverage html
+      - poetry run pytest
+      - poetry run coverage report -m
+      - poetry run coveragepy-lcov
+      - poetry run coverage html
      - open htmlcov/index.html

  py:package:copy-frontend:
@@ -147,17 +144,17 @@ tasks:
    desc: Generate requirements file to pin all packages, effectively a "pip freeze" before installation begins
    internal: true
    cmds:
-      - uv export --no-editable --no-emit-project --extra pgsql --format requirements-txt --output-file dist/requirements.txt
+      - poetry export -n --only=main --extras=pgsql --output=dist/requirements.txt
      # Include mealie in the requirements, hashing the package that was just built to ensure it's the one installed
      - echo "mealie[pgsql]=={{.MEALIE_VERSION}} \\" >> dist/requirements.txt
-      - pip hash dist/mealie-{{.MEALIE_VERSION}}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
+      - poetry run pip hash dist/mealie-{{.MEALIE_VERSION}}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
      - echo " \\" >> dist/requirements.txt
-      - pip hash dist/mealie-{{.MEALIE_VERSION}}.tar.gz | tail -n1 >> dist/requirements.txt
+      - poetry run pip hash dist/mealie-{{.MEALIE_VERSION}}.tar.gz | tail -n1 >> dist/requirements.txt
    vars:
      MEALIE_VERSION:
-         sh: python -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['version'])"
+         sh: poetry version --short
    sources:
-      - uv.lock
+      - poetry.lock
      - pyproject.toml
      - dist/mealie-*.whl
      - dist/mealie-*.tar.gz
@@ -184,13 +181,13 @@ tasks:
    deps:
      - py:package:deps
    cmds:
-      - uv build --out-dir dist
+      - poetry build -n --output=dist
      - task: py:package:generate-requirements

  py:
    desc: runs the backend server
    cmds:
-      - uv run python mealie/app.py
+      - poetry run python mealie/app.py

  py:postgres:
    desc: runs the backend server configured for containerized postgres
@@ -202,12 +199,12 @@ tasks:
      POSTGRES_PORT: 5432
      POSTGRES_DB: mealie
    cmds:
-      - uv run python mealie/app.py
+      - poetry run python mealie/app.py

  py:migrate:
    desc: generates a new database migration file e.g. task py:migrate -- "add new column"
    cmds:
-      - uv run alembic --config mealie/alembic/alembic.ini revision --autogenerate -m "{{ .CLI_ARGS }}"
+      - poetry run alembic --config mealie/alembic/alembic.ini revision --autogenerate -m "{{ .CLI_ARGS }}"
      - task: py:format

  ui:build:
@@ -228,7 +225,7 @@ tasks:
    desc: runs the frontend linter
    dir: frontend
    cmds:
-      - yarn lint --max-warnings=0
+      - yarn lint

  ui:test:
    desc: runs the frontend tests
@@ -246,7 +243,7 @@ tasks:
    desc: runs the frontend server
    dir: frontend
    cmds:
-      - yarn run dev --no-fork
+      - yarn run dev

  docker:build-from-package:
    desc: Builds the Docker image from the existing Python package in dist/
--- a/cliff.toml
+++ b/cliff.toml
@@ -35,7 +35,7 @@ conventional_commits = true
 filter_unconventional = true
 # regex for preprocessing the commit messages
 commit_preprocessors = [
-    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/mealie-recipes/mealie/issues/${2}))"},
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/hay-kot/mealie/issues/${2}))"},
 ]
 # regex for parsing and grouping commits
 commit_parsers = [
--- a/dev/code-generation/gen_docs_api.py
+++ b/dev/code-generation/gen_docs_api.py
@@ -1,8 +1,7 @@
 import json
-from datetime import UTC, datetime
-from typing import Any

 from fastapi import FastAPI
+from freezegun import freeze_time

 from mealie.app import app
 from mealie.core.config import determine_data_dir
@@ -38,43 +37,14 @@ HTML_TEMPLATE = """<!-- Custom HTML site displayed as the Home chapter -->
 """

 HTML_PATH = DATA_DIR.parent.parent.joinpath("docs/docs/overrides/api.html")
-CONSTANT_DT = datetime(2025, 10, 24, 15, 53, 0, 0, tzinfo=UTC)
-
-
-def normalize_timestamps(s: dict[str, Any]) -> dict[str, Any]:
-    field_format = s.get("format")
-    is_timestamp = field_format in ["date-time", "date", "time"]
-    has_default = s.get("default")
-
-    if not is_timestamp:
-        for k, v in s.items():
-            if isinstance(v, dict):
-                s[k] = normalize_timestamps(v)
-            elif isinstance(v, list):
-                s[k] = [normalize_timestamps(i) if isinstance(i, dict) else i for i in v]
-
-        return s
-    elif not has_default:
-        return s
-
-    if field_format == "date-time":
-        s["default"] = CONSTANT_DT.isoformat()
-    elif field_format == "date":
-        s["default"] = CONSTANT_DT.date().isoformat()
-    elif field_format == "time":
-        s["default"] = CONSTANT_DT.time().isoformat()
-
-    return s


 def generate_api_docs(my_app: FastAPI):
-    openapi_schema = my_app.openapi()
-    openapi_schema = normalize_timestamps(openapi_schema)
-
    with open(HTML_PATH, "w") as fd:
-        text = HTML_TEMPLATE.replace("MY_SPECIFIC_TEXT", json.dumps(openapi_schema))
+        text = HTML_TEMPLATE.replace("MY_SPECIFIC_TEXT", json.dumps(my_app.openapi()))
        fd.write(text)


 if __name__ == "__main__":
-    generate_api_docs(app)
+    with freeze_time("2024-01-20T17:00:55Z"):
+        generate_api_docs(app)
--- a/dev/code-generation/gen_py_pytest_data_paths.py
+++ b/dev/code-generation/gen_py_pytest_data_paths.py
@@ -1,4 +1,3 @@
-import subprocess
 from dataclasses import dataclass
 from pathlib import Path

@@ -106,16 +105,12 @@ def main():
    # Flatten list of lists
    all_children = [item for sublist in all_children for item in sublist]

-    out_path = GENERATED / "__init__.py"
    render_python_template(
        TEMPLATE,
-        out_path,
+        GENERATED / "__init__.py",
        {"children": all_children},
    )

-    subprocess.run(["uv", "run", "ruff", "check", str(out_path), "--fix"])
-    subprocess.run(["uv", "run", "ruff", "format", str(out_path)])
-

 if __name__ == "__main__":
    main()
--- a/dev/code-generation/gen_py_schema_exports.py
+++ b/dev/code-generation/gen_py_schema_exports.py
@@ -1,6 +1,5 @@
 import pathlib
 import re
-import subprocess
 from dataclasses import dataclass, field

 from utils import PROJECT_DIR, log, render_python_template
@@ -85,23 +84,16 @@ def find_modules(root: pathlib.Path) -> list[Modules]:
    return modules


-def main() -> None:
+def main():
    modules = find_modules(SCHEMA_PATH)

-    template_paths: list[pathlib.Path] = []
    for module in modules:
        log.debug(f"Module: {module.directory.name}")
        for file in module.files:
            log.debug(f"  File: {file.import_path}")
            log.debug(f"    Classes: [{', '.join(file.classes)}]")

-        template_path = module.directory / "__init__.py"
-        template_paths.append(template_path)
-        render_python_template(template, template_path, {"module": module})
-
-    path_args = (str(p) for p in template_paths)
-    subprocess.run(["uv", "run", "ruff", "check", *path_args, "--fix"])
-    subprocess.run(["uv", "run", "ruff", "format", *path_args])
+        render_python_template(template, module.directory / "__init__.py", {"module": module})


 if __name__ == "__main__":
--- a/dev/code-generation/gen_ts_locales.py
+++ b/dev/code-generation/gen_ts_locales.py
@@ -1,4 +1,3 @@
-import os
 import pathlib
 from dataclasses import dataclass
 from pathlib import Path
@@ -14,7 +13,7 @@ from mealie.schema._mealie import MealieModel

 BASE = pathlib.Path(__file__).parent.parent.parent

-API_KEY = dotenv.get_key(BASE / ".env", "CROWDIN_API_KEY") or os.environ.get("CROWDIN_API_KEY", "")
+API_KEY = dotenv.get_key(BASE / ".env", "CROWDIN_API_KEY")


@dataclass
@@ -24,22 +23,19 @@ class LocaleData:


 LOCALE_DATA: dict[str, LocaleData] = {
+    "en-US": LocaleData(name="American English"),
+    "en-GB": LocaleData(name="British English"),
    "af-ZA": LocaleData(name="Afrikaans (Afrikaans)"),
    "ar-SA": LocaleData(name="العربية (Arabic)", dir="rtl"),
-    "bg-BG": LocaleData(name="Български (Bulgarian)"),
    "ca-ES": LocaleData(name="Català (Catalan)"),
    "cs-CZ": LocaleData(name="Čeština (Czech)"),
    "da-DK": LocaleData(name="Dansk (Danish)"),
    "de-DE": LocaleData(name="Deutsch (German)"),
    "el-GR": LocaleData(name="Ελληνικά (Greek)"),
-    "en-GB": LocaleData(name="British English"),
-    "en-US": LocaleData(name="American English"),
    "es-ES": LocaleData(name="Español (Spanish)"),
-    "et-EE": LocaleData(name="Eesti (Estonian)"),
    "fi-FI": LocaleData(name="Suomi (Finnish)"),
-    "fr-BE": LocaleData(name="Belge (Belgian)"),
-    "fr-CA": LocaleData(name="Français canadien (Canadian French)"),
    "fr-FR": LocaleData(name="Français (French)"),
+    "fr-BE": LocaleData(name="Belge (Belgian)"),
    "gl-ES": LocaleData(name="Galego (Galician)"),
    "he-IL": LocaleData(name="עברית (Hebrew)", dir="rtl"),
    "hr-HR": LocaleData(name="Hrvatski (Croatian)"),
@@ -57,7 +53,6 @@ LOCALE_DATA: dict[str, LocaleData] = {
    "pt-PT": LocaleData(name="Português (Portuguese)"),
    "ro-RO": LocaleData(name="Română (Romanian)"),
    "ru-RU": LocaleData(name="Pусский (Russian)"),
-    "sk-SK": LocaleData(name="Slovenčina (Slovak)"),
    "sl-SI": LocaleData(name="Slovenščina (Slovenian)"),
    "sr-SP": LocaleData(name="српски (Serbian)"),
    "sv-SE": LocaleData(name="Svenska (Swedish)"),
@@ -76,7 +71,7 @@ export const LOCALES = [{% for locale in locales %}
    progress: {{ locale.progress }},
    dir: "{{ locale.dir }}",
  },{% endfor %}
-];
+]

 """

@@ -98,8 +93,8 @@ class CrowdinApi:
    project_id = "451976"
    api_key = API_KEY

-    def __init__(self, api_key: str | None):
-        self.api_key = api_key or API_KEY
+    def __init__(self, api_key: str):
+        api_key = api_key

    @property
    def headers(self) -> dict:
@@ -161,51 +156,29 @@ PROJECT_DIR = Path(__file__).parent.parent.parent

 datetime_dir = PROJECT_DIR / "frontend" / "lang" / "dateTimeFormats"
 locales_dir = PROJECT_DIR / "frontend" / "lang" / "messages"
-nuxt_config = PROJECT_DIR / "frontend" / "nuxt.config.ts"
-i18n_config = PROJECT_DIR / "frontend" / "i18n.config.ts"
+nuxt_config = PROJECT_DIR / "frontend" / "nuxt.config.js"
 reg_valid = PROJECT_DIR / "mealie" / "schema" / "_mealie" / "validators.py"

 """
 This snippet walks the message and dat locales directories and generates the import information
-for the nuxt.config.ts file and automatically injects it into the nuxt.config.ts file. Note that
+for the nuxt.config.js file and automatically injects it into the nuxt.config.js file. Note that
 the code generation ID is hardcoded into the script and required in the nuxt config.
 """


 def inject_nuxt_values():
-    datetime_files = list(datetime_dir.glob("*.json"))
-    datetime_files.sort()
-
-    datetime_imports = []
-    datetime_object_entries = []
-
-    for match in datetime_files:
-        # Convert locale name to camelCase variable name (e.g., "en-US" -> "enUS")
-        var_name = match.stem.replace("-", "")
-
-        # Generate import statement
-        import_line = f'import * as {var_name} from "./lang/dateTimeFormats/{match.name}";'
-        datetime_imports.append(import_line)
-
-        # Generate object entry
-        object_entry = f'  "{match.stem}": {var_name},'
-        datetime_object_entries.append(object_entry)
-
-    all_date_locales = datetime_imports + ["", "const datetimeFormats = {"] + datetime_object_entries + ["};"]
+    all_date_locales = [
+        f'"{match.stem}": require("./lang/dateTimeFormats/{match.name}"),' for match in datetime_dir.glob("*.json")
+    ]

    all_langs = []
    for match in locales_dir.glob("*.json"):
-        match_data = LOCALE_DATA.get(match.stem)
-        match_dir = match_data.dir if match_data else "ltr"
-
-        lang_string = f'{{ code: "{match.stem}", file: "{match.name.replace(".json", ".ts")}", dir: "{match_dir}" }},'
+        lang_string = f'{{ code: "{match.stem}", file: "{match.name}" }},'
        all_langs.append(lang_string)

-    all_langs.sort()
-
    log.debug(f"injecting locales into nuxt config -> {nuxt_config}")
    inject_inline(nuxt_config, CodeKeys.nuxt_local_messages, all_langs)
-    inject_inline(i18n_config, CodeKeys.nuxt_local_dates, all_date_locales)
+    inject_inline(nuxt_config, CodeKeys.nuxt_local_dates, all_date_locales)


 def inject_registration_validation_values():
@@ -222,7 +195,7 @@ def inject_registration_validation_values():


 def generate_locales_ts_file():
-    api = CrowdinApi(None)
+    api = CrowdinApi("")
    models = api.get_languages()
    tmpl = Template(LOCALE_TEMPLATE)
    rendered = tmpl.render(locales=models)
--- a/dev/code-generation/gen_ts_types.py
+++ b/dev/code-generation/gen_ts_types.py
@@ -1,5 +1,4 @@
 import re
-import subprocess
 from pathlib import Path

 from jinja2 import Template
@@ -9,8 +8,8 @@ from utils import log
 # ============================================================

 template = """// This Code is auto generated by gen_ts_types.py
-{% for name in global %}import type {{ name }} from "@/components/global/{{ name }}.vue";
-{% endfor %}{% for name in layout %}import type {{ name }} from "@/components/layout/{{ name }}.vue";
+{% for name in global %}import {{ name }} from "@/components/global/{{ name }}.vue";
+{% endfor %}{% for name in layout %}import {{ name }} from "@/components/layout/{{ name }}.vue";
 {% endfor %}
 declare module "vue" {
  export interface GlobalComponents {
@@ -190,7 +189,6 @@ def generate_typescript_types() -> None:  # noqa: C901
    skipped_dirs: list[Path] = []
    failed_modules: list[Path] = []

-    out_paths: list[Path] = []
    for module in schema_path.iterdir():
        if module.is_dir() and module.stem in ignore_dirs:
            skipped_dirs.append(module)
@@ -207,18 +205,10 @@ def generate_typescript_types() -> None:  # noqa: C901
            path_as_module = path_to_module(module)
            generate_typescript_defs(path_as_module, str(out_path), exclude=("MealieModel"))  # type: ignore
            clean_output_file(out_path)
-            out_paths.append(out_path)
        except Exception:
            failed_modules.append(module)
            log.exception(f"Module Error: {module}")

-    # Run ESLint --fix on the files to clean up any formatting issues
-    subprocess.run(
-        ["yarn", "lint", "--fix", *(str(path) for path in out_paths)],
-        check=True,
-        cwd=PROJECT_DIR / "frontend",
-    )
-
    log.debug("\n📁 Skipped Directories:")
    for skipped_dir in skipped_dirs:
        log.debug(f"   📁 {skipped_dir.name}")
--- a/dev/code-generation/main.py
+++ b/dev/code-generation/main.py
@@ -1,4 +1,3 @@
-import argparse
 from pathlib import Path

 import gen_py_pytest_data_paths
@@ -12,39 +11,15 @@ CWD = Path(__file__).parent


 def main():
-    parser = argparse.ArgumentParser(description="Run code generators")
-    parser.add_argument(
-        "generators",
-        nargs="*",
-        help="Specific generators to run (schema, types, locales, data-paths, routes). If none specified, all will run.",  # noqa: E501 - long line
-    )
-    args = parser.parse_args()
+    items = [
+        (gen_py_schema_exports.main, "schema exports"),
+        (gen_ts_types.main, "frontend types"),
+        (gen_ts_locales.main, "locales"),
+        (gen_py_pytest_data_paths.main, "test data paths"),
+        (gen_py_pytest_routes.main, "pytest routes"),
+    ]

-    # Define all available generators
-    all_generators = {
-        "schema": (gen_py_schema_exports.main, "schema exports"),
-        "types": (gen_ts_types.main, "frontend types"),
-        "locales": (gen_ts_locales.main, "locales"),
-        "data-paths": (gen_py_pytest_data_paths.main, "test data paths"),
-        "routes": (gen_py_pytest_routes.main, "pytest routes"),
-    }
-
-    # Determine which generators to run
-    if args.generators:
-        # Validate requested generators
-        invalid_generators = [g for g in args.generators if g not in all_generators]
-        if invalid_generators:
-            log.error(f"Invalid generator(s): {', '.join(invalid_generators)}")
-            log.info(f"Available generators: {', '.join(all_generators.keys())}")
-            return
-
-        generators_to_run = [(all_generators[g][0], all_generators[g][1]) for g in args.generators]
-    else:
-        # Run all generators (default behavior)
-        generators_to_run = list(all_generators.values())
-
-    # Run the selected generators
-    for func, name in generators_to_run:
+    for func, name in items:
        log.info(f"Generating {name}...")
        func()

--- a/dev/code-generation/utils/template.py
+++ b/dev/code-generation/utils/template.py
@@ -1,4 +1,6 @@
 import logging
+import re
+import subprocess
 from dataclasses import dataclass
 from pathlib import Path

@@ -22,16 +24,21 @@ def render_python_template(template_file: Path | str, dest: Path, data: dict):

    dest.write_text(text)

+    # lint/format file with Ruff
+    log.info(f"Formatting {dest}")
+    subprocess.run(["poetry", "run", "ruff", "check", str(dest), "--fix"])
+    subprocess.run(["poetry", "run", "ruff", "format", str(dest)])
+

@dataclass
 class CodeSlicer:
    start: int
    end: int

-    indentation: str | None
+    indentation: str
    text: list[str]

-    _next_line: int | None = None
+    _next_line = None

    def purge_lines(self) -> None:
        start = self.start + 1
@@ -40,24 +47,15 @@ class CodeSlicer:

    def push_line(self, string: str) -> None:
        self._next_line = self._next_line or self.start + 1
-        self.text.insert(self._next_line, (self.indentation or "") + string + "\n")
+        self.text.insert(self._next_line, self.indentation + string + "\n")
        self._next_line += 1


-def get_indentation_of_string(line: str) -> str:
-    # Extract everything before the comment
-    if "//" in line:
-        indentation = line.split("//")[0]
-    elif "#" in line:
-        indentation = line.split("#")[0]
-    else:
-        indentation = line
-
-    # Keep only the whitespace, remove any non-whitespace characters
-    return "".join(c for c in indentation if c.isspace())
+def get_indentation_of_string(line: str, comment_char: str = "//|#") -> str:
+    return re.sub(rf"{comment_char}.*", "", line).removesuffix("\n")


-def find_start_end(file_text: list[str], gen_id: str) -> tuple[int, int, str | None]:
+def find_start_end(file_text: list[str], gen_id: str) -> tuple[int, int, str]:
    start = None
    end = None
    indentation = None
--- a/dev/data/templates/recipes.md
+++ b/dev/data/templates/recipes.md
@@ -0,0 +1,24 @@
+
+
+![Recipe Image](../../images/{{ recipe.slug }}/original.jpg)
+
+# {{ recipe.name }}
+{{ recipe.description }}
+
+## Ingredients
+{% for ingredient in recipe.recipeIngredient %}
+- [ ] {{ ingredient }} {% endfor %}
+
+## Instructions
+{% for step in recipe.recipeInstructions %}
+- [ ] {{ step.text }} {% endfor %}
+
+{% for note in recipe.notes %}
+**{{ note.title }}:** {{ note.text }}
+{% endfor %}
+
+---
+
+Tags: {{ recipe.tags }}
+Categories: {{ recipe.categories }}
+Original URL: {{ recipe.orgURL }}
--- a/dev/scripts/all_recipes_stress_test.py
+++ b/dev/scripts/all_recipes_stress_test.py
@@ -44,6 +44,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 cup unsalted butter, cut into cubes",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "ea3b6702-9532-4fbc-a40b-f99917831c26",
@@ -53,6 +54,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 cup light brown sugar",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "c5bbfefb-1e23-4ffd-af88-c0363a0fae82",
@@ -62,6 +64,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1/2 cup granulated white sugar",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "034f481b-c426-4a17-b983-5aea9be4974b",
@@ -71,6 +74,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 large eggs",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "37c1f796-3bdb-4856-859f-dbec90bc27e4",
@@ -80,6 +84,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 tsp vanilla extract",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "85561ace-f249-401d-834c-e600a2f6280e",
@@ -89,6 +94,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1/2 cup creamy peanut butter",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "ac91bda0-e8a8-491a-976a-ae4e72418cfd",
@@ -98,6 +104,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 tsp cornstarch",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "4d1256b3-115e-4475-83cd-464fbc304cb0",
@@ -107,6 +114,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 tsp baking soda",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "64627441-39f9-4ee3-8494-bafe36451d12",
@@ -116,6 +124,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1/2 tsp salt",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "7ae212d0-3cd1-44b0-899e-ec5bd91fd384",
@@ -125,6 +134,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1 cup cake flour",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "06967994-8548-4952-a8cc-16e8db228ebd",
@@ -134,6 +144,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 cups all-purpose flour",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "bdb33b23-c767-4465-acf8-3b8e79eb5691",
@@ -143,6 +154,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "2 cups peanut butter chips",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "12ba0af8-affd-4fb2-9cca-6f1b3e8d3aef",
@@ -152,6 +164,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
                "note": "1½ cups Reese's Pieces candies",
                "unit": None,
                "food": None,
+                "disableAmount": True,
                "quantity": 1,
                "originalText": None,
                "referenceId": "4bdc0598-a3eb-41ee-8af0-4da9348fbfe2",
@@ -208,6 +221,7 @@ def recipe_data(name: str, slug: str, id: str, userId: str, groupId: str) -> dic
            "showAssets": False,
            "landscapeView": False,
            "disableComments": False,
+            "disableAmount": True,
            "locked": False,
        },
        "assets": [],
--- a/dev/scripts/convert_seed_files_to_new_format.py
+++ b/dev/scripts/convert_seed_files_to_new_format.py
@@ -1,75 +0,0 @@
-import glob
-import json
-import pathlib
-
-
-def get_seed_locale_names() -> set[str]:
-    """Find all locales in the seed/resources/ folder
-
-    Returns:
-        A set of every file name where there's both a seed label and seed food file
-    """
-
-    LABELS_PATH = "/workspaces/mealie/mealie/repos/seed/resources/labels/locales/"
-    FOODS_PATH = "/workspaces/mealie/mealie/repos/seed/resources/foods/locales/"
-    label_locales = glob.glob("*.json", root_dir=LABELS_PATH)
-    foods_locales = glob.glob("*.json", root_dir=FOODS_PATH)
-
-    # ensure that a locale has both a label and a food seed file
-    return set(label_locales).intersection(foods_locales)
-
-
-def get_labels_from_file(locale: str) -> list[str]:
-    """Query a locale to get all of the labels so that they can be added to the new foods seed format
-
-    Returns:
-        All of the labels found within the seed file for a given locale
-    """
-
-    locale_path = pathlib.Path("/workspaces/mealie/mealie/repos/seed/resources/labels/locales/" + locale)
-    label_names = [label["name"] for label in json.loads(locale_path.read_text(encoding="utf-8"))]
-    return label_names
-
-
-def transform_foods(locale: str):
-    """
-    Convert the current food seed file for a locale into a new format which maps each food to a label
-
-    Existing format of foods seed file is a dictionary where each key is a food name and the values are a dictionary
-        of attributes such as name and plural_name
-
-    New format maps each food to a label. The top-level dictionary has each key as a label e.g. "Fruits".
-        Each label key as a value that is a dictionary with an element called "foods"
-        "Foods" is a dictionary of each food for that label, with a key of the english food name e.g. "baking-soda"
-        and a value of attributes, including the translated name of the item e.g. "bicarbonate of soda" for en-GB.
-    """
-
-    locale_path = pathlib.Path("/workspaces/mealie/mealie/repos/seed/resources/foods/locales/" + locale)
-
-    with open(locale_path, encoding="utf-8") as infile:
-        data = json.load(infile)
-
-    first_value = next(iter(data.values()))
-    if isinstance(first_value, dict) and "foods" in first_value:
-        # Locale is already in the new format, skipping transformation
-        return
-
-    transformed_data = {"": {"foods": dict(data.items())}}
-
-    # Seeding for labels now pulls from the foods file and parses the labels from there (as top-level keys),
-    #   thus we need to add all of the existing labels to the new food seed file and give them an empty foods dictionary
-    label_names = get_labels_from_file(locale)
-    for label in label_names:
-        transformed_data[label] = {"foods": {}}
-
-    with open(locale_path, "w", encoding="utf-8") as outfile:
-        json.dump(transformed_data, outfile, indent=4, ensure_ascii=False)
-
-
-def main():
-    for locale in get_seed_locale_names():
-        transform_foods(locale)
-
-
-if __name__ == "__main__":
-    main()
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,7 @@
 ###############################################
 # Frontend Build
 ###############################################
-FROM node:24@sha256:0ab63cafa05b4c1db52959b40b7ea1f52753fe65f27a1b84f3991c296b1c16e6 \
-    AS frontend-builder
+FROM node:16 AS frontend-builder

 WORKDIR /frontend

@@ -21,8 +20,7 @@ RUN yarn generate
 ###############################################
 # Base Image - Python
 ###############################################
-FROM python:3.12-slim@sha256:2267adc248a477c1f1a852a07a5a224d42abe54c28aafa572efa157dfb001bba \
-    AS python-base
+FROM python:3.12-slim as python-base

 ENV MEALIE_HOME="/app"

@@ -50,29 +48,40 @@ RUN apt-get update \
    curl \
    && rm -rf /var/lib/apt/lists/*

-RUN pip install uv
+ENV POETRY_HOME="/opt/poetry" \
+    POETRY_NO_INTERACTION=1
+
+# prepend poetry to path
+ENV PATH="$POETRY_HOME/bin:$PATH"
+
+# install poetry - respects $POETRY_VERSION & $POETRY_HOME
+ENV POETRY_VERSION=2.0.1
+RUN curl -sSL https://install.python-poetry.org | python3 -
+
+# install poetry plugins needed to build the package
+RUN poetry self add "poetry-plugin-export>=1.9"

 WORKDIR /mealie

 # copy project files here to ensure they will be cached.
-COPY uv.lock pyproject.toml ./
+COPY poetry.lock pyproject.toml ./
 COPY mealie ./mealie

 # Copy frontend to package it into the wheel
 COPY --from=frontend-builder /frontend/dist ./mealie/frontend

 # Build the source and binary package
-RUN uv build --out-dir dist
+RUN poetry build --output=dist

 # Create the requirements file, which is used to install the built package and
 # its pinned dependencies later. mealie is included to ensure the built one is
 # what's installed.
-RUN uv export --no-editable --no-emit-project --extra pgsql --format requirements-txt --output-file dist/requirements.txt \
-    && MEALIE_VERSION=$(python -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['version'])") \
-    && echo "mealie[pgsql]==${MEALIE_VERSION} \\" >> dist/requirements.txt \
-    && pip hash dist/mealie-${MEALIE_VERSION}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt \
+RUN export MEALIE_VERSION=$(poetry version --short) \
+    && poetry export --only=main --extras=pgsql --output=dist/requirements.txt \
+    && echo "mealie[pgsql]==$MEALIE_VERSION \\" >> dist/requirements.txt \
+    && poetry run pip hash dist/mealie-$MEALIE_VERSION-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt \
    && echo " \\" >> dist/requirements.txt \
-    && pip hash dist/mealie-${MEALIE_VERSION}.tar.gz | tail -n1 >> dist/requirements.txt
+    && poetry run pip hash dist/mealie-$MEALIE_VERSION.tar.gz | tail -n1 >> dist/requirements.txt

 ###############################################
 # Package Container
@@ -110,7 +119,7 @@ RUN . $VENV_PATH/bin/activate \
 ###############################################
 # Production Image
 ###############################################
-FROM python-base AS production
+FROM python-base as production
 LABEL org.opencontainers.image.source="https://github.com/mealie-recipes/mealie"
 ENV PRODUCTION=true
 ENV TESTING=false
@@ -123,7 +132,7 @@ RUN apt-get update \
    gosu \
    iproute2 \
    libldap-common \
-    libldap2 \
+    libldap-2.5 \
    && rm -rf /var/lib/apt/lists/*

 # create directory used for Docker Secrets
--- a/docs/docs/contributors/developers-guide/building-packages.md
+++ b/docs/docs/contributors/developers-guide/building-packages.md
@@ -12,13 +12,13 @@ yarnpkg generate
 popd
 rm -r mealie/frontend
 cp -a frontend/dist mealie/frontend
-uv build --out-dir dist
-uv export --no-editable --no-emit-project --extra pgsql --format requirements-txt --output-file dist/requirements.txt
-MEALIE_VERSION=$(python -c "import tomllib; print(tomllib.load(open('pyproject.toml', 'rb'))['project']['version'])")
+poetry build
+poetry export -n --only=main --extras=pgsql --output=dist/requirements.txt
+MEALIE_VERSION=$(poetry version --short)
 echo "mealie[pgsql]==${MEALIE_VERSION} \\" >> dist/requirements.txt
-pip hash dist/mealie-${MEALIE_VERSION}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
+poetry run pip hash dist/mealie-${MEALIE_VERSION}-py3-none-any.whl | tail -n1 | tr -d '\n' >> dist/requirements.txt
 echo " \\" >> dist/requirements.txt
-pip hash dist/mealie-${MEALIE_VERSION}.tar.gz | tail -n1 >> dist/requirements.txt
+poetry run pip hash dist/mealie-${MEALIE_VERSION}.tar.gz | tail -n1 >> dist/requirements.txt
 ```

 The Python package can be installed with all of its dependencies pinned to the versions tested by the developers with:
--- a/docs/docs/contributors/developers-guide/starting-dev-server.md
+++ b/docs/docs/contributors/developers-guide/starting-dev-server.md
@@ -33,8 +33,8 @@ Make sure the VSCode Dev Containers extension is installed, then select "Dev Con
 ### Prerequisites

 - [Python 3.12](https://www.python.org/downloads/)
- [uv](https://docs.astral.sh/uv/)
- [Node](https://nodejs.org/en/)
+- [Poetry](https://python-poetry.org/docs/#installation)
+- [Node v16.x](https://nodejs.org/en/)
 - [yarn](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable)
 - [task](https://taskfile.dev/#/installation)

@@ -45,7 +45,7 @@ Once the prerequisites are installed you can cd into the project base directory
 === "Linux / macOS"

    ```bash
-    # Navigate To The Root Directory
+    # Naviate To The Root Directory
    cd /path/to/project

    # Utilize the Taskfile to Install Dependencies
--- a/docs/docs/documentation/community-guide/bring-api.md
+++ b/docs/docs/documentation/community-guide/bring-api.md
@@ -1,5 +1,5 @@
 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

 Mealie supports adding the ingredients of a recipe to your [Bring](https://www.getbring.com/) shopping list, as you can
 see [here](https://docs.mealie.io/documentation/getting-started/features/#recipe-actions).
--- a/docs/docs/documentation/community-guide/home-assistant.md
+++ b/docs/docs/documentation/community-guide/home-assistant.md
@@ -1,26 +1,26 @@
 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+  This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

 In a lot of ways, Home Assistant is why this project exists! Since Mealie has a robust API it makes it a great fit for interacting with Home Assistant and pulling information into your dashboard.

-## Display Today's Meal in Lovelace
+### Display Today's Meal in Lovelace

 You can use the Mealie API to get access to meal plans in Home Assistant like in the image below.

 ![api-extras-gif](../../assets/img/home-assistant-card.png)

-## Steps:
+Steps:

-### 1. Get your API Token
+#### 1. Get your API Token

-Create an API token from Mealie's User Settings page (see [this page](https://docs.mealie.io/documentation/getting-started/api-usage/#getting-a-token) to learn how).
+Create an API token from Mealie's User Settings page (https://hay-kot.github.io/mealie/documentation/users-groups/user-settings/#api-key-generation)

-### 2. Create Home Assistant Sensors
+#### 2. Create Home Assistant Sensors

 Create REST sensors in home assistant to get the details of today's meal.
 We will create sensors to get the name and ID of the first meal in today's meal plan (note that this may not be what is wanted if there is more than one meal planned for the day). We need the ID as well as the name to be able to retrieve the image for the meal.

-Make sure the url and port (`http://mealie:9000`) matches your installation's address and _API_ port.
+Make sure the url and port (`http://mealie:9000` ) matches your installation's address and _API_ port.

 ```yaml
 rest:
@@ -40,7 +40,7 @@ rest:
        unique_id: mealie_todays_meal_id
 ```

-### 3. Create a Camera Entity
+#### 3. Create a Camera Entity

 We will create a camera entity to display the image of today's meal in Lovelace.

@@ -52,7 +52,7 @@ In the still image url field put in:
 Under the entity page for the new camera, rename it.
 e.g. `camera.mealie_todays_meal_image`

-### 4. Create a Lovelace Card
+#### 4. Create a Lovelace Card

 Create a picture entity card and set the entity to `mealie_todays_meal` and the camera entity to `camera.mealie_todays_meal_image` or set in the yaml directly.

@@ -76,4 +76,4 @@ card_mod:
 ```

 !!! tip
-    Due to how Home Assistant works with images, I had to include the additional styling to get the images to not appear distorted. This requires an [additional installation](https://github.com/thomasloven/lovelace-card-mod) from HACS.
+Due to how Home Assistant works with images, I had to include the additional styling to get the images to not appear distorted. This requires an [additional installation](https://github.com/thomasloven/lovelace-card-mod) from HACS.
--- a/docs/docs/documentation/community-guide/import-recipe-bookmarklet.md
+++ b/docs/docs/documentation/community-guide/import-recipe-bookmarklet.md
@@ -12,10 +12,12 @@ var url = document.URL.endsWith('/') ?
    document.URL;
 var mealie = "http://localhost:8080";
 var group_slug = "home" // Change this to your group slug. You can obtain this from your URL after logging-in to Mealie
+var use_keywords= "&use_keywords=1" // Optional - use keywords from recipe - update to "" if you don't want that
+var edity = "&edit=1" // Optional - keep in edit mode - update to "" if you don't want that

 if (mealie.slice(-1) === "/") {
    mealie = mealie.slice(0, -1)
 }
-var dest = mealie + "/g/" + group_slug + "/r/create/url?recipe_import_url=" + url;
+var dest = mealie + "/g/" + group_slug + "/r/create/url?recipe_import_url=" + url + use_keywords + edity;
 window.open(dest, "_blank");
 ```
--- a/docs/docs/documentation/community-guide/ios-shortcut.md
+++ b/docs/docs/documentation/community-guide/ios-shortcut.md
@@ -1,29 +0,0 @@
-!!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
-
-An easy way to add recipes to Mealie from an Apple device is via an Apple Shortcut. This is a short guide to install an configure a shortcut able to add recipes via a link or image(s). 
-
-!!! note
-    If adding via images make sure to enable [Mealie's OpenAI Integration](https://docs.mealie.io/documentation/getting-started/installation/open-ai/)
-
-## Javascript can only be run via Shortcuts on the Safari browser on MacOS and iOS. If you do not use Safari you may skip this section
-Some sites have begun blocking AI scraping bots, inadvertently blocking the recipe scraping library Mealie uses as well. To circumvent this, the shortcut uses javascript to capture the raw html loaded in the browser and sends that to mealie when possible.
-
-**iOS**
-
-Settings app -> apps -> Shortcuts -> Advanced -> Allow Running Scripts
-
-**MacOS**
-
-Shortcuts app -> Settings (CMD ,) -> Advanced -> Allow Running Scripts
-
-## Initial Setup
-An API key is needed to authenticate with mealie. To create an api key for a user, navigate to http://YOUR_MEALIE_URL/user/profile/api-tokens. Alternatively you can create a key via the mealie home page by clicking the user's profile pic in the top left -> Api Tokens
-
-The shortcut can be installed via **[This link](https://www.icloud.com/shortcuts/52834724050b42aebe0f2efd8d067360)**. Upon install, replace "MEALIE_API_KEY" with the API key generated previously and "MEALIE_URI" with the full URL used to access your mealie instance e.g. "http://10.0.0.5:9000" or "https://mealie.domain.com".
-
-## Using the Shortcut
-Once installed, the shortcut will automatically appear as an option when sharing an image or webpage. It can also be useful to add the shortcut to the home screen of your device. If selected from the home screen or shortcuts app, a menu will appear with prompts to import via **taking photo(s)**, **selecting photo(s)**, **scanning a URL**, or **pasting a URL**. 
-
-!!! note
-    Despite the Mealie API being able to accept multiple recipe images for import it is currently impossible to send multiple files in 1 web request via Shortcuts. Instead, the shortcut combines the images into a singular, vertically-concatenated image to send to mealie. This can result in slightly less-accurate text recognition.
--- a/docs/docs/documentation/community-guide/n8n-backup-automation.md
+++ b/docs/docs/documentation/community-guide/n8n-backup-automation.md
@@ -1,77 +1,71 @@
 # Automating Backups with n8n

 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

-[n8n](https://github.com/n8n-io/n8n) is a free and source-available fair-code licensed workflow automation tool. It's an alternative to tools like Zapier or Make, allowing you to use a UI to create automated workflows.
+> [n8n](https://github.com/n8n-io/n8n) is a free and source-available fair-code licensed workflow automation tool. Alternative to Zapier or Make, allowing you to use a UI to create automated workflows.

 This example workflow:

-1. Creates a Mealie backup every morning via an API call
-2. Keeps the last 7 backups, deleting older ones
+1. Backups Mealie every morning via an API call
+2. Deletes all but the last 7 backups

-!!! warning "Important"
-    This only automates the backup function, this does not backup your data to anywhere except your local instance. Please make sure you are backing up your data to an external source.
+> [!CAUTION]
+> This only automates the backup function, this does not backup your data to anywhere except your local instance. Please make sure you are backing up your data to an external source.

+---

 ![screenshot](../../assets/img/n8n/n8n-mealie-backup.png)

-## Setup
+# Setup

-### Deploying n8n
+## Deploying n8n

 Follow the relevant guide in the [n8n Documentation](https://docs.n8n.io/)

-### Importing n8n workflow
+## Importing n8n workflow

 1. In n8n, add a new workflow
 2. In the top right hit the 3 dot menu and select 'Import from URL...'

-    ![screenshot](../../assets/img/n8n/n8n-workflow-import.png)
+![screenshot](../../assets/img/n8n/n8n-workflow-import.png)

-3. Paste `https://github.com/mealie-recipes/mealie/blob/mealie-next/docs/docs/assets/other/n8n/n8n-mealie-backup.json` and click 'Import'
+3. Paste `https://github.com/mealie-recipes/mealie/blob/mealie-next/docs/docs/assets/other/n8n/n8n-mealie-backup.json` and click Import
 4. Click through the nodes and update the URLs for your environment

-### API Credentials
+## API Credentials

 #### Generate Mealie API Token

-1. Head to `<YOUR MEALIE INSTANCE>/user/profile/api-tokens`
-
-    !!! tip
-        If you dont see this screen make sure that "Show advanced features" is checked under `<YOUR MEALIE INSTANCE>/user/profile/edit`
-
-2. Under token name, enter the name of the token (for example, 'n8n') and hit 'Generate'
-
+1. Head to https://mealie.example.com/user/profile/api-tokens
+   > If you dont see this screen make sure that "Show advanced features" is checked under https://mealie.example.com/user/profile/edit
+2. Under token name, enter the name of the token i.e. 'n8n' and hit Generate
 3. Copy and keep this API Token somewhere safe, this is like your password!

-!!! tip
-    You can use your normal user for this, but assuming you're an admin you could also choose to create a user named n8n and generate the API key against that user.
+> You can use your normal user for this, but assuming you're an admin you could also choose to create a user named n8n and generate the API key against that user.

 #### Setup Credentials in n8n

-See also [n8n Docs](https://docs.n8n.io/credentials/add-edit-credentials/).
+> [n8n Docs](https://docs.n8n.io/credentials/add-edit-credentials/)

 1. Create a new "Header Auth" Credential

-    ![screenshot](../../assets/img/n8n/n8n-cred-app.png)
+![screenshot](../../assets/img/n8n/n8n-cred-app.png)

 2. In the connection screen set - Name as `Authorization` - Value as `Bearer {INSERT MEALIE API KEY}`

-    ![screenshot](../../assets/img/n8n/n8n-cred-connection.png)
+![screenshot](../../assets/img/n8n/n8n-cred-connection.png)

 3. In the workflow you created, for the "Run Backup", "Get All backups", and "Delete Oldies" nodes, update:
+   - Authentication to `Generic Credential Type`
+   - Generic Auth Type to `Header Auth`
+   - Header Auth to `Mealie API` or whatever you named your credentials

-    - Authentication to `Generic Credential Type`
-    - Generic Auth Type to `Header Auth`
-    - Header Auth to `Mealie API` or whatever you named your credentials
+![screenshot](../../assets/img/n8n/n8n-workflow-auth.png)

-    ![screenshot](../../assets/img/n8n/n8n-workflow-auth.png)
+## Notification Node

-### Notification Node
-
-!!! warning "Important"
-    Please use error notifications of some kind. It's very easy to set and forget an automation, then have the worst happen and lose data.
+> Please use error notifications of some kind. It's very easy to set and forget an automation, then have the worst happen and lose data.

 [ntfy](https://github.com/binwiederhier/ntfy) is a great open source, self-hostable tool for sending notifications.

--- a/docs/docs/documentation/community-guide/swag.md
+++ b/docs/docs/documentation/community-guide/swag.md
@@ -1,10 +1,11 @@
 # Using SWAG as Reverse Proxy

 !!! info
-    This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!
+	This guide was submitted by a community member. Find something wrong? Submit a PR to get it fixed!

-To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag).

+
+To make the setup of a Reverse Proxy much easier, Linuxserver.io developed [SWAG](https://github.com/linuxserver/docker-swag)
 SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx web server and reverse proxy with PHP support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.

 ## Step 1: Get a domain
--- a/docs/docs/documentation/getting-started/authentication/oidc-v2.md
+++ b/docs/docs/documentation/getting-started/authentication/oidc-v2.md
@@ -9,7 +9,7 @@

 Mealie supports 3rd party authentication via [OpenID Connect (OIDC)](https://openid.net/connect/), an identity layer built on top of OAuth2. OIDC is supported by many Identity Providers (IdP), including:

- [Authentik](https://integrations.goauthentik.io/documentation/mealie/)
+- [Authentik](https://goauthentik.io/integrations/sources/oauth/#openid-connect)
 - [Authelia](https://www.authelia.com/integration/openid-connect/mealie/)
 - [Keycloak](https://www.keycloak.org/docs/latest/securing_apps/#_oidc)
 - [Okta](https://www.okta.com/openid-connect/)
@@ -52,8 +52,6 @@ Before you can start using OIDC Authentication, you must first configure a new c

 Take the client id and your discovery URL and update your environment variables to include the required OIDC variables described in [Installation - Backend Configuration](../installation/backend-config.md#openid-connect-oidc).

-You might also want to set ALLOW_PASSWORD_LOGIN to false, to hide the username+password inputs, if you want to allow logins only via OIDC.
-
 ### Groups

 There are two (optional) [environment variables](../installation/backend-config.md#openid-connect-oidc) that can control which of the users in your IdP can log in to Mealie and what permissions they will have. Keep in mind that these groups **do not necessarily correspond to groups in Mealie**. The groups claim is configurable via the `OIDC_GROUPS_CLAIM` environment variable. The groups should be **defined in your IdP** and be returned in the configured claim value.
@@ -68,6 +66,7 @@ Example configurations for several Identity Providers have been provided by the

 If you don't see your provider and have successfully set it up, please consider [creating your own example](https://github.com/mealie-recipes/mealie/discussions/new?category=oauth-provider-example) so that others can have a smoother setup.

+
 ## Migration from Mealie v1.x

 **High level changes**
--- a/docs/docs/documentation/getting-started/authentication/oidc.md
+++ b/docs/docs/documentation/getting-started/authentication/oidc.md
@@ -36,10 +36,6 @@ Before you can start using OIDC Authentication, you must first configure a new c
        http://localhost:9091/login
        https://mealie.example.com/login

-    If you are hosting Mealie behind a reverse proxy (nginx, Caddy, ...) to terminate TLS, make sure to start Mealie's Gunicorn server
-    with `--forwarded-allow-ips=<ip-of-proxy>`, otherwise the `X-Forwarded-*` headers will be ignored and the generated OIDC redirect
-    URI will use the wrong scheme (http instead of https). This will lead to authentication errors with strict OIDC providers.
-
 3. Configure origins

    If your identity provider enforces CORS on any endpoints, you will need to specify your Mealie URL as an Allowed Origin.
--- a/docs/docs/documentation/getting-started/faq.md
+++ b/docs/docs/documentation/getting-started/faq.md
@@ -72,7 +72,7 @@
    Mealie allows you to link ingredients to specific steps in a recipe, ensuring you know exactly when to add each ingredient during the cooking process.

    **Link Ingredients to Steps in a Recipe**
-
+    
    1. Go to a recipe
    2. Click the Edit button/icon
    3. Scroll down to the step you want to link ingredients to
@@ -82,7 +82,7 @@
    7. Click 'Save' on the Recipe

    You can optionally link the same ingredient to multiple steps, which is useful for prepping an ingredient in one step and using it in another.
-
+    
 ??? question "What is fuzzy search and how do I use it?"

    ### What is fuzzy search and how do I use it?
@@ -111,7 +111,7 @@

    You can change the theme by settings the environment variables.

-    - [Backend Config - Theming](./installation/backend-config.md#theming)
+    - [Backend Config - Themeing](./installation/backend-config.md#themeing)


 ??? question "How can I change the login session timeout?"
@@ -233,7 +233,7 @@

    ### How can I use Mealie externally

-    Exposing Mealie or any service to the internet can pose significant security risks. Before proceeding, carefully evaluate the potential impacts on your system. Due to the unique nature of each network, we cannot provide specific steps for your setup.
+    Exposing Mealie or any service to the internet can pose significant security risks. Before proceeding, carefully evaluate the potential impacts on your system. Due to the unique nature of each network, we cannot provide specific steps for your setup. 

    There is a community guide available for one way to potentially set this up, and you could reach out on Discord for further discussion on what may be best for your network.

@@ -267,7 +267,7 @@

    ### Why setup Email?

-    Mealie uses email to send account invites and password resets. If you don't use these features, you don't need to set up email. There are also other methods to perform these actions that do not require the setup of Email.
+    Mealie uses email to send account invites and password resets. If you don't use these features, you don't need to set up email. There are also other methods to perform these actions that do not require the setup of Email. 

    Email settings can be adjusted via environment variables on the backend container:

--- a/docs/docs/documentation/getting-started/features.md
+++ b/docs/docs/documentation/getting-started/features.md
@@ -22,7 +22,6 @@ Mealie supports importing recipes from a few other sources besides websites. Cur
 - Recipe Keeper
 - Copy Me That
 - My Recipe Box
- DVO Cook'n X3

 You can access these options on your installation at the `/group/migrations` page on your installation. If you'd like to see another source added, feel free to request so on Github.

@@ -85,13 +84,12 @@ The meal planner has the concept of plan rules. These offer a flexible way to us

 The shopping lists feature is a great way to keep track of what you need to buy for your next meal. You can add items directly to the shopping list or link a recipe and all of it's ingredients to track meals during the week.

-Managing shopping lists can be done from the Sidebar > Shopping Lists.
+Managing shopping lists can be done from the Sidebar > Shopping Lists. 

 Here you will be able to:
-
 - See items already on the Shopping List
 - See linked recipes with ingredients
-    - Toggling via the 'Pot' icon will show you the linked recipe, allowing you to click to access it.
+    - Toggling via the 'Pot' icon will show you the linked recipe, allowing you to click to access it. 
 - Check off an item
 - Add / Change / Remove / Sort Items via the grid icon
    - Be sure if you are modifying an ingredient to click the 'Save' icon.
@@ -103,10 +101,13 @@ Here you will be able to:

 !!! tip
    You can use Labels to categorize your ingredients. You may want to Label by Food Type (Frozen, Fresh, etc), by Store, Tool, Recipe, or more. Play around with this to see what works best for you.
+    
+!!! tip
+    You can toggle 'Food' on items so that if you add multiple of the same food / ingredient, Mealie will automatically combine them together. Do this by editing an item in the Shopping List and clicking the 'Apple' icon. If you then have recipes that contain "1 | cup | cheese" and "2 | cup | cheese" this would be combined to show "3 cups of cheese."

 [See FAQ for more information](../getting-started/faq.md)

-
+    
 [Shopping List Demo](https://demo.mealie.io/shopping-lists){ .md-button .md-button--primary }

 ## Integrations
@@ -116,7 +117,6 @@ Mealie is designed to integrate with many different external services. There are
 ### Notifiers

 Notifiers are event-driven notifications sent when specific actions are performed within Mealie. Some actions include:
-
 - Creating / Updating a recipe
 - Adding items to a shopping list
 - Creating a new mealplan
@@ -195,10 +195,9 @@ Mealie lets you fully customize how you organize your users. You can use Groups

 ### Groups

-Groups are fully isolated instances of Mealie. Think of a group as a completely separate, fully self-contained site. There is no data shared between groups. Each group has its own users, recipes, tags, categories, etc. A user logged-in to one group cannot make any changes to another.
+Groups are fully isolated instances of Mealie. Think of a goup as a completely separate, fully self-contained site. There is no data shared between groups. Each group has its own users, recipes, tags, categories, etc. A user logged-in to one group cannot make any changes to another.

 Common use cases for groups include:
-
 - Hosting multiple instances of Mealie for others who want to keep their data private and secure
 - Creating completely isolated recipe pools

@@ -207,7 +206,6 @@ Common use cases for groups include:
 Households are subdivisions within a single Group. Households maintain their own users and settings, while sharing their recipes with other households. Households also share organizers (tags, categories, etc.) with the entire group. Meal Plans, Shopping Lists, and Integrations are only accessible within a household.

 Common use cases for households include:
-
 - Sharing a common recipe pool amongst families
 - Maintaining separate meal plans and shopping lists from other households
 - Maintaining separate integrations and customizations from other households
--- a/docs/docs/documentation/getting-started/installation/backend-config.md
+++ b/docs/docs/documentation/getting-started/installation/backend-config.md
@@ -4,22 +4,21 @@

 ### General

-| Variables                     |        Default        | Description                                                                                                                                             |
-| ----------------------------- | :-------------------: | ------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| PUID                          |          911          | UserID permissions between host OS and container                                                                                                        |
-| PGID                          |          911          | GroupID permissions between host OS and container                                                                                                       |
-| DEFAULT_GROUP                 |         Home          | The default group for users                                                                                                                             |
-| DEFAULT_HOUSEHOLD             |        Family         | The default household for users in each group                                                                                                           |
-| BASE_URL                      | http://localhost:8080 | Used for Notifications                                                                                                                                  |
-| TOKEN_TIME                    |          48           | The time in hours that a login/auth token is valid. Must be <= 9600 (400 days, in hours).                                                               |
-| API_PORT                      |         9000          | The port exposed by backend API. **Do not change this if you're running in Docker**                                                                     |
-| API_DOCS                      |         True          | Turns on/off access to the API documentation locally                                                                                                    |
-| TZ                            |          UTC          | Must be set to get correct date/time on the server                                                                                                      |
-| ALLOW_SIGNUP<super>\*</super> |         false         | Allow user sign-up without token                                                                                                                        |
-| ALLOW_PASSWORD_LOGIN          |         true          | Whether or not to display the username+password input fields. Keep set to true unless you use OIDC authentication                                       |
-| LOG_CONFIG_OVERRIDE           |                       | Override the config for logging with a custom path                                                                                                      |
-| LOG_LEVEL                     |         info          | Logging level (e.g. critical, error, warning, info, debug)                                                                                              |
-| DAILY_SCHEDULE_TIME           |         23:45         | The time of day to run daily server tasks, in HH:MM format. Use the server's local time, *not* UTC                                                      |
+| Variables                     |        Default        | Description                                                                                        |
+| ----------------------------- | :-------------------: | -------------------------------------------------------------------------------------------------- |
+| PUID                          |          911          | UserID permissions between host OS and container                                                   |
+| PGID                          |          911          | GroupID permissions between host OS and container                                                  |
+| DEFAULT_GROUP                 |         Home          | The default group for users                                                                        |
+| DEFAULT_HOUSEHOLD             |        Family         | The default household for users in each group                                                      |
+| BASE_URL                      | http://localhost:8080 | Used for Notifications                                                                             |
+| TOKEN_TIME                    |          48           | The time in hours that a login/auth token is valid                                                 |
+| API_PORT                      |         9000          | The port exposed by backend API. **Do not change this if you're running in Docker**                |
+| API_DOCS                      |         True          | Turns on/off access to the API documentation locally                                               |
+| TZ                            |          UTC          | Must be set to get correct date/time on the server                                                 |
+| ALLOW_SIGNUP<super>\*</super> |         false         | Allow user sign-up without token                                                                   |
+| LOG_CONFIG_OVERRIDE           |                       | Override the config for logging with a custom path                                                 |
+| LOG_LEVEL                     |         info          | Logging level (e.g. critical, error, warning, info, debug)                                         |
+| DAILY_SCHEDULE_TIME           |         23:45         | The time of day to run daily server tasks, in HH:MM format. Use the server's local time, *not* UTC |

 <super>\*</super> Starting in v1.4.0 this was changed to default to `false` as part of a security review of the application.

@@ -32,16 +31,15 @@

 ### Database

- | Variables                                               | Default  | Description                                                                                                                                                                                                                      |
- |---------------------------------------------------------|:--------:|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
- | DB_ENGINE                                               |  sqlite  | Optional: 'sqlite', 'postgres'                                                                                                                                                                                                   |
- | SQLITE_MIGRATE_JOURNAL_WAL                              |  False   | If set to true, switches SQLite's journal mode to WAL, which allows for multiple concurrent accesses. This can be useful when you have a decent amount of concurrency or when using certain remote storage systems such as Ceph. |
- | POSTGRES_USER<super>[&dagger;][secrets]</super>         |  mealie  | Postgres database user                                                                                                                                                                                                           |
- | POSTGRES_PASSWORD<super>[&dagger;][secrets]</super>     |  mealie  | Postgres database password                                                                                                                                                                                                       |
- | POSTGRES_SERVER<super>[&dagger;][secrets]</super>       | postgres | Postgres database server address                                                                                                                                                                                                 |
- | POSTGRES_PORT<super>[&dagger;][secrets]</super>         |   5432   | Postgres database port                                                                                                                                                                                                           |
- | POSTGRES_DB<super>[&dagger;][secrets]</super>           |  mealie  | Postgres database name                                                                                                                                                                                                           |
- | POSTGRES_URL_OVERRIDE<super>[&dagger;][secrets]</super> |   None   | Optional Postgres URL override to use instead of POSTGRES\_\* variables                                                                                                                                                          |
+ | Variables                                               | Default  | Description                                                             |
+ | ------------------------------------------------------- | :------: | ----------------------------------------------------------------------- |
+ | DB_ENGINE                                               |  sqlite  | Optional: 'sqlite', 'postgres'                                          |
+ | POSTGRES_USER<super>[&dagger;][secrets]</super>         |  mealie  | Postgres database user                                                  |
+ | POSTGRES_PASSWORD<super>[&dagger;][secrets]</super>     |  mealie  | Postgres database password                                              |
+ | POSTGRES_SERVER<super>[&dagger;][secrets]</super>       | postgres | Postgres database server address                                        |
+ | POSTGRES_PORT<super>[&dagger;][secrets]</super>         |   5432   | Postgres database port                                                  |
+ | POSTGRES_DB<super>[&dagger;][secrets]</super>           |  mealie  | Postgres database name                                                  |
+ | POSTGRES_URL_OVERRIDE<super>[&dagger;][secrets]</super> |   None   | Optional Postgres URL override to use instead of POSTGRES\_\* variables |

 ### Email

@@ -132,108 +130,30 @@ For custom mapping variables (e.g. OPENAI_CUSTOM_HEADERS) you should pass values
 | OPENAI_ENABLE_IMAGE_SERVICES                      |  True   | Whether to enable OpenAI image services, such as creating recipes via image. Leave this enabled unless your custom model doesn't support it, or you want to reduce costs     |
 | OPENAI_WORKERS                                    |    2    | Number of OpenAI workers per request. Higher values may increase processing speed, but will incur additional API costs                                                       |
 | OPENAI_SEND_DATABASE_DATA                         |  True   | Whether to send Mealie data to OpenAI to improve request accuracy. This will incur additional API costs                                                                      |
-| OPENAI_REQUEST_TIMEOUT                            |   300   | The number of seconds to wait for an OpenAI request to complete before cancelling the request. Leave this empty unless you're running into timeout issues on slower hardware |
+| OPENAI_REQUEST_TIMEOUT                            |   60    | The number of seconds to wait for an OpenAI request to complete before cancelling the request. Leave this empty unless you're running into timeout issues on slower hardware |

 ### Theming

 Setting the following environmental variables will change the theme of the frontend. Note that the themes are the same for all users. This is a break-change when migration from v0.x.x -> 1.x.x.

-!!! info
-    If you're setting these variables but not seeing these changes persist, try removing the `#` character. Also, depending on which syntax you're using, double-check you're using quotes correctly.
+| Variables             | Default | Description                 |
+| --------------------- | :-----: | --------------------------- |
+| THEME_LIGHT_PRIMARY   | #E58325 | Light Theme Config Variable |
+| THEME_LIGHT_ACCENT    | #007A99 | Light Theme Config Variable |
+| THEME_LIGHT_SECONDARY | #973542 | Light Theme Config Variable |
+| THEME_LIGHT_SUCCESS   | #43A047 | Light Theme Config Variable |
+| THEME_LIGHT_INFO      | #1976D2 | Light Theme Config Variable |
+| THEME_LIGHT_WARNING   | #FF6D00 | Light Theme Config Variable |
+| THEME_LIGHT_ERROR     | #EF5350 | Light Theme Config Variable |
+| THEME_DARK_PRIMARY    | #E58325 | Dark Theme Config Variable  |
+| THEME_DARK_ACCENT     | #007A99 | Dark Theme Config Variable  |
+| THEME_DARK_SECONDARY  | #973542 | Dark Theme Config Variable  |
+| THEME_DARK_SUCCESS    | #43A047 | Dark Theme Config Variable  |
+| THEME_DARK_INFO       | #1976D2 | Dark Theme Config Variable  |
+| THEME_DARK_WARNING    | #FF6D00 | Dark Theme Config Variable  |
+| THEME_DARK_ERROR      | #EF5350 | Dark Theme Config Variable  |

-    If using YAML mapping syntax, be sure to include quotes around these values, otherwise they will be treated as comments in your YAML file:<br>`THEME_LIGHT_PRIMARY: '#E58325'` or  `THEME_LIGHT_PRIMARY: 'E58325'`
-
-    If using YAML sequence syntax, don't include any quotes:<br>`THEME_LIGHT_PRIMARY=#E58325` or `THEME_LIGHT_PRIMARY=E58325`
-
-| Variables             | Default | Description                        |
-| --------------------- | :-----: | ---------------------------------- |
-| THEME_LIGHT_PRIMARY   | #E58325 | Main brand color and headers       |
-| THEME_LIGHT_ACCENT    | #007A99 | Buttons and interactive elements   |
-| THEME_LIGHT_SECONDARY | #973542 | Navigation and sidebar backgrounds |
-| THEME_LIGHT_SUCCESS   | #43A047 | Success messages and confirmations |
-| THEME_LIGHT_INFO      | #1976D2 | Information alerts and tooltips    |
-| THEME_LIGHT_WARNING   | #FF6D00 | Warning notifications              |
-| THEME_LIGHT_ERROR     | #EF5350 | Error messages and alerts          |
-| THEME_DARK_PRIMARY    | #E58325 | Main brand color and headers       |
-| THEME_DARK_ACCENT     | #007A99 | Buttons and interactive elements   |
-| THEME_DARK_SECONDARY  | #973542 | Navigation and sidebar backgrounds |
-| THEME_DARK_SUCCESS    | #43A047 | Success messages and confirmations |
-| THEME_DARK_INFO       | #1976D2 | Information alerts and tooltips    |
-| THEME_DARK_WARNING    | #FF6D00 | Warning notifications              |
-| THEME_DARK_ERROR      | #EF5350 | Error messages and alerts          |
-
-#### Theming Examples
-
-The examples below provide copy-ready Docker Compose environment configurations for three different color palettes. Copy and paste the desired theme into your `docker-compose.yml` file's environment section.
-
-!!! info
-    These themes are functional and ready to use, but they are provided primarily as examples. The color palettes can be adjusted or refined to better suit your preferences.
-
-=== "Blue Theme"
-
-    ```yaml
-    environment:
-      # Light mode colors
-      THEME_LIGHT_PRIMARY: '#5E9BD1'
-      THEME_LIGHT_ACCENT: '#A3C9E8'
-      THEME_LIGHT_SECONDARY: '#4F89BA'
-      THEME_LIGHT_SUCCESS: '#4CAF50'
-      THEME_LIGHT_INFO: '#4A9ED8'
-      THEME_LIGHT_WARNING: '#EAC46B'
-      THEME_LIGHT_ERROR: '#E57373'
-      # Dark mode colors
-      THEME_DARK_PRIMARY: '#5A8FBF'
-      THEME_DARK_ACCENT: '#90B8D9'
-      THEME_DARK_SECONDARY: '#406D96'
-      THEME_DARK_SUCCESS: '#81C784'
-      THEME_DARK_INFO: '#78B2C0'
-      THEME_DARK_WARNING: '#EBC86E'
-      THEME_DARK_ERROR: '#E57373'
-    ```
-
-=== "Green Theme"
-
-    ```yaml
-    environment:
-      # Light mode colors
-      THEME_LIGHT_PRIMARY: '#75A86C'
-      THEME_LIGHT_ACCENT: '#A8D0A6'
-      THEME_LIGHT_SECONDARY: '#638E5E'
-      THEME_LIGHT_SUCCESS: '#4CAF50'
-      THEME_LIGHT_INFO: '#4A9ED8'
-      THEME_LIGHT_WARNING: '#EAC46B'
-      THEME_LIGHT_ERROR: '#E57373'
-      # Dark mode colors
-      THEME_DARK_PRIMARY: '#739B7A'
-      THEME_DARK_ACCENT: '#9FBE9D'
-      THEME_DARK_SECONDARY: '#56775E'
-      THEME_DARK_SUCCESS: '#81C784'
-      THEME_DARK_INFO: '#78B2C0'
-      THEME_DARK_WARNING: '#EBC86E'
-      THEME_DARK_ERROR: '#E57373'
-    ```
-
-=== "Pink Theme"
-
-    ```yaml
-    environment:
-      # Light mode colors
-      THEME_LIGHT_PRIMARY: '#D97C96'
-      THEME_LIGHT_ACCENT: '#E891A7'
-      THEME_LIGHT_SECONDARY: '#C86C88'
-      THEME_LIGHT_SUCCESS: '#4CAF50'
-      THEME_LIGHT_INFO: '#2196F3'
-      THEME_LIGHT_WARNING: '#FFC107'
-      THEME_LIGHT_ERROR: '#E57373'
-      # Dark mode colors
-      THEME_DARK_PRIMARY: '#C2185B'
-      THEME_DARK_ACCENT: '#FF80AB'
-      THEME_DARK_SECONDARY: '#AD1457'
-      THEME_DARK_SUCCESS: '#81C784'
-      THEME_DARK_INFO: '#64B5F6'
-      THEME_DARK_WARNING: '#FFD54F'
-      THEME_DARK_ERROR: '#E57373'
-    ```
+### Docker Secrets

 ### Docker Secrets

--- a/docs/docs/documentation/getting-started/installation/installation-checklist.md
+++ b/docs/docs/documentation/getting-started/installation/installation-checklist.md
@@ -31,7 +31,7 @@ To deploy mealie on your local network, it is highly recommended to use Docker t
 We've gone through a few versions of Mealie v1 deployment targets. We have settled on a single container deployment, and we've begun publishing the nightly container on github containers. If you're looking to move from the old nightly (split containers _or_ the omni image) to the new nightly, there are a few things you need to do:

 1. Take a backup just in case!
-2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v3.9.2`
+2. Replace the image for the API container with `ghcr.io/mealie-recipes/mealie:v2.8.0`
 3. Take the external port from the frontend container and set that as the port mapped to port `9000` on the new container. The frontend is now served on port 9000 from the new container, so it will need to be mapped for you to have access.
 4. Restart the container

@@ -60,7 +60,7 @@ The following steps were tested on a Ubuntu 20.04 server, but should work for mo

 ## Step 3: Customizing The `docker-compose.yaml` files.

-After you've decided how to set up your files, it's important to set a few ENV variables to ensure that you can use all the features of Mealie. Verify that:
+After you've decided setup the files it's important to set a few ENV variables to ensure that you can use all the features of Mealie. I recommend that you verify and check that:

 - [x] You've configured the relevant ENV variables for your database selection in the `docker-compose.yaml` files.
 - [x] You've configured the [SMTP server settings](./backend-config.md#email) (used for invitations, password resets, etc). You can setup a [google app password](https://support.google.com/accounts/answer/185833?hl=en) if you want to send email via gmail.
@@ -117,7 +117,7 @@ The latest tag provides the latest released image of Mealie.

 ---

-**These tags are no longer updated**
+**These tags no are long updated**

 `mealie:frontend-v1.0.0beta-x` **and** `mealie:api-v1.0.0beta-x`

--- a/docs/docs/documentation/getting-started/installation/postgres.md
+++ b/docs/docs/documentation/getting-started/installation/postgres.md
@@ -1,8 +1,5 @@
 # Installing with PostgreSQL

-!!! Warning
-    When upgrading postgresql major versions, manual steps are required [Postgres#37](https://github.com/docker-library/postgres/issues/37).
-
 PostgreSQL might be considered if you need to support many concurrent users. In addition, some features are only enabled on PostgreSQL, such as fuzzy search.

 **For Environment Variable Configuration, see** [Backend Configuration](./backend-config.md)
@@ -10,7 +7,7 @@ PostgreSQL might be considered if you need to support many concurrent users. In
 ```yaml
 services:
  mealie:
-    image: ghcr.io/mealie-recipes/mealie:v3.9.2 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.8.0 # (3)
    container_name: mealie
    restart: always
    ports:
@@ -41,7 +38,7 @@ services:

  postgres:
    container_name: postgres
-    image: postgres:17
+    image: postgres:15
    restart: always
    volumes:
      - mealie-pgdata:/var/lib/postgresql/data
@@ -49,7 +46,6 @@ services:
      POSTGRES_PASSWORD: mealie
      POSTGRES_USER: mealie
      PGUSER: mealie
-      POSTGRES_DB: mealie
    healthcheck:
      test: ["CMD", "pg_isready"]
      interval: 30s
--- a/docs/docs/documentation/getting-started/installation/sqlite.md
+++ b/docs/docs/documentation/getting-started/installation/sqlite.md
@@ -11,7 +11,7 @@ SQLite is a popular, open source, self-contained, zero-configuration database th
 ```yaml
 services:
  mealie:
-    image: ghcr.io/mealie-recipes/mealie:v3.9.2 # (3)
+    image: ghcr.io/mealie-recipes/mealie:v2.8.0 # (3)
    container_name: mealie
    restart: always
    ports:
--- a/docs/docs/documentation/getting-started/introduction.md
+++ b/docs/docs/documentation/getting-started/introduction.md
@@ -28,7 +28,6 @@ Mealie is a self hosted recipe manager and meal planner with a RestAPI backend a
    - Copy Me That
    - Paprika
    - Tandoor Recipes
-    - DVO Cook'n X3
  - Random Meal Plan generation
    - Advanced rule configuration to fine tune random recipes

--- a/docs/docs/documentation/getting-started/roadmap.md
+++ b/docs/docs/documentation/getting-started/roadmap.md
@@ -2,3 +2,6 @@

 ## Feature Requests
 [Please request new features on Github](https://github.com/mealie-recipes/mealie/discussions/new?category=feature-request)
+
+## Progress
+See the [Github Projects page](https://github.com/users/hay-kot/projects/2) to see what is currently being worked on
--- a/docs/docs/documentation/getting-started/updating.md
+++ b/docs/docs/documentation/getting-started/updating.md
@@ -4,28 +4,11 @@
    You MUST read the release notes prior to upgrading your container. Mealie has a robust backup and restore system for managing your data. Pre-v1.0.0 versions of Mealie use a different database structure, so if you are upgrading from pre-v1.0.0 to v1.0.0, you MUST backup your data and then re-import it. Even if you are already on v1.0.0, it is strongly recommended to backup all data before updating.

    ### Before Upgrading
-     - [Read The Release Notes](https://github.com/mealie-recipes/mealie/releases)
+     - Read The Release Notes
     - Identify Breaking Changes
     - Create a Backup and Download from the UI
     - Upgrade

-!!! info "Improved Image Processing"
-    Starting with :octicons-tag-24: v3.7.0, we updated our image processing algorithm to improve image quality and compression. New image processing can be up to 40%-50% smaller on disk while providing higher resolution thumbnails. To take advantage of these improvements on older recipes, you can run our image-processing script:
-
-    ```shell
-    docker exec -it mealie bash
-    python /opt/mealie/lib64/python3.12/site-packages/mealie/scripts/reprocess_images.py
-    ```
-
-    ### Options
-     - `--workers N`: Number of worker threads (default: 2, safe for low-powered devices)
-     - `--force-all`: Reprocess all recipes regardless of current image state
-
-    ### Example
-    ```shell
-    python /opt/mealie/lib64/python3.12/site-packages/mealie/scripts/reprocess_images.py --workers 8
-    ```
-
 ## Upgrading to Mealie v1 or later
 If you are upgrading from pre-v1.0.0 to v1.0.0 or later (v2.0.0, etc.), make sure you read [Migrating to Mealie v1](./migrating-to-mealie-v1.md)!

--- a/docs/docs/documentation/getting-started/usage/backups-and-restoring.md
+++ b/docs/docs/documentation/getting-started/usage/backups-and-restoring.md
@@ -1,10 +1,10 @@
 # Backups and Restores

-Mealie provides an integrated mechanic for doing full installation backups of the database.
+Mealie provides an integrated mechanic for doing full installation backups of the database. 

-Navigate to Settings > Admin Settings > Backups or manually by adding `/admin/backups` to your instance URL.
+Navigate to Settings > Backups or manually by adding `/admin/backups` to your instance URL.

-From this page, you will be able to:
+From this page, you will be able to: 

 - See a list of available backups
 - Create a backup
@@ -39,7 +39,7 @@ Restoring the Database when using Postgres requires Mealie to be configured with
 ```sql
 ALTER USER mealie WITH SUPERUSER;

-- Run restore from Mealie
+# Run restore from Mealie

 ALTER USER mealie WITH NOSUPERUSER;
 ```
--- a/docs/docs/documentation/getting-started/usage/permissions-and-public-access.md
+++ b/docs/docs/documentation/getting-started/usage/permissions-and-public-access.md
@@ -1,7 +1,6 @@
 # Permissions and Public Access

 Mealie provides various levels of user access and permissions. This includes:
-
 - Authentication and registration ([LDAP](../authentication/ldap.md) and [OpenID Connect](../authentication/oidc.md) are both supported)
 - Customizable user permissions
 - Fine-tuned public access for non-users
@@ -9,12 +8,12 @@ Mealie provides various levels of user access and permissions. This includes:
 ## Customizable User Permissions

 Each user can be configured to have varying levels of access. Some of these permissions include:
-
 - Access to Administrator tools
 - Access to inviting other users
 - Access to manage their group and group data

-Administrators can configure these settings on the User Management page (navigate to Settings > Admin Settings > Users or append `/admin/manage/users` to your instance URL).
+Administrators can navigate to the Settings page and access the User Management page to configure these settings.
+

 [User Management Demo](https://demo.mealie.io/admin/manage/users){ .md-button .md-button--primary }

@@ -23,8 +22,8 @@ Administrators can configure these settings on the User Management page (navigat
 By default, groups and households are set to private, meaning only logged-in users may access the group/household. In order for a recipe to be viewable by public (not logged-in) users, three criteria must be met:

 1. The group must not be private
-2. The household must not be private, _and_ the household setting for allowing users outside of your group to see your recipes must be enabled. These can be toggled on the Household Management page (navigate to Settings > Admin Settings > Households or append `/admin/manage/households` to your instance URL)
-3. The recipe must be set to public. This can be toggled for each recipe individually, or in bulk using the Recipe Data Management page
+2. The household must not be private, *and* the household setting for allowing users outside of your group to see your recipes must be enabled. These can be toggled on the Household Settings page
+2. The recipe must be set to public. This can be toggled for each recipe individually, or in bulk using the Recipe Data Management page

 Additionally, if the group is not private, public users can view all public group data (public recipes, public cookbooks, etc.) from the home page ([e.g. the demo home page](https://demo.mealie.io/g/home)).

--- a/docs/docs/overrides/api.html
+++ b/docs/docs/overrides/api.html
--- a/docs/docs/overrides/home.html
+++ b/docs/docs/overrides/home.html
@@ -351,7 +351,7 @@
 <!-- Custom narrow footer -->
 <div class="md-footer-meta__inner md-grid">
  <div class="md-footer-social">
-    <a class="md-footer-social__link" href="https://github.com/mealie-recipes/mealie" rel="noopener" target="_blank"
+    <a class="md-footer-social__link" href="https://github.com/hay-kot/mealie" rel="noopener" target="_blank"
      title="github.com">
      <svg style="width: 32px; height: 32px" viewBox="0 0 480 512" xmlns="http://www.w3.org/2000/svg">
        <path
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@@ -32,8 +32,8 @@ theme:

 markdown_extensions:
  - pymdownx.emoji:
-      emoji_index: !!python/name:material.extensions.emoji.twemoji
-      emoji_generator: !!python/name:material.extensions.emoji.to_svg
+      emoji_index: !!python/name:materialx.emoji.twemoji
+      emoji_generator: !!python/name:materialx.emoji.to_svg
  - def_list
  - pymdownx.highlight
  - pymdownx.superfences
@@ -86,11 +86,11 @@ nav:

      - Community Guides:
          - Bring API without internet exposure: "documentation/community-guide/bring-api.md"
-          - Automating Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
+          - Automate Backups with n8n: "documentation/community-guide/n8n-backup-automation.md"
          - Bulk Url Import: "documentation/community-guide/bulk-url-import.md"
          - Home Assistant: "documentation/community-guide/home-assistant.md"
          - Import Bookmarklet: "documentation/community-guide/import-recipe-bookmarklet.md"
-          - iOS Shortcut: "documentation/community-guide/ios-shortcut.md"
+          - iOS Shortcuts: "documentation/community-guide/ios.md"
          - Reverse Proxy (SWAG): "documentation/community-guide/swag.md"

  - API Reference: "api/redoc.md"
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -0,0 +1,74 @@
+module.exports = {
+  root: true,
+  env: {
+    browser: true,
+    node: true,
+  },
+  parser: "vue-eslint-parser",
+  parserOptions: {
+    parser: "@typescript-eslint/parser",
+    requireConfigFile: false,
+    tsConfigRootDir: __dirname,
+    project: ["./tsconfig.json"],
+    extraFileExtensions: [".vue"],
+  },
+  extends: [
+    "@nuxtjs/eslint-config-typescript",
+    "plugin:nuxt/recommended",
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    // "plugin:prettier/recommended",
+    "prettier",
+  ],
+  // Re-add once we use nuxt bridge
+  // See https://v3.nuxtjs.org/getting-started/bridge#update-nuxtconfig
+  ignorePatterns: ["nuxt.config.js", "lib/api/types/**/*.ts"],
+  plugins: ["prettier"],
+  // add your custom rules here
+  rules: {
+    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+    quotes: ["error", "double"],
+    "vue/component-name-in-template-casing": ["error", "PascalCase"],
+    camelcase: 0,
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline": "off",
+    "vue/no-mutating-props": "off",
+    "vue/no-v-text-v-html-on-component": "warn",
+    "vue/no-v-for-template-key-on-child": "off",
+    "vue/valid-v-slot": [
+      "error",
+      {
+        allowModifiers: true,
+      },
+    ],
+    "@typescript-eslint/ban-ts-comment": [
+      "error",
+      {
+        "ts-ignore": "allow-with-description",
+      },
+    ],
+    "no-restricted-imports": [
+      "error",
+      { paths: ["@vue/reactivity", "@vue/runtime-dom", "@vue/composition-api", "vue-demi"] },
+    ],
+
+    // TODO Gradually activate all rules
+    // Allow Promise in onMounted
+    "@typescript-eslint/no-misused-promises": [
+      "error",
+      {
+        checksVoidReturn: {
+          arguments: false,
+        },
+      },
+    ],
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-floating-promises": "off",
+    "@typescript-eslint/no-explicit-any": "off",
+  },
+};
--- a/frontend/assets/css/fonts.css
+++ b/frontend/assets/css/fonts.css
@@ -0,0 +1,378 @@
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-cyrillic-ext1.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-cyrillic2.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-greek-ext3.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-greek4.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-vietnamese5.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-latin-ext6.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 100;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-100-latin7.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-cyrillic-ext8.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-cyrillic9.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-greek-ext10.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-greek11.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-vietnamese12.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-latin-ext13.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-300-latin14.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-cyrillic-ext15.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-cyrillic16.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-greek-ext17.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-greek18.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-vietnamese19.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-latin-ext20.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-400-latin21.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-cyrillic-ext22.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-cyrillic23.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-greek-ext24.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-greek25.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-vietnamese26.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-latin-ext27.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-500-latin28.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-cyrillic-ext29.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-cyrillic30.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-greek-ext31.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-greek32.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-vietnamese33.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-latin-ext34.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-700-latin35.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
+/* cyrillic-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-cyrillic-ext36.woff2') format('woff2');
+  unicode-range: U+0460-052F, U+1C80-1C88, U+20B4, U+2DE0-2DFF, U+A640-A69F, U+FE2E-FE2F;
+}
+/* cyrillic */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-cyrillic37.woff2') format('woff2');
+  unicode-range: U+0301, U+0400-045F, U+0490-0491, U+04B0-04B1, U+2116;
+}
+/* greek-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-greek-ext38.woff2') format('woff2');
+  unicode-range: U+1F00-1FFF;
+}
+/* greek */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-greek39.woff2') format('woff2');
+  unicode-range: U+0370-03FF;
+}
+/* vietnamese */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-vietnamese40.woff2') format('woff2');
+  unicode-range: U+0102-0103, U+0110-0111, U+0128-0129, U+0168-0169, U+01A0-01A1, U+01AF-01B0, U+1EA0-1EF9, U+20AB;
+}
+/* latin-ext */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-latin-ext41.woff2') format('woff2');
+  unicode-range: U+0100-024F, U+0259, U+1E00-1EFF, U+2020, U+20A0-20AB, U+20AD-20CF, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+/* latin */
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('~assets/fonts/Roboto-900-latin42.woff2') format('woff2');
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
+}
--- a/frontend/assets/css/main.css
+++ b/frontend/assets/css/main.css
@@ -17,11 +17,11 @@
 }

 .theme--dark.v-application {
-  background-color: rgb(var(--v-theme-background, 30, 30, 30)) !important;
+  background-color: var(--v-background-base, #1e1e1e) !important;
 }

 .theme--dark.v-navigation-drawer {
-  background-color: rgb(var(--v-theme-background, 30, 30, 30)) !important;
+  background-color: var(--v-background-base, #1e1e1e) !important;
 }

 .theme--dark.v-card {
@@ -29,15 +29,15 @@
 }

 .left-border {
-  border-left: 5px solid rgb(var(--v-theme-primary)) !important;
+  border-left: 5px solid var(--v-primary-base) !important;
 }

 .left-warning-border {
-  border-left: 5px solid rgb(var(--v-theme-warning)) !important;
+  border-left: 5px solid var(--v-warning-base) !important;
 }

 .handle {
-  cursor: grab !important;
+  cursor: grab;
 }

 .hidden {
@@ -56,15 +56,3 @@
  text-overflow: ellipsis;
  max-width: 100%;
 }
-
-a {
-  color: rgb(var(--v-theme-primary));
-}
-
-.fill-height {
-  min-height: 100vh;
-}
-
-.vue-simple-handler {
-  background-color: rgb(var(--v-theme-primary)) !important;
-}
--- a/frontend/assets/fonts/Roboto-100-cyrillic-ext1.woff2
+++ b/frontend/assets/fonts/Roboto-100-cyrillic-ext1.woff2
--- a/frontend/assets/fonts/Roboto-100-cyrillic2.woff2
+++ b/frontend/assets/fonts/Roboto-100-cyrillic2.woff2
--- a/frontend/assets/fonts/Roboto-100-greek-ext3.woff2
+++ b/frontend/assets/fonts/Roboto-100-greek-ext3.woff2
--- a/frontend/assets/fonts/Roboto-100-greek4.woff2
+++ b/frontend/assets/fonts/Roboto-100-greek4.woff2
--- a/frontend/assets/fonts/Roboto-100-latin-ext6.woff2
+++ b/frontend/assets/fonts/Roboto-100-latin-ext6.woff2
--- a/frontend/assets/fonts/Roboto-100-latin7.woff2
+++ b/frontend/assets/fonts/Roboto-100-latin7.woff2
--- a/frontend/assets/fonts/Roboto-100-vietnamese5.woff2
+++ b/frontend/assets/fonts/Roboto-100-vietnamese5.woff2
--- a/frontend/assets/fonts/Roboto-300-cyrillic-ext8.woff2
+++ b/frontend/assets/fonts/Roboto-300-cyrillic-ext8.woff2
--- a/frontend/assets/fonts/Roboto-300-cyrillic9.woff2
+++ b/frontend/assets/fonts/Roboto-300-cyrillic9.woff2
--- a/frontend/assets/fonts/Roboto-300-greek-ext10.woff2
+++ b/frontend/assets/fonts/Roboto-300-greek-ext10.woff2
--- a/frontend/assets/fonts/Roboto-300-greek11.woff2
+++ b/frontend/assets/fonts/Roboto-300-greek11.woff2
--- a/frontend/assets/fonts/Roboto-300-latin-ext13.woff2
+++ b/frontend/assets/fonts/Roboto-300-latin-ext13.woff2
--- a/frontend/assets/fonts/Roboto-300-latin14.woff2
+++ b/frontend/assets/fonts/Roboto-300-latin14.woff2
--- a/frontend/assets/fonts/Roboto-300-vietnamese12.woff2
+++ b/frontend/assets/fonts/Roboto-300-vietnamese12.woff2
--- a/frontend/assets/fonts/Roboto-400-cyrillic-ext15.woff2
+++ b/frontend/assets/fonts/Roboto-400-cyrillic-ext15.woff2
--- a/frontend/assets/fonts/Roboto-400-cyrillic16.woff2
+++ b/frontend/assets/fonts/Roboto-400-cyrillic16.woff2
--- a/frontend/assets/fonts/Roboto-400-greek-ext17.woff2
+++ b/frontend/assets/fonts/Roboto-400-greek-ext17.woff2
--- a/frontend/assets/fonts/Roboto-400-greek18.woff2
+++ b/frontend/assets/fonts/Roboto-400-greek18.woff2
--- a/frontend/assets/fonts/Roboto-400-latin-ext20.woff2
+++ b/frontend/assets/fonts/Roboto-400-latin-ext20.woff2
--- a/frontend/assets/fonts/Roboto-400-latin21.woff2
+++ b/frontend/assets/fonts/Roboto-400-latin21.woff2
--- a/frontend/assets/fonts/Roboto-400-vietnamese19.woff2
+++ b/frontend/assets/fonts/Roboto-400-vietnamese19.woff2
--- a/frontend/assets/fonts/Roboto-500-cyrillic-ext22.woff2
+++ b/frontend/assets/fonts/Roboto-500-cyrillic-ext22.woff2
--- a/frontend/assets/fonts/Roboto-500-cyrillic23.woff2
+++ b/frontend/assets/fonts/Roboto-500-cyrillic23.woff2
--- a/frontend/assets/fonts/Roboto-500-greek-ext24.woff2
+++ b/frontend/assets/fonts/Roboto-500-greek-ext24.woff2
--- a/frontend/assets/fonts/Roboto-500-greek25.woff2
+++ b/frontend/assets/fonts/Roboto-500-greek25.woff2
--- a/frontend/assets/fonts/Roboto-500-latin-ext27.woff2
+++ b/frontend/assets/fonts/Roboto-500-latin-ext27.woff2
--- a/frontend/assets/fonts/Roboto-500-latin28.woff2
+++ b/frontend/assets/fonts/Roboto-500-latin28.woff2
--- a/frontend/assets/fonts/Roboto-500-vietnamese26.woff2
+++ b/frontend/assets/fonts/Roboto-500-vietnamese26.woff2
--- a/frontend/assets/fonts/Roboto-700-cyrillic-ext29.woff2
+++ b/frontend/assets/fonts/Roboto-700-cyrillic-ext29.woff2
--- a/frontend/assets/fonts/Roboto-700-cyrillic30.woff2
+++ b/frontend/assets/fonts/Roboto-700-cyrillic30.woff2
--- a/frontend/assets/fonts/Roboto-700-greek-ext31.woff2
+++ b/frontend/assets/fonts/Roboto-700-greek-ext31.woff2
--- a/frontend/assets/fonts/Roboto-700-greek32.woff2
+++ b/frontend/assets/fonts/Roboto-700-greek32.woff2
--- a/frontend/assets/fonts/Roboto-700-latin-ext34.woff2
+++ b/frontend/assets/fonts/Roboto-700-latin-ext34.woff2
--- a/frontend/assets/fonts/Roboto-700-latin35.woff2
+++ b/frontend/assets/fonts/Roboto-700-latin35.woff2
--- a/frontend/assets/fonts/Roboto-700-vietnamese33.woff2
+++ b/frontend/assets/fonts/Roboto-700-vietnamese33.woff2
--- a/frontend/assets/fonts/Roboto-900-cyrillic-ext36.woff2
+++ b/frontend/assets/fonts/Roboto-900-cyrillic-ext36.woff2
--- a/frontend/assets/fonts/Roboto-900-cyrillic37.woff2
+++ b/frontend/assets/fonts/Roboto-900-cyrillic37.woff2
--- a/frontend/assets/fonts/Roboto-900-greek-ext38.woff2
+++ b/frontend/assets/fonts/Roboto-900-greek-ext38.woff2
--- a/frontend/assets/fonts/Roboto-900-greek39.woff2
+++ b/frontend/assets/fonts/Roboto-900-greek39.woff2
--- a/frontend/assets/fonts/Roboto-900-latin-ext41.woff2
+++ b/frontend/assets/fonts/Roboto-900-latin-ext41.woff2
--- a/frontend/assets/fonts/Roboto-900-latin42.woff2
+++ b/frontend/assets/fonts/Roboto-900-latin42.woff2
--- a/frontend/assets/fonts/Roboto-900-vietnamese40.woff2
+++ b/frontend/assets/fonts/Roboto-900-vietnamese40.woff2
--- a/frontend/components/Domain/Admin/Setup/EndPageContent.vue
+++ b/frontend/components/Domain/Admin/Setup/EndPageContent.vue
@@ -1,121 +0,0 @@
-<template>
-  <v-container max-width="880" class="end-page-content">
-    <div class="d-flex flex-column ga-6">
-      <div>
-        <v-card-title class="text-h4 justify-center">
-          {{ $t('admin.setup.setup-complete') }}
-        </v-card-title>
-        <v-card-subtitle class="justify-center">
-          {{ $t('admin.setup.here-are-a-few-things-to-help-you-get-started') }}
-        </v-card-subtitle>
-      </div>
-      <div
-        v-for="section, idx in sections"
-        :key="idx"
-        class="d-flex flex-column ga-3"
-      >
-        <v-card-title class="text-h6 pl-0">
-          {{ section.title }}
-        </v-card-title>
-        <div class="sections d-flex flex-column ga-2">
-          <v-card
-            v-for="link, linkIdx in section.links"
-            :key="linkIdx"
-            clas="link-card"
-            :href="link.to"
-            :title="link.text"
-            :subtitle="link.description"
-            :append-icon="$globals.icons.chevronRight"
-          >
-            <template #prepend>
-              <v-avatar :icon="link.icon || undefined" variant="tonal" :color="section.color" />
-            </template>
-          </v-card>
-        </div>
-      </div>
-    </div>
-  </v-container>
-</template>
-
-<script lang="ts">
-export default defineNuxtComponent({
-  setup() {
-    const i18n = useI18n();
-    const $auth = useMealieAuth();
-    const groupSlug = computed(() => $auth.user.value?.groupSlug);
-    const { $globals } = useNuxtApp();
-
-    const sections = ref([
-      {
-        title: i18n.t("profile.data-migrations"),
-        color: "info",
-        links: [
-          {
-            icon: $globals.icons.backupRestore,
-            to: "/admin/backups",
-            text: i18n.t("settings.backup.backup-restore"),
-            description: i18n.t("admin.setup.restore-from-v1-backup"),
-          },
-          {
-            icon: $globals.icons.import,
-            to: "/group/migrations",
-            text: i18n.t("migration.recipe-migration"),
-            description: i18n.t("migration.coming-from-another-application-or-an-even-older-version-of-mealie"),
-          },
-        ],
-      },
-      {
-        title: i18n.t("recipe.create-recipes"),
-        color: "success",
-        links: [
-          {
-            icon: $globals.icons.createAlt,
-            to: computed(() => `/g/${groupSlug.value || ""}/r/create/new`),
-            text: i18n.t("recipe.create-recipe"),
-            description: i18n.t("recipe.create-recipe-description"),
-          },
-          {
-            icon: $globals.icons.link,
-            to: computed(() => `/g/${groupSlug.value || ""}/r/create/url`),
-            text: i18n.t("recipe.import-with-url"),
-            description: i18n.t("recipe.scrape-recipe-description"),
-          },
-        ],
-      },
-      {
-        title: i18n.t("user.manage-users"),
-        color: "primary",
-        links: [
-          {
-            icon: $globals.icons.group,
-            to: "/admin/manage/users",
-            text: i18n.t("user.manage-users"),
-            description: i18n.t("user.manage-users-description"),
-          },
-          {
-            icon: $globals.icons.user,
-            to: "/user/profile",
-            text: i18n.t("profile.manage-user-profile"),
-            description: i18n.t("admin.setup.manage-profile-or-get-invite-link"),
-          },
-        ],
-      },
-    ]);
-    return { sections };
-  },
-});
-</script>
-
-<style>
-.v-container {
-  .v-card-title,
-  .v-card-subtitle {
-    padding: 0;
-    white-space: unset;
-  }
-
-  .v-card-item {
-    gap: 0.5rem;
-  }
-}
-</style>
--- a/frontend/components/Domain/Cookbook/CookbookEditor.vue
+++ b/frontend/components/Domain/Cookbook/CookbookEditor.vue
@@ -1,41 +1,17 @@
 <template>
  <div>
-    <v-card-text
-      v-if="cookbook"
-      class="px-1"
-    >
-      <v-text-field
-        v-model="cookbook.name"
-        :label="$t('cookbook.cookbook-name')"
-        variant="underlined"
-        color="primary"
-      />
-      <v-textarea
-        v-model="cookbook.description"
-        auto-grow
-        :rows="2"
-        :label="$t('recipe.description')"
-        variant="underlined"
-        color="primary"
-      />
+    <v-card-text v-if="cookbook" class="px-1">
+      <v-text-field v-model="cookbook.name" :label="$t('cookbook.cookbook-name')"></v-text-field>
+      <v-textarea v-model="cookbook.description" auto-grow :rows="2" :label="$t('recipe.description')"></v-textarea>
      <QueryFilterBuilder
        :field-defs="fieldDefs"
        :initial-query-filter="cookbook.queryFilter"
        @input="handleInput"
      />
-      <v-switch
-        v-model="cookbook.public"
-        hide-details
-        single-line
-        color="primary"
-      >
+      <v-switch v-model="cookbook.public" hide-details single-line>
        <template #label>
          {{ $t('cookbook.public-cookbook') }}
-          <HelpIcon
-            size="small"
-            right
-            class="ml-2"
-          >
+          <HelpIcon small right class="ml-2">
            {{ $t('cookbook.public-cookbook-description') }}
          </HelpIcon>
        </template>
@@ -44,59 +20,74 @@
  </div>
 </template>

-<script setup lang="ts">
+<script lang="ts">
+import { defineComponent, useContext } from "@nuxtjs/composition-api";
+import { ReadCookBook } from "~/lib/api/types/cookbook";
 import { Organizer } from "~/lib/api/types/non-generated";
 import QueryFilterBuilder from "~/components/Domain/QueryFilterBuilder.vue";
-import type { FieldDefinition } from "~/composables/use-query-filter-builder";
-import type { ReadCookBook } from "~/lib/api/types/cookbook";
+import { FieldDefinition } from "~/composables/use-query-filter-builder";

-const modelValue = defineModel<ReadCookBook>({ required: true });
-const i18n = useI18n();
-const cookbook = toRef(modelValue);
-function handleInput(value: string | undefined) {
-  cookbook.value.queryFilterString = value || "";
-}
+export default defineComponent({
+  components: { QueryFilterBuilder },
+  props: {
+    cookbook: {
+      type: Object as () => ReadCookBook,
+      required: true,
+    },
+    actions: {
+      type: Object as () => any,
+      required: true,
+    },
+  },
+  setup(props) {
+    const { i18n } = useContext();

-const fieldDefs: FieldDefinition[] = [
-  {
-    name: "recipe_category.id",
-    label: i18n.t("category.categories"),
-    type: Organizer.Category,
+    function handleInput(value: string | undefined) {
+      props.cookbook.queryFilterString = value || "";
+    }
+
+    const fieldDefs: FieldDefinition[] = [
+      {
+        name: "recipe_category.id",
+        label: i18n.tc("category.categories"),
+        type: Organizer.Category,
+      },
+      {
+        name: "tags.id",
+        label: i18n.tc("tag.tags"),
+        type: Organizer.Tag,
+      },
+      {
+        name: "recipe_ingredient.food.id",
+        label: i18n.tc("recipe.ingredients"),
+        type: Organizer.Food,
+      },
+      {
+        name: "tools.id",
+        label: i18n.tc("tool.tools"),
+        type: Organizer.Tool,
+      },
+      {
+        name: "household_id",
+        label: i18n.tc("household.households"),
+        type: Organizer.Household,
+      },
+      {
+        name: "created_at",
+        label: i18n.tc("general.date-created"),
+        type: "date",
+      },
+      {
+        name: "updated_at",
+        label: i18n.tc("general.date-updated"),
+        type: "date",
+      },
+    ];
+
+    return {
+      handleInput,
+      fieldDefs,
+    };
  },
-  {
-    name: "tags.id",
-    label: i18n.t("tag.tags"),
-    type: Organizer.Tag,
-  },
-  {
-    name: "recipe_ingredient.food.id",
-    label: i18n.t("recipe.ingredients"),
-    type: Organizer.Food,
-  },
-  {
-    name: "tools.id",
-    label: i18n.t("tool.tools"),
-    type: Organizer.Tool,
-  },
-  {
-    name: "household_id",
-    label: i18n.t("household.households"),
-    type: Organizer.Household,
-  },
-  {
-    name: "user_id",
-    label: i18n.t("user.users"),
-    type: Organizer.User,
-  },
-  {
-    name: "created_at",
-    label: i18n.t("general.date-created"),
-    type: "date",
-  },
-  {
-    name: "updated_at",
-    label: i18n.t("general.date-updated"),
-    type: "date",
-  },
-];
+});
 </script>
--- a/frontend/components/Domain/Cookbook/CookbookPage.vue
+++ b/frontend/components/Domain/Cookbook/CookbookPage.vue
@@ -7,56 +7,44 @@
      width="100%"
      max-width="1100px"
      :icon="$globals.icons.pages"
-      :title="$t('general.edit')"
+      :title="$tc('general.edit')"
      :submit-icon="$globals.icons.save"
-      :submit-text="$t('general.save')"
+      :submit-text="$tc('general.save')"
      :submit-disabled="!editTarget.queryFilterString"
-      can-submit
      @submit="editCookbook"
    >
      <v-card-text>
-        <CookbookEditor
-          v-model="editTarget"
-        />
+        <CookbookEditor :cookbook="editTarget" :actions="actions" />
      </v-card-text>
    </BaseDialog>

-    <v-container
-      v-if="book"
-      class="my-0"
-    >
-      <v-sheet
-        color="transparent"
-        class="d-flex flex-column w-100 pa-0 ma-0"
-        elevation="0"
-      >
-        <div class="d-flex align-center w-100 mb-2">
-          <v-toolbar-title class="headline mb-0">
-            <v-icon size="large" class="mr-3">
-              {{ $globals.icons.pages }}
-            </v-icon>
-            {{ book.name }}
-          </v-toolbar-title>
-          <BaseButton
-            v-if="canEdit"
-            class="mx-1"
-            :edit="true"
-            @click="handleEditCookbook"
-          />
-        </div>
-        <div v-if="book.description" class="subtitle-1 text-grey-lighten-1 mb-2">
+    <!-- Page -->
+    <v-container v-if="book" fluid>
+      <v-app-bar color="transparent" flat class="mt-n1">
+        <v-icon large left> {{ $globals.icons.pages }} </v-icon>
+        <v-toolbar-title class="headline"> {{ book.name }} </v-toolbar-title>
+        <v-spacer></v-spacer>
+        <BaseButton
+          v-if="canEdit"
+          class="mx-1"
+          :edit="true"
+          @click="handleEditCookbook"
+        />
+      </v-app-bar>
+      <v-card flat>
+        <v-card-text class="py-0">
          {{ book.description }}
-        </div>
-      </v-sheet>
+        </v-card-text>
+      </v-card>

      <v-container class="pa-0">
        <RecipeCardSection
          class="mb-5 mx-1"
          :recipes="recipes"
          :query="{ cookbook: slug }"
-          @sort-recipes="assignSorted"
-          @replace-recipes="replaceRecipes"
-          @append-recipes="appendRecipes"
+          @sortRecipes="assignSorted"
+          @replaceRecipes="replaceRecipes"
+          @appendRecipes="appendRecipes"
          @delete="removeRecipe"
        />
      </v-container>
@@ -64,67 +52,92 @@
  </div>
 </template>

-<script setup lang="ts">
-import { useLazyRecipes } from "~/composables/recipes";
-import RecipeCardSection from "@/components/Domain/Recipe/RecipeCardSection.vue";
-import { useCookbookStore } from "~/composables/store/use-cookbook-store";
-import { useCookbook } from "~/composables/use-group-cookbooks";
-import { useLoggedInState } from "~/composables/use-logged-in-state";
-import type { ReadCookBook } from "~/lib/api/types/cookbook";
-import CookbookEditor from "~/components/Domain/Cookbook/CookbookEditor.vue";
+  <script lang="ts">
+  import { computed, defineComponent, useRoute, ref, useContext, useMeta, reactive, useRouter } from "@nuxtjs/composition-api";
+  import { useLazyRecipes } from "~/composables/recipes";
+  import RecipeCardSection from "@/components/Domain/Recipe/RecipeCardSection.vue";
+  import { useCookbook, useCookbooks } from "~/composables/use-group-cookbooks";
+  import { useLoggedInState } from "~/composables/use-logged-in-state";
+  import { RecipeCookBook } from "~/lib/api/types/cookbook";
+  import CookbookEditor from "~/components/Domain/Cookbook/CookbookEditor.vue";

-const $auth = useMealieAuth();
-const { isOwnGroup } = useLoggedInState();
+  export default defineComponent({
+    components: { RecipeCardSection, CookbookEditor },
+    setup() {
+      const { $auth } = useContext();
+      const { isOwnGroup } = useLoggedInState();

-const route = useRoute();
-const groupSlug = computed(() => route.params.groupSlug as string || $auth.user.value?.groupSlug || "");
+      const route = useRoute();
+      const groupSlug = computed(() => route.value.params.groupSlug || $auth.user?.groupSlug || "");

-const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
-const slug = route.params.slug as string;
-const { getOne } = useCookbook(isOwnGroup.value ? null : groupSlug.value);
-const { actions } = useCookbookStore();
-const router = useRouter();
+      const { recipes, appendRecipes, assignSorted, removeRecipe, replaceRecipes } = useLazyRecipes(isOwnGroup.value ? null : groupSlug.value);
+      const slug = route.value.params.slug;
+      const { getOne } = useCookbook(isOwnGroup.value ? null : groupSlug.value);
+      const { actions } = useCookbooks();
+      const router = useRouter();

-const book = getOne(slug);
+      const tab = ref(null);
+      const book = getOne(slug);

-const isOwnHousehold = computed(() => {
-  if (!($auth.user.value && book.value?.householdId)) {
-    return false;
-  }
+      const isOwnHousehold = computed(() => {
+        if (!($auth.user && book.value?.householdId)) {
+          return false;
+        }

-  return $auth.user.value.householdId === book.value.householdId;
-});
-const canEdit = computed(() => isOwnGroup.value && isOwnHousehold.value);
+        return $auth.user.householdId === book.value.householdId;
+      })
+      const canEdit = computed(() => isOwnGroup.value && isOwnHousehold.value);

-const dialogStates = reactive({
-  edit: false,
-});
+      const dialogStates = reactive({
+        edit: false,
+      });

-const editTarget = ref<ReadCookBook | null>(null);
-function handleEditCookbook() {
-  dialogStates.edit = true;
-  editTarget.value = book.value;
-}
+      const editTarget = ref<RecipeCookBook | null>(null);
+      function handleEditCookbook() {
+        dialogStates.edit = true;
+        editTarget.value = book.value;
+      }

-async function editCookbook() {
-  if (!editTarget.value) {
-    return;
-  }
-  const response = await actions.updateOne(editTarget.value);
+      async function editCookbook() {
+        if (!editTarget.value) {
+          return;
+        }
+        const response = await actions.updateOne(editTarget.value);

-  if (response?.slug && book.value?.slug !== response?.slug) {
-    // if name changed, redirect to new slug
-    router.push(`/g/${route.params.groupSlug}/cookbooks/${response?.slug}`);
-  }
-  else {
-    // otherwise reload the page, since the recipe criteria changed
-    router.go(0);
-  }
-  dialogStates.edit = false;
-  editTarget.value = null;
-}
+        if (response?.slug && book.value?.slug !== response?.slug) {
+          // if name changed, redirect to new slug
+          router.push(`/g/${route.value.params.groupSlug}/cookbooks/${response?.slug}`);
+        } else {
+          // otherwise reload the page, since the recipe criteria changed
+          router.go(0);
+        }
+        dialogStates.edit = false;
+        editTarget.value = null;
+      }

-useSeoMeta({
-  title: book?.value?.name || "Cookbook",
-});
-</script>
+      useMeta(() => {
+        return {
+          title: book?.value?.name || "Cookbook",
+        };
+      });
+
+      return {
+        book,
+        slug,
+        tab,
+        appendRecipes,
+        assignSorted,
+        recipes,
+        removeRecipe,
+        replaceRecipes,
+        canEdit,
+        dialogStates,
+        editTarget,
+        handleEditCookbook,
+        editCookbook,
+        actions,
+      };
+    },
+    head: {}, // Must include for useMeta
+  });
+  </script>
--- a/Show More
+++ b/Show More