feat: refactor nxmesh-frontend to use React Router with new layout components

- Updated package.json to replace Vite with React Router for development and build scripts. - Added react-router.config.ts for configuration settings. - Created a new App component with a dashboard layout including header, sidebar, and footer. - Enhanced App.css with a professional theme and responsive design. - Removed old App.tsx and index.css files. - Introduced RootLayout component to encapsulate layout structure. - Developed Header, Footer, and Sidebar components for consistent layout. - Implemented routes for home and dashboard with key metrics and activity sections. - Updated vite.config.ts to integrate React Router and adjust SSR settings.
Merge pull request 'feature/embbed-frontend' (#7 ) from feature/embbed-frontend into master
2026-05-06 10:48:39 +00:00 · 2026-04-25 14:34:55 +08:00 · 2026-04-25 06:30:13 +00:00 · 2026-04-25 06:04:55 +00:00 · 2026-04-25 04:26:59 +00:00 · 2026-04-25 03:21:36 +00:00
27 changed files with 1630 additions and 294 deletions
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -45,13 +45,35 @@ jobs:
      - name: Restore frontend build cache
        uses: actions/cache@v4
        with:
-          path: apps/nxmesh-frontend/build
+          path: apps/nxmesh-frontend/dist
          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
          restore-keys: |
            frontend-build-${{ runner.os }}-

+      # TODO: uncomment until artifact hanlding fixed in gitea
+      # - name: Download frontend build artifact
+      #   uses: actions/download-artifact@v4
+      #   with:
+      #     name: frontend-dist
+      #     path: apps/nxmesh-frontend/dist
+
+      # - name: Copy frontend build to expected location
+      #   run: |
+      #     # unlink frontend-dist
+      #     rm -f apps/nxmesh-master/frontend-dist || true
+      #     rm -rf apps/nxmesh-master/frontend-dist || true
+      #     cp -r apps/nxmesh-frontend/dist apps/nxmesh-master/frontend-dist
+
+      #     ls -la apps/nxmesh-master/frontend-dist
+
+      - name: Create dummy build artifacts
+        run: |
+          rm -f apps/nxmesh-master/frontend-dist || true
+          mkdir -p apps/nxmesh-master/frontend-dist
+          echo "<html><body><h1>Dummy Build</h1></body></html>" > apps/nxmesh-master/frontend-dist/index.html
+
      - name: Run tests
-        run: cargo test --all-features
+        run: cargo test --all-features -- --show-output

  lint-crates:
    runs-on: ubuntu-latest
@@ -74,11 +96,31 @@ jobs:
      - name: Restore frontend build cache
        uses: actions/cache@v4
        with:
-          path: apps/nxmesh-frontend/build
+          path: apps/nxmesh-frontend/dist
          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
          restore-keys: |
            frontend-build-${{ runner.os }}-

+      # TODO: uncomment until artifact hanlding fixed in gitea
+      # - name: Download frontend build artifact
+      #   uses: actions/download-artifact@v4
+      #   with:
+      #     name: frontend-dist
+      #     path: apps/nxmesh-frontend/dist
+
+      # - name: Copy frontend build to expected location
+      #   run: |
+      #     # unlink frontend-dist
+      #     rm -f apps/nxmesh-master/frontend-dist || true
+      #     rm -rf apps/nxmesh-master/frontend-dist || true
+      #     cp -r apps/nxmesh-frontend/dist apps/nxmesh-master/frontend-dist
+
+      - name: Create dummy build artifacts
+        run: |
+          rm -f apps/nxmesh-master/frontend-dist || true
+          mkdir -p apps/nxmesh-master/frontend-dist
+          echo "<html><body><h1>Dummy Build</h1></body></html>" > apps/nxmesh-master/frontend-dist/index.html
+
      - name: Run clippy
        run: cargo clippy --all-features

@@ -147,7 +189,12 @@ jobs:
      - name: Cache frontend build
        uses: actions/cache@v4
        with:
-          path: apps/nxmesh-frontend/build
+          path: apps/nxmesh-frontend/dist
          key: frontend-build-${{ runner.os }}-run-${{ github.run_id }}
-          restore-keys: |
-            frontend-build-${{ runner.os }}-
+          # IGNORE restore-keys
+      # TODO: uncomment until artifact hanlding fixed in gitea
+      # - name: Upload frontend build artifact
+      #   uses: actions/upload-artifact@v4
+      #   with:
+      #     name: frontend-dist
+      #     path: apps/nxmesh-frontend/dist
--- a/.github/workflows/verify.yaml
+++ b/.github/workflows/verify.yaml
@@ -109,14 +109,14 @@ jobs:
      - name: Apply migrations
        if: steps.check_changes.outputs.changed == 'true'
        run: |
-          cargo run -p nxmesh-migration -- up
+          cd crates && sea-orm-cli migrate up

      - name: Regenerate entities
        if: steps.check_changes.outputs.changed == 'true'
        run: |
-          sea-orm-cli generate entity \
+          cd crates && sea-orm-cli generate entity \
            --database-url "$DATABASE_URL" \
-            --output-dir apps/nxmesh-master/src/db/entities \
+            --output-dir ../apps/nxmesh-master/src/db/entities \
            --with-serde both \
            --with-copy-enums \
            --date-time-crate chrono
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -538,6 +538,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b52af3cb4058c895d37317bb27508dccc8e5f2d39454016b297bf4a400597b8"
 dependencies = [
 "axum-core",
+ "axum-macros",
 "base64",
 "bytes",
 "form_urlencoded",
@@ -586,6 +587,45 @@ dependencies = [
 "tracing",
 ]

+[[package]]
+name = "axum-macros"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aa268c23bfbbd2c4363b9cd302a4f504fb2a9dfe7e3451d66f35dd392e20aca"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
+[[package]]
+name = "axum-test"
+version = "20.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a86bfe2ef15bee102ac34912f7f4542b0bb37dc464fa55461763999c4d625e7"
+dependencies = [
+ "anyhow",
+ "axum",
+ "bytes",
+ "bytesize",
+ "cookie",
+ "expect-json",
+ "http",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "mime",
+ "pretty_assertions",
+ "reserve-port",
+ "rust-multipart-rfc7578_2",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tower",
+ "url",
+]
+
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -727,6 +767,12 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"

+[[package]]
+name = "bytesize"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3"
+
 [[package]]
 name = "bzip2"
 version = "0.6.1"
@@ -911,6 +957,16 @@ dependencies = [
 "unicode-segmentation",
 ]

+[[package]]
+name = "cookie"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747"
+dependencies = [
+ "time",
+ "version_check",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.10.1"
@@ -1135,6 +1191,12 @@ dependencies = [
 "unicode-xid",
 ]

+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -1188,6 +1250,15 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "email_address"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@@ -1262,6 +1333,35 @@ dependencies = [
 "pin-project-lite",
 ]

+[[package]]
+name = "expect-json"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "869f97f4abe8e78fc812a94ad6b721d72c4fb5532877c79610f2c238d7ccf6c4"
+dependencies = [
+ "chrono",
+ "email_address",
+ "expect-json-macros",
+ "num",
+ "regex",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "typetag",
+ "uuid",
+]
+
+[[package]]
+name = "expect-json-macros"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e6fdf550180a6c29a28cb9aac262dc0064c25735641d2317f670075e9a469d9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -1964,6 +2064,15 @@ dependencies = [
 "generic-array",
 ]

+[[package]]
+name = "inventory"
+version = "0.3.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b"
+dependencies = [
+ "rustversion",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.2"
@@ -2334,6 +2443,20 @@ dependencies = [
 "windows-sys 0.61.2",
 ]

+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
 [[package]]
 name = "num-bigint"
 version = "0.4.6"
@@ -2410,6 +2533,17 @@ dependencies = [
 "num-modular",
 ]

+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
 [[package]]
 name = "num-traits"
 version = "0.2.19"
@@ -2470,6 +2604,7 @@ dependencies = [
 "async-stream",
 "async-trait",
 "axum",
+ "axum-test",
 "chrono",
 "clap",
 "config",
@@ -2477,12 +2612,14 @@ dependencies = [
 "handlebars",
 "hex",
 "jsonwebtoken",
+ "mime_guess",
 "mockall",
 "nxmesh-core",
 "nxmesh-migration",
 "nxmesh-proto",
 "rand 0.10.0",
 "rcgen",
+ "rust-embed",
 "sea-orm",
 "sea-orm-migration",
 "serde",
@@ -2932,6 +3069,16 @@ dependencies = [
 "termtree",
 ]

+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -3261,6 +3408,15 @@ dependencies = [
 "bytecheck",
 ]

+[[package]]
+name = "reserve-port"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94070964579245eb2f76e62a7668fe87bd9969ed6c41256f3bf614e3323dd3cc"
+dependencies = [
+ "thiserror",
+]
+
 [[package]]
 name = "ring"
 version = "0.17.14"
@@ -3338,6 +3494,40 @@ dependencies = [
 "zeroize",
 ]

+[[package]]
+name = "rust-embed"
+version = "8.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04113cb9355a377d83f06ef1f0a45b8ab8cd7d8b1288160717d66df5c7988d27"
+dependencies = [
+ "rust-embed-impl",
+ "rust-embed-utils",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-impl"
+version = "8.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da0902e4c7c8e997159ab384e6d0fc91c221375f6894346ae107f47dd0f3ccaa"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "rust-embed-utils",
+ "syn 2.0.117",
+ "walkdir",
+]
+
+[[package]]
+name = "rust-embed-utils"
+version = "8.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bcdef0be6fe7f6fa333b1073c949729274b05f123a0ad7efcb8efd878e5c3b1"
+dependencies = [
+ "sha2",
+ "walkdir",
+]
+
 [[package]]
 name = "rust-ini"
 version = "0.21.3"
@@ -3348,6 +3538,21 @@ dependencies = [
 "ordered-multimap",
 ]

+[[package]]
+name = "rust-multipart-rfc7578_2"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00bdaa068902270ca7fa8619775e1838e23a63620abac0947ce0f715819b8cec"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http",
+ "mime",
+ "rand 0.10.0",
+ "thiserror",
+]
+
 [[package]]
 name = "rust_decimal"
 version = "1.40.0"
@@ -3454,6 +3659,15 @@ version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f"

+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.28"
@@ -4699,6 +4913,30 @@ version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"

+[[package]]
+name = "typetag"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be2212c8a9b9bcfca32024de14998494cf9a5dfa59ea1b829de98bac374b86bf"
+dependencies = [
+ "erased-serde",
+ "inventory",
+ "once_cell",
+ "serde",
+ "typetag-impl",
+]
+
+[[package]]
+name = "typetag-impl"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27a7a9b72ba121f6f1f6c3632b85604cac41aedb5ddc70accbebb6cac83de846"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.117",
+]
+
 [[package]]
 name = "ucd-trie"
 version = "0.1.7"
@@ -4876,6 +5114,16 @@ version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"

+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -5046,6 +5294,15 @@ dependencies = [
 "wasite",
 ]

+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.62.2"
--- a/apps/nxmesh-frontend/.gitignore
+++ b/apps/nxmesh-frontend/.gitignore
@@ -22,3 +22,5 @@ dist-ssr
 *.njsproj
 *.sln
 *.sw?
+
+.react-router/
--- a/apps/nxmesh-frontend/bun.lock
+++ b/apps/nxmesh-frontend/bun.lock
--- a/apps/nxmesh-frontend/package.json
+++ b/apps/nxmesh-frontend/package.json
@@ -4,18 +4,24 @@
  "version": "0.0.0",
  "type": "module",
  "scripts": {
-    "dev": "vite",
-    "build": "tsc -b && vite build",
-    "lint": "eslint .",
-    "preview": "vite preview",
-    "test": "echo \"No test specified\" && exit 0"
+    "build": "react-router build",
+    "dev": "react-router dev",
+    "start": "react-router-serve ./build/server/index.js",
+    "typecheck": "react-router typegen && tsc"
  },
  "dependencies": {
-    "react": "^19.2.0",
-    "react-dom": "^19.2.0"
+    "@ant-design/icons": "^6.2.2",
+    "@react-router/node": "7.15.0",
+    "@react-router/serve": "7.15.0",
+    "antd": "^6.3.7",
+    "isbot": "^5.1.36",
+    "react": "^19.2.5",
+    "react-dom": "^19.2.5",
+    "react-router": "7.15.0"
  },
  "devDependencies": {
    "@eslint/js": "^9.39.1",
+    "@react-router/dev": "7.15.0",
    "@types/node": "^24.10.1",
    "@types/react": "^19.2.7",
    "@types/react-dom": "^19.2.3",
@@ -26,6 +32,6 @@
    "globals": "^16.5.0",
    "typescript": "~5.9.3",
    "typescript-eslint": "^8.48.0",
-    "vite": "^7.3.1"
+    "vite": "^8.0.3"
  }
 }
--- a/apps/nxmesh-frontend/react-router.config.ts
+++ b/apps/nxmesh-frontend/react-router.config.ts
@@ -0,0 +1,8 @@
+import type { Config } from '@react-router/dev/config';
+
+export default {
+  // Config options...
+  // Server-side render by default, to enable SPA mode set this to `false`
+  ssr: false,
+  appDirectory: 'src',
+} satisfies Config;
--- a/apps/nxmesh-frontend/src/App.css
+++ b/apps/nxmesh-frontend/src/App.css
@@ -1,42 +1,156 @@
+/* Light Professional Theme - nxMesh Dashboard */
+
+* {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+body {
+  background-color: #f5f5f5;
+  margin: 0;
+  padding: 0;
+}
+
 #root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
+  width: 100%;
+  height: 100vh;
+  margin: 0;
+  padding: 0;
 }

-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-  transition: filter 300ms;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
+/* Header Styles */
+.ant-layout-header {
+  background: #ffffff !important;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
 }

-@keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
+/* Sidebar Styles */
+.ant-layout-sider {
+  background: #fafafa !important;
 }

-@media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
+.ant-menu {
+  background: #fafafa !important;
 }

-.card {
-  padding: 2em;
+.ant-menu-item,
+.ant-menu-submenu-title {
+  color: #333 !important;
+  transition: all 0.3s ease;
 }

-.read-the-docs {
-  color: #888;
+.ant-menu-item-selected {
+  background-color: #e6f7ff !important;
+  color: #1890ff !important;
+}
+
+.ant-menu-item:hover,
+.ant-menu-submenu-title:hover {
+  color: #1890ff !important;
+}
+
+/* Content Area */
+.ant-layout-content {
+  background: #f5f5f5;
+}
+
+/* Card Styles */
+.ant-card {
+  border-color: #f0f0f0;
+  border-radius: 6px;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.03);
+  transition: all 0.3s ease;
+}
+
+.ant-card:hover {
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.08);
+}
+
+.ant-card-head {
+  border-bottom: 1px solid #f0f0f0;
+  background: #fafafa;
+}
+
+/* Statistic Styles */
+.ant-statistic-title {
+  color: #666;
+  font-size: 14px;
+  margin-bottom: 8px;
+}
+
+.ant-statistic-content {
+  color: #1890ff;
+  font-weight: 600;
+  font-size: 28px;
+}
+
+/* Button Styles */
+.ant-btn-primary {
+  background-color: #1890ff;
+  border-color: #1890ff;
+  transition: all 0.3s ease;
+}
+
+.ant-btn-primary:hover {
+  background-color: #0050b3;
+  border-color: #0050b3;
+  transform: translateY(-2px);
+  box-shadow: 0 4px 12px rgba(24, 144, 255, 0.3);
+}
+
+/* Input Styles */
+.ant-input {
+  border-radius: 4px;
+  border-color: #d9d9d9;
+}
+
+.ant-input:hover {
+  border-color: #1890ff;
+}
+
+.ant-input-focused {
+  border-color: #1890ff;
+  box-shadow: 0 0 0 2px rgba(24, 144, 255, 0.1);
+}
+
+/* Badge Styles */
+.ant-badge-success {
+  color: #52c41a;
+}
+
+.ant-badge-processing {
+  color: #1890ff;
+}
+
+/* Typography */
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  color: #333;
+  font-weight: 600;
+}
+
+p {
+  color: #666;
+  line-height: 1.6;
+}
+
+/* Responsive Design */
+@media (max-width: 768px) {
+  .ant-layout-sider {
+    width: 100% !important;
+    max-width: 100% !important;
+  }
+
+  .ant-layout-content {
+    padding: 16px !important;
+  }
+
+  .ant-card {
+    margin-bottom: 12px;
+  }
 }
--- a/apps/nxmesh-frontend/src/App.tsx
+++ b/apps/nxmesh-frontend/src/App.tsx
@@ -1,35 +0,0 @@
-import { useState } from 'react'
-import reactLogo from './assets/react.svg'
-import viteLogo from '/vite.svg'
-import './App.css'
-
-function App() {
-  const [count, setCount] = useState(0)
-
-  return (
-    <>
-      <div>
-        <a href="https://vite.dev" target="_blank">
-          <img src={viteLogo} className="logo" alt="Vite logo" />
-        </a>
-        <a href="https://react.dev" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo" />
-        </a>
-      </div>
-      <h1>Vite + React</h1>
-      <div className="card">
-        <button onClick={() => setCount((count) => count + 1)}>
-          count is {count}
-        </button>
-        <p>
-          Edit <code>src/App.tsx</code> and save to test HMR
-        </p>
-      </div>
-      <p className="read-the-docs">
-        Click on the Vite and React logos to learn more
-      </p>
-    </>
-  )
-}
-
-export default App
--- a/apps/nxmesh-frontend/src/assets/react.svg
+++ b/apps/nxmesh-frontend/src/assets/react.svg
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
--- a/apps/nxmesh-frontend/src/components/Layout.tsx
+++ b/apps/nxmesh-frontend/src/components/Layout.tsx
@@ -0,0 +1,36 @@
+import type { PropsWithChildren } from 'react';
+import { Layout, ConfigProvider, theme } from 'antd';
+import { LayoutHeader } from './layout/Header';
+import { LayoutSidebar } from './layout/Sidebar';
+import { LayoutFooter } from './layout/Footer';
+const { Content } = Layout;
+
+export const RootLayout = ({ children }: PropsWithChildren) => {
+  return (
+    <ConfigProvider
+      theme={{
+        token: {
+          colorPrimary: '#1890ff',
+          borderRadius: 6,
+        },
+        algorithm: theme.defaultAlgorithm,
+      }}
+    >
+      <Layout style={{ minHeight: '100vh' }}>
+        {/* Header */}
+
+        <LayoutHeader />
+
+        <Layout>
+          {/* Sidebar */}
+          <LayoutSidebar />
+
+          {/* Main Content */}
+          <Content style={{ padding: '24px' }}>{children}</Content>
+        </Layout>
+
+        <LayoutFooter />
+      </Layout>
+    </ConfigProvider>
+  );
+};
--- a/apps/nxmesh-frontend/src/components/layout/Footer.tsx
+++ b/apps/nxmesh-frontend/src/components/layout/Footer.tsx
@@ -0,0 +1,17 @@
+import { Layout } from 'antd';
+const { Footer } = Layout;
+
+export const LayoutFooter = () => {
+  return (
+    <Footer
+      style={{
+        textAlign: 'center',
+        color: '#666',
+        borderTop: '1px solid #f0f0f0',
+        background: '#fafafa',
+      }}
+    >
+      nxMesh © 2026 All Rights Reserved
+    </Footer>
+  );
+};
--- a/apps/nxmesh-frontend/src/components/layout/Header.tsx
+++ b/apps/nxmesh-frontend/src/components/layout/Header.tsx
@@ -0,0 +1,47 @@
+import { Space, Avatar, Input, Button, Badge, Dropdown, Layout, type DropdownProps } from 'antd';
+import { UserOutlined, SearchOutlined, BellOutlined, LogoutOutlined } from '@ant-design/icons';
+const { Header } = Layout;
+
+const userMenuItems: Exclude<DropdownProps['menu'], undefined>['items'] = [
+  { key: 'profile', label: 'Profile' },
+  { key: 'settings', label: 'Settings' },
+  { type: 'divider' },
+  { key: 'logout', label: 'Logout', icon: <LogoutOutlined /> },
+];
+
+export const LayoutHeader = () => {
+  return (
+    <Header
+      style={{
+        background: '#fff',
+        padding: '0 24px',
+        boxShadow: '0 2px 8px rgba(0, 0, 0, 0.06)',
+        display: 'flex',
+        justifyContent: 'space-between',
+        alignItems: 'center',
+        position: 'sticky',
+        top: 0,
+        zIndex: 999,
+      }}
+    >
+      <div style={{ display: 'flex', alignItems: 'center', gap: '16px' }}>
+        <h1 style={{ margin: 0, fontSize: '20px', fontWeight: 'bold', color: '#1890ff' }}>nxMesh</h1>
+      </div>
+
+      <Input placeholder="Search agents, workspaces..." prefix={<SearchOutlined />} style={{ width: '300px' }} />
+
+      <Space size="large">
+        <Badge count={3} style={{ backgroundColor: '#ff4d4f' }}>
+          <Button type="text" icon={<BellOutlined style={{ fontSize: '18px' }} />} />
+        </Badge>
+        <Dropdown menu={{ items: userMenuItems }} trigger={['click']}>
+          <Space style={{ cursor: 'pointer' }}>
+            <Avatar icon={<UserOutlined />} style={{ backgroundColor: '#1890ff' }} />
+            {/* TODO: from store */}
+            <span>Admin User</span>
+          </Space>
+        </Dropdown>
+      </Space>
+    </Header>
+  );
+};
--- a/apps/nxmesh-frontend/src/components/layout/Sidebar.tsx
+++ b/apps/nxmesh-frontend/src/components/layout/Sidebar.tsx
@@ -0,0 +1,57 @@
+import { Button, Menu, Layout } from 'antd';
+import { useState } from 'react';
+import { DashboardOutlined, AppstoreOutlined, TeamOutlined, SettingOutlined } from '@ant-design/icons';
+
+const { Sider } = Layout;
+
+const menuItems = [
+  { key: '1', icon: <DashboardOutlined />, label: 'Dashboard' },
+  { key: '2', icon: <AppstoreOutlined />, label: 'Agents' },
+  { key: '3', icon: <AppstoreOutlined />, label: 'Workspaces' },
+  { key: '4', icon: <TeamOutlined />, label: 'Organizations' },
+  {
+    key: '5',
+    icon: <SettingOutlined />,
+    label: 'Infrastructure',
+    children: [
+      { key: '5-1', label: 'Virtual Hosts' },
+      { key: '5-2', label: 'Upstreams' },
+      { key: '5-3', label: 'Certificates' },
+    ],
+  },
+  { key: '6', icon: <TeamOutlined />, label: 'Users & Access' },
+  { key: '7', icon: <SettingOutlined />, label: 'Settings' },
+];
+
+export const LayoutSidebar = () => {
+  const [collapsed, setCollapsed] = useState(false);
+  const [selectedKey, setSelectedKey] = useState('1');
+
+  return (
+    <Sider
+      width={250}
+      trigger={null}
+      collapsible
+      collapsed={collapsed}
+      style={{
+        background: '#fafafa',
+        borderRight: '1px solid #f0f0f0',
+      }}
+    >
+      <Button
+        type="text"
+        onClick={() => setCollapsed(!collapsed)}
+        style={{
+          width: '100%',
+          height: '64px',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'center',
+        }}
+      >
+        {collapsed ? '☰' : '☰'}
+      </Button>
+      <Menu mode="inline" selectedKeys={[selectedKey]} onSelect={(e) => setSelectedKey(e.key)} items={menuItems} style={{ border: 'none' }} />
+    </Sider>
+  );
+};
--- a/apps/nxmesh-frontend/src/index.css
+++ b/apps/nxmesh-frontend/src/index.css
@@ -1,68 +0,0 @@
-:root {
-  font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-a:hover {
-  color: #535bf2;
-}
-
-body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
-}
-
-h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
-}
-
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
-}
-button:hover {
-  border-color: #646cff;
-}
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
-}
--- a/apps/nxmesh-frontend/src/main.tsx
+++ b/apps/nxmesh-frontend/src/main.tsx
@@ -1,10 +0,0 @@
-import { StrictMode } from 'react'
-import { createRoot } from 'react-dom/client'
-import './index.css'
-import App from './App.tsx'
-
-createRoot(document.getElementById('root')!).render(
-  <StrictMode>
-    <App />
-  </StrictMode>,
-)
--- a/apps/nxmesh-frontend/src/root.tsx
+++ b/apps/nxmesh-frontend/src/root.tsx
@@ -0,0 +1,56 @@
+import './App.css';
+import { isRouteErrorResponse, Links, Meta, Outlet, Scripts, ScrollRestoration } from 'react-router';
+import type { Route } from './+types/root';
+import { RootLayout } from './components/Layout.tsx';
+
+export function Layout({ children }: { children: React.ReactNode }) {
+  return (
+    <html lang="en">
+      <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width, initial-scale=1" />
+        <Meta />
+        <Links />
+      </head>
+      <body>
+        {children}
+        <ScrollRestoration />
+        <Scripts />
+      </body>
+    </html>
+  );
+}
+
+export default function App() {
+  return (
+    <RootLayout>
+      <Outlet />
+    </RootLayout>
+  );
+}
+
+export function ErrorBoundary({ error }: Route.ErrorBoundaryProps) {
+  let message = 'Oops!';
+  let details = 'An unexpected error occurred.';
+  let stack: string | undefined;
+
+  if (isRouteErrorResponse(error)) {
+    message = error.status === 404 ? '404' : 'Error';
+    details = error.status === 404 ? 'The requested page could not be found.' : error.statusText || details;
+  } else if (import.meta.env.DEV && error && error instanceof Error) {
+    details = error.message;
+    stack = error.stack;
+  }
+
+  return (
+    <main className="pt-16 p-4 container mx-auto">
+      <h1>{message}</h1>
+      <p>{details}</p>
+      {stack && (
+        <pre className="w-full p-4 overflow-x-auto">
+          <code>{stack}</code>
+        </pre>
+      )}
+    </main>
+  );
+}
--- a/apps/nxmesh-frontend/src/routes.ts
+++ b/apps/nxmesh-frontend/src/routes.ts
@@ -0,0 +1,3 @@
+import { type RouteConfig, index } from "@react-router/dev/routes";
+
+export default [index("routes/home.tsx")] satisfies RouteConfig;
--- a/apps/nxmesh-frontend/src/routes/home.tsx
+++ b/apps/nxmesh-frontend/src/routes/home.tsx
@@ -0,0 +1,70 @@
+import type { Route } from './+types/home';
+import { Row, Col, Card, Statistic, Space, Badge } from 'antd';
+
+export function meta({}: Route.MetaArgs) {
+  return [{ title: 'New React Router App' }, { name: 'description', content: 'Welcome to React Router!' }];
+}
+
+export default function Home() {
+  return (
+    <div style={{ background: '#fff', padding: '24px', borderRadius: '6px', minHeight: '400px' }}>
+      <h2 style={{ marginBottom: '24px', fontSize: '24px', fontWeight: '600' }}>Dashboard</h2>
+
+      {/* Key Metrics */}
+      <Row gutter={[16, 16]} style={{ marginBottom: '32px' }}>
+        <Col xs={24} sm={12} lg={6}>
+          <Card hoverable>
+            <Statistic title="Active Agents" value={12} prefix="📡" />
+          </Card>
+        </Col>
+        <Col xs={24} sm={12} lg={6}>
+          <Card hoverable>
+            <Statistic title="Workspaces" value={5} prefix="📁" />
+          </Card>
+        </Col>
+        <Col xs={24} sm={12} lg={6}>
+          <Card hoverable>
+            <Statistic title="Organizations" value={3} prefix="🏢" />
+          </Card>
+        </Col>
+        <Col xs={24} sm={12} lg={6}>
+          <Card hoverable>
+            <Statistic title="System Health" value={98} suffix="%" valueStyle={{ color: '#52c41a' }} />
+          </Card>
+        </Col>
+      </Row>
+
+      {/* Content Sections */}
+      <Row gutter={[16, 16]}>
+        <Col xs={24} lg={12}>
+          <Card title="Recent Activities" hoverable>
+            <Space direction="vertical" style={{ width: '100%' }}>
+              <p>✓ Agent-01 connected successfully</p>
+              <p>✓ Workspace "Production" updated</p>
+              <p>✓ Certificate renewed for api.example.com</p>
+              <p>✓ New user invited to organization</p>
+            </Space>
+          </Card>
+        </Col>
+        <Col xs={24} lg={12}>
+          <Card title="System Status" hoverable>
+            <Space direction="vertical" style={{ width: '100%' }}>
+              <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                <span>API Server</span>
+                <Badge status="success" text="Online" />
+              </div>
+              <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                <span>Database</span>
+                <Badge status="success" text="Online" />
+              </div>
+              <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>
+                <span>Message Queue</span>
+                <Badge status="processing" text="Operational" />
+              </div>
+            </Space>
+          </Card>
+        </Col>
+      </Row>
+    </div>
+  );
+}
--- a/apps/nxmesh-frontend/vite.config.ts
+++ b/apps/nxmesh-frontend/vite.config.ts
@@ -1,7 +1,13 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react-swc'
+import { defineConfig } from 'vite';
+import { reactRouter } from '@react-router/dev/vite';

 // https://vite.dev/config/
 export default defineConfig({
-  plugins: [react()],
-})
+  plugins: [reactRouter()],
+  ssr: {
+    noExternal: ['@ant-design/icons', '@rc-component/util'],
+  },
+  resolve: {
+    tsconfigPaths: true,
+  },
+});
--- a/apps/nxmesh-master/Cargo.toml
+++ b/apps/nxmesh-master/Cargo.toml
@@ -84,7 +84,13 @@ time = "0.3"

 # Cert handling
 zip = { workspace = true }
