feature: Organizations link and invitation flow implemented minimally.

Reviewed-on: http://178.131.50.201:3000/admin/dyolink/pulls/13

.gitea/workflows/registry-build-deploy.yml

@@ -9,13 +9,22 @@
 #   REGISTRY_USERNAME    Gitea username for docker login
 #   REGISTRY_PASSWORD    Gitea access token (packages:read/write) or account password
 #
+# HTTP registry (typical self-hosted Gitea): Docker defaults to HTTPS. If login/push fails with
+#   "server gave HTTP response to HTTPS client", add REGISTRY_HOST (e.g. 192.168.1.100:3000) to the
+#   Docker daemon "insecure-registries" on the RUNNER machine, then restart Docker (Docker Desktop
+#   → Settings → Docker Engine → JSON → "insecure-registries": ["host:port"]).
+#
 # Optional:
 #   STAGING_HTTP_PORT       host port for nginx (default 8088)
 #
-# Required for deploy job (absolute path on the runner host — forward slashes ok on Windows):
+# Required for deploy job (absolute path on the runner host):
 #   DEPLOY_SECRETS_DIR      folder containing database.staging.env + backend.staging.env
 #
-# Runner: self-hosted with Docker; Git Bash recommended on Windows (shell: bash).
+# Runner: self-hosted with Docker. Default shell is powershell (Windows act_runner often has no WSL bash).
+# For a Linux runner, change defaults.run.shell to bash and restore bash syntax if needed.
+#
+# We do NOT use gitea.com/actions/checkout — many restricted networks cannot reach gitea.com.
+# Checkout is a plain git clone from the same Gitea host.
 
 name: Registry — build, push, deploy
 
@@ -26,92 +35,192 @@ on:
 
 defaults:
   run:
-    shell: bash
+    shell: powershell
 
 jobs:
-  build-and-push:
-    runs-on: self-hosted
-    outputs:
-      image_tag: ${{ steps.meta.outputs.image_tag }}
-    steps:
-      - name: Checkout
-        uses: https://gitea.com/actions/checkout@v4
-
-      - name: Image tag and registry prefix
-        id: meta
-        run: |
-          echo "image_tag=$(git rev-parse --short HEAD)" >> "$GITHUB_OUTPUT"
-          echo "REGISTRY_PREFIX=${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}" >> "$GITHUB_ENV"
-
-      - name: Log in to container registry
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ vars.REGISTRY_HOST }}" \
-            -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
-
-      - name: Build and push backend
-        run: |
-          TAG="${{ steps.meta.outputs.image_tag }}"
-          docker build \
-            -t "${REGISTRY_PREFIX}/dyolink-backend:${TAG}" \
-            -t "${REGISTRY_PREFIX}/dyolink-backend:latest" \
-            ./backend
-          docker push "${REGISTRY_PREFIX}/dyolink-backend:${TAG}"
-          docker push "${REGISTRY_PREFIX}/dyolink-backend:latest"
-
-      - name: Build and push frontend
-        env:
-          PUBLIC_BASE_URL: ${{ vars.PUBLIC_BASE_URL }}
-        run: |
-          TAG="${{ steps.meta.outputs.image_tag }}"
-          docker build \
-            --build-arg NEXT_PUBLIC_API_URL="${PUBLIC_BASE_URL}/api" \
-            --build-arg NEXT_PUBLIC_APP_URL="${PUBLIC_BASE_URL}" \
-            --build-arg NEXT_PUBLIC_APP_NAME="Dyolink" \
-            -t "${REGISTRY_PREFIX}/dyolink-frontend:${TAG}" \
-            -t "${REGISTRY_PREFIX}/dyolink-frontend:latest" \
-            ./frontend
-          docker push "${REGISTRY_PREFIX}/dyolink-frontend:${TAG}"
-          docker push "${REGISTRY_PREFIX}/dyolink-frontend:latest"
-
-  deploy:
-    needs: build-and-push
+  temp-success:
     runs-on: self-hosted
     steps:
-      - name: Checkout infrastructure only
-        uses: https://gitea.com/actions/checkout@v4
-        with:
-          sparse-checkout: |
-            infrastructure
-          sparse-checkout-cone-mode: true
-
-      - name: Write deploy.registry.env and validate secrets path
+      - name: Temporary placeholder (always success)
         run: |
-          SD='${{ vars.DEPLOY_SECRETS_DIR }}'
-          if [ -z "$SD" ]; then
-            echo "Set repository variable DEPLOY_SECRETS_DIR to the absolute path on this runner"
-            echo "where database.staging.env and backend.staging.env live (not in git)."
-            exit 1
-          fi
-          test -f "${SD}/database.staging.env" || { echo "Missing ${SD}/database.staging.env"; exit 1; }
-          test -f "${SD}/backend.staging.env" || { echo "Missing ${SD}/backend.staging.env"; exit 1; }
-          cd infrastructure
-          STAGING_PORT='${{ vars.STAGING_HTTP_PORT }}'
-          STAGING_PORT="${STAGING_PORT:-8088}"
-          {
-            echo "REGISTRY_PREFIX=${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}"
-            echo "IMAGE_TAG=${{ needs.build-and-push.outputs.image_tag }}"
-            echo "STAGING_HTTP_PORT=${STAGING_PORT}"
-            echo "DEPLOY_SECRETS_DIR=${SD}"
-          } > deploy.registry.env
+          $ErrorActionPreference = 'Stop'
+          Write-Host "Temporary workflow is active."
+          Write-Host "Trigger: ${{ github.event_name }}"
+          Write-Host "Branch:  ${{ github.ref_name }}"
+          Write-Host "Commit:  ${{ github.sha }}"
+          Write-Host "Production build/push/deploy steps are intentionally commented."
+          exit 0
 
-      - name: Log in to container registry (for pull)
-        run: |
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login "${{ vars.REGISTRY_HOST }}" \
-            -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
+  # ---------------------------------------------------------------------------
+  # Production pipeline is temporarily disabled.
+  # Uncomment these jobs after split-DNS / registry reachability is fixed.
+  # ---------------------------------------------------------------------------
+  #
+  # build-and-push:
+  #   runs-on: self-hosted
+  #   outputs:
+  #     image_tag: ${{ steps.meta.outputs.image_tag }}
+  #   steps:
+  #     - name: Checkout (clone from this Gitea — no gitea.com)
+  #     - name: Image tag and registry prefix
+  #     - name: Log in to container registry
+  #     - name: Build and push backend
+  #     - name: Build and push frontend
+  #
+  # deploy:
+  #   needs: build-and-push
+  #   runs-on: self-hosted
+  #   steps:
+  #     - name: Checkout (shallow clone from this Gitea — no gitea.com)
+  #     - name: Write deploy.registry.env and validate secrets path
+  #     - name: Log in to container registry (for pull)
+  #     - name: Pull and start stack
+
+
+
+  ####SAMPLE
+  # name: Registry — build, push, deploy
+
+  # on:
+  #   push:
+  #     branches: [main, master]
+  #   workflow_dispatch:
+
+  # defaults:
+  #   run:
+  #     shell: powershell
+
+  # jobs:
+  #   build-and-push:
+  #     runs-on: self-hosted
+  #     outputs:
+  #       image_tag: ${{ steps.meta.outputs.image_tag }}
+  #     steps:
+  #       - name: Checkout (clone from this Gitea — no gitea.com)
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $Server = "${{ github.server_url }}".TrimEnd('/')
+  #           $Repo = "${{ github.repository }}"
+  #           $Branch = "${{ github.ref_name }}"
+  #           $Token = "${{ github.token }}"
+  #           $Actor = "${{ github.actor }}"
+  #           $hp = $Server -replace '^https?://', ''
+  #           if ($Server.StartsWith('https')) {
+  #             $cloneUrl = 'https://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
+  #           } else {
+  #             $cloneUrl = 'http://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
+  #           }
+  #           $env:GIT_TERMINAL_PROMPT = '0'
+  #           git clone --depth 1 --branch $Branch $cloneUrl .
+
+  #       - name: Image tag and registry prefix
+  #         id: meta
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $short = (git rev-parse --short HEAD).Trim()
+  #           $utf8 = New-Object System.Text.UTF8Encoding $false
+  #           [System.IO.File]::AppendAllText($env:GITHUB_OUTPUT, "image_tag=$short`n", $utf8)
+  #           $prefix = "${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}"
+  #           [System.IO.File]::AppendAllText($env:GITHUB_ENV, "REGISTRY_PREFIX=$prefix`n", $utf8)
+
+  #       - name: Log in to container registry
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $pass = @'
+  #           ${{ secrets.REGISTRY_PASSWORD }}
+  #           '@
+  #           $pass.Trim() | docker login "${{ vars.REGISTRY_HOST }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
+
+  #       - name: Build and push backend
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $tag = "${{ steps.meta.outputs.image_tag }}"
+  #           docker build `
+  #             -t "$env:REGISTRY_PREFIX/dyolink-backend:$tag" `
+  #             -t "$env:REGISTRY_PREFIX/dyolink-backend:latest" `
+  #             ./backend
+  #           docker push "$env:REGISTRY_PREFIX/dyolink-backend:$tag"
+  #           docker push "$env:REGISTRY_PREFIX/dyolink-backend:latest"
+
+  #       - name: Build and push frontend
+  #         env:
+  #           PUBLIC_BASE_URL: ${{ vars.PUBLIC_BASE_URL }}
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $tag = "${{ steps.meta.outputs.image_tag }}"
+  #           $base = $env:PUBLIC_BASE_URL
+  #           docker build `
+  #             --build-arg "NEXT_PUBLIC_API_URL=$base/api" `
+  #             --build-arg "NEXT_PUBLIC_APP_URL=$base" `
+  #             --build-arg "NEXT_PUBLIC_APP_NAME=Dyolink" `
+  #             -t "$env:REGISTRY_PREFIX/dyolink-frontend:$tag" `
+  #             -t "$env:REGISTRY_PREFIX/dyolink-frontend:latest" `
+  #             ./frontend
+  #           docker push "$env:REGISTRY_PREFIX/dyolink-frontend:$tag"
+  #           docker push "$env:REGISTRY_PREFIX/dyolink-frontend:latest"
+
+  #   deploy:
+  #     needs: build-and-push
+  #     runs-on: self-hosted
+  #     steps:
+  #       - name: Checkout (shallow clone from this Gitea — no gitea.com)
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $Server = "${{ github.server_url }}".TrimEnd('/')
+  #           $Repo = "${{ github.repository }}"
+  #           $Branch = "${{ github.ref_name }}"
+  #           $Token = "${{ github.token }}"
+  #           $Actor = "${{ github.actor }}"
+  #           $hp = $Server -replace '^https?://', ''
+  #           if ($Server.StartsWith('https')) {
+  #             $cloneUrl = 'https://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
+  #           } else {
+  #             $cloneUrl = 'http://' + $Actor + ':' + $Token + '@' + $hp + '/' + $Repo + '.git'
+  #           }
+  #           $env:GIT_TERMINAL_PROMPT = '0'
+  #           git clone --depth 1 --branch $Branch $cloneUrl .
+
+  #       - name: Write deploy.registry.env and validate secrets path
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $SD = '${{ vars.DEPLOY_SECRETS_DIR }}'.Trim()
+  #           if ([string]::IsNullOrWhiteSpace($SD)) {
+  #             Write-Host "Set repository variable DEPLOY_SECRETS_DIR to the absolute path on this runner"
+  #             Write-Host "where database.staging.env and backend.staging.env live (not in git)."
+  #             exit 1
+  #           }
+  #           if (-not (Test-Path (Join-Path $SD "database.staging.env"))) {
+  #             Write-Host "Missing $(Join-Path $SD 'database.staging.env')"
+  #             exit 1
+  #           }
+  #           if (-not (Test-Path (Join-Path $SD "backend.staging.env"))) {
+  #             Write-Host "Missing $(Join-Path $SD 'backend.staging.env')"
+  #             exit 1
+  #           }
+  #           $stagingPort = '${{ vars.STAGING_HTTP_PORT }}'.Trim()
+  #           if ([string]::IsNullOrWhiteSpace($stagingPort)) { $stagingPort = '8088' }
+  #           $imageTag = "${{ needs.build-and-push.outputs.image_tag }}"
+  #           $lines = @(
+  #             "REGISTRY_PREFIX=${{ vars.REGISTRY_HOST }}/${{ vars.REGISTRY_OWNER }}",
+  #             "IMAGE_TAG=$imageTag",
+  #             "STAGING_HTTP_PORT=$stagingPort",
+  #             "DEPLOY_SECRETS_DIR=$SD"
+  #           )
+  #           Set-Location infrastructure
+  #           $lines | Set-Content -Path deploy.registry.env -Encoding utf8
+
+  #       - name: Log in to container registry (for pull)
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           $pass = @'
+  #           ${{ secrets.REGISTRY_PASSWORD }}
+  #           '@
+  #           $pass.Trim() | docker login "${{ vars.REGISTRY_HOST }}" -u "${{ secrets.REGISTRY_USERNAME }}" --password-stdin
+
+  #       - name: Pull and start stack
+  #         run: |
+  #           $ErrorActionPreference = 'Stop'
+  #           Set-Location infrastructure
+  #           docker compose -f docker-compose.registry.yml --env-file deploy.registry.env pull backend frontend
+  #           docker compose -f docker-compose.registry.yml --env-file deploy.registry.env up -d
 
-      - name: Pull and start stack
-        run: |
-          set -e
-          cd infrastructure
-          docker compose -f docker-compose.registry.yml --env-file deploy.registry.env pull backend frontend
-          docker compose -f docker-compose.registry.yml --env-file deploy.registry.env up -d

.gitignore

@@ -5,7 +5,6 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-package-lock.json
 yarn.lock
 
 # === Build outputs ===

README.md

