lots of fixes. cant remember them all
This commit is contained in:
@@ -0,0 +1,482 @@
|
||||
//
|
||||
// This page is most likely temporary. We probably do not need this page
|
||||
//
|
||||
//
|
||||
//
|
||||
|
||||
"use client";
|
||||
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { useSearchParams, useRouter } from "next/navigation";
|
||||
|
||||
import { CATEGORIES } from "@/data/gunbuilderParts";
|
||||
import type { CategoryId, Part } from "@/types/gunbuilder";
|
||||
|
||||
import {
|
||||
Pencil,
|
||||
Link2,
|
||||
Square,
|
||||
CheckSquare,
|
||||
} from "lucide-react";
|
||||
|
||||
const API_BASE_URL =
|
||||
process.env.NEXT_PUBLIC_API_BASE_URL ?? "http://localhost:8080";
|
||||
|
||||
const STORAGE_KEY = "gunbuilder-build-state";
|
||||
|
||||
type BuildState = Partial<Record<CategoryId, string>>;
|
||||
|
||||
type GunbuilderProductFromApi = {
|
||||
id: number;
|
||||
name: string;
|
||||
brand: string;
|
||||
platform: string;
|
||||
partRole: string;
|
||||
price: number | null;
|
||||
imageUrl: string | null;
|
||||
buyUrl: string | null;
|
||||
};
|
||||
|
||||
const PLATFORMS = ["AR-15", "AR-10", "AR-9"] as const;
|
||||
|
||||
const UNIVERSAL_CATEGORIES = new Set<CategoryId>([
|
||||
"magazine",
|
||||
"weapon-light",
|
||||
"foregrip",
|
||||
"bipod",
|
||||
"sling",
|
||||
"rail-accessory",
|
||||
"tools",
|
||||
"optic",
|
||||
"sights",
|
||||
]);
|
||||
|
||||
const CATEGORY_GROUPS: {
|
||||
id: string;
|
||||
label: string;
|
||||
description?: string;
|
||||
categoryIds: CategoryId[];
|
||||
}[] = [
|
||||
{
|
||||
id: "lower-group",
|
||||
label: "Lower Receiver Parts",
|
||||
description:
|
||||
"Everything from the serialized lower to small parts, fire control, and core controls.",
|
||||
categoryIds: [
|
||||
"lower-receiver",
|
||||
"complete-lower",
|
||||
"lower-parts",
|
||||
"trigger",
|
||||
"grip",
|
||||
"safety",
|
||||
"buffer",
|
||||
"stock",
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "upper-group",
|
||||
label: "Upper Receiver Parts",
|
||||
description:
|
||||
"Barrel, upper, gas system, and the parts that keep the rifle cycling.",
|
||||
categoryIds: [
|
||||
"upper-receiver",
|
||||
"complete-upper",
|
||||
"bcg",
|
||||
"barrel",
|
||||
"gas-block",
|
||||
"gas-tube",
|
||||
"muzzle-device",
|
||||
"suppressor",
|
||||
"handguard",
|
||||
"charging-handle",
|
||||
"sights",
|
||||
"optic",
|
||||
],
|
||||
},
|
||||
{
|
||||
id: "accessories-group",
|
||||
label: "Accessories & Gear",
|
||||
description:
|
||||
"Universal add-ons that work across platforms — mags, lights, slings, tools, and more.",
|
||||
categoryIds: [
|
||||
"magazine",
|
||||
"weapon-light",
|
||||
"foregrip",
|
||||
"bipod",
|
||||
"sling",
|
||||
"rail-accessory",
|
||||
"tools",
|
||||
],
|
||||
},
|
||||
];
|
||||
|
||||
function isValidPlatform(
|
||||
value: string | null
|
||||
): value is (typeof PLATFORMS)[number] {
|
||||
return !!value && (PLATFORMS as readonly string[]).includes(value);
|
||||
}
|
||||
|
||||
function safeDecodeBuildParam(buildParam: string | null): BuildState | null {
|
||||
if (!buildParam) return null;
|
||||
|
||||
try {
|
||||
// build param is base64(json)
|
||||
const json = window.atob(buildParam);
|
||||
const parsed = JSON.parse(json) as BuildState;
|
||||
return parsed && typeof parsed === "object" ? parsed : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function formatPrice(n: number) {
|
||||
return `$${n.toFixed(2)}`;
|
||||
}
|
||||
|
||||
export default function BuildSummaryPage() {
|
||||
const searchParams = useSearchParams();
|
||||
const router = useRouter();
|
||||
|
||||
const qpPlatform = searchParams.get("platform");
|
||||
const platform = isValidPlatform(qpPlatform) ? qpPlatform : "AR-15";
|
||||
|
||||
const [build, setBuild] = useState<BuildState>({});
|
||||
const [parts, setParts] = useState<Part[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
// Load build from ?build=... OR localStorage
|
||||
useEffect(() => {
|
||||
if (typeof window === "undefined") return;
|
||||
|
||||
const buildParam = searchParams.get("build");
|
||||
const decoded = safeDecodeBuildParam(buildParam);
|
||||
|
||||
if (decoded) {
|
||||
setBuild(decoded);
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const stored = localStorage.getItem(STORAGE_KEY);
|
||||
setBuild(stored ? (JSON.parse(stored) as BuildState) : {});
|
||||
} catch {
|
||||
setBuild({});
|
||||
}
|
||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||
}, []);
|
||||
|
||||
// Fetch product data so we can resolve ids -> Part info
|
||||
useEffect(() => {
|
||||
const controller = new AbortController();
|
||||
|
||||
async function fetchProducts() {
|
||||
try {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
|
||||
// scoped (platform)
|
||||
const scopedUrl = `${API_BASE_URL}/api/products?platform=${encodeURIComponent(
|
||||
platform
|
||||
)}`;
|
||||
|
||||
// universal (optional)
|
||||
const universalUrl = `${API_BASE_URL}/api/products`;
|
||||
|
||||
const [scopedRes, universalRes] = await Promise.all([
|
||||
fetch(scopedUrl, { signal: controller.signal }),
|
||||
fetch(universalUrl, { signal: controller.signal }).catch(
|
||||
() => null as any
|
||||
),
|
||||
]);
|
||||
|
||||
if (!scopedRes || !scopedRes.ok) {
|
||||
throw new Error(`Failed to load products (${scopedRes?.status ?? ""})`);
|
||||
}
|
||||
|
||||
const scopedData: GunbuilderProductFromApi[] = await scopedRes.json();
|
||||
|
||||
let universalData: GunbuilderProductFromApi[] = [];
|
||||
if (universalRes && universalRes.ok) {
|
||||
universalData = await universalRes.json();
|
||||
}
|
||||
|
||||
// NOTE: We only need enough to render the summary.
|
||||
// We will map “everything we can” and ignore unknown categories.
|
||||
const toCategoryId = (rawRole: string): CategoryId | null => {
|
||||
const role = (rawRole ?? "").trim().toLowerCase().replace(/_/g, "-");
|
||||
|
||||
// quick defensive mapping (mirrors your builder page strategy)
|
||||
if (role.includes("complete-upper")) return "complete-upper";
|
||||
if (role.includes("complete-lower")) return "complete-lower";
|
||||
if (role === "upper-receiver" || role === "upper") return "upper-receiver";
|
||||
if (role === "lower-receiver" || role === "lower") return "lower-receiver";
|
||||
if (role.includes("charging")) return "charging-handle";
|
||||
if (role.includes("handguard")) return "handguard";
|
||||
if (role.includes("bcg") || role.includes("bolt-carrier")) return "bcg";
|
||||
if (role.includes("barrel")) return "barrel";
|
||||
if (role.includes("gas-block") || role.includes("gasblock")) return "gas-block";
|
||||
if (role.includes("gas-tube") || role.includes("gastube")) return "gas-tube";
|
||||
if (role.includes("muzzle") || role.includes("flash") || role.includes("brake") || role.includes("comp"))
|
||||
return "muzzle-device";
|
||||
if (role.includes("suppress")) return "suppressor";
|
||||
if (role.includes("lower-parts") || role.includes("lpk")) return "lower-parts";
|
||||
if (role.includes("trigger")) return "trigger";
|
||||
if (role.includes("grip")) return "grip";
|
||||
if (role.includes("safety")) return "safety";
|
||||
if (role.includes("buffer")) return "buffer";
|
||||
if (role.includes("stock")) return "stock";
|
||||
if (role.includes("optic") || role.includes("scope")) return "optic";
|
||||
if (role.includes("sight")) return "sights";
|
||||
if (role.includes("mag")) return "magazine";
|
||||
if (role.includes("weapon-light") || (role.includes("light") && !role.includes("flight")))
|
||||
return "weapon-light";
|
||||
if (role.includes("foregrip") || role.includes("grip-vertical")) return "foregrip";
|
||||
if (role.includes("bipod")) return "bipod";
|
||||
if (role.includes("sling")) return "sling";
|
||||
if (role.includes("rail-accessory") || role.includes("rail-attachment")) return "rail-accessory";
|
||||
if (role.includes("tool")) return "tools";
|
||||
|
||||
return null;
|
||||
};
|
||||
|
||||
const normalize = (data: GunbuilderProductFromApi[], isUniversal: boolean): Part[] =>
|
||||
data
|
||||
.map((p): Part | null => {
|
||||
const categoryId = toCategoryId(p.partRole);
|
||||
if (!categoryId) return null;
|
||||
|
||||
if (isUniversal && !UNIVERSAL_CATEGORIES.has(categoryId)) return null;
|
||||
|
||||
const buyUrl = p.buyUrl ?? undefined;
|
||||
|
||||
return {
|
||||
id: String(p.id),
|
||||
categoryId,
|
||||
name: p.name,
|
||||
brand: p.brand,
|
||||
price: p.price ?? 0,
|
||||
imageUrl: (p.imageUrl as any) ?? (p as any).mainImageUrl ?? undefined,
|
||||
affiliateUrl: buyUrl,
|
||||
url: buyUrl,
|
||||
notes: undefined,
|
||||
};
|
||||
})
|
||||
.filter((p): p is Part => p !== null);
|
||||
|
||||
const scopedParts = normalize(scopedData, false);
|
||||
const universalParts = normalize(universalData, true);
|
||||
|
||||
const seen = new Set<string>();
|
||||
const merged: Part[] = [];
|
||||
for (const p of [...scopedParts, ...universalParts]) {
|
||||
const key = `${p.categoryId}:${p.id}`;
|
||||
if (seen.has(key)) continue;
|
||||
seen.add(key);
|
||||
merged.push(p);
|
||||
}
|
||||
|
||||
setParts(merged);
|
||||
} catch (err: any) {
|
||||
if (err?.name === "AbortError") return;
|
||||
setError(err?.message ?? "Failed to load products");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}
|
||||
|
||||
fetchProducts();
|
||||
return () => controller.abort();
|
||||
}, [platform]);
|
||||
|
||||
const summaryCategoryOrder: CategoryId[] = useMemo(
|
||||
() =>
|
||||
CATEGORY_GROUPS.flatMap((g) => g.categoryIds).filter((id) =>
|
||||
CATEGORIES.some((c) => c.id === id)
|
||||
),
|
||||
[]
|
||||
);
|
||||
|
||||
const selectedParts = useMemo(() => {
|
||||
const out: { categoryId: CategoryId; part?: Part }[] = [];
|
||||
for (const cid of summaryCategoryOrder) {
|
||||
const partId = build[cid];
|
||||
const part = partId ? parts.find((p) => p.id === partId && p.categoryId === cid) : undefined;
|
||||
out.push({ categoryId: cid, part });
|
||||
}
|
||||
return out;
|
||||
}, [build, parts, summaryCategoryOrder]);
|
||||
|
||||
const total = useMemo(
|
||||
() => selectedParts.reduce((sum, row) => sum + (row.part?.price ?? 0), 0),
|
||||
[selectedParts]
|
||||
);
|
||||
|
||||
const filledCount = useMemo(
|
||||
() => selectedParts.filter((r) => !!r.part).length,
|
||||
[selectedParts]
|
||||
);
|
||||
|
||||
return (
|
||||
<main className="min-h-screen bg-black text-zinc-50">
|
||||
<div className="mx-auto max-w-6xl px-4 py-6 lg:py-10">
|
||||
{/* Header */}
|
||||
<header className="mb-6">
|
||||
<div className="flex items-start justify-between gap-4">
|
||||
<div>
|
||||
<p className="text-xs font-semibold tracking-[0.2em] uppercase text-zinc-500">
|
||||
BATTL BUILDERS
|
||||
</p>
|
||||
<h1 className="mt-1 text-2xl md:text-3xl font-semibold tracking-tight">
|
||||
Build <span className="text-amber-300">Summary</span>
|
||||
</h1>
|
||||
<p className="mt-2 text-sm text-zinc-400 max-w-2xl">
|
||||
Snapshot of your current selections. (V1: data resolves from your local build state + live products.)
|
||||
</p>
|
||||
<div className="mt-3 text-xs text-zinc-500">
|
||||
Platform: <span className="text-zinc-200 font-semibold">{platform}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col items-end gap-2">
|
||||
<div className="text-right">
|
||||
<div className="text-[10px] uppercase tracking-[0.16em] text-zinc-500">
|
||||
Total
|
||||
</div>
|
||||
<div className="text-2xl font-semibold text-amber-300">
|
||||
{formatPrice(total)}
|
||||
</div>
|
||||
<div className="text-xs text-zinc-500 mt-1">
|
||||
{filledCount} / {summaryCategoryOrder.length} selected
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="flex gap-2">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => {
|
||||
const qp = new URLSearchParams();
|
||||
qp.set("platform", platform);
|
||||
router.push(`/builder?${qp.toString()}`);
|
||||
}}
|
||||
className="rounded-md border border-zinc-700 bg-zinc-900/70 px-3 py-2 text-xs font-semibold text-zinc-200 hover:bg-zinc-800 hover:border-zinc-600 transition-colors"
|
||||
>
|
||||
Back to Builder
|
||||
</button>
|
||||
|
||||
<Link
|
||||
href={{ pathname: "/builder", query: platform ? { platform } : {} }}
|
||||
className="rounded-md bg-amber-400 px-3 py-2 text-xs font-semibold text-black hover:bg-amber-300 transition-colors"
|
||||
>
|
||||
Edit Build
|
||||
</Link>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</header>
|
||||
|
||||
{/* Body */}
|
||||
<section className="rounded-lg border border-zinc-800 bg-zinc-950/60 p-4 md:p-6">
|
||||
{loading ? (
|
||||
<p className="py-10 text-center text-sm text-zinc-500">Loading…</p>
|
||||
) : error ? (
|
||||
<p className="py-10 text-center text-sm text-red-400">
|
||||
{error} — check that the Ballistic API is running.
|
||||
</p>
|
||||
) : (
|
||||
<div className="space-y-4">
|
||||
{CATEGORY_GROUPS.map((group) => {
|
||||
const rows = group.categoryIds
|
||||
.filter((cid) => summaryCategoryOrder.includes(cid))
|
||||
.map((cid) => {
|
||||
const cat = CATEGORIES.find((c) => c.id === cid);
|
||||
const partId = build[cid];
|
||||
const part = partId
|
||||
? parts.find((p) => p.id === partId && p.categoryId === cid)
|
||||
: undefined;
|
||||
return { cid, cat, part };
|
||||
});
|
||||
|
||||
return (
|
||||
<div key={group.id} className="rounded-md border border-zinc-800 bg-zinc-950/80">
|
||||
<div className="border-b border-zinc-800 px-4 py-3">
|
||||
<div className="text-sm font-semibold text-zinc-100">{group.label}</div>
|
||||
{group.description && (
|
||||
<div className="mt-1 text-xs text-zinc-500">{group.description}</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="divide-y divide-zinc-900">
|
||||
{rows.map(({ cid, cat, part }) => (
|
||||
<div key={cid} className="flex items-start justify-between gap-4 px-4 py-3">
|
||||
<div className="min-w-0">
|
||||
<div className="text-xs font-semibold text-zinc-300">
|
||||
{cat?.name ?? cid}
|
||||
</div>
|
||||
{part ? (
|
||||
<div className="mt-1 text-sm text-zinc-100 truncate">
|
||||
<span className="text-zinc-400">{part.brand}</span>{" "}
|
||||
{part.name}
|
||||
</div>
|
||||
) : (
|
||||
<div className="mt-1 text-sm text-zinc-600">
|
||||
Not selected
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="shrink-0 text-right">
|
||||
<div className="text-xs text-zinc-500">Price</div>
|
||||
<div className={`text-sm font-semibold ${part ? "text-amber-300" : "text-zinc-600"}`}>
|
||||
{part ? formatPrice(part.price) : "—"}
|
||||
</div>
|
||||
|
||||
<div className="mt-2 flex justify-end gap-2">
|
||||
<Link
|
||||
href={{
|
||||
pathname: `/parts/p/${platform}/${cid}`,
|
||||
query: platform ? { platform } : {},
|
||||
}}
|
||||
className="inline-flex items-center justify-center rounded-md border border-zinc-700 bg-zinc-900/70 px-2.5 py-1.5 hover:bg-zinc-800 hover:border-zinc-600 transition-colors"
|
||||
title={part ? "Change part" : "Choose part"}
|
||||
aria-label={part ? "Change part" : "Choose part"}
|
||||
>
|
||||
<Pencil className="h-3.5 w-3.5 text-zinc-300" />
|
||||
</Link>
|
||||
|
||||
{part?.url ? (
|
||||
<a
|
||||
href={part.url}
|
||||
target="_blank"
|
||||
rel="noreferrer"
|
||||
className="inline-flex items-center justify-center rounded-md bg-amber-400 px-2.5 py-1.5 hover:bg-amber-300 transition-colors"
|
||||
title="Buy part"
|
||||
aria-label="Buy part"
|
||||
>
|
||||
<Link2 className="h-3.5 w-3.5 text-black" />
|
||||
</a>
|
||||
) : (
|
||||
<span className="inline-flex items-center justify-center rounded-md border border-zinc-800 bg-zinc-950 px-2.5 py-1.5 text-[11px] text-zinc-600">
|
||||
—
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
)}
|
||||
</section>
|
||||
|
||||
<div className="mt-4 text-center text-xs text-zinc-600">
|
||||
Tip: If you landed here from a shared link, it uses <code>?build=</code> first; otherwise it reads your local build.
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user