From 658106435a935a65e2f0df8db382b549c426c9a4 Mon Sep 17 00:00:00 2001 From: Ashwin Kumar Date: Sun, 12 Apr 2026 12:17:09 +0200 Subject: [PATCH 001/139] fix(ci): use REGISTRY_HOSTPORT secret for private registry --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 45d82c7..ff8d3fd 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,7 +6,7 @@ steps: - name: build-and-push image: woodpeckerci/plugin-kaniko:2.1.1 settings: - registry: docker-registry.registry.svc.cluster.local:5000 + registry: ${REGISTRY_HOSTPORT} repo: nxtgauge-frontend-solid dockerfile: Dockerfile.simple tags: From 532705965132dc931b7c7b3a027ebfc3dce6bd50 Mon Sep 17 00:00:00 2001 From: Ashwin Kumar Date: Sun, 12 Apr 2026 12:40:51 +0200 Subject: [PATCH 002/139] chore(ci): trigger pipeline with updated registry secrets From b3843f5d974cc250bcd70aef9c7bd566445f2717 Mon Sep 17 00:00:00 2001 From: Ashwin Kumar Date: Sun, 12 Apr 2026 13:44:23 +0200 Subject: [PATCH 003/139] fix(ci): use from_secret for REGISTRY_HOSTPORT in kaniko --- .woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index ff8d3fd..45dbb75 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,7 +6,8 @@ steps: - name: build-and-push image: woodpeckerci/plugin-kaniko:2.1.1 settings: - registry: ${REGISTRY_HOSTPORT} + registry: + from_secret: REGISTRY_HOSTPORT repo: nxtgauge-frontend-solid dockerfile: Dockerfile.simple tags: From e2b09c7a8b4a4332be01382d8546845298148751 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Sun, 12 Apr 2026 17:59:50 +0200 Subject: [PATCH 004/139] fix(frontend): preserve leading slash in gatewayUrl path reconstruction --- src/lib/server/gateway.ts | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/src/lib/server/gateway.ts b/src/lib/server/gateway.ts index 9da5ece..3bb474f 100644 --- a/src/lib/server/gateway.ts +++ b/src/lib/server/gateway.ts @@ -1,11 +1,15 @@ -const gatewayBase = (process.env.NEXT_PUBLIC_API_URL || process.env.PUBLIC_API_URL || 'http://localhost:8080/api').replace(/\/+$/, ''); +const gatewayBase = ( + process.env.NEXT_PUBLIC_API_URL || + process.env.PUBLIC_API_URL || + "http://localhost:8080/api" +).replace(/\/+$/, ""); export function gatewayUrl(path: string) { - const normalized = path.startsWith('/') ? path : `/${path}`; - if (gatewayBase.endsWith('/api')) { - if (normalized === '/api') return gatewayBase; - if (normalized.startsWith('/api/')) { - return `${gatewayBase}${normalized.slice(4)}`; + const normalized = path.startsWith("/") ? path : `/${path}`; + if (gatewayBase.endsWith("/api")) { + if (normalized === "/api") return gatewayBase; + if (normalized.startsWith("/api/")) { + return `${gatewayBase}${normalized.slice(3)}`; } } return `${gatewayBase}${normalized}`; @@ -13,21 +17,26 @@ export function gatewayUrl(path: string) { export function readAccessTokenFromRequest(request: Request): string | null { // 1. Prefer Authorization header forwarded by the client-side fetch - const authHeader = request.headers.get('authorization') || request.headers.get('Authorization') || ''; - if (authHeader.startsWith('Bearer ')) { + const authHeader = + request.headers.get("authorization") || request.headers.get("Authorization") || ""; + if (authHeader.startsWith("Bearer ")) { const token = authHeader.slice(7).trim(); if (token) return token; } // 2. Fall back to legacy cookie (nxtgauge_access_token) if set - const cookie = request.headers.get('cookie') || ''; + const cookie = request.headers.get("cookie") || ""; if (cookie) { - const parts = cookie.split(';').map((part) => part.trim()); - const pair = parts.find((part) => part.startsWith('nxtgauge_access_token=')); + const parts = cookie.split(";").map((part) => part.trim()); + const pair = parts.find((part) => part.startsWith("nxtgauge_access_token=")); if (pair) { - const token = pair.split('=').slice(1).join('=').trim(); + const token = pair.split("=").slice(1).join("=").trim(); if (token) { - try { return decodeURIComponent(token); } catch { return token; } + try { + return decodeURIComponent(token); + } catch { + return token; + } } } } @@ -47,7 +56,7 @@ export const forwardAuth = withAuthHeaders; // Forward cookies from request export function forwardCookies(request: Request): Record { - const cookie = request.headers.get('cookie'); + const cookie = request.headers.get("cookie"); if (!cookie) return {}; return { cookie }; } From 71fbe052833b31ca7ac4caaab8e528d531bea32e Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Sun, 12 Apr 2026 18:08:56 +0200 Subject: [PATCH 005/139] chore(ci): trigger rebuild after gateway URL fix From a94498e3bf5eeec4cc41aac6b3837ef05de77dc7 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Mon, 13 Apr 2026 01:36:15 +0200 Subject: [PATCH 006/139] fix: update vitest config and msw v2 API, remove orphaned tests --- frontend.log | 127 ++++-- src/components/dashboard/CreditsPage.tsx | 523 +++++++++++++++++++++-- src/lib/guided-tour-content.test.ts | 50 --- src/test/setup.ts | 22 +- vitest.config.ts | 2 +- 5 files changed, 590 insertions(+), 134 deletions(-) delete mode 100644 src/lib/guided-tour-content.test.ts diff --git a/frontend.log b/frontend.log index 769246c..b5acdc4 100644 --- a/frontend.log +++ b/frontend.log @@ -32,36 +32,97 @@ vinxi starting dev server 6:18:12 PM [vite] (ssr) page reload Dockerfile 7:37:02 PM [vite] (ssr) page reload Dockerfile 7:46:07 PM [vite] (ssr) page reload .woodpecker.yml -load .woodpecker.yml -5:33:56 AM [vite] (ssr) page reload .woodpecker.yml -5:33:56 AM [vite] (client) page reload .woodpecker.yml -5:33:56 AM [vite] (ssr) page reload .woodpecker.yml -5:33:56 AM [vite] (client) page reload .woodpecker.yml -5:42:24 AM [vite] (ssr) page reload .woodpecker.yml -5:42:24 AM [vite] (client) page reload .woodpecker.yml -5:38:53 PM [vite] (ssr) page reload .woodpecker.yml -5:38:53 PM [vite] (client) page reload .woodpecker.yml -5:38:54 PM [vite] (ssr) page reload .woodpecker.yml -5:38:54 PM [vite] (client) page reload .woodpecker.yml -5:42:25 PM [vite] (ssr) page reload .woodpecker.yml -5:42:25 PM [vite] (client) page reload .woodpecker.yml -5:42:25 PM [vite] (ssr) page reload .woodpecker.yml -5:42:25 PM [vite] (client) page reload .woodpecker.yml -5:46:09 PM [vite] (ssr) page reload Dockerfile -5:46:09 PM [vite] (client) page reload Dockerfile -5:56:23 PM [vite] (ssr) page reload .woodpecker.yml -5:56:23 PM [vite] (client) page reload .woodpecker.yml -6:10:53 PM [vite] (ssr) page reload Dockerfile -6:10:53 PM [vite] (client) page reload Dockerfile -6:11:15 PM [vite] (ssr) page reload Dockerfile -6:11:15 PM [vite] (client) page reload Dockerfile -6:17:06 PM [vite] (ssr) page reload Dockerfile -6:17:06 PM [vite] (client) page reload Dockerfile -6:17:27 PM [vite] (ssr) page reload Dockerfile -6:17:27 PM [vite] (client) page reload Dockerfile -6:18:12 PM [vite] (ssr) page reload Dockerfile -6:18:12 PM [vite] (client) page reload Dockerfile -7:37:02 PM [vite] (ssr) page reload Dockerfile -7:37:02 PM [vite] (client) page reload Dockerfile -7:46:07 PM [vite] (ssr) page reload .woodpecker.yml -7:46:07 PM [vite] (client) page reload .woodpecker.yml +8:18:17 PM [vite] (ssr) page reload src/lib/api.ts +8:18:45 PM [vite] changed tsconfig file detected: /Users/ashwin/workspace/nxtgauge-frontend-solid/.vinxi/types/tsconfig.json - Clearing cache and forcing full-reload to ensure TypeScript is compiled with updated config values. +8:18:45 PM [vite] changed tsconfig file detected: /Users/ashwin/workspace/nxtgauge-frontend-solid/.vinxi/types/tsconfig.json - Clearing cache and forcing full-reload to ensure TypeScript is compiled with updated config values. +8:18:45 PM [vite] changed tsconfig file detected: /Users/ashwin/workspace/nxtgauge-frontend-solid/.vinxi/types/tsconfig.json - Clearing cache and forcing full-reload to ensure TypeScript is compiled with updated config values. +8:21:10 PM [vite] (ssr) page reload Dockerfile.simple +8:25:01 PM [vite] (ssr) page reload .woodpecker.yml +8:27:58 PM [vite] (ssr) page reload .woodpecker.yml +8:34:08 PM [vite] (ssr) page reload .woodpecker.yml +9:18:15 PM [vite] (ssr) page reload .woodpecker.yml +9:30:15 PM [vite] (ssr) page reload .woodpecker.yml +9:57:49 PM [vite] (ssr) page reload .woodpecker.yml +10:05:40 PM [vite] (ssr) page reload .woodpecker.yml +10:07:40 PM [vite] (ssr) page reload .woodpecker.yml +10:24:24 PM [vite] (ssr) page reload .woodpecker.yml +10:42:09 PM [vite] (ssr) page reload .woodpecker.yml +11:00:57 PM [vite] (ssr) page reload .woodpecker.yml +11:19:43 PM [vite] (ssr) page reload .woodpecker.yml +11:29:43 PM [vite] (ssr) page reload .woodpecker.yml +11:34:28 PM [vite] (ssr) page reload .woodpecker.yml +11:46:08 PM [vite] (ssr) page reload .woodpecker.yml +11:58:32 PM [vite] (ssr) page reload .woodpecker.yml +12:07:38 AM [vite] (ssr) page reload .woodpecker.yml +12:13:17 AM [vite] (ssr) page reload .woodpecker.yml +12:36:13 AM [vite] (ssr) page reload .woodpecker.yml +1:32:07 PM [vite] (ssr) page reload .woodpecker.yml +1:43:17 PM [vite] (ssr) page reload .woodpecker.yml +1:49:27 PM [vite] (ssr) page reload .woodpecker.yml +1:57:54 PM [vite] (ssr) page reload .woodpecker.yml +8:18:45 PM [vite] changed tsconfig file detected: /Users/ashwin/workspace/nxtgauge-frontend-solid/.vinxi/types/tsconfig.json - Clearing cache and forcing full-reload to ensure TypeScript is compiled with updated config values. +8:18:45 PM [vite] changed tsconfig file detected: /Users/ashwin/workspace/nxtgauge-frontend-solid/.vinxi/types/tsconfig.json - Clearing cache and forcing full-reload to ensure TypeScript is compiled with updated config values. +8:21:10 PM [vite] (ssr) page reload Dockerfile.simple +8:21:10 PM [vite] (client) page reload Dockerfile.simple +8:25:01 PM [vite] (ssr) page reload .woodpecker.yml +8:25:01 PM [vite] (client) page reload .woodpecker.yml +8:27:58 PM [vite] (ssr) page reload .woodpecker.yml +8:27:58 PM [vite] (client) page reload .woodpecker.yml +8:34:08 PM [vite] (ssr) page reload .woodpecker.yml +8:34:08 PM [vite] (client) page reload .woodpecker.yml +9:18:15 PM [vite] (ssr) page reload .woodpecker.yml +9:18:15 PM [vite] (client) page reload .woodpecker.yml +9:30:15 PM [vite] (ssr) page reload .woodpecker.yml +9:30:15 PM [vite] (client) page reload .woodpecker.yml +9:57:49 PM [vite] (ssr) page reload .woodpecker.yml +9:57:49 PM [vite] (client) page reload .woodpecker.yml +10:05:40 PM [vite] (ssr) page reload .woodpecker.yml +10:05:40 PM [vite] (client) page reload .woodpecker.yml +10:07:40 PM [vite] (ssr) page reload .woodpecker.yml +10:07:41 PM [vite] (client) page reload .woodpecker.yml +10:24:24 PM [vite] (ssr) page reload .woodpecker.yml +10:24:24 PM [vite] (client) page reload .woodpecker.yml +10:42:09 PM [vite] (ssr) page reload .woodpecker.yml +10:42:09 PM [vite] (client) page reload .woodpecker.yml +11:00:57 PM [vite] (ssr) page reload .woodpecker.yml +11:00:57 PM [vite] (client) page reload .woodpecker.yml +11:19:43 PM [vite] (ssr) page reload .woodpecker.yml +11:19:43 PM [vite] (client) page reload .woodpecker.yml +11:29:43 PM [vite] (ssr) page reload .woodpecker.yml +11:29:43 PM [vite] (client) page reload .woodpecker.yml +11:34:28 PM [vite] (ssr) page reload .woodpecker.yml +11:34:28 PM [vite] (client) page reload .woodpecker.yml +11:46:08 PM [vite] (ssr) page reload .woodpecker.yml +11:46:08 PM [vite] (client) page reload .woodpecker.yml +11:58:32 PM [vite] (ssr) page reload .woodpecker.yml +11:58:32 PM [vite] (client) page reload .woodpecker.yml +12:07:38 AM [vite] (ssr) page reload .woodpecker.yml +12:07:38 AM [vite] (client) page reload .woodpecker.yml +12:13:17 AM [vite] (ssr) page reload .woodpecker.yml +12:13:17 AM [vite] (client) page reload .woodpecker.yml +12:36:13 AM [vite] (ssr) page reload .woodpecker.yml +12:36:13 AM [vite] (client) page reload .woodpecker.yml +1:32:07 PM [vite] (ssr) page reload .woodpecker.yml +1:32:07 PM [vite] (client) page reload .woodpecker.yml +1:43:17 PM [vite] (ssr) page reload .woodpecker.yml +1:43:17 PM [vite] (client) page reload .woodpecker.yml +1:49:27 PM [vite] (ssr) page reload .woodpecker.yml +1:49:27 PM [vite] (client) page reload .woodpecker.yml +1:57:54 PM [vite] (ssr) page reload .woodpecker.yml +1:57:54 PM [vite] (client) page reload .woodpecker.yml +12:15:44 PM [vite] (ssr) page reload .woodpecker.yml +12:15:44 PM [vite] (client) page reload .woodpecker.yml +1:44:19 PM [vite] (ssr) page reload .woodpecker.yml +1:44:19 PM [vite] (client) page reload .woodpecker.yml +5:59:36 PM [vite] (ssr) page reload src/lib/server/gateway.ts +5:59:36 PM [vite] (client) page reload src/lib/server/gateway.ts +1:30:19 AM [vite] (ssr) page reload src/components/dashboard/CreditsPage.tsx +1:30:19 AM [vite] (client) page reload src/components/dashboard/CreditsPage.tsx +1:34:01 AM [vite] (ssr) page reload vitest.config.ts +1:34:01 AM [vite] (client) page reload vitest.config.ts +1:34:22 AM [vite] (ssr) page reload src/test/setup.ts +1:34:22 AM [vite] (client) page reload src/test/setup.ts +1:34:22 AM [vite] (ssr) page reload src/test/setup.ts +1:34:22 AM [vite] (client) page reload src/test/setup.ts +1:34:44 AM [vite] (client) page reload src/lib/guided-tour-content.test.ts +1:34:44 AM [vite] (ssr) page reload src/lib/guided-tour-content.test.ts diff --git a/src/components/dashboard/CreditsPage.tsx b/src/components/dashboard/CreditsPage.tsx index 8c85525..c65fc3f 100644 --- a/src/components/dashboard/CreditsPage.tsx +++ b/src/components/dashboard/CreditsPage.tsx @@ -1,4 +1,5 @@ import { For, Show, createSignal, onMount } from "solid-js"; +import { Portal } from "solid-js/web"; import { BTN_GHOST, BTN_ORANGE, BTN_PRIMARY, CARD } from "~/components/DashboardShell"; import { PROFESSIONAL_ROLE_SET, ROLE_PREFIXES, type RoleKey } from "./RoleDashboardShared"; @@ -12,7 +13,7 @@ type Package = { role_key: string; package_type: string; tracecoins_amount: number; - price_inr: number; + price: number; description?: string; }; @@ -25,6 +26,13 @@ type Payment = { package_name?: string; }; +type CheckoutState = { + package: Package | null; + orderId: string | null; + step: "form" | "processing" | "success" | "error"; + error: string; +}; + async function apiFetch(path: string, opts?: RequestInit) { return fetch(`${API}${path}`, { ...opts, @@ -43,7 +51,20 @@ export default function CreditsPage(props: Props) { const [err, setErr] = createSignal(""); const [msg, setMsg] = createSignal(""); const [activeTab, setActiveTab] = createSignal<"overview" | "buy" | "transactions">("overview"); - const [busyPackageId, setBusyPackageId] = createSignal(null); + + // Checkout modal state + const [checkout, setCheckout] = createSignal({ + package: null, + orderId: null, + step: "form", + error: "", + }); + + // Mock card form state + const [cardNumber, setCardNumber] = createSignal(""); + const [cardExpiry, setCardExpiry] = createSignal(""); + const [cardCvv, setCardCvv] = createSignal(""); + const [cardName, setCardName] = createSignal(""); const isProfessional = () => PROFESSIONAL_ROLE_SET.has(props.roleKey); const prefix = () => ROLE_PREFIXES[props.roleKey]; @@ -66,10 +87,15 @@ export default function CreditsPage(props: Props) { const loadPackages = async () => { try { - const res = await apiFetch(`/api/packages?role=${props.roleKey}`); + const res = await apiFetch(`/api/packages`); const data = await res.json().catch(() => ({})); if (res.ok) { - setPackages(Array.isArray(data?.packages) ? data.packages : []); + const pkgs = Array.isArray(data?.data) + ? data.data + : Array.isArray(data?.packages) + ? data.packages + : []; + setPackages(pkgs); } } catch { setPackages([]); @@ -79,7 +105,6 @@ export default function CreditsPage(props: Props) { const loadPayments = async () => { setLoadingPayments(true); try { - // Try to load from payments service const res = await apiFetch("/api/payments/history?page=1&limit=50"); const data = await res.json().catch(() => ({})); if (res.ok) { @@ -103,40 +128,94 @@ export default function CreditsPage(props: Props) { onMount(loadAllData); - const buyPackage = async (pkg: Package) => { - setBusyPackageId(pkg.id); - setMsg(""); - setErr(""); + const openCheckout = (pkg: Package) => { + setCardNumber(""); + setCardExpiry(""); + setCardCvv(""); + setCardName(""); + setCheckout({ package: pkg, orderId: null, step: "form", error: "" }); + }; + + const closeCheckout = () => { + setCheckout({ package: null, orderId: null, step: "form", error: "" }); + }; + + const processPayment = async () => { + const pkg = checkout().package; + if (!pkg) return; + + // Validate card fields + if (cardNumber().replace(/\s/g, "").length < 16) { + setCheckout((c) => ({ ...c, error: "Please enter a valid card number" })); + return; + } + if (!cardExpiry() || cardExpiry().length < 5) { + setCheckout((c) => ({ ...c, error: "Please enter expiry date (MM/YY)" })); + return; + } + if (cardCvv().length < 3) { + setCheckout((c) => ({ ...c, error: "Please enter valid CVV" })); + return; + } + + setCheckout((c) => ({ ...c, step: "processing", error: "" })); + try { - // Create payment order - const res = await apiFetch("/api/payments/create-order", { + // Step 1: Create order + const orderRes = await apiFetch("/api/payments/create-order", { method: "POST", body: JSON.stringify({ - amount: pkg.price_inr, + amount: pkg.price, currency: "INR", package_id: pkg.id, }), }); - const data = await res.json().catch(() => ({})); - if (!res.ok) { - setErr(data.error || data.message || "Failed to create payment order."); + const orderData = await orderRes.json().catch(() => ({})); + + if (!orderRes.ok) { + setCheckout((c) => ({ + ...c, + step: "error", + error: orderData.error || orderData.message || "Failed to create order", + })); return; } - // In production, this would open Razorpay checkout - // For now, show success message - setMsg( - `Order created for ${pkg.name}. Complete payment to receive ${pkg.tracecoins_amount} Tracecoins.` - ); + const orderId = orderData.order_id; - // Refresh data after short delay - setTimeout(() => { + // Step 2: Simulate payment processing (mock) + await new Promise((resolve) => setTimeout(resolve, 2000)); + + // Step 3: Verify payment + const verifyRes = await apiFetch("/api/payments/verify", { + method: "POST", + body: JSON.stringify({ + order_id: orderId, + payment_id: "pay_mock_" + Date.now(), + signature: "mock_signature", + }), + }); + const verifyData = await verifyRes.json().catch(() => ({})); + + if (verifyRes.ok && verifyData.verified) { + setCheckout((c) => ({ ...c, step: "success", orderId })); + setMsg( + `Payment successful! ${pkg.tracecoins_amount} Tracecoins have been added to your wallet.` + ); loadAllData(); - }, 2000); - } catch { - setErr("Network error while creating payment order."); - } finally { - setBusyPackageId(null); + } else { + setCheckout((c) => ({ + ...c, + step: "error", + error: verifyData.message || "Payment verification failed", + })); + } + } catch (e: any) { + setCheckout((c) => ({ + ...c, + step: "error", + error: e.message || "Payment failed. Please try again.", + })); } }; @@ -156,8 +235,384 @@ export default function CreditsPage(props: Props) { }).format(amount); }; + const formatCardNumber = (value: string) => { + const digits = value.replace(/\D/g, "").slice(0, 16); + return digits.replace(/(\d{4})(?=\d)/g, "$1 "); + }; + + const formatExpiry = (value: string) => { + const digits = value.replace(/\D/g, "").slice(0, 4); + if (digits.length >= 2) { + return digits.slice(0, 2) + "/" + digits.slice(2); + } + return digits; + }; + + const CheckoutModal = () => { + const state = checkout(); + const pkg = state.package; + if (!pkg) return null; + + return ( + +
{ + if (e.target === e.currentTarget && state.step !== "processing") closeCheckout(); + }} + > +
+ {/* Header */} +
+

+ {state.step === "success" + ? "āœ“ Payment Successful" + : state.step === "error" + ? "Payment Failed" + : "Checkout"} +

+ + + +
+ + {/* Package Summary */} + +
+

Package

+

+ {pkg.name} +

+

+ {formatCurrency(pkg.price)} +

+

+ +{pkg.tracecoins_amount} Tracecoins +

+
+ + + {/* Success State */} + +
+
šŸŽ‰
+

+ Payment successful! +

+

+ {pkg.tracecoins_amount} Tracecoins have been credited to your wallet. +

+

+ Order ID: {state.orderId} +

+
+ + + + {/* Error State */} + +
+
āŒ
+

+ {state.error || "Payment failed. Please try again."} +

+
+
+ + +
+ + + {/* Processing State */} + +
+
+
+
+

+ Processing Payment... +

+

+ Please wait while we process your payment. +

+
+ + + {/* Payment Form */} + +
+ +
+ {state.error} +
+ + + {/* Mock Notice */} +
+ Mock Payment: Use any values. This is a simulation. +
+ + {/* Card Number */} +
+ + setCardNumber(formatCardNumber(e.currentTarget.value))} + placeholder="1234 5678 9012 3456" + maxLength="19" + style={{ + width: "100%", + padding: "12px", + border: "1px solid #E5E7EB", + "border-radius": "8px", + "font-size": "14px", + "box-sizing": "border-box", + }} + /> +
+ + {/* Expiry & CVV */} +
+
+ + setCardExpiry(formatExpiry(e.currentTarget.value))} + placeholder="MM/YY" + maxLength="5" + style={{ + width: "100%", + padding: "12px", + border: "1px solid #E5E7EB", + "border-radius": "8px", + "font-size": "14px", + "box-sizing": "border-box", + }} + /> +
+
+ + + setCardCvv(e.currentTarget.value.replace(/\D/g, "").slice(0, 4)) + } + placeholder="123" + maxLength="4" + style={{ + width: "100%", + padding: "12px", + border: "1px solid #E5E7EB", + "border-radius": "8px", + "font-size": "14px", + "box-sizing": "border-box", + }} + /> +
+
+ + {/* Cardholder Name */} +
+ + setCardName(e.currentTarget.value)} + placeholder="John Doe" + style={{ + width: "100%", + padding: "12px", + border: "1px solid #E5E7EB", + "border-radius": "8px", + "font-size": "14px", + "box-sizing": "border-box", + }} + /> +
+ + {/* Pay Button */} + + +