@@ -0,0 +1,116 @@
+# Dyolink
+
+Monorepo: **NestJS** backend (`backend/`), **Next.js** frontend (`frontend/`), **Docker** stack under `infrastructure/`.
+
+Local development: see **`backend/README.md`** and **`frontend/README.md`**.
+
+---
+
+## Deploy on your own server (Docker + Gitea)
+
+High level: **build container images → push to a registry → server pulls images and runs Compose**. Optionally **Gitea Actions** automates that on every merge to `main` / `master`.
+
+### 1. One-time server preparation
+
+1. Install **Docker** and **Docker Compose** on the server.
+2. Run **Gitea** with the **container registry** enabled (same host/port you use for `docker login`, e.g. `178.131.50.201:3000`).
+3. Copy the repo (or deploy only `infrastructure/` + secrets). You need at least:
+
+   - `infrastructure/docker-compose.registry.yml`
+   - `infrastructure/nginx/` configs referenced by that compose file
+   - `infrastructure/database/init.sql` if used by your Postgres service
+
+4. **Secrets on the server** (never commit real values):
+
+   - Copy `infrastructure/database.staging.env.example` → **`database.staging.env`** (Postgres user/password/db).
+   - Copy `infrastructure/backend.staging.env.example` → **`backend.staging.env`** (e.g. `DATABASE_URL`, JWT, pointing at the compose Postgres service name).
+   - Put both files in one directory on the server, e.g. `/opt/dyolink/secrets/`.
+
+5. **Registry login from the server** (same credentials you use for `docker push`):
+
+   ```bash
+   docker login <registry-host>:<port> -u <user>
+   ```
+
+   For HTTP registries, Docker may require **`insecure-registries`** on the daemon.
+
+### 2. Manual deploy (build images elsewhere, run on server)
+
+On your **dev machine** (after successful local builds):
+
+```powershell
+$REG = "<registry-host>:<port>"
+$OWN = "<registry-owner>"
+$TAG = "manual"
+
+docker build -t "${REG}/${OWN}/dyolink-backend:${TAG}" -t "${REG}/${OWN}/dyolink-backend:latest" ./backend
+
+docker build `
+  --build-arg NEXT_PUBLIC_API_URL="http://<your-public-ip>:<nginx-port>/api" `
+  --build-arg NEXT_PUBLIC_APP_URL="http://<your-public-ip>:<nginx-port>" `
+  --build-arg NEXT_PUBLIC_APP_NAME="Dyolink" `
+  -t "${REG}/${OWN}/dyolink-frontend:${TAG}" `
+  -t "${REG}/${OWN}/dyolink-frontend:latest" `
+  ./frontend
+
+docker push "${REG}/${OWN}/dyolink-backend:${TAG}"
+docker push "${REG}/${OWN}/dyolink-backend:latest"
+docker push "${REG}/${OWN}/dyolink-frontend:${TAG}"
+docker push "${REG}/${OWN}/dyolink-frontend:latest"
+```
+
+On the **server**, from `infrastructure/`:
+
+1. Create **`deploy.registry.env`** (see `infrastructure/deploy.registry.env.example`):
+
+   - `REGISTRY_PREFIX=<host>:<port>/<owner>` (no `http://`, no trailing slash)
+   - `IMAGE_TAG=latest` or the tag you pushed
+   - `STAGING_HTTP_PORT=<host port>` (e.g. `8088` — browser uses `http://<ip>:8088`)
+
+2. Set **`DEPLOY_SECRETS_DIR`** to the absolute path of the folder containing `database.staging.env` and `backend.staging.env` (you can export it in the shell or add it to `deploy.registry.env` if your Compose setup expects it).
+
+3. Pull and start:
+
+   ```bash
+   docker compose -f docker-compose.registry.yml --env-file deploy.registry.env pull backend frontend
+   docker compose -f docker-compose.registry.yml --env-file deploy.registry.env up -d
+   ```
+
+The backend container runs **`prisma migrate deploy`** on startup (via entrypoint) when `NODE_ENV=production`, so schema updates apply after you deploy a new image that includes new migrations.
+
+### 3. Automatic deploy (Gitea Actions)
+
+Workflow file: **`.gitea/workflows/registry-build-deploy.yml`**.
+
+**Requirements:**
+
+- **Gitea Actions** enabled for the repository.
+- A **self-hosted runner** (with Docker) registered to Gitea — the workflow uses `runs-on: self-hosted`.
+- **Windows runners:** the workflow uses **PowerShell** (not Bash). Gitea’s runner was failing with `execvpe(/bin/bash) failed` when Bash was routed through WSL without a real `/bin/bash`. If your runner is **Linux**, switch `.gitea/workflows/registry-build-deploy.yml` to `defaults.run.shell: bash` and use Bash syntax instead.
+- **Repository → Actions → Variables** (examples):
+
+  - `REGISTRY_HOST` — e.g. `178.131.50.201:3000`
+  - `REGISTRY_OWNER` — image namespace (same as Docker image path after the host), e.g. `admin`
+  - `PUBLIC_BASE_URL` — URL users open in the browser, e.g. `http://178.131.50.201:8088` (no trailing slash)
+  - `DEPLOY_SECRETS_DIR` — **absolute path on the runner machine** to the folder containing `database.staging.env` and `backend.staging.env`
+  - Optional: `STAGING_HTTP_PORT` (defaults to `8088`)
+
+- **Repository → Actions → Secrets:**
+
+  - `REGISTRY_USERNAME`
+  - `REGISTRY_PASSWORD` — access token with package read/write (or equivalent)
+
+**Trigger:** push to **`main`** or **`master`**, or run the workflow manually (**workflow_dispatch**).
+
+The pipeline clones from your Gitea instance, builds and pushes backend/frontend images, then on the runner runs **`docker compose pull`** and **`up -d`** using `infrastructure/docker-compose.registry.yml`.
+
+---
+
+## Related paths
+
+| Path | Role |
+|------|------|
+| `backend/Dockerfile` | API image |
+| `frontend/Dockerfile` | Web image |
+| `infrastructure/docker-compose.registry.yml` | Pull-only staging stack (registry images + nginx + postgres) |
+| `infrastructure/deploy.registry.env.example` | Template for `deploy.registry.env` |

backend/.npmrc

@@ -0,0 +1 @@
+legacy-peer-deps=true

backend/Dockerfile

@@ -1,18 +1,19 @@
 # ============================================
 # STAGE 1: BUILDER STAGE
 # ============================================
-FROM node:18-alpine AS builder
+FROM node:20-alpine AS builder
 
 WORKDIR /app
 
 COPY package*.json ./
+COPY .npmrc ./
 COPY prisma ./prisma/
 
 RUN npm ci
 
 COPY . .
 
-RUN npx prisma generate
+RUN npm run prisma:generate
 RUN npm run build
 RUN npm prune --production
 
@@ -20,7 +21,7 @@ RUN npm prune --production
 # ============================================
 # STAGE 2: PRODUCTION STAGE
 # ============================================
-FROM node:18-alpine
+FROM node:20-alpine
 
 RUN apk add --no-cache dumb-init
 
@@ -29,14 +30,10 @@ WORKDIR /app
 RUN addgroup -g 1001 -S nodejs && \
     adduser -S dyolink -u 1001
 
+# Prisma client comes from the builder (npm prune --production keeps @prisma/client).
 COPY package*.json ./
 COPY prisma ./prisma/
 
-RUN npm ci --only=production && \
-    npm cache clean --force
-
-RUN npx prisma generate
-
 COPY --from=builder /app/dist ./dist
 COPY --from=builder /app/node_modules ./node_modules
 

backend/README.md

@@ -1,98 +1,88 @@
-<p align="center">
-  <a href="http://nestjs.com/" target="blank"><img src="https://nestjs.com/img/logo-small.svg" width="120" alt="Nest Logo" /></a>
-</p>
+# Dyolink — Backend (NestJS)
 
-[circleci-image]: https://img.shields.io/circleci/build/github/nestjs/nest/master?token=abc123def456
-[circleci-url]: https://circleci.com/gh/nestjs/nest
+## Prerequisites
 
