Skip to content

Update F26 timeline json, edit jsx to allow zoom link to be added to event description. #113

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.

Sign up for GitHub

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

Merged
Russell-Day merged 1 commit into from
Aug 31, 2026
Merged

Update F26 timeline json, edit jsx to allow zoom link to be added to event description. #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions components/timeline.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ export default function Timeline({ events }) {
{event.time}
</time>
<h3 className="text-lg font-semibold text-white snap-center">
{event.title}{" "}
{event.external && (
<Link
href={event.external.link}
className="font-bold underline"
>
{event.external.name}
</Link>
)}
{event.title}
</h3>
<p className="mb-4 text-base font-normal text-white">
{event.description}
{event.external && (
<>
{" "}
<Link
href={event.external.link} target="_blank" rel="noopener noreferrer" className="font-bold underline"
>
{event.external.name}
</Link>
</>
)}
</p>
</li>
))}
Expand Down
20 changes: 12 additions & 8 deletions config/timeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,28 +9,32 @@
},
{
"title": "Mass Meeting #1",
"time": "September 4th (Friday) - Time TBD",
"description": "Join us to learn more about MDST and how to become a member. Location TBD."
"time": "September 4th (Friday) 6-7 PM",
"description": "Join us virtually to learn more about MDST and how to become a member.",
"external": {
"name": "Meeting Link.",
"link": "https://umich.zoom.us/j/93165627866"
}
},
{
"title": "Mass Meeting #2",
"time": "September 8th (Tuesday) - Time TBD",
"description": "Join us to learn more about MDST and how to become a member. Location TBD."
"time": "September 9th (Wednesday) 8:15-9:15 PM",
"description": "Join us in CCCB 3420 to learn more about MDST and how to become a member."
},
{
"title": "Office Hours #1",
"time": "September 9th (Wednesday) 6-8 PM",
"description": "Drop by to ask questions, get help with tutorials, or chat with current members. Location TBD."
"time": "September 10th (Thursday) 6-8 PM",
"description": "Drop by 3353 Mason Hall to ask questions, get help with tutorials, or chat with current members."
},
{
"title": "Project Fair",
"time": "September 13th (Sunday) 12-3 PM",
"description": "Meet project leads, explore this semester's projects, and find the right team for you. Location TBD."
"description": "Meet project leads, explore this semester's projects, and find the right team for you in CCCB 3420."
},
{
"title": "Final Office Hours",
"time": "September 20th (Sunday) 11 AM-1 PM",
"description": "Stop by for last-minute tutorial help or any questions before the deadline. Location TBD."
"description": "Stop by 3330 Mason Hall for last-minute tutorial help or any questions before the deadline."
},
{
"title": "Tutorials and Project Matching Form Due",
Expand Down
Loading