Merge from new code and resolve conflicts

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'
 }

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': '消息'
 }

frontend/src/pages/user/messages/Home.vue

@@ -1,74 +1,54 @@
 <template>
   <div class="message-container">
     <div class="message-hub-conainter">
-      <div v-if="conversations && conversations.length > 0" class="conversation-list-container">
+      <template v-if="!receiver_id">
-        <div
+        <div v-if="conversations && conversations.length > 0" class="conversation-list-container">
-          v-for="(conversation, index) in conversations"
+          <div v-for="(conversation, index) in conversations" :key="index" class="conversation-container" :class="{
-          :key="index"
-          class="conversation-container"
-          :class="{
             selected: selConversation?.id === conversation?.id
-          }"
+          }" @click="selectConversation(conversation)">
-          @click="selectConversation(conversation)"
+            <img class="participant-portrait" alt="user portrait" src="@/assets/profile.png" />
-        >
+            <div class="conversation-summary-container">
-          <img class="participant-portrait" alt="user portrait" src="@/assets/profile.png" />
+              <div class="conversation-summary-header-container">
-          <div class="conversation-summary-container">
+                <span class="participant-fullname">
-            <div class="conversation-summary-header-container">
+                  {{ conversation.subject }}
-              <span class="participant-fullname">
+                </span>
-                {{ conversation.subject }}
+                <span class="conversation-last-update-date">{{
-              </span>
+                  getDateFromFulltimeString(conversation.create_time)
-              <span class="conversation-last-update-date">{{
+                  }}</span>
-                getDateFromFulltimeString(conversation.create_time)
+              </div>
-              }}</span>
+              <div class="conversation-summary-highlight-container">
-            </div>
+                {{ conversation.last_message?.message_body }}
-            <div class="conversation-summary-highlight-container">
+              </div>
-              {{ conversation.last_message?.message_body }}
             </div>
           </div>
         </div>
-      </div>
+        <div v-if="!conversations || conversations.length == 0" class="conversation-list-empty-container">
-      <div
+          {{ $t('Empty conversation') }}
-        v-if="!conversations || conversations.length == 0"
+        </div>
-        class="conversation-list-empty-container"
+      </template>
-      >
-        {{ $t('Empty conversation') }}
-      </div>
       <div class="message-panel-container">
         <div v-if="messages && messages.length > 0" class="message-thread-container">
-          <div
+          <div v-for="(item, index) in messages" :key="index" class="message-item-container"
-            v-for="(item, index) in messages"
+            :class="item.sender_id == userIdentityNote ? 'me' : ''">
-            :key="index"
-            class="message-item-container"
-            :class="item.sender_id == userIdentityNote ? 'me' : ''"
-          >
             <div class="message-item-header-container">
-              <img
+              <img class="message-item-sender-portrait" alt="user portrait" src="@/assets/profile.png" />
-                class="message-item-sender-portrait"
-                alt="user portrait"
-                src="@/assets/profile.png"
-              />
               <span class="message-item-sender-fullname">
                 {{ item.sender_firstname }}
                 {{ item.sender_lastname }}
               </span>
               <span class="message-item-create-time">
-                {{ getDateFromFulltimeString(item.create_time) }}</span
+                {{ getDateFromFulltimeString(item.create_time) }}</span>
-              >
             </div>
             <div class="message-item-message-body">{{ item.message_body }}</div>
           </div>
         </div>
         <div v-if="!messages || messages.length == 0" class="message-thread-empty-container">
-          {{ $t('Please choose conversation') }}
+          {{ receiver_id ? $t('Please input message') : $t('Please choose conversation') }}
         </div>
         <div class="message-writing-panel-container">
           <svg-icon icon="msg-enter" class-name="writing-message-enter" />
-          <input
+          <input class="writing-message-input" type="text" v-model="writtenMessage"
-            class="writing-message-input"
+            @keypress.enter="sendMessage(selConversation?.id)" />
-            type="text"
-            v-model="writtenMessage"
-            @keypress.enter="sendMessage(selConversation.id)"
-          />
         </div>
       </div>
     </div>