+rust-embed = { version = "8.11.0", features = [] }
+mime_guess = "2.0.5"
+axum-test = "20.0.0"

 [dev-dependencies]
 tokio-test.workspace = true
 mockall.workspace = true
+
+[features]
+dev-tools = ["axum/macros"]
--- a/apps/nxmesh-master/frontend-dist
+++ b/apps/nxmesh-master/frontend-dist
@@ -0,0 +1 @@
+../nxmesh-frontend/dist/
--- a/apps/nxmesh-master/src/connector/agent/ssh.rs
+++ b/apps/nxmesh-master/src/connector/agent/ssh.rs
@@ -6,6 +6,7 @@ use nxmesh_proto::{
 };
 use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter};
 use tonic::transport::Server;
+use tracing::info;

 use crate::{db::entities::public_key_revocations, service::agent::AgentServerService};

@@ -69,7 +70,14 @@ impl AgentConnectorTrait for SshAgentConnector {
            .layer(ssh_interceptor)
            .add_service(agent_server_service);

-        router.serve(addr).await?;
+        info!("SSH Agent gRPC server is listening on {}", addr);
+        router
+            .serve(addr)
+            .await
+            .inspect(|_| info!("SSH Agent gRPC server stopped gracefully."))
+            .inspect_err(|e| {
+                tracing::error!("SSH Agent gRPC server failed: {}", e);
+            })?;
        Ok(())
    }
 }
