Temporary commit for CNY support on China region

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

@@ -1,106 +1,57 @@
 <template>
   <div class="making-proposal-container offcanvas-parent">
     <div class="making-proposal-content">
-      <div
+      <div class="offcanvas offcanvas-end offcanvas-container" tabindex="-1" id="offcanvas-copy-existing"
-        class="offcanvas offcanvas-end offcanvas-container"
+        aria-labelledby="offcanvas-copy-existing">
-        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
+          <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></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
+            <div v-for="(existingProposal, index) in existingProposals" :key="index" :id="'existing-proposal' + index"
-              v-for="(existingProposal, index) in existingProposals"
+              class="accordion-item">
-              :key="index"
-              :id="'existing-proposal' + index"
-              class="accordion-item"
-            >
               <h2 class="accordion-header" :id="'existing-heading' + index">
-                <button
+                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                  class="accordion-button collapsed"
+                  :data-bs-target="'#' + 'existing-proposal-collapse' + index" aria-expanded="false"
-                  type="button"
+                  :aria-controls="'collapse' + index">
-                  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
+              <div :id="'existing-proposal-collapse' + index" class="accordion-collapse collapse"
-                :id="'existing-proposal-collapse' + index"
+                :aria-labelledby="'existing-heading' + index" data-bs-parent="#existing-proposal-item-container">
-                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
+                  <div class="existing-request-content-text" v-html="existingProposal.content"></div>
-                    class="existing-request-content-text"
-                    v-html="existingProposal.content"
-                  ></div>
                 </div>
               </div>
             </div>
           </div>
         </div>
       </div>
-      <div
+      <div class="offcanvas offcanvas-end offcanvas-container" tabindex="-1" id="offcanvas-template"
-        class="offcanvas offcanvas-end offcanvas-container"
+        aria-labelledby="offcanvas-template">
-        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
+          <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></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
+            <div v-for="(template, index) in templates" :key="index" :id="'template' + index" class="accordion-item">
-              v-for="(template, index) in templates"
-              :key="index"
-              :id="'template' + index"
-              class="accordion-item"
-            >
               <h2 class="accordion-header" :id="'heading' + index">
-                <button
+                <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                  class="accordion-button collapsed"
+                  :data-bs-target="'#' + 'collapse' + index" aria-expanded="false" :aria-controls="'collapse' + index">
-                  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
+              <div :id="'collapse' + index" class="accordion-collapse collapse" :aria-labelledby="'heading' + index"
-                :id="'collapse' + index"
+                data-bs-parent="#template-item-container">
-                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') }}
@@ -116,22 +67,14 @@
         <div class="accordion accordion-list" id="accordion-request-container">
           <div class="accordion-item">
             <h2 class="accordion-header">
-              <button
+              <button class="accordion-button" type="button" data-bs-toggle="collapse"
-                class="accordion-button"
+                data-bs-target="#collapse-request-content" aria-expanded="false"
-                type="button"
+                aria-controls="collapse-request-content">
-                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
+            <div id="collapse-request-content" class="accordion-collapse collapse"
-              id="collapse-request-content"
+              data-bs-parent="#accordion-request-container">
-              class="accordion-collapse collapse"
-              data-bs-parent="#accordion-request-container"
-            >
               <div class="accordion-body">
                 <div class="request-content" v-html="request.content"></div>
               </div>
@@ -143,23 +86,13 @@
         <div class="proposal-header-container">
           <label class="proposal-label">{{ $t('Proposal') }}:</label>
           <div class="header-bar">
-            <button
+            <button class="btn btn-link" type="button" data-bs-toggle="offcanvas" data-bs-target="#offcanvas-template"
-              class="btn btn-link"
+              aria-controls="offcanvas-template">
-              type="button"
-              data-bs-toggle="offcanvas"
-              data-bs-target="#offcanvas-template"
-              aria-controls="offcanvas-template"
-            >
               <svg-icon icon="btn-templates" />
               {{ $t('Templates') }}
             </button>
-            <button
+            <button class="btn btn-link" type="button" data-bs-toggle="offcanvas"
-              class="btn btn-link"
+              data-bs-target="#offcanvas-copy-existing" aria-controls="offcanvas-copy-existing">
-              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>
@@ -175,12 +108,8 @@
               <div class="form-group">
                 <div class="input-group-container">
                   <div class="form-floating">
-                    <input
+                    <input class="input-email" :id="`stage-payment-content-${index}`" type="number"
-                      class="input-email"
+                      v-model="stage.payment" />
-                      :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>
@@ -191,12 +120,8 @@
               <div class="form-group">
                 <div class="input-group-container">
                   <div class="form-floating">
