Apply event store to further components to fix TS errors

aasimsyed · Jul 2, 2024 · 94a6ded · 94a6ded
1 parent b7fbedc
commit 94a6ded
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/frontend/components/card/about/CardAboutEvent.vue b/frontend/components/card/about/CardAboutEvent.vue
@@ -64,8 +64,10 @@ import CardAbout from "./CardAbout.vue";
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
 
-const event = useEventStore();
-await event.fetchByID(id);
+const eventStore = useEventStore();
+await eventStore.fetchByID(id);
+
+const { event } = eventStore;
 
 const description = ref();
 const descriptionExpandable = ref(false);

diff --git a/frontend/components/header/HeaderAppPage.vue b/frontend/components/header/HeaderAppPage.vue
@@ -75,6 +75,7 @@
 
 <script setup lang="ts">
 import type { Organization } from "~/types/entities/organization";
+import type { Event } from "~/types/events/event";
 import { IconMap } from "~/types/icon-map";
 
 const props = defineProps<{
@@ -90,15 +91,17 @@ const id = typeof idParam === "string" ? idParam : undefined;
 const organizationStore = useOrganizationStore();
 let organization: Organization;
 const group = useGroupStore();
-const event = useEventStore();
+const eventStore = useEventStore();
+let event: Event;
 
 if (props.pageType === "organization") {
   await organizationStore.fetchByID(id);
   organization = organizationStore.organization;
 } else if (props.pageType === "group") {
   await group.fetchByID(id);
 } else if (props.pageType === "event") {
-  await event.fetchByID(id);
+  await eventStore.fetchByID(id);
+  event = eventStore.event;
 }
 
 const headerName = computed<string>(() => {

diff --git a/frontend/components/modal/edit/about/ModalEditAboutEvent.vue b/frontend/components/modal/edit/about/ModalEditAboutEvent.vue
@@ -59,8 +59,10 @@ const props = defineProps<{
 const idParam = useRoute().params.id;
 const id = typeof idParam === "string" ? idParam : undefined;
 
-const event = useEventStore();
-await event.fetchByID(id);
+const eventStore = useEventStore();
+await eventStore.fetchByID(id);
+
+const { event } = eventStore;
 
 const formData = ref({
   description: event.description,

diff --git a/frontend/utils/testEntities.ts b/frontend/utils/testEntities.ts
@@ -145,7 +145,6 @@ export const testClimateEvent: Event = {
   // supportingUsers: [user, user],
   // iconURL: "/images/an_image.svg",
   socialLinks: ["climate_org@mastodon", "[email protected]"],
-  loading: false,
 };
 
 export const testTechEvent: Event = {
@@ -163,7 +162,6 @@ export const testTechEvent: Event = {
   startTime: new Date().toLocaleDateString(),
   // supportingUsers: [user, user, user],
   socialLinks: [""],
-  loading: false,
 };
 
 export const testResource: Resource = {