From 22a32784474c5da0347d119071317ffd4d975691 Mon Sep 17 00:00:00 2001 From: Inshal Date: Sat, 1 Jun 2024 04:50:05 +0500 Subject: [PATCH 1/5] fix --- resources/js/pages/login.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/js/pages/login.vue b/resources/js/pages/login.vue index 993a562..c058115 100644 --- a/resources/js/pages/login.vue +++ b/resources/js/pages/login.vue @@ -70,6 +70,7 @@ const login = async () => { }); } catch (error) { store.dispatch('updateIsLoading', false) + errors.value.email = error.response.data.error isLoading.value = false console.error(error); } From dc2f0e36825fee8cf9a894bb82346186620cf81a Mon Sep 17 00:00:00 2001 From: Inshal Date: Sat, 1 Jun 2024 04:51:45 +0500 Subject: [PATCH 2/5] fix --- resources/js/pages/login.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/js/pages/login.vue b/resources/js/pages/login.vue index c058115..b67f0ff 100644 --- a/resources/js/pages/login.vue +++ b/resources/js/pages/login.vue @@ -48,7 +48,7 @@ const login = async () => { try { store.dispatch('updateIsLoading', true) - isLoading.value = true + // isLoading.value = true const response = await axios.post(ADMIN_LOGIN_API, { email: credentials.value.email, password: credentials.value.password, @@ -71,7 +71,7 @@ const login = async () => { } catch (error) { store.dispatch('updateIsLoading', false) errors.value.email = error.response.data.error - isLoading.value = false + // isLoading.value = false console.error(error); } // try { From 8109a226203b26ba37f041a955c3f5b056888fef Mon Sep 17 00:00:00 2001 From: Inshal Date: Mon, 3 Jun 2024 20:57:07 +0500 Subject: [PATCH 3/5] fixes --- .../DefaultLayoutWithHorizontalNav.vue | 20 +++++++++--------- .../DefaultLayoutWithVerticalNav.vue | 21 +++++++++---------- resources/js/layouts/components/Footer.vue | 12 +++++------ 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/resources/js/layouts/components/DefaultLayoutWithHorizontalNav.vue b/resources/js/layouts/components/DefaultLayoutWithHorizontalNav.vue index 87ff743..766f897 100644 --- a/resources/js/layouts/components/DefaultLayoutWithHorizontalNav.vue +++ b/resources/js/layouts/components/DefaultLayoutWithHorizontalNav.vue @@ -4,12 +4,12 @@ import { themeConfig } from '@themeConfig' // Components import Footer from '@/layouts/components/Footer.vue' -import NavBarNotifications from '@/layouts/components/NavBarNotifications.vue' -import NavSearchBar from '@/layouts/components/NavSearchBar.vue' -import NavbarShortcuts from '@/layouts/components/NavbarShortcuts.vue' +// import NavBarNotifications from '@/layouts/components/NavBarNotifications.vue' +// import NavSearchBar from '@/layouts/components/NavSearchBar.vue' +// import NavbarShortcuts from '@/layouts/components/NavbarShortcuts.vue' import NavbarThemeSwitcher from '@/layouts/components/NavbarThemeSwitcher.vue' import UserProfile from '@/layouts/components/UserProfile.vue' -import NavBarI18n from '@core/components/I18n.vue' +// import NavBarI18n from '@core/components/I18n.vue' import { HorizontalNavLayout } from '@layouts' import { VNodeRenderer } from '@layouts/components/VNodeRenderer' @@ -45,16 +45,16 @@ watch([ - + - + /> --> - - + + @@ -77,6 +77,6 @@ watch([ - + diff --git a/resources/js/layouts/components/DefaultLayoutWithVerticalNav.vue b/resources/js/layouts/components/DefaultLayoutWithVerticalNav.vue index 1aba2f3..758f915 100644 --- a/resources/js/layouts/components/DefaultLayoutWithVerticalNav.vue +++ b/resources/js/layouts/components/DefaultLayoutWithVerticalNav.vue @@ -1,16 +1,15 @@