Skip to content

Doe events#66

Closed
hadiafifah wants to merge 8 commits intomainfrom
doe-events
Closed

Doe events#66
hadiafifah wants to merge 8 commits intomainfrom
doe-events

Conversation

@hadiafifah
Copy link
Copy Markdown
Contributor

Not sure if feat/doe was supposed to be my pr/branch, but these are the doe website event components that I was asked to do last week. I have them implemented as components that are currently being rendered from page.tsx so I could see it easily, but they probably need to be moved somewhere else for the DOE version of the website (pls lemme know what i need to change)

Also, I took liberty in changing "Upcoming events" to "Upcoming Timeline" simply because from the design there were two upcoming events titles right next to each other that were referring to two different things. From my understanding, Emerson wanted the second one to be general hackathon events like Check-In, and Judging, so I renamed it to Upcoming Timeline so that's clearer.

He also had descriptions for each of these events, which I left blank for now because we do not have descriptions for any of the events. I wouldn't mind generating descriptions for each of the general events, but I don't know if we wanna do that or not.

@hadiafifah
Copy link
Copy Markdown
Contributor Author

Sorry I just realized how large this PR is but I swear its because of all the assets I added in from Figma + the hardcoded events json I added to the repo!!

Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adds new homepage components to surface DOE event information (a “Happening now / Upcoming Events” schedule preview and an “Upcoming Timeline” list) driven by a staging events JSON dataset, along with supporting artwork/assets.

Changes:

  • Add ScheduleSneakPeek and UpcomingTimeline client components and render them on the index page.
  • Introduce shared event typing (@data/event) and a staging events dataset (hub-2026-staging.events.json) consumed by the new components.
  • Add new SVG assets for schedule/upcoming sections and bump framer-motion patch version.

Reviewed changes

Copilot reviewed 9 out of 29 changed files in this pull request and generated 6 comments.

Show a summary per file
File Description
public/schedule/vocal_angel_cow.svg New schedule artwork asset.
public/schedule/sleeping_cow.svg New schedule artwork asset.
public/schedule/plus.svg New schedule UI icon asset.
public/schedule/location.svg New schedule UI icon asset.
public/schedule/header_grass.svg New schedule header background asset.
public/schedule/duck+frog.svg New schedule empty-state artwork asset.
public/schedule/duck+bunny.svg New schedule empty-state artwork asset.
public/schedule/cucumber_cow.svg New schedule artwork asset.
public/schedule/check.svg New schedule UI icon asset.
public/schedule/attendee.svg New schedule UI icon asset.
public/schedule/arrow-right.svg New schedule UI icon asset.
public/Images/upcoming/yellow_star.svg New upcoming timeline artwork asset.
public/Images/upcoming/scissors.svg New upcoming timeline artwork asset.
public/Images/upcoming/mochinut.svg New upcoming timeline artwork asset.
public/Images/upcoming/green_flower.svg New upcoming timeline artwork asset.
public/Images/upcoming/froggie.svg New upcoming timeline artwork asset.
public/Images/upcoming/ditto.svg New upcoming timeline artwork asset.
public/Images/upcoming/cow.svg New upcoming timeline artwork asset.
public/Images/upcoming/bunny.svg New upcoming timeline artwork asset.
package.json Bump framer-motion version and reorder a few dependencies/devDependencies entries.
package-lock.json Lockfile updates for framer-motion/motion-* dependency bump.
app/(pages)/(index-page)/page.tsx Render the new schedule preview and upcoming timeline components on the homepage.
app/(pages)/(index-page)/_components/UpcomingTimeline/UpcomingTimeline.tsx New “Upcoming Timeline” component driven by GENERAL events.
app/(pages)/(index-page)/_components/ScheduleSneakPeak/scheduleTime.ts New schedule time formatting/live detection/countdown helpers.
app/(pages)/(index-page)/_components/ScheduleSneakPeak/ScheduleSneakPeek.tsx New “Happening now / Upcoming Events” schedule preview component.
app/(pages)/(index-page)/_components/ScheduleSneakPeak/scheduleEventStyles.ts New event-type → style mapping for schedule cards.
app/(pages)/(index-page)/_components/ScheduleSneakPeak/CalendarItem.tsx New schedule event card renderer used by the preview component.
app/(pages)/_data/hub-2026-staging.events.json New staging events dataset consumed by the new components.
app/(pages)/_data/event.ts New shared Event/EventType/EventTag definitions.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@michelleyeoh
Copy link
Copy Markdown
Contributor

Merging this branch into feat/DOE

@michelleyeoh michelleyeoh deleted the doe-events branch April 9, 2026 01:42
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.

3 participants