Remove references to booking view.

thunderbird · Mar 26, 2024 · 476ea39 · 476ea39
1 parent 390b33d
commit 476ea39
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 99 deletions.
diff --git a/frontend/src/components/bookingView/BookingViewSuccess.vue b/frontend/src/components/bookingView/BookingViewSuccess.vue
@@ -1,8 +1,7 @@
 <template>
   <div class="flex-center min-w-[50%] flex-col gap-12">
     <div class="text-2xl font-semibold text-teal-500">
-      <span v-if="isAvailabilityRoute">{{ t('info.bookingSuccessfullyRequested') }}</span>
-      <span v-else>{{ t('info.bookingSuccessful') }}</span>
+      <span>{{ t('info.bookingSuccessfullyRequested') }}</span>
     </div>
     <div class="flex w-full max-w-sm flex-col gap-1 rounded-lg shadow-lg">
       <div class="flex h-14 items-center justify-around rounded-t-md bg-teal-500">
@@ -20,19 +19,6 @@
         </div>
       </div>
     </div>
-    <div
-      v-if="isBookingRoute"
-      class="-mt-4 cursor-pointer text-sm text-teal-500 underline underline-offset-2"
-      @click="emit('download')"
-    >
-      {{ t('label.downloadTheIcsFile') }}
-    </div>
-    <div v-if="isBookingRoute" class="text-center text-lg text-gray-700">
-      <div>{{ t('info.invitationWasSent') }}</div>
-      <div class="text-lg font-bold">
-        {{ attendeeEmail }}
-      </div>
-    </div>
     <primary-button
       class="mt-12 p-7"
       :label="t('label.startUsingTba')"
@@ -56,12 +42,9 @@ const router = useRouter();
 
 const dj = inject('dayjs');
 
-const emit = defineEmits(['download']);
 defineProps({
   selectedEvent: Object,
   attendeeEmail: String,
-  isAvailabilityRoute: Boolean,
-  isBookingRoute: Boolean,
 });
 
 </script>
diff --git a/frontend/src/views/BookingView.vue b/frontend/src/views/BookingView.vue
@@ -24,10 +24,7 @@
     >
       <booking-view-success
         :attendee-email="attendee.email"
-        :is-availability-route="isAvailabilityRoute"
-        :is-booking-route="isBookingRoute"
         :selected-event="selectedEvent"
-        @download="downloadIcs"
       />
     </main>
     <!-- booking page content: time slot selection -->
@@ -44,7 +41,7 @@
     <booking-modal
       :open="showBookingModal"
       :event="selectedEvent"
-      :requires-confirmation="isAvailabilityRoute"
+      :requires-confirmation="true"
       @book="bookEvent"
       @download="downloadIcs"
       @close="closeModal()"
@@ -53,13 +50,13 @@
 </template>
 
 <script setup>
-import { bookingCalendarViews as views, appointmentState, modalStates } from '@/definitions';
+import { bookingCalendarViews as views, modalStates } from '@/definitions';
 import { download } from '@/utils';
-import { computed, inject, onMounted, ref } from 'vue';
-import { useRoute } from 'vue-router';
+import {
+  inject, onMounted, ref,
+} from 'vue';
 import { storeToRefs } from 'pinia';
 import { useI18n } from 'vue-i18n';
-import { useAppointmentStore } from '@/stores/appointment-store';
 import { useBookingViewStore } from '@/stores/booking-view-store';
 import { useBookingModalStore } from '@/stores/booking-modal-store';
 import LoadingSpinner from '@/elements/LoadingSpinner';
@@ -69,14 +66,11 @@ import BookingViewSuccess from '@/components/bookingView/BookingViewSuccess.vue'
 import BookingViewError from '@/components/bookingView/BookingViewError.vue';
 
 // component constants
-const route = useRoute();
 const { t } = useI18n();
 const dj = inject('dayjs');
 const call = inject('call');
-const appointmentStore = useAppointmentStore();
 const bookingViewStore = useBookingViewStore();
 const bookingModalStore = useBookingModalStore();