@@ -76,26 +56,27 @@
 </template>
 <script>
 import SvgIcon from '@/components/SvgIcon.vue'
-import { MessageHubApi, DateUtils } from '@/utils/index'
+import { MessageHubApi, DateUtils, requestHubUtils } from '@/utils/index'
 import { userUtils } from '@/utils/store/index'
 export default {
   components: { SvgIcon },
   name: 'MessageHub',
   props: {},
   mounted() {
-    this.$store.dispatch('basic/updateConversationsPage', {
+    const request = requestHubUtils.fetchRequestToMessage()
-      token: this.mnx_getUserAuthToken(),
+    if (request && request.user_id) {
-      cb: (error) => {
+      this.receiver_id = request.user_id
-        this.mnx_backendErrorHandler(error)
+    } else {
-      }
+      this.fetchConversations()
-    })
+    }
   },
   data() {
     return {
       userIdentityNote: this.mnx_getUserIdentity(),
       selConversation: null,
       messages: [],
-      writtenMessage: null
+      writtenMessage: null,
+      receiver_id: null
     }
   },
   computed: {
@@ -105,19 +86,28 @@ export default {
   },
   watch: {
     conversations(n_val) {
+      console.log('nval', n_val, this.selConversation, n_val[0].messages)
       if (!this.selConversation && n_val[0]) {
         this.selConversation = n_val[0]
         this.messages = n_val[0].messages || []
         this.clearUnreadMessageBy(n_val[0])
       } else {
         if (n_val?.[0] && this.selConversation?.id === n_val?.[0]?.id) {
-          this.messages = n_val[0].messages || []
+          // this.messages = n_val[0].messages || []
           this.clearUnreadMessageBy(n_val[0])
         }
       }
     }
   },
   methods: {
+    fetchConversations() {
+      this.$store.dispatch('basic/updateConversationsPage', {
+        token: this.mnx_getUserAuthToken(),
+        cb: error => {
+          this.mnx_backendErrorHandler(error)
+        }
+      })
+    },
     fetchMessageForConversation(conversation_id) {
       const jwt = userUtils.getJwtToken()
       MessageHubApi.fetchMessages(
@@ -145,20 +135,32 @@ export default {
     },
     sendMessage(conversation_id) {
       const jwt = userUtils.getJwtToken()
-      MessageHubApi.sendMessageToConversation(conversation_id, this.writtenMessage, jwt)
+      if (this.receiver_id) {
-        .then((response) => {
+        MessageHubApi.sendMessageToUser(this.receiver_id, this.writtenMessage, jwt)
-          let new_message = response.data
+          .then(() => {
-          this.messages.push({
+            requestHubUtils.fillRequestToMessage(null)
-            ...new_message.raw_data,
+            this.receiver_id = null
-            sender_firstname: new_message.sender_profile.first_name,
+            this.writtenMessage = null
-            sender_lastname: new_message.sender_profile.last_name,
-            sender_photo: new_message.sender_profile.photo
           })
-          this.writtenMessage = null
+          .catch((error) => {
-        })
+            this.mnx_backendErrorHandler(error)
-        .catch((error) => {
+          })
-          this.mnx_backendErrorHandler(error)
+      } else {
-        })
+        MessageHubApi.sendMessageToConversation(conversation_id, this.writtenMessage, jwt)
+          .then((response) => {
+            let new_message = response.data
+            this.messages.push({
+              ...new_message.raw_data,
+              sender_firstname: new_message.sender_profile.first_name,
+              sender_lastname: new_message.sender_profile.last_name,
+              sender_photo: new_message.sender_profile.photo
+            })
+            this.writtenMessage = null
+          })
+          .catch((error) => {
+            this.mnx_backendErrorHandler(error)
+          })
+      }
     },
     getDateFromFulltimeString(fulltime) {
       // FromJsonToHMDateString

frontend/src/pages/user/requests/Home.vue

@@ -76,6 +76,9 @@
                   <button class="make-proposal-button" type="button" @click="Propose(request)">
                     {{ $t('Propose') }}
                   </button>
+                  <button class="make-proposal-button" type="button" @click="messageTo(request)">
+                    {{ $t('Message') }}
+                  </button>
                   <div class="request-description-content" v-html="request.content"></div>
                   <div
                     class="pdf-actions"
@@ -251,6 +254,10 @@ export default {
       requestHubUtils.fillRequestToPropose(request)
       this.mnx_navToMakeProposal(request.id, proposingModelEnum.NO_LOADING)
     },
+    messageTo(request) {
+      requestHubUtils.fillRequestToMessage(request)
+      this.mnx_navToMessageHub()
+    },
     getDateFromFulltimeString(fulltime) {
       return DateUtils.FromJsonToDateString(fulltime)
     },

frontend/src/pages/user/workspace/Home.vue

@@ -2,22 +2,13 @@
   <div class="workspace-container">
     <!-- <div class="workspace-header"></div> -->
     <div class="workspace-body">
-      <div
+      <div class="accordion accordion-list" v-for="(project, project_index) in projects" :key="project_index"
-        class="accordion accordion-list"
+        :id="project.id">
-        v-for="(project, project_index) in projects"
-        :key="project_index"
-        :id="project.id"
-      >
         <div class="accordion-item">
           <h2 class="accordion-header">
-            <button
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-              class="accordion-button collapsed"
+              :data-bs-target="'#collapse-' + project_index" aria-expanded="false"
-              type="button"
+              :aria-controls="'collapse-' + project_index">
-              data-bs-toggle="collapse"
-              :data-bs-target="'#collapse-' + project_index"
-              aria-expanded="false"
-              :aria-controls="'collapse-' + project_index"
-            >
               <div class="workspace-item-bar dashed-container">
                 <div class="workspace-item-bar-left">
                   <div class="project-item-title-container">
@@ -44,11 +35,7 @@
               </div>
             </button>
           </h2>
-          <div
+          <div :id="'collapse-' + project_index" class="accordion-collapse collapse" :data-bs-parent="'#' + project.id">
-            :id="'collapse-' + project_index"
-            class="accordion-collapse collapse"
-            :data-bs-parent="'#' + project.id"
-          >
             <div class="accordion-body" v-if="isOpenRequest(project)">
               <div class="float-action-container">
                 <button class="request-action-withdraw" @click="withdrawAndEditRequest(project)">
@@ -56,30 +43,17 @@
                 </button>
               </div>
               <div class="project-request-container">
-                <div
+                <div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)"
-                  class="project-request-content"
+                  contenteditable="false"></div>
-                  v-html="project.request.content"
-                  @keyup="textAreaAdjust($event)"
-                  contenteditable="false"
-                ></div>
               </div>
               <div class="project-request-proposals-container">
-                <div
+                <div class="accordion" v-for="(proposal, proposal_index) in project.proposals" :key="proposal_index"
-                  class="accordion"
+                  :id="proposal.id">
-                  v-for="(proposal, proposal_index) in project.proposals"
-                  :key="proposal_index"
-                  :id="proposal.id"
-                >
                   <div class="accordion-item">
                     <h2 class="accordion-header">
-                      <button
+                      <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                        class="accordion-button collapsed"
+                        :data-bs-target="'#collapse-request-proposal' + proposal_index" aria-expanded="false"
-                        type="button"
+                        :aria-controls="'collapse-request-proposal' + proposal_index">
-                        data-bs-toggle="collapse"
-                        :data-bs-target="'#collapse-request-proposal' + proposal_index"
-                        aria-expanded="false"
-                        :aria-controls="'collapse-request-proposal' + proposal_index"
-                      >
                         <div class="project-request-proposal-bar-container">
                           <div class="project-request-proposal-quote-container">
                             <label class="project-item-label">{{ $t('Quote') }}</label>
@@ -112,23 +86,16 @@
                         </div>
                       </button>
                     </h2>
-                    <div
+                    <div :id="'collapse-request-proposal' + proposal_index" class="accordion-collapse collapse"
-                      :id="'collapse-request-proposal' + proposal_index"
+                      :data-bs-parent="'#' + proposal.id">
-                      class="accordion-collapse collapse"
-                      :data-bs-parent="'#' + proposal.id"
-                    >
                       <div class="accordion-body">
                         <div class="request-proposal-action-container">
-                          <button
+                          <button class="request-proposal-action-reject"
-                            class="request-proposal-action-reject"
+                            @click="rejectProposal(project, proposal_index)">
-                            @click="rejectProposal(project, proposal_index)"
-                          >
                             {{ $t('reject') }}
                           </button>
-                          <button
+                          <button class="request-proposal-action-accept"
-                            class="request-proposal-action-accept"
+                            @click="acceptProposal(project, proposal_index)">
-                            @click="acceptProposal(project, proposal_index)"
-                          >
                             {{ $t('accept') }}
                           </button>
                         </div>
@@ -136,12 +103,9 @@
                           <div class="request-proposal-content" v-html="proposal.content" />
                         </div>
                         <div class="request-proposal-payment-plan">
-                          <div
+                          <div class="request-proposal-payment-plan-stage-container"
-                            class="request-proposal-payment-plan-stage-container"
+                            v-for="(stage, stage_index) in proposal.payment_plan.stages" :key="stage_index"
-                            v-for="(stage, stage_index) in proposal.payment_plan.stages"
+                            :id="'payment-stage-' + stage_index">
-                            :key="stage_index"
-                            :id="'payment-stage-' + stage_index"
-                          >
                             <div class="project-request-proposal-stage-payment-container">
                               <label class="project-item-label">{{ $t('Payment') }}</label>
                               <p class="project-item-text">
@@ -176,12 +140,9 @@
                 <div class="request-proposal-content" v-html="project.proposal.content" />
               </div>
               <div class="request-proposal-payment-plan">
-                <div
+                <div class="request-proposal-payment-plan-stage-container"
-                  class="request-proposal-payment-plan-stage-container"
+                  v-for="(stage, stage_index) in project.proposal.payment_plan.stages" :key="stage_index"
-                  v-for="(stage, stage_index) in project.proposal.payment_plan.stages"
+                  :id="'payment-stage-' + stage_index">
-                  :key="stage_index"
-                  :id="'payment-stage-' + stage_index"
-                >
                   <div class="project-request-proposal-stage-payment-container">
                     <label class="project-item-label">{{ $t('Payment') }}</label>
                     <p class="project-item-text">{{ stage.amount }} {{ stage.currency }}</p>
@@ -199,40 +160,24 @@
                 </div>
               </div>
               <div class="project-request-container">
-                <div
+                <div class="project-request-content" v-html="project.request.content" @keyup="textAreaAdjust($event)"
-                  class="project-request-content"
+                  contenteditable="false"></div>
-                  v-html="project.request.content"
-                  @keyup="textAreaAdjust($event)"
-                  contenteditable="false"
-                ></div>
               </div>
             </div>
             <div class="accordion-body inline-accordion-body" v-if="isOngoingProject(project)">
               <div class="project-invite-collaborator-containter">
-                <button
+                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                  class="accordion-button collapsed"
+                  data-bs-target="#collapse-project-invite-collaborator" aria-expanded="false"
-                  type="button"
+                  aria-controls="collapse-project-invite-collaborator">
-                  data-bs-toggle="collapse"
-                  data-bs-target="#collapse-project-invite-collaborator"
-                  aria-expanded="false"
-                  aria-controls="collapse-project-invite-collaborator"
-                >
                   <div class="project-invite-collaborator">+ {{ $t('Invite') }}</div>
                 </button>
-                <div
+                <div id="collapse-project-invite-collaborator" class="accordion-collapse collapse"
-                  id="collapse-project-invite-collaborator"
+                  data-bs-parent="#collapse-project-invite-collaborator">
-                  class="accordion-collapse collapse"
-                  data-bs-parent="#collapse-project-invite-collaborator"
-                >
                   <div class="project-invite-collaborator-form-container">
-                    <input
+                    <input type="text" v-model="newInviteCollaborator[project_index]"
-                      type="text"
+                      :placeholder="$t('Input E-mail to invite other')" @keydown.enter="
-                      v-model="newInviteCollaborator[project_index]"
-                      :placeholder="$t('Input E-mail to invite other')"
-                      @keydown.enter="
                         inviteCollaborator(project.project_id, newInviteCollaborator[project_index])
-                      "
+                        " />
-                    />
                     <svg-icon icon="msg-enter" class-name="project-invite-enter" />
                   </div>
                 </div>
@@ -240,14 +185,9 @@
               <div class="accordion" id="workspace-project-accordion">
                 <div class="accordion-item">
                   <h2 class="accordion-header">
-                    <button
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                      class="accordion-button collapsed"
+                      data-bs-target="#collapse-project-milestone" aria-expanded="false"
-                      type="button"
+                      aria-controls="collapse-project-milestone">
-                      data-bs-toggle="collapse"
-                      data-bs-target="#collapse-project-milestone"
-                      aria-expanded="false"
-                      aria-controls="collapse-project-milestone"
-                    >
                       <div class="project-milestone-bar-container dashed-container">
                         <div class="project-milestone-bar-progress">
                           <label class="project-item-label">{{ $t('Progress') }}</label>
@@ -283,26 +223,20 @@
                       </div>
                     </button>
                   </h2>
-                  <div
+                  <div id="collapse-project-milestone" class="accordion-collapse collapse"
-                    id="collapse-project-milestone"
+                    data-bs-parent="#collapse-project-milestone">
-                    class="accordion-collapse collapse"
-                    data-bs-parent="#collapse-project-milestone"
-                  >
                     <table class="project-milestones-table">
-                      <tbody
+                      <tbody v-for="milestone in project.project.progress.milestones" :key="milestone.index"
-                        v-for="milestone in project.project.progress.milestones"
+                        :id="'project-milestone-' + milestone.index">
-                        :key="milestone.index"
-                        :id="'project-milestone-' + milestone.index"
-                      >
                         <tr>
                           <td>
                             <div class="project-milestones-table-content">
                               <span class="project-milestones-table-label">{{
                                 $t('Milestone')
-                              }}</span>
+                                }}</span>
                               <span class="project-milestones-table-span">{{
                                 milestone.index
-                              }}</span>
+                                }}</span>
                             </div>
                           </td>
                           <td>
@@ -310,7 +244,7 @@
                               <span class="project-milestones-table-label">{{ $t('Goal') }}</span>
                               <span class="project-milestones-table-span">{{
                                 milestone.description
-                              }}</span>
+                                }}</span>
                             </div>
                           </td>
                           <td>
@@ -318,14 +252,14 @@
                               <span class="project-milestones-table-label">{{ $t('Status') }}</span>
                               <span class="project-milestones-table-span">{{
                                 fromIntToMilestoneStatus(milestone.status)
-                              }}</span>
+                                }}</span>
                             </div>
                           </td>
                           <td>
                             <div class="project-milestones-table-content">
                               <span class="project-milestones-table-label">{{
                                 $t('Payment')
-                              }}</span>
+                                }}</span>
                               <span class="project-milestones-table-span">
                                 {{ milestone.actual_paid }} / {{ milestone.expected_payment }}
                                 {{ project.project.progress.payment_currency }}
