From e368b99775274150df5001a4dde2c46725d3e9b5 Mon Sep 17 00:00:00 2001
From: Xodrium <118943715+malloc62@users.noreply.github.com>
Date: Sat, 11 Feb 2023 19:42:10 -0500
Subject: [PATCH] Better formatting
---
src/lib/components/PostBody.svelte | 30 ++++++++++++---
src/lib/db/db.js | 17 ++++++++-
src/lib/util.js | 37 +++++++++++++++----
src/routes/new_post/+page.svelte | 6 +++
src/routes/user/[user]/+page.js | 2 +-
src/routes/user/[user]/+page.svelte | 57 ++++++++++++++++++-----------
6 files changed, 111 insertions(+), 38 deletions(-)
diff --git a/src/lib/components/PostBody.svelte b/src/lib/components/PostBody.svelte
index ea14f4a..75d1493 100644
--- a/src/lib/components/PostBody.svelte
+++ b/src/lib/components/PostBody.svelte
@@ -1,7 +1,15 @@
@@ -18,10 +26,20 @@
{#each contentSplit as line}
- {#if line && line.type == 'img'}
- {line}
+ {#each line as elem}
+ {#if elem && elem.type == 'img'}
+ {#if line.filter(x => x.type == 'img').length < 2}
+
- {:else}
-
+ {:else}
+
+ {/if}
+ {:else if elem.type == 'link'}
+ {elem.display + ' '}
+ {:else}
+ {elem + ' '}
+ {/if}
+ {/each}
+
img||filename.blah embeds a user-uploaded file in this site
++ @user mentions a user +
++ #post replies to a post by ID +
\ No newline at end of file diff --git a/src/routes/user/[user]/+page.js b/src/routes/user/[user]/+page.js index 0818dd1..9fb0dad 100644 --- a/src/routes/user/[user]/+page.js +++ b/src/routes/user/[user]/+page.js @@ -14,7 +14,7 @@ export async function load({ fetch, params, url }) { const postJson = await res.json(); const resUser = await fetch(`/api/userGet?user=${user}`); - const postJsonUser = await resUser.json(); + const postJsonUser = (await resUser.json()) || {}; return { postJson, id, postJsonUser }; } \ No newline at end of file diff --git a/src/routes/user/[user]/+page.svelte b/src/routes/user/[user]/+page.svelte index 64b6db3..2fe86ce 100644 --- a/src/routes/user/[user]/+page.svelte +++ b/src/routes/user/[user]/+page.svelte @@ -8,27 +8,42 @@ let userData = data.postJsonUser.data; - - - - {userData.username} - - - -- Reputation: {userData.reputation} -
-- Upvotes: {userData.upvotes} -
-- Downvotes: {userData.downvotes} -
- - - - - +{#if userData} + + + + {userData.username} + + + ++ Reputation: {userData.reputation} +
++ Upvotes: {userData.upvotes} +
++ Downvotes: {userData.downvotes} +
+ + + + + +{:else} + + + + Error + + + + + + This user does not exist. + + +{/if}