-  <p align="center">A progressive <a href="http://nodejs.org" target="_blank">Node.js</a> framework for building efficient and scalable server-side applications.</p>
-    <p align="center">
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/v/@nestjs/core.svg" alt="NPM Version" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/l/@nestjs/core.svg" alt="Package License" /></a>
-<a href="https://www.npmjs.com/~nestjscore" target="_blank"><img src="https://img.shields.io/npm/dm/@nestjs/common.svg" alt="NPM Downloads" /></a>
-<a href="https://circleci.com/gh/nestjs/nest" target="_blank"><img src="https://img.shields.io/circleci/build/github/nestjs/nest/master" alt="CircleCI" /></a>
-<a href="https://discord.gg/G7Qnnhy" target="_blank"><img src="https://img.shields.io/badge/discord-online-brightgreen.svg" alt="Discord"/></a>
-<a href="https://opencollective.com/nest#backer" target="_blank"><img src="https://opencollective.com/nest/backers/badge.svg" alt="Backers on Open Collective" /></a>
-<a href="https://opencollective.com/nest#sponsor" target="_blank"><img src="https://opencollective.com/nest/sponsors/badge.svg" alt="Sponsors on Open Collective" /></a>
-  <a href="https://paypal.me/kamilmysliwiec" target="_blank"><img src="https://img.shields.io/badge/Donate-PayPal-ff3f59.svg" alt="Donate us"/></a>
-    <a href="https://opencollective.com/nest#sponsor"  target="_blank"><img src="https://img.shields.io/badge/Support%20us-Open%20Collective-41B883.svg" alt="Support us"></a>
-  <a href="https://twitter.com/nestframework" target="_blank"><img src="https://img.shields.io/twitter/follow/nestframework.svg?style=social&label=Follow" alt="Follow us on Twitter"></a>
-</p>
-  <!--[![Backers on Open Collective](https://opencollective.com/nest/backers/badge.svg)](https://opencollective.com/nest#backer)
-  [![Sponsors on Open Collective](https://opencollective.com/nest/sponsors/badge.svg)](https://opencollective.com/nest#sponsor)-->
+- **Node.js 20+** and **npm**
+- **PostgreSQL** reachable from your machine (local or remote)
 
-## Description
+## First-time setup
 
-[Nest](https://github.com/nestjs/nest) framework TypeScript starter repository.
-
-## Project setup
+1. **Clone the monorepo** and go to the backend app:
 
    ```bash
-$ npm install
+   git clone <repository-url> dyolink
+   cd dyolink/backend
    ```
 
-## Compile and run the project
+2. **Install dependencies**
 
    ```bash
-# development
-$ npm run start
-
-# watch mode
-$ npm run start:dev
-
-# production mode
-$ npm run start:prod
+   npm install
    ```
 
-## Run tests
+3. **Environment**
+
+   Copy `.env.example` to `.env` and set at least:
+
+   - `DATABASE_URL` — PostgreSQL connection string for your dev database
+   - `JWT_SECRET` — strong secret for signing tokens  
+   Do not commit `.env`.
+
+4. **Database URL for local dev**
+
+   Point `DATABASE_URL` at a database you created in Postgres (create an empty DB first if needed).
+
+5. **Generate Prisma Client**
 
    ```bash
-# unit tests
-$ npm run test
-
-# e2e tests
-$ npm run test:e2e
-
-# test coverage
-$ npm run test:cov
+   npm run prisma:generate
    ```
 
-## Deployment
-
-When you're ready to deploy your NestJS application to production, there are some key steps you can take to ensure it runs as efficiently as possible. Check out the [deployment documentation](https://docs.nestjs.com/deployment) for more information.
-
-If you are looking for a cloud-based platform to deploy your NestJS application, check out [Mau](https://mau.nestjs.com), our official platform for deploying NestJS applications on AWS. Mau makes deployment straightforward and fast, requiring just a few simple steps:
+6. **Apply migrations** (creates/updates tables to match `prisma/schema.prisma`)
 
    ```bash
-$ npm install -g @nestjs/mau
-$ mau deploy
+   npm run prisma:migrate
    ```
 
-With Mau, you can deploy your application in just a few clicks, allowing you to focus on building features rather than managing infrastructure.
+   This runs `prisma migrate dev`. Use it during development when the schema changes.
 
-## Resources
+7. **Seed** (optional — sample data / bootstrap)
 
-Check out a few resources that may come in handy when working with NestJS:
+   ```bash
+   npm run prisma:seed
+   ```
 
-- Visit the [NestJS Documentation](https://docs.nestjs.com) to learn more about the framework.
-- For questions and support, please visit our [Discord channel](https://discord.gg/G7Qnnhy).
-- To dive deeper and get more hands-on experience, check out our official video [courses](https://courses.nestjs.com/).
-- Deploy your application to AWS with the help of [NestJS Mau](https://mau.nestjs.com) in just a few clicks.
-- Visualize your application graph and interact with the NestJS application in real-time using [NestJS Devtools](https://devtools.nestjs.com).
-- Need help with your project (part-time to full-time)? Check out our official [enterprise support](https://enterprise.nestjs.com).
-- To stay in the loop and get updates, follow us on [X](https://x.com/nestframework) and [LinkedIn](https://linkedin.com/company/nestjs).
-- Looking for a job, or have a job to offer? Check out our official [Jobs board](https://jobs.nestjs.com).
+## Run (development)
 
-## Support
+```bash
+npm run start:dev
+```
 
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
+API listens on **`http://localhost:3000`** by default (`PORT` in `.env`).
 
-## Stay in touch
+If the frontend runs on another origin (e.g. `http://localhost:3001`), set `CORS_ORIGIN` in `.env` to that URL.
 
-- Author - [Kamil Myśliwiec](https://twitter.com/kammysliwiec)
-- Website - [https://nestjs.com](https://nestjs.com/)
-- Twitter - [@nestframework](https://twitter.com/nestframework)
+## After pulling latest `main`
 
-## License
+```bash
+git pull
+npm install
+npm run prisma:generate
+npm run prisma:migrate
+```
 
-Nest is [MIT licensed](https://github.com/nestjs/nest/blob/master/LICENSE).
+If teammates added migrations, step 4 applies them. Resolve migration conflicts locally before pushing.
+
+## Useful commands
+
+| Command | Purpose |
+|--------|---------|
+| `npm run prisma:generate` | Regenerate client after `schema.prisma` changes |
+| `npm run prisma:migrate` | Dev migrations (`migrate dev`) |
+| `npm run prisma:deploy` | Production-style apply (`migrate deploy`) — e.g. CI/containers |
+| `npm run build` | Compile Nest app |
+| `npm run start:prod` | Run compiled app (`node dist/main`) |
+
+## Docker
+
+Image build is defined in **`Dockerfile`** at this folder. For full-stack deployment and CI, see the **repository root `README.md`**.

backend/SETUP.md

@@ -1,95 +0,0 @@
-
-# Dyolink Backend - Development Setup Guide
-
-## 📋 Prerequisites
-
-Before starting, ensure you have the following installed:
-- **Node.js** (v18 or higher)
-- **PostgreSQL** (v15 or higher) - We use v18, but any v15+ works
-- **Git** (for cloning)
-- **npm** or **yarn** (npm comes with Node.js)
-
-## 🚀 Initial Setup Steps
-
-1. Clone the Repository
-```bash
-git clone [your-repository-url]
-cd dyolink/backend
-
-2. Install Dependencies
-bash
-npm install
-
-3. Environment Configuration
-Create a .env file in the backend folder:
-env
-# backend/.env
-DATABASE_URL=postgresql://postgres:1234@localhost:5432/dyolink_db
-JWT_SECRET=your-super-secret-key-here-change-this
-JWT_REFRESH_SECRET=your-super-secret-refresh-key-here-different-from-above
-JWT_EXPIRES_IN=15m
-JWT_REFRESH_EXPIRES_IN=7d
-PORT=3000
-⚠️ Important: Never commit the .env file to git! We have .gitignore set up to prevent this.
-
-4. Database Setup
-Option A: Fresh PostgreSQL Installation
-If you don't have PostgreSQL installed:
-Windows (using Chocolatey):
-bash
-choco install postgresql
-macOS (using Homebrew):
-bash
-brew install postgresql@15
-brew services start postgresql@15
-Common Installation Issues & Fixes:
-Issue	Solution
-"Password not set during installation"	Edit pg_hba.conf temporarily (see Troubleshooting section)
-"Service not starting"	Run PowerShell/Terminal as Administrator
-"Port 5432 already in use"	Stop local PostgreSQL service or change port
-Option B: Using Existing PostgreSQL
-If you already have PostgreSQL:
-bash
-# Connect to PostgreSQL
-psql -U postgres
-# Create the database (if it doesn't exist)
-CREATE DATABASE dyolink_db;
-\q
-
-5. Database Migrations
-Once PostgreSQL is running and you've created the database:
-bash
-# Generate Prisma client
-npx prisma generate
-# Run migrations to create tables
-npx prisma migrate dev --name init_schema
-⚠️ Known Issue: If you get P1001: Can't reach database server, ensure PostgreSQL is running:
-bash
-# Check PostgreSQL status
-# Windows:
-Get-Service postgresql-x64-18
-# macOS:
-brew services list | grep postgres
-
-6. Seed the Database
-bash
-# Seed with initial data (organization types, plans, permissions, test user)
-npx prisma db seed
-⚠️ Prisma 7 Note: If seeding fails with PrismaClientInitializationError, we've fixed this by using the driver adapter pattern. The seed file now uses:
-typescript
-import { PrismaPg } from '@prisma/adapter-pg';
-import { Pool } from 'pg';
-const adapter = new PrismaPg(pool);
-const prisma = new PrismaClient({ adapter });
-7. Verify Setup
-bash
-# Open Prisma Studio to verify data
-npx prisma studio
-# This opens http://localhost:5555 - you should see all tables with seeded data
-8. Start Development Server
-bash
-npm run start:dev
-You should see:
-text
-Application is running on: http://localhost:3000
-✅ Database connected successfully

backend/docker-entrypoint.sh

@@ -8,22 +8,22 @@ echo "=========================================="
 if [ "$NODE_ENV" = "production" ]; then
     echo "Running in PRODUCTION mode"
     echo "Running database migrations..."
-    npx prisma migrate deploy
+    ./node_modules/.bin/prisma migrate deploy
 else
     echo "Running in DEVELOPMENT mode"
     echo "Syncing database schema..."
-    npx prisma db push
+    ./node_modules/.bin/prisma db push
 fi
 
 if [ "$NODE_ENV" != "production" ]; then
     if [ -f "prisma/seed.ts" ] || [ -f "prisma/seed.js" ]; then
         echo "Running database seed..."
-        npx prisma db seed
+        ./node_modules/.bin/prisma db seed
     fi
 fi
 
 echo "Verifying database connection..."
-if ! echo "SELECT 1" | npx prisma db execute --stdin --schema prisma/schema.prisma >/dev/null 2>&1; then
+if ! echo "SELECT 1" | ./node_modules/.bin/prisma db execute --stdin --schema prisma/schema.prisma >/dev/null 2>&1; then
     echo "Cannot connect to database or execute query."
     exit 1
 fi

backend/package.json

@@ -41,6 +41,7 @@
     "@nestjs/swagger": "^11.2.6",
     "@nestjs/throttler": "^6.5.0",
     "@prisma/client": "^6.19.2",
+    "prisma": "^6.19.2",
     "adminjs": "^7.8.17",
     "axios": "^1.13.5",
     "bcrypt": "^6.0.0",
@@ -84,7 +85,6 @@
     "globals": "^16.0.0",
     "jest": "^30.0.0",
     "prettier": "^3.4.2",
-    "prisma": "^6.19.2",
     "source-map-support": "^0.5.21",
     "supertest": "^7.0.0",
     "ts-jest": "^29.2.5",
@@ -94,6 +94,10 @@
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.20.0"
   },
+  "overrides": {
+    "@tiptap/core": "2.27.2",
+    "@tiptap/pm": "2.27.2"
+  },
   "jest": {
     "moduleFileExtensions": [
       "js",

backend/prisma/migrations/20260505173000_add_organization_invitations/migration.sql

@@ -0,0 +1,33 @@
+-- CreateTable
+CREATE TABLE "organization_invitations" (
+    "id" TEXT NOT NULL,
+    "inviterOrganizationId" TEXT NOT NULL,
+    "inviterUserId" TEXT NOT NULL,
+    "invitedOrganizationId" TEXT,
+    "invitedOrganizationName" TEXT NOT NULL,
+    "invitedOwnerEmail" TEXT NOT NULL,
+    "invitedOrganizationType" TEXT NOT NULL,
+    "tokenHash" TEXT NOT NULL,
+    "expiresAt" TIMESTAMP(3) NOT NULL,
+    "acceptedAt" TIMESTAMP(3),
+    "revokedAt" TIMESTAMP(3),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "organization_invitations_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "organization_invitations_tokenHash_key" ON "organization_invitations"("tokenHash");
+
+-- CreateIndex
+CREATE INDEX "organization_invitations_inviterOrganizationId_createdAt_idx" ON "organization_invitations"("inviterOrganizationId", "createdAt");
+
+-- CreateIndex
+CREATE INDEX "organization_invitations_invitedOwnerEmail_createdAt_idx" ON "organization_invitations"("invitedOwnerEmail", "createdAt");
+
+-- AddForeignKey
+ALTER TABLE "organization_invitations" ADD CONSTRAINT "organization_invitations_inviterOrganizationId_fkey" FOREIGN KEY ("inviterOrganizationId") REFERENCES "organizations"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "organization_invitations" ADD CONSTRAINT "organization_invitations_inviterUserId_fkey" FOREIGN KEY ("inviterUserId") REFERENCES "users"("id") ON DELETE CASCADE ON UPDATE CASCADE;

backend/prisma/migrations/20260505181000_rename_lab_permissions_to_organizations/migration.sql

@@ -0,0 +1,7 @@
+UPDATE "permissions"
+SET "name" = 'TAB_ORGANIZATIONS_READ'
+WHERE "name" = 'TAB_LAB_READ';
+
+UPDATE "permissions"
+SET "name" = 'TAB_ORGANIZATIONS_EDIT'
+WHERE "name" = 'TAB_LAB_EDIT';

backend/prisma/schema.prisma

@@ -21,6 +21,7 @@ model User {
   ownedOrganizations Organization[] @relation("OrganizationOwner")
   sessions           Session[] // 👈 ADD THIS - opposite relation for Session
   sentStaffInvites   StaffInvitation[]
+  sentOrganizationInvitations OrganizationInvitation[]
 
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
@@ -57,6 +58,7 @@ model Organization {
 
   sharedWithMe     OrganizationLink[] @relation("OrganizationB")
   sharedWithOthers OrganizationLink[] @relation("OrganizationA")
+  sentOrganizationInvitations OrganizationInvitation[] @relation("OrganizationInvitationInviter")
   patients         Patient[]
 
   createdAt DateTime @default(now())
@@ -211,6 +213,32 @@ model OrganizationLink {
   @@map("organization_links")
 }
 
+model OrganizationInvitation {
+  id String @id @default(uuid())
+
+  inviterOrganizationId String
+  inviterUserId         String
+
+  invitedOrganizationId   String?
+  invitedOrganizationName String
+  invitedOwnerEmail       String
+  invitedOrganizationType String
+  tokenHash               String   @unique
+  expiresAt               DateTime
+  acceptedAt              DateTime?
+  revokedAt               DateTime?
+
+  inviterOrganization Organization @relation("OrganizationInvitationInviter", fields: [inviterOrganizationId], references: [id], onDelete: Cascade)
+  inviterUser         User         @relation(fields: [inviterUserId], references: [id], onDelete: Cascade)
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  @@index([inviterOrganizationId, createdAt])
+  @@index([invitedOwnerEmail, createdAt])
+  @@map("organization_invitations")
+}
+
 model Session {
   id           String   @id @default(uuid())
   userId       String

backend/prisma/seed.ts

@@ -74,8 +74,8 @@ async function main() {
       permissions: ['TAB_STAFF_READ', 'TAB_STAFF_EDIT'],
     },
     {
-      name: 'Labs / Clinics',
-      permissions: ['TAB_LAB_READ', 'TAB_LAB_EDIT'],
+      name: 'Organizations',
+      permissions: ['TAB_ORGANIZATIONS_READ', 'TAB_ORGANIZATIONS_EDIT'],
     },
     {
       name: 'Patients',

backend/src/app.module.ts

@@ -8,6 +8,7 @@ import { AdminModule } from './admin/admin.module';
 import { PrismaModule } from '../prisma/prisma.module'; // ✅
 import { PatientsModule } from './modules/patients/patients.module';
 import { StaffModule } from './modules/staff/staff.module';
+import { OrganizationModule } from './modules/organization/organization.module';
 
 @Module({
   imports: [
@@ -19,6 +20,7 @@ import { StaffModule } from './modules/staff/staff.module';
     AuthModule,
     PatientsModule,
     StaffModule,
+    OrganizationModule,
     AdminModule.forRoot(),
   ],
   controllers: [AppController],

backend/src/common/permissions.ts

@@ -4,8 +4,8 @@ export const ALL_TAB_PERMISSIONS = [
   'TAB_TODAY_EDIT',
   'TAB_STAFF_READ',
   'TAB_STAFF_EDIT',
-  'TAB_LAB_READ',
-  'TAB_LAB_EDIT',
+  'TAB_ORGANIZATIONS_READ',
+  'TAB_ORGANIZATIONS_EDIT',
   'TAB_PATIENTS_READ',
   'TAB_PATIENTS_EDIT',
   'TAB_APPOINTMENTS_READ',
@@ -38,7 +38,7 @@ const EDIT_TO_READ: Record<string, string> = {
   TAB_PATIENTS_EDIT: 'TAB_PATIENTS_READ',
   TAB_APPOINTMENTS_EDIT: 'TAB_APPOINTMENTS_READ',
   TAB_STAFF_EDIT: 'TAB_STAFF_READ',
-  TAB_LAB_EDIT: 'TAB_LAB_READ',
+  TAB_ORGANIZATIONS_EDIT: 'TAB_ORGANIZATIONS_READ',
   TAB_TREATMENT_EDIT: 'TAB_TREATMENT_READ',
   TAB_BILLING_EDIT: 'TAB_BILLING_READ',
   TAB_REPORTS_EDIT: 'TAB_REPORTS_READ',

backend/src/modules/auth/auth.service.ts

@@ -20,8 +20,8 @@ const ALL_PERMISSIONS = [
   'TAB_TODAY_EDIT',
   'TAB_STAFF_READ',
   'TAB_STAFF_EDIT',
-  'TAB_LAB_READ',
-  'TAB_LAB_EDIT',
+  'TAB_ORGANIZATIONS_READ',
+  'TAB_ORGANIZATIONS_EDIT',
   'TAB_PATIENTS_READ',
   'TAB_PATIENTS_EDIT',
   'TAB_APPOINTMENTS_READ',
@@ -37,7 +37,7 @@ const ALL_PERMISSIONS = [
 const READ_ONLY_PERMISSIONS = [
   'TAB_TODAY_READ',
   'TAB_STAFF_READ',
-  'TAB_LAB_READ',
+  'TAB_ORGANIZATIONS_READ',
   'TAB_PATIENTS_READ',
   'TAB_APPOINTMENTS_READ',
   'TAB_TREATMENT_READ',

backend/src/modules/organization/dto/accept-organization-invite.dto.ts

@@ -0,0 +1,19 @@
+import { IsString, MinLength } from 'class-validator';
+
+export class AcceptOrganizationInviteDto {
+  @IsString()
+  @MinLength(1)
+  token: string;
+
+  @IsString()
+  @MinLength(1)
+  organizationName: string;
+
+  @IsString()
+  @MinLength(1)
+  ownerName: string;
+
+  @IsString()
+  @MinLength(8)
+  password: string;
+}

backend/src/modules/organization/dto/create-link-request.dto.ts

@@ -0,0 +1,6 @@
+import { IsUUID } from 'class-validator';
+
+export class CreateLinkRequestDto {
+  @IsUUID()
+  targetOrganizationId: string;
+}

backend/src/modules/organization/dto/invite-organization.dto.ts

@@ -0,0 +1,14 @@
+import { IsEmail, IsOptional, IsString, MinLength } from 'class-validator';
+
+export class InviteOrganizationDto {
+  @IsString()
+  @MinLength(1)
+  organizationName: string;
+
+  @IsEmail()
+  ownerEmail: string;
+
+  @IsOptional()
+  @IsString()
+  phone?: string;
+}

backend/src/modules/organization/dto/preview-organization-invite.dto.ts

@@ -0,0 +1,7 @@
+import { IsString, MinLength } from 'class-validator';
+
+export class PreviewOrganizationInviteDto {
+  @IsString()
+  @MinLength(1)
+  token: string;
+}

backend/src/modules/organization/dto/respond-link-request.dto.ts

@@ -0,0 +1,6 @@
+import { IsIn } from 'class-validator';
+
+export class RespondLinkRequestDto {
+  @IsIn(['ACCEPT', 'REJECT'])
+  action: 'ACCEPT' | 'REJECT';
+}

backend/src/modules/organization/organization.controller.ts

@@ -0,0 +1,124 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Patch,
+  Post,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
+import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
+import { AcceptOrganizationInviteDto } from './dto/accept-organization-invite.dto';
+import { CreateLinkRequestDto } from './dto/create-link-request.dto';
+import { InviteOrganizationDto } from './dto/invite-organization.dto';
+import { PreviewOrganizationInviteDto } from './dto/preview-organization-invite.dto';
+import { RespondLinkRequestDto } from './dto/respond-link-request.dto';
+import { OrganizationService } from './organization.service';
+
+@ApiTags('organizations')
+@ApiBearerAuth('JWT-auth')
+@Controller('organizations')
+export class OrganizationController {
+  constructor(private readonly organizationService: OrganizationService) {}
+
+  @Get('invitations/preview')
+  @ApiOperation({ summary: 'Preview organization invite by token (public)' })
+  previewInvite(@Query() query: PreviewOrganizationInviteDto) {
+    return this.organizationService.previewInvite(query.token);
+  }
+
+  @Get('invitations')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'List invitation history for current organization' })
+  listInvitations(@Req() req: { user: { id: string; organizationId?: string } }) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.listInvitationHistory(req.user.id, organizationId);
+  }
+
+  @Post('invitations/accept')
+  @ApiOperation({ summary: 'Accept organization invite and create/link counterpart org (public)' })
+  acceptInvite(@Body() dto: AcceptOrganizationInviteDto) {
+    return this.organizationService.acceptInvite(dto);
+  }
+
+  @Get('search')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({
+    summary: 'Search counterpart organizations (active subscription only)',
+  })
+  search(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Query('q') q = '',
+  ) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.searchCounterpartOrganizations(req.user.id, organizationId, q);
+  }
+
+  @Get('links')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'List counterpart links and invitations for current org' })
+  list(@Req() req: { user: { id: string; organizationId?: string } }) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.list(req.user.id, organizationId);
+  }
+
+  @Post('links')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Create pending link request to an existing subscribed counterpart org' })
+  createLinkRequest(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Body() dto: CreateLinkRequestDto,
+  ) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.createLinkRequest(req.user.id, organizationId, dto);
+  }
+
+  @Patch('links/:linkId/respond')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Accept or reject a pending link request for current organization' })
+  respondToLinkRequest(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Param('linkId') linkId: string,
+    @Body() dto: RespondLinkRequestDto,
+  ) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.respondToLinkRequest(req.user.id, organizationId, linkId, dto);
+  }
+
+  @Delete('links/:linkId')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Delete linked organization record' })
+  deleteLink(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Param('linkId') linkId: string,
+  ) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.deleteLink(req.user.id, organizationId, linkId);
+  }
+
+  @Post('invitations/:invitationId/link')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Get a shareable invite link for a pending invitation' })
+  getInvitationLink(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Param('invitationId') invitationId: string,
+  ) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.getInvitationLink(req.user.id, organizationId, invitationId);
+  }
+
+  @Post('invite')
+  @UseGuards(JwtAuthGuard)
+  @ApiOperation({ summary: 'Create invite link for owner of not-yet-subscribed counterpart org' })
+  inviteOrganization(
+    @Req() req: { user: { id: string; organizationId?: string } },
+    @Body() dto: InviteOrganizationDto,
+  ) {
+    const organizationId = this.organizationService.getOrganizationIdFromUser(req.user);
+    return this.organizationService.inviteOrganization(req.user.id, organizationId, dto);
+  }
+}

backend/src/modules/organization/organization.module.ts

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+import { PrismaService } from '../../../prisma/prisma.service';
+import { OrganizationController } from './organization.controller';
+import { OrganizationService } from './organization.service';
+
+@Module({
+  controllers: [OrganizationController],
+  providers: [OrganizationService, PrismaService],
+})
+export class OrganizationModule {}

backend/src/modules/organization/organization.service.ts

@@ -0,0 +1,630 @@
+import {
+  BadRequestException,
+  ConflictException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import { LinkStatus } from '@prisma/client';
+import * as bcrypt from 'bcrypt';
+import { createHash, randomBytes } from 'crypto';
+import { PrismaService } from '../../../prisma/prisma.service';
+import { AcceptOrganizationInviteDto } from './dto/accept-organization-invite.dto';
+import { CreateLinkRequestDto } from './dto/create-link-request.dto';
+import { InviteOrganizationDto } from './dto/invite-organization.dto';
+import { RespondLinkRequestDto } from './dto/respond-link-request.dto';
+
+@Injectable()
+export class OrganizationService {
+  constructor(private readonly prisma: PrismaService) {}
+
+  getOrganizationIdFromUser(user: { organizationId?: string }) {
+    if (!user?.organizationId) {
+      throw new BadRequestException('Organization is not selected');
+    }
+    return user.organizationId;
+  }
+
+  async searchCounterpartOrganizations(userId: string, organizationId: string, query: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const targetType = this.getCounterpartType(actor.organization.type.name);
+    const q = query.trim();
+
+    const organizations = await this.prisma.organization.findMany({
+      where: {
+        type: { name: targetType },
+        planId: { not: null },
+        ...(q
+          ? {
+              OR: [
+                { name: { contains: q, mode: 'insensitive' } },
+                { email: { contains: q, mode: 'insensitive' } },
+                { phone: { contains: q, mode: 'insensitive' } },
+              ],
+            }
+          : {}),
+      },
+      select: {
+        id: true,
+        name: true,
+        email: true,
+        phone: true,
+        owner: { select: { email: true, name: true } },
+      },
+      orderBy: { name: 'asc' },
+      take: 25,
+    });
+
+    return { success: true, data: organizations };
+  }
+
+  async list(userId: string, organizationId: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const [linksA, linksB] = await Promise.all([
+      this.prisma.organizationLink.findMany({
+        where: { organizationAId: organizationId },
+        include: {
+          organizationB: { select: { id: true, name: true, email: true, phone: true, type: true } },
+        },
+        orderBy: { createdAt: 'desc' },
+      }),
+      this.prisma.organizationLink.findMany({
+        where: { organizationBId: organizationId },
+        include: {
+          organizationA: { select: { id: true, name: true, email: true, phone: true, type: true } },
+        },
+        orderBy: { createdAt: 'desc' },
+      }),
+    ]);
+
+    const linkItems = [
+      ...linksA.map((l) => ({
+        requestedByOrganizationId: this.getRequesterOrganizationId(l.sharedDataTypes),
+        id: l.id,
+        counterpartOrganizationId: l.organizationB.id,
+        organizationName: l.organizationB.name,
+        ownerEmail: l.organizationB.email,
+        phone: l.organizationB.phone,
+        status: l.status,
+        createdAt: l.createdAt.toISOString(),
+        acceptedAt: l.status === LinkStatus.ACTIVE ? l.updatedAt.toISOString() : null,
+      })),
+      ...linksB.map((l) => ({
+        requestedByOrganizationId: this.getRequesterOrganizationId(l.sharedDataTypes),
+        id: l.id,
+        counterpartOrganizationId: l.organizationA.id,
+        organizationName: l.organizationA.name,
+        ownerEmail: l.organizationA.email,
+        phone: l.organizationA.phone,
+        status: l.status,
+        createdAt: l.createdAt.toISOString(),
+        acceptedAt: l.status === LinkStatus.ACTIVE ? l.updatedAt.toISOString() : null,
+      })),
+    ];
+
+    return {
+      success: true,
+      data: {
+        items: linkItems.sort((a, b) =>
+          a.createdAt < b.createdAt ? 1 : -1,
+        ),
+      },
+    };
+  }
+
+  async listInvitationHistory(userId: string, organizationId: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const invitations = await this.prisma.organizationInvitation.findMany({
+      where: { inviterOrganizationId: organizationId },
+      orderBy: { createdAt: 'desc' },
+    });
+
+    return {
+      success: true,
+      data: {
+        items: invitations.map((i) => ({
+          id: i.id,
+          organizationName: i.invitedOrganizationName,
+          ownerEmail: i.invitedOwnerEmail,
+          status: this.mapInvitationStatus(i.acceptedAt, i.revokedAt, i.expiresAt),
+          createdAt: i.createdAt.toISOString(),
+          acceptedAt: i.acceptedAt?.toISOString() ?? null,
+        })),
+      },
+    };
+  }
+
+  async createLinkRequest(userId: string, organizationId: string, dto: CreateLinkRequestDto) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+    if (dto.targetOrganizationId === organizationId) {
+      throw new BadRequestException('You cannot link organization to itself');
+    }
+
+    const sourceType = actor.organization.type.name;
+    const targetType = this.getCounterpartType(sourceType);
+    const target = await this.prisma.organization.findUnique({
+      where: { id: dto.targetOrganizationId },
+      select: { id: true, type: true, planId: true },
+    });
+    if (!target) {
+      throw new NotFoundException('Organization not found');
+    }
+    if (target.type.name !== targetType) {
+      throw new BadRequestException(`You can only link to ${targetType} organizations`);
+    }
+    if (!target.planId) {
+      throw new BadRequestException('Target organization does not have an active subscription');
+    }
+
+    const [aId, bId] =
+      organizationId < dto.targetOrganizationId
+        ? [organizationId, dto.targetOrganizationId]
+        : [dto.targetOrganizationId, organizationId];
+
+    const existing = await this.prisma.organizationLink.findUnique({
+      where: { organizationAId_organizationBId: { organizationAId: aId, organizationBId: bId } },
+    });
+    if (existing) {
+      throw new ConflictException('Link already exists for these organizations');
+    }
+
+    const created = await this.prisma.organizationLink.create({
+      data: {
+        organizationAId: aId,
+        organizationBId: bId,
+        status: LinkStatus.PENDING,
+        sharedDataTypes: [`requested_by:${organizationId}`],
+      },
+    });
+
+    return {
+      success: true,
+      data: { id: created.id, status: created.status },
+      message: 'Link request created',
+    };
+  }
+
+  async respondToLinkRequest(
+    userId: string,
+    organizationId: string,
+    linkId: string,
+    dto: RespondLinkRequestDto,
+  ) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const link = await this.prisma.organizationLink.findFirst({
+      where: {
+        id: linkId,
+        OR: [{ organizationAId: organizationId }, { organizationBId: organizationId }],
+      },
+    });
+    if (!link) {
+      throw new NotFoundException('Link request not found');
+    }
+    if (link.status !== LinkStatus.PENDING) {
+      throw new BadRequestException('Only pending link requests can be responded to');
+    }
+
+    const requesterOrgId = this.getRequesterOrganizationId(link.sharedDataTypes);
+    if (requesterOrgId && requesterOrgId === organizationId) {
+      throw new ForbiddenException('You cannot respond to your own link request');
+    }
+
+    const nextStatus = dto.action === 'ACCEPT' ? LinkStatus.ACTIVE : LinkStatus.REJECTED;
+    const updated = await this.prisma.organizationLink.update({
+      where: { id: link.id },
+      data: { status: nextStatus },
+    });
+
+    return {
+      success: true,
+      data: { id: updated.id, status: updated.status },
+      message: nextStatus === LinkStatus.ACTIVE ? 'Link request accepted' : 'Link request rejected',
+    };
+  }
+
+  async deleteLink(userId: string, organizationId: string, linkId: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const link = await this.prisma.organizationLink.findFirst({
+      where: {
+        id: linkId,
+        status: LinkStatus.ACTIVE,
+        OR: [{ organizationAId: organizationId }, { organizationBId: organizationId }],
+      },
+      select: { id: true },
+    });
+    if (!link) {
+      throw new NotFoundException('Linked organization not found');
+    }
+
+    await this.prisma.organizationLink.delete({ where: { id: link.id } });
+
+    return {
+      success: true,
+      data: { id: link.id },
+      message: 'Linked organization removed',
+    };
+  }
+
+  async getInvitationLink(userId: string, organizationId: string, invitationId: string) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const invitation = await this.prisma.organizationInvitation.findFirst({
+      where: {
+        id: invitationId,
+        inviterOrganizationId: organizationId,
+      },
+      select: {
+        id: true,
+        acceptedAt: true,
+        revokedAt: true,
+      },
+    });
+    if (!invitation) {
+      throw new NotFoundException('Invitation not found');
+    }
+    if (invitation.acceptedAt || invitation.revokedAt) {
+      throw new BadRequestException('Only pending invitations can provide a link');
+    }
+
+    const plainToken = this.generateInviteToken();
+    const tokenHash = this.hashInviteToken(plainToken);
+    await this.prisma.organizationInvitation.update({
+      where: { id: invitation.id },
+      data: {
+        tokenHash,
+        expiresAt: this.getInviteExpiryDate(),
+      },
+    });
+
+    return {
+      success: true,
+      data: {
+        invitationId: invitation.id,
+        invitationUrl: this.buildInviteUrl(plainToken),
+      },
+    };
+  }
+
+  async inviteOrganization(userId: string, organizationId: string, dto: InviteOrganizationDto) {
+    const actor = await this.getActorMembership(userId, organizationId);
+    if (!actor || !this.canEditOrganizations(actor)) {
+      throw new ForbiddenException('You do not have permission to manage organizations');
+    }
+
+    const ownerEmail = dto.ownerEmail.trim().toLowerCase();
+    const inviterType = actor.organization.type.name;
+    const invitedType = this.getCounterpartType(inviterType);
+    const plainToken = this.generateInviteToken();
+    const tokenHash = this.hashInviteToken(plainToken);
+
+    const existingOwnerWithPlan = await this.prisma.organization.findFirst({
+      where: {
+        owner: { email: ownerEmail },
+        planId: { not: null },
+      },
+      select: { id: true },
+    });
+    if (existingOwnerWithPlan) {
+      throw new BadRequestException(
+        'This owner already has an organization with active subscription. Select that organization from search instead of sending invitation.',
+      );
+    }
+
+    const invitation = await this.prisma.$transaction(async (tx) => {
+      let owner = await tx.user.findUnique({ where: { email: ownerEmail } });
+      if (!owner) {
+        owner = await tx.user.create({
+          data: {
+            email: ownerEmail,
+            name: dto.organizationName.trim(),
+            passwordHash: null,
+          },
+        });
+      }
+
+      let invitedOrg = await tx.organization.findFirst({
+        where: {
+          ownerId: owner.id,
+          type: { name: invitedType },
+        },
+        select: { id: true },
+        orderBy: { createdAt: 'desc' },
+      });
+
+      if (!invitedOrg) {
+        invitedOrg = await tx.organization.create({
+          data: {
+            name: dto.organizationName.trim(),
+            email: `pending-${plainToken.slice(0, 12)}@dyolink.local`,
+            owner: { connect: { id: owner.id } },
+            type: { connect: { name: invitedType } },
+          },
+          select: { id: true },
+        });
+      }
+
+      const [aId, bId] =
+        organizationId < invitedOrg.id
+          ? [organizationId, invitedOrg.id]
+          : [invitedOrg.id, organizationId];
+
+      const existingLink = await tx.organizationLink.findUnique({
+        where: { organizationAId_organizationBId: { organizationAId: aId, organizationBId: bId } },
+      });
+      if (existingLink?.status === LinkStatus.ACTIVE) {
+        throw new ConflictException('These organizations are already linked');
+      }
+
+      await tx.organizationLink.upsert({
+        where: { organizationAId_organizationBId: { organizationAId: aId, organizationBId: bId } },
+        update: {
+          status: LinkStatus.PENDING,
+          sharedDataTypes: [`requested_by:${organizationId}`],
+        },
+        create: {
+          organizationAId: aId,
+          organizationBId: bId,
+          status: LinkStatus.PENDING,
+          sharedDataTypes: [`requested_by:${organizationId}`],
+        },
+      });
+
+      return tx.organizationInvitation.create({
+        data: {
+          inviterOrganizationId: organizationId,
+          inviterUserId: userId,
+          invitedOrganizationId: invitedOrg.id,
+          invitedOrganizationName: dto.organizationName.trim(),
+          invitedOwnerEmail: ownerEmail,
+          invitedOrganizationType: invitedType,
+          tokenHash,
+          expiresAt: this.getInviteExpiryDate(),
+        },
+      });
+    });
+
+    return {
+      success: true,
+      data: {
+        invitationId: invitation.id,
+        invitationUrl: this.buildInviteUrl(plainToken),
+        status: 'PENDING',
+      },
+    };
+  }
+
+  async previewInvite(token: string) {
+    const invitation = await this.findValidInvitation(token);
+    return {
+      success: true,
+      data: {
+        ownerEmail: invitation.invitedOwnerEmail,
+        organizationName: invitation.invitedOrganizationName,
+        organizationType: invitation.invitedOrganizationType,
+        inviterOrganizationName: invitation.inviterOrganization.name,
+        expiresAt: invitation.expiresAt.toISOString(),
+        status: invitation.acceptedAt ? 'ACCEPTED' : 'PENDING',
+      },
+    };
+  }
+
+  async acceptInvite(dto: AcceptOrganizationInviteDto) {
+    const invitation = await this.findValidInvitation(dto.token);
+    if (invitation.acceptedAt) {
+      throw new BadRequestException('This invitation has already been accepted');
+    }
+
+    const organization = await this.prisma.$transaction(async (tx) => {
+      const passwordHash = await bcrypt.hash(dto.password, 10);
+      const ownerEmail = invitation.invitedOwnerEmail;
+
+      let owner = await tx.user.findUnique({ where: { email: ownerEmail } });
+      if (!owner) {
+        owner = await tx.user.create({
+          data: {
+            email: ownerEmail,
+            name: dto.ownerName.trim(),
+            passwordHash,
+            trialUsedAt: new Date(),
+          },
+        });
+      } else if (!owner.passwordHash) {
+        owner = await tx.user.update({
+          where: { id: owner.id },
+          data: { passwordHash, name: dto.ownerName.trim(), trialUsedAt: owner.trialUsedAt ?? new Date() },
+        });
+      }
+
+      let targetOrganizationId = invitation.invitedOrganizationId;
+      if (targetOrganizationId) {
+        await tx.organization.update({
+          where: { id: targetOrganizationId },
+          data: {
+            name: dto.organizationName.trim(),
+            email: ownerEmail,
+            owner: { connect: { id: owner.id } },
+            plan: { connect: { name: 'trial' } },
+          },
+        });
+      } else {
+        const createdOrg = await tx.organization.create({
+          data: {
+            name: dto.organizationName.trim(),
+            email: ownerEmail,
+            owner: { connect: { id: owner.id } },
+            type: { connect: { name: invitation.invitedOrganizationType } },
+            plan: { connect: { name: 'trial' } },
+          },
+        });
+        targetOrganizationId = createdOrg.id;
+      }
+
+      const ownerMembership = await tx.membership.findFirst({
+        where: { userId: owner.id, organizationId: targetOrganizationId },
+        select: { id: true },
+      });
+      if (!ownerMembership) {
+        await tx.membership.create({
+          data: {
+            userId: owner.id,
+            organizationId: targetOrganizationId,
+            isOwner: true,
+            isActive: true,
+          },
+        });
+      }
+
+      const [aId, bId] =
+        invitation.inviterOrganizationId < targetOrganizationId
+          ? [invitation.inviterOrganizationId, targetOrganizationId]
+          : [targetOrganizationId, invitation.inviterOrganizationId];
+
+      await tx.organizationLink.upsert({
+        where: { organizationAId_organizationBId: { organizationAId: aId, organizationBId: bId } },
+        update: { status: LinkStatus.ACTIVE },
+        create: {
+          organizationAId: aId,
+          organizationBId: bId,
+          status: LinkStatus.ACTIVE,
+          sharedDataTypes: [],
+        },
+      });
+
+      await tx.organizationInvitation.update({
+        where: { id: invitation.id },
+        data: {
+          acceptedAt: new Date(),
+          invitedOrganizationId: targetOrganizationId,
+          invitedOrganizationName: dto.organizationName.trim(),
+        },
+      });
+
+      return targetOrganizationId;
+    });
+
+    return {
+      success: true,
+      data: { organizationId: organization },
+      message: 'Invitation accepted. Organization trial has started and link is active.',
+    };
+  }
+
+  private async getActorMembership(userId: string, organizationId: string) {
+    return this.prisma.membership.findFirst({
+      where: { userId, organizationId },
+      include: {
+        organization: {
+          select: {
+            id: true,
+            type: true,
+          },
+        },
+        permissions: { include: { permission: true } },
+      },
+    });
+  }
+
+  private canEditOrganizations(m: {
+    isOwner: boolean;
+    permissions: { permission: { name: string } }[];
+  }): boolean {
+    if (m.isOwner) return true;
+    return m.permissions.some((p) => p.permission.name === 'TAB_ORGANIZATIONS_EDIT');
+  }
+
+  private getCounterpartType(orgType: string): 'CLINIC' | 'LAB' {
+    if (orgType === 'CLINIC') return 'LAB';
+    if (orgType === 'LAB') return 'CLINIC';
+    throw new BadRequestException('Unknown organization type');
+  }
+
+  private mapInvitationStatus(
+    acceptedAt: Date | null,
+    revokedAt: Date | null,
+    expiresAt: Date,
+  ): LinkStatus | 'EXPIRED' {
+    if (acceptedAt) return LinkStatus.ACTIVE;
+    if (revokedAt) return LinkStatus.REJECTED;
+    return expiresAt.getTime() > Date.now() ? LinkStatus.PENDING : 'EXPIRED';
+  }
+
+  private generateInviteToken(): string {
+    return randomBytes(32).toString('hex');
+  }
+
+  private hashInviteToken(token: string): string {
+    return createHash('sha256').update(token).digest('hex');
+  }
+
+  private getInviteExpiryDate(): Date {
+    const d = new Date();
+    d.setDate(d.getDate() + 7);
+    return d;
+  }
+
+  private buildInviteUrl(token: string): string {
+    const appUrl = process.env.FRONTEND_URL || 'http://localhost:3001';
+    return `${appUrl}/accept-organization-invite?token=${encodeURIComponent(token)}`;
+  }
+
+  private buildInviteUrlFromTokenHashPlaceholder(): null {
+    // Raw token cannot be reconstructed from hash, so pending links are preserved client-side after creation.
+    return null;
+  }
+
+  private getRequesterOrganizationId(sharedDataTypes: unknown): string | null {
+    if (!Array.isArray(sharedDataTypes)) return null;
+    for (const v of sharedDataTypes) {
+      if (typeof v !== 'string') continue;
+      if (!v.startsWith('requested_by:')) continue;
+      const id = v.slice('requested_by:'.length).trim();
+      if (id) return id;
+    }
+    return null;
+  }
+
+  private async findValidInvitation(token: string) {
+    const invitation = await this.prisma.organizationInvitation.findUnique({
+      where: { tokenHash: this.hashInviteToken(token) },
+      include: {
+        inviterOrganization: { select: { id: true, name: true } },
+      },
+    });
+    if (!invitation) {
+      throw new NotFoundException('Invitation not found');
+    }
+    if (invitation.revokedAt) {
+      throw new BadRequestException('Invitation has been revoked');
+    }
+    if (invitation.expiresAt.getTime() <= Date.now()) {
+      throw new BadRequestException('Invitation has expired');
+    }
+    return invitation;
+  }
+}

backend/src/modules/patients/patients.service.ts

@@ -1,5 +1,4 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
-import { Prisma } from '@prisma/client';
 import { PrismaService } from '../../../prisma/prisma.service';
 import { CreatePatientDto } from './dto/create-patient.dto';
 import { ListPatientsDto } from './dto/list-patients.dto';
@@ -26,15 +25,15 @@ export class PatientsService {
     const { page = 1, limit = 10, q } = query;
     const skip = (page - 1) * limit;
 
-    const where: Prisma.PatientWhereInput = {
+    const where = {
       organizationId,
       ...(q
         ? {
             OR: [
-              { firstName: { contains: q, mode: 'insensitive' } },
-              { lastName: { contains: q, mode: 'insensitive' } },
-              { email: { contains: q, mode: 'insensitive' } },
-              { phone: { contains: q, mode: 'insensitive' } },
+              { firstName: { contains: q, mode: 'insensitive' as const } },
+              { lastName: { contains: q, mode: 'insensitive' as const } },
+              { email: { contains: q, mode: 'insensitive' as const } },
+              { phone: { contains: q, mode: 'insensitive' as const } },
             ],
           }
         : {}),

backend/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "types": ["node", "jest"],
     "module": "nodenext",
     "moduleResolution": "nodenext",
     "resolvePackageJsonExports": true,

frontend/Dockerfile

@@ -1,5 +1,5 @@
 # Build stage — produces `.next/standalone` (see next.config.ts output: standalone)
-FROM node:18-alpine AS builder
+FROM node:20-alpine AS builder
 
 WORKDIR /app
 
@@ -21,7 +21,7 @@ ENV NEXT_PUBLIC_APP_NAME=${NEXT_PUBLIC_APP_NAME}
 RUN npm run build
 
 # Production — minimal runtime using Next.js standalone bundle
-FROM node:18-alpine AS runner
+FROM node:20-alpine AS runner
 
 RUN apk add --no-cache dumb-init
 

frontend/README.md

@@ -1,36 +1,63 @@
-This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
+# Dyolink — Frontend (Next.js)
 
-## Getting Started
+## Prerequisites
 
-First, run the development server:
+- **Node.js 20+** and **npm**
+
+## First-time setup
+
+1. **Clone the monorepo** and go to the frontend app:
+
+   ```bash
+   git clone <repository-url> dyolink
+   cd dyolink/frontend
+   ```
+
+2. **Install dependencies**
+
+   ```bash
+   npm install
+   ```
+
+3. **Environment**
+
+   Create **`.env.local`** in this folder (not committed to git) with the public URLs your browser will use:
+
+   ```env
+   NEXT_PUBLIC_APP_URL=http://localhost:3001
+   NEXT_PUBLIC_API_URL=http://localhost:3000/api
+   NEXT_PUBLIC_APP_NAME=Dyolink
+   ```
+
+   - Adjust **`NEXT_PUBLIC_API_URL`** if the Nest API runs on another host/port.
+   - These values are baked in at **build time** for production images; for local dev, restart `npm run dev` after changing them.
+
+## Run (development)
 
 ```bash
 npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
-bun dev
 ```
 
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
+Open **`http://localhost:3001`** (dev server uses port **3001** so it does not clash with the API on 3000).
 
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
+Ensure the backend is running and `NEXT_PUBLIC_API_URL` matches its base URL (including `/api` if your API is mounted there).
 
-This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
+## After pulling latest `main`
 
-## Learn More
+```bash
+git pull
+npm install
+```
 
-To learn more about Next.js, take a look at the following resources:
+## Useful commands
 
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
+| Command | Purpose |
+|--------|---------|
+| `npm run dev` | Development server (port 3001) |
+| `npm run build` | Production build |
+| `npm run start` | Serve production build (port 3000 — used inside Docker) |
+| `npm run lint` | ESLint |
 
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
+## Docker
 
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.
+Image build and build-args (`NEXT_PUBLIC_*`) are documented in the **repository root `README.md`**.

frontend/src/app/(dashboard)/billing/page.tsx

@@ -1,10 +1,11 @@
 // src/app/(dashboard)/billing/page.tsx
 'use client';
 import { useState } from 'react';
-import { Search, Filter, Plus } from 'lucide-react';
+import { Pencil } from 'lucide-react';
 import { Button } from '@/components/ui/common/Button';
-import { Input } from '@/components/ui/common/Input';
 import { Badge } from '@/components/ui/common/Badge';
+import { Table } from '@/components/ui/common/Table';
+import { SearchBar } from '@/components/ui/common/SearchBar';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { hasPermission } from '@/shared/permissions';
 // Mock data matching your design
@@ -44,11 +45,9 @@ export default function BillingPage() {
                 <h1 className="text-2xl font-semibold text-text-primary">Billing</h1>
                 <Button
                     variant="primary"
-                    className="flex items-center gap-2"
                     disabled={!canEditBilling}
                     title={!canEditBilling ? 'Read-only access for this organization.' : undefined}
                 >
-                    <Plus className="h-4 w-4 icon-flat" />
                     New Invoice
                 </Button>
             </div>
@@ -80,17 +79,12 @@ export default function BillingPage() {
                 />
             </div>
             {/* Filters */}
-            <div className="surface-card p-4">
-                <div className="flex gap-4 items-center">
-                    <div className="flex-1">
-                        <Input
-                            placeholder="Search patients..."
+            <SearchBar
                 value={search}
-                            onChange={(e) => setSearch(e.target.value)}
-                            icon={<Search className="h-4 w-4 icon-flat" />}
-                        />
-                    </div>
-                    <div className="flex gap-2">
+                onChange={setSearch}
+                placeholder="Search patients..."
+                actions={(
+                    <>
                         {['all', 'paid', 'unpaid', 'overdue'].map((status) => (
                             <button
                                 key={status}
@@ -103,13 +97,12 @@ export default function BillingPage() {
                                 {status}
                             </button>
                         ))}
-                    </div>
-                </div>
-            </div>
+                    </>
+                )}
+            />
             {/* Invoices Table - Matching your design */}
-            <div className="surface-card overflow-hidden">
-                <table className="w-full">
-                    <thead className="bg-background-secondary/70 border-b border-border">
+            <Table
+                headers={
                     <tr>
                             <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
                                 Invoice ID
@@ -129,36 +122,37 @@ export default function BillingPage() {
                             <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
                                 Paid
                             </th>
-                            <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                            <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">
                                 Status
                             </th>
                             <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
                                 Action
                             </th>
                         </tr>
-                    </thead>
-                    <tbody className="divide-y divide-border/60">
+                }
+                body={
+                    <>
                         {invoices.map((invoice) => (
                         <tr key={invoice.id} className="hover:bg-background-secondary/45">
-                                <td className="px-6 py-4 text-sm font-medium text-text-primary">
+                                <td className="px-6 py-1.5 text-sm font-medium text-text-primary">
                                     {invoice.id}
                                 </td>
-                                <td className="px-6 py-4 text-sm text-text-primary">
+                                <td className="px-6 py-1.5 text-sm text-text-primary">
                                     {invoice.patient}
                                 </td>
-                                <td className="px-6 py-4 text-sm text-text-secondary">
+                                <td className="px-6 py-1.5 text-sm text-text-secondary">
                                     {invoice.date}
                                 </td>
-                                <td className="px-6 py-4 text-sm text-text-primary">
+                                <td className="px-6 py-1.5 text-sm text-text-primary">
                                     {invoice.service}
                                 </td>
-                                <td className="px-6 py-4 text-sm text-text-primary">
+                                <td className="px-6 py-1.5 text-sm text-text-primary">
                                     ${invoice.amount}
                                 </td>
-                                <td className="px-6 py-4 text-sm text-text-primary">
+                                <td className="px-6 py-1.5 text-sm text-text-primary">
                                     ${invoice.paid}
                                 </td>
-                                <td className="px-6 py-4">
+                                <td className="px-6 py-1.5 text-center align-middle">
                                     <Badge
                                         variant={statusColors[invoice.status as keyof typeof statusColors]}
                                         className="capitalize"
@@ -166,21 +160,24 @@ export default function BillingPage() {
                                         {invoice.status}
                                     </Badge>
                                 </td>
-                                <td className="px-6 py-4">
+                                <td className="px-6 py-1.5">
                                     <button
-                                        className={`text-sm ${canEditBilling ? 'text-primary hover:opacity-90' : 'text-text-muted cursor-not-allowed'}`}
+                                        className={`p-2 rounded-md ${canEditBilling
+                                            ? 'text-text-secondary hover:bg-background-card/80 hover:text-text-primary'
+                                            : 'text-text-muted cursor-not-allowed opacity-50'}`}
                                         disabled={!canEditBilling}
                                         title={!canEditBilling ? 'Read-only access for this organization.' : undefined}
+                                        aria-label="Edit invoice"
                                     >
-                                        Edit
+                                        <Pencil className="w-4 h-4" />
                                     </button>
                                 </td>
                         </tr>
                         ))}
-                    </tbody>
-                </table>
-                {/* Pagination - Matching your design */}
-                <div className="px-6 py-4 border-t border-border/60 flex justify-between items-center bg-background-secondary/70">
+                    </>
+                }
+                footer={(
+                    <>
                     <button className="text-sm text-text-secondary hover:text-text-primary">
                         ← Previous
                     </button>
@@ -190,8 +187,9 @@ export default function BillingPage() {
                     <button className="text-sm text-text-secondary hover:text-text-primary">
                         Next →
                     </button>
-                </div>
-            </div>
+                    </>
+                )}
+            />
         </div>
     );
 }

frontend/src/app/(dashboard)/lab/page.tsx

@@ -1,10 +0,0 @@
-export default function LabPage() {
-  return (
-    <div className="space-y-3">
-      <h1 className="text-2xl font-semibold text-text-primary">Lab Management</h1>
-      <p className="text-sm text-text-secondary">
-        Lab management module is coming soon.
-      </p>
-    </div>
-  );
-}

frontend/src/app/(dashboard)/organizations/page.tsx

@@ -0,0 +1,602 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { Check, Copy, Link2, Trash2, X } from 'lucide-react';
+import { useAuth } from '@/lib/hooks/useAuth';
+import {
+  organizationApi,
+  type CounterpartItemDto,
+  type CounterpartSearchResultDto,
+  type OrganizationInvitationHistoryItemDto,
+} from '@/lib/api/organization';
+import { Button } from '@/components/ui/common/Button';
+import { Badge, organizationLinkStatusVariant } from '@/components/ui/common/Badge';
+import { Input } from '@/components/ui/common/Input';
+import { SearchBar } from '@/components/ui/common/SearchBar';
+import { Table } from '@/components/ui/common/Table';
+import type { ApiError } from '@/types/api';
+
+type StoredInviteLink = {
+  invitationId: string;
+  ownerEmail: string;
+  invitationUrl: string;
+};
+
+function inviteLinksStorageKey(orgId: string): string {
+  return `counterpartInviteLinks:${orgId}`;
+}
+
+function readStoredInviteLinks(orgId: string): Record<string, StoredInviteLink> {
+  if (typeof window === 'undefined') return {};
+  try {
+    const raw = window.localStorage.getItem(inviteLinksStorageKey(orgId));
+    if (!raw) return {};
+    const parsed = JSON.parse(raw) as Record<string, StoredInviteLink>;
+    return parsed && typeof parsed === 'object' ? parsed : {};
+  } catch {
+    return {};
+  }
+}
+
+function writeStoredInviteLinks(orgId: string, links: Record<string, StoredInviteLink>) {
+  if (typeof window === 'undefined') return;
+  window.localStorage.setItem(inviteLinksStorageKey(orgId), JSON.stringify(links));
+}
+
+function formatOrganizationStatusLabel(status: string): string {
+  if (!status) return status;
+  const lower = status.toLowerCase();
+  return lower.charAt(0).toUpperCase() + lower.slice(1);
+}
+
+function formatLinkStatusLabel(status: CounterpartItemDto['status']): string {
+  if (status === 'PENDING') return 'Link request pending';
+  if (status === 'ACTIVE') return 'Linked';
+  if (status === 'REJECTED') return 'Link request rejected';
+  return formatOrganizationStatusLabel(status);
+}
+
+function formatInvitationStatusLabel(status: OrganizationInvitationHistoryItemDto['status']): string {
+  if (status === 'PENDING') return 'Invitation pending';
+  if (status === 'ACTIVE') return 'Invitation Accepted';
+  if (status === 'REJECTED') return 'Invitation rejected';
+  return formatOrganizationStatusLabel(status);
+}
+
+function formatApiMessage(err: unknown): string {
+  if (!err || typeof err !== 'object') return 'Something went wrong';
+  const m = (err as ApiError).message;
+  if (Array.isArray(m)) return m.join(', ');
+  if (typeof m === 'string') return m;
+  return 'Something went wrong';
+}
+
+function formatTableDate(value: string): string {
+  const d = new Date(value);
+  if (Number.isNaN(d.getTime())) return '—';
+  return d.toLocaleDateString();
+}
+
+type TableMode = 'existing' | 'search';
+
+export default function OrganizationsPage() {
+  const { currentOrganization } = useAuth();
+  const [loading, setLoading] = useState(true);
+  const [error, setError] = useState('');
+  const [success, setSuccess] = useState('');
+
+  const [query, setQuery] = useState('');
+  const [mode, setMode] = useState<TableMode>('existing');
+  const [searching, setSearching] = useState(false);
+  const [searchResults, setSearchResults] = useState<CounterpartSearchResultDto[]>([]);
+  const [requestLinkRowId, setRequestLinkRowId] = useState<string | null>(null);
+  const [deleteLinkRowId, setDeleteLinkRowId] = useState<string | null>(null);
+
+  const [items, setItems] = useState<CounterpartItemDto[]>([]);
+  const [manualOrganizationName, setManualOrganizationName] = useState('');
+  const [manualOwnerEmail, setManualOwnerEmail] = useState('');
+  const [inviteLoading, setInviteLoading] = useState(false);
+  const [copiedId, setCopiedId] = useState<string | null>(null);
+  const [pendingInviteLinks, setPendingInviteLinks] = useState<Record<string, StoredInviteLink>>({});
+  const [showInviteForm, setShowInviteForm] = useState(false);
+  const [historyOpen, setHistoryOpen] = useState(false);
+  const [historyLoading, setHistoryLoading] = useState(false);
+  const [historyItems, setHistoryItems] = useState<OrganizationInvitationHistoryItemDto[]>([]);
+
+  const counterpartLabel = currentOrganization?.type === 'LAB' ? 'Clinic' : 'Lab';
+  const tabLabel = currentOrganization?.type === 'LAB' ? 'Clinics' : 'Labs';
+
+  const existingRows = items;
+
+  async function loadList() {
+    setLoading(true);
+    setError('');
+    try {
+      const res = await organizationApi.list();
+      setItems(res.data.items);
+    } catch (e) {
+      setError(formatApiMessage(e));
+    } finally {
+      setLoading(false);
+    }
+  }
+
+  useEffect(() => {
+    if (!currentOrganization?.id) return;
+    setPendingInviteLinks(readStoredInviteLinks(currentOrganization.id));
+  }, [currentOrganization?.id]);
+
+  useEffect(() => {
+    void loadList();
+  }, []);
+
+  useEffect(() => {
+    if (!success) return;
+    const t = setTimeout(() => setSuccess(''), 4000);
+    return () => clearTimeout(t);
+  }, [success]);
+
+  async function runSearch() {
+    const q = query.trim();
+    if (!q) {
+      setMode('existing');
+      setSearchResults([]);
+      setShowInviteForm(false);
+      return;
+    }
+
+    setSearching(true);
+    setError('');
+    setMode('search');
+    setShowInviteForm(false);
+    try {
+      const res = await organizationApi.search(q);
+      setSearchResults(res.data);
+    } catch (e) {
+      setError(formatApiMessage(e));
+      setSearchResults([]);
+    } finally {
+      setSearching(false);
+    }
+  }
+
+  async function submitRequestLink(targetOrganizationId: string) {
+    setRequestLinkRowId(targetOrganizationId);
+    setError('');
+    try {
+      await organizationApi.createLink(targetOrganizationId);
+      setSuccess(`${counterpartLabel} link request sent`);
+      setSearchResults([]);
+      setQuery('');
+      setMode('existing');
+      await loadList();
+    } catch (e) {
+      setError(formatApiMessage(e));
+    } finally {
+      setRequestLinkRowId(null);
+    }
+  }
+
+  async function sendInvite() {
+    setInviteLoading(true);
+    setError('');
+    try {
+      const res = await organizationApi.invite({
+        organizationName: manualOrganizationName.trim(),
+        ownerEmail: manualOwnerEmail.trim(),
+      });
+      if (currentOrganization?.id) {
+        const nextLinks = {
+          ...pendingInviteLinks,
+          [res.data.invitationId]: {
+            invitationId: res.data.invitationId,
+            ownerEmail: manualOwnerEmail.trim().toLowerCase(),
+            invitationUrl: res.data.invitationUrl,
+          },
+        };
+        setPendingInviteLinks(nextLinks);
+        writeStoredInviteLinks(currentOrganization.id, nextLinks);
+      }
+      setSuccess(`Invitation link created for ${manualOwnerEmail.trim()}`);
+      setManualOrganizationName('');
+      setManualOwnerEmail('');
+      setShowInviteForm(false);
+      setMode('existing');
+      setQuery('');
+      setSearchResults([]);
+      await loadList();
+    } catch (e) {
+      setError(formatApiMessage(e));
+    } finally {
+      setInviteLoading(false);
+    }
+  }
+
+  async function openInvitationHistory() {
+    setHistoryOpen(true);
+    setHistoryLoading(true);
+    setError('');
+    try {
+      const res = await organizationApi.listInvitations();
+      setHistoryItems(res.data.items);
+    } catch (e) {
+      setError(formatApiMessage(e));
+    } finally {
+      setHistoryLoading(false);
+    }
+  }
+
+  async function respondToPendingLink(linkId: string, action: 'ACCEPT' | 'REJECT') {
+    setRequestLinkRowId(linkId);
+    setError('');
+    try {
+      await organizationApi.respondLink(linkId, action);
+      setSuccess(action === 'ACCEPT' ? 'Link request accepted' : 'Link request rejected');
+      await loadList();
+    } catch (e) {
+      setError(formatApiMessage(e));
+    } finally {
+      setRequestLinkRowId(null);
+    }
+  }
+
+  async function deleteLinkedOrganization(linkId: string) {
+    setDeleteLinkRowId(linkId);
+    setError('');
+    try {
+      await organizationApi.deleteLink(linkId);
+      setSuccess('Linked organization removed');
+      await loadList();
+    } catch (e) {
+      setError(formatApiMessage(e));
+    } finally {
+      setDeleteLinkRowId(null);
+    }
+  }
+
+  async function copyInvitationLink(invitationId: string) {
+    setError('');
+    try {
+      let invitationUrl = pendingInviteLinks[invitationId]?.invitationUrl;
+      if (!invitationUrl) {
+        const res = await organizationApi.getInvitationLink(invitationId);
+        invitationUrl = res.data.invitationUrl;
+        if (currentOrganization?.id) {
+          const nextLinks = {
+            ...pendingInviteLinks,
+            [invitationId]: {
+              invitationId,
+              ownerEmail:
+                historyItems.find((item) => item.id === invitationId)?.ownerEmail?.toLowerCase() ?? '',
+              invitationUrl,
+            },
+          };
+          setPendingInviteLinks(nextLinks);
+          writeStoredInviteLinks(currentOrganization.id, nextLinks);
+        }
+      }
+      await navigator.clipboard.writeText(invitationUrl);
+      setCopiedId(invitationId);
+      setTimeout(() => setCopiedId(null), 1500);
+    } catch {
+      setError('Could not copy invitation link');
+    }
+  }
+
+  function clearSearchView() {
+    setMode('existing');
+    setQuery('');
+    setSearchResults([]);
+    setShowInviteForm(false);
+  }
+
+  if (!currentOrganization) {
+    return <p className="text-sm text-text-secondary">Loading organization...</p>;
+  }
+
+  return (
+    <div className="space-y-6">
+      <div className="flex flex-col gap-1 sm:flex-row sm:items-start sm:justify-between">
+        <div>
+          <h1 className="text-2xl font-semibold text-text-primary">{tabLabel}</h1>
+          <p className="text-sm text-text-secondary mt-1">
+            Search organizations and send link requests or invitation links in one place.
+          </p>
+        </div>
+        <Button type="button" size="sm" onClick={() => void openInvitationHistory()}>
+          Invitation History
+        </Button>
+      </div>
+
+      {error && (
+        <div className="rounded-[var(--radius-md)] border border-red-500/40 bg-red-500/10 px-4 py-3 text-sm text-red-700 dark:text-red-300">
+          {error}
+        </div>
+      )}
+      {success && (
+        <div className="rounded-[var(--radius-md)] border border-primary/30 bg-primary-soft/40 px-4 py-3 text-sm text-text-primary">
+          {success}
+        </div>
+      )}
+
+      <SearchBar
+        value={query}
+        onChange={setQuery}
+        onSubmit={() => void runSearch()}
+        placeholder={`Search ${counterpartLabel.toLowerCase()} by name, email, or phone...`}
+        actions={
+          <>
+            <button
+              type="button"
+              onClick={() => void runSearch()}
+              disabled={searching}
+              className="px-4 py-2 rounded-[var(--radius-sm)] text-sm font-medium border bg-primary-soft text-primary border-primary/50 disabled:opacity-60"
+            >
+              Search
+            </button>
+            {mode === 'search' && (
+              <button
+                type="button"
+                onClick={clearSearchView}
+                className="px-4 py-2 rounded-[var(--radius-sm)] text-sm font-medium border text-text-secondary border-border/40 hover:bg-background-card/70 hover:border-border"
+              >
+                Back to list
+              </button>
+            )}
+          </>
+        }
+      />
+
+      <Table
+        headers={
+            <tr>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                Organization
+              </th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                Owner email
+              </th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                Date
+              </th>
+              <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">
+                Status
+              </th>
+              <th className="px-6 py-3 text-right text-xs font-medium text-text-muted uppercase tracking-wider">
+                Action
+              </th>
+            </tr>
+        }
+        body={
+          <>
+            {loading ? (
+              <tr>
+                <td colSpan={5} className="px-6 py-8 text-sm text-text-secondary">
+                  Loading...
+                </td>
+              </tr>
+            ) : mode === 'existing' ? (
+              existingRows.length === 0 ? (
+                <tr>
+                  <td colSpan={5} className="px-6 py-8 text-sm text-text-secondary">
+                    No organizations linked or pending yet. Use search to find and connect.
+                  </td>
+                </tr>
+              ) : (
+                existingRows.map((row) => {
+                  const canRespond =
+                    row.status === 'PENDING' &&
+                    row.requestedByOrganizationId !== null &&
+                    row.requestedByOrganizationId !== currentOrganization.id;
+
+                  return (
+                    <tr key={row.id} className="hover:bg-background-secondary/45">
+                      <td className="px-6 py-1.5 text-sm font-medium text-text-primary">
+                        {row.organizationName}
+                      </td>
+                      <td className="px-6 py-1.5 text-sm text-text-secondary">{row.ownerEmail}</td>
+                      <td className="px-6 py-1.5 text-sm text-text-secondary">
+                        {formatTableDate(row.createdAt)}
+                      </td>
+                      <td className="px-6 py-1.5 text-center align-middle">
+                        <Badge variant={organizationLinkStatusVariant(row.status)} fixedWidth={false}>
+                          {formatLinkStatusLabel(row.status)}
+                        </Badge>
+                      </td>
+                      <td className="px-6 py-1.5 text-right">
+                        <div className="inline-flex items-center gap-2">
+                          {canRespond && (
+                            <>
+                              <button
+                                type="button"
+                                className="p-2 rounded-md text-text-secondary hover:bg-background-card/80 hover:text-text-primary disabled:text-text-muted disabled:opacity-50"
+                                disabled={requestLinkRowId !== null && requestLinkRowId !== row.id}
+                                onClick={() => void respondToPendingLink(row.id, 'ACCEPT')}
+                                aria-label="Accept link request"
+                                title="Accept link request"
+                              >
+                                <Check className="w-4 h-4" />
+                              </button>
+                              <button
+                                type="button"
+                                className="p-2 rounded-md text-text-secondary hover:bg-red-500/15 hover:text-red-600 disabled:text-text-muted disabled:opacity-50"
+                                disabled={requestLinkRowId !== null && requestLinkRowId !== row.id}
+                                onClick={() => void respondToPendingLink(row.id, 'REJECT')}
+                                aria-label="Reject link request"
+                                title="Reject link request"
+                              >
+                                <X className="w-4 h-4" />
+                              </button>
+                            </>
+                          )}
+                          {row.status === 'ACTIVE' && (
+                            <button
+                              type="button"
+                              className="p-2 rounded-md text-text-secondary hover:bg-red-500/15 hover:text-red-600 disabled:text-text-muted disabled:opacity-50"
+                              disabled={deleteLinkRowId !== null && deleteLinkRowId !== row.id}
+                              onClick={() => void deleteLinkedOrganization(row.id)}
+                              aria-label="Delete link"
+                              title="Delete link"
+                            >
+                              <Trash2 className="w-4 h-4" />
+                            </button>
+                          )}
+                        </div>
+                      </td>
+                    </tr>
+                  );
+                })
+              )
+            ) : searchResults.length > 0 ? (
+              searchResults.map((r) => (
+                <tr key={r.id} className="hover:bg-background-secondary/45">
+                  <td className="px-6 py-1.5 text-sm font-medium text-text-primary">{r.name}</td>
+                  <td className="px-6 py-1.5 text-sm text-text-secondary">{r.owner.email}</td>
+                  <td className="px-6 py-1.5 text-sm text-text-secondary">Today</td>
+                  <td className="px-6 py-1.5 text-center align-middle">
+                    <Badge variant="default" fixedWidth={false}>Found</Badge>
+                  </td>
+                  <td className="px-6 py-1.5 text-right">
+                    <button
+                      type="button"
+                      className="p-2 rounded-md text-text-secondary hover:bg-background-card/80 hover:text-text-primary disabled:text-text-muted disabled:opacity-50"
+                      disabled={requestLinkRowId !== null && requestLinkRowId !== r.id}
+                      onClick={() => void submitRequestLink(r.id)}
+                      aria-label="Send link request"
+                      title="Send link request"
+                    >
+                      <Link2 className="w-4 h-4" />
+                    </button>
+                  </td>
+                </tr>
+              ))
+            ) : (
+              <tr>
+                <td colSpan={5} className="px-6 py-6">
+                  <div className="flex flex-col gap-3">
+                    <p className="text-sm text-text-secondary">
+                      No organization found in directory search.
+                    </p>
+                    <div className="flex flex-wrap items-center gap-2">
+                      <Button type="button" onClick={() => setShowInviteForm((v) => !v)}>
+                        {showInviteForm ? 'Hide invitation fields' : 'Send invitation link'}
+                      </Button>
+                    </div>
+                    {showInviteForm && (
+                      <div className="grid gap-3 sm:grid-cols-3 mt-1">
+                        <Input
+                          label={`${counterpartLabel} name`}
+                          value={manualOrganizationName}
+                          onChange={(e) => setManualOrganizationName(e.target.value)}
+                        />
+                        <Input
+                          label="Owner email"
+                          type="email"
+                          value={manualOwnerEmail}
+                          onChange={(e) => setManualOwnerEmail(e.target.value)}
+                        />
+                        <div className="flex items-end">
+                          <Button
+                            type="button"
+                            isLoading={inviteLoading}
+                            disabled={!manualOrganizationName.trim() || !manualOwnerEmail.trim()}
+                            onClick={() => void sendInvite()}
+                            className="w-full"
+                          >
+                            Send invitation
+                          </Button>
+                        </div>
+                      </div>
+                    )}
+                  </div>
+                </td>
+              </tr>
+            )}
+          </>
+        }
+      />
+
+      {historyOpen && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/50">
+          <div
+            className="w-full max-w-3xl max-h-[90vh] overflow-y-auto rounded-[var(--radius-md)] border border-border bg-background-secondary p-6 shadow-xl space-y-4"
+            role="dialog"
+            aria-modal="true"
+          >
+            <div className="flex items-center justify-between">
+              <h2 className="text-lg font-semibold text-text-primary">Invitation History</h2>
+              <Button type="button" size="sm" onClick={() => setHistoryOpen(false)}>
+                Close
+              </Button>
+            </div>
+
+            {historyLoading ? (
+              <p className="text-sm text-text-secondary">Loading invitation history...</p>
+            ) : historyItems.length === 0 ? (
+              <p className="text-sm text-text-secondary">No invitations yet.</p>
+            ) : (
+              <Table
+                headers={
+                  <tr>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                      Organization
+                    </th>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                      Owner email
+                    </th>
+                    <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">
+                      Date
+                    </th>
+                    <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">
+                      Status
+                    </th>
+                    <th className="px-6 py-3 text-right text-xs font-medium text-text-muted uppercase tracking-wider">
+                      Action
+                    </th>
+                  </tr>
+                }
+                body={
+                  <>
+                    {historyItems.map((inv) => (
+                      <tr key={inv.id} className="hover:bg-background-secondary/45">
+                        <td className="px-6 py-1.5 text-sm text-text-primary">{inv.organizationName}</td>
+                        <td className="px-6 py-1.5 text-sm text-text-secondary">{inv.ownerEmail}</td>
+                        <td className="px-6 py-1.5 text-sm text-text-secondary">
+                          {formatTableDate(inv.createdAt)}
+                        </td>
+                        <td className="px-6 py-1.5 text-center align-middle">
+                          <Badge variant={organizationLinkStatusVariant(inv.status)} fixedWidth={false}>
+                            {formatInvitationStatusLabel(inv.status)}
+                          </Badge>
+                        </td>
+                        <td className="px-6 py-1.5 text-right">
+                          {inv.status === 'PENDING' ? (
+                            <button
+                              type="button"
+                              className="p-2 rounded-md text-text-secondary hover:bg-background-card/80 hover:text-text-primary"
+                              onClick={() => void copyInvitationLink(inv.id)}
+                              aria-label="Copy invitation link"
+                              title="Copy invitation link"
+                            >
+                              {copiedId === inv.id ? (
+                                <Check className="w-4 h-4" />
+                              ) : (
+                                <Copy className="w-4 h-4" />
+                              )}
+                            </button>
+                          ) : (
+                            <span className="text-xs text-text-muted">—</span>
+                          )}
+                        </td>
+                      </tr>
+                    ))}
+                  </>
+                }
+              />
+            )}
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/app/(dashboard)/patients/page.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useEffect, useMemo, useState } from 'react';
-import { Plus } from 'lucide-react';
 import { Button } from '@/components/ui/common/Button';
 import { patientsApi } from '@/lib/api/patients';
 import { useAuth } from '@/lib/hooks/useAuth';
@@ -160,7 +159,6 @@ export default function PatientsPage() {
         <h1 className="text-2xl font-semibold text-text-primary">Patients</h1>
         <Button
           variant="primary"
-          className="flex items-center gap-2"
           disabled={!canEditPatients}
           onClick={() => {
             if (!canEditPatients) return;
@@ -168,7 +166,6 @@ export default function PatientsPage() {
           }}
           title={!canEditPatients ? 'Read-only access for this organization.' : undefined}
         >
-          <Plus className="h-4 w-4 icon-flat" />
           New Patient
         </Button>
       </div>

frontend/src/app/(dashboard)/settings/subscriptions/page.tsx

@@ -5,6 +5,7 @@ import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { authApi } from '@/lib/api/auth';
+import { Button } from '@/components/ui/common/Button';
 import type { SubscriptionAlertData } from '@/types/subscription';
 
 const PLAN_OPTIONS = [
@@ -176,9 +177,9 @@ export default function SubscriptionsSettingsPage() {
               );
             })}
           </div>
-          <button
+          <Button
             type="button"
-            className="inline-flex items-center justify-center rounded-[var(--radius-md)] bg-primary px-4 py-2 text-sm font-medium text-white hover:opacity-90 disabled:opacity-60"
+            variant="primary"
             onClick={() => {
               const selectedPlanLabel = selectedPlan?.name ?? 'the selected plan';
               setPurchaseNotice(
@@ -187,7 +188,7 @@ export default function SubscriptionsSettingsPage() {
             }}
           >
             Start purchase process
-          </button>
+          </Button>
           {purchaseNotice && (
             <div className="rounded-[var(--radius-md)] border border-emerald-500/30 bg-emerald-500/10 px-4 py-3">
               <p className="text-sm text-emerald-200">{purchaseNotice}</p>

frontend/src/app/(dashboard)/staff/components/staffPermissions.ts

@@ -2,7 +2,11 @@
 export const STAFF_FEATURE_GROUPS = [
   { label: 'Today', read: 'TAB_TODAY_READ', edit: 'TAB_TODAY_EDIT' },
   { label: 'Staff', read: 'TAB_STAFF_READ', edit: 'TAB_STAFF_EDIT' },
-  { label: 'Labs / Clinics', read: 'TAB_LAB_READ', edit: 'TAB_LAB_EDIT' },
+  {
+    label: 'Organizations',
+    read: 'TAB_ORGANIZATIONS_READ',
+    edit: 'TAB_ORGANIZATIONS_EDIT',
+  },
   { label: 'Patients', read: 'TAB_PATIENTS_READ', edit: 'TAB_PATIENTS_EDIT' },
   { label: 'Appointment', read: 'TAB_APPOINTMENTS_READ', edit: 'TAB_APPOINTMENTS_EDIT' },
   { label: 'Treatment', read: 'TAB_TREATMENT_READ', edit: 'TAB_TREATMENT_EDIT' },

frontend/src/app/(dashboard)/staff/page.tsx

@@ -16,12 +16,14 @@ import {
   formatAccessSummary,
   type FeaturePermState,
 } from './staff-permission-form';
-import { UserPlus, Pencil, Trash2, Copy, Check, X, Clock3 } from 'lucide-react';
+import { Pencil, Trash2, Copy, Check, X } from 'lucide-react';
 import { useAuth } from '@/lib/hooks/useAuth';
 import { staffApi, type StaffMemberDto } from '@/lib/api/staff';
 import { Button } from '@/components/ui/common/Button';
+import { Badge } from '@/components/ui/common/Badge';
 import { Input } from '@/components/ui/common/Input';
 import { Checkbox } from '@/components/ui/common/Checkbox';
+import { Table } from '@/components/ui/common/Table';
 import type { ApiError } from '@/types/api';
 
 type StoredInviteLink = {
@@ -335,7 +337,6 @@ export default function StaffPage() {
           className="shrink-0"
           title={!canEdit ? 'Read-only access for this organization.' : undefined}
         >
-          <UserPlus className="w-4 h-4 mr-2" />
           Invite member
         </Button>
       </div>
@@ -410,14 +411,7 @@ export default function StaffPage() {
                     }
                   }}
                 >
-                  {copiedInviteMembershipId === lastInviteInfo.membershipId ? (
-                    <Check className="w-4 h-4" />
-                  ) : (
-                    <Copy className="w-4 h-4" />
-                  )}
-                  <span className="ml-1">
                   {copiedInviteMembershipId === lastInviteInfo.membershipId ? 'Copied' : 'Copy link'}
-                  </span>
                 </Button>
               </div>
               <p className="text-xs text-text-muted">
@@ -431,47 +425,40 @@ export default function StaffPage() {
       {loading ? (
         <p className="text-sm text-text-secondary">Loading team…</p>
       ) : (
-        <div className="overflow-x-auto rounded-[var(--radius-md)] border border-border/70">
-          <table className="w-full text-sm">
-            <thead>
-              <tr className="border-b border-border/70 text-left text-text-secondary">
-                <th className="p-3 font-medium">Name</th>
-                <th className="p-3 font-medium">Email</th>
-                <th className="p-3 font-medium">Role</th>
-                <th className="p-3 font-medium">Status</th>
-                <th className="p-3 font-medium">Access</th>
-                <th className="p-3 font-medium w-28">Actions</th>
+        <Table
+          headers={
+            <tr>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Name</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Email</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Role</th>
+              <th className="px-6 py-3 text-center text-xs font-medium text-text-muted uppercase tracking-wider">Status</th>
+              <th className="px-6 py-3 text-left text-xs font-medium text-text-muted uppercase tracking-wider">Access</th>
+              <th className="px-6 py-3 text-right text-xs font-medium text-text-muted uppercase tracking-wider w-28">Actions</th>
             </tr>
-            </thead>
-            <tbody>
+          }
+          body={
+            <>
               {members.map((m) => (
-                <tr key={m.id} className="h-14 border-b border-border/40 last:border-0">
-                  <td className="p-3 text-text-primary">{m.name}</td>
-                  <td className="p-3 text-text-secondary">{m.email}</td>
-                  <td className="p-3">
+                <tr key={m.id} className="hover:bg-background-secondary/45">
+                  <td className="px-6 py-1.5 text-sm text-text-primary">{m.name}</td>
+                  <td className="px-6 py-1.5 text-sm text-text-secondary">{m.email}</td>
+                  <td className="px-6 py-1.5 text-sm">
                     {m.isOwner ? (
                       <span className="text-primary font-medium">Owner</span>
                     ) : (
                       <span className="text-text-secondary">Staff</span>
                     )}
                   </td>
-                  <td className="p-3 align-middle">
+                  <td className="px-6 py-1.5 align-middle text-center">
                     {m.isOwner || m.invitationStatus === 'ACTIVE' ? (
-                      <span className="inline-flex items-center rounded-full border border-emerald-600/40 bg-emerald-600/15 px-2 py-0.5 text-xs text-emerald-400">
-                        Active
-                      </span>
+                      <Badge variant="success">Active</Badge>
                     ) : m.invitationStatus === 'PENDING' ? (
-                      <span className="inline-flex items-center gap-1 rounded-full border border-amber-500/40 bg-amber-500/15 px-2 py-0.5 text-xs text-amber-300">
-                        <Clock3 className="h-3 w-3" />
-                        Pending
-                      </span>
+                      <Badge variant="warning">Pending</Badge>
                     ) : (
-                      <span className="inline-flex items-center rounded-full border border-red-500/40 bg-red-500/15 px-2 py-0.5 text-xs text-red-300">
-                        Expired
-                      </span>
+                      <Badge variant="danger">Expired</Badge>
                     )}
                   </td>
-                  <td className="p-3 text-text-secondary max-w-md">
+                  <td className="px-6 py-1.5 text-sm text-text-secondary max-w-md">
                     {m.isOwner ? (
                       <span className="text-text-muted">All features</span>
                     ) : (
@@ -480,7 +467,7 @@ export default function StaffPage() {
                       </span>
                     )}
                   </td>
-                  <td className="p-3 align-middle">
+                  <td className="px-6 py-1.5 align-middle">
                     {!m.isOwner && (
                       <div className="flex min-h-[36px] items-center justify-end gap-1">
                         {m.invitationStatus === 'PENDING' && pendingInviteLinks[m.id]?.invitationUrl && (
@@ -543,9 +530,9 @@ export default function StaffPage() {
                   </td>
                 </tr>
               ))}
-            </tbody>
-          </table>
-        </div>
+            </>
+          }
+        />
       )}
 
       {inviteOpen && (

frontend/src/app/(dashboard)/staff/staff-permission-form.ts

@@ -6,7 +6,7 @@
 export const STAFF_FEATURE_GROUPS = [
   { label: 'Today', read: 'TAB_TODAY_READ', edit: 'TAB_TODAY_EDIT' },
   { label: 'Staff', read: 'TAB_STAFF_READ', edit: 'TAB_STAFF_EDIT' },
-  { label: 'Labs', read: 'TAB_LAB_READ', edit: 'TAB_LAB_EDIT' },
+  { label: 'Organizations', read: 'TAB_ORGANIZATIONS_READ', edit: 'TAB_ORGANIZATIONS_EDIT' },
   { label: 'Patients', read: 'TAB_PATIENTS_READ', edit: 'TAB_PATIENTS_EDIT' },
   { label: 'Appointment', read: 'TAB_APPOINTMENTS_READ', edit: 'TAB_APPOINTMENTS_EDIT' },
   { label: 'Treatment', read: 'TAB_TREATMENT_READ', edit: 'TAB_TREATMENT_EDIT' },
@@ -21,7 +21,7 @@ export function resolveStaffFeatureLabel(
   group: (typeof STAFF_FEATURE_GROUPS)[number],
   organizationType: OrgType,
 ): string {
-  if (group.read === 'TAB_LAB_READ') {
+  if (group.read === 'TAB_ORGANIZATIONS_READ') {
     return organizationType === 'LAB' ? 'Clinics' : 'Labs';
   }
   return group.label;

frontend/src/app/(public)/accept-invite/page.tsx

@@ -78,7 +78,7 @@ function AcceptInviteContent() {
         name: name.trim(),
         password,
       });
-      setSuccess('Invitation accepted. Redirecting to login...');
+      setSuccess('Invitation Accepted. Redirecting to login...');
       setTimeout(() => {
         router.replace('/login');
       }, 1000);

frontend/src/app/(public)/accept-organization-invite/page.tsx

@@ -0,0 +1,159 @@
+'use client';
+
+import { Suspense, useEffect, useMemo, useState } from 'react';
+import Link from 'next/link';
+import { useRouter, useSearchParams } from 'next/navigation';
+import { Button } from '@/components/ui/common/Button';
+import { Input } from '@/components/ui/common/Input';
+import { organizationApi } from '@/lib/api/organization';
+
+function AcceptOrganizationInviteContent() {
+  const params = useSearchParams();
+  const router = useRouter();
+  const token = useMemo(() => params.get('token') || '', [params]);
+
+  const [loading, setLoading] = useState(true);
+  const [submitting, setSubmitting] = useState(false);
+  const [error, setError] = useState('');
+  const [success, setSuccess] = useState('');
+  const [inviteInfo, setInviteInfo] = useState<{
+    ownerEmail: string;
+    organizationName: string;
+    organizationType: 'CLINIC' | 'LAB';
+    inviterOrganizationName: string;
+    expiresAt: string;
+    status: 'PENDING' | 'ACCEPTED';
+  } | null>(null);
+
+  const [ownerName, setOwnerName] = useState('');
+  const [organizationName, setOrganizationName] = useState('');
+  const [password, setPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+
+  useEffect(() => {
+    if (!token) {
+      setLoading(false);
+      setError('Invalid invitation link');
+      return;
+    }
+
+    void (async () => {
+      setLoading(true);
+      setError('');
+      try {
+        const res = await organizationApi.previewInvite(token);
+        setInviteInfo(res.data);
+        setOrganizationName(res.data.organizationName || '');
+        if (res.data.status === 'ACCEPTED') {
+          setSuccess('This invitation is already accepted. You can log in now.');
+        }
+      } catch (e: any) {
+        setError(e?.message || 'Could not load invitation');
+      } finally {
+        setLoading(false);
+      }
+    })();
+  }, [token]);
+
+  async function onAccept() {
+    if (!token) return;
+    setError('');
+    setSuccess('');
+    if (!ownerName.trim()) return setError('Owner name is required');
+    if (!organizationName.trim()) return setError('Organization name is required');
+    if (password.length < 8) return setError('Password must be at least 8 characters');
+    if (password !== confirmPassword) return setError('Passwords do not match');
+
+    setSubmitting(true);
+    try {
+      await organizationApi.acceptInvite({
+        token,
+        ownerName: ownerName.trim(),
+        organizationName: organizationName.trim(),
+        password,
+      });
+      setSuccess('Invitation Accepted. Redirecting to login...');
+      setTimeout(() => router.replace('/login'), 1000);
+    } catch (e: any) {
+      setError(e?.message || 'Could not accept invitation');
+    } finally {
+      setSubmitting(false);
+    }
+  }
+
+  return (
+    <div className="min-h-screen app-web-bg flex items-center justify-center p-4">
+      <div className="w-full max-w-md surface-card p-6 space-y-5">
+        <h1 className="text-xl font-semibold text-text-primary">Accept organization invitation</h1>
+        {loading ? (
+          <p className="text-sm text-text-secondary">Loading invitation...</p>
+        ) : (
+          <>
+            {inviteInfo && (
+              <div className="rounded-[var(--radius-md)] border border-border/70 bg-background-secondary/70 px-3 py-2 text-sm text-text-secondary space-y-1">
+                <p>
+                  Invited by: <span className="text-text-primary">{inviteInfo.inviterOrganizationName}</span>
+                </p>
+                <p>
+                  Owner email: <span className="text-text-primary">{inviteInfo.ownerEmail}</span>
+                </p>
+              </div>
+            )}
+            {error && (
+              <div className="rounded-[var(--radius-md)] border border-red-500/40 bg-red-500/10 px-3 py-2 text-sm text-red-300">
+                {error}
+              </div>
+            )}
+            {success && (
+              <div className="rounded-[var(--radius-md)] border border-primary/30 bg-primary-soft/40 px-3 py-2 text-sm text-text-primary">
+                {success}
+              </div>
+            )}
+            {inviteInfo?.status !== 'ACCEPTED' && (
+              <div className="space-y-3">
+                <Input label="Owner name" value={ownerName} onChange={(e) => setOwnerName(e.target.value)} />
+                <Input
+                  label="Organization name"
+                  value={organizationName}
+                  onChange={(e) => setOrganizationName(e.target.value)}
+                />
+                <Input
+                  label="Create password"
+                  type="password"
+                  value={password}
+                  onChange={(e) => setPassword(e.target.value)}
+                />
+                <Input
+                  label="Confirm password"
+                  type="password"
+                  value={confirmPassword}
+                  onChange={(e) => setConfirmPassword(e.target.value)}
+                />
+                <Button type="button" fullWidth isLoading={submitting} onClick={() => void onAccept()}>
+                  Activate organization
+                </Button>
+              </div>
+            )}
+            <p className="text-xs text-text-muted">
+              Already have access? <Link href="/login" className="text-primary">Go to login</Link>
+            </p>
+          </>
+        )}
+      </div>
+    </div>
+  );
+}
+
+export default function AcceptOrganizationInvitePage() {
+  return (
+    <Suspense
+      fallback={
+        <div className="min-h-screen app-web-bg flex items-center justify-center">
+          <p className="text-sm text-text-secondary">Loading invitation...</p>
+        </div>
+      }
+    >
+      <AcceptOrganizationInviteContent />
+    </Suspense>
+  );
+}

frontend/src/components/ui/common/Badge.tsx

@@ -1,12 +1,16 @@
-//src/components/ui/Badge.tsx
 import React from 'react';
 
-type BadgeVariant = 'success' | 'warning' | 'danger' | 'default';
+export type BadgeVariant = 'success' | 'warning' | 'danger' | 'default';
 
 interface BadgeProps {
   children: React.ReactNode;
   variant?: BadgeVariant;
   className?: string;
+  /**
+   * Same pixel width for every badge (table columns).
+   * Set false only when the pill should shrink to the label.
+   */
+  fixedWidth?: boolean;
 }
 
 const variantStyles: Record<BadgeVariant, string> = {
@@ -16,16 +20,40 @@ const variantStyles: Record<BadgeVariant, string> = {
   default: 'bg-background-secondary text-text-secondary border-border',
 };
 
+/** Explicit width + height so every row matches; flex centers label optically. */
+const FIXED_LAYOUT_CLASS =
+  'w-[8rem] min-w-[8rem] max-w-[8rem] shrink-0 h-7 px-2 py-0';
+
 export function Badge({
   children,
   variant = 'default',
   className,
+  fixedWidth = true,
 }: BadgeProps) {
+  const layoutClass = fixedWidth
+    ? `${FIXED_LAYOUT_CLASS} justify-center text-center`
+    : 'min-h-[1.75rem] px-2.5 py-1 justify-center';
+
   return (
     <span
-            className={`px-2 py-1 text-xs font-medium rounded-lg border inline-block ${variantStyles[variant]} ${className || ''}`}
+      className={`inline-flex items-center box-border rounded-md border text-xs font-medium leading-none whitespace-nowrap ${variantStyles[variant]} ${layoutClass} ${className ?? ''}`}
     >
       {children}
     </span>
   );
 }
+
+/** Map organization link / invitation row status to badge variant. */
+export function organizationLinkStatusVariant(status: string): BadgeVariant {
+  switch (status) {
+    case 'ACTIVE':
+      return 'success';
+    case 'PENDING':
+      return 'warning';
+    case 'REJECTED':
+    case 'EXPIRED':
+      return 'danger';
+    default:
+      return 'default';
+  }
+}

frontend/src/components/ui/common/Button.tsx

@@ -1,6 +1,4 @@
-// src/components/ui/Button.tsx
 import React from 'react';
-import { Loader2 } from 'lucide-react';
 
 type ButtonVariant = 'primary' | 'secondary' | 'outline' | 'danger' | 'ghost';
 type ButtonSize = 'sm' | 'md' | 'lg';
@@ -25,23 +23,22 @@ export const Button: React.FC<ButtonProps> = ({
 }) => {
   const baseClasses =
     'inline-flex items-center justify-center rounded-[var(--radius-md)] font-medium transition-all duration-200 ' +
-    'focus:outline-none focus:ring-2 focus:ring-primary/40 disabled:opacity-50 disabled:cursor-not-allowed';
+    'focus:outline-none focus:ring-2 focus:ring-primary/40 disabled:cursor-not-allowed';
 
   const variantClasses: Record<ButtonVariant, string> = {
     primary:
-      'bg-primary text-primary-contrast hover:brightness-105 shadow-[0_0_0_1px_var(--color-primary-soft)]',
+      'bg-primary text-white hover:opacity-90 disabled:opacity-60',
 
     secondary:
-      'bg-surface-elevated text-text-primary border border-border hover:border-border-strong',
+      'bg-surface-elevated text-text-primary border border-border hover:border-border-strong disabled:opacity-50',
 
     outline:
-      'border border-border text-text-primary hover:bg-background-card/70',
+      'border border-border text-text-primary hover:bg-background-card/70 disabled:opacity-50',
 
-    danger:
-      'bg-red-600 text-white hover:bg-red-700',
+    danger: 'bg-red-600 text-white hover:bg-red-700 disabled:opacity-50',
 
     ghost:
-      'text-text-secondary hover:text-text-primary hover:bg-background-card/70',
+      'text-text-secondary hover:text-text-primary hover:bg-background-card/70 disabled:opacity-50',
   };
 
   const sizeClasses: Record<ButtonSize, string> = {
@@ -51,16 +48,15 @@ export const Button: React.FC<ButtonProps> = ({
   };
 
   const widthClass = fullWidth ? 'w-full' : '';
+  const loadingClass = isLoading ? 'opacity-70 animate-pulse pointer-events-none' : '';
 
   return (
     <button
-      className={`${baseClasses} ${variantClasses[variant]} ${sizeClasses[size]} ${widthClass} ${className}`}
+      className={`${baseClasses} ${variantClasses[variant]} ${sizeClasses[size]} ${widthClass} ${loadingClass} ${className}`}
       disabled={disabled || isLoading}
+      aria-busy={isLoading || undefined}
       {...props}
     >
-      {isLoading && (
-        <Loader2 className="w-4 h-4 mr-2 animate-spin" />
-      )}
       {children}
     </button>
   );

frontend/src/components/ui/common/SearchBar.tsx

@@ -0,0 +1,38 @@
+import { Search } from 'lucide-react';
+import type { ReactNode } from 'react';
+import { Input } from './Input';
+
+interface SearchBarProps {
+  value: string;
+  onChange: (value: string) => void;
+  placeholder: string;
+  onSubmit?: () => void;
+  actions?: ReactNode;
+}
+
+export function SearchBar({
+  value,
+  onChange,
+  placeholder,
+  onSubmit,
+  actions,
+}: SearchBarProps) {
+  return (
+    <div className="surface-card p-4">
+      <div className="flex gap-4 items-center">
+        <div className="flex-1">
+          <Input
+            placeholder={placeholder}
+            value={value}
+            onChange={(e) => onChange(e.target.value)}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') onSubmit?.();
+            }}
+            icon={<Search className="h-4 w-4 icon-flat" />}
+          />
+        </div>
+        {actions && <div className="flex gap-2">{actions}</div>}
+      </div>
+    </div>
+  );
+}

frontend/src/components/ui/common/Sidebar.tsx

@@ -35,7 +35,12 @@ function Sidebar() {
       const withCounterpartTab = [
         menu[0],
         menu[1],
-        { name: counterpartLabel, path: '/lab', icon: FlaskConical, read: 'TAB_LAB_READ' as const },
+        {
+          name: counterpartLabel,
+          path: '/organizations',
+          icon: FlaskConical,
+          read: 'TAB_ORGANIZATIONS_READ' as const,
+        },
         menu[2],
         menu[3],
         menu[4],

frontend/src/components/ui/common/Table.tsx

@@ -0,0 +1,27 @@
+import type { ReactNode } from 'react';
+
+interface TableProps {
+  headers: ReactNode;
+  body: ReactNode;
+  footer?: ReactNode;
+}
+
+export function Table({ headers, body, footer }: TableProps) {
+  return (
+    <div className="surface-card overflow-hidden">
+      <table className="w-full">
+        <thead className="bg-background-secondary/70 border-b border-border">
+          {headers}
+        </thead>
+        <tbody className="divide-y divide-border/60">
+          {body}
+        </tbody>
+      </table>
+      {footer && (
+        <div className="px-6 py-3 border-t border-border/60 flex justify-between items-center bg-background-secondary/70">
+          {footer}
+        </div>
+      )}
+    </div>
+  );
+}

frontend/src/components/ui/organization/OrganizationSelectorContent.tsx

@@ -2,7 +2,7 @@
 
 import { useState } from 'react';
 import { useAuth } from '@/lib/hooks/useAuth';
-import { Building2, Beaker, Mail, Plus } from 'lucide-react';
+import { Building2, Beaker, Mail } from 'lucide-react';
 import { Input } from '@/components/ui/common/Input';
 import { Button } from '@/components/ui/common/Button';
 
@@ -55,7 +55,6 @@ export function OrganizationSelectorContent() {
             setIsCreateOpen((prev) => !prev);
           }}
         >
-          <Plus className="h-4 w-4 mr-2 icon-flat" />
           {isCreateOpen ? 'Cancel' : 'Create Organization'}
         </Button>
       </div>

frontend/src/lib/api/organization.ts

@@ -0,0 +1,115 @@
+import { apiClient } from './client';
+
+export interface CounterpartSearchResultDto {
+  id: string;
+  name: string;
+  email: string;
+  phone: string | null;
+  owner: { email: string; name: string };
+}
+
+export interface CounterpartItemDto {
+  id: string;
+  requestedByOrganizationId: string | null;
+  counterpartOrganizationId: string | null;
+  organizationName: string;
+  ownerEmail: string;
+  phone: string | null;
+  status: 'PENDING' | 'ACTIVE' | 'REJECTED' | 'EXPIRED';
+  createdAt: string;
+  acceptedAt: string | null;
+}
+
+export interface OrganizationInvitationHistoryItemDto {
+  id: string;
+  organizationName: string;
+  ownerEmail: string;
+  status: 'PENDING' | 'ACTIVE' | 'REJECTED' | 'EXPIRED';
+  createdAt: string;
+  acceptedAt: string | null;
+}
+
+export const organizationApi = {
+  search: async (q: string): Promise<{ success: boolean; data: CounterpartSearchResultDto[] }> => {
+    const response = await apiClient.get(`/organizations/search?q=${encodeURIComponent(q)}`);
+    return response.data;
+  },
+
+  list: async (): Promise<{ success: boolean; data: { items: CounterpartItemDto[] } }> => {
+    const response = await apiClient.get('/organizations/links');
+    return response.data;
+  },
+
+  listInvitations: async (): Promise<{
+    success: boolean;
+    data: { items: OrganizationInvitationHistoryItemDto[] };
+  }> => {
+    const response = await apiClient.get('/organizations/invitations');
+    return response.data;
+  },
+
+  createLink: async (
+    targetOrganizationId: string,
+  ): Promise<{ success: boolean; data: { id: string; status: 'PENDING' | 'ACTIVE' | 'REJECTED' } }> => {
+    const response = await apiClient.post('/organizations/links', { targetOrganizationId });
+    return response.data;
+  },
+
+  respondLink: async (
+    linkId: string,
+    action: 'ACCEPT' | 'REJECT',
+  ): Promise<{ success: boolean; data: { id: string; status: 'PENDING' | 'ACTIVE' | 'REJECTED' } }> => {
+    const response = await apiClient.patch(`/organizations/links/${linkId}/respond`, { action });
+    return response.data;
+  },
+
+  deleteLink: async (linkId: string): Promise<{ success: boolean; data: { id: string }; message: string }> => {
+    const response = await apiClient.delete(`/organizations/links/${linkId}`);
+    return response.data;
+  },
+
+  invite: async (body: {
+    organizationName: string;
+    ownerEmail: string;
+    phone?: string;
+  }): Promise<{ success: boolean; data: { invitationId: string; invitationUrl: string; status: 'PENDING' } }> => {
+    const response = await apiClient.post('/organizations/invite', body);
+    return response.data;
+  },
+
+  getInvitationLink: async (
+    invitationId: string,
+  ): Promise<{ success: boolean; data: { invitationId: string; invitationUrl: string } }> => {
+    const response = await apiClient.post(`/organizations/invitations/${invitationId}/link`);
+    return response.data;
+  },
+
+  previewInvite: async (
+    token: string,
+  ): Promise<{
+    success: boolean;
+    data: {
+      ownerEmail: string;
+      organizationName: string;
+      organizationType: 'CLINIC' | 'LAB';
+      inviterOrganizationName: string;
+      expiresAt: string;
+      status: 'PENDING' | 'ACCEPTED';
+    };
+  }> => {
+    const response = await apiClient.get(
+      `/organizations/invitations/preview?token=${encodeURIComponent(token)}`,
+    );
+    return response.data;
+  },
+
+  acceptInvite: async (body: {
+    token: string;
+    organizationName: string;
+    ownerName: string;
+    password: string;
+  }): Promise<{ success: boolean; message: string; data: { organizationId: string } }> => {
+    const response = await apiClient.post('/organizations/invitations/accept', body);
+    return response.data;
+  },
+};

frontend/src/shared/permissions.ts

@@ -3,7 +3,7 @@ import type { Organization } from '@/types/organization';
 const ROUTE_TAB_READ: { prefix: string; permission: string }[] = [
   { prefix: '/today', permission: 'TAB_TODAY_READ' },
   { prefix: '/staff', permission: 'TAB_STAFF_READ' },
-  { prefix: '/lab', permission: 'TAB_LAB_READ' },
+  { prefix: '/organizations', permission: 'TAB_ORGANIZATIONS_READ' },
   { prefix: '/patients', permission: 'TAB_PATIENTS_READ' },
   { prefix: '/appointments', permission: 'TAB_APPOINTMENTS_READ' },
   { prefix: '/treatment', permission: 'TAB_TREATMENT_READ' },