From 09d86dd7218c3e99b0a8e4b0cc67722bfde909db Mon Sep 17 00:00:00 2001 From: Xyphyn Date: Fri, 30 Jun 2023 19:44:30 -0700 Subject: [PATCH] feat: Add comment trees --- package.json | 2 +- src/lib/components/RelativeDate.svelte | 12 +++ src/lib/lemmy.ts | 2 +- src/routes/+page.server.ts | 5 + src/routes/+page.svelte | 24 ++++- src/routes/post/[id]/+page.svelte | 131 ++++++++++++++++++++----- src/routes/post/[id]/Avatar.svelte | 8 ++ src/routes/post/[id]/Comment.svelte | 47 +++++++++ src/routes/post/[id]/Comments.svelte | 22 +++++ src/routes/post/[id]/Post.svelte | 118 ++++++++++++---------- src/routes/post/[id]/comments.ts | 7 ++ src/style/app.css | 20 +++- yarn.lock | 18 ++++ 13 files changed, 325 insertions(+), 91 deletions(-) create mode 100644 src/lib/components/RelativeDate.svelte create mode 100644 src/routes/+page.server.ts create mode 100644 src/routes/post/[id]/Avatar.svelte create mode 100644 src/routes/post/[id]/Comments.svelte create mode 100644 src/routes/post/[id]/comments.ts diff --git a/package.json b/package.json index 959363d8..b78ff889 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "svelte": "^3.54.0", "svelte-check": "^3.0.1", "svelte-hero-icons": "^5.0.0", + "svelte-markdown": "^0.2.3", "tailwindcss": "^3.3.2", "tslib": "^2.4.1", "typescript": "^5.0.0", @@ -26,7 +27,6 @@ }, "dependencies": { "lemmy-js-client": "^0.18.0-rc.2" - }, "type": "module" } diff --git a/src/lib/components/RelativeDate.svelte b/src/lib/components/RelativeDate.svelte new file mode 100644 index 00000000..3e35e578 --- /dev/null +++ b/src/lib/components/RelativeDate.svelte @@ -0,0 +1,12 @@ + + +{rtf} diff --git a/src/lib/lemmy.ts b/src/lib/lemmy.ts index 697e0f5f..a2f5316a 100644 --- a/src/lib/lemmy.ts +++ b/src/lib/lemmy.ts @@ -1,3 +1,3 @@ import { LemmyHttp } from 'lemmy-js-client' -export const lemmy = new LemmyHttp('https://lemmy.ml') \ No newline at end of file +export const lemmy = new LemmyHttp('https://programming.dev') diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts new file mode 100644 index 00000000..07653513 --- /dev/null +++ b/src/routes/+page.server.ts @@ -0,0 +1,5 @@ +import { lemmy } from '$lib/lemmy.js' + +export function load() { + return lemmy.getPosts({ limit: 20, page: 1 }) +} diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 61b9f231..1d7e8efd 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,10 +1,24 @@ - -
- Go +
+
+ + +
+ {#each data.posts as post} + + {/each} +
+
+
+

Lemmy

+
diff --git a/src/routes/post/[id]/+page.svelte b/src/routes/post/[id]/+page.svelte index d20300ab..e19cb850 100644 --- a/src/routes/post/[id]/+page.svelte +++ b/src/routes/post/[id]/+page.svelte @@ -1,36 +1,115 @@
- - c/{postData.community.name} - {postData.creator.name} - -

{post.name}

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

{post.body}

- {/if} + + c/{postData.community.name} + {postData.creator.name} + +

{post.name}

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

+ {post.body} +

+ {/if}
-
Comments
- +
Comments
+
-{#each comments as comment} - {comment.comment.content} -{/each} + diff --git a/src/routes/post/[id]/Avatar.svelte b/src/routes/post/[id]/Avatar.svelte new file mode 100644 index 00000000..eceeebf6 --- /dev/null +++ b/src/routes/post/[id]/Avatar.svelte @@ -0,0 +1,8 @@ + + + diff --git a/src/routes/post/[id]/Comment.svelte b/src/routes/post/[id]/Comment.svelte index e69de29b..dd862b93 100644 --- a/src/routes/post/[id]/Comment.svelte +++ b/src/routes/post/[id]/Comment.svelte @@ -0,0 +1,47 @@ + + +
  • +
    + + + {node.comment_view.creator.name} + + {node.comment_view.counts.score} point{node.comment_view.counts.score == + 1 + ? '' + : 's'} + + + + + +
    +
    + +
    + + + {node.comment_view.counts.score} + + +
    +
    +
    +
    +
  • diff --git a/src/routes/post/[id]/Comments.svelte b/src/routes/post/[id]/Comments.svelte new file mode 100644 index 00000000..40fb687b --- /dev/null +++ b/src/routes/post/[id]/Comments.svelte @@ -0,0 +1,22 @@ + + +
      + {#each nodes.slice(0, maxComments) as node} + + {#if node.children?.length > 0} + + {/if} + {/each} +
    diff --git a/src/routes/post/[id]/Post.svelte b/src/routes/post/[id]/Post.svelte index 5449a5ba..01c97c72 100644 --- a/src/routes/post/[id]/Post.svelte +++ b/src/routes/post/[id]/Post.svelte @@ -1,66 +1,76 @@
    -
    - - c/{postRes.community.name} - {postRes.creator.name} - -

    {post.name}

    - {#if post.url} - + + c/{postRes.community.name} + {postRes.creator.name} + + + + +

    {post.name}

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

    - {post.body} -

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

    + {post.body} +

    + {/if} +
    +
    +
    + + {postRes.counts.score} +
    -
    -
    - - {postRes.counts.score} - -
    - - - {postRes.counts.comments} - -
    + + + {postRes.counts.comments} + +
    diff --git a/src/routes/post/[id]/comments.ts b/src/routes/post/[id]/comments.ts new file mode 100644 index 00000000..f93b5434 --- /dev/null +++ b/src/routes/post/[id]/comments.ts @@ -0,0 +1,7 @@ +import type { CommentView } from 'lemmy-js-client' + +export interface CommentNodeI { + comment_view: CommentView + children: Array + depth: number +} diff --git a/src/style/app.css b/src/style/app.css index 22169511..d1a04ba4 100644 --- a/src/style/app.css +++ b/src/style/app.css @@ -3,13 +3,25 @@ @tailwind utilities; :root { - @apply bg-slate-50 dark:bg-zinc-950 text-zinc-900 dark:text-slate-100; + @apply bg-slate-50 dark:bg-zinc-950 text-zinc-900 + dark:text-slate-100; +} + +@media (prefers-color-scheme: dark) { + :root { + color-scheme: dark; + } } #nprogress .bar { - @apply bg-black dark:bg-white !important; + @apply bg-black dark:bg-white !important; } #nprogress .peg { - display: none !important; -} \ No newline at end of file + display: none !important; +} + +pre { + @apply bg-slate-100 p-2 rounded-md m-2 max-w-full whitespace-pre-wrap + border-slate-200 border dark:bg-zinc-900 dark:border-zinc-800 text-sm; +} diff --git a/yarn.lock b/yarn.lock index c368d55a..d571a084 100644 --- a/yarn.lock +++ b/yarn.lock @@ -235,6 +235,11 @@ resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.5.1.tgz#b29aa1f91a59f35e29ff8f7cb24faf1a3a750554" integrity sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g== +"@types/marked@^4.0.1": + version "4.3.1" + resolved "https://registry.yarnpkg.com/@types/marked/-/marked-4.3.1.tgz#45fb6dfd47afb595766c71ed7749ead23f137de3" + integrity sha512-vSSbKZFbNktrQ15v7o1EaH78EbWV+sPQbPjHG+Cp8CaNcPFUEfjZ0Iml/V0bFDwsTlYe8o6XC5Hfdp91cqPV2g== + "@types/nprogress@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@types/nprogress/-/nprogress-0.2.0.tgz#86c593682d4199212a0509cc3c4d562bbbd6e45f" @@ -679,6 +684,11 @@ magic-string@^0.30.0: dependencies: "@jridgewell/sourcemap-codec" "^1.4.13" +marked@^4.0.10: + version "4.3.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.3.0.tgz#796362821b019f734054582038b116481b456cf3" + integrity sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A== + merge2@^1.3.0: version "1.4.1" resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" @@ -1057,6 +1067,14 @@ svelte-hmr@^0.15.1: resolved "https://registry.yarnpkg.com/svelte-hmr/-/svelte-hmr-0.15.2.tgz#d2f6fc82e040f2734abd54cea5cbef46828f2538" integrity sha512-q/bAruCvFLwvNbeE1x3n37TYFb3mTBJ6TrCq6p2CoFbSTNhDE9oAtEfpy+wmc9So8AG0Tja+X0/mJzX9tSfvIg== +svelte-markdown@^0.2.3: + version "0.2.3" + resolved "https://registry.yarnpkg.com/svelte-markdown/-/svelte-markdown-0.2.3.tgz#16c6db61605512100cf25c3e18f8e4105837895c" + integrity sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A== + dependencies: + "@types/marked" "^4.0.1" + marked "^4.0.10" + svelte-preprocess@^5.0.3: version "5.0.4" resolved "https://registry.yarnpkg.com/svelte-preprocess/-/svelte-preprocess-5.0.4.tgz#2123898e079a074f7f4ef1799e10e037f5bcc55b"