www
/
www-new
12
3
Fork 5
Code Issues 58 Pull Requests 42 Projects Releases Wiki Activity

Add endDate to events #446

Merged
snedadah merged 23 commits from events-end-time into main 2022-05-25 20:58:14 -04:00
Conversation 0 Commits 23 Files Changed 548 +659 -575
snedadah commented 2022-05-21 01:45:53 -04:00
Owner
Copy Link
  • Added an endDate to events.
  • Renamed date to startDate, and updated in all past events.
  • Updated calander generation script.
  • Updated event display system to use endDate to display "upcoming" and "past" events.

Closes #406 and Closes #424

Usage:
Add an (optional) "endDate" property to an event's markdown file in order to add an end date to that event.

Staging:
https://csclub.uwaterloo.ca/~a3thakra/csc/events-end-time/

Older discussion happend in:
#434

Note: I have temporarily reverted the commits that change the older events to allow for code review. A few wierd artifcats are present from that in some of the event .md files, please ignore those, after unreverting before merging those will all be sorted out.

- Added an endDate to events. - Renamed date to startDate, and updated in all past events. - Updated calander generation script. - Updated event display system to use endDate to display "upcoming" and "past" events. Closes #406 and Closes #424 Usage: Add an (optional) "endDate" property to an event's markdown file in order to add an end date to that event. Staging: https://csclub.uwaterloo.ca/~a3thakra/csc/events-end-time/ Older discussion happend in: #434 Note: I have temporarily reverted the commits that change the older events to allow for code review. A few wierd artifcats are present from that in some of the event .md files, please ignore those, after unreverting before merging those will all be sorted out.
snedadah added 14 commits 2022-05-21 01:45:55 -04:00
f63106bc36
Revert "Renamed date to startDate" 
This reverts commit 5dc1ae00510efa643c8edea843b2e31345dcae63.
continuous-integration/drone/push Build is passing Details
8e38007573
Renamed date to startDate in new events
snedadah added 2 commits 2022-05-21 02:00:26 -04:00
continuous-integration/drone/push Build is passing Details
1cf4b4ed5e
use endDate for upcoming and past event system
snedadah changed title from Added end time to events. to Add endDate to events 2022-05-21 02:01:37 -04:00
snedadah added 1 commit 2022-05-21 03:03:01 -04:00
snedadah added 1 commit 2022-05-21 03:05:14 -04:00
continuous-integration/drone/push Build was killed Details
c196288b70
Revert "Renamed date to startDate in new events" for review purposes 
This reverts commit 8e38007573.
a258wang reviewed 2022-05-22 13:12:08 -04:00
components/EventDescriptionCard.tsx Outdated
@ -38,3 +39,4 @@
online,
registerLink,
permaLink,
endDate,
a258wang commented 2022-05-22 13:12:08 -04:00
Owner
Copy Link

NIT: For readability purposes, it'd be nice to have endDate next to startDate - this would also match the order used in the Props interface and in other files. 🙂

NIT: For readability purposes, it'd be nice to have `endDate` next to `startDate` - this would also match the order used in the Props interface and in other files. 🙂
snedadah marked this conversation as resolved
a258wang reviewed 2022-05-22 13:14:45 -04:00
components/MiniEventCard.tsx Outdated
@ -27,3 +28,4 @@
year,
term,
slug,
endDate,
a258wang commented 2022-05-22 13:14:45 -04:00
Owner
Copy Link

NIT: same as above

NIT: same as above
snedadah marked this conversation as resolved
a258wang reviewed 2022-05-22 13:16:45 -04:00
content/events/2021/fall/BOT.md Outdated
@ -15,3 +15,3 @@
Registration is not required to attend! We’ll just be sending you an email reminder, as well as inviting you to our calendar event.
📅 Event Date: Tuesday, September 14th from 7:00-8:30 pm ET via [Twitch](https://www.twitch.tv/uwcsclub) and [Discord](https://discord.gg/pHfYBCg)
📅 Event startDate: Tuesday, September 14th from 7:00-8:30 pm ET via [Twitch](https://www.twitch.tv/uwcsclub) and [Discord](https://discord.gg/pHfYBCg)
a258wang commented 2022-05-22 13:16:45 -04:00
Owner
Copy Link

Just want to confirm that this and other similar occurrences will be fixed once we unrevert?

Just want to confirm that this and other similar occurrences will be fixed once we unrevert?
snedadah commented 2022-05-22 20:33:34 -04:00
Author
Owner
Copy Link

Yep it will be fixed after the revert, this commit was to fix the slight oversight on my part... I think I reverted in the wrong order which is why its a bit wierd now.

Yep it will be fixed after the revert, this commit was to fix the slight oversight on my part... I think I reverted in the wrong order which is why its a bit wierd now.
👍 1
snedadah marked this conversation as resolved
a258wang reviewed 2022-05-22 13:23:45 -04:00
scripts/change-dates.ts
@ -7,1 +7,4 @@
/*
Note:
This script will not work for events by default anymore, since events now have startDate instead of endDate
a258wang commented 2022-05-22 13:23:45 -04:00
Owner
Copy Link

Do we think it's worth updating the script to reflect the newly named startDate/endDate fields?

It looks to me like this was a one-time use script, so it shouldn't be a big deal, but it also probably wouldn't be very difficult to update the script so it still works in case we ever need to use it again.

Do we think it's worth updating the script to reflect the newly named `startDate`/`endDate` fields? It looks to me like this was a one-time use script, so it shouldn't be a big deal, but it also probably wouldn't be very difficult to update the script so it still works in case we ever need to use it again.
snedadah commented 2022-05-22 20:28:54 -04:00
Author
Owner
Copy Link

The reason I did not fix it is that the news system is still using the old start date, so this script works for that. So whoever ends up using it in the future should fix it if they need to work with events, but not news.

The reason I did not fix it is that the news system is still using the old start date, so this script works for that. So whoever ends up using it in the future should fix it if they need to work with events, but not news.
👍 1
snedadah marked this conversation as resolved
a258wang approved these changes 2022-05-22 13:28:59 -04:00
a258wang left a comment
Owner
Copy Link

Left a couple of comments, but otherwise LGTM! When unreverting, just double check to make sure that

  • staging works as expected
  • test events have been removed
  • event descriptions say "Event Date" instead of "Event startDate" 😛

and then this should be good to merge! 🚢

Left a couple of comments, but otherwise LGTM! When unreverting, just double check to make sure that - staging works as expected - test events have been removed - event descriptions say "Event Date" instead of "Event startDate" 😛 and then this should be good to merge! 🚢
snedadah added 1 commit 2022-05-25 20:18:19 -04:00
continuous-integration/drone/push Build is failing Details
2d0858f22e
Reordered endDate
snedadah added 4 commits 2022-05-25 20:31:37 -04:00
continuous-integration/drone/push Build is passing Details
45e4dd2cfe
Updated bondfire to new event format
snedadah merged commit f12ffbb925 into main 2022-05-25 20:58:14 -04:00
Sign in to join this conversation.
Reviewers
No reviewers
a258wang
Labels
Clear labels   
a11y

   
Backlog

   
Blocked

   
Bug

   
Content

   
Dependencies

   
Design

   
Feature Request

   
Good First Issue

   
In Progress

   
Performance

   
Priority - High

   
Priority - Low

   
Priority - Medium

   
Untriaged
No Label
a11y
Backlog
Blocked
Bug
Content
Dependencies
Design
Feature Request
Good First Issue
In Progress
Performance
Priority - High
Priority - Low
Priority - Medium
Untriaged
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: www/www-new#446
No description provided.
Delete Branch "events-end-time"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?