Add request id header to incoming requests

Add workflow for ui
run prettier on ui
2025-07-25 23:23:16 +01:00 · 2025-07-25 23:03:58 +01:00 · 2025-07-25 22:39:10 +01:00 · 2025-07-25 17:28:41 +01:00 · 2025-07-25 17:12:13 +01:00 · 2025-07-25 16:28:40 +01:00
16 changed files with 918 additions and 122 deletions
--- a/.gitea/workflows/frontend.yaml
+++ b/.gitea/workflows/frontend.yaml
@ -0,0 +1,72 @@
+name: Frontend Actions
+run-name: ${{ gitea.actor }} is running frontend actions
+on: [push]
+
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+      - uses: actions/checkout@v4
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ui/node_modules
+          key: ${{ runner.os }}-node-check-${{ hashFiles('ui/package-lock.json') }}
+      - name: Install Dependencies
+        run: npm ci
+      - name: Run Eslint
+        run: npm run lint
+      - name: Run Prettier
+        run: npm run fmt -- . --check
+
+
+  build:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+      - uses: actions/checkout@v4
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ui/node_modules
+          key: ${{ runner.os }}-node-build-${{ hashFiles('ui/package-lock.json') }}
+      - run: node --version
+      - name: Install Dependencies
+        run: npm ci
+      - name: Build UI
+        run: npm run build
+
+  test:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: ./ui
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '24'
+      - uses: actions/checkout@v4
+      - name: Load Cache
+        uses: actions/cache@v4
+        with:
+          path: |
+            ui/node_modules
+          key: ${{ runner.os }}-node-test-${{ hashFiles('ui/package-lock.json') }}
+      - run: node --version
+      - name: Install Dependencies
+        run: npm ci
+      - name: Run tests
+        run: npm run test
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,3 @@
 .env
 package/
-package.tar.zst
+*.tar.zst
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@ -1896,6 +1896,7 @@ dependencies = [
 "tower-layer",
 "tower-service 0.3.3",
 "tracing",
+ "uuid",
 ]

 [[package]]
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@ -11,7 +11,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.141"
 tokio = { version = "1.0", features = ["full"] }
 tower = { version = "0.5.2", features = ["full"] }
-tower-http = { version = "0.6.6", features = ["timeout", "trace", "auth"] }
+tower-http = { version = "0.6.6", features = ["timeout", "trace", "auth", "request-id"] }
 tower-http-util = "0.1.0"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
--- a/backend/src/router.rs
+++ b/backend/src/router.rs
@ -7,12 +7,25 @@ use crate::config;
 use axum::extract::Request;
 use axum::routing::get;
 use axum::{Router, body::Body};
+use http::HeaderName;
 use tower::ServiceBuilder;
+use tower_http::request_id::{MakeRequestId, RequestId, SetRequestIdLayer};
 use tower_http::timeout::TimeoutLayer;
 use tower_http::trace::TraceLayer;
 use tracing::Level;
 use uuid::Uuid;

