Skip to content

Commit c1937e3

Browse files
Update Settings Page UI (#1425)
* Settings Page: NoticeBar positioning and aside button styles * Settings Page: Account Settings section updated * Settings Page: Update Preferences section UI * Settings Page: Connected Applications section UI * Override link button text colour * Settings Page: Adjustments to Delete Appointment data components * Use rems instead of pixels on calendar-color * Settings Page: Update Booking Page Link input label and capitalization of Start of the Week * Update frontend/src/locales/de.json Co-authored-by: Andreas <mail@devmount.de> --------- Co-authored-by: Andreas <mail@devmount.de>
1 parent ee4fd60 commit c1937e3

File tree

10 files changed

+481
-580
lines changed

10 files changed

+481
-580
lines changed

frontend/src/components/ConfirmationModal.vue

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,16 @@ const emit = defineEmits(['close', 'confirm', 'error']);
3333
class="position-center fixed z-50 flex w-full max-w-lg flex-col items-center gap-6 rounded-xl bg-white p-12 dark:bg-gray-700"
3434
>
3535
<div class="btn-close absolute right-8 top-8 cursor-pointer" @click="emit('close')" :title="t('label.close')">
36-
<ph-x class="size-6 fill-transparent stroke-gray-700 stroke-1 dark:stroke-gray-400" />
36+
<ph-x class="size-6" />
3737
</div>
38-
<div class="text-2xl font-semibold text-teal-500">
38+
<div class="text-2xl font-semibold title-color">
3939
{{ title }}
4040
</div>
4141
<div class="max-w-sm text-center">
4242
{{ message }}
4343
</div>
4444
<div class="flex gap-4">
4545
<primary-button
46-
class="btn-close"
4746
variant="outline"
4847
@click="emit('close')"
4948
:title="cancelLabel"
@@ -69,3 +68,17 @@ const emit = defineEmits(['close', 'confirm', 'error']);
6968
</div>
7069
</div>
7170
</template>
71+
72+
<style scoped>
73+
.title-color {
74+
color: var(--colour-ti-highlight);
75+
}
76+
77+
.btn-close {
78+
color: var(--colour-ti-muted);
79+
80+
&:hover {
81+
color: var(--colour-ti-secondary);
82+
}
83+
}
84+
</style>

frontend/src/components/RadioGroupPill.vue

Lines changed: 0 additions & 93 deletions
This file was deleted.

frontend/src/locales/de.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,13 +102,13 @@
102102
"calendarSettings": "Kalender-Einstellungen",
103103
"calendarsConnected": "Verbundene Kalender",
104104
"calendarsUnconnected": "Verfügbare Kalender",
105-
"cancelAppointmentService": "Termin-Service abbrechen?",
106105
"connectedAccounts": "Verbundene Konten",
107106
"connectedAccountsSettings": "Verbundene Konten Einstellungen",
108107
"connectedApplications": "Verbundene Anwendungen",
109108
"contactRequest": "Kontaktanfrage",
110109
"createNewAppointment": "Neuen Termin erstellen",
111110
"dateAndTimeFormatting": "Datums- und Zeitformat",
111+
"deleteAppointmentData": "Termin-Daten löschen",
112112
"discoverCaldavcalendars": "CalDAV-Kalender abfragen",
113113
"displayInformation": "Anzeige-Informationen",
114114
"eventBooked": "Event gebucht!",
@@ -155,10 +155,8 @@
155155
"bookingSuccessfullyDenied": "Buchung erfolgreich abgelehnt!",
156156
"bookingSuccessfullyRequested": "Buchung erfolgreich angefragt!",
157157
"bookingWillBeCanceled": "Booking will be canceled. An update will be sent to the booker.",
158-
"cancelServiceInfo": "Um deinen Appointment Service abzubrechen, klicke hier:\n Hinweis: Dies hat keinen Einfluss auf dein TB Pro Konto oder Abonnement.",
159158
"connectionEstablished": "Verbindung hergestellt",
160159
"copiedToClipboard": "In Zwischenablage kopiert",
161-
"downloadAccountData": "Um alle Daten herunterzuladen, die vom Appointment Service verwendet werden, klicken Sie hier:",
162160
"eventWasCreated": "Das Event wurde in deinem Kalender erstellt.",
163161
"invitationGenerated": "Die Einladungscodes wurden erfolgreich generiert.",
164162
"invitationWasSent": "Eine Einladung wurde an deine E-Mail-Adresse gesendet.",
@@ -170,8 +168,8 @@
170168
"slotIsAvailableAgain": "Das Zeitfenster ist jetzt wieder buchbar."
171169
},
172170
"label": {
173-
"12hAmPm": "12-hour AM/PM",
174-
"24h": "24-hour",
171+
"12hAmPm": "12:00 Uhr (12-Stunden-Format)",
172+
"24h": "24:00 (24-Stunden-Format)",
175173
"DDMMYYYY": "TT/MM/YYYY",
176174
"MMDDYYYY": "MM/TT/YYYY",
177175
"accepted": "Akzeptiert",
@@ -227,8 +225,7 @@
227225
"bookingDetails": "Buchungsdetails",
228226
"bookingLink": "Buchungslink",
229227
"bookingSlot": "Gebuchtes Zeitfenster",
230-
"bookingPageURL": "Buchungsseite URL",
231-
"bookingPageSettings": "Buchungsseite Einstellungen",
228+
"bookingPageLinkLabel": "Buchungsseite Link",
232229
"bookings": "Buchungen",
233230
"bookingPageLink": "Dein Buchungsseiten-Link",
234231
"bookingPageDetails": "Buchungsseite Details",
@@ -243,7 +240,6 @@
243240
"cancelled": "Storniert",
244241
"cancelBooking": "Buchung absagen",
245242
"cancelReason": "Grund für die Absage",
246-
"cancelService": "Service abbrechen",
247243
"changeMyAvailability": "Verfügbarkeit ändern",
248244
"changesNotSaved": "Änderungen wurden nicht gespeichert",
249245
"checkAvailableSlots": "Verfügbare Zeiten anzeigen",
@@ -260,7 +256,7 @@
260256
"connect": "Verbinden",
261257
"connectCalendar": "Kalender verbinden",
262258
"connectGoogleCalendar": "Google Kalender verbinden",
263-
"connectedAs": "Verbunden als {name}",
259+
"connectedAs": "Verbunden als",
264260
"contact": "Kontakt",
265261
"continue": "Weiter",
266262
"contributeToThisSite": "Dieser Seite beitragen",
@@ -288,6 +284,8 @@
288284
"defaultTimeZone": "Standard Zeitzone",
289285
"delete": "Löschen",
290286
"deleteBooking": "Buchung löschen",
287+
"deleteAllAppointmentData": "Alle Appointment-Daten löschen",
288+
"deleteAllAppointmentDataInfo": "Dein TB Pro-Abonnement bleibt davon unberührt.",
291289
"deny": "Ablehnen",
292290
"denyBooking": "Buchung ablehnen",
293291
"disable": "Deaktivieren",
@@ -299,7 +297,7 @@
299297
"downloadICS": "Download ICS",
300298
"downloadInvitation": "Termineinladung herunterladen",
301299
"downloadTheIcsFile": "ICS-Datei herunterladen",
302-
"downloadMyData": "Meine Daten herunterladen",
300+
"downloadMyData": "Alle deine Daten von Appointment herunterladen",
303301
"earliestBooking": "Früheste Buchung",
304302
"edit": "Bearbeiten",
305303
"editCalendar": "Kalender bearbeiten",
@@ -345,6 +343,7 @@
345343
"logIn": "Anmelden",
346344
"logOut": "Abmelden",
347345
"loginToContinue": "Anmelden, um fortzufahren",
346+
"manageBookingLink": "Buchungsseite verwalten",
348347
"meetingDuration": "Meeting-Dauer",
349348
"meetingTitle": "Meeting Titel",
350349
"meetingDate": "Meeting-Datum",
@@ -436,7 +435,7 @@
436435
"sortBy": "Sortieren nach",
437436
"start": "Start",
438437
"startDate": "Startdatum",
439-
"startOfWeek": "Wochenbeginn",
438+
"startOfWeek": "Wochentag als Wochenbeginn",
440439
"startTime": "Startzeit",
441440
"startUsingTba": "Starte mit TBA",
442441
"status": "Status",
@@ -540,7 +539,6 @@
540539
"zoomCom": "zoom.com …"
541540
},
542541
"text": {
543-
"accountCancelWarning": "Du wirst keinen Zugriff mehr auf Thunderbird Appointment haben. Alle Buchungs-Kalender werden auf \"Inaktiv\" gesetzt und alle zukünftigen Buchungen werden storniert.\nAndere Termin-Daten werden 30 Tage lang beibehalten, entsprechend der TB Pro Datenschutzrichtlinie.",
544542
"admin": {
545543
"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.",
546544
"disableAccountFirst": "Das Konto muss zunächst deaktiviert sein."
@@ -550,6 +548,7 @@
550548
"chooseDateAndTime": "Wähle Tag und Zeit für ein Treffen.",
551549
"connectZoom": "Du kannst dein Zoom-Konto verbinden, um Besprechungen direkt mit einer Zoom-Einladung zu erstellen.",
552550
"contactRequestForm": "Bitte verwende das nachstehende Kontaktformular, um Feedback, Fragen oder Anliegen an unser Support-Team zu senden. Wir werden ggf. versuchen, so schnell wie möglich zu antworten.",
551+
"deleteAppointmentDataWarning": "Du wirst keinen Zugriff mehr auf Thunderbird Appointment haben. Alle Buchungs-Kalender werden auf \"Inaktiv\" gesetzt und alle zukünftigen Buchungen werden storniert.\nAndere Termin-Daten werden 30 Tage lang beibehalten, entsprechend der TB Pro Datenschutzrichtlinie.",
553552
"defineDaysAndTimeSlots": "Definiere Tage und Zeitfenster, damit Teilnehmer die Zeit des Events auswählen können …",
554553
"denialSentToAddress": "Die Informationen über die Ablehnung der Anfrage wurde per E-Mail an {address} geschickt.",
555554
"disclaimerGABooking": "Bitte beachten: Der Eigentümer muss die Buchung bestätigen.",

frontend/src/locales/en.json

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@
105105
"calendarSettings": "Calendar Settings",
106106
"calendarsConnected": "Connected Calendars",
107107
"calendarsUnconnected": "Available Calendars",
108-
"cancelAppointmentService": "Cancel Appointment Service?",
109108
"connectedAccounts": "Connected Accounts",
110109
"connectedAccountsSettings": "Connected Accounts Settings",
111110
"connectedApplications": "Connected Applications",
112111
"contactRequest": "Contact Request",
113112
"createNewAppointment": "Create new appointment",
114113
"dateAndTimeFormatting": "Date and Time Format",
114+
"deleteAppointmentData": "Delete Appointment Data",
115115
"discoverCaldavcalendars": "Discover CalDAV Calendars",
116116
"displayInformation": "Display information",
117117
"eventBooked": "Event booked!",
@@ -158,10 +158,8 @@
158158
"bookingSuccessfullyDenied": "Booking rejected. Reach out to the booker to recommend an alternative.",
159159
"bookingSuccessfullyRequested": "Booking request sent",
160160
"bookingWillBeCanceled": "Booking will be canceled. An update will be sent to the booker.",
161-
"cancelServiceInfo": "To cancel your Appointment service, click here:\n Note: This will not affect your TB Pro account or subscription.",
162161
"connectionEstablished": "Connection established",
163162
"copiedToClipboard": "Copied to clipboard",
164-
"downloadAccountData": "To download all the data being used by the Appointment service, click here:",
165163
"eventWasCreated": "Event created in your calendar.",
166164
"invitationGenerated": "The invite codes were generated successfully.",
167165
"invitationWasSent": "An invitation was sent to your email.",
@@ -173,8 +171,8 @@
173171
"slotIsAvailableAgain": "Time slot now available for bookings."
174172
},
175173
"label": {
176-
"12hAmPm": "12-hour AM/PM",
177-
"24h": "24-hour",
174+
"12hAmPm": "12:00 AM/PM (12-hour)",
175+
"24h": "24:00 (24-hour)",
178176
"DDMMYYYY": "DD/MM/YYYY",
179177
"MMDDYYYY": "MM/DD/YYYY",
180178
"accepted": "Accepted",
@@ -229,8 +227,7 @@
229227
"bookingDetails": "Booking Details",
230228
"bookingLink": "Booking Link",
231229
"bookingSlot": "Booking slot",
232-
"bookingPageURL": "Booking Page URL",
233-
"bookingPageSettings": "Booking Page Settings",
230+
"bookingPageLinkLabel": "Booking Page Link",
234231
"bookings": "Bookings",
235232
"bookingPageLink": "Your Booking Page Link",
236233
"bookingPageDetails": "Booking Page Details",
@@ -245,7 +242,6 @@
245242
"cancelled": "Cancelled",
246243
"cancelBooking": "Cancel booking",
247244
"cancelReason": "Reason for cancelling",
248-
"cancelService": "Cancel Service",
249245
"changeMyAvailability": "Change my availability",
250246
"changesNotSaved": "Changes have not been saved",
251247
"checkAvailableSlots": "Check available slots",
@@ -263,7 +259,7 @@
263259
"connecting": "Connecting",
264260
"connectCalendar": "Connect calendar",
265261
"connectGoogleCalendar": "Connect Google Calendar",
266-
"connectedAs": "Connected as {name}",
262+
"connectedAs": "Connected as",
267263
"contact": "Contact",
268264
"continue": "Continue",
269265
"contributeToThisSite": "Contribute to this site",
@@ -291,6 +287,8 @@
291287
"defaultTimeZone": "Default Time Zone",
292288
"delete": "Delete",
293289
"deleteBooking": "Delete booking",
290+
"deleteAllAppointmentData": "Delete all Appointment data",
291+
"deleteAllAppointmentDataInfo": "Your TB Pro subscription will not be affected.",
294292
"deny": "Deny",
295293
"denyBooking": "Deny booking",
296294
"disable": "Disable",
@@ -302,7 +300,7 @@
302300
"downloadICS": "Download ICS",
303301
"downloadInvitation": "Download invitation",
304302
"downloadTheIcsFile": "Add to your calendar",
305-
"downloadMyData": "Download My Data",
303+
"downloadMyData": "Download all your data from Appointment",
306304
"earlier": "Earlier",
307305
"earliestBooking": "Earliest Booking",
308306
"edit": "Edit",
@@ -349,6 +347,7 @@
349347
"logIn": "Log in",
350348
"logOut": "Log out",
351349
"loginToContinue": "Log in to continue",
350+
"manageBookingLink": "Manage booking link",
352351
"meetingDuration": "Meeting duration",
353352
"meetingTitle": "Meeting title",
354353
"meetingDate": "Meeting date",
@@ -439,7 +438,7 @@
439438
"sortBy": "Sort by",
440439
"start": "Start",
441440
"startDate": "Start date",
442-
"startOfWeek": "Start of Week",
441+
"startOfWeek": "Start of the Week",
443442
"startTime": "Start time",
444443
"startUsingTba": "Try Appointment",
445444
"status": "Status",
@@ -543,7 +542,6 @@
543542
"zoomCom": "zoom.com…"
544543
},
545544
"text": {
546-
"accountCancelWarning": "You will no longer have access to TB Appointment. All booking calendars will be set to \"Inactive\" and all upcoming bookings will be cancelled.\nOther appointment data will be retained for 30 days, in accordance with the TB Pro Privacy Policy.",
547545
"admin": {
548546
"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.",
549547
"disableAccountFirst": "You must disable the account first."
@@ -553,6 +551,7 @@
553551
"chooseDateAndTime": "Choose when to meet.",
554552
"connectZoom": "Connect your Zoom account to generate instant meeting invites for each booking.",
555553
"contactRequestForm": "Please use the contact form below to send any feedback, questions, or concerns to our support team. If needed we will try and contact you for further information as soon as possible.",
554+
"deleteAppointmentDataWarning": "You will no longer have access to TB Appointment. All booking calendars will be set to \"Inactive\" and all upcoming bookings will be cancelled.\nOther appointment data will be retained for 30 days, in accordance with the TB Pro Privacy Policy.",
556555
"defineDaysAndTimeSlots": "Choose the days and time this event can be booked.",
557556
"denialSentToAddress": "We've let the booker ({address}) know you can't make this event.",
558557
"disclaimerGABooking": "Your booking will be confirmed by the calendar owner.",

frontend/src/views/AvailabilityView/index.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,11 @@ export default {
234234
<style scoped>
235235
@import '@/assets/styles/custom-media.pcss';
236236
237+
:deep(.base.link.filled) {
238+
font-size: 0.75rem;
239+
color: var(--colour-ti-secondary);
240+
}
241+
237242
.page-title {
238243
margin-block-end: 2rem;
239244
font-family: metropolis;

0 commit comments

Comments
 (0)