Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restructure calendar components and fix remote tentative event styles #437

Merged
merged 5 commits into from
May 29, 2024

Conversation

devmount
Copy link
Collaborator

Description of the Change

The change disassembles the CalendarEvent.vue component into 4 components of different event states:

  1. Placeholder events (used at the booking page / availability link)
  2. Remote events (retrieved from remote Google or CalDAV calendars)
  3. Preview events (generated on the fly when configuring availability)
  4. Scheduled events (appointments waiting for attendees/confirmation).

Moreover a couple of components from the former calendar implementation were removed (CalendarDay.vue and CalendarWeek.vue). The CalendarMonth.vue component was renamed and reduced to a mini month component.

Moreover remote tentative events are now styled with transparent background and calendar colored border and text.

Benefits

This heavily enhances readability and makes styles on different event types changeable again.

image

Tentative remote events now look like this again in week/day view:

image

Applicable Issues

Closes #324

@devmount devmount self-assigned this May 29, 2024
@devmount devmount requested a review from MelissaAutumn May 29, 2024 16:36
Copy link
Member

@MelissaAutumn MelissaAutumn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Otherwise looks good, I meant to do this when we switched to Qalendar but I didn't have time to get around to it. So thank you so much!

}"
:style="{
borderColor: !isMonthView ? eventColor(event, false).border : null,
backgroundColor: isMonthView || (!isMonthView && event.tentative) ? 'transparent' : event.calendar_color,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bg-amber-400/80 is being overwritten by transparent, and I think this is the cause. Can you confirm? Thanks!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean for all day events? In which calendar mode?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep sorry, all day events on the main calendar page for me!

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes I see, fixed it

@devmount devmount merged commit 41ca26a into main May 29, 2024
4 checks passed
@devmount devmount deleted the bugs/324-restructure-calendar-components branch May 29, 2024 21:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

regression: Distinguish Tentative/Optional Meetings from Accepted
2 participants