From 11cddfa94f32634a6f3725f40bba1fd795896c30 Mon Sep 17 00:00:00 2001 From: Dominic Villemure Date: Sun, 25 Aug 2024 12:08:54 -0400 Subject: [PATCH] MustBeLogged component + fix sideBar auto open --- src/App.vue | 3 --- src/views/MustBeLogged.vue | 42 ++++++++++++++++++++++++++++++ src/views/contents/Reaction.vue | 11 ++++++++ src/views/main/LoginForm.vue | 1 + src/views/messages/PostMessage.vue | 29 ++------------------- 5 files changed, 56 insertions(+), 30 deletions(-) create mode 100644 src/views/MustBeLogged.vue diff --git a/src/App.vue b/src/App.vue index 9c65c9b..39768ee 100644 --- a/src/App.vue +++ b/src/App.vue @@ -4,15 +4,12 @@
diff --git a/src/views/MustBeLogged.vue b/src/views/MustBeLogged.vue new file mode 100644 index 0000000..d37b80b --- /dev/null +++ b/src/views/MustBeLogged.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/views/contents/Reaction.vue b/src/views/contents/Reaction.vue index 7d97c69..39a5f1c 100644 --- a/src/views/contents/Reaction.vue +++ b/src/views/contents/Reaction.vue @@ -3,8 +3,11 @@ import { useUserStore } from "@/stores/userStore.js"; import { REACTIONS } from "@/Constants/Reactions.js"; import { computed, ref } from "vue"; import { useClient } from "@/plugins/api.js"; +import {useAuthStore} from "@/stores/authStore.js" +import MustBeLogged from "@/views/MustBeLogged.vue"; const userStore = useUserStore(); +const authStore = useAuthStore() const props = defineProps({ content: { @@ -30,9 +33,16 @@ const holdTimeout = ref(null); const hideTimeout = ref(null); const touchTimeout = ref(null); +const loginModal = ref(false); + initializeReactions(); async function reactToContent(reaction) { + if (!authStore.isAuthenticated) { + loginModal.value = true; + return; + } + const client = useClient(); if (!hasReacted.value) { @@ -308,6 +318,7 @@ function isMobileDevice() { +
diff --git a/src/views/main/LoginForm.vue b/src/views/main/LoginForm.vue index 0ef24f6..3434a8c 100644 --- a/src/views/main/LoginForm.vue +++ b/src/views/main/LoginForm.vue @@ -40,6 +40,7 @@ const password = ref(""); const errorSnackBar = ref(false); const showEmailForm = ref(false); const showPassword = ref(false); +const googleCallback = ref(''); const props = defineProps({ onSuccess: { diff --git a/src/views/messages/PostMessage.vue b/src/views/messages/PostMessage.vue index eaaaf5d..756284d 100644 --- a/src/views/messages/PostMessage.vue +++ b/src/views/messages/PostMessage.vue @@ -36,19 +36,7 @@ - - - -
- - - Vous devez être connecté pour poster un commentaire. -
- - Fermer - -
-
+