-const { status: appointmentStatus } = appointmentStore;
 
 const errorHeading = ref(null);
 const errorBody = ref(null);
@@ -86,17 +80,6 @@ const bookingRequestFinished = ref(false);
 const showNavigation = ref(false);
 const showBookingModal = ref(false);
 
-/**
- * For general availability / scheduling the owner has to accept or decline booking requests.
- * @type {ComputedRef<boolean>}
- */
-const isAvailabilityRoute = computed(() => route.name === 'availability');
-/**
- * For one-off appointment bookings. The booking auto-confirms and no action is needed on the owner's part.
- * @type {ComputedRef<boolean>}
- */
-const isBookingRoute = computed(() => route.name === 'booking');
-
 const {
   appointment,
   activeView,
@@ -156,22 +139,14 @@ const getViewBySlotDistribution = (slots) => {
  * @returns {Promise<void>}
  */
 const downloadIcs = async () => {
-  let request = null;
-
-  if (isAvailabilityRoute.value) {
-    const obj = {
-      slot: {
-        start: selectedEvent.value.start,
-        duration: selectedEvent.value.duration,
-      },
-      attendee: attendee.value,
-    };
-    request = call('schedule/serve/ics').put({ s_a: obj, url: window.location.href });
-  } else if (isBookingRoute.value) {
-    request = call(`apmt/serve/ics/${route.params.slug}/${selectedEvent.value.id}`).get();
-  } else {
-    return;
-  }
+  const obj = {
+    slot: {
+      start: selectedEvent.value.start,
+      duration: selectedEvent.value.duration,
+    },
+    attendee: attendee.value,
+  };
+  const request = call('schedule/serve/ics').put({ s_a: obj, url: window.location.href });
 
   const { data, error } = await request.json();
 
@@ -189,15 +164,7 @@ const downloadIcs = async () => {
  * @returns {Promise<Object|null>}
  */
 const getAppointment = async () => {
-  let request = null;
-
-  if (isAvailabilityRoute.value) {
-    request = call('schedule/public/availability').post({ url: window.location.href });
-  } else if (isBookingRoute.value) {
-    request = call(`apmt/public/${route.params.slug}`).get();
-  } else {
-    return null;
-  }
+  const request = call('schedule/public/availability').post({ url: window.location.href });
 
   const { data, error } = await request.json();
 
@@ -213,12 +180,6 @@ const getAppointment = async () => {
     return null;
   }
 
-  /*
-  if (isBookingRoute.value && appointmentStatus(data.value) !== appointmentState.pending) {
-    return null;
-  }
-   */
-
   // convert start dates from UTC back to users timezone
   data.value.slots.forEach((s) => {
     s.start = dj(s.start).tz(dj.tz.guess());
@@ -233,36 +194,20 @@ const getAppointment = async () => {
  * @returns {Promise<void>}
  */
 const bookEvent = async (attendeeData) => {
-  let request = null;
-
   bookingRequestFinished.value = false;
 
-  if (isAvailabilityRoute.value) {
-    const obj = {
-      slot: {
-        start: selectedEvent.value.start,
-        duration: selectedEvent.value.duration,
-      },
-      attendee: attendeeData,
-    };
-
-    request = call('schedule/public/availability/request').put({
-      s_a: obj,
-      url: window.location.href,
-    });
-  } else if (isBookingRoute.value) {
-    const obj = {
-      slot_id: selectedEvent.value.id,
-      attendee: attendeeData,
-    };
-
-    request = call(`apmt/public/${route.params.slug}`).put(obj);
-  } else {
-    modalState.value = modalStates.error;
-    // Generic unknown error, they shouldn't hit here though!
-    modalStateData.value = t('error.unknownAppointmentError');
-    return;
-  }
+  const obj = {
+    slot: {
+      start: selectedEvent.value.start,
+      duration: selectedEvent.value.duration,
+    },
+    attendee: attendeeData,
+  };
+
+  const request = call('schedule/public/availability/request').put({
+    s_a: obj,
+    url: window.location.href,
+  });
 
   // Data should just be true here.
   const { data, error } = await request.json();