From c965fa0b3e2517f57f2372347a9db97aaa41861a Mon Sep 17 00:00:00 2001 From: nabilasherif Date: Sun, 18 Aug 2024 14:11:04 +0300 Subject: [PATCH 1/2] route adjustment --- client/src/api/axios.ts | 1 - client/src/components.d.ts | 1 - client/src/pages/Login.vue | 4 ++-- client/src/plugins/vuetify.ts | 4 ++-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/client/src/api/axios.ts b/client/src/api/axios.ts index 6b692ca..78d5c57 100644 --- a/client/src/api/axios.ts +++ b/client/src/api/axios.ts @@ -11,7 +11,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 index 82d13bc..0ee2cb8 100644 --- 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 index 695751c..bb3a3a4 100644 --- a/client/src/pages/Login.vue +++ b/client/src/pages/Login.vue @@ -146,9 +146,10 @@ 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', @@ -156,7 +157,6 @@ 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 index 5f1f7aa..1fc5665 100644 --- 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', }, }, }, From 2b8471327ffdc0dc6afe9a30d22c02a90a43dfa2 Mon Sep 17 00:00:00 2001 From: nabilasherif Date: Sun, 18 Aug 2024 14:36:48 +0300 Subject: [PATCH 2/2] removing timeout --- client/src/api/axios.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/api/axios.ts b/client/src/api/axios.ts index 78d5c57..784de34 100644 --- 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'),