diff --git a/src/Resources/src/components/dashboard/Slots.vue b/src/Resources/src/components/dashboard/Slots.vue index ef56d696d..e6aa6a5dc 100644 --- a/src/Resources/src/components/dashboard/Slots.vue +++ b/src/Resources/src/components/dashboard/Slots.vue @@ -3,8 +3,10 @@ v-slot="{ open }" v-model="selectedSlot" :disabled="disabled" + class="relative w-full" + as="span" > -
+
- - + +
diff --git a/src/Resources/src/components/guest/GuestCheckbox.vue b/src/Resources/src/components/guest/GuestCheckbox.vue index ad05a70e8..6d04b994a 100644 --- a/src/Resources/src/components/guest/GuestCheckbox.vue +++ b/src/Resources/src/components/guest/GuestCheckbox.vue @@ -2,7 +2,7 @@ @@ -24,7 +24,7 @@ import { CheckIcon } from '@heroicons/vue/solid'; import { ref } from 'vue'; import useEventsBus from 'tools/eventBus'; import CombiModal from '@/components/dashboard/CombiModal.vue'; -import { Meal } from '@/api/getDashboardData'; +import { type Meal } from '@/api/getDashboardData'; import { Dictionary } from 'types/types'; const props = defineProps<{ @@ -36,10 +36,10 @@ const enabled = ref(false); const open = ref(false); const { emit } = useEventsBus(); -const isCombiBox = props.meals[props.mealId].dishSlug === 'combined-dish'; +const isCombiBox = (props.meals[props.mealId] as Meal).dishSlug === 'combined-dish'; let hasVariations = false; -Object.values(props.meals).forEach((meal) => (meal.variations ? (hasVariations = true) : '')); +Object.values(props.meals).forEach((meal) => ((meal as Meal).variations ? (hasVariations = true) : '')); function handle() { // Is a combi meal @@ -49,8 +49,8 @@ function handle() { open.value = true; } else { let combiDishes = Object.values(props.meals) - .filter((meal) => meal.dishSlug !== 'combined-dish') - .map((meal) => meal.dishSlug); + .filter((meal) => (meal as Meal).dishSlug !== 'combined-dish') + .map((meal) => (meal as Meal).dishSlug); emit('guestChosenCombi', combiDishes); emit('guestChosenMeals', props.mealId); diff --git a/src/Resources/src/components/guest/GuestDay.vue b/src/Resources/src/components/guest/GuestDay.vue new file mode 100644 index 000000000..6d109a3ef --- /dev/null +++ b/src/Resources/src/components/guest/GuestDay.vue @@ -0,0 +1,70 @@ + + + diff --git a/src/Resources/src/views/Guest.vue b/src/Resources/src/views/Guest.vue index c41c5ec55..bc783c6c1 100644 --- a/src/Resources/src/views/Guest.vue +++ b/src/Resources/src/views/Guest.vue @@ -13,7 +13,7 @@ {{ t('guest.description') }}

- @@ -40,7 +40,7 @@ import { useJoinMealGuest } from '@/api/postJoinMealGuest'; import { useI18n } from 'vue-i18n'; import GuestCompletion from '@/components/guest/GuestCompletion.vue'; import GuestForm from '@/components/guest/GuestForm.vue'; -import Day from '@/components/dashboard/Day.vue'; +import GuestDay from '@/components/guest/GuestDay.vue'; const progress = useProgress().start(); const route = useRoute();