Skip to content

Commit dd2cf6e

Browse files
authored
Merge pull request #1471 from phthallo/congressional-app-challenge
update congressional app challenge
2 parents be775fd + 6068b81 commit dd2cf6e

File tree

5 files changed

+107
-23
lines changed

5 files changed

+107
-23
lines changed

components/congressional-app-challenge/screen.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const Screen = ({
1010
}) => {
1111
let color = backgroundImage ? '' : '#fff'
1212
let expan = expand2
13-
? ['100%', null, null, '68vh']
13+
? ['100%', null, null, '58vh']
1414
: expand
1515
? ['100%', null, null, '58vh']
1616
: '58vh' // jank
@@ -83,7 +83,7 @@ const Screen = ({
8383
padding: 3,
8484
height: expan,
8585
backgroundImage: `url(${backgroundImage})`,
86-
backgroundSize: 'cover'
86+
backgroundSize: 'cover',
8787
}}
8888
>
8989
{children}

components/congressional-app-challenge/userProfile.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Box, Image, Text } from 'theme-ui'
22

3+
34
export default function UserProfile({
45
image,
56
name,

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -107,5 +107,6 @@
107107
"eslint": "8.57.0",
108108
"eslint-config-next": "14.1.0",
109109
"prettier": "^3.2.5"
110-
}
110+
},
111+
"packageManager": "[email protected]+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
111112
}

pages/congressional-app-challenge.js

+99-20
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@ import Polaroid from '../components/congressional-app-challenge/polaroid'
1212
import UserProfile from '../components/congressional-app-challenge/userProfile'
1313
import ForceTheme from '../components/force-theme'
1414
import Carousel from '../components/index/carousel'
15-
import { TypeAnimation } from 'react-type-animation'
1615
import Photo from '../components/photo'
16+
import { TypeAnimation } from 'react-type-animation'
17+
1718