--- a/apps/nxmesh-master/src/main.rs
+++ b/apps/nxmesh-master/src/main.rs
@@ -14,6 +14,7 @@ mod cli;
 mod config;
 mod connector;
 mod db;
+mod routes;
 mod service;

 #[tokio::main]
--- a/apps/nxmesh-master/src/routes/frontend/mod.rs
+++ b/apps/nxmesh-master/src/routes/frontend/mod.rs
@@ -0,0 +1,160 @@
+use axum::{Router, response::IntoResponse};
+use tracing::error;
+
+// In development, build the frontend from the source directory, the soft link will handle the path resolution
+// In deployment, pre-build the frontend and replace the frontend-dist folder with the built assets, the rust-embed will handle the embedding and path resolution
+#[derive(rust_embed::Embed)]
+#[folder = "./frontend-dist/"]
+struct FrontendAssets;
+
+const INDEX_HTML: &str = "index.html";
+
+pub async fn get_router() -> Router {
+    Router::new()
+        .route(
+            "/",
+            axum::routing::get(get_fallback_handler)
+                .head(get_fallback_handler)
+                .options(get_fallback_handler),
+        )
+        .route(
+            "/{*path}",
+            axum::routing::get(get_file_handler)
+                .head(get_file_handler)
+                .options(get_file_handler),
+        )
+        //
+        .fallback(get_fallback_handler().await)
+}
+
+pub async fn get_fallback_handler() -> Result<axum::response::Html<Vec<u8>>, axum::http::StatusCode>
+{
+    let index_html = get_index_html();
+    match index_html {
+        Some(html) => Ok(axum::response::Html(html)),
+        None => Err(axum::http::StatusCode::NOT_FOUND),
+    }
+}
+
+fn get_index_html() -> Option<Vec<u8>> {
+    FrontendAssets::get(INDEX_HTML).map(|asset| asset.data.as_ref().to_owned())
+}
+
+async fn get_file_handler(
+    axum::extract::Path(path): axum::extract::Path<String>,
+) -> Result<axum::response::Response, axum::http::StatusCode> {
+    let file_path = if path.is_empty() {
+        INDEX_HTML.to_string()
+    } else {
+        path
+    };
+
+    match FrontendAssets::get(&file_path) {
+        Some(asset) => {
+            let content_type = mime_guess::from_path(&file_path).first_or_octet_stream();
+            let response = axum::response::Response::builder()
+                .header(axum::http::header::CONTENT_TYPE, content_type.as_ref())
+                .body(asset.data.into_owned().into())
+                .map_err(|e| {
+                    error!("Failed to build response for {}: {}", file_path, e);
+                    axum::http::StatusCode::INTERNAL_SERVER_ERROR
+                })?;
+            Ok(response)
+        }
+        // return index.html for any file not found to support client-side routing in the frontend
+        None => get_fallback_handler()
+            .await
+            .map(|html| html.into_response()),
+    }
+}
+
+#[cfg(test)]
+#[allow(clippy::expect_used)]
+mod tests {
+    use super::*;
+
+    #[tokio::test]
+    async fn test_asset() {
+        // list all embedded assets for debugging
+        let assets = FrontendAssets::iter().collect::<Vec<_>>();
+        println!("Embedded assets: {:?}", assets);
+        assert!(
+            !assets.is_empty(),
+            "Expected to find embedded assets, but found none"
+        );
+    }
+
+    #[tokio::test]
+    async fn test_get_index_html() {
+        let index_html = get_index_html();
+        assert!(
+            index_html.is_some(),
+            "Expected to find index.html in embedded assets"
+        );
+    }
+
+    #[tokio::test]
+    async fn test_get_file_handler_existing_file() {
+        let response = get_file_handler(axum::extract::Path("index.html".to_string())).await;
+        assert!(
+            response.is_ok(),
+            "Expected to successfully retrieve index.html"
+        );
+        let response = response.expect("Expected response to be Ok");
+        assert_eq!(response.status(), axum::http::StatusCode::OK);
+        assert!(
+            response
+                .headers()
+                .get(axum::http::header::CONTENT_TYPE)
+                .map(|ct| ct.to_str().unwrap_or(""))
+                .expect("Content-Type header should be present")
+                .starts_with("text/html")
+        );
+    }
+
+    #[tokio::test]
+    async fn test_get_file_handler_nonexistent_file() {
+        let response = get_file_handler(axum::extract::Path("nonexistent.txt".to_string())).await;
+        assert!(
+            response.is_ok(),
+            "Expected to fallback to index.html for nonexistent file"
+        );
+        let response = response.expect("Expected response to be Ok");
+        assert_eq!(response.status(), axum::http::StatusCode::OK);
+        assert!(
+            response
+                .headers()
+                .get(axum::http::header::CONTENT_TYPE)
+                .map(|ct| ct.to_str().unwrap_or(""))
+                .expect("Content-Type header should be present")
+                .starts_with("text/html")
+        )
+    }
+}
+
+#[cfg(test)]
+mod axum_tests {
+    use super::*;
+    use axum_test::TestServer;
+
+    #[tokio::test]
+    async fn test_should_return_index_html_for_root_path() {
+        let router = get_router().await;
+        let server = TestServer::new(router);
+        let response = server.get("/").await;
+        assert_eq!(response.status_code(), 200);
+    }
+
+    #[tokio::test]
+    async fn test_should_return_index_html_for_nonexistent_path() {
+        let router = get_router().await;
+        let server = TestServer::new(router);
+        let fallback_response = server.get("/nonexistent").await;
+        assert_eq!(fallback_response.status_code(), 200);
+
+        let index_response = server.get("/").await;
+        assert_eq!(index_response.status_code(), 200);
+
+        assert_eq!(fallback_response.text(), index_response.text());
+    }
+}
--- a/apps/nxmesh-master/src/routes/mod.rs
+++ b/apps/nxmesh-master/src/routes/mod.rs
@@ -0,0 +1,36 @@
+use axum::Router;
+
+mod frontend;
+
+pub async fn get_root_router() -> Router {
+    Router::new()
+        .merge(frontend::get_router().await)
+        .fallback(frontend::get_fallback_handler().await)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use axum_test::TestServer;
+
+    #[tokio::test]
+    async fn test_should_return_index_html_for_root_path() {
+        let router = get_root_router().await;
+        let server = TestServer::new(router);
+        let response = server.get("/").await;
+        assert_eq!(response.status_code(), 200);
+    }
+
+    #[tokio::test]
+    async fn test_should_return_index_html_for_nonexistent_path() {
+        let router = get_root_router().await;
+        let server = TestServer::new(router);
+        let fallback_response = server.get("/nonexistent").await;
+        assert_eq!(fallback_response.status_code(), 200);
+
+        let index_response = server.get("/").await;
+        assert_eq!(index_response.status_code(), 200);
+
+        assert_eq!(fallback_response.text(), index_response.text());
+    }
+}
--- a/apps/nxmesh-master/src/service/mod.rs
+++ b/apps/nxmesh-master/src/service/mod.rs
@@ -1,4 +1,6 @@
-use std::sync::Arc;
+use std::{net::ToSocketAddrs, sync::Arc};
+
+use tracing::info;

 use crate::{connector::agent::AgentConnectorTrait, service::certificate::CertificateService};

