Merge branch 'main' of https://freeleaps.com:3443/products/freeleaps into main

* 'main' of https://freeleaps.com:3443/products/freeleaps:
  Add issuer information
  update:bug fix
  update: 初始化聊天列表
  update
  Pull from origin gitea
  add more args in docker file

Dockerfile

@@ -1,7 +1,7 @@
 # build stage
 FROM node:lts-alpine as build-stage
 ARG CONTAINER_APP_ROOT="/app"
-
+ARG FRONTEND_PORT=8080
 RUN npm update npm -g
 RUN npm config set "@fortawesome:registry" https://npm.fontawesome.com/
 RUN npm config set "//npm.fontawesome.com/:_authToken" 58624E90-2685-43C6-BF0F-0BFECCE11CD2
@@ -23,5 +23,5 @@ RUN npm run build
 FROM nginx:1.25.2 as production-stage
 COPY --from=build-stage /app/dist /usr/share/nginx/html
 COPY frontend/nginx_docker.conf /etc/nginx/conf.d/default.conf
-EXPOSE 8080
+EXPOSE ${FRONTEND_PORT}
 CMD ["nginx", "-g", "daemon off;"]

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

@@ -91,8 +91,7 @@ export default {
     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.selectConversation(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) {

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

@@ -180,7 +180,35 @@
                   </div>
                 </div>
               </div>
-              <div v-if="requests" class="accordion" id="accordion-action-panel">
+              <div v-if="requests" class="statistics-container">
+                <label class="self-intro-content-label marb-10" for="statistics-content">{{
+                  $t('Action panel')
+                  }}</label>
+                <div class="invite-to-request-container">
+                  <label class="invite-to-request-content-label" for="invite-to-request-content">{{ $t('Invite')
+                    }}
+                    <span class="invite-to-request-name-span">{{ provider.user_profile.first_name }}
+                      {{ provider.user_profile.last_name }}</span>
+                    {{ $t('to my open requests') }}</label>
+                  <div class="invite-to-request-content-container" id="invite-to-request-content">
+                    <div class="form-check" v-for="(request, index) in requests" :key="index">
+                      <input class="form-check-input" type="checkbox" :value="request.id"
+                        :id="'check' + request.id" v-model="checkedRequests" @change="
+                          checkRequest($event, request.id, provider.user_profile.user_id)
+                          " />
+                      <label class="form-check-label" :for="'check' + request.id">{{
+                        request.title
+                        }}</label>
+                    </div>
+                    <span class="invite-to-request-note-text">*{{
+                      $t(
+                        'Once the request is selected, the provider will be invited to see the request.'
+                      )
+                    }}</span>
+                  </div>
+                </div>
+              </div>
+              <!-- <div v-if="requests" class="accordion" id="accordion-action-panel">
                 <div class="accordion-item">
                   <h2 class="accordion-header">
                     <button class="accordion-button" type="button" data-bs-toggle="collapse"
@@ -218,7 +246,7 @@
                     </div>
                   </div>
                 </div>
-              </div>
+              </div> -->
             </div>
           </div>
         </div>
@@ -389,6 +417,10 @@ export default {
   font-weight: bold !important;
 }
 
+.marb-10 {
+  margin-bottom: 10px !important
+}
+
 .self-intro-content-container {
   @extend .container;
   @extend .text-start;

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

@@ -96,7 +96,7 @@
                     </button>
                     <button
                       class="btn btn-link"
-                      @click="downloadAttachedFile(request.id, file.document_id)"
+                      @click="downloadAttachedFile(request.id, file.document_id, file.file_name)"
                     >
                       {{ $t('Download') }}{{ file.file_name }}
                     </button>
@@ -278,22 +278,35 @@ export default {
           this.mnx_backendErrorHandler(error)
         })
     },
-    downloadAttachedFile(request_id, document_id) {
+    downloadAttachedFile(request_id, document_id, file_name) {
+
+      // window.open(`http://${window.location.host}/api/workspace/request/fetch-attached-file-as-download?request_id=${request_id}&document_id=${document_id}`)
+
+      // const link = document.createElement('a')
+      // link.href = `${window.location.host}/api/workspace/request/fetch-attached-file-as-download?request_id=${request_id}&document_id=${document_id}`
+      // link.download = file_name
+      // link.target = '_blank'
+      // document.body.appendChild(link)
+      // link.click()
+      // document.body.removeChild(link)
+
       WorksapceApi.fetchAttachedFileAsDownload(request_id, document_id)
         .then((response) => {
+          console.log('resposne', response)
           // create file link in browser's memory
-          const href = URL.createObjectURL(response.data)
+          // const href = URL.createObjectURL(response.data)
 
           // create "a" HTML element with href to file & click
           const link = document.createElement('a')
-          link.href = href
+          link.href = response.data.download_url
-          link.setAttribute('download', 'file.pdf') //or any other extension
+          link.download = file_name
+          link.target = '_blank'
           document.body.appendChild(link)
           link.click()
 
           // clean up "a" element & remove ObjectURL
           document.body.removeChild(link)
-          URL.revokeObjectURL(href) //TODO: navigate to the preview page
+          // URL.revokeObjectURL(href) //TODO: navigate to the preview page
         })
         .catch((error) => {
           this.mnx_backendErrorHandler(error)

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

@@ -2,22 +2,13 @@
   <empty-content :loading="loading" :empty="projects?.length === 0" />
   <div v-if="projects && projects.length > 0" class="workspace-container">
     <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">
@@ -29,26 +20,29 @@
                     <p class="project-item-text">{{ fromIntToProjectStatus(project.status) }}</p>
                   </div>
                   <div class="project-item-date-container">
-                    <label class="project-item-label">{{ $t('Date') }}</label>
+                    <label class="project-item-label">{{ $t('Update') }}</label>
                     <p class="project-item-text">
                       {{ getDateFromFulltimeString(project.update_time) }}
                     </p>
                   </div>
                 </div>
                 <div class="workspace-item-bar-right">
+                  <div class="project-item-inform-container">
+                    <label class="project-item-label">{{ $t('Issuer') }}</label>
+                    <p class="project-item-text">{{ project?.issuer?.first_name }}
+                      {{ project?.issuer?.last_name }}</p>
+                  </div>
+                </div>
+                <!-- <div class="workspace-item-bar-right">
                   <div class="project-item-inform-container">
                     <label class="project-item-label">{{ getTitleForItemInfo(project) }}</label>
                     <p class="project-item-text">{{ getContentForItemInfo(project) }}</p>
                   </div>
-                </div>
+                </div> -->
               </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 +50,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>
@@ -114,23 +95,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>
@@ -138,12 +112,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">
@@ -178,12 +149,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>
@@ -201,40 +169,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>
@@ -242,14 +194,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>
@@ -285,26 +232,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>
@@ -312,7 +253,7 @@
                               <span class="project-milestones-table-label">{{ $t('Goal') }}</span>
                               <span class="project-milestones-table-span">{{
                                 milestone.description
-                              }}</span>
+                                }}</span>
                             </div>
                           </td>
                           <td>
@@ -320,14 +261,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.status == 3
@@ -344,20 +285,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="project-milestones-table-btn"
+                                " :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> -->
@@ -368,10 +304,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>
@@ -383,14 +317,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>
@@ -413,22 +342,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>
@@ -444,14 +364,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>
@@ -474,11 +389,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') }}
@@ -1590,7 +1502,7 @@ export default {
   @extend .btn;
   @extend .btn-primary;
   border-color: #1748f8;
-  background-color: rgba(23,72,248,0.1);
+  background-color: rgba(23, 72, 248, 0.1);
   color: #1748f8;
   width: fit-content;
   padding: 0 8px;