Merge branch 'AddAuthPages' of https://github.com/codescalersinternsh…

…ips/test-tracker into AddAuthPages
codescalersinternships · Aug 21, 2024 · 1f80cb4 · 1f80cb4
2 parents 1753f92 + 2b84713
commit 1f80cb4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/client/src/api/axios.ts b/client/src/api/axios.ts
@@ -2,7 +2,6 @@ import axios, { AxiosInstance } from 'axios'
 
 const AuthClient: AxiosInstance = axios.create({
   baseURL: 'https://server.gent02.dev.grid.tf/api',
-  timeout: 1000,
   headers: {
     'Content-Type': 'application/json',
     Authorization: 'Bearer ' + localStorage.getItem('token'),
@@ -11,7 +10,6 @@ const AuthClient: AxiosInstance = axios.create({
 
 const BaseClient: AxiosInstance = axios.create({
   baseURL: 'https://server.gent02.dev.grid.tf/api',
-  timeout: 1000,
 })
 
 async function SignUp (newUser:any) {

diff --git a/client/src/components.d.ts b/client/src/components.d.ts
@@ -10,7 +10,6 @@ declare module 'vue' {
     AlreadyHaveAnAccount: typeof import('./components/AlreadyHaveAnAccount.vue')['default']
     LoginGithub: typeof import('./components/LoginGithub.vue')['default']
     LoginTFT: typeof import('./components/LoginTFT.vue')['default']
-    NewPlan: typeof import('./components/NewPlan.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     Test: typeof import('./components/test.vue')['default']

diff --git a/client/src/pages/Login.vue b/client/src/pages/Login.vue
@@ -146,17 +146,17 @@
           await axios.LogInUser(userInfo.value)
           console.log(localStorage.getItem('token'))
           if (localStorage.getItem('token') != null) {
-            router.push(`/profile`)
+            router.push(`/`)
           }
         } catch (error) {
+          console.error(error)
           notifier.notify({
             title: 'Fail',
             description: 'Login failed',
             showProgressBar: true,
             timeout: 7_000,
             type: 'error',
           })
-          console.error(error)
         }
       }
       const form = ref(null)

diff --git a/client/src/plugins/vuetify.ts b/client/src/plugins/vuetify.ts
@@ -15,11 +15,11 @@ import { createVuetify } from 'vuetify'
 export default createVuetify({
   theme: {
     defaultTheme: 'light',
-        themes: {
+    themes: {
       light: {
         dark: false,
         colors: {
-          primary: "#37ADE3",
+          primary: '#37ADE3',
         },
       },
     },