design + functionality improvement
This commit is contained in:
parent
ff0d61a071
commit
7aec066ef7
@ -10,11 +10,10 @@ export const load = async ({ fetch }) => {
|
||||
});
|
||||
|
||||
const { site } = await blogRes.json();
|
||||
site.primary_color_hex = "#" + site.primary_color_hex
|
||||
site.secondary_color_hex = "#" + site.secondary_color_hex
|
||||
site.text_color_hex = "#" + site.text_color_hex
|
||||
// site.primary_color_hex = "#" + site.primary_color_hex
|
||||
// site.secondary_color_hex = "#" + site.secondary_color_hex
|
||||
// site.text_color_hex = "#" + site.text_color_hex
|
||||
|
||||
// console.log("getting back", site)
|
||||
return {
|
||||
blog_info: site,
|
||||
form: await superValidate(site, zod(schema))
|
||||
@ -32,9 +31,9 @@ export const actions = {
|
||||
}
|
||||
|
||||
let data = structuredClone(form.data);
|
||||
data.primary_color_hex = data.primary_color_hex.slice(1);
|
||||
data.secondary_color_hex = data.secondary_color_hex.slice(1);
|
||||
data.text_color_hex = data.text_color_hex.slice(1);
|
||||
// data.primary_color_hex = data.primary_color_hex.slice(1);
|
||||
// data.secondary_color_hex = data.secondary_color_hex.slice(1);
|
||||
// data.text_color_hex = data.text_color_hex.slice(1);
|
||||
|
||||
const res = await event.fetch(config.api_url + "/dashboard/website", {
|
||||
method: "PUT",
|
||||
|
@ -85,18 +85,12 @@
|
||||
<input type="text" value={data.blog_info.id} name="id" readonly class="hidden" />
|
||||
|
||||
<div class="grid grid-cols-1 gap-16 md:grid-cols-2 md:grid-rows-1">
|
||||
<div>
|
||||
<Collapsible.Root class="space-y-2">
|
||||
<div class="space-y-16">
|
||||
<div class="space-y-4">
|
||||
<div class="flex items-center justify-between space-x-4 border-b px-4">
|
||||
<h2 class="mb-4 text-2xl font-bold">Basics</h2>
|
||||
<Collapsible.Trigger asChild let:builder>
|
||||
<Button builders={[builder]} variant="ghost" size="sm" class="w-9 p-0">
|
||||
<ChevronsUpDown class="h-4 w-4" />
|
||||
<span class="sr-only">Toggle</span>
|
||||
</Button>
|
||||
</Collapsible.Trigger>
|
||||
</div>
|
||||
<Collapsible.Content class="space-y-2">
|
||||
<div>
|
||||
<Form.Field {form} name="name">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label>Blog name</Form.Label>
|
||||
@ -121,7 +115,7 @@
|
||||
<Form.Description />
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
<Form.Field {form} name="primary_color_hex">
|
||||
<!-- <Form.Field {form} name="primary_color_hex">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label>Primary color</Form.Label>
|
||||
<ColorPicker
|
||||
@ -162,7 +156,7 @@
|
||||
</Form.Control>
|
||||
<Form.Description />
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
</Form.Field> -->
|
||||
<Form.Field {form} name="domain">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label>Custom domain</Form.Label>
|
||||
@ -179,21 +173,43 @@
|
||||
{/if}
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
</Collapsible.Content>
|
||||
</Collapsible.Root>
|
||||
</div>
|
||||
</div>
|
||||
<div class="space-y-4">
|
||||
<div class="flex items-center justify-between space-x-4 border-b px-4">
|
||||
<h2 class="mb-4 text-2xl font-bold">Auto publish</h2>
|
||||
</div>
|
||||
<div>
|
||||
<Collapsible.Root class="space-y-2">
|
||||
<Form.Field {form} name="auto_publish">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label>Auto Publish</Form.Label>
|
||||
<div class="flex items-center justify-start">
|
||||
<Switch {...attrs} bind:checked={$formData.auto_publish} />
|
||||
</div>
|
||||
</Form.Control>
|
||||
<Form.FieldErrors />
|
||||
<Form.Description
|
||||
>Automatically creates a blog post for you when you upload a video</Form.Description
|
||||
>
|
||||
</Form.Field>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="space-y-16">
|
||||
<div class="space-y-4">
|
||||
<div class="flex items-center justify-between space-x-4 border-b px-4">
|
||||
<h2 class="mb-4 text-2xl font-bold">Freebies</h2>
|
||||
<Collapsible.Trigger asChild let:builder>
|
||||
<Button builders={[builder]} variant="ghost" size="sm" class="w-9 p-0">
|
||||
<ChevronsUpDown class="h-4 w-4" />
|
||||
<span class="sr-only">Toggle</span>
|
||||
</Button>
|
||||
</Collapsible.Trigger>
|
||||
</div>
|
||||
<Collapsible.Content class="space-y-2">
|
||||
<div>
|
||||
<Form.Field {form} name="freebie_title">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label class="text-right">Freebie title</Form.Label>
|
||||
<div class="flex items-center justify-start">
|
||||
<Input {...attrs} bind:value={$formData.freebie_title} />
|
||||
</div>
|
||||
</Form.Control>
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
<Form.Field {form} name="use_freebie">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label class="text-right">Send freebie</Form.Label>
|
||||
@ -207,19 +223,6 @@
|
||||
>
|
||||
</Form.Control>
|
||||
</Form.Field>
|
||||
<Form.Field {form} name="freebie_name">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label class="text-right">Freebie Name</Form.Label>
|
||||
<div class="flex items-center justify-start">
|
||||
<Input
|
||||
{...attrs}
|
||||
bind:value={$formData.freebie_name}
|
||||
bind:readonly={disable_freebies}
|
||||
/>
|
||||
</div>
|
||||
</Form.Control>
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
<Form.Field {form} name="freebie_url">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label class="text-right">Freebie file</Form.Label>
|
||||
@ -276,66 +279,8 @@
|
||||
>The text displayed next to the signup form on your blog.</Form.Description
|
||||
>
|
||||
</Form.Field>
|
||||
</Collapsible.Content>
|
||||
</Collapsible.Root>
|
||||
</div>
|
||||
<div>
|
||||
<Collapsible.Root class="space-y-2">
|
||||
<div class="flex items-center justify-between space-x-4 border-b px-4">
|
||||
<h2 class="mb-4 text-2xl font-bold">Auto publish</h2>
|
||||
<Collapsible.Trigger asChild let:builder>
|
||||
<Button builders={[builder]} variant="ghost" size="sm" class="w-9 p-0">
|
||||
<ChevronsUpDown class="h-4 w-4" />
|
||||
<span class="sr-only">Toggle</span>
|
||||
</Button>
|
||||
</Collapsible.Trigger>
|
||||
</div>
|
||||
<Collapsible.Content class="space-y-2">
|
||||
<Form.Field {form} name="auto_publish">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label>Auto Publish</Form.Label>
|
||||
<div class="flex items-center justify-start">
|
||||
<Switch {...attrs} bind:checked={$formData.auto_publish} />
|
||||
</div>
|
||||
</Form.Control>
|
||||
<Form.FieldErrors />
|
||||
<Form.Description
|
||||
>Automatically creates a blog post for you when you upload a video</Form.Description
|
||||
>
|
||||
</Form.Field>
|
||||
<Form.Field {form} name="freebie_name">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label class="text-right">Freebie Name</Form.Label>
|
||||
<div class="flex items-center justify-start">
|
||||
<Input
|
||||
{...attrs}
|
||||
bind:value={$formData.freebie_name}
|
||||
bind:readonly={disable_freebies}
|
||||
/>
|
||||
</div>
|
||||
</Form.Control>
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
<Form.Field {form} name="freebie_url">
|
||||
<Form.Control let:attrs>
|
||||
<Form.Label class="text-right">Freebie file</Form.Label>
|
||||
<div class="flex items-center justify-start">
|
||||
<Input
|
||||
type="file"
|
||||
on:input={(e) =>
|
||||
handleFileChange(e, $formData.freebie_url).then((x) => {
|
||||
$formData.freebie_url = x;
|
||||
})}
|
||||
bind:disabled={disable_freebies}
|
||||
/>
|
||||
<Input {...attrs} class="hidden" bind:value={$formData.freebie_url} readonly />
|
||||
</div>
|
||||
</Form.Control>
|
||||
<Form.Description>Maximum size of 5MB (TEMPORARY)</Form.Description>
|
||||
<Form.FieldErrors />
|
||||
</Form.Field>
|
||||
</Collapsible.Content>
|
||||
</Collapsible.Root>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-4">
|
||||
|
@ -3,14 +3,14 @@ import { z } from "zod";
|
||||
export const schema = z.object({
|
||||
id: z.string(),
|
||||
name: z.string().min(4).max(32),
|
||||
primary_color_hex: z.string().length(7),
|
||||
secondary_color_hex: z.string().length(7),
|
||||
text_color_hex: z.string().length(7),
|
||||
// primary_color_hex: z.string().length(7),
|
||||
// secondary_color_hex: z.string().length(7),
|
||||
// text_color_hex: z.string().length(7),
|
||||
domain: z.string().refine((key) => key === null || /^[a-z0-9\.\-]*$/.test(key), {
|
||||
message: "Invalid domain"
|
||||
}).nullable(),
|
||||
use_freebie: z.boolean().default(false),
|
||||
freebie_name: z.string().nullable(),
|
||||
freebie_title: z.string().nullable(),
|
||||
freebie_url: z.string().nullable(),
|
||||
freebie_image_url: z.string().nullable(),
|
||||
freebie_text: z.string().nullable(),
|
||||
@ -20,13 +20,6 @@ export const schema = z.object({
|
||||
}).superRefine((data, ctx) => {
|
||||
console.log(data);
|
||||
if (data.use_freebie) {
|
||||
if (!data.freebie_name || data.freebie_name.length === 0) {
|
||||
ctx.addIssue({
|
||||
path: ['freebie_name'],
|
||||
message: "A freebie name' is required when 'Use freebie' is true.",
|
||||
code: "custom"
|
||||
});
|
||||
}
|
||||
if (!data.freebie_url) {
|
||||
ctx.addIssue({
|
||||
path: ['freebie_url'],
|
||||
|
Loading…
Reference in New Issue
Block a user