re-styling

frontend/src/lang/zh.js

@@ -87,8 +87,7 @@ export default {
   Edit: '编辑',
   Templates: '模版',
   Cancel: '取消',
-    'I want to be a service provider and earn money':
+  'I want to be a service provider and earn money': '我要提供技术服务并且开始赚钱',
-        '我要提供技术服务并且开始赚钱',
   'Stripe account onboarding is not completed.': 'Stripe账户未绑定.',
   'Upload QR code to receive payment': '上传二维码开始收款',
   'Have you linked your strip account?': '你是否已经绑定Stripe账户？',
@@ -167,18 +166,15 @@ export default {
   '(Re)Submit': '（再）提交',
   'The request has been submitted!': '请求已提交',
   'You can find it in': '你可以在这里找到：',
-    'Review your request and the associated proposals':
+  'Review your request and the associated proposals': '核对你的请求和相关提议',
-        '核对你的请求和相关提议',
   Title: '标题',
   Action: '响应',
   'Proposed by': '提议来自',
   Price: '价格',
   Reject: '拒绝',
   Accept: '接受',
-    'Please review the following critical information':
+  'Please review the following critical information': '请核对以下重要信息',
-        '请核对以下重要信息',
   'Payment plan proposed by the service provider': '服务提供方提议的付款方案',
-    'Execution plan proposed by the service provider':
+  'Execution plan proposed by the service provider': '服务提供方提议的项目执行方案',
-        '服务提供方提议的项目执行方案',
   'Proceed to workspace': '进入到我的工作'
 }

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

@@ -7,9 +7,7 @@
           :key="index"
           class="conversation-container"
           :class="{
-            selected:
+            selected: current_thread?.conversation?.id === conversation.id
-              current_thread?.conversation?.id ===
-              conversation.id
           }"
           @click="selectConversation(conversation)"
         >

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

@@ -1,57 +1,106 @@
 <template>
   <div class="making-proposal-container offcanvas-parent">
     <div class="making-proposal-content">
-      <div class="offcanvas offcanvas-end offcanvas-container" tabindex="-1" id="offcanvas-copy-existing"
+      <div
-        aria-labelledby="offcanvas-copy-existing">
+        class="offcanvas offcanvas-end offcanvas-container"
+        tabindex="-1"
+        id="offcanvas-copy-existing"
+        aria-labelledby="offcanvas-copy-existing"
+      >
         <div class="offcanvas-header">
           <h5 class="offcanvas-title" id="offcanvas-copy-existing">
             {{ $t('Copy from existing proposals') }}
           </h5>
-          <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+          <button
+            type="button"
+            class="btn-close"
+            data-bs-dismiss="offcanvas"
+            aria-label="Close"
+          ></button>
         </div>
         <div class="offcanvas-body">
           <div class="accordion" id="existing-proposal-item-container">
-            <div v-for="(existingProposal, index) in existingProposals" :key="index" :id="'existing-proposal' + index"
+            <div
-              class="accordion-item">
+              v-for="(existingProposal, index) in existingProposals"
+              :key="index"
+              :id="'existing-proposal' + index"
+              class="accordion-item"
+            >
               <h2 class="accordion-header" :id="'existing-heading' + index">
-                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                <button
-                  :data-bs-target="'#' + 'existing-proposal-collapse' + index" aria-expanded="false"
+                  class="accordion-button collapsed"
-                  :aria-controls="'collapse' + index">
+                  type="button"
+                  data-bs-toggle="collapse"
+                  :data-bs-target="'#' + 'existing-proposal-collapse' + index"
+                  aria-expanded="false"
+                  :aria-controls="'collapse' + index"
+                >
                   <span class="dashed-container">{{ existingProposal.request.title }}</span>
                 </button>
               </h2>
-              <div :id="'existing-proposal-collapse' + index" class="accordion-collapse collapse"
+              <div
-                :aria-labelledby="'existing-heading' + index" data-bs-parent="#existing-proposal-item-container">
+                :id="'existing-proposal-collapse' + index"
+                class="accordion-collapse collapse"
+                :aria-labelledby="'existing-heading' + index"
+                data-bs-parent="#existing-proposal-item-container"
+              >
                 <div class="accordion-body">
                   <button class="copy-existing-button" @click="copyProposal(existingProposal)">
                     {{ $t('Copy') }}
                   </button>
-                  <div class="existing-request-content-text" v-html="existingProposal.content"></div>
+                  <div
+                    class="existing-request-content-text"
+                    v-html="existingProposal.content"
+                  ></div>
                 </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-      <div class="offcanvas offcanvas-end offcanvas-container" tabindex="-1" id="offcanvas-template"
+      <div
-        aria-labelledby="offcanvas-template">
+        class="offcanvas offcanvas-end offcanvas-container"
+        tabindex="-1"
+        id="offcanvas-template"
+        aria-labelledby="offcanvas-template"
+      >
         <div class="offcanvas-header">
           <h5 class="offcanvas-title" id="offcanvas-template">
             {{ $t('Apply proposal template') }}
           </h5>
-          <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+          <button
+            type="button"
+            class="btn-close"
+            data-bs-dismiss="offcanvas"
+            aria-label="Close"
+          ></button>
         </div>
         <div class="offcanvas-body">
           <div class="accordion" id="template-item-container">
-            <div v-for="(template, index) in templates" :key="index" :id="'template' + index" class="accordion-item">
+            <div
+              v-for="(template, index) in templates"
+              :key="index"
+              :id="'template' + index"
+              class="accordion-item"
+            >
               <h2 class="accordion-header" :id="'heading' + index">
