[INT-93] Different colours for event types #189
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
archessmn
changed the title
archessmn
reviewed
Oct 24, 2024
| @@ -381,7 +389,7 @@ export default function YSTVCalendar() { | |||
| ); | |||
| } | |||
|
|
|||
| type EventType = "show" | "meeting" | "social" | "other"; | |||
| //type EventType = "show" | "meeting" | "social" | "other"; | |||
There was a problem hiding this comment.
Can we remove this if it isn't used?
| @@ -52,7 +52,7 @@ export default async function NewEventPage() { | |||
| ); | |||
| if (permittedEventTypes.length === 0) { | |||
| throw new Forbidden([ | |||
| "Calendar.Admin or Calendar.{Show,Meeting,Social}.{Creator,Admin}" as any, | |||
| "Calendar.Admin or Calendar.{Show,Meeting,Social,Workshop}.{Creator,Admin}" as any, | |||
There was a problem hiding this comment.
Suggested change
| "Calendar.Admin or Calendar.{Show,Meeting,Social,Workshop}.{Creator,Admin}" as any, | |
| "Calendar.Admin or Calendar.{Show,Meeting,Workshop,Social}.{Creator,Admin}" as any, |
Very much a nitpick but just to have these in the same order as elsewhere 😂
features/calendar/permissions.ts
Outdated
| @@ -30,6 +37,9 @@ export function adminEventTypes(userPermissions: Permission[]): EventType[] { | |||
| if (userPermissions.includes("Calendar.Public.Admin")) { | |||
| permittedEventTypes.push("public"); | |||
| } | |||
| if (userPermissions.includes("Calendar.Workshop.Admin")) { | |||
There was a problem hiding this comment.
Nitpick again, reorder this to the same order as EventTypes
features/calendar/permissions.ts
Outdated
| @@ -54,6 +64,9 @@ export function creatableEventTypes( | |||
| if (userPermissions.includes("Calendar.Public.Creator")) { | |||
| base.push("public"); | |||
| } | |||
| if (userPermissions.includes("Calendar.Workshop.Creator")) { | |||
archessmn
approved these changes
Oct 24, 2024
|
Attempted to deploy a preview of this PR, but ran into an error. See the Jenkins output for details. |
archessmn
deleted the
int-93-can-we-have-different-colours-for-different-event-types
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Added new workshop type and permissions for it.
Added new component for colour types key on the calendar page.
Added workshop to event type selector when creating new event.
Testing: