Browse Source

lint and minor refactoring

Olivier Massot 4 years ago
parent
commit
7534d861d9
9 changed files with 91 additions and 161 deletions
  1. 0 1
      .gitlab-ci.yml
  2. 10 0
      README.md
  3. 0 71
      assets/vue_js_logo.svg
  4. 7 0
      notes_relecture.md
  5. 3 4
      store/form.ts
  6. 10 24
      store/index.js
  7. 3 3
      store/page.ts
  8. 46 46
      store/profile/access.ts
  9. 12 12
      store/profile/organization.ts

+ 0 - 1
.gitlab-ci.yml

@@ -5,7 +5,6 @@ before_script:
   - apt-get update
   - curl -fsSL https://deb.nodesource.com/setup_14.x | bash -
   - apt-get install -y nodejs
-#  - apt-get install -y npm
   - npm install --global yarn
   - yarn install
 

+ 10 - 0
README.md

@@ -3,6 +3,16 @@
 [![pipeline status](http://gitlab.2iopenservice.com/vincent/admin/badges/master/pipeline.svg)](http://gitlab.2iopenservice.com/vincent/admin/-/commits/master)
 [![coverage report](http://gitlab.2iopenservice.com/vincent/admin/badges/master/coverage.svg)](http://gitlab.2iopenservice.com/vincent/admin/-/commits/master)
 
+Frontend Opentalent développé avec Vue.js 2 + NuxtJs 2
+
+A voir:
+
+* [vuejs.org](https://vuejs.org/v2/guide/)
+* [nuxtjs.org](https://fr.nuxtjs.org/docs/2.x/get-started/installation)
+* [vuex-orm.org](https://vuex-orm.org/)
+* [vuetifyjs.com](https://vuetifyjs.com/en/)
+* [typescriptlang.org](https://www.typescriptlang.org/)
+
 ## Build Setup
 
 ```bash

File diff suppressed because it is too large
+ 0 - 71
assets/vue_js_logo.svg


+ 7 - 0
notes_relecture.md

@@ -8,3 +8,10 @@
 * config de l'host et du port: la doc mentionne que ce n'est pas conseillé 
   de les définir ici, en tout cas pour la prod <https://nuxtjs.org/docs/2.x/features/configuration#edit-host-and-port>
 * 
+
+# Divers
+
+* Revoir les commentaires // QTN
+* manquerait pas un await dans middleware/auth.js?
+* un intérêt à utiliser les extensions .client.js et .server.js pour les plugins? (https://fr.nuxtjs.org/docs/2.x/directory-structure/plugins#convention-pour-le-nommage-des-plugins)
+* 

+ 3 - 4
store/form.ts

@@ -7,17 +7,16 @@ export const state = () => ({
 })
 
 export const mutations = {
-  setDirty (state:formState, dirty:boolean) {
+  setDirty (state: formState, dirty: boolean) {
     state.dirty = dirty
   },
-  setShowConfirmToLeave (state:formState, showConfirmToLeave:boolean) {
+  setShowConfirmToLeave (state: formState, showConfirmToLeave: boolean) {
     state.showConfirmToLeave = showConfirmToLeave
   },
-  setGoAfterLeave (state:formState, goAfterLeave:string) {
+  setGoAfterLeave (state: formState, goAfterLeave: string) {
     state.goAfterLeave = goAfterLeave
   }
 }
 
 export const actions = {
-
 }

+ 10 - 24
store/index.js

@@ -16,8 +16,8 @@ export const actions = {
    * @return {Promise<void>}
    */
   async nuxtServerInit ({ dispatch }, { req }) {
-    const initCookie = await dispatch('initCookies', { req })
-    const updateProfile = await dispatch('getUserProfile')
+    await dispatch('initCookies', { req })
+    await dispatch('getUserProfile')
   },
 
   /**
@@ -27,43 +27,29 @@ export const actions = {
    * @return {Promise<void>}
    */
   async initCookies ({ commit }, { req }) {
-    let bearer = null
-    let accessId = null
-    let SwitchAccessId = null
     if (req.headers.cookie) {
       const parsed = cookieparser.parse(req.headers.cookie)
-      try {
-        bearer = parsed.BEARER
-      } catch (err) {
-        throw new Error(err.message)
-      }
-
-      try {
-        accessId = parsed.AccessId
-      } catch (err) {
-        throw new Error(err.message)
-      }
 
       try {
-        SwitchAccessId = parsed.SwitchAccessId
-        commit('profile/access/setSwitchId', SwitchAccessId)
+        await commit('profile/access/setSwitchId', parsed.SwitchAccessId)
       } catch (err) {}
+
+      await commit('profile/access/setBearer', parsed.BEARER)
+      await commit('profile/access/setId', parsed.AccessId)
     }
-    commit('profile/access/setBearer', bearer)
-    commit('profile/access/setId', accessId)
   },
 
   /**
-   * Récupère les informations du profile connecté et update le Store Profile
+   * Récupère les informations du profil connecté et update le Store Profile
    * @param dispatch
    * @param state
    * @return {Promise<void>}
    */
-  async getUserProfile ({ dispatch, state }) {
-    const my_profile = await this.app.context.$dataProvider.invoke({
+  async getUserProfile ({ dispatch }) {
+    const myProfile = await this.app.context.$dataProvider.invoke({
       type: QUERY_TYPE.DEFAULT,
       url: 'my_profile'
     })
-    dispatch('profile/access/setProfile', my_profile)
+    await dispatch('profile/access/setProfile', myProfile)
   }
 }

+ 3 - 3
store/page.ts

@@ -5,16 +5,16 @@ export const state = () => ({
 })
 
 export const mutations = {
-  setAlert (state:pageState, alert:alert) {
+  setAlert (state: pageState, alert: alert) {
     state.alerts.push(alert)
   },
-  removeAlert (state:pageState) {
+  removeAlert (state: pageState) {
     state.alerts.shift()
   }
 }
 
 export const actions = {
-  removeSlowlyAlert (context:any) {
+  removeSlowlyAlert (context: any) {
     setTimeout(() => {
       context.commit('removeAlert')
     }, 300)

+ 46 - 46
store/profile/access.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash'
 import { $roleUtils } from '~/services/rights/roleUtils'
-import { AbilitiesType, accessState, AnyJson, baseAccessState, baseOrganizationState, Historical } from '~/types/interfaces'
+import { AbilitiesType, accessState, baseAccessState, baseOrganizationState, Historical } from '~/types/interfaces'
 import { GENDER } from '~/types/enums'
 import { MyProfile } from '~/models/Access/MyProfile'
 import { repositoryHelper } from '~/services/store/repository'
@@ -36,95 +36,95 @@ export const state = () => ({
 })
 
 export const mutations = {
-  setBearer (state:accessState, bearer:string) {
+  setBearer (state: accessState, bearer: string) {
     state.bearer = bearer
   },
-  setId (state:accessState, id:number) {
+  setId (state: accessState, id: number) {
     state.id = id
   },
-  setSwitchId (state:accessState, switchId:number) {
+  setSwitchId (state: accessState, switchId: number) {
     state.switchId = switchId
   },
-  setName (state:accessState, name:string) {
+  setName (state: accessState, name: string) {
     state.name = name
   },
-  setGivenName (state:accessState, givenName:string) {
+  setGivenName (state: accessState, givenName: string) {
     state.givenName = givenName
   },
-  setGender (state:accessState, gender:GENDER) {
+  setGender (state: accessState, gender: GENDER) {
     state.gender = gender
   },
-  setAvatarId (state:accessState, avatarId:number) {
+  setAvatarId (state: accessState, avatarId: number) {
     state.avatarId = avatarId
   },
-  setActivityYear (state:accessState, activityYear:number) {
+  setActivityYear (state: accessState, activityYear: number) {
     state.activityYear = activityYear
   },
-  setHistorical (state:accessState, historical:Historical) {
+  setHistorical (state: accessState, historical: Historical) {
     state.historical = historical
   },
-  setRoles (state:accessState, roles:Array<string>) {
+  setRoles (state: accessState, roles: Array<string>) {
     state.roles = roles
   },
-  setAbilities (state:accessState, abilities:Array<AbilitiesType>) {
+  setAbilities (state: accessState, abilities: Array<AbilitiesType>) {
     state.abilities = abilities
   },
-  setIsAdminAccess (state:accessState, isAdminAccess:boolean) {
+  setIsAdminAccess (state: accessState, isAdminAccess: boolean) {
     state.isAdminAccess = isAdminAccess
   },
-  setIsAdmin (state:accessState, isRole:boolean) {
+  setIsAdmin (state: accessState, isRole: boolean) {
     state.isAdmin = isRole
   },
-  setIsAdministratifManager (state:accessState, isRole:boolean) {
+  setIsAdministratifManager (state: accessState, isRole: boolean) {
     state.isAdministratifManager = isRole
   },
   setIsPedagogicManager (state:accessState, isRole:boolean) {
     state.isPedagogicManager = isRole
   },
-  setIsFinancialManager (state:accessState, isRole:boolean) {
+  setIsFinancialManager (state: accessState, isRole: boolean) {
     state.isFinancialManager = isRole
   },
-  setIsCaMember (state:accessState, isRole:boolean) {
+  setIsCaMember (state: accessState, isRole: boolean) {
     state.isCaMember = isRole
   },
-  setIsStudent (state:accessState, isRole:boolean) {
+  setIsStudent (state: accessState, isRole: boolean) {
     state.isStudent = isRole
   },
-  setIsTeacher (state:accessState, isRole:boolean) {
+  setIsTeacher (state: accessState, isRole: boolean) {
     state.isTeacher = isRole
   },
-  setIsMember (state:accessState, isRole:boolean) {
+  setIsMember (state: accessState, isRole: boolean) {
     state.isMember = isRole
   },
-  setIsOther (state:accessState, isRole:boolean) {
+  setIsOther (state: accessState, isRole: boolean) {
     state.isOther = isRole
   },
-  setHasLateralMenu (state:accessState, hasLateralMenu:boolean) {
+  setHasLateralMenu (state: accessState, hasLateralMenu: boolean) {
     state.hasLateralMenu = hasLateralMenu
   },
-  setHasConfigurationMenu (state:accessState, hasConfigurationMenu:boolean) {
+  setHasConfigurationMenu (state: accessState, hasConfigurationMenu: boolean) {
     state.hasConfigurationMenu = hasConfigurationMenu
   },
-  setHasAccessesMenu (state:accessState, hasAccessesMenu:boolean) {
+  setHasAccessesMenu (state: accessState, hasAccessesMenu: boolean) {
     state.hasAccessesMenu = hasAccessesMenu
   },
-  setHasFamilyMenu (state:accessState, hasFamilyMenu:boolean) {
+  setHasFamilyMenu (state: accessState, hasFamilyMenu: boolean) {
     state.hasFamilyMenu = hasFamilyMenu
   },
-  addMultiAccess (state:accessState, access:baseOrganizationState) {
+  addMultiAccess (state: accessState, access: baseOrganizationState) {
     state.multiAccesses.push(access)
   },
-  addFamilyAccess (state:accessState, access:baseAccessState) {
+  addFamilyAccess (state: accessState, access: baseAccessState) {
     state.familyAccesses.push(access)
   },
-  setOriginalAccess (state:accessState, access:baseAccessState) {
+  setOriginalAccess (state: accessState, access: baseAccessState) {
     state.originalAccess = access
   }
 }
 
 export const actions = {
-  setProfile (context:any, profile:any) {
-    const roles_to_array:Array<string> = Object.values(profile.roles)
+  setProfile (context: any, profile: any) {
+    const rolesArray: Array<string> = Object.values(profile.roles)
 
     context.commit('setName', profile.name)
     context.commit('setGivenName', profile.givenName)
@@ -133,16 +133,16 @@ export const actions = {
     context.commit('setActivityYear', profile.activityYear)
     context.commit('setHistorical', profile.historical)
     context.commit('setIsAdminAccess', profile.isAdminAccess)
-    context.commit('setIsAdmin', $roleUtils.isA('ADMIN', roles_to_array))
-    context.commit('setIsAdministratifManager', $roleUtils.isA('ADMINISTRATIF_MANAGER', roles_to_array))
-    context.commit('setIsPedagogicManager', $roleUtils.isA('PEDAGOGICS_MANAGER', roles_to_array))
-    context.commit('setIsFinancialManager', $roleUtils.isA('FINANCIAL_MANAGER', roles_to_array))
-    context.commit('setIsCaMember', $roleUtils.isA('CA', roles_to_array))
-    context.commit('setIsStudent', $roleUtils.isA('STUDENT', roles_to_array))
-    context.commit('setIsTeacher', $roleUtils.isA('TEACHER', roles_to_array))
-    context.commit('setIsMember', $roleUtils.isA('MEMBER', roles_to_array))
-    context.commit('setIsOther', $roleUtils.isA('OTHER', roles_to_array))
-    context.commit('setRoles', $roleUtils.filterFunctionRoles(roles_to_array))
+    context.commit('setIsAdmin', $roleUtils.isA('ADMIN', rolesArray))
+    context.commit('setIsAdministratifManager', $roleUtils.isA('ADMINISTRATIF_MANAGER', rolesArray))
+    context.commit('setIsPedagogicManager', $roleUtils.isA('PEDAGOGICS_MANAGER', rolesArray))
+    context.commit('setIsFinancialManager', $roleUtils.isA('FINANCIAL_MANAGER', rolesArray))
+    context.commit('setIsCaMember', $roleUtils.isA('CA', rolesArray))
+    context.commit('setIsStudent', $roleUtils.isA('STUDENT', rolesArray))
+    context.commit('setIsTeacher', $roleUtils.isA('TEACHER', rolesArray))
+    context.commit('setIsMember', $roleUtils.isA('MEMBER', rolesArray))
+    context.commit('setIsOther', $roleUtils.isA('OTHER', rolesArray))
+    context.commit('setRoles', $roleUtils.filterFunctionRoles(rolesArray))
     context.commit('setIsAdminAccess', profile.isAdminAccess)
 
     // Time to set Multi Accesses
@@ -159,16 +159,16 @@ export const actions = {
 
     context.dispatch('createNewMyProfileVUexOrmInstance', profile)
   },
-  setMultiAccesses (context:any, accesses:any) {
+  setMultiAccesses (context: any, accesses: any) {
     _.each(accesses, (organization) => {
-      const o:baseOrganizationState = {
+      const o: baseOrganizationState = {
         id: organization.id,
         name: organization.name
       }
       context.commit('addMultiAccess', o)
     })
   },
-  setFamilyAccesses (context:any, accesses:any) {
+  setFamilyAccesses (context: any, accesses: any) {
     _.each(accesses, (access) => {
       const a:baseAccessState = {
         id: access.id,
@@ -180,7 +180,7 @@ export const actions = {
       context.commit('addFamilyAccess', a)
     })
   },
-  setOriginalAccess (context:any, access: any) {
+  setOriginalAccess (context: any, access: any) {
     if (access) {
       const originalAccess:baseAccessState = {
         id: access.id,
@@ -194,10 +194,10 @@ export const actions = {
   },
   /**
    * Créer une nouvelle instance MyProfile dans Vuex ORM
-   * @param context
+   * @param _context
    * @param access
    */
-  createNewMyProfileVUexOrmInstance (context:any, access: any): void {
+  createNewMyProfileVUexOrmInstance (_context: any, access: any): void {
     repositoryHelper.persist(MyProfile, access)
   }
 }

+ 12 - 12
store/profile/organization.ts

@@ -14,40 +14,40 @@ export const state = () => ({
 })
 
 export const mutations = {
-  setId (state:organizationState, id:number) {
+  setId (state: organizationState, id: number) {
     state.id = id
   },
-  setName (state:organizationState, name:string) {
+  setName (state: organizationState, name: string) {
     state.name = name
   },
-  setProduct (state:organizationState, product:string) {
+  setProduct (state: organizationState, product: string) {
     state.product = product
   },
-  setModules (state:organizationState, modules:Array<string>) {
+  setModules (state: organizationState, modules: Array<string>) {
     state.modules = modules
   },
-  setHasChildren (state:organizationState, hasChildren:boolean) {
+  setHasChildren (state: organizationState, hasChildren: boolean) {
     state.hasChildren = hasChildren
   },
-  setNetworks (state:organizationState, networks:Array<string>) {
+  setNetworks (state: organizationState, networks: Array<string>) {
     state.networks = networks
   },
-  setParents (state:organizationState, parents:Array<organizationState>) {
+  setParents (state: organizationState, parents: Array<organizationState>) {
     state.parents = parents
   },
-  setWebsite (state:organizationState, website:string) {
+  setWebsite (state: organizationState, website: string) {
     state.website = website
   },
-  setSubDomain (state:organizationState, subDomain:string) {
+  setSubDomain (state: organizationState, subDomain: string) {
     state.subDomain = subDomain
   },
-  addParent (state:organizationState, parent:organizationState) {
+  addParent (state: organizationState, parent: organizationState) {
     state.parents.push(parent)
   }
 }
 
 export const actions = {
-  setProfile (context:any, profile:any) {
+  setProfile (context: any, profile: any) {
     context.commit('setId', profile.id)
     context.commit('setName', profile.name)
     context.commit('setProduct', profile.product)
@@ -58,7 +58,7 @@ export const actions = {
     context.commit('setNetworks', profile.networks)
 
     _.each(profile.parents, (parent) => {
-      const p:baseOrganizationState = {
+      const p: baseOrganizationState = {
         id: parent.id,
         name: parent.name,
         website: parent.website,

Some files were not shown because too many files changed in this diff