diff --git a/appview/pages/pages.go b/appview/pages/pages.go --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -1598,6 +1598,7 @@ IsStarred bool StarCount int Owner identity.Identity + CommentList []models.CommentListItem } func (p *Pages) SingleString(w io.Writer, params SingleStringParams) error { diff --git a/appview/strings/strings.go b/appview/strings/strings.go --- a/appview/strings/strings.go +++ b/appview/strings/strings.go @@ -156,6 +156,11 @@ isStarred = db.GetStarStatus(s.Db, user.Did, string.AtUri()) } + comments, err := db.GetComments(s.Db, orm.FilterEq("subject_uri", string.AtUri())) + if err != nil { + l.Error("failed to get comments", "err", err) + } + s.Pages.SingleString(w, pages.SingleStringParams{ LoggedInUser: user, RenderToggle: renderToggle, @@ -165,6 +170,7 @@ IsStarred: isStarred, StarCount: starCount, Owner: id, + CommentList: models.NewCommentList(comments), }) } diff --git a/appview/pages/templates/strings/string.html b/appview/pages/templates/strings/string.html --- a/appview/pages/templates/strings/string.html +++ b/appview/pages/templates/strings/string.html @@ -94,4 +94,61 @@ {{ template "fragments/multiline-select" }} +
+ {{ + template "fragments/comment/commentList" + (dict + "LoggedInUser" .LoggedInUser + "CommentList" .CommentList) + }} + {{ template "newComment" . }} +
+{{ end }} + +{{ define "newComment" }} + {{ if .LoggedInUser }} +
+ +
+
+ {{ template "user/fragments/picHandleLink" .LoggedInUser.Did }} +
+ +
+
+
+ +
+
+ {{ else }} +
+ + sign up + + or + login + to add to the discussion +
+ {{ end }} {{ end }}