From f45bad52b7c2f001ad7cac5710f65aa1c35faf18 Mon Sep 17 00:00:00 2001
From: Omer Sabic <osabic2004@gmail.com>
Date: Fri, 7 Jun 2024 16:08:25 +0200
Subject: [PATCH] feafa

---
 src/routes/(app)/+layout.svelte             |  4 ++--
 src/routes/(app)/+page.svelte               |  2 +-
 src/routes/(app)/articles/+page.server.js   |  2 +-
 src/routes/(app)/articles/+page.svelte      | 21 +++++++++++++++++----
 src/routes/(app)/articles/delete/+server.js | 13 +++++++++++++
 src/routes/(app)/emails/+page.svelte        |  2 +-
 src/routes/(app)/website/schema.js          | 12 +++++++++++-
 7 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 src/routes/(app)/articles/delete/+server.js

diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 224c5d9..a23f41d 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -116,8 +116,8 @@
 				<DropdownMenu.Content align="end">
 					<DropdownMenu.Label>My Account</DropdownMenu.Label>
 					<DropdownMenu.Separator />
-					<DropdownMenu.Item href={config.api_url + "/me/billing"}>Billing</DropdownMenu.Item>
-					<DropdownMenu.Item>Support</DropdownMenu.Item>
+					<!-- <DropdownMenu.Item href={config.api_url + "/me/billing"}>Billing</DropdownMenu.Item> -->
+					<DropdownMenu.Item><a href="mailto:osabic2004@gmail.com?Subject=Youpage.ai support">Support</a></DropdownMenu.Item>
 					<DropdownMenu.Separator />
 					<DropdownMenu.Item on:click={logout}>Logout</DropdownMenu.Item>
 				</DropdownMenu.Content>
diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 56240a5..21c118b 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -23,7 +23,7 @@
 		</Card.Header>
 		<Card.Content>
 			<div class="text-2xl font-bold">{data.dashboard_info.totalArticles}</div>
-			<p class="text-xs text-muted-foreground">7 remaining this month</p>
+			<!-- <p class="text-xs text-muted-foreground">7 remaining this month</p> -->
 		</Card.Content>
 	</Card.Root>
 	<!-- <Card.Root>
diff --git a/src/routes/(app)/articles/+page.server.js b/src/routes/(app)/articles/+page.server.js
index 39f8674..317c5b6 100644
--- a/src/routes/(app)/articles/+page.server.js
+++ b/src/routes/(app)/articles/+page.server.js
@@ -86,7 +86,7 @@ export const actions = {
         return {
             form
         }
-    }
+    },
 };
 
 /**
diff --git a/src/routes/(app)/articles/+page.svelte b/src/routes/(app)/articles/+page.svelte
index b170aac..beaca76 100644
--- a/src/routes/(app)/articles/+page.svelte
+++ b/src/routes/(app)/articles/+page.svelte
@@ -10,6 +10,8 @@
 	import { ChevronLeft } from 'svelte-radix';
 	import { onMount } from 'svelte';
 	import { browser } from '$app/environment';
+	import {config} from '$lib';
+	
 
 	/** @type {import("./$types").PageData} */
 	export let data;
@@ -41,7 +43,18 @@
 		}
 
 		currentPage = Number(pageQuery.get("page"));
-	})
+	});
+
+	/**
+	 * @param {string} id
+	 */
+	async function deleteArticle(id) {
+		await fetch("/articles/delete?id="+id, {
+			method: "DELETE"
+		});
+
+		document.querySelector(`tr[name="article-row-${id}"]`)?.remove()
+	}
 
 	$: {
 		if(data) {
@@ -76,7 +89,7 @@
 			</Table.Header>
 			<Table.Body>
 				{#each data.articles as article, i (i)}
-					<Table.Row>
+					<Table.Row name="article-row-{article.id}">
 						<Table.Cell class="font-medium">
 							{#if article.is_public}
 								<Eye class="mx-auto h-5 w-5" />
@@ -95,7 +108,7 @@
 								variant="outline"
 								size="icon"
 								tip="Preview"
-								on:click={() => window.open('/site/' + data.site.id + '/' + article.seo_slug)}
+								on:click={() => window.location.href = `http://${data.site.subdomain_slug}.${config.sites_url}/${article.seo_slug}`}
 							>
 								<ExternalLink size="1rem" />
 							</TooltipButton>
@@ -107,7 +120,7 @@
 							>
 								<Pen size="1rem" />
 							</TooltipButton>
-							<TooltipButton class="hover:bg-red-600" variant="outline" size="icon" tip="Delete">
+							<TooltipButton class="hover:bg-red-600" variant="outline" size="icon" tip="Delete" on:click={() => deleteArticle(article.id)}>
 								<Trash size="1rem" />
 							</TooltipButton>
 						</Table.Cell>
diff --git a/src/routes/(app)/articles/delete/+server.js b/src/routes/(app)/articles/delete/+server.js
new file mode 100644
index 0000000..70a9a7a
--- /dev/null
+++ b/src/routes/(app)/articles/delete/+server.js
@@ -0,0 +1,13 @@
+import { config } from '$lib';
+import { error, json, text } from '@sveltejs/kit';
+
+/** @type {import('./$types').RequestHandler} */
+export async function DELETE(event) {
+	if(!event.url.searchParams.has("id")) return error(400);
+    const id = event.url.searchParams.get("id");
+
+    const response = await event.fetch(config.api_url + "/dashboard/article?id=" + id, {
+        method: "DELETE"
+    }).then(x=>x.json());
+	return json(response);
+}
diff --git a/src/routes/(app)/emails/+page.svelte b/src/routes/(app)/emails/+page.svelte
index bec93ff..9762d11 100644
--- a/src/routes/(app)/emails/+page.svelte
+++ b/src/routes/(app)/emails/+page.svelte
@@ -44,7 +44,7 @@
 			<Table.Row>
 				<Table.Head class="max-w-[300px]">Email</Table.Head>
 				<Table.Head class="text-end">Date and Time</Table.Head>
-				<Table.Head class="text-end">Actions</Table.Head>
+				<!-- <Table.Head class="text-end">Actions</Table.Head> -->
 			</Table.Row>
 		</Table.Header>
 		<Table.Body>
diff --git a/src/routes/(app)/website/schema.js b/src/routes/(app)/website/schema.js
index 1dc6db5..35f4fdf 100644
--- a/src/routes/(app)/website/schema.js
+++ b/src/routes/(app)/website/schema.js
@@ -1,12 +1,22 @@
 import { z } from "zod";
 
+const domain_regex = /^[a-z0-9\.\-]*$/;
+
+/**
+ * @param {string} key 
+ * @returns {boolean}
+ */
+const isValidDomain = key => domain_regex.test(key);
+
 export const schema = z.object({
     id: z.string(),
     name: z.string().min(4).max(16),
     primary_color_hex: z.string().length(7),
     secondary_color_hex: z.string().length(7),
     text_color_hex: z.string().length(7),
-    domain: z.string().optional(),
+    domain: z.string().refine(isValidDomain, {
+        message: "Invalid domain"
+    }).optional(),
     use_freebie: z.boolean().default(false),
     freebie_name: z.string().optional(),
     freebie_url: z.string().optional(),