From 6d6789c4a625ae46762dcd3b26bf673cefbd26c7 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 4 Dec 2025 22:55:25 -0500
Subject: [PATCH 1/8] Disabled attendance buttons if event end time is past
 current time to address #55

---
 ui/src/components/calendar/ViewCalendarEvent.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index 39be30d..25fac9d 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -97,6 +97,12 @@ async function forceReload() {
     activeEvent.value = await getCalendarEvent(activeEvent.value.id);
 }
 
+const isPast = computed(() => {
+    const end = new Date(activeEvent.value.end)
+    // is current date later than end date
+    return new Date() < end;
+})
+
 defineExpose({forceReload})
 </script>
 
@@ -142,7 +148,7 @@ defineExpose({forceReload})
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section class="w-full">
+            <section v-if="isPast" class="w-full">
                 <ButtonGroup class="flex w-full">
                     <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
-- 
2.37.3.windows.1


From e550f862bcf41015f0f952e43b04f629a6c4f5c1 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Thu, 4 Dec 2025 23:41:55 -0500
Subject: [PATCH 2/8] event details area initial redesign

---
 .../components/calendar/ViewCalendarEvent.vue | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index 25fac9d..fa5185e 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -55,6 +55,20 @@ const endFmt = new Intl.DateTimeFormat(undefined, {
     hour: 'numeric', minute: '2-digit'
 })
 
+const dateFmt = new Intl.DateTimeFormat(undefined, {
+    weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
+    hour: 'numeric', minute: '2-digit'
+})
+
+const startText = computed(() => {
+    return dateFmt.format(new Date(activeEvent.value.start));
+})
+
+const endText = computed(() => {
+    return dateFmt.format(new Date(activeEvent.value.end));
+})
+
+
 const whenText = computed(() => {
     if (!activeEvent.value?.start) return ''
     const s = new Date(activeEvent.value.start)
@@ -103,7 +117,7 @@ const isPast = computed(() => {
     return new Date() < end;
 })
 
-defineExpose({forceReload})
+defineExpose({ forceReload })
 </script>
 
 <template>
@@ -125,8 +139,7 @@ defineExpose({forceReload})
                         <DropdownMenuItem @click="emit('edit', activeEvent)">
                             Edit
                         </DropdownMenuItem>
-                        <DropdownMenuItem v-if="activeEvent.cancelled"
-                            @click="setCancel(false)">
+                        <DropdownMenuItem v-if="activeEvent.cancelled" @click="setCancel(false)">
                             Un-Cancel
                         </DropdownMenuItem>
                         <DropdownMenuItem v-else @click="setCancel(true)">
@@ -161,15 +174,16 @@ defineExpose({forceReload})
                         @click="setAttendance(CalendarAttendance.NotAttending)">Declined</Button>
                 </ButtonGroup>
             </section>
-            <!-- When -->
-            <section v-if="whenText" class="space-y-2 w-full">
-                <div class="inline-flex items-center gap-2 rounded-md border px-2.5 py-1.5 text-sm">
-                    <Clock class="size-4 opacity-80" />
-                    <span class="font-medium">{{ whenText }}</span>
-                </div>
+            <!-- Meta -->
+            <section class="space-y-2 w-full">
+                <p class="text-lg font-semibold">Details</p>
+                <p class="font-semibold">Start: <span class="font-normal">{{ startText }}</span></p>
+                <p class="font-semibold">End: <span class="font-normal">{{ endText }}</span></p>
+                <p class="font-semibold">Creator: <span class="font-normal">{{ activeEvent.creator_name || "Unknown User" }}</span></p>
+                <p class="font-semibold">Location: <span class="font-normal">{{ activeEvent.location || "Unknown" }}</span></p>
             </section>
             <!-- Quick meta chips -->
-            <section class="flex flex-wrap gap-2 w-full">
+            <!-- <section class="flex flex-wrap gap-2 w-full">
                 <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
                     <MapPin class="size-3.5 opacity-80" />
                     <span class="font-medium">{{ activeEvent.location || "Unknown" }}</span>
@@ -177,9 +191,9 @@ defineExpose({forceReload})
                 <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
                     <User class="size-3.5 opacity-80" />
                     <span class="font-medium">Created by: {{ activeEvent.creator_name || "Unknown User"
-                        }}</span>
+                    }}</span>
                 </span>
-            </section>
+            </section> -->
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
-- 
2.37.3.windows.1


