From 52dbf0195dd1e05f07df77cff5e4ba6d6ee9ec32 Mon Sep 17 00:00:00 2001 From: orangix Date: Tue, 15 Aug 2023 20:57:04 +0200 Subject: [PATCH] fixed user comments UI --- pages/user.go | 3 -- views/partials/contextComment.hbs | 65 +++++++++++++------------------ views/user.hbs | 5 +++ views/userComments.hbs | 5 +++ 4 files changed, 38 insertions(+), 40 deletions(-) diff --git a/pages/user.go b/pages/user.go index 05b0355..0a9cc4b 100644 --- a/pages/user.go +++ b/pages/user.go @@ -1,7 +1,6 @@ package pages import ( - "fmt" "strconv" "codeberg.org/rimgo/rimgo/utils" @@ -97,8 +96,6 @@ func HandleUserComments(c *fiber.Ctx) error { return err } - fmt.Println(comments[0].Post.Cover.Url) //FIXME:debug - return c.Render("userComments", fiber.Map{ "user": user, "comments": comments, diff --git a/views/partials/contextComment.hbs b/views/partials/contextComment.hbs index 1faf833..5d06633 100644 --- a/views/partials/contextComment.hbs +++ b/views/partials/contextComment.hbs @@ -1,39 +1,30 @@ -
- - -
- {{#noteq this.User.Username "[deleted]"}} - - -

{{this.User.Username}}

-
- {{/noteq}} - {{#equal this.User.Username "[deleted]"}} -

[deleted]

- {{/equal}} -
-
-

{{{this.Comment}}}

- \ No newline at end of file + \ No newline at end of file diff --git a/views/user.hbs b/views/user.hbs index 0243e1b..2213f59 100644 --- a/views/user.hbs +++ b/views/user.hbs @@ -21,6 +21,11 @@

{{user.Username}}

{{user.Points}} pts · {{user.CreatedAt}}

+
+

{{user.Bio}}

diff --git a/views/userComments.hbs b/views/userComments.hbs index c7be3e4..662c73a 100644 --- a/views/userComments.hbs +++ b/views/userComments.hbs @@ -21,6 +21,11 @@

{{user.Username}}

{{user.Points}} pts · {{user.CreatedAt}}

+
+
+ Submissions + Comments +

{{user.Bio}}