1819
const styled = `
1920
@import url("https://fonts.googleapis.com/css2?family=Gaegu&display=swap");
@@ -122,7 +123,7 @@ function Page({ carouselCards }) {
122123
title="Hack Club - Congressional App Challenge"
123124
backgroundImage="https://cloud-qqz8uj8y5-hack-club-bot.vercel.app/027544281748_b641f43479_o-1.jpg"
124125
sxProps={{
125-
height: ['40vh', null, null, '100%'],
126+
height: ['20vh', null, null, '100%'],
126127
position: 'relative'
127128
}}
128129
>
@@ -234,6 +235,15 @@ function Page({ carouselCards }) {
234235
</Box>
235236
</Box>
236237
</Box>
238+
<Box sx= {{width: "100vw", display: "flex", justifyContent: "center", alignItems: "center"}}>
239+
<a href = "#start">
240+
<Image
241+
src="/congressional-app-challenge/chevron.svg"
242+
alt="A chevron"
243+
sx={{ height: 40, marginTop: 60}}
244+
/>
245+
</a>
246+
</Box>
237247
</Box>
238248

239249
<Box
@@ -255,13 +265,14 @@ function Page({ carouselCards }) {
255265
<Heading
256266
as="h1"
257267
variant="title"
268+
id="start"
258269
sx={{
259270
paddingY: 3,
260271
textAlign: 'left',
261272
textShadow: '2px 2px #413cf2, 4px 4px #facb2d, 6px 6px #e15ba6'
262273
}}
263274
>
264-
What will you create this year?
275+
A nonprofit by and for teenagers
265276
</Heading>
266277
<Box sx={{}}>
267278
<Box
@@ -274,10 +285,20 @@ function Page({ carouselCards }) {
274285
}}
275286
>
276287
<Text variant="subtitle" sx={{ width: ['100%'] }}>
277-
Each year, thousands of high schoolers across the United States participate in the Congressional App Challenge, and this year, <span class = "underline pink">Hack Club</span> is here to help.
278-
<br /> <br />
279-
Every day, Hack Clubbers worldwide work together to <b>build projects and win prizes</b> in awesome hackathons and events.
280-
<br/>Join the <Link as="a" href="https://hackclub.com/slack">Hack Club Slack</Link> to chat with and <b>get support on your Congressional App Challenge submission</b> from tens of thousands of other high school programmers.
288+
289+
Hack Club has <Link as="a" href="https://hackclub.com/arcade">given away</Link> $100,000s of Framework Laptops, 3D printers, and Raspberry Pis in the past year.
290+
291+
<br /><br />
292+
293+
We host dozens of really cool, unique hackathons on <Link as="a" href="https://zephyr.hackclub.com">trains</Link> and in <Link as="a" href="https://outernet.hackclub.com">forests</Link> for free.
294+
295+
<br /><br />
296+
297+
Hack Clubbers provide <Link as="a" href="https://hackclub.app">free website and Discord bot hosting</Link> with SSH access and send tens of thousands of messages every day helping each other on their projects in the Hack Club Slack.
298+
299+
<br /><br />
300+
301+
Join us as you work on your Congressional App Challenge project.
281302
<br /> <br />
282303
<Text
283304
sx={{
@@ -543,27 +564,27 @@ function Page({ carouselCards }) {
543564
id="winners"
544565
sx={{ backgroundColor: palette['cream'], padding: [3, 4, 4, 5] }}
545566
>
546-
<Box sx={{ padding: 4, height: ['100%', null, null, '100vh'] }}>
567+
<Box sx={{ padding: 4, height: ['100%', null, null, '135vh'] }}>
547568
<Heading as="h1" sx={{ pb: 4 }}>
548-
Meet <span class="underline pink">past winners</span>
569+
Meet <span class="underline pink">past winners</span>...
549570
</Heading>
550-
<Box sx={{ position: 'relative' }}>
571+
<Box sx={{ position: 'relative', display: 'flex', flexDirection: 'column', rowGap: 2 }}>
551572
<Screen
552573
expand2
553-
title="Hack Club - Challenge Winners v2 FINAL THIS ONE"
574+
title="Hack Club - Challenge Winners FINAL"
554575
sxProps={{
555576
position: ['relative', null, null, 'absolute'],
556-
top: [0, 0, 0, 40],
557-
marginBottom: [2, 2, 2, 0],
558-
zIndex: 1
577+
top: [0, 0, 0, 0],
578+
zIndex: 2
559579
}}
560580
>
561581
<Box
562582
sx={{
563583
display: 'flex',
564584
flexDirection: ['column', 'row', 'row', 'row'],
565585
justifyContent: 'space-around',
566-
alignItems: 'center'
586+
alignItems: 'center',
587+
zIndex: 2
567588
}}
568589
>
569590
<UserProfile
@@ -586,13 +607,49 @@ function Page({ carouselCards }) {
586607
</Screen>
587608

588609
<Screen
610+
expand2
611+
title="Hack Club - Challenge Winners FINAL THIS ONE (2)"
612+
sxProps={{
613+
position: ['relative', null, null, 'absolute'],
614+
left: [0, 0, 0, 80],
615+
top: [0, 0, 0, 400],
616+
zIndex: 4
617+
}}
618+
>
619+
<Box
620+
sx={{
621+
display: 'flex',
622+
flexDirection: ['column', 'row', 'row', 'row'],
623+
alignItems: 'center',
624+
justifyContent: 'space-around'
625+
}}
626+
>
627+
<UserProfile
628+
name="Celeste"
629+
age="16"
630+
state="GA"
631+
description="Celeste is a computer scientist, roboticist, and singer. She's passionate about the intersection of STEM and the arts, as well as tech advocacy."
632+
page="https://www.court-connect.net/"
633+
image="https://cloud-6a1c03tuu-hack-club-bot.vercel.app/0img_1754.jpg"
634+
/>
635+
<UserProfile
636+
name="Clay"
637+
age="16"
638+
state="VT"
639+
description="Clay is a student developer and high schooler from Vermont, as well as a member of Green Mountain Robotics and Robohawks."
640+
page="https://www.congressionalappchallenge.us/23-VT00/"
641+
image="https://cloud-b6mzh2987-hack-club-bot.vercel.app/21704591152368.jpg"
642+
/>
643+
</Box>
644+
</Screen>
645+
<Screen
589646
expand2
590647
title="Hack Club - Challenge Winners (draft)"
591648
sxProps={{
592649
position: ['relative', null, null, 'absolute'],
593650
right: [0, 0, 0, 10],
594-
top: [0, 0, 0, -10],
595-
zIndex: 0
651+
top: [0, 0, 0, -45],
652+
zIndex: 1
596653
}}
597654
>
598655
<Box
@@ -611,19 +668,41 @@ function Page({ carouselCards }) {
611668
page="https://www.congressionalappchallenge.us/23-GA06/"
612669
image="https://cloud-b6mzh2987-hack-club-bot.vercel.app/31659043447794.jpg"
613670
/>
671+
<Box
672+
sx={{ display: ['none', null, 'flex', 'none'], padding: 2, width: 200 }}
673+
/>
674+
614675
</Box>
676+
<Box>
677+
<Box sx ={{
678+
left: [null, null, 10, 245],
679+
position: "absolute",
680+
textAlign: 'right',
681+
bottom: [0, null, 20, -220],
682+
display: ['none', null, null, 'block'],
683+
}}>
684+
<Heading as="h1" sx={{marginBottom: 3}}>
685+
...on the <span class = "underline blurple">Hack Club Slack
686+
</span>
687+
</Heading>
688+
<Text variant="subtitle">Join the <a href = "https://hackclub.com/slack">Slack</a> and build your winning app submission today.</Text>
689+
</Box>
690+
615691
<Image
616692
src="https://cloud-n807bcpij-hack-club-bot.vercel.app/0terrifiedheidi.png"
617693
alt="A sticker of scared Heidi"
618694
sx={{
619695
height: '250px',
620-
display: ['none', null, 'block', null],
621696
position: 'absolute',
622-
right: -4,
623-
bottom: -60
697+
display: ['none', null, 'block', 'block'],
698+
right: [0, null, 80, -4],
699+
bottom: [0, null, 15, -480],
700+
zIndex: 4
624701
}}
625702
/>
703+
</Box>
626704
</Screen>
705+
627706
</Box>
628707
</Box>
629708
</Box>
Loading

0 commit comments

Comments
 (0)