Skip to content

Commit 864946d

Browse files
authored
Merge branch 'develop' into #1885-jayjung-credits
2 parents 1cb03e6 + 8fc429c commit 864946d

1 file changed

Lines changed: 19 additions & 1 deletion

File tree

src/frontend/src/pages/CreditsPage/CreditsPage.tsx

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ const CreditsPage: React.FC = () => {
9090
{ name: 'Jake Wu-Chen', color: '#bdc0c7' },
9191
{ name: 'William Seward', color: '#e53774' },
9292
{ name: 'Quinn Louie', color: '#3281a8' },
93+
{ name: 'Pierre Dang', color: '#31875a' },
9394
{ name: 'Liu von Engelbrechten', color: '#2969f2' },
9495
{
9596
name: 'Zach Norman',
@@ -123,6 +124,18 @@ const CreditsPage: React.FC = () => {
123124
{ name: 'Aarav Shyamkumar', color: '#FF0000' },
124125
{ name: 'Raghav Mathur', color: '#009933' },
125126
{ name: 'Anika Sharma', color: '#ff0000' },
127+
{
128+
name: 'Samson Ajayi',
129+
color: '6a0dad',
130+
sx: {
131+
background: 'linear-gradient(90deg, rgba(245,0,0,1) 0%, rgba(255,0,243,1) 50%, rgba(164,0,255,1) 100%);',
132+
px: 1.5,
133+
borderRadius: 2.5,
134+
textShadow: '0 0 2px rgba(0,0,0), 0 0 20px rgba(220,220,220,1)'
135+
}
136+
},
137+
{ name: 'Christian Bacalhau', color: '#6a0dad' },
138+
{ name: 'Gurshan Sidhu', color: '#487c90' },
126139
{ name: 'William (Jack) Turner', color: '#ff5733' },
127140
{
128141
name: 'Dao Ho',
@@ -161,6 +174,7 @@ const CreditsPage: React.FC = () => {
161174
{ name: 'Lauren Phan', color: '#F3A7C0' },
162175
{ name: 'Vidyuth Ramkumar', color: '#800000' },
163176
{ name: 'Jake Hensley', color: '#FFA500' },
177+
{ name: 'Jesse Garcia', color: '#3BB143' },
164178
{ name: 'Emma Shum', color: '#d4878f' },
165179
{ name: 'Matthew Egg', color: '#7E1B2F' },
166180
{
@@ -170,6 +184,7 @@ const CreditsPage: React.FC = () => {
170184
textShadow: '0 0 2px rgba(0,0,0), 0 0 20px rgba(220,220,220,1)'
171185
}
172186
},
187+
{ name: 'Jaden Zhou', color: '#34568B' },
173188
{ name: 'Alexander Kylander-Kreiner', color: '#82EEFD' },
174189
{ name: 'Vincent Demaisip', color: '#ebb135' },
175190
{ name: 'Daniel Ma', color: '#ffb4e8' },
@@ -186,10 +201,13 @@ const CreditsPage: React.FC = () => {
186201
{ name: 'Alan Eng', color: '#0B66E4' },
187202
{ name: 'Alexander Schinkmann-Bonias', color: '#d3d3d3' },
188203
{ name: 'Aditya Boddepalli', color: '#00FFFF' },
204+
{ name: 'Sarah Zhang', color: '#CCC8FF' },
189205
{ name: 'Rup Jaisinghani', color: '#065535' },
190206
{ name: 'Jack Dreifus', color: '#014421' },
191207
{ name: 'Vinay Pillai', color: '#42458e' },
192-
{ name: 'Jay Jung', color: '##344739' }
208+
{ name: 'Jay Jung', color: '##344739' },
209+
{ name: 'Will Anderson', color: '#ebb145' },
210+
{ name: 'Chris Pyle', color: '#ADD8E6' }
193211
];
194212

195213
const snark = ['Add your name!', "Shouldn't you do it yourself?", 'Seriously', 'go', 'do', 'it'];

0 commit comments

Comments
 (0)