@@ -337,20 +271,15 @@
                               <span class="project-milestones-table-label">{{ $t('Update') }}</span>
                               <span class="project-milestones-table-span">{{
                                 getDateFromFulltimeString(milestone.update_time)
-                              }}</span>
+                                }}</span>
                             </div>
                           </td>
                           <td>
                             <div class="project-milestones-table-content">
                               <span class="project-milestones-table-label">{{ $t('Action') }}</span>
-                              <button
+                              <button class="project-milestones-table-btn" :disabled="isMilestoneActionButtonDisabled(project.project, milestone)
-                                class="btn btn-link"
+                                " :hidden="isMilestoneActionButtonHidden(project.project, milestone)"
-                                :disabled="
+                                @click="handleMilestoneAction(project.project, milestone)">
-                                  isMilestoneActionButtonDisabled(project.project, milestone)
-                                "
-                                :hidden="isMilestoneActionButtonHidden(project.project, milestone)"
-                                @click="handleMilestoneAction(project.project, milestone)"
-                              >
                                 {{ fetchMilestoneActionButtonText(project.project, milestone) }}
                               </button>
                               <!-- <span class="project-milestones-table-span">{{ getDateFromFulltimeString(milestone.update_time) }}</span> -->
@@ -361,10 +290,8 @@
                           <td colspan="6">
                             <div class="project-milestones-qrcode-content">
                               <img :src="this.qrCode.imageUrl" alt="freeleaps" />