@@ -26,15 +28,38 @@ pub async fn start_master_server(
        println!("Certificate generated and stored successfully.");
    }

-    // Initialize agent connector
-    let mut agent_connector = crate::connector::agent::AgentConnector::new(Box::new(
-        crate::connector::agent::ssh::SshAgentConnector::new(settings.clone())?,
-    ));
+    let ssh_connector = crate::connector::agent::ssh::SshAgentConnector::new(settings.clone())?;
+    let cert_service_for_agent = cert_service.clone();
+    let settings_for_agent = settings.clone();
+    let connection_for_agent = db_connection.clone();

-    // Start the agent server
-    agent_connector
-        .start_server(&settings, cert_service, db_connection)
-        .await?;
+    tokio::spawn(async move {
+        let mut connector = ssh_connector;
+        tracing::info!("Starting agent server...");
+        if let Err(e) = connector
+            .start_server(
+                &settings_for_agent,
+                cert_service_for_agent,
+                connection_for_agent,
+            )
+            .await
+        {
+            tracing::error!("Agent server failed: {}", e);
+        } else {
+            tracing::info!("Agent server stopped.");
+        }
+    });
+
+    let axum_router = crate::routes::get_root_router().await;
+
+    // Start the HTTP server
+    let addr = format!("{}:{}", settings.server.bind_address, settings.server.port)
+        .to_socket_addrs()?
+        .next()
+        .ok_or("Invalid bind address")?;
+    let listener = tokio::net::TcpListener::bind(addr).await?;
+    info!("Web/API server is listening on {}", addr);
+    axum::serve(listener, axum_router).await?;

    Ok(())
 }
