From 510a879b5e11b84d362a0c484bca84461fd42444 Mon Sep 17 00:00:00 2001
From: Zhigang Wang <zhigangw@hotmail.com>
Date: Fri, 7 Jun 2024 15:10:06 -0700
Subject: [PATCH] add password validation plus some cleanup

---
 frontend/src/headers/HeaderGuest.vue          | 11 ++++++-
 .../src/pages/guest/NewUserSetPassword.vue    |  4 +--
 .../src/pages/user/account/UserProfile.vue    | 12 ++++++--
 frontend/src/plugins/router/router.js         |  1 -
 frontend/src/utils/index.js                   |  2 +-
 frontend/src/utils/validator/index.js         |  9 +-----
 .../src/utils/validator/passwordValidator.js  |  4 +--
 frontend/src/utils/validator/userProfile.js   | 29 -------------------
 frontend/vite.config.js                       |  2 +-
 9 files changed, 27 insertions(+), 47 deletions(-)
 delete mode 100644 frontend/src/utils/validator/userProfile.js

diff --git a/frontend/src/headers/HeaderGuest.vue b/frontend/src/headers/HeaderGuest.vue
index 7f8b201..e4bea46 100644
--- a/frontend/src/headers/HeaderGuest.vue
+++ b/frontend/src/headers/HeaderGuest.vue
@@ -1,7 +1,12 @@
 <template>
   <div class="header-container">
     <div class="header-content">
-      <img class="company-logo" alt="freeleaps logo" src="@/assets/freeleaps.png" />
+      <img
+        class="company-logo"
+        alt="freeleaps logo"
+        src="@/assets/freeleaps.png"
+        @click="gotoFrontdoor()"
+      />
       <!-- <div class="content-area">
         <span class="company-slogan"
           >Freeleaps: A trustworthy platform to find a software development partner</span
