diff --git a/.DS_Store b/.DS_Store index 5e83b28..37ebb87 100755 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/assets/css/style.css b/assets/css/style.css index 4379253..5a24d43 100755 --- a/assets/css/style.css +++ b/assets/css/style.css @@ -164,4 +164,8 @@ body{ .accordion-button:not(.collapsed)::after { background-image: var(--bs-accordion-btn-icon); fill: red; + +} +.bar{ + background-color: #e9c046 !important; } \ No newline at end of file diff --git a/components/homebar.vue b/components/homebar.vue index 135f3f1..9c94ba4 100755 --- a/components/homebar.vue +++ b/components/homebar.vue @@ -127,9 +127,90 @@ + + \ No newline at end of file diff --git a/layouts/default.vue b/layouts/default.vue index 3aaf117..9b58440 100755 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -8,82 +8,6 @@ - diff --git a/middleware/auth.ts b/middleware/auth.ts index 9170b6a..5fb9e6c 100644 --- a/middleware/auth.ts +++ b/middleware/auth.ts @@ -1,13 +1,19 @@ import {useUserStore} from '@/stores/user'; // @ts-ignore -export default defineNuxtRouteMiddleware(async ({store, redirect}) => { +export default defineNuxtRouteMiddleware( (from,to) => { const app = useNuxtApp(); - const user = await useUserStore(app.$pinia); - const localePath = useLocalePath() + // @ts-ignore + const user = useUserStore(app.$pinia) console.log(user.is_login); + const localePath = useLocalePath() + // console.log(user.is_login); + // console.log(from) // isAuthenticated() is an example method verifying if a user is authenticated - if (!user.is_login) { - console.log('User not logged in'); + if (user.is_login) { + console.log('User logged in'); + + }else { + console.log('User not logged in') return navigateTo(localePath('/auth/login')); } }) \ No newline at end of file diff --git a/nuxt.config.ts b/nuxt.config.ts index 47ed4dc..ecf5daf 100755 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -4,6 +4,7 @@ export default defineNuxtConfig({ + ssr:false, plugins:[ {src: '~/plugins/AudioVisual.client', mode: 'client'}, {src: '~/plugins/PiniaPlugin', mode: 'client'}, @@ -146,7 +147,7 @@ export default defineNuxtConfig({ "Log In":"Log In", "Already have an Account?":"Already have an Account?", "I agree to Mindboost's terms and conditions. You can read about how we use and protect your information in our Privacy Policy.":"I agree to Mindboost's terms and conditions. You can read about how we use and protect your information in our Privacy Policy.", - "Hello,":"Hello,!", + "Hello,":"Hello,", "First Name,":"First Name,", "Surname,":"Surname,", "Email,":"Email,", diff --git a/pages/auth/signup.vue b/pages/auth/signup.vue index a0ba86c..fa3f1df 100755 --- a/pages/auth/signup.vue +++ b/pages/auth/signup.vue @@ -79,7 +79,7 @@ {{t("Loading...")}} -

{{t("Already have an Account?")}} {{t("Log In")}}

+

{{t("Already have an Account?")}} {{t("Log In")}}

diff --git a/pages/homeforest.vue b/pages/homeforest.vue index 8e035ec..013aae1 100644 --- a/pages/homeforest.vue +++ b/pages/homeforest.vue @@ -5,7 +5,7 @@
diff --git a/pages/hometropics.vue b/pages/hometropics.vue index 5c98599..28d5ff9 100644 --- a/pages/hometropics.vue +++ b/pages/hometropics.vue @@ -4,7 +4,7 @@
- +
diff --git a/pages/index.vue b/pages/index.vue index cd4fa76..763f900 100755 --- a/pages/index.vue +++ b/pages/index.vue @@ -1,13 +1,12 @@