fixed merge conflicts

Co-authored-by: Mityai <[email protected]>

src/api/event.api.ts

@@ -47,9 +47,9 @@ export const updateICalOnServer = async (event_id: number, updatedIcal: string)
   }
 };
 
-export const postEvent = async(event: AdminEvent) => {
+// export const postEvent = async(event: AdminEvent) => {
 
-}
+// }
 
 export async function getEventById(id: number): Promise<AdminEvent> {
   const response = await axios.get<AdminEvent>(

src/interfaces/ical.interface.ts

@@ -1,7 +1,8 @@
 export interface IEventTime {
   id: number;
+  event_id: number;
   title: string;
-  rrule: string;
+  rrule: string | null; 
   start: string;
   end: string;
 }

src/router/router.ts

@@ -8,7 +8,6 @@ import PlacePage from '@/pages/place.page.vue';
 import PaymentPage from '@/pages/payment.page.vue';
 import NotFoundPage from '@/pages/not-found.page.vue';
 import BookingPage from '@/pages/booking.page.vue';
-import HomePage from '@/pages/home.page.vue';
 import BillingsPage from '@/pages/billings.page.vue';
 
 import { createRouter, createWebHistory } from 'vue-router';
@@ -72,16 +71,6 @@ const routes = [
         component: BillingsPage,
       },
     ],
-  },
-  {
-    path: '/admin/calendar',
-    name: 'Calendar',
-    component: CalendarTempPage,
-  },
-  {
-    path: '/admin/buyers',
-    name: 'Buyers',
-    component: BuyerPage
   }
 ];
 

src/store/auth.store.ts

@@ -1,5 +1,5 @@
 import { reactive } from 'vue';
 
 export const auth = reactive({
-  authenticated: false
+  authenticated: true
 })

src/utils/ical.parser.ts

@@ -38,7 +38,7 @@ const generateRandomId = () => {
   return Math.floor(Math.random() * 1000000);
 };
 
-export const getICalData = (event_id: number, title: string, icalData: string): IEventTime => {
+export const getICalData = (event_id: number, title: string, icalData: string): IEventTime[] => {
   const events = [];
   const eventRegex = /BEGIN:VEVENT[\s\S]*?END:VEVENT/g;