Author	SHA1	Message	Date
GW_MC	ffae46f906	feat: refactor nxmesh-frontend to use React Router with new layout components - Updated package.json to replace Vite with React Router for development and build scripts. - Added react-router.config.ts for configuration settings. - Created a new App component with a dashboard layout including header, sidebar, and footer. - Enhanced App.css with a professional theme and responsive design. - Removed old App.tsx and index.css files. - Introduced RootLayout component to encapsulate layout structure. - Developed Header, Footer, and Sidebar components for consistent layout. - Implemented routes for home and dashboard with key metrics and activity sections. - Updated vite.config.ts to integrate React Router and adjust SSR settings.	2026-05-06 10:48:39 +00:00
GW_MC	cd28b5009a	Merge pull request 'feature/embbed-frontend' (#7 ) from feature/embbed-frontend into master All checks were successful Test / get-ci-image (push) Successful in 6s Details Test / lint-frontend (push) Successful in 24s Details Test / frontend-build (push) Successful in 23s Details Verify / get-ci-image (push) Successful in 4s Details Test / test-frontend (push) Successful in 35s Details Test / lint-crates (push) Successful in 1m50s Details Test / test-crates (push) Successful in 2m1s Details Verify / verify-generated-db-entities (push) Successful in 2m21s Details Reviewed-on: http://gitea.gwmc.dev/GW_MC/NxMesh/pulls/7	2026-04-25 14:34:55 +08:00
GW_MC	171e505f22	fix: update migration and entity generation commands in CI workflow All checks were successful Test / get-ci-image (pull_request) Successful in 5s Details Test / lint-frontend (pull_request) Successful in 26s Details Test / frontend-build (pull_request) Successful in 24s Details Verify / get-ci-image (pull_request) Successful in 6s Details Test / test-frontend (pull_request) Successful in 33s Details Test / lint-crates (pull_request) Successful in 1m52s Details Test / test-crates (pull_request) Successful in 2m3s Details Verify / verify-generated-db-entities (pull_request) Successful in 2m25s Details	2026-04-25 06:30:13 +00:00
GW_MC	dff828addf	fix: update frontend build process to create dummy artifacts and comment out artifact handling Some checks failed Test / get-ci-image (pull_request) Successful in 6s Details Test / lint-frontend (pull_request) Successful in 21s Details Verify / get-ci-image (pull_request) Successful in 5s Details Test / frontend-build (pull_request) Successful in 26s Details Test / test-frontend (pull_request) Successful in 37s Details Test / lint-crates (pull_request) Successful in 1m45s Details Test / test-crates (pull_request) Successful in 1m57s Details Verify / verify-generated-db-entities (pull_request) Failing after 1m45s Details Co-authored-by: Copilot <copilot@github.com>	2026-04-25 06:04:55 +00:00
GW_MC	1481e31182	Revert "fix: update frontend build process and add logging for embedded assets" Some checks failed Test / get-ci-image (pull_request) Successful in 11s Details Test / lint-frontend (pull_request) Failing after 30s Details Test / test-frontend (pull_request) Successful in 21s Details Verify / get-ci-image (pull_request) Successful in 35s Details Test / frontend-build (pull_request) Successful in 51s Details Test / test-crates (pull_request) Failing after 4m37s Details Test / lint-crates (pull_request) Failing after 40s Details Verify / verify-generated-db-entities (pull_request) Successful in 9m14s Details This reverts commit `4b80619c97`.	2026-04-25 04:26:59 +00:00
GW_MC	4b80619c97	fix: update frontend build process and add logging for embedded assets Some checks failed Test / get-ci-image (pull_request) Successful in 14s Details Test / test-frontend (pull_request) Successful in 47s Details Verify / get-ci-image (pull_request) Successful in 6s Details Test / lint-frontend (pull_request) Successful in 1m14s Details Verify / verify-generated-db-entities (pull_request) Failing after 15m14s Details Test / frontend-build (pull_request) Failing after 19m51s Details Test / test-crates (pull_request) Has been skipped Details Test / lint-crates (pull_request) Has been skipped Details Co-authored-by: Copilot <copilot@github.com>	2026-04-25 03:21:36 +00:00
GW_MC	836617fa54	test: Add asset listing test for embedded frontend assets Some checks failed Test / get-ci-image (pull_request) Successful in 6s Details Test / test-frontend (pull_request) Successful in 30s Details Test / lint-frontend (pull_request) Successful in 32s Details Verify / get-ci-image (pull_request) Successful in 5s Details Verify / verify-generated-db-entities (pull_request) Successful in 3m12s Details Test / frontend-build (pull_request) Successful in 23s Details Test / lint-crates (pull_request) Failing after 4m6s Details Test / test-crates (pull_request) Failing after 4m14s Details Co-authored-by: Copilot <copilot@github.com>	2026-04-25 02:49:47 +00:00
GW_MC	e74ddb96ab	fix: embed frontend builds in test Some checks failed Test / get-ci-image (pull_request) Successful in 5s Details Test / lint-frontend (pull_request) Successful in 24s Details Test / frontend-build (pull_request) Successful in 23s Details Verify / get-ci-image (pull_request) Successful in 5s Details Test / test-frontend (pull_request) Successful in 38s Details Test / lint-crates (pull_request) Successful in 2m34s Details Test / test-crates (pull_request) Failing after 2m44s Details Verify / verify-generated-db-entities (pull_request) Successful in 3m2s Details	2026-04-25 02:41:16 +00:00
GW_MC	86e9fd42bb	test: Add unit tests for frontend routing and file handling Some checks failed Test / get-ci-image (pull_request) Successful in 48s Details Test / lint-frontend (pull_request) Successful in 1m10s Details Test / frontend-build (pull_request) Successful in 25s Details Test / test-frontend (pull_request) Successful in 1m13s Details Verify / get-ci-image (pull_request) Successful in 5s Details Test / lint-crates (pull_request) Successful in 6m10s Details Test / test-crates (pull_request) Failing after 6m22s Details Verify / verify-generated-db-entities (pull_request) Successful in 7m5s Details	2026-04-24 12:14:36 +00:00
GW_MC	d9fe053d41	feat: Add new dependencies for axum-test and related packages in Cargo.lock	2026-04-24 12:08:00 +00:00
GW_MC	1eeca606ec	feat: Remove debug handler attributes from fallback and file handler functions All checks were successful Test / get-ci-image (pull_request) Successful in 7s Details Test / lint-frontend (pull_request) Successful in 26s Details Test / frontend-build (pull_request) Successful in 23s Details Verify / get-ci-image (pull_request) Successful in 4s Details Test / test-frontend (pull_request) Successful in 34s Details Test / lint-crates (pull_request) Successful in 5m48s Details Test / test-crates (pull_request) Successful in 5m59s Details Verify / verify-generated-db-entities (pull_request) Successful in 6m28s Details	2026-04-18 08:37:08 +00:00
GW_MC	6ce8850ddb	feat: Update frontend build cache path and add dummy artifact to prevent build failure	2026-04-18 08:22:05 +00:00
GW_MC	a9a08d2ef8	feat: Enhance SSH Agent gRPC server logging for better monitoring	2026-04-18 07:31:45 +00:00
GW_MC	bbde3c1b60	feat: Refactor agent server initialization to support parallel api server	2026-04-18 07:31:29 +00:00
GW_MC	e2d364722b	feat: Add frontend routing and asset handling with Axum	2026-04-18 07:30:37 +00:00
GW_MC	da0ab29b2a	feat: Update dependencies and add frontend distribution path	2026-04-18 07:26:37 +00:00
GW_MC	a1996adc45	Merge pull request 'workflows' (#5 ) from workflows into master All checks were successful Test / get-ci-image (push) Successful in 6s Details Test / test-frontend (push) Successful in 11s Details Test / lint-frontend (push) Successful in 13s Details Verify / get-ci-image (push) Successful in 5s Details Test / frontend-build (push) Successful in 17s Details Test / lint-crates (push) Successful in 1m49s Details Test / test-crates (push) Successful in 1m59s Details Verify / verify-generated-db-entities (push) Successful in 2m27s Details Reviewed-on: http://gitea.gwmc.dev/GW_MC/NxMesh/pulls/5	2026-04-16 13:02:27 +08:00
				`@@ -1 +0,0 @@`
				<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>