From 243f2dfb47e0a5f876b24ba5bf850bbe72d9fde9 Mon Sep 17 00:00:00 2001 From: rob Date: Sun, 25 Sep 2022 05:51:26 -0400 Subject: [PATCH] public room browser --- app/services/chat.js | 3 ++- app/views/chat/index.pug | 4 +--- app/views/chat/room/index.pug | 12 +++++++++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/services/chat.js b/app/services/chat.js index 44035ab..5bdcc56 100644 --- a/app/services/chat.js +++ b/app/services/chat.js @@ -265,6 +265,7 @@ class ChatService extends SiteService { skip: 0, cpp: 50 }, pagination); + const totalPublicRooms = await ChatRoom.countDocuments({ visibility: 'public' }); const rooms = await ChatRoom .find({ visibility: 'public' }) .sort({ lastActivity: -1, created: -1 }) @@ -272,7 +273,7 @@ class ChatService extends SiteService { .limit(pagination.cpp) .populate(this.populateChatRoom) .lean(); - return rooms; + return { rooms, totalPublicRooms }; } async getRoomById (roomId) { diff --git a/app/views/chat/index.pug b/app/views/chat/index.pug index 517ca93..48c1653 100644 --- a/app/views/chat/index.pug +++ b/app/views/chat/index.pug @@ -19,6 +19,4 @@ block content each message in timeline +renderChatMessage(message, { includeRoomInfo: true }) .chat-message-menu - button(type="button", onclick="return dtp.app.chat.resumeChatScroll(event);").chat-scroll-return Resume scrolling - - //- pre= JSON.stringify(userTimeline, null, 2) \ No newline at end of file + button(type="button", onclick="return dtp.app.chat.resumeChatScroll(event);").chat-scroll-return Resume scrolling \ No newline at end of file diff --git a/app/views/chat/room/index.pug b/app/views/chat/room/index.pug index cb155af..961f67d 100644 --- a/app/views/chat/room/index.pug +++ b/app/views/chat/room/index.pug @@ -1,6 +1,8 @@ extends ../layouts/room block content + include ../../components/pagination-bar + mixin renderRoomTile (room) a(href=`/chat/room/${room._id}`).uk-display-block.uk-link-reset div(data-room-id= room._id, data-room-name= room.name).uk-tile.uk-tile-default.uk-tile-small @@ -24,11 +26,15 @@ block content .uk-card.uk-card-default.uk-card-small .uk-card-header h1.uk-card-title Public Chat Rooms + .uk-card-body - if Array.isArray(publicRooms) && (publicRooms.length > 0) + if Array.isArray(publicRooms.rooms) && (publicRooms.rooms.length > 0) div(uk-grid) - each room in publicRooms + each room in publicRooms.rooms div(class="uk-width-1-1 uk-width-1-2@m uk-width-1-3@l") +renderRoomTile(room) else - div #{site.name} has no public rooms. \ No newline at end of file + div #{site.name} has no public rooms. + + .uk-card-footer + +renderPaginationBar('/chat/room', publicRooms.totalRoomCount) \ No newline at end of file