merging

frontend/src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-body">
-    <img src="@/assets/images/home-bg-left.png" alt="freeleaps" class="app-bg-left">
+    <img src="@/assets/images/home-bg-left.png" alt="freeleaps" class="app-bg-left" />
-    <img src="@/assets/images/home-bg-right.png" alt="freeleaps" class="app-bg-right">
+    <img src="@/assets/images/home-bg-right.png" alt="freeleaps" class="app-bg-right" />
     <header class="body-header">
       <router-view name="header"></router-view>
     </header>

frontend/src/assets/styles/main.scss

@@ -204,7 +204,7 @@ p {
     // border-bottom: 1px solid #dee2e6;
     &::before {
       left: 0;
-      width: 100%;;
+      width: 100%;
     }
     .dashed-container {
       background-color: #f3f6ff;

frontend/src/components/FreeleapsEditor.vue

@@ -309,7 +309,7 @@ export default {
       let html = $event.target.innerHTML || ''
       setTimeout(() => {
         this.$emit('update:content', html)
-      });
+      })
     }
   }
 }

frontend/src/components/LaguageSwitch.vue

@@ -1,13 +1,18 @@
 <template>
   <div class="laguage-switch-container">
-        <button class="btn btn-link btn-link-switch" data-bs-toggle="dropdown" aria-expanded="false" id="language-switch-button">
+    <button
-            <img :src="languageMapper[currentLanguage]" alt="freeleap language">
+      class="btn btn-link btn-link-switch"
+      data-bs-toggle="dropdown"
+      aria-expanded="false"
+      id="language-switch-button"
+    >
+      <img :src="languageMapper[currentLanguage]" alt="freeleap language" />
     </button>
     <ul class="dropdown-menu" aria-labelledby="language-switch-button">
       <template v-for="item in languageList" :key="item">
         <li v-if="item != currentLanguage">
           <button class="btn btn-link btn-link-switch" @click="changeLanguage(item)">
-                    <img :src="languageMapper[item]" alt="freeleap zh">
+            <img :src="languageMapper[item]" alt="freeleap zh" />
           </button>
         </li>
       </template>
