diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index cfa0465..ad57458 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -113,6 +113,7 @@ export default { Apply: 'Apply', 'Empty conversation': 'Empty conversation', 'Please choose conversation': 'Please choose conversation', + 'Please input message': 'Please input message', Name: 'Name', 'Stay on Freeleaps': 'Stay on Freeleaps', 'Delivered projects': 'Delivered projects', @@ -210,5 +211,6 @@ export default { 'line(s)': 'line(s)', 'Issues management': 'Issues management', 'Payment progress': 'Payment progress', - Goal: 'Goal' + Goal: 'Goal', + 'Message': 'Message' } diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index a3d5233..4df72e1 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -112,6 +112,7 @@ export default { Apply: '应用', 'Empty conversation': '空对话', 'Please choose conversation': '请选择对话', + 'Please input message': '请输入消息', Name: '名字', 'Stay on Freeleaps': 'Freeleaps注册时长', 'Delivered projects': '已交付项目', @@ -203,5 +204,6 @@ export default { 'Logins': '总登录次数', 'Issued request': '项目请求总数', 'Open requests': '待处理的项目请求', - 'Lines of code per week': '每周代码产量' + 'Lines of code per week': '每周代码产量', + 'Message': '消息' } diff --git a/frontend/src/pages/user/messages/Home.vue b/frontend/src/pages/user/messages/Home.vue index 4b79729..dd18076 100644 --- a/frontend/src/pages/user/messages/Home.vue +++ b/frontend/src/pages/user/messages/Home.vue @@ -1,74 +1,54 @@
-
+
- user portrait + user portrait {{ item.sender_firstname }} {{ item.sender_lastname }} - {{ getDateFromFulltimeString(item.create_time) }} + {{ getDateFromFulltimeString(item.create_time) }}
{{ item.message_body }}
- {{ $t('Please choose conversation') }} + {{ receiver_id ? $t('Please input message') : $t('Please choose conversation') }}
- +
@@ -76,26 +56,27 @@ @@ -315,6 +272,7 @@ export default { margin-bottom: 0; font-weight: bold; } + .project-invite-collaborator-containter { border-bottom: 1px solid #e1e1e1; @@ -323,6 +281,7 @@ export default { // color: $primary; // background-color: #F3F6FF; padding: 12px !important; + &::after { display: none; } @@ -345,6 +304,7 @@ export default { border-radius: 3px; align-items: center; border: 1px solid #e7e8eb; + &:focus-within { border: 1px solid #1748f8; } @@ -356,6 +316,7 @@ export default { outline: none; box-shadow: none; } + .project-invite-enter { width: 16px; height: 16px; @@ -378,6 +339,7 @@ export default { @extend .initiate-button; @extend .float-end; } + .project-new-issue-textarea { height: 100px; width: 100%; @@ -406,10 +368,12 @@ export default { margin-bottom: 12px; } } + .project-issue-description { display: flex; align-items: center; margin-bottom: 12px; + label { flex: 1; } @@ -465,4 +429,4 @@ export default { @extend .initiate-button; @extend .float-end; } - + \ No newline at end of file diff --git a/frontend/src/utils/backend/messageHub.js b/frontend/src/utils/backend/messageHub.js index 7746bc3..6dfe851 100644 --- a/frontend/src/utils/backend/messageHub.js +++ b/frontend/src/utils/backend/messageHub.js @@ -44,6 +44,18 @@ class MessageHubApi { ) return request } + + static sendMessageToUser(receiver_id, message, jwt) { + // let jwt = userUtils.getJwtToken() + const request = backendAxios.post( + '/api/messages/send-message-to-user', + { receiver_id, message }, + { + headers: { Authorization: `Bearer ${jwt}` } + } + ) + return request + } } export { MessageHubApi } diff --git a/frontend/src/utils/store/requestHubUtils.js b/frontend/src/utils/store/requestHubUtils.js index 7c3c22a..6f36d45 100644 --- a/frontend/src/utils/store/requestHubUtils.js +++ b/frontend/src/utils/store/requestHubUtils.js @@ -13,6 +13,14 @@ class RequestHubUtils { return this.request_to_propose } + fillRequestToMessage(request) { + this.request_to_message = request + } + + fetchRequestToMessage() { + return this.request_to_message + } + fillExistingProposal(proposal) { this.existing_proposal = proposal }