calvin.erfmann/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-02-02 16:19:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

♻️ adapt zod schema to v4 and move form description below the inptu

Browse Source
This commit is contained in:
Fred KISSIE
2025-11-18 01:07:46 +01:00
parent ee7e7778b6
commit 66b01b764f
2 changed files with 53 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/private/routers/loginPage/upsertLoginPageBranding.ts
View File

@@ -29,27 +29,23 @@ import { getOrgTierData } from "#private/lib/billing";
import { TierId } from "@server/lib/billing/tiers";
import { build } from "@server/build";
const paramsSchema = z
.object({
orgId: z.string()
})
.strict();
const paramsSchema = z.strictObject({
orgId: z.string()
});
const bodySchema = z
.object({
logoUrl: z.string().url(),
logoWidth: z.coerce.number().min(1),
logoHeight: z.coerce.number().min(1),
resourceTitle: z.string(),
resourceSubtitle: z.string().optional(),
orgTitle: z.string().optional(),
orgSubtitle: z.string().optional(),
primaryColor: z
.string()
.regex(/^#([0-9a-f]{6}|[0-9a-f]{3})$/i)
.optional()
})
.strict();
const bodySchema = z.strictObject({
logoUrl: z.url(),
logoWidth: z.coerce.number<number>().min(1),
logoHeight: z.coerce.number<number>().min(1),
resourceTitle: z.string(),
resourceSubtitle: z.string().optional(),
orgTitle: z.string().optional(),
orgSubtitle: z.string().optional(),
primaryColor: z
.string()
.regex(/^#([0-9a-f]{6}|[0-9a-f]{3})$/i)
.optional()
});
export type UpdateLoginPageBrandingBody = z.infer<typeof bodySchema>;

74
src/components/AuthPageBrandingForm.tsx
View File

@@ -50,29 +50,26 @@ export type AuthPageCustomizationProps = {
};
const AuthPageFormSchema = z.object({
logoUrl: z
.string()
.url()
.refine(
async (url) => {
try {
const response = await fetch(url);
return (
response.status === 200 &&
(response.headers.get("content-type") ?? "").startsWith(
"image/"
)
);
} catch (error) {
return false;
}
},
{
message: "Invalid logo URL, must be a valid image URL"
logoUrl: z.url().refine(
async (url) => {
try {
const response = await fetch(url);
return (
response.status === 200 &&
(response.headers.get("content-type") ?? "").startsWith(
"image/"
)
);
} catch (error) {
return false;
}
),
logoWidth: z.coerce.number().min(1),
logoHeight: z.coerce.number().min(1),
},
{
error: "Invalid logo URL, must be a valid image URL"
}
),
logoWidth: z.coerce.number<number>().min(1),
logoHeight: z.coerce.number<number>().min(1),
orgTitle: z.string().optional(),
orgSubtitle: z.string().optional(),
resourceTitle: z.string(),
@@ -272,7 +269,7 @@ export default function AuthPageBrandingForm({
)}
/>
<span className="self-center relative top-2.5">
<span className="relative top-8">
<XIcon className="text-muted-foreground size-4" />
</span>
@@ -300,7 +297,7 @@ export default function AuthPageBrandingForm({
<>
<Separator />
<div className="flex flex-col gap-3">
<div className="flex flex-col gap-5">
<FormField
control={form.control}
name="orgTitle"
@@ -311,6 +308,10 @@ export default function AuthPageBrandingForm({
"brandingOrgTitle"
)}
</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormDescription>
{t(
"brandingOrgDescription",
@@ -320,9 +321,6 @@ export default function AuthPageBrandingForm({
}
)}
</FormDescription>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
@@ -337,6 +335,10 @@ export default function AuthPageBrandingForm({
"brandingOrgSubtitle"
)}
</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormDescription>
{t(
"brandingOrgDescription",
@@ -346,9 +348,6 @@ export default function AuthPageBrandingForm({
}
)}
</FormDescription>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
@@ -359,7 +358,7 @@ export default function AuthPageBrandingForm({
<Separator />
<div className="flex flex-col gap-3">
<div className="flex flex-col gap-5">
<FormField
control={form.control}
name="resourceTitle"
@@ -368,6 +367,10 @@ export default function AuthPageBrandingForm({
<FormLabel>
{t("brandingResourceTitle")}
</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormDescription>
{t(
"brandingResourceDescription",
@@ -377,9 +380,6 @@ export default function AuthPageBrandingForm({
}
)}
</FormDescription>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}
@@ -394,6 +394,9 @@ export default function AuthPageBrandingForm({
"brandingResourceSubtitle"
)}
</FormLabel>
<FormControl>
<Input {...field} />
</FormControl>
<FormDescription>
{t(
"brandingResourceDescription",
@@ -403,9 +406,6 @@ export default function AuthPageBrandingForm({
}
)}
</FormDescription>
<FormControl>
<Input {...field} />
</FormControl>
<FormMessage />
</FormItem>
)}