@@ -21,10 +26,10 @@ export default {
   name: 'LaguageSwitch',
   data() {
     return {
-            languageList: ["zh", "en"],
+      languageList: ['zh', 'en'],
       languageMapper: {
-                "zh": zh_icon,
+        zh: zh_icon,
-                "en": en_icon
+        en: en_icon
       }
     }
   },
@@ -50,7 +55,9 @@ export default {
     width: 35px;
     line-height: 1;
 
-        img {width: 100%;}
+    img {
+      width: 100%;
+    }
   }
 
   .dropdown-menu {

frontend/src/headers/HeaderUser.vue

@@ -4,7 +4,7 @@
       <div
         class="information-bar"
         @click="gotoMessages"
-        :class="{'active' : activePath == 'message', 'unread' : unreadCount > 0}"
+        :class="{ active: activePath == 'message', unread: unreadCount > 0 }"
       >
         <img alt="freeleaps logo" src="@/assets/message.png" />
       </div>

frontend/src/lang/en.js

@@ -1,70 +1,70 @@
 export default {
-    "About": "About",
+  About: 'About',
-    "Blogs": "Blogs",
+  Blogs: 'Blogs',
-    "Career": "Career",
+  Career: 'Career',
-    "Contact": "Contact",
+  Contact: 'Contact',
-    "Summary": "Summary",
+  Summary: 'Summary',
-    "Status": "Status",
+  Status: 'Status',
-    "Date": "Date",
+  Date: 'Date',
-    "withdraw": "withdraw",
+  withdraw: 'withdraw',
-    "edit": "edit",
+  edit: 'edit',
-    "Quote": "Quote",
+  Quote: 'Quote',
-    "Payment": "Payment",
+  Payment: 'Payment',
-    "Duration": "Duration",
+  Duration: 'Duration',
-    "days": "days",
+  days: 'days',
-    "Update": "Update",
+  Update: 'Update',
-    "From": "From",
+  From: 'From',
-    "reject": "reject",
+  reject: 'reject',
-    "accept": "accept",
+  accept: 'accept',
-    "Note": "Note",
+  Note: 'Note',
-    "Invite": "Invite",
+  Invite: 'Invite',
-    "Input E-mail to invite other": "Input E-mail to invite other",
+  'Input E-mail to invite other': 'Input E-mail to invite other',
-    "Submit": "Submit",
+  Submit: 'Submit',
-    "Progress": "Progress",
+  Progress: 'Progress',
-    "milestones": "milestones",
+  milestones: 'milestones',
-    "Paid": "Paid",
+  Paid: 'Paid',
-    "Milestone": "Milestone",
+  Milestone: 'Milestone',
-    "Description": "Description",
+  Description: 'Description',
-    "Mark As Paid": "Mark As Paid",
+  'Mark As Paid': 'Mark As Paid',
-    "Code Depot": "Code Depot",
+  'Code Depot': 'Code Depot',
-    "Commits": "Commits",
+  Commits: 'Commits',
-    "Last committer": "Last committer",
+  'Last committer': 'Last committer',
-    "copy git url": "copy git url",
+  'copy git url': 'copy git url',
-    "Manage": "Manage",
+  Manage: 'Manage',
-    "TO BE IMPLEMENTED.": "TO BE IMPLEMENTED.",
+  'TO BE IMPLEMENTED.': 'TO BE IMPLEMENTED.',
-    "Open issues": "Open issues",
+  'Open issues': 'Open issues',
-    "Resolved issues": "Resolved issues",
+  'Resolved issues': 'Resolved issues',
-    "Closed issues": "Closed issues",
+  'Closed issues': 'Closed issues',
-    "Add Issue": "Add Issue",
+  'Add Issue': 'Add Issue',
-    "New issue description": "New issue description",
+  'New issue description': 'New issue description',
-    "Issue title": "Issue title",
+  'Issue title': 'Issue title',
-    "Last updated": "Last updated",
+  'Last updated': 'Last updated',
-    "Issue description": "Issue description",
+  'Issue description': 'Issue description',
-    "Resolve": "Resolve",
+  Resolve: 'Resolve',
-    "Confirm": "Confirm",
+  Confirm: 'Confirm',
-    "Reopen": "Reopen",
+  Reopen: 'Reopen',
-    "fd_1": "A platform where our users can find a trustworthy partner,",
+  fd_1: 'A platform where our users can find a trustworthy partner,',
-    "fd_2": "simplify software development, and secure return.",
+  fd_2: 'simplify software development, and secure return.',
-    "fd_3": "One stop platform",
+  fd_3: 'One stop platform',
-    "fd_4": "for hiring the best",
+  fd_4: 'for hiring the best',
-    "fd_5": "freelance software development talent",
+  fd_5: 'freelance software development talent',
-    "Email address": "Email address",
+  'Email address': 'Email address',
-    "GET STARTED": "GET STARTED",
+  'GET STARTED': 'GET STARTED',
-    "Please type in your email": "Please type in your email",
+  'Please type in your email': 'Please type in your email',
-    "Your Freeleaps User ID": "Your Freeleaps User ID",
+  'Your Freeleaps User ID': 'Your Freeleaps User ID',
-    "SUBMIT": "SUBMIT",
+  SUBMIT: 'SUBMIT',
-    "Please type in your Freeleaps user ID": "Please type in your Freeleaps user ID",
+  'Please type in your Freeleaps user ID': 'Please type in your Freeleaps user ID',
-    "Your password": "Your password",
+  'Your password': 'Your password',
-    "Repeat password": "Repeat password",
+  'Repeat password': 'Repeat password',
-    "SIGN UP": "SIGN UP",
+  'SIGN UP': 'SIGN UP',
-    "Please type in your password": "Please type in your password",
+  'Please type in your password': 'Please type in your password',
-    "The two passwords are not matched": "The two passwords are not matched",
+  'The two passwords are not matched': 'The two passwords are not matched',
-    "Authenticaion Code Sent To Your Email": "Authenticaion Code Sent To Your Email",
+  'Authenticaion Code Sent To Your Email': 'Authenticaion Code Sent To Your Email',
-    "SIGN IN": "SIGN IN",
+  'SIGN IN': 'SIGN IN',
-    "Please type in the code sent to your email": "Please type in the code sent to your email",
+  'Please type in the code sent to your email': 'Please type in the code sent to your email',
-    "Invalid auth code": "Invalid auth code",
+  'Invalid auth code': 'Invalid auth code',
-    "invalid code": "invalid code",
+  'invalid code': 'invalid code',
-    "Password": "Password",
+  Password: 'Password',
-    "Forget password": "Forget password",
+  'Forget password': 'Forget password',
-    "Invalid password": "Invalid password",
+  'Invalid password': 'Invalid password'
 }

frontend/src/lang/zh.js

@@ -1,3 +1,3 @@
 export default {
-    "Contact": "联系我们"
+  Contact: '联系我们'
 }

frontend/src/pages/public/About.vue

@@ -70,7 +70,7 @@ export default {
 .directory-title {
   font-size: 48px;
   // font-weight: bold;
-  color: #18181A;
+  color: #18181a;
   margin-bottom: 5px;
 }
 .directory-subtitle {

frontend/src/pages/public/Blogs.vue

@@ -56,7 +56,8 @@ export default {
   cursor: pointer;
   padding: 0;
 
-  h2, p {
+  h2,
+  p {
     text-align: left;
   }
 }

frontend/src/pages/public/Career.vue

@@ -50,15 +50,17 @@ export default {
 
   .career-item {
     cursor: pointer;
-    box-shadow: 0px 0px 24px 0px #D4D3E380;
+    box-shadow: 0px 0px 24px 0px #d4d3e380;
     padding: 32px;
-    color: #18181A;
+    color: #18181a;
     font-size: 14px;
     background-color: white;
     margin-bottom: 32px;
     text-align: left;
 
-    p {margin: 0;}
+    p {
+      margin: 0;
+    }
     .career-title {
       font-size: 32px;
       margin-bottom: 10px;

frontend/src/pages/public/Contact.vue

@@ -84,10 +84,10 @@ export default {
     }
     .contact-right {
       margin-left: 24px;
-      box-shadow: 0px 0px 24px 0px #D4D3E380;
+      box-shadow: 0px 0px 24px 0px #d4d3e380;
       background: white;
       padding: 32px;
-      color: #18181A;
+      color: #18181a;
       border-radius: 12px;
       width: 368px;
       text-align: left;

frontend/src/pages/user/account/UserHistory.vue

@@ -4,7 +4,14 @@
       <div class="accordion accordion-list" id="accordion-history-total">
         <div class="accordion-item">
           <h2 class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="collapse-history-total" aria-expanded="false" aria-controls="collapse-history-total">
+            <button
+              class="accordion-button collapsed"
+              type="button"
+              data-bs-toggle="collapse"
+              data-bs-target="collapse-history-total"
+              aria-expanded="false"
+              aria-controls="collapse-history-total"
+            >
               <div class="history-bar dashed-container">
                 <div class="history-bar-container">
                   <div class="history-bar-item">
@@ -31,10 +38,12 @@
               </div>
             </button>
           </h2>
-          <div id="collapse-history-total" class="accordion-collapse collapse" data-bs-parent="#accordion-history-total">
+          <div
-            <div class="accordion-body">
+            id="collapse-history-total"
-
+            class="accordion-collapse collapse"
-            </div>
+            data-bs-parent="#accordion-history-total"
+          >
+            <div class="accordion-body"></div>
           </div>
         </div>
       </div>
@@ -42,7 +51,14 @@
       <div class="accordion accordion-list" id="accordion-history-total">
         <div class="accordion-item">
           <h2 class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="collapse-history-total" aria-expanded="false" aria-controls="collapse-history-total">
+            <button
+              class="accordion-button collapsed"
+              type="button"
+              data-bs-toggle="collapse"
+              data-bs-target="collapse-history-total"
+              aria-expanded="false"
+              aria-controls="collapse-history-total"
+            >
               <div class="history-bar dashed-container">
                 <div class="history-bar-container">
                   <div class="history-bar-item">
@@ -61,16 +77,25 @@
               </div>
             </button>
           </h2>
-          <div id="collapse-history-total" class="accordion-collapse collapse" data-bs-parent="#accordion-history-total">
+          <div
-            <div class="accordion-body">
+            id="collapse-history-total"
-
+            class="accordion-collapse collapse"
-            </div>
+            data-bs-parent="#accordion-history-total"
+          >
+            <div class="accordion-body"></div>
           </div>
         </div>
 
         <div class="accordion-item">
           <h2 class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="collapse-history-total" aria-expanded="false" aria-controls="collapse-history-total">
+            <button
+              class="accordion-button collapsed"
+              type="button"
+              data-bs-toggle="collapse"
+              data-bs-target="collapse-history-total"
+              aria-expanded="false"
+              aria-controls="collapse-history-total"
+            >
               <div class="history-bar dashed-container">
                 <div class="history-bar-container">
                   <div class="history-bar-item">
@@ -89,19 +114,27 @@
               </div>
             </button>
           </h2>
-          <div id="collapse-history-total" class="accordion-collapse collapse" data-bs-parent="#accordion-history-total">
+          <div
-            <div class="accordion-body">
+            id="collapse-history-total"
-
+            class="accordion-collapse collapse"
+            data-bs-parent="#accordion-history-total"
+          >
+            <div class="accordion-body"></div>
           </div>
         </div>
       </div>
-      </div>
-
 
       <div class="accordion accordion-list" id="accordion-history-earning">
         <div class="accordion-item">
           <h2 class="accordion-header">
-            <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#collapse-history-earning" aria-expanded="false" aria-controls="collapse-history-earning">
+            <button
+              class="accordion-button collapsed"
+              type="button"
+              data-bs-toggle="collapse"
+              data-bs-target="#collapse-history-earning"
+              aria-expanded="false"
+              aria-controls="collapse-history-earning"
+            >
               <div class="history-bar dashed-container">
                 <div class="history-bar-container">
                   <div class="history-bar-item">
@@ -120,7 +153,11 @@
               </div>
             </button>
           </h2>
-          <div id="collapse-history-earning" class="accordion-collapse collapse" data-bs-parent="#accordion-history-earning">
+          <div
+            id="collapse-history-earning"
+            class="accordion-collapse collapse"
+            data-bs-parent="#accordion-history-earning"
+          >
             <div class="accordion-body">
               <div class="history-bar dashed-container">
                 <div class="history-bar-container">

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

@@ -93,7 +93,9 @@
                           </div>
                           <div class="project-request-proposal-duration-container">
                             <label class="project-item-label">{{ $t('Duration') }}</label>
-                            <p class="project-item-text">{{ proposal.duration_in_day }}&nbsp;{{$t('days')}}</p>
+                            <p class="project-item-text">
+                              {{ proposal.duration_in_day }}&nbsp;{{ $t('days') }}
+                            </p>
                           </div>
                           <div class="project-request-proposal-date-container">
                             <label class="project-item-label">{{ $t('Update') }}</label>
@@ -148,7 +150,9 @@
                             </div>
                             <div class="project-request-proposal-stage-duration-container">
                               <label class="project-item-label">{{ $t('Duration') }}</label>
-                              <p class="project-item-text">{{ stage.duration_in_day }}&nbsp;{{$t('days')}}</p>
+                              <p class="project-item-text">
+                                {{ stage.duration_in_day }}&nbsp;{{ $t('days') }}
+                              </p>
                             </div>
                             <div class="project-request-proposal-stage-note-container">
                               <label class="project-item-label">{{ $t('Note') }}</label>
@@ -184,7 +188,9 @@
                   </div>
                   <div class="project-request-proposal-stage-duration-container">
                     <label class="project-item-label">{{ $t('Duration') }}</label>
-                    <p class="project-item-text">{{ stage.duration_in_day }}&nbsp;{{$t('days')}}</p>
+                    <p class="project-item-text">
+                      {{ stage.duration_in_day }}&nbsp;{{ $t('days') }}
+                    </p>
                   </div>
                   <div class="project-request-proposal-stage-note-container">
                     <label class="project-item-label">{{ $t('Note') }}</label>
@@ -220,7 +226,9 @@
                 >
                   <div class="project-invite-collaborator-form-container">
                     <div class="project-invite-collaborator-form">
-                      <label class="project-item-label">{{$t('Input E-mail to invite other')}}</label>
+                      <label class="project-item-label">{{
+                        $t('Input E-mail to invite other')
+                      }}</label>
                       <input
                         class="project-invite-collaborator-input"
                         v-model="newInviteCollaborator[project_index]"
@@ -253,7 +261,9 @@
                           <label class="project-item-label">{{ $t('Progress') }}</label>
                           <p class="project-item-text">
                             {{ project.project.progress.current_milestone }} /
-                            {{ project.project.progress.milestones.length }}&nbsp;{{$t('milestones')}}
+                            {{ project.project.progress.milestones.length }}&nbsp;{{
+                              $t('milestones')
+                            }}
                           </p>
                         </div>
                         <div class="project-milestone-bar-status">
@@ -464,7 +474,9 @@
                       >
                         <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">{{
+                              $t('New issue description')
+                            }}</label>
                             <textarea
                               class="project-new-issue-textarea"
                               type="text"
@@ -529,7 +541,9 @@
                             :data-bs-parent="'#collapse-project-issue-details' + issue_index"
                           >
                             <div class="project-issue-description-container">
-                              <label class="project-item-label">{{$t('Issue description')}}</label>
+                              <label class="project-item-label">{{
+                                $t('Issue description')
+                              }}</label>
                               <p class="project-item-text">{{ issue.description }}</p>
                             </div>
                             <div class="project-issue-action-container">
@@ -1075,7 +1089,7 @@ export default {
 
 .request-proposal-payment-plan {
   @extend .container;
-  border: 1px dashed #9CB0F6;
+  border: 1px dashed #9cb0f6;
   border-radius: 3px;
   padding: 24px;
   margin: 32px 0;

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

@@ -336,7 +336,7 @@ export default {
   box-shadow: 0px 0px 24px 0px rgba(212, 211, 227, 0.5);
   border-radius: 12px;
   overflow: hidden;
-  background: white
+  background: white;
 }
 
 .action-bar {

frontend/src/plugins/store/basic.js

@@ -8,7 +8,7 @@ const basicStore = {
     return {
       language: 'zh',
       unreadCountMapper: [],
-        downstream_web_socket: null,
+      downstream_web_socket: null
     }
   },
   mutations: {
@@ -81,4 +81,3 @@ const basicStore = {
 }
 
 export { basicStore }
-