@@ -22,6 +27,9 @@ export default {
   components: {},
   computed: {},
   methods: {
+    gotoFrontdoor() {
+      this.mnx_navToFrontDoor()
+    },
     gotoAbout() {
       this.mnx_navToAbout()
     },
@@ -57,6 +65,7 @@ export default {
 
 .company-logo {
   height: 40px;
+  cursor: pointer;
 }
 
 .company-slogan {
diff --git a/frontend/src/pages/guest/NewUserSetPassword.vue b/frontend/src/pages/guest/NewUserSetPassword.vue
index 987bea2..480ea08 100644
--- a/frontend/src/pages/guest/NewUserSetPassword.vue
+++ b/frontend/src/pages/guest/NewUserSetPassword.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { UserAuthApi } from '../../utils/index'
+import { UserAuthApi, passwordValidator } from '../../utils/index'
 export default {
   name: 'NewUserSetPassword',
   props: {},
@@ -67,7 +67,7 @@ export default {
         this.message = 'The two passwords are not matched'
         return
       }
-
+      this.message = passwordValidator.validate(this.password)
       if (this.message != null) return
 
       UserAuthApi.updatePassword(this.password, this.password2)
diff --git a/frontend/src/pages/user/account/UserProfile.vue b/frontend/src/pages/user/account/UserProfile.vue
index a12011e..bfcbbb1 100644
--- a/frontend/src/pages/user/account/UserProfile.vue
+++ b/frontend/src/pages/user/account/UserProfile.vue
@@ -762,7 +762,12 @@
 <script>
 import { moneyCollectionTypeEnum } from '../../../types/index'
 
-import { UserProfileApi, elementHandler, textAreaAujuster } from '../../../utils/index'
+import {
+  UserProfileApi,
+  elementHandler,
+  textAreaAujuster,
+  passwordValidator
+} from '../../../utils/index'
 
 export default {
   name: 'UserProfile',
@@ -984,7 +989,10 @@ export default {
       } else if (!this.passwordOperation.password) {
         //Do nothing since there is no password input
       } else {
-        this.updatePassword(this.passwordOperation.password, this.passwordOperation.password2)
+        this.passwordOperation.message = passwordValidator.validate(this.passwordOperation.password)
+        if (!this.passwordOperation.password) {
+          this.updatePassword(this.passwordOperation.password, this.passwordOperation.password2)
+        }
       }
     },
 
diff --git a/frontend/src/plugins/router/router.js b/frontend/src/plugins/router/router.js
index 6a35d53..78d42df 100644
--- a/frontend/src/plugins/router/router.js
+++ b/frontend/src/plugins/router/router.js
@@ -386,7 +386,6 @@ const router = createRouter({
 })
 
 router.beforeEach(function (to, from, next) {
-  console.log('beforeEach', to)
   if (to.name == 'front-door') {
     next()
   } else if (to.meta.requiredRoles.includes(userRoleEnum.NONE)) {
diff --git a/frontend/src/utils/index.js b/frontend/src/utils/index.js
index 353bee8..69f4682 100644
--- a/frontend/src/utils/index.js
+++ b/frontend/src/utils/index.js
@@ -14,6 +14,6 @@ export { userUtils, userProfileUtils, requestIssueUtils, requestHubUtils } from
 
 export { ValueChecker, DateUtils, OIDUtils } from './common/index'
 
-export { userProfileValidator } from './validator/index'
+export { passwordValidator } from './validator/index'
 
 export { textAreaAujuster, tooltip, elementHandler, mediaDataHandler } from './html/index'
diff --git a/frontend/src/utils/validator/index.js b/frontend/src/utils/validator/index.js
index d036ea7..0e86722 100644
--- a/frontend/src/utils/validator/index.js
+++ b/frontend/src/utils/validator/index.js
@@ -1,8 +1 @@
-export { userProfileValidator } from './userProfile'
-export { businessProfileValidator } from './businessProfile'
-export { problemValidator } from './problemValidator'
-export { codingInterviewValidator } from './codingInterviewValidator'
-export { jobPositionValidator } from './jobPositionValidator'
-export { applicantValidator } from './applicantValidator'
-export { solutionSubmissionValidator } from './solutionSubmissionValidator'
-export { uploadFileLengthValidator } from './uploadFileLengthValidator'
+export { passwordValidator } from './passwordValidator'
diff --git a/frontend/src/utils/validator/passwordValidator.js b/frontend/src/utils/validator/passwordValidator.js
index 051fdec..12cb4f9 100644
--- a/frontend/src/utils/validator/passwordValidator.js
+++ b/frontend/src/utils/validator/passwordValidator.js
@@ -22,5 +22,5 @@ class PasswordValidator extends TextValidator {
     )
   }
 }
-
-export { PasswordValidator }
+const passwordValidator = new PasswordValidator()
+export { passwordValidator }
diff --git a/frontend/src/utils/validator/userProfile.js b/frontend/src/utils/validator/userProfile.js
deleted file mode 100644
index b9a342c..0000000
--- a/frontend/src/utils/validator/userProfile.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { UsernameValidator } from './usernameValidator'
-import { PasswordValidator } from './passwordValidator'
-import { NameValidator } from './nameValidator'
-import { MobileValidator } from './mobileValidator'
-import { EmailValidator } from './emailValidator'
-import { ImageValidator } from './imageValidator'
-import { AuthCodeValidator } from './authCodeValidator'
-import { CountryNameValidator } from './countryNameValidator'
-import { FilenameValidator } from './filenameValidator'
-import { TextFileValidator } from './textFileValidator'
-
-class ProfileValidator {
-  constructor() {
-    this.usernameValidator = new UsernameValidator()
-    this.passwordValidator = new PasswordValidator()
-    this.nameValidator = new NameValidator()
-    this.mobileValidator = new MobileValidator()
-    this.emailValidator = new EmailValidator()
-    this.imageValidator = new ImageValidator()
-    this.authCodeValidator = new AuthCodeValidator()
-    this.countryNameValidator = new CountryNameValidator()
-    this.resumenameValidator = new FilenameValidator()
-    this.resumeFileValidator = new TextFileValidator()
-  }
-}
-
-const userProfileValidator = new ProfileValidator()
-
-export { userProfileValidator }
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index 61854f6..3cffbbb 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -38,7 +38,7 @@ export default defineConfig({
   server: {
     proxy: {
       '^/api/': {
-        target: 'https://localhost:8001/',
+        target: 'http://localhost:8001/',
         ws: true,
         changeOrigin: true
       }