XBPjPKA7{3a&H+~xQvr>C_A;7=JrfK~$M2pCh>|xLz>W6SCs4qC|#V`)#
z)0C|?$o>jzh<|-cpfK7osU{Xp5PG4-K+L2G=)c3f&}H&M3wo7TlO_UJjQ-Oq&_
zjAc9=nNIYz{c3zxOiS5UfcE1}8#iI4@uy;$Q7>}u`j+OU0N<*Ezx$k{x_27+{s2Eg
z`^=rhtIzCm!_UcJ?Db~Lh-=_))PT3{Q0{Mwdq;0>ZL%l3+;B&4!&xm#%HYAK|;b456Iv&&f$VQHf`
z>$*K9w8T+paVwc7fLfMlhQ4)*zL_SG{~v4QR;IuX-(oRtYAhWOlh`NLoX0k$RUYMi
z2Y!bqpdN}wz8q`-%>&Le@q|jFw92ErW-hma-le?S
z-@OZt2EEUm4wLsuEMkt4zlyy29_3S50JAcQHTtgTC{P~%-mvCTzrjXOc|{}N`Cz`W
zSj7CrXfa7lcsU0J(0uSX6G`54t^7}+OLM0n(|g4waOQ}bd3%!XLh?NX9|8G_|06Ie
zD5F1)w5I~!et7lA{G^;uf7aqT`KE&2qx9|~O;s6t!gb`+zVLJyT2T)l*8l(j
literal 0
HcmV?d00001
diff --git a/apps/frontend/react-router.config.ts b/apps/frontend/react-router.config.ts
new file mode 100644
index 0000000..61161a6
--- /dev/null
+++ b/apps/frontend/react-router.config.ts
@@ -0,0 +1,5 @@
+import type { Config } from '@react-router/dev/config';
+
+export default {
+ ssr: false,
+} satisfies Config;
diff --git a/apps/frontend/tsconfig.json b/apps/frontend/tsconfig.json
new file mode 100644
index 0000000..a6b90b7
--- /dev/null
+++ b/apps/frontend/tsconfig.json
@@ -0,0 +1,22 @@
+{
+ "include": ["**/*", "**/.server/**/*", "**/.client/**/*", ".react-router/types/**/*"],
+ "compilerOptions": {
+ "lib": ["DOM", "DOM.Iterable", "ES2022"],
+ "types": ["node", "vite/client"],
+ "target": "ES2022",
+ "module": "ES2022",
+ "moduleResolution": "bundler",
+ "jsx": "react-jsx",
+ "rootDirs": [".", "./.react-router/types"],
+ "baseUrl": ".",
+ "paths": {
+ "~/*": ["./app/*"]
+ },
+ "esModuleInterop": true,
+ "verbatimModuleSyntax": true,
+ "noEmit": true,
+ "resolveJsonModule": true,
+ "skipLibCheck": true,
+ "strict": true
+ }
+}
diff --git a/apps/frontend/vite.config.ts b/apps/frontend/vite.config.ts
new file mode 100644
index 0000000..22b2eb2
--- /dev/null
+++ b/apps/frontend/vite.config.ts
@@ -0,0 +1,9 @@
+import { reactRouter } from '@react-router/dev/vite';
+import tailwindcss from '@tailwindcss/vite';
+import { defineConfig } from 'vite';
+import tsconfigPaths from 'vite-tsconfig-paths';
+
+export default defineConfig({
+ plugins: [tailwindcss(), reactRouter(), tsconfigPaths()],
+ appType: 'spa',
+});
diff --git a/justfile b/justfile
index 2b3e71e..44963be 100644
--- a/justfile
+++ b/justfile
@@ -40,3 +40,15 @@ migrate *args:
generate-entity:
# delegate to cli
just cli db:migrate_and_generate --output-path ../../public/database/src/generated/entities
+
+build-frontend:
+ # build frontend assets
+ cd apps/frontend && \
+ pnpm build
+
+build-backend:
+ # build backend server
+ cd apps/api && \
+ cargo build --release
+
+build: build-frontend build-backend
From edbcdaeff412a7b5f2713312921dff2a9b149b90 Mon Sep 17 00:00:00 2001
From: GW_MC <72297530+GWMCwing@users.noreply.github.com>
Date: Tue, 2 Dec 2025 19:25:46 +0800
Subject: [PATCH 2/6] Implement frontend routing and API fallback handling; add
dependencies for include_dir and mime_guess
---
Cargo.lock | 57 +++++++++++++++++++++++++++++
apps/api/Cargo.toml | 4 ++-
apps/api/src/routes.rs | 7 ++++
apps/api/src/routes/api.rs | 11 ++++++
apps/api/src/routes/view.rs | 71 +++++++++++++++++++++++++++++++++++++
5 files changed, 149 insertions(+), 1 deletion(-)
create mode 100644 apps/api/src/routes/api.rs
create mode 100644 apps/api/src/routes/view.rs
diff --git a/Cargo.lock b/Cargo.lock
index f9f0ad6..ab8dd37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1135,6 +1135,25 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+[[package]]
+name = "h2"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap 2.12.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -1277,6 +1296,7 @@ dependencies = [
"bytes",
"futures-channel",
"futures-core",
+ "h2",
"http",
"http-body",
"httparse",
@@ -1488,6 +1508,25 @@ dependencies = [
"icu_properties",
]
+[[package]]
+name = "include_dir"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -1690,6 +1729,16 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+[[package]]
+name = "mime_guess"
+version = "2.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+dependencies = [
+ "mime",
+ "unicase",
+]
+
[[package]]
name = "mio"
version = "1.1.0"
@@ -3696,6 +3745,12 @@ version = "0.1.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
[[package]]
name = "unicode-bidi"
version = "0.3.18"
@@ -4275,7 +4330,9 @@ dependencies = [
"chrono",
"config",
"database",
+ "include_dir",
"migration",
+ "mime_guess",
"sea-orm",
"serde",
"serde_json",
diff --git a/apps/api/Cargo.toml b/apps/api/Cargo.toml
index d5c120c..c4c76d4 100644
--- a/apps/api/Cargo.toml
+++ b/apps/api/Cargo.toml
@@ -7,7 +7,7 @@ edition = "2024"
database = { path = "../../public/database" }
migration = { path = "../../public/migration" }
-axum = { version = "0.8.7", features = ["form", "http1", "json", "matched-path", "original-uri", "query", "tokio", "tower-log", "tracing", "macros"]}
+axum = { version = "0.8.7", features = ["form", "http1", "http2", "json", "matched-path", "original-uri", "query", "tokio", "tower-log", "tracing", "macros"]}
async-trait = { version = "0.1.89" }
chrono = { version = "0.4.42", features = ["clock", "std", "oldtime", "wasmbind", "serde"] }
config = { version = "0.15.19", features = ["toml", "json", "yaml", "ini", "ron", "json5", "convert-case", "async"] }
@@ -18,3 +18,5 @@ tracing-subscriber = { version = "0.3.20", features = ["smallvec", "fmt", "ansi"
serde_json = { version = "1.0.145", features = ["std"] }
serde = { version = "1.0.228", features = ["std", "derive"] }
sea-orm = { workspace = true }
+include_dir = { version = "0.7.4" }
+mime_guess = { version = "2.0.5" }
diff --git a/apps/api/src/routes.rs b/apps/api/src/routes.rs
index c0d22db..7fb0e6b 100644
--- a/apps/api/src/routes.rs
+++ b/apps/api/src/routes.rs
@@ -1,3 +1,6 @@
+mod api;
+mod view;
+
use std::sync::Arc;
use axum::{Extension, Router};
@@ -25,6 +28,10 @@ pub struct AppService {
pub fn get_root_router(state: impl Into>) -> Router {
let mut router = Router::new();
+ router = router
+ .nest("/api", api::get_api_router())
+ .merge(view::get_view_router());
+
router = middlewares::apply_root_middleware(router);
router = router.layer(Extension(state.into()));
diff --git a/apps/api/src/routes/api.rs b/apps/api/src/routes/api.rs
new file mode 100644
index 0000000..2924fe9
--- /dev/null
+++ b/apps/api/src/routes/api.rs
@@ -0,0 +1,11 @@
+use axum::{Router, response::IntoResponse, routing::any};
+
+pub fn get_api_router() -> Router {
+ Router::new()
+ // explicit fallback for unmatched API routes
+ .route("/{*wildcard}", any(api_fallback_handler))
+}
+
+async fn api_fallback_handler() -> impl IntoResponse {
+ (axum::http::StatusCode::NOT_FOUND, "API route not found").into_response()
+}
diff --git a/apps/api/src/routes/view.rs b/apps/api/src/routes/view.rs
new file mode 100644
index 0000000..ef61da1
--- /dev/null
+++ b/apps/api/src/routes/view.rs
@@ -0,0 +1,71 @@
+use axum::{
+ Router,
+ body::Bytes,
+ extract::Path,
+ http::{StatusCode, header},
+ response::IntoResponse,
+ routing::{MethodRouter, get},
+};
+use include_dir::{Dir, include_dir};
+use mime_guess::from_path;
+
+static DIST_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/../frontend/build/client");
+const INDEX_HTML_PATH: &str = "index.html";
+const INDEX_FILE_NOT_FOUND_HTML: &str = r#"
+
+
+
+
+
+ 404 Not Found
+
+
+ 404 Not Found
+ The requested resource was not found on this server. Possibly the frontend build is missing or corrupted.
+
+
+"#;
+
+pub fn get_view_router() -> Router {
+ Router::new()
+ // Serve the root index.html
+ .route("/", get(root_view_handler))
+ .route(
+ "/{*wildcard}",
+ MethodRouter::new()
+ .get(|Path(path): Path| async move { view_handler(Some(path)).await }),
+ )
+}
+
+async fn root_view_handler() -> impl IntoResponse {
+ view_handler(None).await
+}
+
+async fn view_handler(path: Option) -> impl IntoResponse {
+ // If path is empty, serve index.html
+ let incoming_path = if let Some(p) = path {
+ p.trim_start_matches('/').to_string()
+ } else {
+ INDEX_HTML_PATH.to_string()
+ };
+
+ let path = match DIST_DIR.get_file(&incoming_path) {
+ Some(_) => incoming_path,
+ None => INDEX_HTML_PATH.to_string(),
+ };
+
+ match DIST_DIR.get_file(&path) {
+ Some(file) => {
+ let mime = from_path(&path).first_or_octet_stream();
+ let body: Bytes = Bytes::copy_from_slice(file.contents());
+ ([(header::CONTENT_TYPE, mime.as_ref())], body).into_response()
+ }
+ // This should never happen, but just in case...
+ None => (
+ StatusCode::NOT_FOUND,
+ [(header::CONTENT_TYPE, "text/plain")],
+ Bytes::from(INDEX_FILE_NOT_FOUND_HTML),
+ )
+ .into_response(),
+ }
+}
From 051951dc4471c04dafda01e341ab73ce729bf144 Mon Sep 17 00:00:00 2001
From: GW_MC <72297530+GWMCwing@users.noreply.github.com>
Date: Tue, 2 Dec 2025 19:48:25 +0800
Subject: [PATCH 3/6] Added frontend testing script and job
---
.github/workflows/test.yml | 31 +++++++++++++++++++++++++++++++
apps/frontend/package.json | 3 ++-
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1a8b5ce..638bb91 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -57,6 +57,37 @@ jobs:
- name: Run tests
run: cargo test --all-features
+ test-frontend:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - uses: pnpm/action-setup@v4
+ name: Install pnpm
+ with:
+ version: 10
+ run_install: false
+
+ - name: Install Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version: 22
+ cache: 'pnpm'
+ cache-dependency-path: apps/frontend/pnpm-lock.yaml
+
+ - name: Install frontend dependencies
+ run: |
+ cd apps/frontend
+ pnpm install
+
+ - name: Run frontend tests
+ run: |
+ cd apps/frontend
+ pnpm test
+
lint:
runs-on: ubuntu-latest
steps:
diff --git a/apps/frontend/package.json b/apps/frontend/package.json
index 3f2873d..8d81f1d 100644
--- a/apps/frontend/package.json
+++ b/apps/frontend/package.json
@@ -6,7 +6,8 @@
"build": "react-router build",
"dev": "react-router dev",
"start": "react-router-serve ./build/server/index.js",
- "typecheck": "react-router typegen && tsc"
+ "typecheck": "react-router typegen && tsc",
+ "test": "echo \"No tests specified\" && exit 0"
},
"dependencies": {
"@radix-ui/themes": "^3.2.1",
From 06cabb0e1880f34b4188ef3b1989e15a1897e451 Mon Sep 17 00:00:00 2001
From: GW_MC <72297530+GWMCwing@users.noreply.github.com>
Date: Tue, 2 Dec 2025 19:51:49 +0800
Subject: [PATCH 4/6] Add catch-all 404 route and NotFound component to
frontend routing
---
apps/frontend/app/routes.ts | 8 ++++++--
apps/frontend/app/routes/404.tsx | 3 +++
2 files changed, 9 insertions(+), 2 deletions(-)
create mode 100644 apps/frontend/app/routes/404.tsx
diff --git a/apps/frontend/app/routes.ts b/apps/frontend/app/routes.ts
index 102b402..9411f45 100644
--- a/apps/frontend/app/routes.ts
+++ b/apps/frontend/app/routes.ts
@@ -1,3 +1,7 @@
-import { type RouteConfig, index } from "@react-router/dev/routes";
+import { type RouteConfig, index, route } from '@react-router/dev/routes';
-export default [index("routes/home.tsx")] satisfies RouteConfig;
+export default [
+ index('routes/home.tsx'),
+ // catch-all 404 route
+ route('*', 'routes/404.tsx'),
+] satisfies RouteConfig;
diff --git a/apps/frontend/app/routes/404.tsx b/apps/frontend/app/routes/404.tsx
new file mode 100644
index 0000000..217238d
--- /dev/null
+++ b/apps/frontend/app/routes/404.tsx
@@ -0,0 +1,3 @@
+export default function NotFound() {
+ return 404 - Not Found
;
+}
From 0374d63efee3788d58bffb482b85eb414593a078 Mon Sep 17 00:00:00 2001
From: GW_MC <72297530+GWMCwing@users.noreply.github.com>
Date: Tue, 2 Dec 2025 20:18:48 +0800
Subject: [PATCH 5/6] Add frontend build artifact handling and linting steps to
CI workflow
---
.github/workflows/test.yml | 67 +++++++++++++++++++++++++++++++++-----
justfile | 8 +++++
2 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 638bb91..0cbc987 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -44,6 +44,7 @@ jobs:
fi
test:
+ needs: frontend-build
runs-on: ubuntu-latest
steps:
- name: Checkout repository
@@ -54,9 +55,42 @@ jobs:
- name: Setup Rust, checkout and restore caches
uses: ./.github/actions/setup-rust
+ - name: Download frontend build
+ uses: actions/download-artifact@v4
+ with:
+ name: frontend-build
+ path: apps/frontend/build
+
- name: Run tests
run: cargo test --all-features
+ lint:
+ needs: frontend-build
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
+ with:
+ fetch-depth: 0
+
+ - name: Setup Rust, checkout and restore caches
+ uses: ./.github/actions/setup-rust
+ with:
+ components: clippy, rustfmt
+
+ - name: Download frontend build
+ uses: actions/download-artifact@v4
+ with:
+ name: frontend-build
+ path: apps/frontend/build
+
+ - name: Run clippy
+ run: cargo clippy --all-features -- -D warnings
+
+ - name: Check code formatting
+ run: cargo fmt --all -- --check
+
+
test-frontend:
runs-on: ubuntu-latest
steps:
@@ -88,21 +122,36 @@ jobs:
cd apps/frontend
pnpm test
- lint:
+ frontend-build:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
+
+ - uses: pnpm/action-setup@v4
with:
- fetch-depth: 0
+ version: 10
+ run_install: false
- - name: Setup Rust, checkout and restore caches
- uses: ./.github/actions/setup-rust
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
with:
- components: clippy, rustfmt
+ node-version: 22
+ cache: 'pnpm'
+ cache-dependency-path: apps/frontend/pnpm-lock.yaml
- - name: Run clippy
- run: cargo clippy --all-features -- -D warnings
+ - name: Install frontend dependencies
+ run: |
+ cd apps/frontend
+ pnpm install
- - name: Check code formatting
- run: cargo fmt --all -- --check
\ No newline at end of file
+ - name: Build frontend
+ run: |
+ cd apps/frontend
+ pnpm build
+
+ - name: Upload frontend build artifact
+ uses: actions/upload-artifact@v4
+ with:
+ name: frontend-build
+ path: apps/frontend/build
\ No newline at end of file
diff --git a/justfile b/justfile
index 44963be..a048e1d 100644
--- a/justfile
+++ b/justfile
@@ -52,3 +52,11 @@ build-backend:
cargo build --release
build: build-frontend build-backend
+
+act *args:
+ if [ -n "{{args}}" ]; then \
+ act {{args}} --artifact-server-path /tmp/artifacts; \
+ else \
+ act; \
+ fi
+
From c79ef265dbdea9ff8cd88a680e3b577a62d1e1d6 Mon Sep 17 00:00:00 2001
From: GW_MC <72297530+GWMCwing@users.noreply.github.com>
Date: Tue, 2 Dec 2025 20:44:18 +0800
Subject: [PATCH 6/6] use workflow specific cache instead of artifact
---
.github/workflows/test.yml | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0cbc987..4956b9a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -55,11 +55,13 @@ jobs:
- name: Setup Rust, checkout and restore caches
uses: ./.github/actions/setup-rust
- - name: Download frontend build
- uses: actions/download-artifact@v4
+ - name: Restore frontend build cache
+ uses: actions/cache@v4
with:
- name: frontend-build
path: apps/frontend/build
+ key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
+ restore-keys: |
+ frontend-build-${{ runner.os }}-
- name: Run tests
run: cargo test --all-features
@@ -78,11 +80,13 @@ jobs:
with:
components: clippy, rustfmt
- - name: Download frontend build
- uses: actions/download-artifact@v4
+ - name: Restore frontend build cache
+ uses: actions/cache@v4
with:
- name: frontend-build
path: apps/frontend/build
+ key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
+ restore-keys: |
+ frontend-build-${{ runner.os }}-
- name: Run clippy
run: cargo clippy --all-features -- -D warnings
@@ -150,8 +154,10 @@ jobs:
cd apps/frontend
pnpm build
- - name: Upload frontend build artifact
- uses: actions/upload-artifact@v4
+ - name: Cache frontend build
+ uses: actions/cache@v4
with:
- name: frontend-build
- path: apps/frontend/build
\ No newline at end of file
+ path: apps/frontend/build
+ key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
+ restore-keys: |
+ frontend-build-${{ runner.os }}-