-                              <button
+                              <button class="project-milestones-qrcode-button"
-                                class="project-milestones-qrcode-button"
+                                @click="handlePaymentAction(project.project, milestone)">
-                                @click="handlePaymentAction(project.project, milestone)"
-                              >
                                 {{ $t('Mark As Paid') }}
                               </button>
                             </div>
@@ -376,14 +303,9 @@
                 </div>
                 <div class="accordion-item">
                   <h2 class="accordion-header">
-                    <button
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                      class="accordion-button collapsed"
+                      data-bs-target="#collapse-project-code" aria-expanded="false"
-                      type="button"
+                      aria-controls="collapse-project-code">
-                      data-bs-toggle="collapse"
-                      data-bs-target="#collapse-project-code"
-                      aria-expanded="false"
-                      aria-controls="collapse-project-code"
-                    >
                       <div class="project-code-bar-container dashed-container">
                         <div class="project-code-git-status">
                           <label class="project-item-label">{{ $t('Code Depot') }}</label>
@@ -406,22 +328,13 @@
                       </div>
                     </button>
                   </h2>
-                  <div
+                  <div id="collapse-project-code" class="accordion-collapse collapse"
-                    id="collapse-project-code"
+                    data-bs-parent="#collapse-project-code">
-                    class="accordion-collapse collapse"
-                    data-bs-parent="#collapse-project-code"
-                  >
                     <div class="project-code-details-container">
                       <div class="project-code-git-url-container">
