api endpoint fix for me
This commit is contained in:
parent
ab639edc7a
commit
d1b0a77a5e
2 changed files with 188 additions and 123 deletions
|
|
@ -8,18 +8,13 @@ function readCookie(name: string, cookieHeader: string) {
|
|||
|
||||
export async function GET(req: Request) {
|
||||
const base = process.env.NEXT_PUBLIC_API_BASE_URL!;
|
||||
// ⬇️ include username
|
||||
// include username so the form can show it
|
||||
const url = `${base}/users/me?fields=id,username,display_name,first_name,last_name,email`;
|
||||
|
||||
// Forward the raw Cookie header (covers your session)…
|
||||
const cookieHeader = req.headers.get("cookie") ?? "";
|
||||
|
||||
// …and also send ma_at as Bearer for token-based setups.
|
||||
const ma_at = readCookie("ma_at", cookieHeader);
|
||||
|
||||
const headers: Record<string, string> = {
|
||||
"cache-control": "no-store",
|
||||
};
|
||||
const headers: Record<string, string> = { "cache-control": "no-store" };
|
||||
if (cookieHeader) headers.cookie = cookieHeader;
|
||||
if (ma_at) headers.authorization = `Bearer ${ma_at}`;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,18 @@ function useOptions(path: string) {
|
|||
fetch(url, { cache: "no-store", credentials: "include" })
|
||||
.then((r) => r.json())
|
||||
.then((j) => {
|
||||
if (alive) setOpts((j?.data as Opt[]) ?? []);
|
||||
if (!alive) return;
|
||||
// Normalize to {id, label} no matter what the API returns
|
||||
const raw = (j?.data ?? j) as any[];
|
||||
const normalized: Opt[] = Array.isArray(raw)
|
||||
? raw
|
||||
.map((x) => ({
|
||||
id: String(x?.id ?? x?.value ?? x?.key ?? ""),
|
||||
label: String(x?.label ?? x?.name ?? x?.title ?? x?.text ?? ""),
|
||||
}))
|
||||
.filter((o) => o.id && o.label)
|
||||
: [];
|
||||
setOpts(normalized);
|
||||
})
|
||||
.finally(() => {
|
||||
if (alive) setLoading(false);
|
||||
|
|
@ -41,7 +52,14 @@ function useOptions(path: string) {
|
|||
}
|
||||
|
||||
function FilterableSelect({
|
||||
label, name, register, options, loading, onQuery, placeholder = "—", required = false,
|
||||
label,
|
||||
name,
|
||||
register,
|
||||
options,
|
||||
loading,
|
||||
onQuery,
|
||||
placeholder = "—",
|
||||
required = false,
|
||||
}: {
|
||||
label: string;
|
||||
name: string;
|
||||
|
|
@ -53,7 +71,9 @@ function FilterableSelect({
|
|||
required?: boolean;
|
||||
}) {
|
||||
const [filter, setFilter] = useState("");
|
||||
useEffect(() => { onQuery?.(filter); }, [filter, onQuery]);
|
||||
useEffect(() => {
|
||||
onQuery?.(filter);
|
||||
}, [filter, onQuery]);
|
||||
|
||||
const filtered = useMemo(() => {
|
||||
if (!filter) return options;
|
||||
|
|
@ -73,18 +93,21 @@ function FilterableSelect({
|
|||
onChange={(e) => setFilter(e.target.value)}
|
||||
/>
|
||||
<select className="w-full border rounded px-2 py-1" {...register(name, { required })}>
|
||||
<option value="">{placeholder}{loading ? " (loading…)" : ""}</option>
|
||||
<option value="">
|
||||
{placeholder}
|
||||
{loading ? " (loading…)" : ""}
|
||||
</option>
|
||||
{filtered.map((o) => (
|
||||
<option key={o.id} value={o.id}>{o.label}</option>
|
||||
<option key={o.id} value={o.id}>
|
||||
{o.label}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
function BoolBox({ label, name, register }:{
|
||||
label: string; name: string; register: UseFormRegister<any>;
|
||||
}) {
|
||||
function BoolBox({ label, name, register }: { label: string; name: string; register: UseFormRegister<any> }) {
|
||||
return (
|
||||
<label className="flex items-center gap-1 text-sm">
|
||||
<input type="checkbox" {...register(name)} /> {label}
|
||||
|
|
@ -98,6 +121,22 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
const initialFromQuery = (sp.get("target") as Target) || initialTarget || "settings_fiber";
|
||||
const [target, setTarget] = useState<Target>(initialFromQuery);
|
||||
|
||||
// Map collection -> type slug for option endpoints
|
||||
const typeForOptions = useMemo(() => {
|
||||
switch (target) {
|
||||
case "settings_fiber":
|
||||
return "fiber";
|
||||
case "settings_uv":
|
||||
return "uv";
|
||||
case "settings_co2gan":
|
||||
return "co2-gantry";
|
||||
case "settings_co2gal":
|
||||
return "co2-galvo";
|
||||
default:
|
||||
return "fiber";
|
||||
}
|
||||
}, [target]);
|
||||
|
||||
// Image inputs (for preview + multipart submit)
|
||||
const [photoFile, setPhotoFile] = useState<File | null>(null);
|
||||
const [screenFile, setScreenFile] = useState<File | null>(null);
|
||||
|
|
@ -115,61 +154,83 @@ export default function SettingsSubmit({ initialTarget }: { initialTarget?: Targ
|
|||
let alive = true;
|
||||
fetch("/api/me", { cache: "no-store", credentials: "include" })
|
||||
.then((r) => (r.ok ? r.json() : Promise.reject(r)))
|
||||
.then((j) => { if (alive) setMe(j?.data || j || null); })
|
||||
.catch(() => { if (alive) setMeErr("not-signed-in"); });
|
||||
return () => { alive = false; };
|
||||
.then((j) => {
|
||||
if (alive) setMe(j?.data || j || null);
|
||||
})
|
||||
.catch(() => {
|
||||
if (alive) setMeErr("not-signed-in");
|
||||
});
|
||||
return () => {
|
||||
alive = false;
|
||||
};
|
||||
}, []);
|
||||
|
||||
const shortId = (s?: string) => (s ? `${s.slice(0, 8)}…${s.slice(-4)}` : "");
|
||||
|
||||
const shortId = me?.id ? `${me.id.slice(0, 8)}…${me.id.slice(-4)}` : "";
|
||||
const meLabel =
|
||||
(me?.username ? `@${me.username}` : "") ||
|
||||
(me?.display_name || "").trim() ||
|
||||
me?.username ||
|
||||
me?.display_name ||
|
||||
[me?.first_name, me?.last_name].filter(Boolean).join(" ").trim() ||
|
||||
(me?.email ? me.email.split("@")[0] : "") ||
|
||||
(me?.id ? `User ${shortId(me.id)}` : "");
|
||||
me?.email ||
|
||||
shortId ||
|
||||
"";
|
||||
|
||||
// Generic lists (alphabetical)
|
||||
const mats = useOptions("material");
|
||||
const coats = useOptions("material_coating");
|
||||
const mats = useOptions("material");
|
||||
const coats = useOptions("material_coating");
|
||||
const colors = useOptions("material_color");
|
||||
const opacs = useOptions("material_opacity");
|
||||
const soft = useOptions("laser_software"); // only visible for fiber
|
||||
const opacs = useOptions("material_opacity");
|
||||
const soft = useOptions("laser_software"); // only visible for fiber
|
||||
|
||||
// Target-driven lists
|
||||
const srcs = useOptions(`laser_source?target=${target}`); // wavelength filter server-side
|
||||
const lens = useOptions(`lens?target=${target}`); // scan vs focus lens by target
|
||||
// Target-driven lists (use `type`, not the collection id)
|
||||
const srcs = useOptions(`laser_source?type=${typeForOptions}`);
|
||||
const lens = useOptions(`lens?type=${typeForOptions}`);
|
||||
|
||||
// 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 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 } } = useForm<any>({
|
||||
const {
|
||||
register,
|
||||
handleSubmit,
|
||||
control,
|
||||
reset,
|
||||
formState: { isSubmitting },
|
||||
} = useForm<any>({
|
||||
defaultValues: {
|
||||
setting_title: "",
|
||||
setting_notes: "",
|
||||
mat: "", mat_coat: "", mat_color: "", mat_opacity: "",
|
||||
mat_thickness: "", source: "", lens: "", focus: "",
|
||||
laser_soft: "", repeat_all: "",
|
||||
fill_settings: [], line_settings: [], raster_settings: [],
|
||||
mat: "",
|
||||
mat_coat: "",
|
||||
mat_color: "",
|
||||
mat_opacity: "",
|
||||
mat_thickness: "",
|
||||
source: "",
|
||||
lens: "",
|
||||
focus: "",
|
||||
laser_soft: "",
|
||||
repeat_all: "",
|
||||
fill_settings: [],
|
||||
line_settings: [],
|
||||
raster_settings: [],
|
||||
},
|
||||
});
|
||||
|
||||
const fills = useFieldArray({ control, name: "fill_settings" });
|
||||
const lines = useFieldArray({ control, name: "line_settings" });
|
||||
const fills = useFieldArray({ control, name: "fill_settings" });
|
||||
const lines = useFieldArray({ control, name: "line_settings" });
|
||||
const rasters = useFieldArray({ control, name: "raster_settings" });
|
||||
|
||||
const isGantry = target === "settings_co2gan";
|
||||
const isFiber = target === "settings_fiber";
|
||||
const isFiber = target === "settings_fiber";
|
||||
|
||||
function num(v: any) { return (v === "" || v == null) ? null : Number(v); }
|
||||
function num(v: any) {
|
||||
return v === "" || v == null ? null : Number(v);
|
||||
}
|
||||
const bool = (v: any) => !!v;
|
||||
|
||||
async function onSubmit(values: any) {
|
||||
setSubmitErr(null);
|
||||
|
||||
// Result photo required on all
|
||||
if (!photoFile) {
|
||||
(document.querySelector('input[type="file"][data-role="photo"]') as HTMLInputElement | null)?.focus();
|
||||
return;
|
||||
|
|
@ -195,14 +256,12 @@ async function onSubmit(values: any) {
|
|||
interval: num(r.interval),
|
||||
pass: num(r.pass),
|
||||
type: r.type || "",
|
||||
// present on fiber/uv/co2gal
|
||||
frequency: num(r.frequency),
|
||||
pulse: num(r.pulse),
|
||||
angle: num(r.angle),
|
||||
auto: bool(r.auto),
|
||||
increment: num(r.increment),
|
||||
cross: bool(r.cross),
|
||||
// present on all
|
||||
flood: bool(r.flood),
|
||||
air: bool(r.air),
|
||||
})),
|
||||
|
|
@ -216,7 +275,6 @@ async function onSubmit(values: any) {
|
|||
skip: r.skip || "",
|
||||
pass: num(r.pass),
|
||||
air: bool(r.air),
|
||||
// extra on fiber/uv/co2gal
|
||||
frequency: num(r.frequency),
|
||||
pulse: num(r.pulse),
|
||||
wobble: bool(r.wobble),
|
||||
|
|
@ -237,7 +295,6 @@ async function onSubmit(values: any) {
|
|||
dot: num(r.dot),
|
||||
pass: num(r.pass),
|
||||
air: bool(r.air),
|
||||
// extras on fiber/uv/co2gal
|
||||
frequency: num(r.frequency),
|
||||
pulse: num(r.pulse),
|
||||
cross: bool(r.cross),
|
||||
|
|
@ -249,18 +306,14 @@ async function onSubmit(values: any) {
|
|||
payload.repeat_all = num(values.repeat_all);
|
||||
}
|
||||
|
||||
let res: Response;
|
||||
try {
|
||||
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,
|
||||
credentials: "include",
|
||||
});
|
||||
res = await fetch("/api/submit/settings", { method: "POST", body: form, credentials: "include" });
|
||||
} else {
|
||||
res = await fetch("/api/submit/settings", {
|
||||
method: "POST",
|
||||
|
|
@ -278,7 +331,6 @@ async function onSubmit(values: any) {
|
|||
throw new Error(data?.error || "Submission failed");
|
||||
}
|
||||
|
||||
// Clear form + previews
|
||||
reset();
|
||||
setPhotoFile(null);
|
||||
setScreenFile(null);
|
||||
|
|
@ -286,20 +338,13 @@ async function onSubmit(values: any) {
|
|||
setScreenPreview("");
|
||||
|
||||
const id = data?.id ? String(data.id) : "";
|
||||
router.push(
|
||||
`/submit/settings/success?target=${encodeURIComponent(target)}&id=${encodeURIComponent(id)}`
|
||||
);
|
||||
router.push(`/submit/settings/success?target=${encodeURIComponent(target)}&id=${encodeURIComponent(id)}`);
|
||||
} catch (e: any) {
|
||||
setSubmitErr(e?.message || "Submission failed");
|
||||
}
|
||||
}
|
||||
|
||||
// File input helpers
|
||||
function onPick(
|
||||
file: File | null,
|
||||
setFile: (f: File | null) => void,
|
||||
setPreview: (s: string) => void
|
||||
) {
|
||||
function onPick(file: File | null, setFile: (f: File | null) => void, setPreview: (s: string) => void) {
|
||||
setFile(file);
|
||||
if (!file) {
|
||||
setPreview("");
|
||||
|
|
@ -355,9 +400,7 @@ return (
|
|||
) : null}
|
||||
|
||||
{submitErr ? (
|
||||
<div className="border border-red-500 text-red-600 bg-red-50 rounded p-2 text-sm">
|
||||
{submitErr}
|
||||
</div>
|
||||
<div className="border border-red-500 text-red-600 bg-red-50 rounded p-2 text-sm">{submitErr}</div>
|
||||
) : null}
|
||||
|
||||
<form onSubmit={handleSubmit(onSubmit)} className="space-y-4">
|
||||
|
|
@ -367,10 +410,7 @@ return (
|
|||
<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 })}
|
||||
/>
|
||||
<input className="w-full border rounded px-2 py-1" {...register("setting_title", { required: true })} />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -385,9 +425,7 @@ return (
|
|||
accept="image/*"
|
||||
data-role="photo"
|
||||
required
|
||||
onChange={(e) =>
|
||||
onPick(e.target.files?.[0] ?? null, setPhotoFile, setPhotoPreview)
|
||||
}
|
||||
onChange={(e) => onPick(e.target.files?.[0] ?? null, setPhotoFile, setPhotoPreview)}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
{photoFile ? (
|
||||
|
|
@ -398,18 +436,14 @@ return (
|
|||
"Max 25 MB. JPG/PNG/WebP recommended."
|
||||
)}
|
||||
</p>
|
||||
{photoPreview ? (
|
||||
<img src={photoPreview} alt="Result preview" className="mt-2 rounded border" />
|
||||
) : null}
|
||||
{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)
|
||||
}
|
||||
onChange={(e) => onPick(e.target.files?.[0] ?? null, setScreenFile, setScreenPreview)}
|
||||
/>
|
||||
<p className="text-xs text-muted-foreground mt-1">
|
||||
{screenFile ? (
|
||||
|
|
@ -420,9 +454,7 @@ return (
|
|||
"Max 25 MB. JPG/PNG/WebP recommended."
|
||||
)}
|
||||
</p>
|
||||
{screenPreview ? (
|
||||
<img src={screenPreview} alt="Settings preview" className="mt-2 rounded border" />
|
||||
) : null}
|
||||
{screenPreview ? <img src={screenPreview} alt="Settings preview" className="mt-2 rounded border" /> : null}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -434,12 +466,60 @@ return (
|
|||
|
||||
{/* 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="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="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
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Focus, thickness, repeat_all */}
|
||||
|
|
@ -460,21 +540,14 @@ return (
|
|||
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.
|
||||
</p>
|
||||
<p className="text-xs text-muted-foreground mt-1">0 = in focus. Negative = focus closer. Positive = focus further.</p>
|
||||
</div>
|
||||
{isFiber && (
|
||||
<div>
|
||||
<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 })}
|
||||
/>
|
||||
<input type="number" step="1" className="w-full border rounded px-2 py-1" {...register("repeat_all", { required: true })} />
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
|
@ -503,27 +576,27 @@ return (
|
|||
{!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`)} />
|
||||
<input placeholder="Speed (mm/s)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.speed`)} />
|
||||
<input placeholder="Interval (mm)" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.interval`)} />
|
||||
<input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.pass`)} />
|
||||
<input placeholder="Power (%)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.power`)} />
|
||||
<input placeholder="Speed (mm/s)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.speed`)} />
|
||||
<input placeholder="Interval (mm)" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.interval`)} />
|
||||
<input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.pass`)} />
|
||||
|
||||
{!isGantry && (
|
||||
<>
|
||||
<input placeholder="Angle (°)" type="number" step="1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.angle`)} />
|
||||
<input placeholder="Increment" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.increment`)} />
|
||||
<input placeholder="Angle (°)" type="number" step="1" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.angle`)} />
|
||||
<input placeholder="Increment" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`fill_settings.${i}.increment`)} />
|
||||
<div className="flex items-center gap-3">
|
||||
<BoolBox label="Auto" name={`fill_settings.${i}.auto`} register={register} />
|
||||
<BoolBox label="Auto" name={`fill_settings.${i}.auto`} register={register} />
|
||||
<BoolBox label="Cross" name={`fill_settings.${i}.cross`} register={register} />
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
<div className="flex items-center gap-3">
|
||||
<BoolBox label="Flood" name={`fill_settings.${i}.flood`} register={register} />
|
||||
<BoolBox label="Air" name={`fill_settings.${i}.air`} register={register} />
|
||||
<BoolBox label="Air" name={`fill_settings.${i}.air`} register={register} />
|
||||
</div>
|
||||
|
||||
<button type="button" className="px-2 py-1 border rounded md:col-span-4" onClick={() => fills.remove(i)}>
|
||||
|
|
@ -548,14 +621,14 @@ return (
|
|||
{!isGantry && (
|
||||
<>
|
||||
<input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.frequency`)} />
|
||||
<input placeholder="Pulse (ns)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.pulse`)} />
|
||||
<input placeholder="Pulse (ns)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`line_settings.${i}.pulse`)} />
|
||||
</>
|
||||
)}
|
||||
|
||||
<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`)} />
|
||||
<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`)} />
|
||||
<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="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 && (
|
||||
|
|
@ -589,7 +662,7 @@ return (
|
|||
{!isGantry && (
|
||||
<>
|
||||
<input placeholder="Frequency (kHz)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.frequency`)} />
|
||||
<input placeholder="Pulse (ns)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.pulse`)} />
|
||||
<input placeholder="Pulse (ns)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.pulse`)} />
|
||||
</>
|
||||
)}
|
||||
|
||||
|
|
@ -612,18 +685,18 @@ return (
|
|||
placeholder="Select dither"
|
||||
/>
|
||||
|
||||
<input placeholder="Power (%)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.power`)} />
|
||||
<input placeholder="Speed (mm/s)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.speed`)} />
|
||||
<input placeholder="Halftone Cell" type="number" step="1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.halftone_cell`)} />
|
||||
<input placeholder="Halftone Angle" type="number" step="1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.halftone_angle`)} />
|
||||
<input placeholder="Interval (mm)" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.interval`)} />
|
||||
<input placeholder="Dot" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.dot`)} />
|
||||
<input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.pass`)} />
|
||||
<input placeholder="Power (%)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.power`)} />
|
||||
<input placeholder="Speed (mm/s)" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.speed`)} />
|
||||
<input placeholder="Halftone Cell" type="number" step="1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.halftone_cell`)} />
|
||||
<input placeholder="Halftone Angle" type="number" step="1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.halftone_angle`)} />
|
||||
<input placeholder="Interval (mm)" type="number" step="0.001" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.interval`)} />
|
||||
<input placeholder="Dot" type="number" step="0.1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.dot`)} />
|
||||
<input placeholder="Pass" type="number" step="1" className="border rounded px-2 py-1" {...register(`raster_settings.${i}.pass`)} />
|
||||
|
||||
{!isGantry && <BoolBox label="Cross" name={`raster_settings.${i}.cross`} register={register} />}
|
||||
<div className="flex items-center gap-3">
|
||||
<BoolBox label="Inversion" name={`raster_settings.${i}.inversion`} register={register} />
|
||||
<BoolBox label="Air" name={`raster_settings.${i}.air`} register={register} />
|
||||
<BoolBox label="Air" name={`raster_settings.${i}.air`} register={register} />
|
||||
</div>
|
||||
|
||||
<button type="button" className="px-2 py-1 border rounded md:col-span-4" onClick={() => rasters.remove(i)}>
|
||||
|
|
@ -633,10 +706,7 @@ return (
|
|||
))}
|
||||
</fieldset>
|
||||
|
||||
<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