added Success page for submissions
This commit is contained in:
parent
e08891c94b
commit
9be0527a46
2 changed files with 192 additions and 192 deletions
72
app/api/submit/settings/success/page.tsx
Normal file
72
app/api/submit/settings/success/page.tsx
Normal file
|
|
@ -0,0 +1,72 @@
|
|||
// app/submit/settings/success/page.tsx
|
||||
"use client";
|
||||
|
||||
import Link from "next/link";
|
||||
import { useSearchParams } from "next/navigation";
|
||||
import { useMemo } from "react";
|
||||
|
||||
type Target =
|
||||
| "settings_fiber"
|
||||
| "settings_co2gan"
|
||||
| "settings_co2gal"
|
||||
| "settings_uv";
|
||||
|
||||
const TARGET_TO_LIST: Record<Target, string> = {
|
||||
settings_fiber: "/fiber-settings",
|
||||
settings_co2gan: "/co2-gantry-settings",
|
||||
settings_co2gal: "/co2-galvo-settings",
|
||||
settings_uv: "/uv-settings",
|
||||
};
|
||||
|
||||
const TARGET_LABEL: Record<Target, string> = {
|
||||
settings_fiber: "Fiber",
|
||||
settings_co2gan: "CO₂ Gantry",
|
||||
settings_co2gal: "CO₂ Galvo",
|
||||
settings_uv: "UV",
|
||||
};
|
||||
|
||||
export default function SuccessPage() {
|
||||
const sp = useSearchParams();
|
||||
const id = (sp.get("id") || "").trim();
|
||||
const target = (sp.get("target") || "settings_fiber") as Target;
|
||||
|
||||
const listHref = TARGET_TO_LIST[target] || "/projects";
|
||||
const targetLabel = TARGET_LABEL[target] || "Settings";
|
||||
|
||||
const title = useMemo(
|
||||
() => `Settings Submitted${id ? ` (#${id})` : ""}`,
|
||||
[id]
|
||||
);
|
||||
|
||||
return (
|
||||
<main className="max-w-2xl mx-auto py-10 px-4 space-y-6">
|
||||
<div className="space-y-2">
|
||||
<h1 className="text-2xl font-semibold">{title}</h1>
|
||||
<p className="text-sm text-muted-foreground">
|
||||
Your submission was received successfully.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div className="grid gap-3 sm:grid-cols-2">
|
||||
<Link
|
||||
className="inline-flex items-center justify-center rounded border px-3 py-2 hover:bg-muted"
|
||||
href={`/submit/settings?target=${encodeURIComponent(target)}`}
|
||||
>
|
||||
Submit Another ({targetLabel})
|
||||
</Link>
|
||||
<Link
|
||||
className="inline-flex items-center justify-center rounded border px-3 py-2 hover:bg-muted"
|
||||
href={listHref}
|
||||
>
|
||||
Go to {targetLabel} Database
|
||||
</Link>
|
||||
</div>
|
||||
|
||||
{id ? (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Reference ID: <span className="font-mono">{id}</span>
|
||||
</p>
|
||||
) : null}
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
|
@ -2,15 +2,11 @@
|
|||
|
||||
import { useEffect, useMemo, useState } from "react";
|
||||
import { useForm, useFieldArray, type UseFormRegister } from "react-hook-form";
|
||||
import { useRouter, useSearchParams } from "next/navigation";
|
||||
|
||||
/** Targets map 1:1 with your Directus collections */
|
||||
type Target = "settings_fiber" | "settings_co2gan" | "settings_co2gal" | "settings_uv";
|
||||
type Opt = { id: string; label: string };
|
||||
|
||||
/* ─────────────────────────────────────────────────────────────
|
||||
* Generic hook to fetch options with client-side filter
|
||||
* Expects endpoint to return: { data: Array<{id,label}> }
|
||||
* ──────────────────────────────────────────────────────────── */
|
||||
function useOptions(path: string) {
|
||||
const [opts, setOpts] = useState<Opt[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
|
@ -23,7 +19,6 @@ function useOptions(path: string) {
|
|||
fetch(url, { cache: "no-store" })
|
||||
.then((r) => r.json())
|
||||
.then((j) => { if (alive) setOpts((j?.data as Opt[]) ?? []); })
|
||||
.catch(() => { if (alive) setOpts([]); })
|
||||
.finally(() => { if (alive) setLoading(false); });
|
||||
return () => { alive = false; };
|
||||
}, [path, q]);
|
||||
|
|
@ -31,9 +26,6 @@ function useOptions(path: string) {
|
|||
return { opts, loading, setQ };
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────────────────────────
|
||||
* Filterable select with optional "required" client rule
|
||||
* ──────────────────────────────────────────────────────────── */
|
||||
function FilterableSelect({
|
||||
label, name, register, options, loading, onQuery, placeholder = "—", required = false,
|
||||
}: {
|
||||
|
|
@ -57,14 +49,16 @@ function FilterableSelect({
|
|||
|
||||
return (
|
||||
<div>
|
||||
<label className="block text-sm mb-1">{label}{required && <span className="text-red-500"> *</span>}</label>
|
||||
<label className="block text-sm mb-1">
|
||||
{label} {required ? <span className="text-red-600">*</span> : null}
|
||||
</label>
|
||||
<input
|
||||
className="w-full border rounded px-2 py-1 mb-1"
|
||||
placeholder="Type to filter…"
|
||||
value={filter}
|
||||
onChange={(e) => setFilter(e.target.value)}
|
||||
/>
|
||||
<select className="w-full border rounded px-2 py-1" {...register(name, required ? { required: true } : undefined)}>
|
||||
<select className="w-full border rounded px-2 py-1" {...register(name, { required })}>
|
||||
<option value="">{placeholder}{loading ? " (loading…)" : ""}</option>
|
||||
{filtered.map((o) => <option key={o.id} value={o.id}>{o.label}</option>)}
|
||||
</select>
|
||||
|
|
@ -72,9 +66,6 @@ function FilterableSelect({
|
|||
);
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────────────────────────
|
||||
* Checkbox
|
||||
* ──────────────────────────────────────────────────────────── */
|
||||
function BoolBox({ label, name, register }:{
|
||||
label: string; name: string; register: UseFormRegister<any>;
|
||||
}) {
|
||||
|
|
@ -85,87 +76,17 @@ function BoolBox({ label, name, register }:{
|
|||
);
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────────────────────────
|
||||
* Polished File Picker (with preview + filename)
|
||||
* NOT registered into RHF; managed via local state.
|
||||
* Use `onFile` to push the selected File up to the parent.
|
||||
* ──────────────────────────────────────────────────────────── */
|
||||
function FilePicker({
|
||||
label,
|
||||
required,
|
||||
onFile,
|
||||
accept,
|
||||
}: {
|
||||
label: string;
|
||||
required?: boolean;
|
||||
onFile: (f: File | null) => void;
|
||||
accept?: string;
|
||||
}) {
|
||||
const [file, setFile] = useState<File | null>(null);
|
||||
const [url, setUrl] = useState<string | null>(null);
|
||||
|
||||
function handleChange(e: React.ChangeEvent<HTMLInputElement>) {
|
||||
const f = e.target.files?.[0] || null;
|
||||
setFile(f);
|
||||
onFile(f);
|
||||
if (url) URL.revokeObjectURL(url);
|
||||
setUrl(f ? URL.createObjectURL(f) : null);
|
||||
}
|
||||
|
||||
function clear() {
|
||||
setFile(null);
|
||||
onFile(null);
|
||||
if (url) URL.revokeObjectURL(url);
|
||||
setUrl(null);
|
||||
}
|
||||
|
||||
const inputId = `fp-${label.replace(/\s+/g, "-").toLowerCase()}`;
|
||||
|
||||
return (
|
||||
<div className="space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
<label htmlFor={inputId} className="block text-sm">
|
||||
{label}{required && <span className="text-red-500"> *</span>}
|
||||
</label>
|
||||
{file && (
|
||||
<button type="button" onClick={clear} className="text-sm underline">
|
||||
Remove
|
||||
</button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* visually hidden native input; we present a custom button */}
|
||||
<input
|
||||
id={inputId}
|
||||
type="file"
|
||||
accept={accept}
|
||||
className="sr-only"
|
||||
onChange={handleChange}
|
||||
/>
|
||||
<div className="flex items-center gap-3">
|
||||
<label htmlFor={inputId} className="px-2 py-1 border rounded cursor-pointer inline-block">
|
||||
Choose file
|
||||
</label>
|
||||
<div className="text-sm text-muted-foreground">
|
||||
{file ? file.name : "No file chosen"}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{url && (
|
||||
<div className="border rounded p-2">
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src={url} alt={`${label} preview`} className="max-h-48 object-contain mx-auto" />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/* ─────────────────────────────────────────────────────────────
|
||||
* Main form
|
||||
* ──────────────────────────────────────────────────────────── */
|
||||
export default function SettingsSubmit({ initialTarget }: { initialTarget?: Target }) {
|
||||
const [target, setTarget] = useState<Target>(initialTarget ?? "settings_fiber");
|
||||
const router = useRouter();
|
||||
const sp = useSearchParams();
|
||||
const initialFromQuery = (sp.get("target") as Target) || initialTarget || "settings_fiber";
|
||||
const [target, setTarget] = useState<Target>(initialFromQuery);
|
||||
|
||||
// Image inputs (for preview + multipart submit)
|
||||
const [photoFile, setPhotoFile] = useState<File | null>(null);
|
||||
const [screenFile, setScreenFile] = useState<File | null>(null);
|
||||
const [photoPreview, setPhotoPreview] = useState<string>("");
|
||||
const [screenPreview, setScreenPreview] = useState<string>("");
|
||||
|
||||
// Generic lists (alphabetical)
|
||||
const mats = useOptions("material");
|
||||
|
|
@ -179,11 +100,11 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
const lens = useOptions(`lens?target=${target}`); // scan vs focus lens by target
|
||||
|
||||
// Repeater select choices from Directus field config
|
||||
const fillType = useOptions(`repeater-choices?target=${target}&group=fill_settings&field=type`);
|
||||
const rasterType = useOptions(`repeater-choices?target=${target}&group=raster_settings&field=type`);
|
||||
const rasterDither= useOptions(`repeater-choices?target=${target}&group=raster_settings&field=dither`);
|
||||
const fillType = useOptions(`repeater-choices?target=${target}&group=fill_settings&field=type`);
|
||||
const rasterType = useOptions(`repeater-choices?target=${target}&group=raster_settings&field=type`);
|
||||
const rasterDither = useOptions(`repeater-choices?target=${target}&group=raster_settings&field=dither`);
|
||||
|
||||
const { register, handleSubmit, control, reset, formState: { isSubmitting, errors } } = useForm<any>({
|
||||
const { register, handleSubmit, control, reset, formState: { isSubmitting } } = useForm<any>({
|
||||
defaultValues: {
|
||||
setting_title: "", uploader: "", setting_notes: "",
|
||||
mat: "", mat_coat: "", mat_color: "", mat_opacity: "",
|
||||
|
|
@ -199,40 +120,21 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
|
||||
const isGantry = target === "settings_co2gan";
|
||||
const isFiber = target === "settings_fiber";
|
||||
// const isUV = target === "settings_uv";
|
||||
// const isCO2Gal = target === "settings_co2gal";
|
||||
|
||||
// file state (not part of RHF)
|
||||
const [photoFile, setPhotoFile] = useState<File | null>(null);
|
||||
const [screenFile, setScreenFile] = useState<File | null>(null);
|
||||
const [submitMsg, setSubmitMsg] = useState<{ ok: boolean; text: string } | null>(null);
|
||||
|
||||
// helpers
|
||||
function num(v: any) { return (v === "" || v == null) ? null : Number(v); }
|
||||
const bool = (v: any) => !!v;
|
||||
|
||||
async function onSubmit(values: any) {
|
||||
setSubmitMsg(null);
|
||||
|
||||
// client-side requireds (extra guardrails)
|
||||
const missing: string[] = [];
|
||||
if (!photoFile) missing.push("photo");
|
||||
if (!values.source) missing.push("laser source");
|
||||
if (!values.lens) missing.push("lens");
|
||||
if (values.focus === "" || values.focus === undefined || values.focus === null) missing.push("focus");
|
||||
for (const k of ["mat","mat_coat","mat_color","mat_opacity"]) {
|
||||
if (!values[k]) missing.push(k);
|
||||
}
|
||||
if (!values.setting_title) missing.push("title");
|
||||
if (!values.uploader) missing.push("uploader");
|
||||
if (isFiber) {
|
||||
if (!values.laser_soft) missing.push("software");
|
||||
if (values.repeat_all === "" || values.repeat_all === undefined || values.repeat_all === null) missing.push("repeat_all");
|
||||
}
|
||||
if (missing.length) {
|
||||
setSubmitMsg({ ok: false, text: `Missing required field(s): ${missing.join(", ")}` });
|
||||
// Browser validation for required photo
|
||||
if (!photoFile) {
|
||||
// Let the native required attribute handle focus/UX,
|
||||
// but this is a safety net in case the browser skips it.
|
||||
(document.querySelector('input[type="file"][data-role="photo"]') as HTMLInputElement | null)?.focus();
|
||||
return;
|
||||
}
|
||||
|
||||
// Build server payload (numbers coerced on server too)
|
||||
const payload: any = {
|
||||
target,
|
||||
setting_title: values.setting_title,
|
||||
|
|
@ -308,42 +210,53 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
payload.repeat_all = num(values.repeat_all);
|
||||
}
|
||||
|
||||
// Use multipart/form-data with JSON payload + files
|
||||
const form = new FormData();
|
||||
form.set("payload", JSON.stringify(payload));
|
||||
if (photoFile) form.set("photo", photoFile, photoFile.name);
|
||||
if (screenFile) form.set("screen", screenFile, screenFile.name);
|
||||
|
||||
const res = await fetch("/api/submit/settings", {
|
||||
method: "POST",
|
||||
body: form,
|
||||
});
|
||||
|
||||
const text = await res.text();
|
||||
let data: any = {};
|
||||
try { data = text ? JSON.parse(text) : {}; } catch { /* non-JSON error page */ }
|
||||
|
||||
if (!res.ok) {
|
||||
setSubmitMsg({ ok: false, text: `Submission failed: ${data?.error || res.statusText}` });
|
||||
return;
|
||||
// Decide JSON vs multipart (include images when present)
|
||||
let res: Response;
|
||||
if (photoFile || screenFile) {
|
||||
const form = new FormData();
|
||||
form.set("payload", JSON.stringify(payload));
|
||||
if (photoFile) form.set("photo", photoFile, photoFile.name || "photo");
|
||||
if (screenFile) form.set("screen", screenFile, screenFile.name || "screen");
|
||||
res = await fetch("/api/submit/settings", { method: "POST", body: form });
|
||||
} else {
|
||||
res = await fetch("/api/submit/settings", {
|
||||
method: "POST",
|
||||
headers: { "Content-Type": "application/json" },
|
||||
body: JSON.stringify(payload),
|
||||
});
|
||||
}
|
||||
|
||||
setSubmitMsg({ ok: true, text: `Submitted! ID: ${data?.id ?? "unknown"}` });
|
||||
const data = await res.json().catch(() => ({}));
|
||||
if (!res.ok) throw new Error(data?.error || "Submission failed");
|
||||
|
||||
// reset form (keep target)
|
||||
reset({
|
||||
setting_title: "", uploader: "", setting_notes: "",
|
||||
mat: "", mat_coat: "", mat_color: "", mat_opacity: "",
|
||||
mat_thickness: "", source: "", lens: "", focus: "",
|
||||
laser_soft: "", repeat_all: "",
|
||||
fill_settings: [], line_settings: [], raster_settings: [],
|
||||
});
|
||||
// Clear form + file previews
|
||||
reset();
|
||||
setPhotoFile(null);
|
||||
setScreenFile(null);
|
||||
setPhotoPreview("");
|
||||
setScreenPreview("");
|
||||
|
||||
// Redirect to success page (don’t show alert)
|
||||
const id = data?.id ? String(data.id) : "";
|
||||
router.push(`/submit/settings/success?target=${encodeURIComponent(target)}&id=${encodeURIComponent(id)}`);
|
||||
}
|
||||
|
||||
// File input helpers
|
||||
function onPick(
|
||||
file: File | null,
|
||||
setFile: (f: File | null) => void,
|
||||
setPreview: (s: string) => void
|
||||
) {
|
||||
setFile(file);
|
||||
if (!file) { setPreview(""); return; }
|
||||
const reader = new FileReader();
|
||||
reader.onload = () => setPreview(String(reader.result || ""));
|
||||
reader.readAsDataURL(file);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="max-w-3xl mx-auto space-y-4">
|
||||
{/* Target + (fiber) software */}
|
||||
<div className="flex flex-wrap gap-3 items-end">
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Target</label>
|
||||
|
|
@ -368,49 +281,83 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
options={soft.opts}
|
||||
loading={soft.loading}
|
||||
onQuery={soft.setQ}
|
||||
required
|
||||
required={true}
|
||||
/>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-6">
|
||||
{/* identity */}
|
||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
|
||||
{/* Title / Uploader */}
|
||||
<div className="grid md:grid-cols-2 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Title <span className="text-red-500">*</span></label>
|
||||
<label className="block text-sm mb-1">Title <span className="text-red-600">*</span></label>
|
||||
<input className="w-full border rounded px-2 py-1" {...register("setting_title", { required: true })} />
|
||||
{errors.setting_title && <p className="text-xs text-red-600 mt-1">Title is required</p>}
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Uploader <span className="text-red-500">*</span></label>
|
||||
<label className="block text-sm mb-1">Uploader <span className="text-red-600">*</span></label>
|
||||
<input className="w-full border rounded px-2 py-1" {...register("uploader", { required: true })} />
|
||||
{errors.uploader && <p className="text-xs text-red-600 mt-1">Uploader is required</p>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Images */}
|
||||
<div className="grid md:grid-cols-2 gap-4">
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Result Photo <span className="text-red-600">*</span></label>
|
||||
<input
|
||||
type="file"
|
||||
accept="image/*"
|
||||
data-role="photo"
|
||||
required
|
||||
onChange={(e) => onPick(e.target.files?.[0] ?? null, setPhotoFile, setPhotoPreview)}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
{photoFile ? <>Selected: <span className="font-mono">{photoFile.name}</span></> : "Max 25 MB. JPG/PNG/WebP recommended."}
|
||||
</p>
|
||||
{photoPreview ? (
|
||||
<img src={photoPreview} alt="Result preview" className="mt-2 rounded border" />
|
||||
) : null}
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Settings Screenshot (optional)</label>
|
||||
<input
|
||||
type="file"
|
||||
accept="image/*"
|
||||
onChange={(e) => onPick(e.target.files?.[0] ?? null, setScreenFile, setScreenPreview)}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
{screenFile ? <>Selected: <span className="font-mono">{screenFile.name}</span></> : "Max 25 MB. JPG/PNG/WebP recommended."}
|
||||
</p>
|
||||
{screenPreview ? (
|
||||
<img src={screenPreview} alt="Settings preview" className="mt-2 rounded border" />
|
||||
) : null}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Notes */}
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Notes</label>
|
||||
<textarea rows={4} className="w-full border rounded px-2 py-1" {...register("setting_notes")} />
|
||||
</div>
|
||||
|
||||
{/* materials & system */}
|
||||
{/* Material / Source / Lens */}
|
||||
<div className="grid md:grid-cols-2 gap-3">
|
||||
<FilterableSelect label="Material" name="mat" register={register} options={mats.opts} loading={mats.loading} onQuery={mats.setQ} required />
|
||||
<FilterableSelect label="Coating" name="mat_coat" register={register} options={coats.opts} loading={coats.loading} onQuery={coats.setQ} required />
|
||||
<FilterableSelect label="Material" name="mat" register={register} options={mats.opts} loading={mats.loading} onQuery={mats.setQ} required />
|
||||
<FilterableSelect label="Coating" name="mat_coat" register={register} options={coats.opts} loading={coats.loading} onQuery={coats.setQ} required />
|
||||
<FilterableSelect label="Color" name="mat_color" register={register} options={colors.opts} loading={colors.loading} onQuery={colors.setQ} required />
|
||||
<FilterableSelect label="Opacity" name="mat_opacity" register={register} options={opacs.opts} loading={opacs.loading} onQuery={opacs.setQ} required />
|
||||
<FilterableSelect label="Laser Source" name="source" register={register} options={srcs.opts} loading={srcs.loading} onQuery={srcs.setQ} required />
|
||||
<FilterableSelect label="Lens" name="lens" register={register} options={lens.opts} loading={lens.loading} onQuery={lens.setQ} required />
|
||||
<FilterableSelect label="Opacity" name="mat_opacity" register={register} options={opacs.opts} loading={opacs.loading} onQuery={opacs.setQ} required />
|
||||
<FilterableSelect label="Laser Source" name="source" register={register} options={srcs.opts} loading={srcs.loading} onQuery={srcs.setQ} required />
|
||||
<FilterableSelect label="Lens" name="lens" register={register} options={lens.opts} loading={lens.loading} onQuery={lens.setQ} required />
|
||||
</div>
|
||||
|
||||
{/* Focus, thickness, repeat_all */}
|
||||
<div className="grid md:grid-cols-3 gap-3">
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Material Thickness (mm)</label>
|
||||
<input type="number" step="0.01" className="w-full border rounded px-2 py-1" {...register("mat_thickness")} />
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Focus (mm) <span className="text-red-500">*</span></label>
|
||||
<label className="block text-sm mb-1">Focus (mm) <span className="text-red-600">*</span></label>
|
||||
<input type="number" min={-10} max={10} step="1" className="w-full border rounded px-2 py-1" {...register("focus", { required: true })} />
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
0 = in focus. Negative = focus closer. Positive = focus further.
|
||||
|
|
@ -418,18 +365,12 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
</div>
|
||||
{isFiber && (
|
||||
<div>
|
||||
<label className="block text-sm mb-1">Repeat All <span className="text-red-500">*</span></label>
|
||||
<label className="block text-sm mb-1">Repeat All <span className="text-red-600">*</span></label>
|
||||
<input type="number" step="1" className="w-full border rounded px-2 py-1" {...register("repeat_all", { required: true })} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* images */}
|
||||
<div className="grid md:grid-cols-2 gap-6">
|
||||
<FilePicker label="Result Photo" required accept="image/*" onFile={setPhotoFile} />
|
||||
<FilePicker label="Settings Screenshot (optional)" accept="image/*" onFile={setScreenFile} />
|
||||
</div>
|
||||
|
||||
{/* FILL */}
|
||||
<fieldset className="border rounded p-3 space-y-2">
|
||||
<div className="flex items-center justify-between">
|
||||
|
|
@ -452,7 +393,7 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
{!isGantry && (
|
||||
<>
|
||||
<input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.frequency`)} />
|
||||
<input placeholder="Pulse (ns)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.pulse`)} />
|
||||
<input placeholder="Pulse (ns)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.pulse`)} />
|
||||
</>
|
||||
)}
|
||||
<input placeholder="Power (%)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.power`)} />
|
||||
|
|
@ -499,10 +440,10 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
|
||||
<input placeholder="Power (%)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.power`)} />
|
||||
<input placeholder="Speed (mm/s)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.speed`)} />
|
||||
<div className="flex items-center gap-3">
|
||||
<BoolBox label="Perf" name={`line_settings.${i}.perf`} register={register} />
|
||||
<BoolBox label="Air" name={`line_settings.${i}.air`} register={register} />
|
||||
</div>
|
||||
<input placeholder="Perf" className="border rounded px-2 py-1" {...register(`line_settings.${i}.perf`)} />
|
||||
<input placeholder="Cut" className="border rounded px-2 py-1" {...register(`line_settings.${i}.cut`)} />
|
||||
<input placeholder="Skip" className="border rounded px-2 py-1" {...register(`line_settings.${i}.skip`)} />
|
||||
<input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.pass`)} />
|
||||
{!isGantry && (
|
||||
<>
|
||||
<input placeholder="Step" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`line_settings.${i}.step`)} />
|
||||
|
|
@ -510,10 +451,7 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
<BoolBox label="Wobble" name={`line_settings.${i}.wobble`} register={register} />
|
||||
</>
|
||||
)}
|
||||
<input placeholder="Cut" className="border rounded px-2 py-1" {...register(`line_settings.${i}.cut`)} />
|
||||
<input placeholder="Skip" className="border rounded px-2 py-1" {...register(`line_settings.${i}.skip`)} />
|
||||
|
||||
<input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.pass`)} />
|
||||
<BoolBox label="Air" name={`line_settings.${i}.air`} register={register} />
|
||||
|
||||
<button type="button" className="px-2 py-1 border rounded md:col-span-4" onClick={() => lines.remove(i)}>Remove</button>
|
||||
</div>
|
||||
|
|
@ -575,17 +513,7 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
))}
|
||||
</fieldset>
|
||||
|
||||
{/* submit */}
|
||||
{submitMsg && (
|
||||
<div className={`p-2 rounded text-sm ${submitMsg.ok ? "bg-green-100 text-green-800" : "bg-red-100 text-red-800"}`}>
|
||||
{submitMsg.text}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<button
|
||||
disabled={isSubmitting}
|
||||
className="px-3 py-2 border rounded bg-accent text-background hover:opacity-90 disabled:opacity-50"
|
||||
>
|
||||
<button disabled={isSubmitting} className="px-3 py-2 border rounded bg-accent text-background hover:opacity-90 disabled:opacity-50">
|
||||
{isSubmitting ? "Submitting…" : "Submit Settings"}
|
||||
</button>
|
||||
</form>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue