diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 2a0281f13..33031d36f 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -220,6 +220,7 @@ "back": "Zurück", "backToTop": "Nach oben scrollen", "bookEvent": "Buchen", + "bookAppointment": "Termin buchen", "booked": "Gebucht", "bookingConfirmation": "Bestätigung für Buchungen", "bookingDetails": "Buchungsdetails", @@ -255,14 +256,12 @@ "confirm": "Bestätigen", "confirmed": "Bestätigt", "confirmBooking": "Buchung bestätigen", - "confirmSelection": "Auswahl bestätigen", "connect": "Verbinden", "connectCalendar": "Kalender verbinden", "connectGoogleCalendar": "Google Kalender verbinden", "connectedAs": "Verbunden als {name}", "contact": "Kontakt", "continue": "Weiter", - "continueAsGuest": "Weiter als Gast", "contributeToThisSite": "Dieser Seite beitragen", "cookies": "Cookies", "copied": "Kopiert", @@ -360,6 +359,7 @@ "next": "Weiter", "nextWeek": "Nächste Woche", "no": "Nein", + "noneSelected": "Keine Auswahl", "earlier": "Früher", "notConnected": "Nicht verbunden", "notProvided": "Keine Angabe", @@ -370,6 +370,7 @@ "off": "Aus", "on": "An", "online": "Online", + "onlineMeeting": "Online-Meeting", "open": "Offen", "openMenu": "Menü öffnen", "openMyPage": "Meinen Link öffnen", @@ -408,7 +409,7 @@ "searchAppointments": "Termine durchsuchen", "searchForCalendars": "Nach Kalendern suchen", "secondaryTimeZone": "Sekundäre Zeitzone", - "selectATimeFromTheCalendar": "Zeit aus dem Kalender wählen", + "selectATimeFromTheCalendar": "Wähle einen freien Zeitpunkt aus dem Kalender", "selectCalendar": "Kalender auswählen", "selectDays": "Wochentage auswählen", "selectDateForWeek": "Datum für Woche auswählen", @@ -481,7 +482,8 @@ "yes": "Ja", "youAreBookable": "Du bist verfügbar", "youAreNotBookable": "Du bist nicht verfügbar", - "youHaveUnsavedChanges": "Du hast ungespeicherte Änderungen" + "youHaveUnsavedChanges": "Du hast ungespeicherte Änderungen", + "yourAppointmentWillBeConfirmedAutomatically": "Deine Buchung wird automatisch bestätigt." }, "locales": { "de": "Deutsch", @@ -539,6 +541,7 @@ "completelyRemoveUser": "Hier wird ein Benutzer vollständig aus Thunderbird Appointment entfernt, einschließlich aller Benutzerdaten. Diese Funktion bitte nicht ausführen, wenn es keine Aufforderung dafür gab.", "disableAccountFirst": "Das Konto muss zunächst deaktiviert sein." }, + "bookATimeToMeetWith": "Buche einen Zeitpunkt um dich mit {name} zu treffen", "calendarDeletionWarning": "Wenn die Verbindung zu diesem Kalender getrennt wird, werden alle Termine und Zeitpläne aus Thunderbird Appointment entfernt. Es werden keine Termine entfernt, die derzeit in diesem Kalender gespeichert sind.", "chooseDateAndTime": "Wähle Tag und Zeit für ein Treffen.", "connectZoom": "Du kannst dein Zoom-Konto verbinden, um Besprechungen direkt mit einer Zoom-Einladung zu erstellen.", @@ -560,7 +563,6 @@ "login": { "continueToFxa": "Bitte die E-Mail-Adresse des Mozilla-Kontos eingeben." }, - "nameIsInvitingYou": "{name} lädt dich ein zu", "ownerNeedsToConfirmBooking": "Wenn diese Option aktiviert ist, müssen Buchungen dieses Zeitplans bestätigt oder ablehnt werden. Wenn diese Option deaktiviert ist, werden alle Zeiten automatisch bestätigt.", "preferredEmailHelp": "Die E-Mail-Adresse festlegen, die für ausgehende Kommunikation in Kalenderereignissen verwendet werden soll.", "recipientsCanScheduleBetween": "Empfänger können einen Termin zwischen {earliest} und {farthest} ab dem aktuellen Zeitpunkt wählen. ", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 76f46c638..df29ad929 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -222,6 +222,7 @@ "back": "Back", "backToTop": "Back to top", "bookEvent": "Book", + "bookAppointment": "Book appointment", "booked": "Booked", "bookingConfirmation": "Booking Confirmation", "bookingDetails": "Booking Details", @@ -257,7 +258,6 @@ "confirm": "Confirm", "confirmed": "Confirmed", "confirmBooking": "Confirm booking", - "confirmSelection": "Confirm selection", "connect": "Connect", "connecting": "Connecting", "connectCalendar": "Connect calendar", @@ -265,7 +265,6 @@ "connectedAs": "Connected as {name}", "contact": "Contact", "continue": "Continue", - "continueAsGuest": "Continue as Guest", "contributeToThisSite": "Contribute to this site", "cookies": "Cookies", "copied": "Copied", @@ -364,6 +363,7 @@ "next": "Next", "nextWeek": "Next week", "no": "No", + "noneSelected": "None selected", "notConnected": "Not connected", "notProvided": "Not Provided", "notVerified": "Not Verified", @@ -373,6 +373,7 @@ "off": "Off", "on": "On", "online": "Online", + "onlineMeeting": "Online meeting", "open": "Open", "openMenu": "Open menu", "openMyPage": "Open my page", @@ -411,7 +412,7 @@ "searchAppointments": "Search bookings", "searchForCalendars": "Search for calendars", "secondaryTimeZone": "Secondary time zone", - "selectATimeFromTheCalendar": "Select a time from the calendar", + "selectATimeFromTheCalendar": "Select an open time slot from the calendar.", "selectCalendar": "Select calendar", "selectDays": "Select days", "selectDateForWeek": "Select date for week", @@ -451,7 +452,7 @@ "timeFormat": "Time Format", "timeOfTheEvent": "Time of the event:", "timeUpdated": "Time Updated", - "timeZone": "Time Zone", + "timeZone": "Timezone", "title": "Title", "to": "to", "today": "Today", @@ -484,7 +485,8 @@ "yes": "Yes", "youAreBookable": "You're bookable", "youAreNotBookable": "You're not bookable", - "youHaveUnsavedChanges": "You have unsaved changes" + "youHaveUnsavedChanges": "You have unsaved changes", + "yourAppointmentWillBeConfirmedAutomatically": "Your appointment will be confirmed automatically." }, "locales": { "de": "German", @@ -542,6 +544,7 @@ "completelyRemoveUser": "This will completely remove a user from Thunderbird Appointment, including all of their user data. Don't do this unless you're told to.", "disableAccountFirst": "You must disable the account first." }, + "bookATimeToMeetWith": "Book a time to meet with {name}", "calendarDeletionWarning": "Removing this calendar will remove all appointments and schedules from Thunderbird Appointment. Any confirmed events currently stored in your calendar will not be removed.", "chooseDateAndTime": "Choose when to meet.", "connectZoom": "Connect your Zoom account to generate instant meeting invites for each booking.", @@ -563,7 +566,6 @@ "login": { "continueToFxa": "Enter your email above to continue to Mozilla Accounts" }, - "nameIsInvitingYou": "{name} is inviting you to", "ownerNeedsToConfirmBooking": "When this option is active, you will be required to confirm or decline times booked on your schedule. When this option is deactivated, all times will automatically be confirmed.", "preferredEmailHelp": "Set the email you'll use for out-going communication. This will be used in calendar events and emails.", "recipientsCanScheduleBetween": "Recipients can schedule a {duration} appointment between {earliest} and {farthest} ahead of time.", diff --git a/frontend/src/models.ts b/frontend/src/models.ts index 49e308ae7..dcfe26c5c 100644 --- a/frontend/src/models.ts +++ b/frontend/src/models.ts @@ -16,11 +16,6 @@ export type Attendee = { timezone: string; }; -export type GuestUserInfo = { - name?: string; - email: string; -} - export type Slot = { id: number; start: Dayjs|string; diff --git a/frontend/src/stores/booking-view-store.ts b/frontend/src/stores/booking-view-store.ts index 92667b854..47fb2b96e 100644 --- a/frontend/src/stores/booking-view-store.ts +++ b/frontend/src/stores/booking-view-store.ts @@ -1,7 +1,7 @@ import { defineStore } from 'pinia'; import { ref, inject } from 'vue'; import { BookingCalendarView } from '@/definitions'; -import { Appointment, Attendee, Slot, GuestUserInfo } from '@/models'; +import { Appointment, Attendee, Slot } from '@/models'; import { dayjsKey } from '@/keys'; /** @@ -19,8 +19,6 @@ export const useBookingViewStore = defineStore('bookingView', () => { const selectedEvent = ref(null); // The selected slot also needs some data from its parent const appointment = ref(null); const attendee = ref(null); // Attendee can either be a guest or an actual user - const guestUserInfo = ref({ name: '', email: '' }); // Used in the SlotSelectionUserInfo form - const guestUserInfoValid = ref(false); // Used in the SlotSelectionUserInfo form /** * Restore default state, set date to today and remove other data @@ -31,7 +29,6 @@ export const useBookingViewStore = defineStore('bookingView', () => { selectedEvent.value = null; appointment.value = null; attendee.value = null; - guestUserInfo.value = { name: '', email: '' }; }; return { @@ -42,8 +39,6 @@ export const useBookingViewStore = defineStore('bookingView', () => { selectedEvent, appointment, attendee, - guestUserInfo, - guestUserInfoValid, // Funcs $reset, }; diff --git a/frontend/src/views/BookerView/components/BookingViewSlotSelection.vue b/frontend/src/views/BookerView/components/BookingViewSlotSelection.vue index 2a4596dba..3135d99a5 100644 --- a/frontend/src/views/BookerView/components/BookingViewSlotSelection.vue +++ b/frontend/src/views/BookerView/components/BookingViewSlotSelection.vue @@ -1,6 +1,9 @@ diff --git a/frontend/src/views/BookerView/components/SlotSelectionHeader.vue b/frontend/src/views/BookerView/components/SlotSelectionHeader.vue new file mode 100644 index 000000000..a66cb7659 --- /dev/null +++ b/frontend/src/views/BookerView/components/SlotSelectionHeader.vue @@ -0,0 +1,91 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/views/BookerView/components/SlotSelectionUserInfo.vue b/frontend/src/views/BookerView/components/SlotSelectionUserInfo.vue deleted file mode 100644 index 2e218ddd9..000000000 --- a/frontend/src/views/BookerView/components/SlotSelectionUserInfo.vue +++ /dev/null @@ -1,155 +0,0 @@ - - - - - \ No newline at end of file diff --git a/frontend/src/views/BookerView/index.vue b/frontend/src/views/BookerView/index.vue index b8a1ace93..79a4fbb67 100644 --- a/frontend/src/views/BookerView/index.vue +++ b/frontend/src/views/BookerView/index.vue @@ -127,43 +127,41 @@ export default { diff --git a/frontend/src/views/DashboardView/components/WeekCalendar.vue b/frontend/src/views/DashboardView/components/WeekCalendar.vue index dffa97404..d92444b46 100644 --- a/frontend/src/views/DashboardView/components/WeekCalendar.vue +++ b/frontend/src/views/DashboardView/components/WeekCalendar.vue @@ -487,7 +487,6 @@ const filteredSelectableSlotsForGrid = computed(() => { border: 1px solid var(--colour-neutral-border); border-radius: 1.5rem; background-color: var(--colour-neutral-base); - margin-block-end: 2rem; flex: 1; overflow-y: auto; overflow-x: auto; diff --git a/frontend/src/views/DashboardView/index.vue b/frontend/src/views/DashboardView/index.vue index 9e4bd1814..7046c7cfb 100644 --- a/frontend/src/views/DashboardView/index.vue +++ b/frontend/src/views/DashboardView/index.vue @@ -71,11 +71,13 @@ export default { - +
+ +
@@ -94,6 +96,10 @@ export default { flex-direction: column; width: 100%; margin-block-start: 0.25rem; + + .calendar-container { + margin-block-end: 2rem; + } } .calendar-header-container {