Skip to content

Commit 951873e

Browse files
cassidoocassidoo
committed
Add optional location field to events
1 parent c9d64ca commit 951873e

19 files changed

+732
-422
lines changed

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ type: 'meetup'
3535
userName: 'github'
3636
userLink: 'https://www.meetup.com/GitHub-Africa/'
3737
linkUrl: 'https://www.meetup.com/GitHub-Africa/'
38+
location: 'Virtual'
3839
---
3940
4041
Join GitHub users across Africa to talk about open source project maintainership!
@@ -54,6 +55,7 @@ All fields included in the _frontmatter_ are mandatory:
5455
- `userName`: user name or organization organizing the event.
5556
- `userLink`: link to user or organization profile.
5657
- `linkUrl`: Button link with external link to the event.
58+
- `location`: event location, either `Virtual` or `In-person` or the location itself.
5759

5860
After these fields, on the line following `---`, you can add the event description, in markdown format.
5961

‎components/chip/Chip.jsx‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
import clsx from 'clsx'
22

33
const Chip = ({ label, icon, customColor }) => {
4-
const classes = clsx('chip', { 'custom-color': customColor })
4+
const classes = clsx('chip', {
5+
'custom-color': customColor,
6+
})
57

68
return (
7-
<div className={classes} style={{ backgroundColor: customColor }}>
9+
<div
10+
className={classes}
11+
data-location={label.toLowerCase().includes('virtual') ? true : undefined}
12+
style={{ backgroundColor: customColor }}
13+
>
814
{icon ? <span className="chip__icon">{icon}</span> : null}
915
<span className="chip__label">{label}</span>
1016
</div>

‎components/chip/chip.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
border-radius: 27px;
1313
cursor: default;
1414

15+
&[data-location] {
16+
background-color: #2b5797;
17+
color: white;
18+
}
19+
1520
&__icon {
1621
height: 18px;
1722
width: 18px;

‎components/event-detail/EventDetail.jsx‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const EventDetail = ({ event, reverseColumns, isFullPage }) => {
3333
<div className="event-detail__column">
3434
<Chip label={event.formattedDate.date} />
3535
<EventTypeChip type={event.type} />
36+
{event.location && <Chip label={event.location} />}
3637
</div>
3738
<DateTimeChip
3839
date={event.formattedDate.date}
@@ -52,7 +53,10 @@ const EventDetail = ({ event, reverseColumns, isFullPage }) => {
5253
{isFullPage ? (
5354
<h1 className="event-detail__title">{event.title}</h1>
5455
) : (
55-
<Link href={{ pathname: event.link }} className="event-detail__title">
56+
<Link
57+
href={{ pathname: event.link }}
58+
className="event-detail__title"
59+
>
5660
{event.title}
5761
</Link>
5862
)}

‎components/events-list/EventsList.jsx‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,7 @@ const EventsList = ({ events }) => {
3030
<div className="events-list__event">
3131
<div className="events-list__chips">
3232
<EventTypeChip type={event.type} />
33-
<Link
34-
href={{ pathname: event.link }}
35-
aria-label={getLiteral('navigation:schedule')}
36-
className="events-list__more"
37-
>
38-
{getLiteral('actions:view-more')}
39-
</Link>
33+
{event.location && <Chip label={event.location} />}
4034
</div>
4135
<DateTimeChip
4236
startTime={event.formattedDate.startTime}
@@ -53,7 +47,10 @@ const EventsList = ({ events }) => {
5347
{event.userName}
5448
</a>
5549

56-
<Link href={{ pathname: event.link }} className="events-list__link">
50+
<Link
51+
href={{ pathname: event.link }}
52+
className="events-list__link"
53+
>
5754
{event.title}
5855
</Link>
5956
</div>
@@ -71,9 +68,11 @@ const EventsList = ({ events }) => {
7168
</div>
7269
</div>
7370
))}
74-
< br />
71+
<br />
7572
<div>
76-
<ButtonLink href="https://github.com/github/maintainermonth/issues/new?assignees=&labels=&template=add-to-calendar.yml&title=EVENT_NAME">Add your own activity</ButtonLink>
73+
<ButtonLink href="https://github.com/github/maintainermonth/issues/new?assignees=&labels=&template=add-to-calendar.yml&title=EVENT_NAME">
74+
Add your own activity
75+
</ButtonLink>
7776
</div>
7877
</section>
7978
)

‎components/events-list/events-list.scss‎

Lines changed: 29 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -67,27 +67,37 @@
6767

6868
&__chips {
6969
display: flex;
70-
justify-content: space-between;
71-
width: 100%;
70+
flex-wrap: wrap;
71+
gap: spacing(1);
72+
margin-bottom: spacing(1);
73+
74+
> * {
75+
margin-right: spacing(1);
76+
77+
&:last-child {
78+
margin-left: auto;
79+
margin-right: 0;
80+
}
81+
}
7282
}
7383

7484
&__more {
75-
padding: spacing(1) spacing(2);
76-
77-
display: flex;
78-
align-items: center;
79-
80-
@extend %subtitle-1;
81-
82-
@extend %background-filter-white;
83-
border-radius: 155px;
84-
85-
transition: background $simple-fade, color $simple-fade;
86-
87-
&:hover {
88-
background: $white;
89-
color: $purple;
90-
}
85+
padding: spacing(1) spacing(2);
86+
87+
display: flex;
88+
align-items: center;
89+
90+
@extend %subtitle-1;
91+
92+
@extend %background-filter-white;
93+
border-radius: 155px;
94+
95+
transition: background $simple-fade, color $simple-fade;
96+
97+
&:hover {
98+
background: $white;
99+
color: $purple;
100+
}
91101
}
92102

93103
&__user {
@@ -115,7 +125,7 @@
115125

116126
&__text {
117127
flex: 1;
118-
128+
119129
@extend %body-1;
120130
color: $white-80;
121131

‎content/2023/events/green-software-foundation-meetup.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
---
2-
title: "Ottawa Green Software Foundation Meetup - Hybrid Event"
3-
metaTitle: "Ottawa Green Software Foundation Meetup - Hybrid Event"
2+
title: 'Ottawa Green Software Foundation Meetup - Hybrid Event'
3+
metaTitle: 'Ottawa Green Software Foundation Meetup - Hybrid Event'
44
metaDesc: "This is the first Green Software Foundation meetup in Ottawa. We'll have insightful talks on the Principles of Sustainable Green Software as well as Sustainable DevOps. You'll also learn about how you can help the Green Software Foundation maintain projects and patterns which will help reduce the carbon impact of software. Don't miss out on this opportunity to learn, connect, and engage; mark your calendars and prepare for an exciting morning of discussions, and connections!"
55
date: '05/24'
66
UTCStartTime: '13:00'
77
UTCEndTime: '14:30'
88
type: 'meetup'
9+
location: 'Hybrid - Microsoft Ottawa Office & Virtual'
910
userName: 'Green Software Foundation'
1011
userLink: 'https://greensoftware.foundation'
1112
linkUrl: 'https://www.meetup.com/gsf-canada/events/293112123'
@@ -23,4 +24,4 @@ The Principles of Sustainable Green Software Engineering are a core set of compe
2324
10:00am EDT Sustainable DevOps - Tajinder Singh, Solutions Engineer, Github
2425
Organizations are talking about Green Software, Green Cloud but what about DevOps? Green And Sustainable DevOps is as important as software and the cloud. Learn more about best practices and how to use GitHub And Azure to run Sustainable DevOps Pipelines.
2526

26-
10:30am EDT - Close and networking
27+
10:30am EDT - Close and networking

‎content/events/20205-05-07-PyTorch.md‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎content/events/2025-05-01-OpenSearch.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ type: 'conference'
99
userName: 'The Linux Foundation'
1010
userLink: 'https://events.linuxfoundation.org/opensearchcon-europe/'
1111
linkUrl: 'https://events.linuxfoundation.org/opensearchcon-europe/'
12+
location: 'Amsterdam'
1213
---
1314

1415
OpenSearchCon (April 30-May 1 in Amsterdam) brings the OpenSearch community together to learn, connect, and collaborate. Users, administrators, and developers attend to explore solutions to real-world problems, network with peers, and explore the future of search, observability, and security applications.

‎content/events/2025-05-01-Welcome.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ type: 'podcast'
99
userName: 'karasowles'
1010
userLink: 'https://maintainermonth.github.com'
1111
linkUrl: 'https://maintainermonth.github.com'
12+
location: 'Virtual'
1213
---
1314

1415
Welcome to Maintainer Month! As it kicks off on May 1st, consider posting about an open source project you enjoy, a maintainer you want to thank, or resources for software maintenance.

0 commit comments

Comments
 (0)