Browse Source

Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

develop
Rob Colbert 2 years ago
parent
commit
81d2a119f6
  1. 1
      app/services/comment.js
  2. 2
      app/views/chat/room/view.pug
  3. 2
      app/views/comment/components/comment.pug
  4. 8
      app/views/user/profile.pug

1
app/services/comment.js

@ -42,6 +42,7 @@ class CommentService extends SiteService {
{ {
path: 'author', path: 'author',
select: '_id username username_lc displayName picture', select: '_id username username_lc displayName picture',
strictPopulate: false,
}, },
], ],
}, },

2
app/views/chat/room/view.pug

@ -23,7 +23,7 @@ block content
.uk-width-auto .uk-width-auto
.uk-inline .uk-inline
button(type="button").uk-button.uk-button-link.uk-button-small button(type="button").uk-button.uk-button-link.uk-button-small
i.fas.fa-ellipsis-h i.fas.fa-ellipsis-v
#chat-room-menu(uk-dropdown={ pos: 'bottom-right', mode: 'click' }) #chat-room-menu(uk-dropdown={ pos: 'bottom-right', mode: 'click' })
ul.uk-nav.uk-nav-default.uk-dropdown-nav ul.uk-nav.uk-nav-default.uk-dropdown-nav
li li

2
app/views/comment/components/comment.pug

@ -19,7 +19,7 @@ mixin renderComment (comment, options)
.uk-width-auto .uk-width-auto
button(type="button").uk-button.uk-button-link button(type="button").uk-button.uk-button-link
span span
i.fas.fa-ellipsis-h i.fas.fa-ellipsis-v
div(data-comment-id= comment._id, uk-dropdown={ mode: 'click', pos: 'bottom-right' }) div(data-comment-id= comment._id, uk-dropdown={ mode: 'click', pos: 'bottom-right' })
ul.uk-nav.uk-dropdown-nav ul.uk-nav.uk-dropdown-nav
if user && user._id.equals(comment.author._id) if user && user._id.equals(comment.author._id)

8
app/views/user/profile.pug

@ -23,5 +23,9 @@ block content
each badge in userProfile.badges each badge in userProfile.badges
.uk-width-auto .uk-width-auto
alert.uk-label= badge alert.uk-label= badge
p Your profile is where you edit your account settings, configure your commenting defaults, and otherwise manage how you use #[+renderSiteLink()]. h2 Recent Comments
ul.uk-list
each comment in commentHistory
li
+renderComment(comment, { })
Loading…
Cancel
Save