-                        <button
+                        <button v-if="project.project.code?.git_url" class="project-code-copy-git-url"
-                          v-if="project.project.code?.git_url"
+                          @click="copyCodeGit(project)" v-tooltip title="Copied" trigger="click"
-                          class="project-code-copy-git-url"
+                          delay='{"show":"500", "hide":"100"}'>
-                          @click="copyCodeGit(project)"
-                          v-tooltip
-                          title="Copied"
-                          trigger="click"
-                          delay='{"show":"500", "hide":"100"}'
-                        >
                           {{ $t('copy git url') }}
                         </button>
                       </div>
@@ -437,14 +350,9 @@
                 </div>
                 <div class="accordion-item">
                   <h2 class="accordion-header">
-                    <button
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                      class="accordion-button collapsed"
+                      data-bs-target="#collapse-project-issue" aria-expanded="false"
-                      type="button"
+                      aria-controls="collapse-project-issue">
-                      data-bs-toggle="collapse"
-                      data-bs-target="#collapse-project-issue"
-                      aria-expanded="false"
-                      aria-controls="collapse-project-issue"
-                    >
                       <div class="project-issue-bar-container dashed-container">
                         <div class="project-issue-open-issues">
                           <label class="project-item-label">{{ $t('Open issues') }}</label>