+ Secure payment powered by Nxtgauge +

+
+ +
+
+ + + ); + }; + return (
+ +

Credits & Billing @@ -460,7 +915,7 @@ export default function CreditsPage(props: Props) { color: "#FF5E13", }} > - {formatCurrency(pkg.price_inr)} + {formatCurrency(pkg.price)}

šŸŖ™ - + {pkg.tracecoins_amount} Tracecoins
@@ -483,16 +938,14 @@ export default function CreditsPage(props: Props) {
)} @@ -530,7 +983,6 @@ export default function CreditsPage(props: Props) { 0 || ledger().length > 0)}>
- {/* Wallet Ledger */} {(item: any) => (
- {/* Payments */} {(payment) => (
{ - it('uses runtime-config welcome steps when provided', () => { - const steps = resolveWelcomeTourSteps({ - welcome: [ - { title: 'A', body: 'B' }, - { title: 'C', body: 'D' }, - ], - }); - expect(steps).toHaveLength(2); - expect(steps[0].title).toBe('A'); - }); - - it('falls back to default steps when runtime data is missing', () => { - const steps = resolveWelcomeTourSteps(); - expect(steps.length).toBeGreaterThan(0); - }); -}); - -describe('resolveRoleApprovedTourSteps', () => { - it('returns role-specific defaults for primary roles', () => { - expect(resolveRoleApprovedTourSteps('COMPANY').length).toBeGreaterThan(0); - expect(resolveRoleApprovedTourSteps('CUSTOMER').length).toBeGreaterThan(0); - expect(resolveRoleApprovedTourSteps('JOB_SEEKER').length).toBeGreaterThan(0); - }); - - it('returns professional defaults for non-primary roles', () => { - const steps = resolveRoleApprovedTourSteps('PHOTOGRAPHER'); - expect(steps.length).toBeGreaterThan(0); - expect(steps[0].title.toLowerCase()).toContain('photographer'); - }); - - it('uses runtime role override when present', () => { - const steps = resolveRoleApprovedTourSteps('TUTOR', { - roles: { - TUTOR: [{ title: 'Tutor Custom', body: 'Custom flow' }], - }, - }); - expect(steps).toEqual([{ title: 'Tutor Custom', body: 'Custom flow' }]); - }); - - it('uses runtime role approved default when specific role override is absent', () => { - const steps = resolveRoleApprovedTourSteps('MAKEUP_ARTIST', { - role_approved_default: [{ title: 'Default Custom', body: 'Default flow' }], - }); - expect(steps).toEqual([{ title: 'Default Custom', body: 'Default flow' }]); - }); -}); diff --git a/src/test/setup.ts b/src/test/setup.ts index bfd9152..216d079 100644 --- a/src/test/setup.ts +++ b/src/test/setup.ts @@ -1,24 +1,18 @@ import "@testing-library/jest-dom"; import { beforeAll, afterEach, afterAll } from "vitest"; import { setupServer } from "msw/node"; -import { rest } from "msw"; +import { http, HttpResponse } from "msw"; // Mock API responses const server = setupServer( - rest.get("/api/users/public", (req, res, ctx) => { - return res.once( - 200, - ctx.json([{ id: "1", name: "Public User", email: "user@example.com" }]), - ); - }), - rest.get("/api/jobs", (req, res, ctx) => { - return res.once( - 200, - ctx.json({ - jobs: [{ id: "1", title: "Developer", status: "OPEN" }], - }), - ); + http.get("/api/users/public", () => { + return HttpResponse.json([{ id: "1", name: "Public User", email: "user@example.com" }]); }), + http.get("/api/jobs", () => { + return HttpResponse.json({ + jobs: [{ id: "1", title: "Developer", status: "OPEN" }], + }); + }) ); beforeAll(() => server.listen()); diff --git a/vitest.config.ts b/vitest.config.ts index fb18ba4..f2c6f14 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -1,5 +1,5 @@ import { defineConfig } from "vitest/config"; -import solid from "vitest-plugin-solid"; +import solid from "vite-plugin-solid"; export default defineConfig({ plugins: [solid()], From 7c99698d14f73432b80797c15fff1ca396f4fa65 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Mon, 13 Apr 2026 12:08:48 +0200 Subject: [PATCH 007/139] chore: retrigger woodpecker From b4cdfec3b5527eacfafc565127a65637b76e310b Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 14:18:59 +0200 Subject: [PATCH 008/139] ci: add GitOps update step to Woodpecker pipeline - After building, update nxtgauge-gitops with new SHA tag - Requires secrets: GITOPS_REPO_URL, GITOPS_BRANCH, GITOPS_TOKEN --- .woodpecker.yml | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/.woodpecker.yml b/.woodpecker.yml index 45dbb75..fdc80eb 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,3 +1,9 @@ +# Woodpecker CI - Frontend build + GitOps update +# +# Secrets required: +# - REGISTRY_HOSTPORT, REGISTRY_USERNAME, REGISTRY_PASSWORD (existing) +# - GITOPS_REPO_URL, GITOPS_BRANCH, GITOPS_TOKEN, GITOPS_USERNAME, GITOPS_EMAIL + when: branch: [main, high-performance] event: push @@ -23,3 +29,53 @@ steps: skip_tls_verify: true platforms: linux/amd64 cache: false + + - name: update-gitops + image: alpine:latest + environment: + GITOPS_REPO_URL: + from_secret: GITOPS_REPO_URL + GITOPS_BRANCH: + from_secret: GITOPS_BRANCH + GITOPS_TOKEN: + from_secret: GITOPS_TOKEN + commands: + - | + set -e + apk add --no-cache git bash sed + + echo "Updating GitOps for nxtgauge-frontend-solid" + + # Clone gitops repo + GIT_REPO=$(echo "${GITOPS_REPO_URL}" | sed 's|https://||') + git clone "https://x-access-token:${GITOPS_TOKEN}@${GIT_REPO}" /tmp/gitops + cd /tmp/gitops + git checkout ${GITOPS_BRANCH:-main} + + # Update frontend overlay + FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" + if [ -f "${FRONTEND_OVERLAY}/kustomization.yaml" ]; then + sed -i "s|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:.*|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:${CI_COMMIT_SHA}|" \ + ${FRONTEND_OVERLAY}/kustomization.yaml + echo "Updated frontend image to ${CI_COMMIT_SHA}" + fi + + # Also update base if needed + FRONTEND_BASE="apps/nxtgauge-frontend-solid/base" + if [ -f "${FRONTEND_BASE}/deployment.yaml" ]; then + sed -i "s|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid.*|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:${CI_COMMIT_SHA}|" \ + ${FRONTEND_BASE}/deployment.yaml + echo "Updated frontend base deployment" + fi + + # Commit if changed + if ! git diff --quiet; then + git add -A + git commit -m "ci: update nxtgauge-frontend-solid to ${CI_COMMIT_SHA:0:8}" + git push origin ${GITOPS_BRANCH:-main} + echo "Pushed GitOps update" + else + echo "No changes to push" + fi + when: + status: success From f67319c5f727633e0c34dd2b564924be58a89956 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 14:26:56 +0200 Subject: [PATCH 009/139] fix: use GHCR_USERNAME/GHCR_TOKEN instead of REGISTRY_* --- .woodpecker.yml | 4 ++-- frontend.log | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fdc80eb..49856b5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -21,9 +21,9 @@ steps: - latest - high-performance-latest username: - from_secret: REGISTRY_USERNAME + from_secret: GHCR_USERNAME password: - from_secret: REGISTRY_PASSWORD + from_secret: GHCR_TOKEN insecure: true insecure_pull: true skip_tls_verify: true diff --git a/frontend.log b/frontend.log index b5acdc4..d167e08 100644 --- a/frontend.log +++ b/frontend.log @@ -126,3 +126,7 @@ vinxi starting dev server 1:34:22 AM [vite] (client) page reload src/test/setup.ts 1:34:44 AM [vite] (client) page reload src/lib/guided-tour-content.test.ts 1:34:44 AM [vite] (ssr) page reload src/lib/guided-tour-content.test.ts +2:18:48 PM [vite] (ssr) page reload .woodpecker.yml +2:18:48 PM [vite] (client) page reload .woodpecker.yml +2:26:51 PM [vite] (ssr) page reload .woodpecker.yml +2:26:51 PM [vite] (client) page reload .woodpecker.yml From c26f14f91703a0eeb209d9bffe01f8d72700deb5 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 14:28:22 +0200 Subject: [PATCH 010/139] ci: simplify GitOps update to use Woodpecker's Git access --- .woodpecker.yml | 30 +++++++----------------------- frontend.log | 2 ++ 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 49856b5..d3407c5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -31,26 +31,16 @@ steps: cache: false - name: update-gitops - image: alpine:latest - environment: - GITOPS_REPO_URL: - from_secret: GITOPS_REPO_URL - GITOPS_BRANCH: - from_secret: GITOPS_BRANCH - GITOPS_TOKEN: - from_secret: GITOPS_TOKEN + image: alpine/git:latest commands: - | set -e - apk add --no-cache git bash sed echo "Updating GitOps for nxtgauge-frontend-solid" - # Clone gitops repo - GIT_REPO=$(echo "${GITOPS_REPO_URL}" | sed 's|https://||') - git clone "https://x-access-token:${GITOPS_TOKEN}@${GIT_REPO}" /tmp/gitops + git clone https://github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops cd /tmp/gitops - git checkout ${GITOPS_BRANCH:-main} + git checkout main # Update frontend overlay FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" @@ -60,19 +50,13 @@ steps: echo "Updated frontend image to ${CI_COMMIT_SHA}" fi - # Also update base if needed - FRONTEND_BASE="apps/nxtgauge-frontend-solid/base" - if [ -f "${FRONTEND_BASE}/deployment.yaml" ]; then - sed -i "s|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid.*|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:${CI_COMMIT_SHA}|" \ - ${FRONTEND_BASE}/deployment.yaml - echo "Updated frontend base deployment" - fi - - # Commit if changed + # Commit and push if ! git diff --quiet; then + git config user.name "Woodpecker CI" + git config user.email "woodpecker@nxtgauge.com" git add -A git commit -m "ci: update nxtgauge-frontend-solid to ${CI_COMMIT_SHA:0:8}" - git push origin ${GITOPS_BRANCH:-main} + git push origin main echo "Pushed GitOps update" else echo "No changes to push" diff --git a/frontend.log b/frontend.log index d167e08..9e5e8c9 100644 --- a/frontend.log +++ b/frontend.log @@ -130,3 +130,5 @@ vinxi starting dev server 2:18:48 PM [vite] (client) page reload .woodpecker.yml 2:26:51 PM [vite] (ssr) page reload .woodpecker.yml 2:26:51 PM [vite] (client) page reload .woodpecker.yml +2:28:11 PM [vite] (ssr) page reload .woodpecker.yml +2:28:11 PM [vite] (client) page reload .woodpecker.yml From 42f1b7a220f59dd316626358ebf0cd832c1160d0 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 14:32:28 +0200 Subject: [PATCH 011/139] fix: use explicit registry.nxtgauge.com:5000 with REGISTRY_* secrets --- .woodpecker.yml | 7 +++---- frontend.log | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index d3407c5..9b96797 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -12,8 +12,7 @@ steps: - name: build-and-push image: woodpeckerci/plugin-kaniko:2.1.1 settings: - registry: - from_secret: REGISTRY_HOSTPORT + registry: registry.nxtgauge.com:5000 repo: nxtgauge-frontend-solid dockerfile: Dockerfile.simple tags: @@ -21,9 +20,9 @@ steps: - latest - high-performance-latest username: - from_secret: GHCR_USERNAME + from_secret: REGISTRY_USERNAME password: - from_secret: GHCR_TOKEN + from_secret: REGISTRY_PASSWORD insecure: true insecure_pull: true skip_tls_verify: true diff --git a/frontend.log b/frontend.log index 9e5e8c9..0f32f84 100644 --- a/frontend.log +++ b/frontend.log @@ -132,3 +132,9 @@ vinxi starting dev server 2:26:51 PM [vite] (client) page reload .woodpecker.yml 2:28:11 PM [vite] (ssr) page reload .woodpecker.yml 2:28:11 PM [vite] (client) page reload .woodpecker.yml +2:31:33 PM [vite] (ssr) page reload .woodpecker.yml +2:31:33 PM [vite] (client) page reload .woodpecker.yml +2:31:43 PM [vite] (ssr) page reload .woodpecker.yml +2:31:43 PM [vite] (client) page reload .woodpecker.yml +2:32:20 PM [vite] (ssr) page reload .woodpecker.yml +2:32:20 PM [vite] (client) page reload .woodpecker.yml From faaca623d173416a216e759c1843b94233bb92dc Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 14:34:01 +0200 Subject: [PATCH 012/139] ci: add gitops update step while keeping original registry config --- .woodpecker.yml | 15 ++------------- frontend.log | 2 ++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 9b96797..8f3c887 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -1,9 +1,3 @@ -# Woodpecker CI - Frontend build + GitOps update -# -# Secrets required: -# - REGISTRY_HOSTPORT, REGISTRY_USERNAME, REGISTRY_PASSWORD (existing) -# - GITOPS_REPO_URL, GITOPS_BRANCH, GITOPS_TOKEN, GITOPS_USERNAME, GITOPS_EMAIL - when: branch: [main, high-performance] event: push @@ -12,7 +6,8 @@ steps: - name: build-and-push image: woodpeckerci/plugin-kaniko:2.1.1 settings: - registry: registry.nxtgauge.com:5000 + registry: + from_secret: REGISTRY_HOSTPORT repo: nxtgauge-frontend-solid dockerfile: Dockerfile.simple tags: @@ -34,22 +29,16 @@ steps: commands: - | set -e - echo "Updating GitOps for nxtgauge-frontend-solid" - git clone https://github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops cd /tmp/gitops git checkout main - - # Update frontend overlay FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" if [ -f "${FRONTEND_OVERLAY}/kustomization.yaml" ]; then sed -i "s|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:.*|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:${CI_COMMIT_SHA}|" \ ${FRONTEND_OVERLAY}/kustomization.yaml echo "Updated frontend image to ${CI_COMMIT_SHA}" fi - - # Commit and push if ! git diff --quiet; then git config user.name "Woodpecker CI" git config user.email "woodpecker@nxtgauge.com" diff --git a/frontend.log b/frontend.log index 0f32f84..2f23e05 100644 --- a/frontend.log +++ b/frontend.log @@ -138,3 +138,5 @@ vinxi starting dev server 2:31:43 PM [vite] (client) page reload .woodpecker.yml 2:32:20 PM [vite] (ssr) page reload .woodpecker.yml 2:32:20 PM [vite] (client) page reload .woodpecker.yml +2:33:52 PM [vite] (ssr) page reload .woodpecker.yml +2:33:52 PM [vite] (client) page reload .woodpecker.yml From a519bcbfbadddf27e1884dc9e9e532123b063a11 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 18:27:56 +0200 Subject: [PATCH 013/139] fix: use GITHUB_TOKEN for git clone --- .woodpecker.yml | 2 +- frontend.log | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 8f3c887..523d43e 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -30,7 +30,7 @@ steps: - | set -e echo "Updating GitOps for nxtgauge-frontend-solid" - git clone https://github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops + git clone https://x-access-token:${GITHUB_TOKEN}@github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops cd /tmp/gitops git checkout main FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" diff --git a/frontend.log b/frontend.log index 2f23e05..2155733 100644 --- a/frontend.log +++ b/frontend.log @@ -140,3 +140,5 @@ vinxi starting dev server 2:32:20 PM [vite] (client) page reload .woodpecker.yml 2:33:52 PM [vite] (ssr) page reload .woodpecker.yml 2:33:52 PM [vite] (client) page reload .woodpecker.yml +6:27:51 PM [vite] (ssr) page reload .woodpecker.yml +6:27:51 PM [vite] (client) page reload .woodpecker.yml From 8333339342d2217d214480bcf06e0b0a4272f215 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 18:30:50 +0200 Subject: [PATCH 014/139] fix: use GITOPS_REPO_URL secret for git clone --- .woodpecker.yml | 5 ++++- frontend.log | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 523d43e..a0f75d2 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -26,11 +26,14 @@ steps: - name: update-gitops image: alpine/git:latest + environment: + GITOPS_REPO_URL: + from_secret: GITOPS_REPO_URL commands: - | set -e echo "Updating GitOps for nxtgauge-frontend-solid" - git clone https://x-access-token:${GITHUB_TOKEN}@github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops + git clone ${GITOPS_REPO_URL} /tmp/gitops cd /tmp/gitops git checkout main FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" diff --git a/frontend.log b/frontend.log index 2155733..0694d9a 100644 --- a/frontend.log +++ b/frontend.log @@ -142,3 +142,7 @@ vinxi starting dev server 2:33:52 PM [vite] (client) page reload .woodpecker.yml 6:27:51 PM [vite] (ssr) page reload .woodpecker.yml 6:27:51 PM [vite] (client) page reload .woodpecker.yml +6:30:24 PM [vite] (ssr) page reload .woodpecker.yml +6:30:24 PM [vite] (client) page reload .woodpecker.yml +6:30:45 PM [vite] (ssr) page reload .woodpecker.yml +6:30:45 PM [vite] (client) page reload .woodpecker.yml From b5afe10594c5dd8c262412af9cf106db011118b3 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 18:31:56 +0200 Subject: [PATCH 015/139] fix: use GHCR_TOKEN/GHCR_USERNAME for gitops push --- .woodpecker.yml | 8 +++++--- frontend.log | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index a0f75d2..6a765de 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -27,13 +27,15 @@ steps: - name: update-gitops image: alpine/git:latest environment: - GITOPS_REPO_URL: - from_secret: GITOPS_REPO_URL + GHCR_TOKEN: + from_secret: GHCR_TOKEN + GHCR_USERNAME: + from_secret: GHCR_USERNAME commands: - | set -e echo "Updating GitOps for nxtgauge-frontend-solid" - git clone ${GITOPS_REPO_URL} /tmp/gitops + git clone https://${GHCR_USERNAME}:${GHCR_TOKEN}@github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops cd /tmp/gitops git checkout main FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" diff --git a/frontend.log b/frontend.log index 0694d9a..593f4e4 100644 --- a/frontend.log +++ b/frontend.log @@ -146,3 +146,5 @@ vinxi starting dev server 6:30:24 PM [vite] (client) page reload .woodpecker.yml 6:30:45 PM [vite] (ssr) page reload .woodpecker.yml 6:30:45 PM [vite] (client) page reload .woodpecker.yml +6:31:49 PM [vite] (ssr) page reload .woodpecker.yml +6:31:49 PM [vite] (client) page reload .woodpecker.yml From 287be475982b46c741f6ac7759d076cd12046aec Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 18:44:10 +0200 Subject: [PATCH 016/139] fix: use GITOPS_REPO_URL with GHCR auth --- .woodpecker.yml | 4 +++- frontend.log | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 6a765de..fc43a11 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -31,11 +31,13 @@ steps: from_secret: GHCR_TOKEN GHCR_USERNAME: from_secret: GHCR_USERNAME + GITOPS_REPO_URL: + from_secret: GITOPS_REPO_URL commands: - | set -e echo "Updating GitOps for nxtgauge-frontend-solid" - git clone https://${GHCR_USERNAME}:${GHCR_TOKEN}@github.com/Traceworks2023/nxtgauge-gitops.git /tmp/gitops + git clone https://${GHCR_USERNAME}:${GHCR_TOKEN}@${GITOPS_REPO_URL} /tmp/gitops cd /tmp/gitops git checkout main FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" diff --git a/frontend.log b/frontend.log index 593f4e4..dcef0a5 100644 --- a/frontend.log +++ b/frontend.log @@ -148,3 +148,5 @@ vinxi starting dev server 6:30:45 PM [vite] (client) page reload .woodpecker.yml 6:31:49 PM [vite] (ssr) page reload .woodpecker.yml 6:31:49 PM [vite] (client) page reload .woodpecker.yml +6:44:02 PM [vite] (ssr) page reload .woodpecker.yml +6:44:02 PM [vite] (client) page reload .woodpecker.yml From b2856f49c12bf0f9f23c7a34a36e6b8c4148b3f1 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Tue, 14 Apr 2026 18:52:19 +0200 Subject: [PATCH 017/139] chore: remove gitops update step (handled server-side) --- .woodpecker.yml | 35 ----------------------------------- frontend.log | 2 ++ 2 files changed, 2 insertions(+), 35 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index fc43a11..45dbb75 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -23,38 +23,3 @@ steps: skip_tls_verify: true platforms: linux/amd64 cache: false - - - name: update-gitops - image: alpine/git:latest - environment: - GHCR_TOKEN: - from_secret: GHCR_TOKEN - GHCR_USERNAME: - from_secret: GHCR_USERNAME - GITOPS_REPO_URL: - from_secret: GITOPS_REPO_URL - commands: - - | - set -e - echo "Updating GitOps for nxtgauge-frontend-solid" - git clone https://${GHCR_USERNAME}:${GHCR_TOKEN}@${GITOPS_REPO_URL} /tmp/gitops - cd /tmp/gitops - git checkout main - FRONTEND_OVERLAY="apps/nxtgauge-frontend-solid/overlays/prod" - if [ -f "${FRONTEND_OVERLAY}/kustomization.yaml" ]; then - sed -i "s|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:.*|image: registry.nxtgauge.com:5000/nxtgauge-frontend-solid:${CI_COMMIT_SHA}|" \ - ${FRONTEND_OVERLAY}/kustomization.yaml - echo "Updated frontend image to ${CI_COMMIT_SHA}" - fi - if ! git diff --quiet; then - git config user.name "Woodpecker CI" - git config user.email "woodpecker@nxtgauge.com" - git add -A - git commit -m "ci: update nxtgauge-frontend-solid to ${CI_COMMIT_SHA:0:8}" - git push origin main - echo "Pushed GitOps update" - else - echo "No changes to push" - fi - when: - status: success diff --git a/frontend.log b/frontend.log index dcef0a5..bbce842 100644 --- a/frontend.log +++ b/frontend.log @@ -150,3 +150,5 @@ vinxi starting dev server 6:31:49 PM [vite] (client) page reload .woodpecker.yml 6:44:02 PM [vite] (ssr) page reload .woodpecker.yml 6:44:02 PM [vite] (client) page reload .woodpecker.yml +6:52:12 PM [vite] (ssr) page reload .woodpecker.yml +6:52:12 PM [vite] (client) page reload .woodpecker.yml From c2cbafc1592c9a765f50f2cd1afe15b51dddaca5 Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Wed, 15 Apr 2026 00:15:11 +0200 Subject: [PATCH 018/139] Wire external runtime preview mode and backend data in dashboard preview --- .../admin/DashboardDesignPreview.tsx | 102 +++++++++++-- src/routes/dashboard.tsx | 137 ++++++++++++++---- 2 files changed, 200 insertions(+), 39 deletions(-) diff --git a/src/components/admin/DashboardDesignPreview.tsx b/src/components/admin/DashboardDesignPreview.tsx index 2563df2..7597194 100644 --- a/src/components/admin/DashboardDesignPreview.tsx +++ b/src/components/admin/DashboardDesignPreview.tsx @@ -1376,10 +1376,18 @@ export default function DashboardDesignPreview(props: { const apiDelete = (path: string) => fetch(`${GW}${path}`, { method: 'DELETE', credentials: 'include' }).catch(() => null); - // Credits balance + // Credits / wallet const [creditsResource] = createResource( - () => (hasLive() ? livePrefix() : null), - (prefix) => apiFetch(`/api/${prefix}/wallet/balance`), + () => (hasLive() && isProfessionalRole() ? livePrefix() : null), + (prefix) => apiFetch(`/api/${prefix}/wallet/me`), + ); + const [walletLedgerResource] = createResource( + () => (hasLive() && isProfessionalRole() ? livePrefix() : null), + (prefix) => apiFetch(`/api/${prefix}/wallet/me/ledger?page=1&limit=50`), + ); + const [paymentHistoryResource] = createResource( + () => (hasLive() ? 'yes' : null), + () => apiFetch('/api/payments/history?page=1&limit=50'), ); // Marketplace requirements (professionals) const [marketplaceResource] = createResource( @@ -1402,7 +1410,9 @@ export default function DashboardDesignPreview(props: { const r = normalizeRoleKey(props.roleKey ?? ''); return hasLive() && (r === 'JOB_SEEKER' || r === 'COMPANY') ? r : null; }, - () => apiFetch('/api/jobs?limit=50'), + (role) => role === 'JOB_SEEKER' + ? apiFetch('/api/jobseeker/jobs?page=1&limit=50') + : apiFetch('/api/companies/jobs?page=1&limit=50'), ); // User profile (all roles) const [profileResource] = createResource( @@ -1603,7 +1613,70 @@ export default function DashboardDesignPreview(props: { // Sync resources ā†’ local signals createEffect(() => { const d = creditsResource(); - if (d != null && typeof d.balance === 'number') setLeadCredits(d.balance); + if (!d) return; + const nextBalance = Number( + d?.balance + ?? d?.tracecoins_balance + ?? d?.data?.balance + ?? d?.wallet?.balance + ?? 0 + ); + if (Number.isFinite(nextBalance) && nextBalance >= 0) setLeadCredits(nextBalance); + }); + createEffect(() => { + const paymentsPayload = paymentHistoryResource(); + const ledgerPayload = walletLedgerResource(); + const payments: any[] = Array.isArray(paymentsPayload?.payments) + ? paymentsPayload.payments + : Array.isArray(paymentsPayload?.data) + ? paymentsPayload.data + : []; + if (payments.length > 0) { + const rows: Array<[string, string, string, string, string, string]> = payments.map((item: any) => { + const statusRaw = String(item?.status || 'PENDING').toUpperCase(); + const status = statusRaw.includes('SUCCESS') + ? 'Completed' + : statusRaw.includes('FAIL') + ? 'Failed' + : 'Pending'; + const amount = Number(item?.amount_inr ?? item?.amount ?? 0); + const credits = Number(item?.tracecoins_credited ?? item?.credits ?? 0); + const when = item?.created_at + ? new Date(item.created_at).toLocaleDateString('en-US', { month: 'short', day: '2-digit', year: 'numeric' }) + : '--'; + return [ + String(item?.id || item?.invoice_no || `#INV-${Date.now()}`), + String(item?.package_name || item?.package || 'Tracecoin Purchase'), + String(Math.round(credits || 0).toLocaleString('en-IN')), + `ā‚¹${Math.round(amount || 0).toLocaleString('en-IN')}`, + status, + when, + ]; + }); + if (rows.length) setTxRows(rows); + return; + } + const ledger: any[] = Array.isArray(ledgerPayload?.data) + ? ledgerPayload.data + : Array.isArray(ledgerPayload) + ? ledgerPayload + : []; + if (!ledger.length) return; + const rows: Array<[string, string, string, string, string, string]> = ledger.map((item: any) => { + const amount = Number(item?.amount ?? 0); + const when = item?.created_at + ? new Date(item.created_at).toLocaleDateString('en-US', { month: 'short', day: '2-digit', year: 'numeric' }) + : '--'; + return [ + String(item?.id || item?.reference_id || `#TX-${Date.now()}`), + String(item?.reason || item?.type || 'Ledger Entry'), + `${amount >= 0 ? '+' : ''}${Math.round(amount).toLocaleString('en-IN')}`, + 'ā‚¹0', + amount >= 0 ? 'Completed' : 'Pending', + when, + ]; + }); + if (rows.length) setTxRows(rows); }); createEffect(() => { const d = marketplaceResource(); @@ -1621,11 +1694,11 @@ export default function DashboardDesignPreview(props: { : 'TBD', urgency: item.urgency === 'HIGH' ? 'High' : item.urgency === 'MEDIUM' ? 'Medium' : 'Low', budget: item.budget_min != null - ? `ā‚¹${Math.round(item.budget_min / 100).toLocaleString('en-IN')} - ā‚¹${Math.round((item.budget_max ?? item.budget_min) / 100).toLocaleString('en-IN')}` + ? `ā‚¹${Math.round(item.budget_min).toLocaleString('en-IN')} - ā‚¹${Math.round((item.budget_max ?? item.budget_min)).toLocaleString('en-IN')}` : 'ā‚¹0', - budgetValue: Number(item.budget_max ?? item.budget_min ?? 0) / 100, + budgetValue: Number(item.budget_max ?? item.budget_min ?? 0), priceRange: item.budget_min != null - ? `ā‚¹${Math.round(item.budget_min / 100).toLocaleString('en-IN')} - ā‚¹${Math.round((item.budget_max ?? item.budget_min) / 100).toLocaleString('en-IN')}` + ? `ā‚¹${Math.round(item.budget_min).toLocaleString('en-IN')} - ā‚¹${Math.round((item.budget_max ?? item.budget_min)).toLocaleString('en-IN')}` : 'ā‚¹0', cost: 25, status: 'open' as const, @@ -1671,10 +1744,10 @@ export default function DashboardDesignPreview(props: { summary: String(item.description ?? ''), category: String(item.category ?? item.profession_key ?? ''), amount: item.budget_min != null - ? `ā‚¹${Math.round(item.budget_min / 100).toLocaleString('en-IN')}` + ? `ā‚¹${Math.round(item.budget_min).toLocaleString('en-IN')}` : 'ā‚¹0', budget: item.budget_min != null - ? `ā‚¹${Math.round(item.budget_min / 100).toLocaleString('en-IN')} - ā‚¹${Math.round((item.budget_max ?? item.budget_min) / 100).toLocaleString('en-IN')}` + ? `ā‚¹${Math.round(item.budget_min).toLocaleString('en-IN')} - ā‚¹${Math.round((item.budget_max ?? item.budget_min)).toLocaleString('en-IN')}` : 'ā‚¹0', location: String(item.location ?? 'India'), submission: item.created_at @@ -1696,10 +1769,12 @@ export default function DashboardDesignPreview(props: { company: String(item.company_name ?? item.company ?? 'Company'), location: String(item.location ?? 'India'), salary: item.salary_min != null - ? `ā‚¹${Math.round(item.salary_min / 100).toLocaleString('en-IN')}+` + ? item.salary_max != null + ? `ā‚¹${Math.round(item.salary_min).toLocaleString('en-IN')} - ā‚¹${Math.round(item.salary_max).toLocaleString('en-IN')}` + : `ā‚¹${Math.round(item.salary_min).toLocaleString('en-IN')}` : 'Negotiable', - exp: String(item.experience_required ?? item.experience ?? '0-2 yrs'), - type: String(item.employment_type ?? item.type ?? 'Full-Time'), + exp: String(item.experience_required ?? item.experience_years ?? item.experience ?? '0-2 yrs'), + type: String(item.employment_type ?? item.job_type ?? item.type ?? 'Full-Time'), tags: Array.isArray(item.tags) ? item.tags : [], match: '', posted: item.created_at @@ -1804,6 +1879,7 @@ export default function DashboardDesignPreview(props: { setTimeout(() => setPortfolioApprovalState('IN_REVIEW'), 250); }; createEffect(() => { + if (hasLive()) return; const roleKey = normalizeRoleKey(props.roleKey || ''); const spec = portfolioSpecForRole(roleKey); setPortfolioSpecialties(spec.specialties.slice(0, 6)); diff --git a/src/routes/dashboard.tsx b/src/routes/dashboard.tsx index d1db04e..84a0cb8 100644 --- a/src/routes/dashboard.tsx +++ b/src/routes/dashboard.tsx @@ -73,6 +73,7 @@ type RuntimeBundle = { fields: string[]; verificationStatus?: string; source: "dashboard-config"; + renderMode?: "preview"; }; const API_GATEWAY = "/api/gateway"; @@ -337,6 +338,32 @@ function normalizeRole(value: string): RoleKey { return (ROLE_OPTIONS.find((r) => r === up) || "JOB_SEEKER") as RoleKey; } +function normalizeSidebarKey(value: string): string { + const key = String(value || "").trim().toLowerCase(); + if (!key) return "my dashboard"; + if (key === "my dashboard" || key === "dashboard") return "my dashboard"; + if (key === "my profile" || key === "profile") return "my profile"; + if (key === "my portfolio" || key === "portfolio") return "my portfolio"; + if (key === "lead" || key === "leads") return "leads"; + if (key === "my response" || key === "responses" || key === "response") return "my responses"; + if (key === "credit" || key === "credits") return "credits"; + if (key.includes("explore")) return "explore nxtgauge"; + if (key === "verification" || key === "verify") return "verification"; + if (key === "help centre" || key === "support" || key === "help") return "help center"; + if (key === "setting" || key === "settings") return "settings"; + if (key === "switch service" || key === "switch role" || key === "switch roles" || key === "switch services") return "switch services"; + if (key === "logout" || key === "log out" || key === "sign out") return "logout"; + if (key === "job" || key === "jobs") return "jobs"; + if (key === "application" || key === "applications" || key === "job applications") return "applications"; + if (key === "shortlisted candidate" || key === "shortlisted candidates") return "shortlisted candidates"; + if (key === "requirement" || key === "requirements" || key === "my requirement" || key === "my requirements") return "my requirements"; + if (key === "received response" || key === "received responses") return "received responses"; + if (key === "shortlisted response" || key === "shortlisted responses") return "shortlisted responses"; + if (key === "my application" || key === "my applications") return "my applications"; + if (key === "saved job" || key === "saved jobs") return "saved jobs"; + return key; +} + function asStringArray(value: unknown): string[] { if (!Array.isArray(value)) return []; return value.map((item) => String(item || "").trim()).filter(Boolean); @@ -350,6 +377,8 @@ function getInitialRoleFromStorage(): RoleKey { const raw = window.localStorage.getItem(key) || window.sessionStorage.getItem(key); if (!raw) continue; const parsed = JSON.parse(raw); + const preferred = normalizeRole(String(parsed?.selectedProfessionalRole || "")); + if (ROLE_OPTIONS.includes(preferred) && preferred !== "JOB_SEEKER") return preferred; const found = normalizeRole( String( parsed?.roleKey || @@ -368,6 +397,19 @@ function getInitialRoleFromStorage(): RoleKey { return "JOB_SEEKER"; } +function resolveRoleForDashboard(rawRole: string | null | undefined): RoleKey { + const raw = String(rawRole || "").trim(); + if (raw) { + return normalizeRole(raw); + } + const normalized = normalizeRole(raw); + const preferred = getInitialRoleFromStorage(); + if (preferred !== "JOB_SEEKER") { + return preferred; + } + return normalized; +} + async function fetchJson(path: string): Promise { try { const isServer = typeof window === "undefined"; @@ -387,6 +429,9 @@ async function loadRoleBundle(role: RoleKey): Promise { const runtime = await fetchJson("/api/runtime-config"); if (runtime) { const runtimeRole = normalizeRole(String(runtime?.role || runtime?.user?.active_role || role)); + const runtimeRenderMode = String( + runtime?.dashboard_config?.render_mode ?? runtime?.render_mode ?? "" + ).toLowerCase(); const runtimeSidebar = asStringArray( runtime?.dashboard_config?.sidebar_items ?? runtime?.dashboard_config?.sidebarItems ?? @@ -418,6 +463,7 @@ async function loadRoleBundle(role: RoleKey): Promise { runtime?.verification_status || runtime?.user?.verification_status || "" ).toUpperCase() || undefined, source: "dashboard-config", + renderMode: runtimeRenderMode === "preview" ? "preview" : undefined, }; } @@ -449,6 +495,7 @@ async function loadRoleBundle(role: RoleKey): Promise { ) .filter(Boolean); const fields = asStringArray((config as any)?.fields); + const configRenderMode = String((config as any)?.render_mode || "").toLowerCase(); return { role, status: payload?.is_active === false ? "INACTIVE" : "ACTIVE", @@ -457,6 +504,7 @@ async function loadRoleBundle(role: RoleKey): Promise { widgets, fields, source: "dashboard-config", + renderMode: configRenderMode === "preview" ? "preview" : undefined, }; } @@ -472,13 +520,46 @@ function mergeSidebar( "Logout", ]; const fromRuntime = runtimeSidebar.filter(Boolean); - const source = fromRuntime.length > 0 ? fromRuntime : base; const map = new Map(); - for (const item of source) { + for (const item of [...fromRuntime, ...base]) { const key = item.trim().toLowerCase(); if (!map.has(key)) map.set(key, item); } let merged = Array.from(map.values()); + + const persona: "PROFESSIONAL" | "COMPANY" | "JOB_SEEKER" | "CUSTOMER" = + role === "COMPANY" + ? "COMPANY" + : role === "CUSTOMER" + ? "CUSTOMER" + : role === "JOB_SEEKER" + ? "JOB_SEEKER" + : "PROFESSIONAL"; + + if (persona === "JOB_SEEKER") { + merged = merged.filter((item) => normalizeSidebarKey(item) !== "credits"); + } + + const hasExplore = merged.some((item) => normalizeSidebarKey(item) === "explore nxtgauge"); + if (!hasExplore) { + const verificationIdx = merged.findIndex( + (item) => normalizeSidebarKey(item) === "verification" + ); + if (verificationIdx >= 0) merged.splice(verificationIdx, 0, "Explore Nxtgauge"); + else merged.push("Explore Nxtgauge"); + } + + const hasPortfolio = merged.some((item) => normalizeSidebarKey(item) === "my portfolio"); + if (persona === "PROFESSIONAL" || persona === "JOB_SEEKER") { + if (!hasPortfolio) { + const profileIdx = merged.findIndex((item) => normalizeSidebarKey(item) === "my profile"); + if (profileIdx >= 0) merged.splice(profileIdx + 1, 0, "My Portfolio"); + else merged.push("My Portfolio"); + } + } else if (hasPortfolio) { + merged = merged.filter((item) => normalizeSidebarKey(item) !== "my portfolio"); + } + const status = String(verificationStatus || "").toUpperCase(); const approved = status === "APPROVED"; if (!approved && status) { @@ -516,7 +597,7 @@ export default function RuntimeDashboardPage() { const u = auth.user()!; if (u.full_name) setUserName(u.full_name); if (u.id) setUserId(u.id); - if (u.active_role) setRole(normalizeRole(u.active_role)); + if (u.active_role) setRole(resolveRoleForDashboard(u.active_role)); } }); @@ -525,11 +606,12 @@ export default function RuntimeDashboardPage() { if (u) { if (u.full_name && userName() === "User") setUserName(u.full_name); if (u.id && !userId()) setUserId(u.id); - if (u.active_role) setRole(normalizeRole(u.active_role)); + if (u.active_role) setRole(resolveRoleForDashboard(u.active_role)); } }); const [bundle] = createResource(() => role(), loadRoleBundle); + const activeSidebarKey = createMemo(() => normalizeSidebarKey(activeSidebar())); const sidebarItems = createMemo(() => mergeSidebar(role(), bundle()?.sidebarItems || [], bundle()?.verificationStatus) @@ -567,8 +649,11 @@ export default function RuntimeDashboardPage() { return { userName: userName(), userId: userId(), rolePrefix: prefix }; }); + const forcePreviewFromConfig = createMemo(() => bundle()?.renderMode === "preview"); + const isRealPage = createMemo(() => { - const key = activeSidebar().toLowerCase(); + if (forcePreviewFromConfig()) return false; + const key = activeSidebarKey(); if (BASE_REAL_PAGES.includes(key)) return true; if (COMMON_REAL_PAGES.includes(key)) return true; if (role() === "COMPANY" && COMPANY_REAL_PAGES.includes(key)) return true; @@ -596,66 +681,66 @@ export default function RuntimeDashboardPage() { userName={userName()} > - + - + - + - + - + - + - + - + - + - + - + @@ -663,29 +748,29 @@ export default function RuntimeDashboardPage() { - + @@ -693,7 +778,7 @@ export default function RuntimeDashboardPage() { From 5922b98c931f1d122b8d288c25626ce62b097a9c Mon Sep 17 00:00:00 2001 From: Tracewebstudio Dev Date: Wed, 15 Apr 2026 06:23:28 +0200 Subject: [PATCH 019/139] fix: update forms to match DB schema - first_name/last_name, role keys --- frontend-solid.dev.log | 0 frontend-solid.dev.pid | 1 + .../dashboard/CustomerRequirementsPage.tsx | 32 +- src/components/dashboard/PortfolioPage.tsx | 415 +++++++------ src/components/dashboard/ProfilePage.tsx | 558 +++++++++++------- src/lib/auth.tsx | 40 +- src/routes/api/gateway/[...path].ts | 6 +- src/routes/contact.tsx | 297 +++++++--- src/routes/dashboard/index.tsx | 1 + src/routes/login.tsx | 147 ++++- src/routes/signup.tsx | 477 ++++++++++----- vite.config.ts | 24 +- 12 files changed, 1348 insertions(+), 650 deletions(-) create mode 100644 frontend-solid.dev.log create mode 100644 frontend-solid.dev.pid create mode 100644 src/routes/dashboard/index.tsx diff --git a/frontend-solid.dev.log b/frontend-solid.dev.log new file mode 100644 index 0000000..e69de29 diff --git a/frontend-solid.dev.pid b/frontend-solid.dev.pid new file mode 100644 index 0000000..3813b54 --- /dev/null +++ b/frontend-solid.dev.pid @@ -0,0 +1 @@ +7995 diff --git a/src/components/dashboard/CustomerRequirementsPage.tsx b/src/components/dashboard/CustomerRequirementsPage.tsx index 7def79c..0891cad 100644 --- a/src/components/dashboard/CustomerRequirementsPage.tsx +++ b/src/components/dashboard/CustomerRequirementsPage.tsx @@ -16,10 +16,9 @@ type RequirementItem = { title: string; description?: string | null; status?: string; - budget_min?: number | null; - budget_max?: number | null; + budget_inr?: number | null; area?: string | null; - city?: string | null; + location?: string | null; created_at?: string; }; @@ -44,7 +43,7 @@ export default function CustomerRequirementsPage() { budget_min: "", budget_max: "", area: "", - city: "", + location: "", }); const loadRequirements = async () => { @@ -79,10 +78,12 @@ export default function CustomerRequirementsPage() { const payload = { title: form().title.trim(), description: form().description.trim() || undefined, - budget_min: form().budget_min ? Number(form().budget_min) : undefined, - budget_max: form().budget_max ? Number(form().budget_max) : undefined, + budget_inr: + form().budget_min || form().budget_max + ? Number(form().budget_min) || Number(form().budget_max) + : undefined, area: form().area.trim() || undefined, - city: form().city.trim() || undefined, + location: form().city.trim() || undefined, }; const res = await apiFetch("/api/customers/requirements", { method: "POST", @@ -94,7 +95,14 @@ export default function CustomerRequirementsPage() { return; } setMsg("Requirement created."); - setForm({ title: "", description: "", budget_min: "", budget_max: "", area: "", city: "" }); + setForm({ + title: "", + description: "", + budget_min: "", + budget_max: "", + area: "", + location: "", + }); await loadRequirements(); } catch { setErr("Network error while creating requirement."); @@ -193,10 +201,10 @@ export default function CustomerRequirementsPage() { />
- + setField("city", e.currentTarget.value)} + value={form().location} + onInput={(e) => setField("location", e.currentTarget.value)} style={INPUT} placeholder="Chennai" /> @@ -303,7 +311,7 @@ export default function CustomerRequirementsPage() { {row.title}

- {row.city || "ā€”"} {row.area ? `ā€¢ ${row.area}` : ""}{" "} + {row.location || row.city || "ā€”"} {row.area ? `ā€¢ ${row.area}` : ""}{" "} {row.created_at ? `ā€¢ ${new Date(row.created_at).toLocaleString("en-IN")}` : ""} diff --git a/src/components/dashboard/PortfolioPage.tsx b/src/components/dashboard/PortfolioPage.tsx index cca9567..d15c691 100644 --- a/src/components/dashboard/PortfolioPage.tsx +++ b/src/components/dashboard/PortfolioPage.tsx @@ -57,6 +57,26 @@ const EMPTY_JOB_SEEKER_FORM: JobSeekerPortfolioState = { skills: '', }; const JOB_SEEKER_FALLBACK_TABS = ['About', 'Education', 'Work Experience', 'Skills']; +const PROFESSIONAL_PORTFOLIO_TABS: Record = { + DEVELOPER: ['About', 'Services & Pricing', 'Projects', 'Tech Stack & Experience', 'Testimonials', 'FAQs'], + default: ['About', 'Services & Pricing', 'Projects', 'Experience', 'Testimonials', 'FAQs'], +}; + +type ProfessionalPortfolioState = { + about: string; + services: string; + experience: string; + testimonials: string; + faqs: string; +}; + +const EMPTY_PROFESSIONAL_FORM: ProfessionalPortfolioState = { + about: '', + services: '', + experience: '', + testimonials: '', + faqs: '', +}; // ā”€ā”€ Helpers ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ @@ -95,6 +115,9 @@ export default function PortfolioPage(props: Props) { const [jobSeekerSaving, setJobSeekerSaving] = createSignal(false); const [jobSeekerMsg, setJobSeekerMsg] = createSignal(''); const [jobSeekerErr, setJobSeekerErr] = createSignal(''); + const [professionalTab, setProfessionalTab] = createSignal('About'); + const [professionalForm, setProfessionalForm] = createSignal({ ...EMPTY_PROFESSIONAL_FORM }); + const [professionalMsg, setProfessionalMsg] = createSignal(''); const loadItems = async () => { if (!isProfessional()) { setLoading(false); return; } @@ -196,6 +219,54 @@ export default function PortfolioPage(props: Props) { return grouped; }; + const professionalTabs = () => { + const runtimeRaw = Array.isArray(props.runtimeTabs) ? props.runtimeTabs : []; + const fromRuntime = runtimeRaw + .map((tab) => toLabel(tab)) + .filter(Boolean) + .map((tab) => { + const t = normalizeToken(tab); + if (t.includes('about') || t.includes('overview') || t.includes('profile')) return 'About'; + if (t.includes('service') || t.includes('pricing') || t.includes('package')) return 'Services & Pricing'; + if (t.includes('project') || t.includes('portfolio') || t.includes('gallery') || t.includes('showreel')) return 'Projects'; + if (t.includes('stack') || t.includes('experience') || t.includes('qualification') || t.includes('tool')) return props.roleKey === 'DEVELOPER' ? 'Tech Stack & Experience' : 'Experience'; + if (t.includes('testimonial') || t.includes('review')) return 'Testimonials'; + if (t.includes('faq') || t.includes('question')) return 'FAQs'; + return ''; + }) + .filter(Boolean); + const uniqueRuntime = Array.from(new Set(fromRuntime)); + if (uniqueRuntime.length >= 3) return uniqueRuntime; + return PROFESSIONAL_PORTFOLIO_TABS[props.roleKey] || PROFESSIONAL_PORTFOLIO_TABS.default; + }; + + const professionalFormStorageKey = () => `nxtgauge_portfolio_meta_${String(props.roleKey || 'professional').toLowerCase()}`; + const loadProfessionalForm = () => { + if (typeof window === 'undefined') return; + try { + const raw = window.localStorage.getItem(professionalFormStorageKey()); + if (!raw) return; + const parsed = JSON.parse(raw) as Partial; + setProfessionalForm({ + about: String(parsed?.about || ''), + services: String(parsed?.services || ''), + experience: String(parsed?.experience || ''), + testimonials: String(parsed?.testimonials || ''), + faqs: String(parsed?.faqs || ''), + }); + } catch { + // Ignore malformed local storage payloads. + } + }; + + const saveProfessionalForm = () => { + if (typeof window !== 'undefined') { + window.localStorage.setItem(professionalFormStorageKey(), JSON.stringify(professionalForm())); + } + setProfessionalMsg('Portfolio section saved.'); + window.setTimeout(() => setProfessionalMsg(''), 1800); + }; + onMount(() => { if (isJobSeeker()) { loadJobSeekerPortfolio(); @@ -204,6 +275,11 @@ export default function PortfolioPage(props: Props) { setLoading(false); return; } + if (isProfessional()) { + const tabs = professionalTabs(); + setProfessionalTab(tabs[0] || 'About'); + loadProfessionalForm(); + } void loadItems(); }); @@ -418,195 +494,184 @@ export default function PortfolioPage(props: Props) { ); } + const isProjectsTab = () => { + const key = normalizeToken(professionalTab()); + return key.includes('project') || key.includes('portfolio') || key.includes('gallery') || key.includes('showreel'); + }; + + const isServicesTab = () => { + const key = normalizeToken(professionalTab()); + return key.includes('service') || key.includes('pricing') || key.includes('package'); + }; + + const isTestimonialsTab = () => normalizeToken(professionalTab()).includes('testimonial'); + const isFaqTab = () => normalizeToken(professionalTab()).includes('faq'); + const sectionFieldKey = () => { + if (isServicesTab()) return 'services' as const; + if (isTestimonialsTab()) return 'testimonials' as const; + if (isFaqTab()) return 'faqs' as const; + const key = normalizeToken(professionalTab()); + if (key.includes('experience') || key.includes('stack') || key.includes('tool') || key.includes('qualification')) return 'experience' as const; + return 'about' as const; + }; + + const sectionPlaceholder = () => { + if (isServicesTab()) return 'List your plans, pricing slabs, and deliverables...'; + if (isTestimonialsTab()) return 'Add client quotes and project outcomes...'; + if (isFaqTab()) return 'Add common questions and answers...'; + if (sectionFieldKey() === 'experience') return 'Share stack, years of experience, and toolchain...'; + return 'Write a short summary about your profile and strengths...'; + }; + return (

- - {/* ā”€ā”€ Header ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ */} -
-
-

My Portfolio

-

- Showcase your work to attract clients. -

+
+
+ + {(tab) => ( + + )} + +
+
+
+

My Portfolio

+

+ Runtime-config driven tab layout aligned with external dashboard preview. +

+
+ + +
-
- {/* ā”€ā”€ Create / Edit form ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ā”€ */} - -
-

- {editId() ? 'Edit Portfolio Item' : 'New Portfolio Item'} -

- -
-
- - setField('title', e.currentTarget.value)} - style={INPUT} - /> -
-
- + + +
+ {professionalMsg()} +
+ +

{professionalTab()}

+
+