From ccb132b9b08ca1946713d2d0f2ea528a943448de Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 5 Dec 2025 12:49:15 -0500
Subject: [PATCH 3/8] Improvements to event details UI to address #41

---
 .../components/calendar/ViewCalendarEvent.vue | 73 ++++++++-----------
 1 file changed, 30 insertions(+), 43 deletions(-)

diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index fa5185e..9bcacc9 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
+import { CircleAlert, Clock, Clock1, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
 import { computed, onMounted, ref, watch } from 'vue';
 import ButtonGroup from '../ui/button-group/ButtonGroup.vue';
 import Button from '../ui/button/Button.vue';
@@ -11,6 +11,7 @@ import DropdownMenu from '../ui/dropdown-menu/DropdownMenu.vue';
 import DropdownMenuTrigger from '../ui/dropdown-menu/DropdownMenuTrigger.vue';
 import DropdownMenuContent from '../ui/dropdown-menu/DropdownMenuContent.vue';
 import DropdownMenuItem from '../ui/dropdown-menu/DropdownMenuItem.vue';
+import { Calendar } from 'lucide-vue-next';
 
 const route = useRoute();
 // const eventID = computed(() => {
@@ -45,37 +46,27 @@ const emit = defineEmits<{
     (e: 'edit', event: CalendarEvent): void
 }>()
 
-// const activeEvent = computed(() => props.event)
-
-const startFmt = new Intl.DateTimeFormat(undefined, {
-    weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
-    hour: 'numeric', minute: '2-digit'
-})
-const endFmt = new Intl.DateTimeFormat(undefined, {
-    hour: 'numeric', minute: '2-digit'
-})
-
 const dateFmt = new Intl.DateTimeFormat(undefined, {
-    weekday: 'short', year: 'numeric', month: 'short', day: 'numeric',
+    weekday: 'long', month: 'short', day: 'numeric',
+})
+
+const timeFmt = new Intl.DateTimeFormat(undefined, {
     hour: 'numeric', minute: '2-digit'
 })
 
-const startText = computed(() => {
-    return dateFmt.format(new Date(activeEvent.value.start));
+const dateText = computed(() => {
+    let start = dateFmt.format(new Date(activeEvent.value.start));
+    let end = dateFmt.format(new Date(activeEvent.value.end));
+    if (start === end)
+        return start;
+    else
+        return `${start} - ${end}`;
 })
 
-const endText = computed(() => {
-    return dateFmt.format(new Date(activeEvent.value.end));
-})
-
-
-const whenText = computed(() => {
-    if (!activeEvent.value?.start) return ''
-    const s = new Date(activeEvent.value.start)
-    const e = activeEvent.value?.end ? new Date(activeEvent.value.end) : null
-    return e
-        ? `${startFmt.format(s)} – ${endFmt.format(e)}`
-        : `${startFmt.format(s)}`
+const timeText = computed(() => {
+    let startTime = timeFmt.format(new Date(activeEvent.value.start))
+    let endTime = timeFmt.format(new Date(activeEvent.value.end))
+    return [startTime, endTime]
 })
 
 const attending = computed<CalendarSignup[]>(() => { return activeEvent.value.eventSignups.filter((s) => s.status == CalendarAttendance.Attending) })
@@ -175,25 +166,21 @@ defineExpose({ forceReload })
                 </ButtonGroup>
             </section>
             <!-- Meta -->
-            <section class="space-y-2 w-full">
+            <section class="space-y-3 w-full">
                 <p class="text-lg font-semibold">Details</p>
-                <p class="font-semibold">Start: <span class="font-normal">{{ startText }}</span></p>
-                <p class="font-semibold">End: <span class="font-normal">{{ endText }}</span></p>
-                <p class="font-semibold">Creator: <span class="font-normal">{{ activeEvent.creator_name || "Unknown User" }}</span></p>
-                <p class="font-semibold">Location: <span class="font-normal">{{ activeEvent.location || "Unknown" }}</span></p>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <Calendar :size="20"></Calendar> {{ dateText }}
+                </div>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <Clock1 :size="20"></Clock1> {{ timeText[0] }} - {{ timeText[1] }}
+                </div>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <MapPin :size="20"></MapPin> {{ activeEvent.location || "Unknown" }}
+                </div>
+                <div class="text-foreground/80 flex gap-3 items-center">
+                    <User :size="20"></User> {{ activeEvent.creator_name || "Unknown User" }}
+                </div>
             </section>
-            <!-- Quick meta chips -->
-            <!-- <section class="flex flex-wrap gap-2 w-full">
-                <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
-                    <MapPin class="size-3.5 opacity-80" />
-                    <span class="font-medium">{{ activeEvent.location || "Unknown" }}</span>
-                </span>
-                <span class="inline-flex items-center gap-1.5 rounded-md border px-2 py-1 text-xs">
-                    <User class="size-3.5 opacity-80" />
-                    <span class="font-medium">Created by: {{ activeEvent.creator_name || "Unknown User"
-                    }}</span>
-                </span>
-            </section> -->
             <!-- Description -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Description</p>
-- 
2.37.3.windows.1


From 575455a0fc96a148bb9bf50125b99ce13f34fe0d Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 5 Dec 2025 16:04:32 -0500
Subject: [PATCH 4/8] overhauled attendance visualization to be more useful for
 planning

---
 api/src/services/calendarService.ts           |  14 +--
 shared/types/calendar.ts                      |   1 +
 .../components/calendar/ViewCalendarEvent.vue | 107 +++++++++++++-----
 3 files changed, 83 insertions(+), 39 deletions(-)

diff --git a/api/src/services/calendarService.ts b/api/src/services/calendarService.ts
index c88f671..7aa2cee 100644
--- a/api/src/services/calendarService.ts
+++ b/api/src/services/calendarService.ts
@@ -123,15 +123,9 @@ export async function setAttendanceStatus(memberID: number, eventID: number, sta
 }
 
 export async function getEventAttendance(eventID: number): Promise<CalendarSignup[]> {
-    const sql = `
-        SELECT 
-            s.member_id,
-            s.status,
-            m.name AS member_name
-        FROM calendar_events_signups s
-        LEFT JOIN members m ON s.member_id = m.id
-        WHERE s.event_id = ?
-    `;
 
-    return await pool.query(sql, [eventID]);
+    const sql = "CALL `sp_GetCalendarEventSignups`(?)"
+    const res = await pool.query(sql, [eventID]);
+    console.log(res[0]);
+    return res[0];
 }
\ No newline at end of file
diff --git a/shared/types/calendar.ts b/shared/types/calendar.ts
index 526068f..5a62a8b 100644
--- a/shared/types/calendar.ts
+++ b/shared/types/calendar.ts
@@ -26,6 +26,7 @@ export interface CalendarSignup {
     eventID: number;
     status: CalendarAttendance;
     member_name?: string;
+    member_unit?: string;
 }    
 
 export interface CalendarEventShort {
diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index 9bcacc9..45bfa74 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -108,6 +108,67 @@ const isPast = computed(() => {
     return new Date() < end;
 })
 
+const attendanceTab = ref<"Alpha" | "Echo" | "Other">("Alpha");
+const attendanceList = computed<CalendarSignup[]>(() => {
+    let out: CalendarSignup[] = [];
+    if (attendanceTab.value === 'Alpha') {
+        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Alpha Company');
+    } else if (attendanceTab.value === 'Echo') {
+        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit === 'Echo Company')
+    } else {
+        out = activeEvent.value.eventSignups?.filter((s) => s.member_unit != 'Alpha Company' && s.member_unit != 'Echo Company')
+    }
+
+    const statusOrder: Record<CalendarAttendance, number> = {
+        [CalendarAttendance.Attending]: 1,
+        [CalendarAttendance.Maybe]: 2,
+        [CalendarAttendance.NotAttending]: 3,
+    };
+
+    out.sort((a, b) => statusOrder[a.status] - statusOrder[b.status]);
+
+    return out;
+})
+
+const attendanceCounts = computed(() => {
+    const signups = activeEvent.value.eventSignups ?? [];
+
+    return {
+        Alpha: signups.filter(s => s.member_unit === "Alpha Company").length,
+        Echo: signups.filter(s => s.member_unit === "Echo Company").length,
+        Other: signups.filter(s =>
+            s.member_unit !== "Alpha Company" &&
+            s.member_unit !== "Echo Company"
+        ).length,
+    };
+});
+
+const statusColor = (status: CalendarAttendance) => {
+    switch (status) {
+        case CalendarAttendance.Attending:
+            return "text-success";
+        case CalendarAttendance.Maybe:
+            return "text-yellow-600";
+        case CalendarAttendance.NotAttending:
+            return "text-destructive";
+        default:
+            return "";
+    }
+};
+
+const displayStatus = (status: CalendarAttendance) => {
+    switch (status) {
+        case CalendarAttendance.Attending:
+            return "Attending";
+        case CalendarAttendance.Maybe:
+            return "Maybe";
+        case CalendarAttendance.NotAttending:
+            return "Declined";
+        default:
+            return status;
+    }
+};
+
 defineExpose({ forceReload })
 </script>
 
@@ -188,46 +249,34 @@ defineExpose({ forceReload })
                     {{ activeEvent.description }}
                 </p>
             </section>
-            <!-- Attendance -->
+            <!-- attendance -->
             <section class="space-y-2 w-full">
                 <p class="text-lg font-semibold">Attendance</p>
                 <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
                     <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
-                        <label
-                            :class="viewedState === CalendarAttendance.Attending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.Attending">Going {{ attending.length }}</label>
-                        <label
-                            :class="viewedState === CalendarAttendance.Maybe ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.Maybe">Maybe {{ maybe.length }}</label>
-                        <label
-                            :class="viewedState === CalendarAttendance.NotAttending ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="viewedState = CalendarAttendance.NotAttending">Declined {{ declined.length
-                            }}</label>
+                        <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCounts.Alpha }}</label>
+                        <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="attendanceTab = 'Echo'">Echo {{ attendanceCounts.Echo }}</label>
+                        <label :class="attendanceTab === 'Other' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
+                            @click="attendanceTab = 'Other'">Other {{ attendanceCounts.Other }}</label>
                     </div>
-                    <div class="px-5 py-4 min-h-28">
-                        <div v-if="viewedState === CalendarAttendance.Attending" v-for="person in attending">
-                            <p>{{ person.member_name }}</p>
+                    <div class="pb-1 min-h-48">
+                        <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
+                            <p>Name</p>
+                            <p class="text-right">Status</p>
                         </div>
-                        <div v-if="viewedState === CalendarAttendance.Maybe" v-for="person in maybe">
-                            <p>{{ person.member_name }}</p>
-                        </div>
-                        <div v-if="viewedState === CalendarAttendance.NotAttending" v-for="person in declined">
+
+                        <div v-for="person in attendanceList" :key="person.member_id"
+                            class="grid grid-cols-2 py-1 *:px-3 hover:bg-muted">
                             <p>{{ person.member_name }}</p>
+                            <p :class="statusColor(person.status)" class="text-right">
+                                {{ displayStatus(person.status) }}
+                            </p>
                         </div>
                     </div>
                 </div>
             </section>
         </div>
-        <!-- Footer (optional actions) -->
-        <!-- <div class="border-t px-4 py-3 flex items-center justify-end gap-2">
-            <button class="rounded-md border px-3 py-1.5 text-sm hover:bg-muted/40 transition">
-                Edit
-            </button>
-            <button
-                class="rounded-md bg-primary text-primary-foreground px-3 py-1.5 text-sm hover:opacity-90 transition">
-                Open details
-            </button>
-        </div> -->
-
     </div>
 </template>
\ No newline at end of file
-- 
2.37.3.windows.1


From 89280dd3a772221dc358cda2295342bdc034dcef Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 5 Dec 2025 16:12:25 -0500
Subject: [PATCH 5/8] Added (hidden) attendees summary

---
 .../components/calendar/ViewCalendarEvent.vue | 27 +++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index 45bfa74..ced6a85 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -130,7 +130,7 @@ const attendanceList = computed<CalendarSignup[]>(() => {
     return out;
 })
 
-const attendanceCounts = computed(() => {
+const attendanceCountsByGroup = computed(() => {
     const signups = activeEvent.value.eventSignups ?? [];
 
     return {
@@ -143,6 +143,16 @@ const attendanceCounts = computed(() => {
     };
 });
 
+const attendanceStatusSummary = computed(() => {
+    const signups = activeEvent.value.eventSignups ?? [];
+
+    return {
+        attending: signups.filter(s => s.status === CalendarAttendance.Attending).length,
+        maybe: signups.filter(s => s.status === CalendarAttendance.Maybe).length,
+        notAttending: signups.filter(s => s.status === CalendarAttendance.NotAttending).length,
+    };
+});
+
 const statusColor = (status: CalendarAttendance) => {
     switch (status) {
         case CalendarAttendance.Attending:
@@ -251,15 +261,22 @@ defineExpose({ forceReload })
             </section>
             <!-- attendance -->
             <section class="space-y-2 w-full">
-                <p class="text-lg font-semibold">Attendance</p>
+                <div class="flex items-center gap-5">
+                    <p class="text-lg font-semibold">Attendance</p>
+                    <!-- <div class="text-muted-foreground flex gap-6">
+                        <p>Going <span class="ml-1">{{ attendanceStatusSummary.attending }}</span></p>
+                        <p>Maybe <span class="ml-1">{{ attendanceStatusSummary.maybe }}</span></p>
+                        <p>Declined <span class="ml-1">{{ attendanceStatusSummary.notAttending }}</span></p>
+                    </div> -->
+                </div>
                 <div class="flex flex-col border bg-muted/50 rounded-lg min-h-24 my-2">
                     <div class="flex w-full pt-2 border-b *:w-full *:text-center *:pb-1 *:cursor-pointer">
                         <label :class="attendanceTab === 'Alpha' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCounts.Alpha }}</label>
+                            @click="attendanceTab = 'Alpha'">Alpha {{ attendanceCountsByGroup.Alpha }}</label>
                         <label :class="attendanceTab === 'Echo' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="attendanceTab = 'Echo'">Echo {{ attendanceCounts.Echo }}</label>
+                            @click="attendanceTab = 'Echo'">Echo {{ attendanceCountsByGroup.Echo }}</label>
                         <label :class="attendanceTab === 'Other' ? 'border-b-3 border-foreground' : 'mb-[2px]'"
-                            @click="attendanceTab = 'Other'">Other {{ attendanceCounts.Other }}</label>
+                            @click="attendanceTab = 'Other'">Other {{ attendanceCountsByGroup.Other }}</label>
                     </div>
                     <div class="pb-1 min-h-48">
                         <div class="grid grid-cols-2 font-semibold text-muted-foreground border-b py-1 px-3 mb-2">
-- 
2.37.3.windows.1


From 09d20fd18f878156d1fe60ef915b24221d302664 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 5 Dec 2025 16:16:51 -0500
Subject: [PATCH 6/8] prevented header wiggle when editable value changes

---
 ui/src/components/calendar/ViewCalendarEvent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index ced6a85..34fe5f9 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -185,11 +185,11 @@ defineExpose({ forceReload })
 <template>
     <div v-if="loaded">
         <!-- Header -->
-        <div class="flex items-center justify-between gap-3 border-b px-4 py-3">
+        <div class="flex items-center justify-between gap-3 border-b px-4 py-3 h-14">
             <h2 class="text-lg font-semibold break-all">
                 {{ activeEvent?.name || 'Event' }}
             </h2>
-            <div class="flex gap-4">
+            <div class="flex gap-4 items-center">
                 <DropdownMenu v-if="canEditEvent">
                     <DropdownMenuTrigger>
                         <button
-- 
2.37.3.windows.1


From 94b5bfcff7dba28e3f21f6d1437f0d0590d147dc Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 5 Dec 2025 16:28:42 -0500
Subject: [PATCH 7/8] Added support for public read only calendar #53

---
 ui/src/components/Navigation/Navbar.vue          |  6 ++++++
 ui/src/components/calendar/ViewCalendarEvent.vue | 16 +++-------------
 ui/src/pages/Calendar.vue                        | 16 +++++++++-------
 ui/src/router/index.js                           |  4 ++--
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/ui/src/components/Navigation/Navbar.vue b/ui/src/components/Navigation/Navbar.vue
index 72c5bd4..c56d592 100644
--- a/ui/src/components/Navigation/Navbar.vue
+++ b/ui/src/components/Navigation/Navbar.vue
@@ -156,6 +156,12 @@ function blurAfter() {
                                     <RouterLink to="/join" @click="blurAfter">Join</RouterLink>
                                 </NavigationMenuLink>
                             </NavigationMenuItem>
+                            <!-- Calendar -->
+                            <NavigationMenuItem>
+                                <NavigationMenuLink as-child :class="navigationMenuTriggerStyle()">
+                                    <RouterLink to="/calendar" @click="blurAfter">Calendar</RouterLink>
+                                </NavigationMenuLink>
+                            </NavigationMenuItem>
                         </NavigationMenuList>
                     </NavigationMenu>
                 </div>
diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index 34fe5f9..c24ca14 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -14,22 +14,10 @@ import DropdownMenuItem from '../ui/dropdown-menu/DropdownMenuItem.vue';
 import { Calendar } from 'lucide-vue-next';
 
 const route = useRoute();
-// const eventID = computed(() => {
-//     const id = route.params.id;
-//     if (typeof id === 'string') return id;
-//     return undefined;
-// });
 
 const loaded = ref<boolean>(false);
 const activeEvent = ref<CalendarEvent | null>(null);
 
-// onMounted(async () => {
-//     let eventID = route.params.id;
-//     console.log(eventID);
-//     activeEvent.value = await getCalendarEvent(Number(eventID));
-//     loaded.value = true;
-// });
-
 watch(
     () => route.params.id,
     async (id) => {
@@ -76,6 +64,7 @@ const viewedState = ref<CalendarAttendance>(CalendarAttendance.Attending);
 
 let user = useUserStore();
 const myAttendance = computed<CalendarSignup | null>(() => {
+    if (!user.isLoggedIn) return null;
     return activeEvent.value.eventSignups.find(
         (s) => s.member_id === user.user.id
     ) || null;
@@ -88,6 +77,7 @@ async function setAttendance(state: CalendarAttendance) {
 }
 
 const canEditEvent = computed(() => {
+    if (!user.isLoggedIn) return false;
     if (user.user.id == activeEvent.value.creator_id)
         return true;
 });
@@ -223,7 +213,7 @@ defineExpose({ forceReload })
                     <CircleAlert></CircleAlert> This event has been cancelled
                 </div>
             </section>
-            <section v-if="isPast" class="w-full">
+            <section v-if="isPast && user.isLoggedIn" class="w-full">
                 <ButtonGroup class="flex w-full">
                     <Button variant="outline"
                         :class="myAttendance?.status === CalendarAttendance.Attending ? 'border-2 border-primary text-primary' : ''"
diff --git a/ui/src/pages/Calendar.vue b/ui/src/pages/Calendar.vue
index 2f4c76e..df9868b 100644
--- a/ui/src/pages/Calendar.vue
+++ b/ui/src/pages/Calendar.vue
@@ -3,15 +3,14 @@ import { ref, watch, nextTick, computed, onMounted } from 'vue'
 import FullCalendar from '@fullcalendar/vue3'
 import dayGridPlugin from '@fullcalendar/daygrid'
 import interactionPlugin from '@fullcalendar/interaction'
-import { X, Clock, MapPin, User, ListTodo, ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
+import { ChevronLeft, ChevronRight, Plus } from 'lucide-vue-next'
 import CreateCalendarEvent from '@/components/calendar/CreateCalendarEvent.vue'
-import { getCalendarEvent, getMonthCalendarEvents } from '@/api/calendar'
-import { CalendarEvent, CalendarEventShort } from '@shared/types/calendar'
-import { Calendar } from '@fullcalendar/core'
+import { CalendarEvent } from '@shared/types/calendar'
 import ViewCalendarEvent from '@/components/calendar/ViewCalendarEvent.vue'
 import { useRouter, useRoute } from 'vue-router'
 import { useCalendarEvents } from '@/composables/useCalendarEvents'
 import { useCalendarNavigation } from '@/composables/useCalendarNavigation'
+import { useUserStore } from '@/stores/user'
 
 const monthLabels = [
     'January', 'February', 'March', 'April', 'May', 'June',
@@ -24,13 +23,14 @@ function api() {
 
 const router = useRouter();
 const route = useRoute();
+const userStore = useUserStore();
 
 function buildFullDate(month: number, year: number): Date {
     return new Date(year, month, 1); //default to first of month
 }
 
 const { selectedMonth, selectedYear, years, goPrev, goNext, goToday, onDatesSet, goToSelectedDate } = useCalendarNavigation(api)
-const { events, loadEvents} = useCalendarEvents(selectedMonth, selectedYear);
+const { events, loadEvents } = useCalendarEvents(selectedMonth, selectedYear);
 
 const panelOpen = ref(false)
 const activeEvent = ref<CalendarEvent | null>(null)
@@ -48,6 +48,7 @@ const dialogRef = ref<any>(null)
 
 // NEW: handle day/time slot clicks to start creating an event
 function onDateClick(arg: { dateStr: string }) {
+    if (!userStore.isLoggedIn) return;
     dialogRef.value?.openDialog(arg.dateStr);
     // For now, just open the panel with a draft payload.
     // activeEvent.value = {
@@ -202,7 +203,7 @@ onMounted(() => {
                                 @click="goToday">
                                 Today
                             </button>
-                            <button
+                            <button v-if="userStore.isLoggedIn"
                                 class="cursor-pointer ml-1 inline-flex items-center gap-1.5 rounded-md bg-primary px-3 py-1.5 text-sm text-primary-foreground hover:opacity-90"
                                 @click="onCreateEvent">
                                 <Plus class="h-4 w-4" />
@@ -216,7 +217,8 @@ onMounted(() => {
             <aside v-if="panelOpen"
                 class="3xl:w-lg 2xl:w-md border-l bg-card text-foreground flex flex-col overflow-auto scrollbar-themed"
                 :style="{ height: 'calc(100vh - 61px)', position: 'sticky', top: '64px' }">
-                <ViewCalendarEvent ref="eventViewRef" @close="() => { router.push('/calendar'); }" @reload="loadEvents()" @edit="(val) => {dialogRef.openDialog(null, 'edit', val)}">
+                <ViewCalendarEvent ref="eventViewRef" @close="() => { router.push('/calendar'); }"
+                    @reload="loadEvents()" @edit="(val) => { dialogRef.openDialog(null, 'edit', val) }">
                 </ViewCalendarEvent>
             </aside>
         </div>
diff --git a/ui/src/router/index.js b/ui/src/router/index.js
index 29cc862..74e99a4 100644
--- a/ui/src/router/index.js
+++ b/ui/src/router/index.js
@@ -16,8 +16,8 @@ const router = createRouter({
     { path: '/loa', component: () => import('@/pages/SubmitLOA.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/transfer', component: () => import('@/pages/Transfer.vue'), meta: { requiresAuth: true, memberOnly: true } },
     
-    { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
-    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { requiresAuth: true, memberOnly: true }, },
+    { path: '/calendar', component: () => import('@/pages/Calendar.vue'), meta: { }, },
+    { path: '/calendar/event/:id', component: () => import('@/pages/Calendar.vue'), meta: { }, },
     
     { path: '/trainingReport', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
     { path: '/trainingReport/new', component: () => import('@/pages/TrainingReport.vue'), meta: { requiresAuth: true, memberOnly: true } },
-- 
2.37.3.windows.1


From a233b15ad46c7909795b63c7161761280f89ecd9 Mon Sep 17 00:00:00 2001
From: ajdj100 <ajairplane@gmail.com>
Date: Fri, 5 Dec 2025 16:34:00 -0500
Subject: [PATCH 8/8] Switched clock icon to something more readable at that
 size

---
 ui/src/components/calendar/ViewCalendarEvent.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ui/src/components/calendar/ViewCalendarEvent.vue b/ui/src/components/calendar/ViewCalendarEvent.vue
index c24ca14..c99e0dc 100644
--- a/ui/src/components/calendar/ViewCalendarEvent.vue
+++ b/ui/src/components/calendar/ViewCalendarEvent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { CalendarEvent, CalendarSignup } from '@shared/types/calendar'
-import { CircleAlert, Clock, Clock1, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
-import { computed, onMounted, ref, watch } from 'vue';
+import { CircleAlert, Clock4, EllipsisVertical, MapPin, User, X } from 'lucide-vue-next';
+import { computed, ref, watch } from 'vue';
 import ButtonGroup from '../ui/button-group/ButtonGroup.vue';
 import Button from '../ui/button/Button.vue';
 import { CalendarAttendance, getCalendarEvent, setCalendarEventAttendance, setCancelCalendarEvent } from '@/api/calendar';
@@ -233,7 +233,7 @@ defineExpose({ forceReload })
                     <Calendar :size="20"></Calendar> {{ dateText }}
                 </div>
                 <div class="text-foreground/80 flex gap-3 items-center">
-                    <Clock1 :size="20"></Clock1> {{ timeText[0] }} - {{ timeText[1] }}
+                    <Clock4 :size="20"></Clock4> {{ timeText[0] }} - {{ timeText[1] }}
                 </div>
                 <div class="text-foreground/80 flex gap-3 items-center">
                     <MapPin :size="20"></MapPin> {{ activeEvent.location || "Unknown" }}
-- 
2.37.3.windows.1