.gitignore

@@ -13,5 +13,4 @@ ythe.sh
 /logs/
 *build*
 package-lock.json
-.vite
-.idea
+.vite

Dockerfile

@@ -2,10 +2,6 @@
 FROM node:lts-alpine as build-stage
 ARG CONTAINER_APP_ROOT="/app"
 ARG FRONTEND_PORT=8080
-# TODO: further testing before turning on
-# ARG ZOOM_CLIENT_ID
-# ARG ZOOM_REDIRECT_URI
-# ARG ZOOM_SCOPE
 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
@@ -21,11 +17,6 @@ COPY frontend/*.html ./
 COPY frontend/src ./src
 COPY frontend/public ./public
 
-# TODO: further testing before turning on
-# RUN echo "VUE_APP_ZOOM_CLIENT_ID=${ZOOM_CLIENT_ID}" >> .env
-# RUN echo "VUE_APP_ZOOM_REDIRECT_URI=${ZOOM_REDIRECT_URI}" >> .env
-# RUN echo "VUE_APP_ZOOM_SCOPE=${ZOOM_SCOPE}" >> .env
-
 RUN npm run build
 
 # production stage

frontend/frontend

@@ -1 +0,0 @@
-../freeleaps2-frontend/frontend

frontend/package.json

@@ -19,7 +19,6 @@
     "echarts": "^5.5.1",
     "graphql": "^16.9.0",
     "graphql-tag": "^2.12.6",
-    "jwt-decode": "^4.0.0",
     "pdfjs-dist": "^4.3.136",
     "pinia": "^2.1.6",
     "vue": "^3.3.4",
@@ -42,4 +41,4 @@
     "vite-plugin-svg-icons": "^2.0.1",
     "webpack": "^5.88.2"
   }
-}
+}

frontend/src/components/CustomChart.vue

@@ -1,72 +0,0 @@
-<template>
-  <v-chart ref="customChart" :option="option" autoresize />
-</template>
-
-<script>
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-import { LineChart, BarChart } from 'echarts/charts'
-import { GridComponent, LegendComponent, TooltipComponent, DataZoomComponent } from 'echarts/components'
-import VChart from 'vue-echarts'
-use([CanvasRenderer, LineChart, LegendComponent, GridComponent, TooltipComponent, BarChart, DataZoomComponent])
-
-export default {
-  name: 'CustomChart',
-  props: {
-    customOption: { type: Object, default: () => {} }
-  },
-  components: {
-    VChart,
-  },
-  computed: {
-    option() {
-      if (this.customOption) {
-        const option = {
-          tooltip: {
-            trigger: 'axis',
-            textStyle: {
-              align: 'left'
-            },
-            ...this.customOption?.tooltip
-          },
-          legend: {
-            data: this.customOption.series.map(ser => ser.name) || [],
-            ...this.customOption?.legend
-          },
-          xAxis: {
-            type: 'category',
-            axisLabel: {
-              showMaxLabel: true,
-              showMinLabel: true
-            },
-            boundaryGap: false,
-            ...this.customOption?.xAxis
-          },
-          yAxis: {
-            type: 'value',
-            ...this.customOption?.yAxis
-          },
-          dataZoom: [{
-            type: 'slider',
-            startValue: 0,
-            endValue: 3,
-            show: this.customOption?.xAxis?.data?.length > 4
-          }],
-          series: this.customOption.series || [],
-        }
-        return option
-      }
-      return {}
-    }
-  },
-  beforeUnmount() {
-    // 手动销毁实例
-    if (this.$refs.customChart && this.$refs.customChart.dispose) {
-      this.$refs.customChart.dispose();
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

frontend/src/components/EmptyContent.vue

@@ -1,7 +1,7 @@
 <template>
-  <div v-if="loading || empty" class="empty-content-container" :class="{ autoFit: 'auto-fit' }">
-    <img v-if="loading" src="@/assets/images/loading.gif" class="loading-big" alt="" />
-    <img v-if="empty && !loading" src="@/assets/images/no_content.jpg" class="empty-img" alt="" />
+  <div v-if="loading || empty" class="empty-content-container" :class="{autoFit : 'auto-fit'}">
+    <img v-if="loading" src="@/assets/images/loading.gif" class="loading-big" alt="">
+    <img v-if="empty && !loading" src="@/assets/images/no_content.jpg" class="empty-img" alt="">
     <span v-if="empty && !loading" class="empty-text">{{ $t('No content yet') }}</span>
   </div>
 </template>
@@ -34,13 +34,11 @@ export default {
     width: 188px;
     height: 188px;
   }
-
   .empty-img {
     width: 188px;
     height: 188px;
     margin-bottom: 15px;
   }
-
   .empty-text {
     font-size: 26px;
     color: #6e7387;

frontend/src/components/LineChart.vue

@@ -1,58 +0,0 @@
-<template>
-  <v-chart ref="lineChart" :option="option" autoresize />
-</template>
-
-<script>
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-import { LineChart } from 'echarts/charts'
-import { GridComponent, LegendComponent, TooltipComponent } from 'echarts/components'
-import VChart from 'vue-echarts'
-use([CanvasRenderer, LineChart, LegendComponent, GridComponent, TooltipComponent])
-
-export default {
-  name: 'LineChart',
-  props: {
-    data: { type: Object, default: () => {} }
-  },
-  components: {
-    VChart,
-  },
-  computed: {
-    option() {
-      const option = {
-        tooltip: {
-          trigger: 'axis'
-        },
-        legend: {
-          data: this.data.series.map(ser => ser.name) || []
-        },
-        xAxis: {
-          type: 'category',
-          boundaryGap: false,
-          data: this.data.xData || [],
-          axisLabel: {
-            showMaxLabel: true,
-            showMinLabel: true
-          }
-        },
-        yAxis: {
-          type: 'value',
-          minInterval: 1
-        },
-        series: this.data.series || []
-      }
-      return option
-    }
-  },
-  beforeUnmount() {
-    // 手动销毁实例
-    if (this.$refs.lineChart && this.$refs.lineChart.dispose) {
-      this.$refs.lineChart.dispose();
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-</style>

frontend/src/headers/HeaderUser.vue

@@ -2,61 +2,38 @@
 <template>
   <div class="header-container">
     <div class="header-content">
-      <div
-        class="information-bar"
-        @click="gotoMessages"
-        :class="{ active: activePath == 'message', unread: unreadConversationCount > 0 }"
-      >
+      <div class="information-bar" @click="gotoMessages"
+        :class="{ active: activePath == 'message', unread: unreadConversationCount > 0 }">
         <img alt="freeleaps message" src="@/assets/message.png" />
       </div>
       <div class="navigation-container" role="navigation">
-        <button
-          class="navigation-item"
-          @click="gotoWorkspace"
-          :class="{ active: activePath == 'Workspace', badge: unreadWorkspace }"
-        >
+        <button class="navigation-item" @click="gotoWorkspace"
+          :class="{ active: activePath == 'Workspace', badge: unreadWorkspace }">
           <svg-icon icon="workspace" class-name="icon" />
           {{ $t('My Work') }}
           <div v-if="unreadWorkspace" class="navigation-item-tip">
             {{ $t('Some update in your work') }}
           </div>
         </button>
-        <button
-          class="navigation-item"
-          @click="gotoRequests"
-          :class="{ active: activePath == 'Requests', badge: unreadRequest }"
-        >
+        <button class="navigation-item" @click="gotoRequests"
+          :class="{ active: activePath == 'Requests', badge: unreadRequest }">
           <svg-icon icon="requests" class-name="icon" />
           {{ $t('Jobs') }}
           <div v-if="unreadRequest" class="navigation-item-tip">
             {{ $t('Some update in your request') }}
           </div>
         </button>
-        <button
-          class="navigation-item"
-          @click="gotoProviders"
-          :class="activePath == 'Providers' ? 'active' : ''"
-        >
+        <button class="navigation-item" @click="gotoProviders" :class="activePath == 'Providers' ? 'active' : ''">
           <svg-icon icon="providers" class-name="icon" />
           {{ $t('Workers') }}
         </button>
-        <button
-          class="navigation-item"
-          @click="gotoIssueRequest"
-          :class="activePath == 'Post' ? 'active' : ''"
-        >
+        <button class="navigation-item" @click="gotoIssueRequest" :class="activePath == 'Post' ? 'active' : ''">
           <svg-icon icon="post" class-name="icon" />
           {{ $t('Post a Job') }}
         </button>
         <div class="form-check form-switch header-switch-container" @click="gotoProfile">
-          <input
-            class="form-check-input"
-            type="checkbox"
-            role="switch"
-            :checked="userProfile?.account?.provider?.accepting_request"
-            id="personal-earning-now-checkbox"
-            disabled
-          />
+          <input class="form-check-input" type="checkbox" role="switch"
+            :checked="userProfile?.account?.provider?.accepting_request" id="personal-earning-now-checkbox" disabled />
           <label class="form-check-label" for="personal-earning-now-checkbox">
             <span>{{ $t('Providing service') }}</span>
           </label>
@@ -67,17 +44,10 @@
         <laguage-switch class="laguage-switch" />
       </div>
       <div class="profile-container">
-        <img
-          alt="freeleaps logo"
-          data-bs-toggle="dropdown"
-          aria-expanded="false"
-          id="accountButton"
-          :src="
-            userProfile?.account?.basic?.photo?.base64
-              ? userProfile?.account?.basic?.photo?.base64
-              : profileUrl
-          "
-        />
+        <img alt="freeleaps logo" data-bs-toggle="dropdown" aria-expanded="false" id="accountButton" :src="userProfile?.account?.basic?.photo?.base64
+          ? userProfile?.account?.basic?.photo?.base64
+          : profileUrl
+          " />
         <ul class="dropdown-menu" aria-labelledby="accountButton">
           <li>
             <button class="account-menu-button" @click="gotoProfile">{{ $t('Profile') }}</button>

frontend/src/lang/en.js

@@ -215,10 +215,8 @@ export default {
   Goal: 'Goal',
   Message: 'Message',
   'Upload attachment': 'Upload attachment',
-  "Didn't get the email? Check junk folder or": "Didn't get the email? Check junk folder or ",
+  'Didn\'t get the email? Check junk folder or': 'Didn\'t get the email? Check junk folder or ',
   'send again': 'send again',
-  'No content yet': 'No content yet',
-  'open': 'open',
-  'resolved': 'resolved',
-  'unresolved': 'unresolved'
+  'No content yet': 'No content yet'
+
 }

frontend/src/lang/zh.js

@@ -213,20 +213,7 @@ export default {
   'Lines of code per week': '每周代码产量',
   Message: '消息',
   'Upload attachment': '上传附件',
-  "Didn't get the email? Check junk folder or": '没收到邮件？检查垃圾文件夹或',
+  'Didn\'t get the email? Check junk folder or': '没收到邮件？检查垃圾文件夹或',
   'send again': '重新发送',
-  'No content yet': '暂无内容',
-  OUTSTANDING: '进行中',
-  PAID: '已付款',
-  DONE: '已完成',
-  RECRUITING: '招人中',
-  ONGOING: '进行中',
-  PENDING: '待确认',
-  CLOSED: '已关闭',
-  REJECTED: '已拒绝',
-  APPLYING: '申请中',
-  ACCEPTING: '接受中',
-  'open': '未解决',
-  'resolved': '已解决',
-  'unresolved': '未解决总计'
+  'No content yet': '暂无内容'
 }

frontend/src/pages/guest/FrontDoor.vue

@@ -8,13 +8,7 @@
       <div class="form-group">
         <div class="input-group-container">
           <div class="form-floating">
-            <input
-              class="input-email"
-              id="inputEmail"
-              type="text"
-              placeholder="name@example.com"
-              v-model="email"
-            />
+            <input class="input-email" id="inputEmail" type="text" placeholder="name@example.com" v-model="email" />
             <label for="inputEmail">{{ $t('Enter email address to start') }}</label>
           </div>
           <button class="btn-start" ref="submitButton" @click="trySigninWithEmail()">
@@ -57,8 +51,6 @@ export default {
   },
   methods: {
     trySigninWithEmail() {
-      // Prevent the page from refreshing on form submission
-      event.preventDefault()
       this.message = null
       if (this.email === null || this.email.length < 1) {
         this.message = this.$t('Please type in your email')

frontend/src/pages/guest/SigninWithEmailAndCode.vue

@@ -9,14 +9,8 @@
         <div class="form-group">
           <div class="input-group-container">
             <div class="form-floating">
-              <input
-                class="input-email"
-                id="inputCode"
-                type="text"
-                :placeholder="'Code sent to your email'"
-                v-model="code"
-                @focus="inputFocus"
-              />
+              <input class="input-email" id="inputCode" type="text" :placeholder="'Code sent to your email'"
+                v-model="code" @focus="inputFocus" />
               <label for="inputCode">{{ $t('Authenticaion Code Sent To Your Email') }}</label>
             </div>
             <button type="submit" class="btn-start">{{ $t('SIGN IN') }}</button>
@@ -24,15 +18,9 @@
         </div>
         <p class="error-msg" v-if="message != null">{{ message }}</p>
         <p class="error-msg msg-center" v-if="!message">
-          <span>{{ $t("Didn't get the email? Check junk folder or") }}</span>
-          <button
-            class="btn btn-link resend-btn"
-            :disabled="countdown !== 0"
-            type="button"
-            @click="trySigninWithEmail"
-          >
-            {{ $t('send again') }}
-          </button>
+          <span>{{ $t('Didn\'t get the email? Check junk folder or') }}</span>
+          <button class="btn btn-link resend-btn" :disabled="countdown !== 0" type="button"
+            @click="trySigninWithEmail">{{ $t('send again') }}</button>
           <span v-if="countdown !== 0" class="countdown">({{ countdown }})</span>
         </p>
       </div>
@@ -64,7 +52,7 @@ export default {
     }
   },
 
-  created() {},
+  created() { },
   mounted() {
     if (this.mnx_IsKeepUserSignedIn() && this.mnx_isUserAuthenticated()) {
       this.mnx_navAfterSignedin()

frontend/src/pages/guest/SigninWithEmailAndPassword.vue

@@ -78,14 +78,6 @@ export default {
 
       UserAuthApi.signinByEmail(this.email, this.password)
         .then((response) => {
-          // Extract the necessary data from the response
-          const { access_token, refresh_token, expires_in } = response.data
-
-          // Save tokens and expiration time in localStorage
-          localStorage.setItem('access_token', access_token)
-          localStorage.setItem('refresh_token', refresh_token)
-          localStorage.setItem('expires_in', expires_in)
-
           let signinAction = response.data.signin_result
           switch (signinAction) {
             case signinActionEnum.EXISTING_USER_PASSWORD_REQUIRED:

frontend/src/pages/public/About.vue

@@ -33,8 +33,10 @@ export default {
         })
     },
     view_link(directory) {
-      if (directory.content_id) this.mnx_navToPdfContentViewer(directory.content_id)
-      else if (directory.content_link) this.mnx_navToLinkContentViewer(btoa(directory.content_link))
+      if (directory.content_id)
+        this.mnx_navToPdfContentViewer(directory.content_id)
+      else if (directory.content_link)
+        this.mnx_navToLinkContentViewer(btoa(directory.content_link))
     }
   },
   data() {
@@ -85,7 +87,6 @@ export default {
   color: #666666;
   margin-bottom: 5px;
 }
-
 .directory-btn {
   font-weight: 600;
 }

frontend/src/pages/public/Blogs.vue

@@ -32,8 +32,10 @@ export default {
         })
     },
     view_blog(blog) {
-      if (blog.content_id) this.mnx_navToPdfContentViewer(blog.content_id)
-      else if (blog.content_link) this.mnx_navToLinkContentViewer(btoa(blog.content_link))
+      if (blog.content_id)
+        this.mnx_navToPdfContentViewer(blog.content_id)
+      else if (blog.content_link)
+        this.mnx_navToLinkContentViewer(btoa(blog.content_link))
     },
     retrieve_summary(blog) {
       return blog.summary_text

frontend/src/pages/public/Career.vue

@@ -1,11 +1,6 @@
 <template>
   <div class="career_containter">
-    <div
-      class="career-item"
-      v-for="(directory, index) in directories"
-      :key="index"
-      @click="view_link(directory)"
-    >
+    <div class="career-item" v-for="(directory, index) in directories" :key="index" @click="view_link(directory)">
       <p class="career-title">
         {{ directory.title_text }}
       </p>
@@ -33,8 +28,10 @@ export default {
         })
     },
     view_link(directory) {
-      if (directory.content_id) this.mnx_navToPdfContentViewer(directory.content_id)
-      else if (directory.content_link) this.mnx_navToLinkContentViewer(btoa(directory.content_link))
+      if (directory.content_id)
+        this.mnx_navToPdfContentViewer(directory.content_id)
+      else if (directory.content_link)
+        this.mnx_navToLinkContentViewer(btoa(directory.content_link))
     }
   },
   data() {