diff --git a/src/views/pages/auth/Login.vue b/src/views/pages/auth/Login.vue
index fd071d8..b1992bf 100644
--- a/src/views/pages/auth/Login.vue
+++ b/src/views/pages/auth/Login.vue
@@ -2,6 +2,7 @@
import { useLayout } from '@/layout/composables/layout';
import { useAuth } from '@websanova/vue-auth/src/v3.js';
import { computed, ref } from 'vue';
+import { useRouter } from 'vue-router';
//import logo from '@/assets/Logo_Apollo_Transparent.png';
import logo from '@/assets/apollo.jpg';
import { useRouter } from 'vue-router';
@@ -10,6 +11,9 @@ const auth = useAuth();
const { isDarkTheme } = useLayout();
const username = ref('');
const password = ref('');
+const error = ref('');
+const visible = ref(false);
+const router = useRouter();
const logoSrc = ref(logo);
const router = useRouter();
@@ -18,36 +22,29 @@ const logoUrl = computed(() => {
});
const login = async () => {
- try {
- await auth.login({
- data: {
- "username": username.value,
- "password": password.value
- },
- fetchUser: true
- }).then((response) => {
- console.log("1 user :", response.data.data);
-
- if (!response.data.data.selectedProject) {
- router.push({ name: 'projects-list' });
- } else {
- router.push({ path: '/ksdocuments' });
- }
-
- console.log("response", response);
- }).catch((err) => {
- console.log("error", err);
- error.value = 'Incorrect username or password. Please try again.';
- visible.value = true;
-
- setTimeout(() => {
- visible.value = false;
- }, 3500);
- });
- } catch (err) {
- console.log('Error ' + err);
- }
+ try {
+ await auth.login({
+ data:{
+ "username":username.value,
+ "password":password.value
+ },
+ fetchUser: true
+ }).then((response) => {
+ console.log("1 user :" , response.data.data);
+ router.push({ name: 'ksdocuments' });
+ console.log("response", response);
+ }).catch((err) => {
+ console.log("error", err);
+ error.value = 'Incorrect username or password. Please try again.';
+ visible.value = true;
+ setTimeout(() => {
+ visible.value = false;
+ }, 3500);
+ });
+ } catch (err) {
+ console.log('Error ' + err);
+ }
}
@@ -86,22 +83,22 @@ const login = async () => {
-
-
-
- {{ error }}
-
-
+
+
+
+ {{ error }}
+
+
+
@@ -142,4 +139,12 @@ const login = async () => {
/* Ensures the logo scales nicely within the circle */
display: block;
}
+
+.error-message {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ text-align: center;
+ width: 100%; /* Ensure the message takes the full width of its container */
+}