From 3dc1e463291c476e6823ab31450c6d945b375a17 Mon Sep 17 00:00:00 2001
From: Sam <sam@samr1.net>
Date: Wed, 11 Aug 2021 22:21:26 +0200
Subject: [PATCH] Client - minor refactor

---
 fittrackee_client/src/App.vue                       |  1 +
 fittrackee_client/src/api/authApi.ts                |  1 +
 fittrackee_client/src/api/defaultApi.ts             |  1 +
 .../src/components/Common/Dropdown.vue              |  1 +
 fittrackee_client/src/components/NavBar.vue         |  2 +-
 fittrackee_client/src/components/User/LoginForm.vue |  1 +
 fittrackee_client/src/main.ts                       |  5 +++--
 fittrackee_client/src/router/index.ts               |  1 +
 fittrackee_client/src/store/index.ts                |  1 +
 fittrackee_client/src/store/modules/root/getters.ts |  1 +
 fittrackee_client/src/store/modules/root/index.ts   |  1 +
 .../src/store/modules/root/mutations.ts             |  1 +
 fittrackee_client/src/store/modules/user/actions.ts |  5 +++--
 fittrackee_client/src/store/modules/user/enums.ts   |  2 ++
 fittrackee_client/src/store/modules/user/getters.ts |  1 +
 fittrackee_client/src/store/modules/user/index.ts   |  1 +
 .../src/store/modules/user/interfaces.ts            | 13 +++++++------
 .../src/store/modules/user/mutations.ts             |  3 ++-
 fittrackee_client/src/views/Login.vue               |  1 +
 fittrackee_client/src/views/NotFound.vue            |  1 +
 20 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/fittrackee_client/src/App.vue b/fittrackee_client/src/App.vue
index 5036dcfd..c15c28d1 100644
--- a/fittrackee_client/src/App.vue
+++ b/fittrackee_client/src/App.vue
@@ -6,6 +6,7 @@
 
 <script lang="ts">
   import { defineComponent } from 'vue'
+
   import Footer from '@/components/Footer.vue'
   import NavBar from '@/components/NavBar.vue'
 
diff --git a/fittrackee_client/src/api/authApi.ts b/fittrackee_client/src/api/authApi.ts
index 73e7b34f..6d60c5c1 100644
--- a/fittrackee_client/src/api/authApi.ts
+++ b/fittrackee_client/src/api/authApi.ts
@@ -1,4 +1,5 @@
 import axios from 'axios'
+
 import store from '@/store'
 import { USER_STORE } from '@/store/constants'
 import { getApiUrl } from '@/utils'
diff --git a/fittrackee_client/src/api/defaultApi.ts b/fittrackee_client/src/api/defaultApi.ts
index b336e71b..31a2474c 100644
--- a/fittrackee_client/src/api/defaultApi.ts
+++ b/fittrackee_client/src/api/defaultApi.ts
@@ -1,4 +1,5 @@
 import axios from 'axios'