@@ -467,11 +375,8 @@
                       </div>
                     </button>
                   </h2>
-                  <div
+                  <div id="collapse-project-issue" class="accordion-collapse collapse"
-                    id="collapse-project-issue"
+                    data-bs-parent="#collapse-project-issue">
-                    class="accordion-collapse collapse"
-                    data-bs-parent="#collapse-project-issue"
-                  >
                     <div class="project-code-git-url-container">
                       <button class="project-code-copy-git-url" @click="gotoIssueManage(project)">
                         {{ $t('Issues management') }}
@@ -1253,6 +1158,7 @@ export default {
   text-align: center;
   @extend .initiate-button;
 }
+
 // ...
 
 .project-milestones-table {
@@ -1569,4 +1475,19 @@ export default {
   width: 100%;
   height: 357px;
 }
+
+.project-milestones-table-btn {
+  @extend .btn;
+  @extend .btn-primary;
+  width: fit-content;
+  padding: 0 8px;
+  border-radius: 0;
+
+  &:disabled {
+    color: #000000;
+    border-color: #D9D9D9;
+    background-color: #D9D9D9;
+    opacity: 1;
+  }
+}
 </style>

frontend/src/pages/user/workspace/projectIssue/Issue.vue

@@ -4,14 +4,8 @@
       <div class="accordion" id="workspace-project-accordion">
         <div v-if="project.id" class="accordion-item">
           <h2 class="accordion-header">
-            <button
+            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-              class="accordion-button collapsed"
+              data-bs-target="#collapse-project-issue" aria-expanded="false" aria-controls="collapse-project-issue">
-              type="button"
-              data-bs-toggle="collapse"
-              data-bs-target="#collapse-project-issue"
-              aria-expanded="false"
-              aria-controls="collapse-project-issue"
-            >
               <div class="project-issue-bar-container dashed-container">
                 <div class="project-issue-open-issues">
                   <label class="project-item-label">{{ $t('Summary') }}</label>
@@ -38,41 +32,27 @@
               </div>
             </button>
           </h2>
-          <div
+          <div id="collapse-project-issue" class="accordion-collapse collapse" data-bs-parent="#collapse-project-issue">
-            id="collapse-project-issue"
-            class="accordion-collapse collapse"
-            data-bs-parent="#collapse-project-issue"
-          >
             <div class="project-invite-collaborator-containter">
-              <button
+              <button class="accordion-button collapsed" type="button" ref="issueAddBtn" data-bs-toggle="collapse"
-                class="accordion-button collapsed"
+                data-bs-target="#collapse-project-new-issue" aria-expanded="false"
-                type="button"
+                aria-controls="collapse-project-issue">
-                ref="issueAddBtn"
-                data-bs-toggle="collapse"
-                data-bs-target="#collapse-project-new-issue"
-                aria-expanded="false"
-                aria-controls="collapse-project-issue"
-              >
                 <div class="project-invite-collaborator">+ {{ $t('Add Issue') }}</div>
               </button>
-              <div
+              <div id="collapse-project-new-issue" class="accordion-collapse collapse"
-                id="collapse-project-new-issue"
+                data-bs-parent="#collapse-project-new-issue">
-                class="accordion-collapse collapse"
-                data-bs-parent="#collapse-project-new-issue"
-              >
                 <div class="project-issue-description-container">
                   <div class="project-issue-description">
-                    <label class="project-item-label">{{ $t('New issue description') }}</label>
+                    <label class="project-item-label">{{
-                    <button
+                      $t('New issue description')
-                      class="project-issue-description-btn"
+                      }}</label>
-                      @click="
+                    <button class="project-issue-description-btn" @click="
-                        postNewIssue(
+                      postNewIssue(
-                          project.request.product_id,
+                        project.request.product_id,
-                          project.project_id,
+                        project.project_id,
-                          newIssueDescriptions
+                        newIssueDescriptions
-                        )
+                      )
-                      "
+                      ">
-                    >
                       {{ $t('Submit') }}
                     </button>
                   </div>
@@ -81,22 +61,13 @@
               </div>
             </div>
             <div>
-              <div
+              <div class="project-issue-container" v-for="(issue, issue_index) in project.project.issue.open_issues"
-                class="project-issue-container"
+                :key="issue_index" :id="'project-issue-' + issue_index">
-                v-for="(issue, issue_index) in project.project.issue.open_issues"
-                :key="issue_index"
-                :id="'project-issue-' + issue_index"
-              >
                 <div class="accordion-item">
                   <h2 class="accordion-header">
-                    <button
+                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                      class="accordion-button collapsed"
+                      :data-bs-target="'#collapse-project-issue-details' + issue_index" aria-expanded="false"
-                      type="button"
+                      aria-controls="collapse-project-issue-details">
-                      data-bs-toggle="collapse"
-                      :data-bs-target="'#collapse-project-issue-details' + issue_index"
-                      aria-expanded="false"
-                      aria-controls="collapse-project-issue-details"
-                    >
                       <div class="project-issue-header dashed-container">
                         <div class="project-issue-title">
                           <label class="project-item-label">{{ $t('Issue title') }}</label>
@@ -117,33 +88,23 @@
                       </div>
                     </button>
                   </h2>
-                  <div
+                  <div :id="'collapse-project-issue-details' + issue_index" class="accordion-collapse collapse"
-                    :id="'collapse-project-issue-details' + issue_index"
+                    :data-bs-parent="'#collapse-project-issue-details' + issue_index">
-                    class="accordion-collapse collapse"
-                    :data-bs-parent="'#collapse-project-issue-details' + issue_index"
-                  >
                     <div class="project-issue-description-container">
                       <div class="project-issue-description">
-                        <label class="project-item-label">{{ $t('Issue description') }}</label>
+                        <label class="project-item-label">{{
-                        <button
+                          $t('Issue description')
-                          :hidden="!showIssueActionButton(project.project, issue, 'Resolve')"
+                          }}</label>
-                          class="project-issue-description-btn"
+                        <button :hidden="!showIssueActionButton(project.project, issue, 'Resolve')
-                          @click="setProjectIssueStatus(issue.id, 1)"
+                          " class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 1)">
-                        >
                           {{ $t('Resolve') }}
                         </button>
-                        <button
+                        <button :hidden="!showIssueActionButton(project.project, issue, 'Confirm')
-                          :hidden="!showIssueActionButton(project.project, issue, 'Confirm')"
+                          " class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 2)">
-                          class="project-issue-description-btn"
-                          @click="setProjectIssueStatus(issue.id, 2)"
-                        >
                           {{ $t('Confirm') }}
                         </button>
-                        <button
+                        <button :hidden="!showIssueActionButton(project.project, issue, 'Reopen')"
-                          :hidden="!showIssueActionButton(project.project, issue, 'Reopen')"
+                          class="project-issue-description-btn" @click="setProjectIssueStatus(issue.id, 0)">
-                          class="project-issue-description-btn"
-                          @click="setProjectIssueStatus(issue.id, 0)"
-                        >
                           {{ $t('Reopen') }}
                         </button>
                       </div>
@@ -161,11 +122,7 @@
 </template>
 <script>
 import { DateUtils, WorksapceApi } from '@/utils/index'
-import {
+import { projectStatusEnum, convertIntoToProjectIssueStatus, projectIssueStatusEnum } from '@/types/index'
-  projectStatusEnum,
-  convertIntoToProjectIssueStatus,
-  projectIssueStatusEnum
-} from '@/types/index'
 export default {
   name: 'projectIssue',
   props: {
@@ -235,24 +192,24 @@ export default {
     showIssueActionButton(project, issue, button_text) {
       switch (issue.status) {
         case projectIssueStatusEnum.OPEN:
-          if (button_text === this.$t('Resolve')) {
+          if (button_text === 'Resolve') {
             return project.providers.includes(project.current_user_id)
           }
           break
         case 1:
-          if (button_text === this.$t('Reopen') || button_text === this.$t('Confirm')) {
+          if (button_text === 'Reopen' || button_text === 'Confirm') {
             return project.issuers.includes(project.current_user_id)
           }
           break
         case projectIssueStatusEnum.CLOSED:
-          if (button_text === this.$t('Reopen')) {
+          if (button_text === 'Reopen') {
             return project.issuers.includes(project.current_user_id)
           }
           break
         default:
           return false
       }
-    }
+    },
   }
 }
 </script>
@@ -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;
 }
-</style>
+</style>

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 }

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
   }