+#[derive(Clone)]
+struct RequestIdLayer;
+
+impl MakeRequestId for RequestIdLayer {
+    fn make_request_id<B>(&mut self, _: &http::Request<B>) -> Option<RequestId> {
+        let id = Uuid::now_v7().to_string();
+
+        Some(RequestId::new(id.parse().unwrap()))
+    }
+}
+
 pub fn app(config: &config::Config) -> (Router, mpsc::Receiver<bool>) {
    let (tx, rx) = mpsc::channel();
    (
@ -22,15 +35,29 @@ pub fn app(config: &config::Config) -> (Router, mpsc::Receiver<bool>) {
            .nest("/admin", admin::router(tx, config))
            .layer(
                ServiceBuilder::new()
+                    .layer(SetRequestIdLayer::new(
+                        HeaderName::from_static("x-request-id"),
+                        RequestIdLayer,
+                    ))
                    .layer(
                        TraceLayer::new_for_http().make_span_with(|req: &Request<Body>| {
-                            tracing::span!(
-                                Level::DEBUG,
-                                "request",
-                                trace_id = Uuid::now_v7().to_string(),
-                                method = format!("{}", req.method()),
-                                uri = format!("{}", req.uri()),
-                            )
+                            if let Some(req_id) = req.headers().get("x-request-id") {
+                                tracing::span!(
+                                    Level::DEBUG,
+                                    "request",
+                                    req_id = req_id.to_str().unwrap(),
+                                    method = format!("{}", req.method()),
+                                    uri = format!("{}", req.uri()),
+                                )
+                            } else {
+                                tracing::span!(
+                                    Level::DEBUG,
+                                    "request",
+                                    req_id = "<missing>",
+                                    method = format!("{}", req.method()),
+                                    uri = format!("{}", req.uri()),
+                                )
+                            }
                        }),
                    )
                    .layer(TimeoutLayer::new(Duration::from_secs(10))),
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -6,6 +6,15 @@ services:
    command: --host 0.0.0.0
    depends_on:
      - db
+
+  frontend:
+    build: ./ui
+    ports:
+      - "3000:3000"
+    command: --host 0.0.0.0
+    depends_on:
+      - db
+
  db:
    image: postgres:17-alpine
    environment:
--- a/ui/.dockerignore
+++ b/ui/.dockerignore
@ -0,0 +1,24 @@
+# Nuxt dev/build outputs
+.output
+.data
+.nuxt
+.nitro
+.cache
+dist
+
+# Node dependencies
+node_modules
+
+# Logs
+logs
+*.log
+
+# Misc
+.DS_Store
+.fleet
+.idea
+
+# Local env files
+.env
+.env.*
+!.env.example
--- a/ui/Dockerfile
+++ b/ui/Dockerfile
@ -0,0 +1,15 @@
+FROM node:24-alpine AS base
+
+FROM base AS build
+WORKDIR /app
+COPY package.json package-lock.json ./
+RUN npm ci
+COPY . .
+RUN npm run build
+
+FROM base AS prod
+WORKDIR /app
+COPY --from=build /app/.output ./ui
+ENV PORT=3000
+
+ENTRYPOINT [ "node", "/app/ui/server/index.mjs" ]
--- a/ui/app/app.vue
+++ b/ui/app/app.vue
@ -1,6 +1,6 @@
 <template>
  <div>
    <NuxtRouteAnnouncer />
-    <NuxtWelcome />
+    <NuxtPage />
  </div>
 </template>
--- a/ui/app/pages/index.spec.ts
+++ b/ui/app/pages/index.spec.ts
@ -0,0 +1,14 @@
+// @noErrors
+import { it, expect } from "vitest";
+// ---cut---
+// tests/components/SomeComponents.nuxt.spec.ts
+import { mountSuspended } from "@nuxt/test-utils/runtime";
+import Index from "~/pages/index.vue";
+
+// tests/App.nuxt.spec.ts
+it("can also mount an app", async () => {
+  const component = await mountSuspended(Index, { route: "/test" });
+  expect(component.html()).toMatchInlineSnapshot(`
+      "<h1>Hello World</h1>"
+    `);
+});
--- a/ui/app/pages/index.vue
+++ b/ui/app/pages/index.vue
@ -0,0 +1,3 @@
+<template>
+  <h1>Hello World</h1>
+</template>
--- a/ui/eslint.config.mjs
+++ b/ui/eslint.config.mjs
@ -1,6 +1,9 @@
 // @ts-check
-import withNuxt from './.nuxt/eslint.config.mjs'
+import withNuxt from "./.nuxt/eslint.config.mjs";

-export default withNuxt(
-  // Your custom configs here
-)
+export default withNuxt({
+  rules: {
+    "prefer-const": "warn",
+    "no-unexpected-multiline": 0,
+  },
+});
--- a/ui/nuxt.config.ts
+++ b/ui/nuxt.config.ts
@ -1,6 +1,14 @@
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
-  compatibilityDate: '2025-07-15',
+  compatibilityDate: "2025-07-15",
  devtools: { enabled: true },
-  modules: ['@nuxt/eslint', '@nuxt/icon', '@nuxt/test-utils']
-})
+  modules: [
+    "@nuxt/eslint",
+    "@nuxt/icon",
+    "@nuxt/test-utils",
+    "@nuxt/test-utils/module",
+  ],
+  nitro: {
+    preset: "node-server",
+  },
+});
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
--- a/ui/package.json
+++ b/ui/package.json
@ -7,14 +7,31 @@
    "dev": "nuxt dev",
    "generate": "nuxt generate",
    "preview": "nuxt preview",
