the cleanup

app/(app)/(builder)/builder/page.tsx

@@ -75,7 +75,7 @@ const isUuid = (v: string) =>
   );
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 const STORAGE_KEY = "gunbuilder-build-state";
 

app/(app)/(builder)/parts/p/[platform]/[partRole]/[productSlug]/page.tsx

@@ -49,7 +49,7 @@ type GunbuilderProductFromApi = {
 type BuildState = Partial<Record<BuilderSlotKey, string>>;
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 const STORAGE_KEY = "gunbuilder-build-state";
 

app/(app)/vault/page.tsx

@@ -19,7 +19,7 @@ type BuildDto = {
 };
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 // UUID validator (defensive)
 const isUuid = (v: string) =>

app/admin/beta-invites/page.tsx

@@ -5,7 +5,7 @@ import { Button, Field, Input } from "@/components/ui/form";
 import { useAuth } from "@/context/AuthContext";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 type AdminBetaRequestDto = {
   id: number;

app/admin/classification/reconcile/page.tsx

@@ -38,7 +38,7 @@ const DEFAULT_PLATFORM = "AR-15";
 
 // Update these if your admin mapping UI lives elsewhere.
 const MAPPING_UI_PATH = "/admin/mapping"; // <- change if needed
-const API_BASE = process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+const API_BASE = process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 const url = `${API_BASE}/admin/classification/reconcile?dryRun=true&limit=500&platform=AR-15&merchantId=4`;
 
@@ -80,7 +80,7 @@ export default function AdminClassificationReconcilePage() {
       if (merchantId?.trim()) params.set("merchantId", merchantId.trim());
       if (includeLocked) params.set("includeLocked", "true");
   
-      const API_BASE = process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+      const API_BASE = process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
       const url = `${API_BASE}/admin/classification/reconcile?${params.toString()}`;
   
       const res = await fetch(url, {

app/admin/enrichment/EnrichmentQueueClient.tsx

@@ -29,7 +29,7 @@ type QueueItem = {
 };
 
 const API_BASE =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 function getAuthHeaders(): HeadersInit {
   if (typeof window === "undefined") return {};

app/admin/import-status/page.tsx

@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import Link from "next/link";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 const formatCount = (value: number | null | undefined) =>
   (typeof value === "number" ? value : 0).toLocaleString();

app/admin/mapping/page.tsx

@@ -4,7 +4,7 @@ import { useEffect, useMemo, useState } from "react";
 import { useSearchParams, useRouter } from "next/navigation";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 /**
  * Tabs:

app/admin/merchants/page.tsx

@@ -3,7 +3,7 @@
 import { useEffect, useState } from "react";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 type MerchantAdminDto = {
   id: number;

app/admin/page.tsx

@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
 import Link from "next/link";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 type AdminOverview = {
   totalProducts: number;

app/admin/products/_lib/auth.ts

@@ -1,5 +1,5 @@
 export const API_BASE =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 export function getCookie(name: string): string | null {
   if (typeof document === "undefined") return null;

app/admin/users/page.tsx

@@ -7,7 +7,7 @@ import { Loader2 } from "lucide-react";
 import type { AdminUser, UserRole } from "@/types/user";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 export default function AdminUsersPage() {
   const { getAuthHeaders } = useAuth();

app/api/admin/beta-invites/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from "next/server";
 import { cookies } from "next/headers";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 // POST /api/admin/beta-invites?dryRun=true&limit=10&tokenMinutes=30
 export async function POST(req: Request) {

app/api/beta-signup/route.ts

@@ -2,7 +2,7 @@
 import { NextResponse } from "next/server";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 const TOS_VERSION = "2025-12-27";
 

app/api/users/me/password/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 export async function POST(req: Request) {
   const body = await req.text().catch(() => "");

app/api/users/me/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 function passthroughHeaders(req: Request) {
   const h = new Headers();

app/api/users/me/username-available/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 export async function GET(req: Request) {
   const url = new URL(req.url);

app/api/v1/admin/merchants/[id]/route.ts

@@ -0,0 +1,18 @@
+import { springProxy } from "@/lib/springProxy";
+import type {
+    MerchantAdminResponse,
+    MerchantAdminUpdateRequest,
+} from "@/types/merchant-admin";
+
+export async function PUT(
+    req: Request,
+    { params }: { params: { id: string } }
+) {
+    const body = (await req.json()) as MerchantAdminUpdateRequest;
+
+    return springProxy<MerchantAdminResponse, MerchantAdminUpdateRequest>(
+        req,
+        `/api/v1/admin/merchants/${params.id}`,
+        { method: "PUT", body }
+    );
+}

app/api/v1/admin/merchants/route.ts

@@ -0,0 +1,19 @@
+import { springProxy } from "@/lib/springProxy";
+import type {
+    MerchantAdminCreateRequest,
+    MerchantAdminResponse,
+} from "@/types/merchant-admin";
+
+export async function GET(req: Request) {
+    return springProxy<MerchantAdminResponse[]>(req, "/api/v1/admin/merchants");
+}
+
+export async function POST(req: Request) {
+    const body = (await req.json()) as MerchantAdminCreateRequest;
+
+    return springProxy<MerchantAdminResponse, MerchantAdminCreateRequest>(
+        req,
+        "/api/v1/admin/merchants",
+        { method: "POST", body }
+    );
+}

app/beta/confirm/page.tsx

@@ -6,7 +6,7 @@ import { useRouter, useSearchParams } from "next/navigation";
 import { useAuth } from "@/context/AuthContext";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 function BetaConfirmPageContent() {
   const params = useSearchParams();

app/beta/magic/page.tsx

@@ -27,7 +27,7 @@ function BetaMagicPageContent() {
 
     (async () => {
       try {
-        const res = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080"}/api/auth/magic/exchange`, {
+        const res = await fetch(`${process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://battlbuilder-api:8080"}/api/auth/magic/exchange`, {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify({ token }),

app/builds/[buildId]/page.tsx

@@ -3,7 +3,7 @@ import Link from "next/link";
 import { notFound } from "next/navigation";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 function formatMoney(n?: number | null) {
   if (n == null) return "—";

app/builds/page.tsx

@@ -57,7 +57,7 @@ type BuildFeedCardDto = {
 };
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 // --- UI Filter Sets (keep; we’ll generate options from data too) ---
 const CLASS_FILTERS: (BuildClass | "all")[] = ["all", "Rifle", "Pistol", "NFA"];

app/login/page.tsx

@@ -8,7 +8,7 @@ import { useAuth } from "@/context/AuthContext";
 import { Button, Field, Input } from "@/components/ui/form";
 
 const API_BASE_URL =
-  process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
+  process.env.NEXT_PUBLIC_API_BASE_URL ?? "";
 
 function LoginPageContent() {
   const router = useRouter();