Skip to content

Commit 97a17ec

Browse files
garyhtougaryhtou
authored
Merge branch 'main' into garyhtou/hcb-apply
2 parents a1a9a6c + c9ea1e0 commit 97a17ec

File tree

3 files changed

+187
-7
lines changed

3 files changed

+187
-7
lines changed

‎components/fiscal-sponsorship/first/stats.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,6 @@ function formatMoney(amount) {
4343
}
4444

4545
const Stats = ({ stats }) => {
46-
if (stats.transactions_volume === undefined) {
47-
return null
48-
}
4946
const [balance, setBalance] = useState(0) // A formatted balance string, split by decimal
5047

5148
useEffect(() => {
@@ -67,6 +64,9 @@ const Stats = ({ stats }) => {
6764

6865
return () => observer.disconnect()
6966
}, [stats.transactions_volume])
67+
68+
if (stats.transactions_volume === undefined) return null
69+
7070
return (
7171
<Box id="parent">
7272
<Flex sx={{ flexDirection: 'column', alignItems: 'center' }}>

‎components/index/cards/scrapyard.js

+182
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
import CardModel from './card-model'
2+
import { Box, Flex, Grid, Image, Text, Heading } from 'theme-ui'
3+
import Buttons from './button'
4+
import { Global } from '@emotion/react'
5+
6+
/** @jsxImportSource theme-ui */
7+
8+
export default function Scrapyard() {
9+
return (
10+
11+
<CardModel
12+
color="white"
13+
sx={{
14+
backgroundSize: 'cover',
15+
backgroundColor: '#90A8E1',
16+
fontFamily: "p22stanyan",
17+
objectFit: "contain"
18+
}}
19+
position={[null, 'bottom', 'bottom']}
20+
21+
>
22+
<Global
23+
styles={`
24+
@font-face {
25+
font-family: 'p22stanyan';
26+
src: url('https://use.typekit.net/af/444506/00000000000000007735b3cd/30/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n7&v=3') format('woff2');
27+
font-weight: normal;
28+
font-style: normal;
29+
}
30+
@font-face {
31+
font-family: 'moonblossom';
32+
src: url('https://use.typekit.net/af/bf03be/00000000000000007735fbe5/30/l?primer=7cdcb44be4a7db8877ffa5c0007b8dd865b3bbc383831fe2ea177f62257a9191&fvd=n4&v=3') format('woff2');
33+
font-weight: normal;
34+
font-style: normal;
35+
}
36+
`}
37+
/>
38+
<Grid columns={[1, 1, 1]} sx={{ position: 'relative', zIndex: 2 }}>
39+
<Flex
40+
sx={{
41+
flexDirection: 'column',
42+
justifyContent: 'space-between',
43+
position: 'relative',
44+
alignItems: 'center',
45+
}}
46+
>
47+
<Image
48+
src="https://cloud-4fnsp2wse-hack-club-bot.vercel.app/0scrapyard.png"
49+
sx={{
50+
width: ['400px', '450px', '500px'],
51+
mt: ['30px', '40px', '45px'],
52+
mb: ['30px', '30px', '30px'],
53+
position: 'relative',
54+
zIndex: 3,
55+
ml: '0px',
56+
mr: '0px',
57+
fontSize: ['48px', 4, 5],
58+
color: 'white',
59+
// mx: 'auto'
60+
}}
61+
alt="Scrapyard"
62+
/>
63+
64+
65+
<Flex
66+
sx={{
67+
flexDirection: ['row', 'row', 'column'],
68+
justifyContent: 'space-between'
69+
70+
}}
71+
>
72+
<Box
73+
sx={{
74+
display: 'flex',
75+
flexDirection: 'column',
76+
alignItems: 'center'
77+
}}
78+
>
79+
<Box
80+
sx={{
81+
background: "url('https://scrapyard.hackclub.com/elements/ripped-paper.png')",
82+
backgroundSize: 'cover',
83+
display: 'block',
84+
width: 'min(500px, calc(100vw - 30px))',
85+
filter: 'drop-shadow(5px 5px 5px #000000AA)',
86+
position: 'relative',
87+
zIndex: 20
88+
}}
89+
>
90+
<Heading
91+
as="h2"
92+
sx={{
93+
fontFamily: 'moonblossom',
94+
textAlign: 'center',
95+
margin: '8%',
96+
fontSize: '22px',
97+
color: '#1f2d3d'
98+
}}
99+
>
100+
Build stupid stuff, get stupid prizes.
101+
</Heading>
102+
</Box>
103+
<Box
104+
sx={{
105+
zIndex: 1,
106+
width: 'max-content',
107+
backgroundImage: "url('https://scrapyard.hackclub.com/elements/[email protected]')",
108+
backgroundRepeat: 'no-repeat',
109+
backgroundSize: '100% 100%',
110+
width: '75%',
111+
position: 'relative',
112+
zIndex: 30,
113+
top: '-15%',
114+
display: 'flex',
115+
flexDirection: 'column',
116+
alignItems: 'center',
117+
// pt: '3%',
118+
filter: 'drop-shadow(5px 5px 5px #00000099)'
119+
}}
120+
>
121+
<Heading
122+
as="h2"
123+
sx={{
124+
fontFamily: 'p22stanyan',
125+
mx: '8%',
126+
my: '3%',
127+
p: 0,
128+
wordBreak: 'keep-all',
129+
whiteSpace: 'nowrap',
130+
width: 'min-content',
131+
fontSize: ['1.2em', '1.4em'],
132+
color: '#1f2d3d'
133+
}}
134+
>
135+
100+&nbsp;Cities&nbsp;worldwide&nbsp;–&nbsp;March&nbsp;15-16
136+
</Heading>
137+
</Box>
138+
</Box>
139+
140+
141+
</Flex>
142+
</Flex>
143+
144+
<Buttons
145+
href="https://scrapyard.hackclub.com/"
146+
target="_blank"
147+
148+
rel="noopener"
149+
primary="#fde778"
150+
icon = "door-enter"
151+
id="43"
152+
zIndex={999}
153+
sx = {{zIndex: 9999999, left: ["50%", "50%", "0%"], color: '#1f2d3d'}}
154+
>
155+
156+
Learn More
157+
</Buttons>
158+
159+
160+
</Grid>
161+
<Image
162+
src="https://cloud-hqnbfdg3v-hack-club-bot.vercel.app/0image__14_.png"
163+
sx={{
164+
width: ['100%', '100%', '100%'],
165+
mb: ['0px', '0px', '0px'],
166+
mr: ['0px', '0px', '0px'],
167+
ml: ['0px', '0px', '0px'],
168+
position: 'absolute',
169+
zIndex: 1,
170+
left: 0,
171+
bottom: 0,
172+
fontSize: ['36px', 4, 5],
173+
color: 'white',
174+
objectFit: 'cover',
175+
height: '100%',
176+
mx: 0
177+
}}
178+
alt=""
179+
/>
180+
</CardModel>
181+
)
182+
}

‎pages/index.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ import Comma from '../components/comma'
4040
import Haxidraw from '../components/index/cards/haxidraw'
4141
import Onboard from '../components/index/cards/onboard'
4242
import Trail from '../components/index/cards/trail'
43-
import HighSeas from '../components/index/cards/highseas'
44-
import Counterspell from '../components/index/cards/counterspell'
43+
import Scrapyard from '../components/index/cards/scrapyard'
4544
/** @jsxImportSource theme-ui */
4645

4746
function Page({
@@ -669,8 +668,7 @@ function Page({
669668
and make things together!
670669
</Text>
671670
</Box>
672-
<HighSeas />
673-
<Counterspell />
671+
<Scrapyard />
674672
<Trail />
675673
<Slack slackKey={slackKey} data={slackData} events={events} />
676674
</Box>

0 commit comments

Comments
 (0)