From d6ed6fbab198f37c8848713c76bc1a6ddf208a5c Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Sat, 1 Jul 2023 11:47:34 -0700 Subject: [PATCH] misc: Fix overflow (hopefully) --- src/routes/+layout.svelte | 2 +- src/routes/+page.server.ts | 12 +++++-- src/routes/+page.svelte | 48 ++++++++++++++++++++++------ src/routes/post/[id]/+page.svelte | 17 ++++++---- src/routes/post/[id]/Avatar.svelte | 2 +- src/routes/post/[id]/Comment.svelte | 3 +- src/routes/post/[id]/Comments.svelte | 2 +- src/routes/post/[id]/Post.svelte | 16 ++++------ 8 files changed, 70 insertions(+), 32 deletions(-) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index bcf1827c..f971e296 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -22,6 +22,6 @@ -
+
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts index 31071bc3..689a9327 100644 --- a/src/routes/+page.server.ts +++ b/src/routes/+page.server.ts @@ -1,12 +1,18 @@ import { lemmy } from '$lib/lemmy.js' +import type { ListingType, SortType } from 'lemmy-js-client' export function load(req) { const page = Number(req.url.searchParams.get('page') || 1) || 1 - console.log(page) + + const sort: SortType = + (req.url.searchParams.get('sort') as SortType) || 'Active' + const listingType: ListingType = + (req.url.searchParams.get('type') as ListingType) || 'Local' + return lemmy.getPosts({ limit: 40, page: page, - sort: 'Active', - type_: 'Local', + sort: sort, + type_: listingType, }) } diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b4fcb29b..f017a734 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -9,25 +9,55 @@ export let data -
+
- +
+ { + const url = $page.url + url.searchParams.set('type', e.detail) + url.searchParams.delete('page') + goto(url, { + invalidateAll: true, + }) + }} + /> + { + const url = $page.url + url.searchParams.set('sort', e.detail) + url.searchParams.delete('page') + goto(url, { + invalidateAll: true, + }) + }} + /> +
-
+
{#each data.posts as post} {/each}
- +
diff --git a/src/routes/post/[id]/+page.svelte b/src/routes/post/[id]/+page.svelte index e19cb850..003225bf 100644 --- a/src/routes/post/[id]/+page.svelte +++ b/src/routes/post/[id]/+page.svelte @@ -8,6 +8,7 @@ } from 'lemmy-js-client' import type { CommentNodeI } from './comments.js' import Comments from './Comments.svelte' + import SvelteMarkdown from 'svelte-markdown' export let data: { post: GetPostResponse; comments: GetCommentsResponse } @@ -81,12 +82,9 @@ return tree } - - let newComment = '' - - async function comment() {} +{data.post.post_view.post.name}
c/{postData.community.name} @@ -94,13 +92,18 @@

{post.name}

{#if post.thumbnail_url} - {post.name} + {post.name} {/if} {#if post.body}

- {post.body} +

{/if}
diff --git a/src/routes/post/[id]/Avatar.svelte b/src/routes/post/[id]/Avatar.svelte index eceeebf6..95905de2 100644 --- a/src/routes/post/[id]/Avatar.svelte +++ b/src/routes/post/[id]/Avatar.svelte @@ -5,4 +5,4 @@ export let width: number - + diff --git a/src/routes/post/[id]/Comment.svelte b/src/routes/post/[id]/Comment.svelte index dd862b93..7f22c643 100644 --- a/src/routes/post/[id]/Comment.svelte +++ b/src/routes/post/[id]/Comment.svelte @@ -6,10 +6,11 @@ import RelativeDate from '$lib/components/RelativeDate.svelte' export let node: CommentNodeI + export let open = true
  • -
    +
    {#each nodes.slice(0, maxComments) as node} - + {#if node.children?.length > 0} {/if} diff --git a/src/routes/post/[id]/Post.svelte b/src/routes/post/[id]/Post.svelte index 2a1f1c15..45866a39 100644 --- a/src/routes/post/[id]/Post.svelte +++ b/src/routes/post/[id]/Post.svelte @@ -18,8 +18,6 @@ let postRes: PostView export { postRes as post } - - const post = postRes.post
    -

    {post.name}

    - {#if post.url} +

    {postRes.post.name}

    + {#if postRes.post.url} - {post.url} + {postRes.post.url} {/if} - {#if post.body} + {#if postRes.post.body}

    - {post.body} + {postRes.post.body}

    {/if}
    @@ -67,7 +65,7 @@ {postRes.counts.comments}