-    "postinstall": "nuxt prepare"
+    "postinstall": "nuxt prepare",
+    "test": "vitest run",
+    "watch": "vitest watch",
+    "lint": "eslint",
+    "fmt": "prettier"
  },
  "dependencies": {
    "@nuxt/eslint": "1.6.0",
    "@nuxt/icon": "^1.15.0",
-    "@nuxt/test-utils": "^3.19.2",
    "nuxt": "^4.0.1",
    "vue": "^3.5.17",
    "vue-router": "^4.5.1"
+  },
+  "devDependencies": {
+    "@eslint/css": "^0.10.0",
+    "@eslint/js": "^9.32.0",
+    "@nuxt/test-utils": "^3.19.2",
+    "@vue/test-utils": "^2.4.6",
+    "eslint": "^9.32.0",
+    "eslint-plugin-vue": "^10.3.0",
+    "globals": "^16.3.0",
+    "happy-dom": "^18.0.1",
+    "playwright-core": "^1.54.1",
+    "prettier": "3.6.2",
+    "typescript-eslint": "^8.38.0",
+    "vitest": "^3.2.4"
  }
 }
--- a/ui/vitest.config.ts
+++ b/ui/vitest.config.ts
@ -0,0 +1,7 @@
+import { defineVitestConfig } from "@nuxt/test-utils/config";
+
+export default defineVitestConfig({
+  test: {
+    environment: "nuxt",
+  },
+});
Author	SHA1	Message	Date
Fergus Molloy	20f64cd35d	Add request id header to incoming requests All checks were successful Backend Actions / check (push) Successful in 1m1s Details Backend Actions / build (push) Successful in 1m51s Details Frontend Actions / check (push) Successful in 59s Details Backend Actions / test (push) Successful in 2m20s Details Frontend Actions / build (push) Successful in 59s Details Frontend Actions / test (push) Successful in 55s Details	2025-07-25 23:23:16 +01:00
Fergus Molloy	6bd6dbad38	Add workflow for ui All checks were successful Backend Actions / check (push) Successful in 12s Details Backend Actions / build (push) Successful in 22s Details Backend Actions / test (push) Successful in 32s Details Frontend Actions / check (push) Successful in 1m2s Details Frontend Actions / build (push) Successful in 1m1s Details Frontend Actions / test (push) Successful in 51s Details	2025-07-25 23:03:58 +01:00
Fergus Molloy	df81605ecc	run prettier on ui	2025-07-25 22:39:10 +01:00
Fergus Molloy	8c12ca0024	add ui testing All checks were successful Backend Actions / check (push) Successful in 13s Details Backend Actions / build (push) Successful in 28s Details Backend Actions / test (push) Successful in 37s Details	2025-07-25 17:28:41 +01:00
Fergus Molloy	70835f04fa	add ui docker build All checks were successful Backend Actions / check (push) Successful in 28s Details Backend Actions / build (push) Successful in 27s Details Backend Actions / test (push) Successful in 35s Details	2025-07-25 17:12:13 +01:00
Fergus Molloy	e7eb9b8b16	update .gitignore All checks were successful Backend Actions / check (push) Successful in 14s Details Backend Actions / build (push) Successful in 26s Details Backend Actions / test (push) Successful in 35s Details	2025-07-25 16:28:40 +01:00