+
 import { getApiUrl } from '@/utils'
 
 const api = axios.create({
diff --git a/fittrackee_client/src/components/Common/Dropdown.vue b/fittrackee_client/src/components/Common/Dropdown.vue
index 03a4fcef..fb9eb60a 100644
--- a/fittrackee_client/src/components/Common/Dropdown.vue
+++ b/fittrackee_client/src/components/Common/Dropdown.vue
@@ -19,6 +19,7 @@
 
 <script lang="ts">
   import { PropType, defineComponent, ref } from 'vue'
+
   import { IDropdownOption } from '@/interfaces'
   import { TDropdownOptions } from '@/types'
 
diff --git a/fittrackee_client/src/components/NavBar.vue b/fittrackee_client/src/components/NavBar.vue
index 6ba1c171..7911c218 100644
--- a/fittrackee_client/src/components/NavBar.vue
+++ b/fittrackee_client/src/components/NavBar.vue
@@ -61,8 +61,8 @@
 
   import { IDropdownOption } from '@/interfaces'
   import { ROOT_STORE, USER_STORE } from '@/store/constants'
-  import { useStore } from '@/use/useStore'
   import { IAuthUserProfile } from '@/store/modules/user/interfaces'
+  import { useStore } from '@/use/useStore'
   import Dropdown from '@/components/Common/Dropdown.vue'
 
   export default defineComponent({
diff --git a/fittrackee_client/src/components/User/LoginForm.vue b/fittrackee_client/src/components/User/LoginForm.vue
index 34b495c0..ee229cf6 100644
--- a/fittrackee_client/src/components/User/LoginForm.vue
+++ b/fittrackee_client/src/components/User/LoginForm.vue
@@ -6,6 +6,7 @@
 
 <script lang="ts">
   import { defineComponent } from 'vue'
+
   import UserForm from '@/components/User/UserForm.vue'
 
   export default defineComponent({
diff --git a/fittrackee_client/src/main.ts b/fittrackee_client/src/main.ts
index b5e8a4ec..1bc81c63 100644
--- a/fittrackee_client/src/main.ts
+++ b/fittrackee_client/src/main.ts
@@ -1,8 +1,9 @@
 import { createApp } from 'vue'
-import App from './App.vue'
+
 import './registerServiceWorker'
+import App from './App.vue'
+import i18n from './i18n'
 import router from './router'
 import store from './store'
-import i18n from './i18n'
 
 createApp(App).use(i18n).use(store).use(router).mount('#app')
diff --git a/fittrackee_client/src/router/index.ts b/fittrackee_client/src/router/index.ts
index c9f92871..34c12cfd 100644
--- a/fittrackee_client/src/router/index.ts
+++ b/fittrackee_client/src/router/index.ts
@@ -1,4 +1,5 @@
 import { createRouter, createWebHistory, RouteRecordRaw } from 'vue-router'
+
 import Dashboard from '@/views/DashBoard.vue'
 import Login from '@/views/Login.vue'
 import NotFound from '@/views/NotFound.vue'
diff --git a/fittrackee_client/src/store/index.ts b/fittrackee_client/src/store/index.ts
index c3d82fd5..43a59203 100644
--- a/fittrackee_client/src/store/index.ts
+++ b/fittrackee_client/src/store/index.ts
@@ -1,4 +1,5 @@
 import { createStore } from 'vuex'
+
 import { IRootState } from '@/store/modules/root/interfaces'
 import root from '@/store/modules/root'
 
diff --git a/fittrackee_client/src/store/modules/root/getters.ts b/fittrackee_client/src/store/modules/root/getters.ts
index b0a6ce0f..41262386 100644
--- a/fittrackee_client/src/store/modules/root/getters.ts
+++ b/fittrackee_client/src/store/modules/root/getters.ts
@@ -1,4 +1,5 @@
 import { GetterTree } from 'vuex'
+
 import { ROOT_STORE } from '@/store/constants'
 import { IRootState, IRootGetters } from '@/store/modules/root/interfaces'
 
diff --git a/fittrackee_client/src/store/modules/root/index.ts b/fittrackee_client/src/store/modules/root/index.ts
index 5e63fad1..5e967040 100644
--- a/fittrackee_client/src/store/modules/root/index.ts
+++ b/fittrackee_client/src/store/modules/root/index.ts
@@ -1,4 +1,5 @@
 import { Module, ModuleTree } from 'vuex'
+
 import { getters } from '@/store/modules/root/getters'
 import { IRootState } from '@/store/modules/root/interfaces'
 import { mutations } from '@/store/modules/root/mutations'
diff --git a/fittrackee_client/src/store/modules/root/mutations.ts b/fittrackee_client/src/store/modules/root/mutations.ts
index 40ccc214..1f5b1e28 100644
--- a/fittrackee_client/src/store/modules/root/mutations.ts
+++ b/fittrackee_client/src/store/modules/root/mutations.ts
@@ -1,4 +1,5 @@
 import { MutationTree } from 'vuex'
+
 import { ROOT_STORE } from '@/store/constants'
 import { IRootState } from '@/store/modules/root/interfaces'
 import { TRootMutations } from '@/store/modules/root/types'
diff --git a/fittrackee_client/src/store/modules/user/actions.ts b/fittrackee_client/src/store/modules/user/actions.ts
index ab0cf055..3c5b0bf7 100644
--- a/fittrackee_client/src/store/modules/user/actions.ts
+++ b/fittrackee_client/src/store/modules/user/actions.ts
@@ -1,14 +1,15 @@
 import { ActionContext, ActionTree } from 'vuex'
+
 import { ROOT_STORE, USER_STORE } from '@/store/constants'
+import { IRootState } from '@/store/modules/root/interfaces'
 import {
   ILoginOrRegisterData,
   IUserActions,
   IUserState,
 } from '@/store/modules/user/interfaces'
-import { IRootState } from '@/store/modules/root/interfaces'
 import { handleError } from '@/utils'
-import api from '@/api/defaultApi'
 import authApi from '@/api/authApi'
+import api from '@/api/defaultApi'
 import router from '@/router'
 
 export const actions: ActionTree<IUserState, IRootState> & IUserActions = {
diff --git a/fittrackee_client/src/store/modules/user/enums.ts b/fittrackee_client/src/store/modules/user/enums.ts
index c419993d..bfcbabf8 100644
--- a/fittrackee_client/src/store/modules/user/enums.ts
+++ b/fittrackee_client/src/store/modules/user/enums.ts
@@ -2,11 +2,13 @@ export enum UserActions {
   GET_USER_PROFILE = 'GET_USER_PROFILE',
   LOGIN_OR_REGISTER = 'LOGIN_OR_REGISTER',
 }
+
 export enum UserGetters {
   AUTH_TOKEN = 'AUTH_TOKEN',
   AUTH_USER_PROFILE = 'AUTH_USER_PROFILE',
   IS_AUTHENTICATED = 'IS_AUTHENTICATED',
 }
+
 export enum UserMutations {
   UPDATE_AUTH_TOKEN = 'UPDATE_AUTH_TOKEN',
   UPDATE_AUTH_USER_PROFILE = 'UPDATE_AUTH_USER_PROFILE',
diff --git a/fittrackee_client/src/store/modules/user/getters.ts b/fittrackee_client/src/store/modules/user/getters.ts
index c03f3cf6..b0f8568c 100644
--- a/fittrackee_client/src/store/modules/user/getters.ts
+++ b/fittrackee_client/src/store/modules/user/getters.ts
@@ -1,4 +1,5 @@
 import { GetterTree } from 'vuex'
+
 import { USER_STORE } from '@/store/constants'
 import { IRootState } from '@/store/modules/root/interfaces'
 import { IUserGetters, IUserState } from '@/store/modules/user/interfaces'
diff --git a/fittrackee_client/src/store/modules/user/index.ts b/fittrackee_client/src/store/modules/user/index.ts
index 42bc2e48..d171e273 100644
--- a/fittrackee_client/src/store/modules/user/index.ts
+++ b/fittrackee_client/src/store/modules/user/index.ts
@@ -1,4 +1,5 @@
 import { Module } from 'vuex'
+
 import { IRootState } from '@/store/modules/root/interfaces'
 import { actions } from '@/store/modules/user/actions'
 import { getters } from '@/store/modules/user/getters'
diff --git a/fittrackee_client/src/store/modules/user/interfaces.ts b/fittrackee_client/src/store/modules/user/interfaces.ts
index 3e9fa9f4..e41ffb79 100644
--- a/fittrackee_client/src/store/modules/user/interfaces.ts
+++ b/fittrackee_client/src/store/modules/user/interfaces.ts
@@ -1,4 +1,5 @@
 import { ActionContext } from 'vuex'
+
 import { IFormData } from '@/interfaces'
 import { USER_STORE } from '@/store/constants'
 import { IRootState } from '@/store/modules/root/interfaces'
@@ -36,15 +37,15 @@ export interface IUserState {
   authUserProfile: IAuthUserProfile
 }
 
-export interface IUserGetters {
-  [USER_STORE.GETTERS.AUTH_TOKEN](state: IUserState): string | null
-  [USER_STORE.GETTERS.AUTH_USER_PROFILE](state: IUserState): IAuthUserProfile
-  [USER_STORE.GETTERS.IS_AUTHENTICATED](state: IUserState): boolean
-}
-
 export interface IUserActions {
   [USER_STORE.ACTIONS.LOGIN_OR_REGISTER](
     context: ActionContext<IUserState, IRootState>,
     data: ILoginOrRegisterData
   ): void
 }
+
+export interface IUserGetters {
+  [USER_STORE.GETTERS.AUTH_TOKEN](state: IUserState): string | null
+  [USER_STORE.GETTERS.AUTH_USER_PROFILE](state: IUserState): IAuthUserProfile
+  [USER_STORE.GETTERS.IS_AUTHENTICATED](state: IUserState): boolean
+}
diff --git a/fittrackee_client/src/store/modules/user/mutations.ts b/fittrackee_client/src/store/modules/user/mutations.ts
index 24c3c554..006d1f30 100644
--- a/fittrackee_client/src/store/modules/user/mutations.ts
+++ b/fittrackee_client/src/store/modules/user/mutations.ts
@@ -1,7 +1,8 @@
 import { MutationTree } from 'vuex'
-import { TUserMutations } from '@/store/modules/user/types'
+
 import { USER_STORE } from '@/store/constants'
 import { IAuthUserProfile, IUserState } from '@/store/modules/user/interfaces'
+import { TUserMutations } from '@/store/modules/user/types'
 
 export const mutations: MutationTree<IUserState> & TUserMutations = {
   [USER_STORE.MUTATIONS.UPDATE_AUTH_TOKEN](
diff --git a/fittrackee_client/src/views/Login.vue b/fittrackee_client/src/views/Login.vue
index 56b795ba..77987da9 100644
--- a/fittrackee_client/src/views/Login.vue
+++ b/fittrackee_client/src/views/Login.vue
@@ -13,6 +13,7 @@
 
 <script lang="ts">
   import { defineComponent } from 'vue'
+
   import BikePic from '@/components/BikePic.vue'
   import LoginForm from '@/components/User/LoginForm.vue'
 
diff --git a/fittrackee_client/src/views/NotFound.vue b/fittrackee_client/src/views/NotFound.vue
index 0d39d797..971772ab 100644
--- a/fittrackee_client/src/views/NotFound.vue
+++ b/fittrackee_client/src/views/NotFound.vue
@@ -11,6 +11,7 @@
 <script lang="ts">
   import { defineComponent } from 'vue'
   import { useI18n } from 'vue-i18n'
+
   import Error from '@/components/Error.vue'
 
   export default defineComponent({