diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 54b3e42..379f52c 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -3,19 +3,18 @@ import Menu from 'lucide-svelte/icons/menu'; import Package2 from 'lucide-svelte/icons/package-2'; - import Search from 'lucide-svelte/icons/search'; import CircleUser from 'lucide-svelte/icons/circle-user'; import Sun from 'svelte-radix/Sun.svelte'; import Moon from 'svelte-radix/Moon.svelte'; import * as DropdownMenu from '$lib/components/ui/dropdown-menu/index.js'; - import { Input } from '$lib/components/ui/input/index.js'; import * as Sheet from '$lib/components/ui/sheet/index.js'; import { Button } from '$lib/components/ui/button/index.js'; import { ModeWatcher, toggleMode } from 'mode-watcher'; import { Toaster } from '$lib/components/ui/sonner'; import { config } from '$lib'; + import * as Dialog from '$lib/components/ui/dialog'; /** @type {import('./$types').LayoutServerData} */ export let data; @@ -24,14 +23,16 @@ { name: 'Dashboard', redirect: '/' }, { name: 'Articles', redirect: '/articles' }, { name: 'Emails', redirect: '/emails' }, - { name: 'Website', redirect: '/website' }, + { name: 'Website', redirect: '/website' } // { name: 'Analytics', redirect: '##' }, ]; async function logout() { - fetch("/auth/logout"); - window.location.href = "/auth" + fetch('/auth/logout'); + window.location.href = '/auth'; } + + const is_subscribed = new Date(data.me.subscribed_until) > new Date(); @@ -47,7 +48,9 @@ {data.me.name} {#each navs as nav} - {nav.name} + {nav.name} {/each} @@ -64,7 +67,7 @@ {data.me.name} {#each navs as nav} - {nav.name} + {nav.name} {/each}
--> -
+
Tokens: {data.me.tokens} -
+
+ + +{/if} + diff --git a/src/routes/(app)/articles/+page.server.js b/src/routes/(app)/articles/+page.server.js index 24cc2cd..b5f13df 100644 --- a/src/routes/(app)/articles/+page.server.js +++ b/src/routes/(app)/articles/+page.server.js @@ -3,9 +3,11 @@ import { message, setError, superValidate, fail } from "sveltekit-superforms"; import { createFormSchema, editFormSchema } from "./schema"; import { zod } from "sveltekit-superforms/adapters"; +const articlesPerPage = 10; + /** @type {import("./$types").PageServerLoad} */ export const load = async ({ fetch, url, request }) => { - const offset = (Number(url.searchParams.get("page") || 1) - 1) * 10; + const offset = (Number(url.searchParams.get("page") || 1) - 1) * articlesPerPage; // @ts-ignore const blogRes = await fetch(config.api_url + "/blog?mine=true&offset=" + offset, { credentials: 'include' diff --git a/src/routes/(app)/articles/+page.svelte b/src/routes/(app)/articles/+page.svelte index ab63cb7..dc4c4f0 100644 --- a/src/routes/(app)/articles/+page.svelte +++ b/src/routes/(app)/articles/+page.svelte @@ -12,6 +12,7 @@ import { browser } from '$app/environment'; import {config} from '$lib'; + const articlesPerPage = 10; /** @type {import("./$types").PageData} */ export let data; @@ -30,7 +31,8 @@ }); } - let currentPage = 1; + /** @type {Number} */ + let currentPage; onMount(() => { if(!browser) return; @@ -61,7 +63,9 @@ isLoading = false; } } - $: currentPage + // $: { + // console.log(currentPage) + // } let isLoading = true; @@ -132,7 +136,7 @@ - +