From e427acff7b38d327e0c7edda49869c40ab7f888c Mon Sep 17 00:00:00 2001 From: Ella Date: Fri, 29 Jul 2022 16:09:22 -0400 Subject: [PATCH] Savepoint mid-afternoon Some code cleanup and initial round of edits from mid-day review call --- components/footer.js | 4 +- components/hackathons/content.mdx | 35 ------ components/hackathons/cta.js | 37 ------ components/hackathons/features/money.js | 10 +- components/hackathons/landing.js | 146 ------------------------ components/hackathons/landing2.js | 22 ++-- components/hackathons/philosophy.js | 37 +++++- components/hackathons/rundown.js | 2 +- components/hackathons/todo.md | 13 +++ pages/hackathons.js | 12 +- pages/hackathons2.js | 113 ------------------ 11 files changed, 75 insertions(+), 356 deletions(-) delete mode 100644 components/hackathons/content.mdx delete mode 100644 components/hackathons/cta.js delete mode 100644 components/hackathons/landing.js create mode 100644 components/hackathons/todo.md delete mode 100644 pages/hackathons2.js diff --git a/components/footer.js b/components/footer.js index f07e2bbd..5fc4ad79 100644 --- a/components/footer.js +++ b/components/footer.js @@ -118,7 +118,9 @@ const Footer = ({ dark = false, children, ...props }) => ( Events Workshops Contribute - Hackathons + + Hackathons + Bank diff --git a/components/hackathons/content.mdx b/components/hackathons/content.mdx deleted file mode 100644 index b7134d41..00000000 --- a/components/hackathons/content.mdx +++ /dev/null @@ -1,35 +0,0 @@ - - -import { Card } from 'theme-ui' - - - -## things - -things people do at hackathons - - - - - -## things - -things people do at hackathons - - - - - -## things - -things people do at hackathons - - - - - -## things - -things people do at hackathons - - diff --git a/components/hackathons/cta.js b/components/hackathons/cta.js deleted file mode 100644 index 3688a9d4..00000000 --- a/components/hackathons/cta.js +++ /dev/null @@ -1,37 +0,0 @@ -import { Box, Text, Heading, Button } from 'theme-ui' -import NextLink from 'next/link' - -export default function Cta() { - return ( - <> - t.util.gx('red', 'orange'), - margin: 'auto', - width: '600px', - maxWidth: '90%', - mb: 4, - mt: 4, - borderRadius: 8, - color: 'white', - textAlign: 'center', - p: 4 - }} - > - - Join the movement! - - - - - - - - - - ) -} diff --git a/components/hackathons/features/money.js b/components/hackathons/features/money.js index 98c82612..10b9f3c9 100644 --- a/components/hackathons/features/money.js +++ b/components/hackathons/features/money.js @@ -26,7 +26,7 @@ const Content2 = () => ( A full-stack financial toolkit - Hack Club Bank and Gadzooks! + Hack Club Bank and FIRST ( waiving fees for hackathons on hack club bank. and $10k in grants thanks - to our generous friends at Gadzooks! + to our generous friends at FIRST! */} -
- - - - - - - - - - ) -} - -function Slide({ children }) { - return ( - - woof - {children} - - ) -} - -function Vignette() { - return ( - - ) -} - -function Highlight(props) { - return ( - - ) -} diff --git a/components/hackathons/landing2.js b/components/hackathons/landing2.js index 36f45f5b..5651f22f 100644 --- a/components/hackathons/landing2.js +++ b/components/hackathons/landing2.js @@ -59,7 +59,8 @@ export default function Landing2({ showButton }) { transform: [ 'translateY(-50%) rotate(8deg)', 'translateX(15%) rotate(12deg)' - ] + ], + fontSize: [2, 3] }} > Looking for hackathons? @@ -82,13 +83,21 @@ export default function Landing2({ showButton }) { sx={{ WebkitTextStroke: 'currentColor', WebkitTextStrokeWidth: ['2px', '3px'], - WebkitTextFillColor: '#33D6A6' + WebkitTextFillColor: '#33D6A6', + whiteSpace: [null, null, 'nowrap'] }} > - high school hackathon. + high school hackathon. - + It's not an extracurricular or a club. It's not a class or a lecture. @@ -96,11 +105,6 @@ export default function Landing2({ showButton }) { Hackathons are a playground to build things for fun and meet others doing the same. - - This semester, we’re distributing $10k in grants (thanks - Gadzooks!) & providing the tools and resources for you to run - the best events. - diff --git a/components/hackathons/philosophy.js b/components/hackathons/philosophy.js index 91317a72..6919b9af 100644 --- a/components/hackathons/philosophy.js +++ b/components/hackathons/philosophy.js @@ -1,4 +1,5 @@ -import { Heading, Container, Box } from 'theme-ui' +import { Heading, Container, Box, Button } from 'theme-ui' +import Link from 'next/link' export default function Philosophy() { return ( @@ -56,6 +57,40 @@ export default function Philosophy() { volunteers. We make things. We want others to make things too. + + t.util.gx('orange', 'red'), + margin: 'auto', + width: '600px', + maxWidth: '90%', + mb: 4, + borderRadius: 8, + color: 'white', + textAlign: 'center', + p: 4 + }} + > + + Join the movement! + + + + + + + + + ) } diff --git a/components/hackathons/rundown.js b/components/hackathons/rundown.js index 22191e49..234937d4 100644 --- a/components/hackathons/rundown.js +++ b/components/hackathons/rundown.js @@ -79,7 +79,7 @@ export default function Rundown() { icon="bank-account" color="white" name="$10k in grants" - desc="We've partnered with Gadzooks to provide $500 grants for IRL high school hackathons this semester." + desc="We've partnered with FIRST to provide $500 grants for IRL high school hackathons this semester." /> - - - - + - diff --git a/pages/hackathons2.js b/pages/hackathons2.js deleted file mode 100644 index 4fcfa4b0..00000000 --- a/pages/hackathons2.js +++ /dev/null @@ -1,113 +0,0 @@ -import { Box, Container, Heading, Grid, Text } from 'theme-ui' -import Meta from '@hackclub/meta' -import Head from 'next/head' -import ForceTheme from '../components/force-theme' -import Nav from '../components/nav' -import Footer from '../components/footer' - -import Landing from '../components/hackathons/landing' -import Rundown from '../components/hackathons/rundown' -import Content from '../components/hackathons/content.mdx' -import MovingCards from '../components/hackathons/moving-cards' -import Cta from '../components/hackathons/cta' -import Philosophy from '../components/hackathons/philosophy' -import Landing2 from '../components/hackathons/landing2' - -export default function HackathonsLanding() { - return ( - <> - -