yeah

d3rpp-dev · Aug 25, 2024 · 59911f7 · 59911f7
1 parent 4c2d260
commit 59911f7
Show file tree

Hide file tree

Showing 31 changed files with 62 additions and 35 deletions.
diff --git a/src/hooks.server.ts b/src/hooks.server.ts
@@ -2,6 +2,7 @@ import { lucia } from "$lib/server/auth/adapter";
 import { authHook } from "$lib/server/auth/hook";
 import { createContext } from "$lib/server/trpc/context";
 import { router } from "$lib/server/trpc/router";
+import { TRPC_PATH } from "$lib/trpc/client";
 
 import type { Handle } from "@sveltejs/kit";
 import { sequence } from "@sveltejs/kit/hooks";
@@ -17,5 +18,5 @@ setInterval(() => {
 
 export const handle: Handle = sequence(
 	authHook,
-	createTRPCHandle({ router, createContext }),
+	createTRPCHandle({ router, createContext, url: TRPC_PATH }),
 );
diff --git a/src/lib/components/ui/avatar/avatar-fallback.svelte b/src/lib/components/ui/avatar/avatar-fallback.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Avatar as AvatarPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	type $$Props = AvatarPrimitive.FallbackProps;
 

diff --git a/src/lib/components/ui/avatar/avatar-image.svelte b/src/lib/components/ui/avatar/avatar-image.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Avatar as AvatarPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	type $$Props = AvatarPrimitive.ImageProps;
 

diff --git a/src/lib/components/ui/avatar/avatar.svelte b/src/lib/components/ui/avatar/avatar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Avatar as AvatarPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	type $$Props = AvatarPrimitive.Props;
 

diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { Button as ButtonPrimitive } from "bits-ui";
-	import { type Props, buttonVariants } from "./index.js";
-	import { cn } from "$lib/utils.js";
+	import { type Props, buttonVariants } from "./index";
+	import { cn } from "$lib/utils";
 
 	let {
 		class: className,

diff --git a/src/lib/components/ui/card/card-content.svelte b/src/lib/components/ui/card/card-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/card/card-description.svelte b/src/lib/components/ui/card/card-description.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/card/card-footer.svelte b/src/lib/components/ui/card/card-footer.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/card/card-header.svelte b/src/lib/components/ui/card/card-header.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/card/card-title.svelte b/src/lib/components/ui/card/card-title.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import type { HTMLAttributes } from "svelte/elements";
 	import type { HeadingLevel } from "./index.js";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className = undefined,

diff --git a/src/lib/components/ui/card/card.svelte b/src/lib/components/ui/card/card.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-checkbox-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
 	import Check from "lucide-svelte/icons/check";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { CheckBoxItemProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
-	import { cn, flyAndScale } from "$lib/utils.js";
+	import { cn, flyAndScale } from "$lib/utils";
 
 	import type { ContentProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-item.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { ItemProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-label.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { LabelProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-radio-item.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
 	import Circle from "lucide-svelte/icons/circle";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { RadioItemProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { SeparatorProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-shortcut.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { ShortcutProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
-	import { cn, flyAndScale } from "$lib/utils.js";
+	import { cn, flyAndScale } from "$lib/utils";
 
 	import type { SubContentProps } from ".";
 

diff --git a/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte b/src/lib/components/ui/dropdown-menu/dropdown-menu-sub-trigger.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { DropdownMenu as DropdownMenuPrimitive } from "bits-ui";
 	import ChevronRight from "lucide-svelte/icons/chevron-right";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	import type { SubTriggerProps } from ".";
 

diff --git a/src/lib/components/ui/input/input-file.svelte b/src/lib/components/ui/input/input-file.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLInputAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	let {
 		class: className,

diff --git a/src/lib/components/ui/input/input.svelte b/src/lib/components/ui/input/input.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import type { HTMLInputAttributes } from "svelte/elements";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	let {
 		class: className,

diff --git a/src/lib/components/ui/label/label.svelte b/src/lib/components/ui/label/label.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Label as LabelPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/separator/separator.svelte b/src/lib/components/ui/separator/separator.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Separator as SeparatorPrimitive } from "bits-ui";
-	import { cn } from "$lib/utils.js";
+	import { cn } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/components/ui/tooltip/tooltip-content.svelte b/src/lib/components/ui/tooltip/tooltip-content.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { Tooltip as TooltipPrimitive } from "bits-ui";
-	import { cn, flyAndScale } from "$lib/utils.js";
+	import { cn, flyAndScale } from "$lib/utils";
 
 	const {
 		class: className,

diff --git a/src/lib/server/db.ts b/src/lib/server/db.ts
@@ -15,7 +15,9 @@ sqlite.exec("PRAGMA journal_mode = WAL;");
 sqlite.exec("PRAGMA foreign_keys = on;");
 
 export const DB = drizzle(sqlite, {
-	logger: process.env.NODE_ENV == "development" && ["1", "true"].includes(process.env.LOGGER_ENABLED ?? ""),
+	logger:
+		process.env.NODE_ENV == "development" &&
+		["1", "true"].includes(process.env.LOGGER_ENABLED ?? ""),
 });
 
 /**

diff --git a/src/lib/trpc/client.ts b/src/lib/trpc/client.ts
@@ -1,15 +1,21 @@
 // type imported for TSDoc, ignore this.
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import type { page } from "$app/stores";
+
 import type { Router } from "$lib/server/trpc/router";
 
 import { createTRPCClient, type TRPCClientInit } from "trpc-sveltekit";
 import type { QueryClient } from "@tanstack/svelte-query";
 import { svelteQueryWrapper } from "trpc-svelte-query-adapter";
+
+import { httpBatchLink, loggerLink } from "@trpc/client";
+
 import { browser } from "$app/environment";
 
 let browserClient: ReturnType<typeof svelteQueryWrapper<Router>>;
 
+export const TRPC_PATH = `/__trpc`;
+
 /**
  * allows access to a client-side tRPC client
  *
@@ -19,7 +25,15 @@ let browserClient: ReturnType<typeof svelteQueryWrapper<Router>>;
 export const trpc = (init?: TRPCClientInit, queryClient?: QueryClient) => {
 	if (browser && browserClient) return browserClient;
 	const client = svelteQueryWrapper({
-		client: createTRPCClient<Router>({ init }),
+		client: createTRPCClient<Router>({
+			links: [
+				loggerLink(),
+				httpBatchLink({
+					url: TRPC_PATH,
+					fetch: init?.fetch,
+				}),
+			],
+		}),
 		queryClient,
 	});
 	if (browser) browserClient = client;

diff --git a/src/routes/(app)/app/+page.svelte b/src/routes/(app)/app/+page.svelte
@@ -3,8 +3,17 @@
 
 	import { Button } from "$lib/components/ui/button";
 
+    import { toast } from "svelte-sonner";
+
 	const aaaa = () => {
-		console.error("AAAAAAAA");
+        toast.promise(new Promise(res => setTimeout(res, 5_000)), {
+            loading: "Loading",
+            important: true,
+            finally: () => {
+                toast.success("Done.")
+            }
+        });
+
 	};
 </script>
 

diff --git a/src/routes/(app)/app/account/+page.ts b/src/routes/(app)/app/account/+page.ts
@@ -6,9 +6,11 @@ export const load = (async (event) => {
 	const client = trpc(event, queryClient);
 
 	return {
-		uploadedFileCount:
-			await client.user.getUploadedFiles.createServerQuery(undefined, {
-                ssr: false
-            }),
+		uploadedFileCount: await client.user.getUploadedFiles.createServerQuery(
+			undefined,
+			{
+				ssr: false,
+			},
+		),
 	};
 }) satisfies PageLoad;
diff --git a/src/routes/(auth)/auth/sign-up/+page.svelte b/src/routes/(auth)/auth/sign-up/+page.svelte
@@ -61,7 +61,6 @@
 	 */
 	const username_invalid_error_text: Readable<string | undefined> =
 		derived_store(username_availability_query, (val) => {
-			console.log(val.data);
 			if (val.data && val.data.available === false)
 				return "Username is Taken";
 

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
@@ -27,7 +27,7 @@
 
 <ModeWatcher defaultMode="system" />
 
-<Toaster />
+<Toaster position="bottom-center" />
 
 <QueryClientProvider client={queryClient}>
 	{@render children()}