From 23b229af119019dc931031faa0be810ccfbfeccd Mon Sep 17 00:00:00 2001 From: OldHawk Date: Sun, 18 Jun 2017 18:02:15 +0800 Subject: [PATCH] feat(messages): load message replies data --- modules/core/client/app/trans-string-en.js | 3 + modules/core/client/app/trans-string-zh.js | 3 + .../controllers/messages.client.controller.js | 101 ++++++++++++++++-- modules/messages/client/less/message.less | 50 +++++++-- .../services/messages.client.service.js | 2 +- .../client/views/box.client.view.html | 48 +++++++-- .../controllers/messages.server.controller.js | 64 +++++++++-- .../server/policies/messages.server.policy.js | 3 +- .../server/routes/messages.server.routes.js | 3 - 9 files changed, 239 insertions(+), 38 deletions(-) diff --git a/modules/core/client/app/trans-string-en.js b/modules/core/client/app/trans-string-en.js index e0f927e1..175defb6 100644 --- a/modules/core/client/app/trans-string-en.js +++ b/modules/core/client/app/trans-string-en.js @@ -261,6 +261,7 @@ EDIT_COMMENT: 'Edit Comment', REPLY_COMMENT: 'Reply Comment', SUBMIT_COMMENT: 'Submit Comment', + SUBMIT_REPLY: 'Submit Reply', SUBMIT_CANCEL: 'Cancel', MARKDOWN_LINK: 'Styling with Markdown is supported', COMMENT_REPLY_BUTTON: '@ & reply', @@ -465,6 +466,7 @@ BUTTON_SEARCH: 'Search', BUTTON_DELETE: '　Delete　', BUTTON_CLOSE: '　Close　', + BUTTON_REPLY: '　Reply　', INPUT_EMAIL: 'email', SEND_INVITE_SUCCESSFULLY: 'Send invitation successfully', SEND_INVITE_ERROR: 'Send invitation failed', @@ -484,6 +486,7 @@ TT_REQUIRED: 'Please enter message title', CT_REQUIRED: 'Please enter message content', LIST_TITLE: 'Title', + LIST_REPLIES: 'Replies', LIST_TYPE: 'Type', LIST_SENDAT: 'SendedAt', LIST_SELECT: 'Select', diff --git a/modules/core/client/app/trans-string-zh.js b/modules/core/client/app/trans-string-zh.js index 54e5f3bd..e7c4c97a 100644 --- a/modules/core/client/app/trans-string-zh.js +++ b/modules/core/client/app/trans-string-zh.js @@ -261,6 +261,7 @@ EDIT_COMMENT: '编辑评论', REPLY_COMMENT: '回复评论', SUBMIT_COMMENT: '提交评论', + SUBMIT_REPLY: '提交回复', SUBMIT_CANCEL: '取消', MARKDOWN_LINK: '排版支持 Markdown 全部格式', COMMENT_REPLY_BUTTON: '@ 楼主并回复', @@ -465,6 +466,7 @@ BUTTON_SEARCH: '搜索', BUTTON_DELETE: '　删除　', BUTTON_CLOSE: '　关闭　', + BUTTON_REPLY: '　回复　', INPUT_EMAIL: '邮箱地址', SEND_INVITE_SUCCESSFULLY: '发送邀请成功', SEND_INVITE_ERROR: '发送邀请失败', @@ -484,6 +486,7 @@ TT_REQUIRED: '请输入消息标题', CT_REQUIRED: '请输入消息内容', LIST_TITLE: '标题', + LIST_REPLIES: '回复', LIST_TYPE: '类型', LIST_SENDAT: '发送时间', LIST_SELECT: '选择', diff --git a/modules/messages/client/controllers/messages.client.controller.js b/modules/messages/client/controllers/messages.client.controller.js index 8eab1191..363779d0 100644 --- a/modules/messages/client/controllers/messages.client.controller.js +++ b/modules/messages/client/controllers/messages.client.controller.js @@ -6,10 +6,10 @@ .controller('MessageController', MessageController); MessageController.$inject = ['$scope', '$state', '$translate', '$timeout', 'Authentication', '$filter', 'NotifycationService', '$stateParams', 'MessagesService', - 'MeanTorrentConfig', 'ModalConfirmService']; + 'MeanTorrentConfig', 'ModalConfirmService', 'marked']; function MessageController($scope, $state, $translate, $timeout, Authentication, $filter, NotifycationService, $stateParams, MessagesService, - MeanTorrentConfig, ModalConfirmService) { + MeanTorrentConfig, ModalConfirmService, marked) { var vm = this; vm.messageConfig = MeanTorrentConfig.meanTorrentConfig.messages; vm.user = Authentication.user; @@ -23,7 +23,9 @@ $state.go('authentication.signin'); } - document.getElementById('popupSlide').addEventListener('transitionend', onTransitionEnd, false); + if (document.getElementById('popupSlide')) { + document.getElementById('popupSlide').addEventListener('transitionend', onTransitionEnd, false); + } /** * checkSendTo @@ -108,6 +110,8 @@ * pageChanged */ vm.pageChanged = function () { + vm.selectedMessage = undefined; + vm.hideMessage(); vm.figureOutItemsToDisplay(); }; @@ -161,8 +165,6 @@ * @param event */ function onTransitionEnd(event) { - console.log('end'); - var e = $('.popup-overlay'); if (vm.selectedMessage) { if (!e.hasClass('popup-visible')) { @@ -176,8 +178,8 @@ * @param msg */ vm.showMessage = function (msg) { + console.log(msg); vm.selectedMessage = msg; - var e = $('.popup-overlay'); if (e.hasClass('popup-visible')) { e.removeClass('popup-visible'); @@ -197,5 +199,92 @@ e.removeClass('popup-visible'); } }; + + /** + * getMessageClass + * @param m + * @returns {*} + */ + vm.getMessageClass = function (m) { + if (m) { + if (m.from_user._id === vm.user._id) { + if (m.from_status === 0) { + return 'unread'; + } + } + if (m.to_user._id === vm.user._id) { + if (m.to_status === 0) { + return 'unread'; + } + } + } + return 'read'; + }; + + /** + * getContentMarked + * @param m + * @returns {*} + */ + vm.getContentMarked = function (m) { + if (m) { + return marked(m.content, {sanitize: true}); + } + }; + + /** + * replyMessage + */ + vm.replyMessage = function (m) { + var rmsg = new MessagesService({ + _messageId: m._id, + title: '', + content: vm.replyContent, + type: 'user', + from_user: vm.user._id, + to_user: fromIsMe(m) ? m.to_user._id : m.from_user._id + }); + + rmsg.$save(function (response) { + successCallback(response); + }, function (errorResponse) { + errorCallback(errorResponse); + }); + + function successCallback(res) { + console.log(res); + vm.selectedMessage = res; + + vm.messages.splice(vm.messages.indexOf(m), 0, res); + vm.messages.splice(vm.messages.indexOf(m), 1); + vm.figureOutItemsToDisplay(); + + vm.replyContent = undefined; + NotifycationService.showSuccessNotify('MESSAGE_SEND_SUCCESSFULLY'); + } + + function errorCallback(res) { + NotifycationService.showErrorNotify(res.data.message, 'MESSAGE_SEND_FAILED'); + } + + }; + + /** + * fromIsMe + * @param m + * @returns {boolean} + */ + function fromIsMe(m) { + return (m.from_user._id === vm.user._id) ? true : false; + } + + /** + * toIsMe + * @param m + * @returns {boolean} + */ + function toIsMe(m) { + return (m.to_user._id === vm.user._id) ? true : false; + } } }()); diff --git a/modules/messages/client/less/message.less b/modules/messages/client/less/message.less index 5a51c427..436d2102 100644 --- a/modules/messages/client/less/message.less +++ b/modules/messages/client/less/message.less @@ -36,6 +36,13 @@ height: 38px; width: 38px; } + .reply-avatar { + float: left; + margin-right: 10px; + border-radius: 3px; + height: 30px; + width: 30px; + } .message-title { font-weight: bold; font-size: 14px; @@ -45,6 +52,25 @@ color: #999; margin: 0 0; } + .read { + color: #999; + } + .unread { + color: #333; + } + .title-info { + margin-left: 48px; + } + .reply-info { + margin-left: 40px; + .message-info { + margin-top: -10px; + } + } + .message-reply { + margin-left: 50px; + margin-top: 10px; + } } .popup-overlay { @@ -55,16 +81,16 @@ bottom: 0; right: 0; overflow: auto; - z-index: 10000; + z-index: 999; transition: all 0.3s ease-out; /* csslint ignore:start */ transform: translateX(101%) translateY(0); /* csslint ignore:end */ @media (min-width: @screen-sm-min) { - min-width: 450px; + width: 450px; } @media (max-width: @screen-xs-max) { - min-width: ~"calc(100% - 50px)"; + min-width: ~"calc(100% - 150px)"; } } @@ -75,20 +101,28 @@ } .bottom-control { - background-color: #eee; + background-color: #fdfdfd; border-top: solid 1px #e6e6e6; width: 100%; - height: 50px; + height: 150px; position: absolute; left: 0; bottom: 0; - padding: 7px 10px; + padding: 8px 10px; } .message-popup { - background-color: #fafafa; + background-color: #fdfdfd; width: 100%; height: ~"calc(100% - 50px)"; overflow: auto; - padding: 10px; + padding: 15px; } + +.reply-textarea { + resize: none; + width: 100%; + min-height: 90px; + margin-bottom: 8px; +} + diff --git a/modules/messages/client/services/messages.client.service.js b/modules/messages/client/services/messages.client.service.js index 49b3bb5b..6f8d1a0b 100644 --- a/modules/messages/client/services/messages.client.service.js +++ b/modules/messages/client/services/messages.client.service.js @@ -9,7 +9,7 @@ function MessagesService($resource) { return $resource('/api/messages/:messageId', { - messageId: '@_id' + messageId: '@_messageId' }, { update: { method: 'PUT' diff --git a/modules/messages/client/views/box.client.view.html b/modules/messages/client/views/box.client.view.html index da58ba3b..4355ebd4 100644 --- a/modules/messages/client/views/box.client.view.html +++ b/modules/messages/client/views/box.client.view.html @@ -33,28 +33,32 @@ {{ 'MESSAGES_FIELD.LIST_TITLE' | translate}} + {{ 'MESSAGES_FIELD.LIST_REPLIES' | translate}} {{ 'MESSAGES_FIELD.LIST_TYPE' | translate}} {{ 'MESSAGES_FIELD.LIST_SENDAT' | translate}} {{ 'MESSAGES_FIELD.LIST_SELECT' | translate}} - - + + - +

{{m.from_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_TO' | translate}} {{m.to_user.displayName}} {{'MESSAGES_FIELD.INFO_SEND_AT' | translate}} {{m.createdat | date: 'yyyy-MM-dd HH:mm:ss' }}

- {{'MESSAGE_TYPE_' + m.type.toUpperCase() | translate}} + {{m._replies.length}} - {{m.createdat | life}} + {{'MESSAGE_TYPE_' + m.type.toUpperCase() | translate}} + {{m.createdat | life}} + + @@ -79,12 +83,42 @@