diff --git a/frontend/src/app/json-editor/_schemas/schemas.ts b/frontend/src/app/json-editor/_schemas/schemas.ts
index ad9d16bae..9ffe8f3a1 100644
--- a/frontend/src/app/json-editor/_schemas/schemas.ts
+++ b/frontend/src/app/json-editor/_schemas/schemas.ts
@@ -24,8 +24,8 @@ export const ScriptSchema = z.object({
slug: z.string().min(1, "Slug is required"),
categories: z.array(z.number()),
date_created: z.string().regex(/^\d{4}-\d{2}-\d{2}$/, "Date must be in YYYY-MM-DD format").min(1, "Date is required"),
- type: z.enum(["vm", "ct", "misc", "turnkey"], {
- errorMap: () => ({ message: "Type must be either 'vm', 'ct', 'misc' or 'turnkey'" })
+ type: z.enum(["vm", "ct", "pve", "addon", "turnkey"], {
+ errorMap: () => ({ message: "Type must be either 'vm', 'ct', 'pve', 'addon' or 'turnkey'" })
}),
updateable: z.boolean(),
privileged: z.boolean(),
diff --git a/frontend/src/app/json-editor/page.tsx b/frontend/src/app/json-editor/page.tsx
index 4e161557f..fc99f2a98 100644
--- a/frontend/src/app/json-editor/page.tsx
+++ b/frontend/src/app/json-editor/page.tsx
@@ -5,18 +5,8 @@ import { Button } from "@/components/ui/button";
import { Calendar } from "@/components/ui/calendar";
import { Input } from "@/components/ui/input";
import { Label } from "@/components/ui/label";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
import { Switch } from "@/components/ui/switch";
import { Textarea } from "@/components/ui/textarea";
import { fetchCategories } from "@/lib/data";
@@ -66,29 +56,26 @@ export default function JSONGenerator() {
.catch((error) => console.error("Error fetching categories:", error));
}, []);
- const updateScript = useCallback(
- (key: keyof Script, value: Script[keyof Script]) => {
- setScript((prev) => {
- const updated = { ...prev, [key]: value };
+ const updateScript = useCallback((key: keyof Script, value: Script[keyof Script]) => {
+ setScript((prev) => {
+ const updated = { ...prev, [key]: value };
- if (key === "type" || key === "slug") {
- updated.install_methods = updated.install_methods.map((method) => ({
- ...method,
- script:
- method.type === "alpine"
- ? `${updated.type}/alpine-${updated.slug}.sh`
- : `${updated.type}/${updated.slug}.sh`,
- }));
- }
+ if (key === "type" || key === "slug") {
+ updated.install_methods = updated.install_methods.map((method) => ({
+ ...method,
+ script:
+ method.type === "alpine"
+ ? `${updated.type}/alpine-${updated.slug}.sh`
+ : `${updated.type}/${updated.slug}.sh`,
+ }));
+ }
- const result = ScriptSchema.safeParse(updated);
- setIsValid(result.success);
- setZodErrors(result.success ? null : result.error);
- return updated;
- });
- },
- [],
- );
+ const result = ScriptSchema.safeParse(updated);
+ setIsValid(result.success);
+ setZodErrors(result.success ? null : result.error);
+ return updated;
+ });
+ }, []);
const handleCopy = useCallback(() => {
navigator.clipboard.writeText(JSON.stringify(script, null, 2));
@@ -101,13 +88,13 @@ export default function JSONGenerator() {
const jsonString = JSON.stringify(script, null, 2);
const blob = new Blob([jsonString], { type: "application/json" });
const url = URL.createObjectURL(blob);
-
+
const a = document.createElement("a");
a.href = url;
a.download = `${script.slug || "script"}.json`;
document.body.appendChild(a);
a.click();
-
+
URL.revokeObjectURL(url);
document.body.removeChild(a);
}, [script]);
@@ -120,16 +107,13 @@ export default function JSONGenerator() {
);
const formattedDate = useMemo(
- () =>
- script.date_created ? format(script.date_created, "PPP") : undefined,
+ () => (script.date_created ? format(script.date_created, "PPP") : undefined),
[script.date_created],
);
const validationAlert = useMemo(
() => (
-
+
{isValid ? "Valid JSON" : "Invalid JSON"}
{isValid
@@ -160,21 +144,13 @@ export default function JSONGenerator() {
- updateScript("name", e.target.value)}
- />
+ updateScript("name", e.target.value)} />
@@ -197,11 +173,7 @@ export default function JSONGenerator() {
onChange={(e) => updateScript("description", e.target.value)}
/>
-
{validationAlert}
-
-
+
{JSON.stringify(script, null, 2)}
diff --git a/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx b/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx
index 3713a165b..7ee300aac 100644
--- a/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx
+++ b/frontend/src/app/scripts/_components/ScriptInfoBlocks.tsx
@@ -1,12 +1,5 @@
import { Button } from "@/components/ui/button";
-import {
- Card,
- CardContent,
- CardDescription,
- CardFooter,
- CardHeader,
- CardTitle,
-} from "@/components/ui/card";
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "@/components/ui/card";
import { basePath, mostPopularScripts } from "@/config/siteConfig";
import { extractDate } from "@/lib/time";
import { Category, Script } from "@/lib/types";
@@ -23,7 +16,8 @@ export const getDisplayValueFromType = (type: string) => {
return "LXC";
case "vm":
return "VM";
- case "misc":
+ case "pve":
+ case "addon":
return "";
default:
return "";
@@ -35,7 +29,7 @@ export function LatestScripts({ items }: { items: Category[] }) {
const latestScripts = useMemo(() => {
if (!items) return [];
-
+
const scripts = items.flatMap((category) => category.scripts || []);
// Filter out duplicates by slug
@@ -47,8 +41,7 @@ export function LatestScripts({ items }: { items: Category[] }) {
});
return Array.from(uniqueScriptsMap.values()).sort(
- (a, b) =>
- new Date(b.date_created).getTime() - new Date(a.date_created).getTime(),
+ (a, b) => new Date(b.date_created).getTime() - new Date(a.date_created).getTime(),
);
}, [items]);
@@ -59,7 +52,7 @@ export function LatestScripts({ items }: { items: Category[] }) {
const goToPreviousPage = () => {
setPage((prevPage) => prevPage - 1);
};
-
+
const startIndex = (page - 1) * ITEMS_PER_PAGE;
const endIndex = page * ITEMS_PER_PAGE;
@@ -74,18 +67,12 @@ export function LatestScripts({ items }: { items: Category[] }) {
Newest Scripts
{page > 1 && (
-
+
Previous
)}
{endIndex < latestScripts.length && (
-
+
{page === 1 ? "More.." : "Next"}
)}
@@ -94,10 +81,7 @@ export function LatestScripts({ items }: { items: Category[] }) {
)}
{latestScripts.slice(startIndex, endIndex).map((script) => (
-
+
@@ -107,10 +91,7 @@ export function LatestScripts({ items }: { items: Category[] }) {
height={64}
width={64}
alt=""
- onError={(e) =>
- ((e.currentTarget as HTMLImageElement).src =
- `/${basePath}/logo.png`)
- }
+ onError={(e) => ((e.currentTarget as HTMLImageElement).src = `/${basePath}/logo.png`)}
className="h-11 w-11 object-contain"
/>
@@ -126,9 +107,7 @@ export function LatestScripts({ items }: { items: Category[] }) {
-
- {script.description}
-
+ {script.description}