diff --git a/resources/js/components/NavBar.vue b/resources/js/components/NavBar.vue index 6b4d278..a1529b9 100644 --- a/resources/js/components/NavBar.vue +++ b/resources/js/components/NavBar.vue @@ -8,6 +8,7 @@ import { Sun, Monitor, User, + LogOut, Menu, X, BookOpen, @@ -64,6 +65,13 @@ const isHomeOrSsc = computed( const showAuthModal = ref(false); const authModalMessage = ref('অনুগ্রহ করে সার্চ ফিচার ব্যবহার করতে লগইন করুন।'); +const showLogoutModal = ref(false); + +const openLogoutModal = () => { + dropdownOpen.value = false; + mobileMenuOpen.value = false; + showLogoutModal.value = true; +}; const searchActive = ref(false); const searchInputRef = ref(null); @@ -372,20 +380,32 @@ onBeforeUnmount(() => { v-if="dropdownOpen" class="absolute right-0 mt-2 w-56 origin-top-right rounded-2xl border border-slate-200 bg-white p-1.5 shadow-2xl dark:border-gray-800 dark:bg-gray-900" > - +
-

- {{ user.name }} -

-

+

+ {{ user.name }} +

+

+ {{ user.email }} +

+
+ +
@@ -519,40 +539,55 @@ onBeforeUnmount(() => {
- - -
- {{ user.name.charAt(0).toUpperCase() }} -
-
-

- {{ user.name }} -

-

+

- {{ user.email }} -

-
- + {{ user.name.charAt(0).toUpperCase() }} +
+
+

+ {{ user.name }} +

+

+ {{ user.email }} +

+
+ + + + +
@@ -755,5 +790,65 @@ onBeforeUnmount(() => {
+ + + +
+
+ +
+ + +
+ +
+ +

+ Sign out of your account? +

+

+ Are you sure you want to log out of HSCStack? You will need + to sign in again to access your account features. +

+ +
+ + + + Sign Out + +
+
+
+
diff --git a/resources/js/pages/Blog/Show.vue b/resources/js/pages/Blog/Show.vue index 74f4376..a96d4cc 100644 --- a/resources/js/pages/Blog/Show.vue +++ b/resources/js/pages/Blog/Show.vue @@ -113,10 +113,12 @@ const hasUserCommented = computed(() => { if (!currentUser.value?.id) { return false; } + const currentId = Number(currentUser.value.id); return props.comments.some((c: any) => { const commentUserId = Number(c.user_id ?? c.user?.id); + return commentUserId === currentId; }); }); diff --git a/resources/js/pages/User/Show.vue b/resources/js/pages/User/Show.vue index 00ef003..370ccb5 100644 --- a/resources/js/pages/User/Show.vue +++ b/resources/js/pages/User/Show.vue @@ -18,7 +18,6 @@ import { Heart, Instagram, LogIn, - LogOut, MessageSquare, UploadCloud, Users, @@ -213,7 +212,6 @@ const localAppreciationsCount = ref(props.appreciationsCount); const showAppreciatorsModal = ref(false); const showAppreciatingModal = ref(false); const showGuestModal = ref(false); -const showLogoutModal = ref(false); watch( () => props.isAppreciated, @@ -418,16 +416,6 @@ const handleAppreciate = () => { Edit - -
- +
- - - -
-
- -
- - -
- -
- -

- Sign out of your account? -

-

- Are you sure you want to log out of HSCStack? You will need - to sign in again to access your private data. -

- -
- - - - Sign Out - -
-
-
-