-                    <input
+                    <input class="input-email" :id="`stage-duration-content-${index}`" type="number"
-                      class="input-email"
+                      v-model="stage.duration_in_days" />
-                      :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>
@@ -207,12 +132,7 @@
               <div class="form-group">
                 <div class="input-group-container">
                   <div class="form-floating">
-                    <input
+                    <input class="input-email" :id="`stage-note-content-${index}`" type="text" v-model="stage.note" />
-                      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>
@@ -277,12 +197,7 @@
               <span v-if="uploadFile">{{ uploadFile.name }}</span>
               <input type="file" hidden @change="handleFileUpload" />
             </label>
-            <svg-icon
+            <svg-icon v-if="uploadFile" icon="delete" class-name="delete-icon" @click.stop="clearFile" />
-              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" /> -->
@@ -301,7 +216,9 @@ import { requestHubUtils, RequestHubApi } from '@/utils/index'
 import {
   proposingModelEnum,
   preparedProposal,
+  preparedProposalCNY,
   preparedProposalStage,
+  preparedProposalStageCNY,
   preparedProposalSummary,
   proposalUtils
 } from '@/types/index'
@@ -339,7 +256,7 @@ export default {
     return {
       proposal: null,
       request: null,
-      emptyStage: preparedProposalStage,
+      emptyStage: this.isUserInCNY() ? preparedProposalStageCNY : preparedProposalStage,
       summary: preparedProposalSummary,
       existingProposals: null,
       templates: null,
@@ -354,6 +271,9 @@ export default {
     // copyExisting() {
     //   this.mnx_navToCopyProposals()
     // },
+    isUserInCNY() {
+      return window.location.host.includes('localhost') || window.location.href.includes('com.cn');
+    },
     handleFileUpload(event) {
       this.uploadFile = event.target.files[0]
     },
@@ -403,7 +323,7 @@ export default {
     loadFrom() {
       switch (Number.parseInt(this.loadingMode, 10)) {
         case proposingModelEnum.NO_LOADING: {
-          this.proposal = preparedProposal
+          this.proposal = this.isUserInCNY() ? preparedProposalCNY : preparedProposal
           break
         }
         case proposingModelEnum.FROM_DRAFT: {
@@ -495,6 +415,7 @@ export default {
 .request-container {
   @extend .container;
   padding: 0;
+
   .accordion-list {
     margin: 0;
     box-shadow: none;
@@ -527,6 +448,7 @@ export default {
   @extend .flex-row-container;
   @extend .justify-content-end;
   align-items: center;
+
   .btn {
     white-space: nowrap;
     padding: 0;
@@ -774,6 +696,7 @@ export default {
   width: 100%;
   text-align: left;
   border-bottom: 1px solid #e7e8eb;
+
   .btn-link {
     padding: 0;
   }
@@ -794,6 +717,7 @@ export default {
 .milestone-input-container {
   width: calc(33.3% - 30px);
   border: 2px dashed #9cb0f6;
+
   .btn-start {
     background: transparent;
     color: #0d1637;
@@ -807,6 +731,7 @@ export default {
 .delete-icon {
   color: $primary;
   cursor: pointer;
+
   &:hover {
     opacity: 0.78;
   }

frontend/src/types/index.js

@@ -19,7 +19,9 @@ export {
 export {
   proposingModelEnum,
   preparedProposal,
+  preparedProposalCNY,
   preparedProposalStage,
+  preparedProposalStageCNY,
   preparedProposalSummary,
   proposalUtils
 } from './proposalUtils'

frontend/src/types/proposalUtils.js

@@ -11,6 +11,13 @@ const preparedProposalStage = {
   note: 'some note to indicate what this stage is about, like finish all coding work'
 }
 
+const preparedProposalStageCNY = {
+  payment: 400,
+  currency: 'CNY',
+  duration_in_days: 10,
+  note: '关于这个里程的一些备注，例如完成所有开发工作'
+}
+
 const preparedProposalSummary = {
   total_stages: 0,
   total_payment: 0,
@@ -27,6 +34,15 @@ const preparedProposal = {
   stages: [preparedProposalStage]
 }
 
+const preparedProposalCNY = {
+  id: null,
+  user_id: null,
+  create_time: null,
+  update_time: null,
+  content: '',
+  stages: [preparedProposalStageCNY]
+}
+
 class ProposalUtils {
   caculateSummary(summary, stages) {
     summary.total_stages = 0 //reset
@@ -47,7 +63,9 @@ const proposalUtils = new ProposalUtils()
 export {
   proposingModelEnum,
   preparedProposal,
+  preparedProposalCNY,
   preparedProposalStage,
+  preparedProposalStageCNY,
   preparedProposalSummary,
   proposalUtils
 }