-                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                <button
-                  :data-bs-target="'#' + 'collapse' + index" aria-expanded="false" :aria-controls="'collapse' + index">
+                  class="accordion-button collapsed"
+                  type="button"
+                  data-bs-toggle="collapse"
+                  :data-bs-target="'#' + 'collapse' + index"
+                  aria-expanded="false"
+                  :aria-controls="'collapse' + index"
+                >
                   <span class="dashed-container">{{ template.title }}</span>
                 </button>
               </h2>
-              <div :id="'collapse' + index" class="accordion-collapse collapse" :aria-labelledby="'heading' + index"
+              <div
-                data-bs-parent="#template-item-container">
+                :id="'collapse' + index"
+                class="accordion-collapse collapse"
+                :aria-labelledby="'heading' + index"
+                data-bs-parent="#template-item-container"
+              >
                 <div class="accordion-body">
                   <button class="load-template-button" @click="applyTemplate(template)">
                     {{ $t('Apply') }}
@@ -67,14 +116,22 @@
         <div class="accordion accordion-list" id="accordion-request-container">
           <div class="accordion-item">
             <h2 class="accordion-header">
-              <button class="accordion-button" type="button" data-bs-toggle="collapse"
+              <button
-                data-bs-target="#collapse-request-content" aria-expanded="false"
+                class="accordion-button"
-                aria-controls="collapse-request-content">
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#collapse-request-content"
+                aria-expanded="false"
+                aria-controls="collapse-request-content"
+              >
                 <span class="dashed-container">{{ request.title }}</span>
               </button>
             </h2>
-            <div id="collapse-request-content" class="accordion-collapse collapse"
+            <div
-              data-bs-parent="#accordion-request-container">
+              id="collapse-request-content"
+              class="accordion-collapse collapse"
+              data-bs-parent="#accordion-request-container"
+            >
               <div class="accordion-body">
                 <div class="request-content" v-html="request.content"></div>
               </div>
@@ -86,13 +143,23 @@
         <div class="proposal-header-container">
           <label class="proposal-label">{{ $t('Proposal') }}:</label>
           <div class="header-bar">
-            <button class="btn btn-link" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvas-template"
+            <button
-              aria-controls="offcanvas-template">
+              class="btn btn-link"
+              type="button"
+              data-bs-toggle="offcanvas"
+              data-bs-target="#offcanvas-template"
+              aria-controls="offcanvas-template"
+            >
               <svg-icon icon="btn-templates" />
               {{ $t('Templates') }}
             </button>
-            <button class="btn btn-link" type="button" data-bs-toggle="offcanvas"
+            <button
-              data-bs-target="#offcanvas-copy-existing" aria-controls="offcanvas-copy-existing">
+              class="btn btn-link"
+              type="button"
+              data-bs-toggle="offcanvas"
+              data-bs-target="#offcanvas-copy-existing"
+              aria-controls="offcanvas-copy-existing"
+            >
               <svg-icon icon="btn-history" />
               {{ $t('Copy') }}
             </button>
@@ -108,8 +175,12 @@
               <div class="form-group">
                 <div class="input-group-container">
                   <div class="form-floating">
-                    <input class="input-email" :id="`stage-payment-content-${index}`" type="number"
+                    <input
-                      v-model="stage.payment" />
+                      class="input-email"
+                      :id="`stage-payment-content-${index}`"
+                      type="number"
+                      v-model="stage.payment"
+                    />
                     <label :for="`stage-payment-content-${index}`">{{ $t('Payment') }}</label>
                   </div>
                   <span class="btn-start">{{ stage.currency }}</span>
@@ -120,8 +191,12 @@
               <div class="form-group">
                 <div class="input-group-container">
                   <div class="form-floating">
-                    <input class="input-email" :id="`stage-duration-content-${index}`" type="number"
+                    <input
-                      v-model="stage.duration_in_days" />
+                      class="input-email"
+                      :id="`stage-duration-content-${index}`"
+                      type="number"
+                      v-model="stage.duration_in_days"
+                    />
                     <label :for="`stage-duration-content-${index}`">{{ $t('Duration') }}</label>
                   </div>
                   <span class="btn-start">day(s)</span>
@@ -132,7 +207,12 @@
               <div class="form-group">
                 <div class="input-group-container">
                   <div class="form-floating">
-                    <input class="input-email" :id="`stage-note-content-${index}`" type="text" v-model="stage.note" />
+                    <input
+                      class="input-email"
+                      :id="`stage-note-content-${index}`"
+                      type="text"
+                      v-model="stage.note"
+                    />
                     <label :for="`stage-note-content-${index}`">{{ $t('Notes') }}</label>
                   </div>
                 </div>
@@ -197,7 +277,12 @@
               <span v-if="uploadFile">{{ uploadFile.name }}</span>
               <input type="file" hidden @change="handleFileUpload" />
             </label>
-            <svg-icon v-if="uploadFile" icon="delete" class-name="delete-icon" @click.stop="clearFile" />
+            <svg-icon
+              v-if="uploadFile"
+              icon="delete"
+              class-name="delete-icon"
+              @click.stop="clearFile"
+            />
           </div>
           <!-- <label for="file-upload" class="file-upload-label">Upload File:</label>
           <input type="file" id="file-upload" class="file-upload-input" @change="handleFileUpload" /> -->
@@ -272,7 +357,7 @@ export default {
     //   this.mnx_navToCopyProposals()
     // },
     isUserInCNY() {
-      return window.location.host.includes('localhost') || window.location.href.includes('com.cn');
+      return window.location.host.includes('localhost') || window.location.href.includes('com.cn')
     },
     handleFileUpload(event) {
       this.uploadFile = event.target.files[0]