Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Scott170c/hacky-holidays int…
Browse files Browse the repository at this point in the history
…o dev
  • Loading branch information
BrightTheBackpack committed Dec 17, 2024
2 parents a1e0c7c + 80b35b8 commit 7474c6e
Show file tree
Hide file tree
Showing 17 changed files with 5,858 additions and 255 deletions.
2 changes: 1 addition & 1 deletion app/ModelViewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const ModelViewer = () => {
disable-zoom
camera-orbit="0deg 0deg 105%"
disable-pan
style={{ width: '25vw' ,height: '40vh'}}
style={{ width: '25' ,height: '40vh'}}
></model-viewer>
);
};
Expand Down
228 changes: 123 additions & 105 deletions app/components/3box.tsx
Original file line number Diff line number Diff line change
@@ -1,109 +1,127 @@
import {
Box,
Button,
Image,
Grid,
Heading,
Text,
} from 'theme-ui';
import { Box, Image, Grid, Heading, Text } from 'theme-ui';

const Threebox = () => {
return(
<Grid columns= {[1,1,1,3]}gap = {[50,5,20,0]} sx={{
mt: '5vh',
width: 'fit-content',
minheight: '40vh',
resize: 'both',
px: '3vw',
textAlign: 'center',
justifyContent: 'center',
flexDirection: 'row',
alignItems: 'center',
backgroundColor: 'rgba(0, 0, 0, 0.31)',
borderRadius: '1rem',
mx: '32px',
mb: '5vh',
padding: '2vh',
}}>
<Box sx={{
alignItems: 'center',
justifyContent: 'center',
display: 'flex',
flexDirection: 'column',
mx: '1vw',
paddingTop: ['0rem', '2rem'],
borderRadius: '20px',
}}>
<Heading as="h4" sx={{
fontFamily: 'var(--font-inter)',
fontWeight: 900,
fontSize: ['1rem', '1.5vw'],
paddingBottom: '1.2rem',
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
} }>Design a PCB</Heading>
<Image sx={{
width:['28vh', '26vw'],
height:['32vh', '28vw'],
borderRadius: '10px',
paddingBottom: '2rem',
fill: 'true'
}}
src = "https://cloud-qonvrpxwd-hack-club-bot.vercel.app/0image.png"
></Image>

</Box>
<Box sx={{
alignItems: 'center',
justifyContent: 'center',
display: 'flex',
flexDirection: 'column',
paddingTop: ['1rem', '2rem'],
mx: '1vw',

textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>
<Heading as="h4" sx={{
fontFamily: 'var(--font-inter)',
fontWeight: 900,
fontSize: ['1rem', '1.5vw'],
color: 'white',
paddingBottom: '1.2rem'
} }>Design Art</Heading>
<Image sx={{
width:['28vh', '26vw'],
height:['32vh', '28vw'],
borderRadius: '10px',
paddingBottom: '2rem'
}} src="https://cloud-go1uacpkk-hack-club-bot.vercel.app/0image.png"></Image>
</Box>
<Box sx={{
alignItems: 'center',
justifyContent: 'center',
display: 'flex',
mx: '1vw',

flexDirection: 'column',
paddingTop: ['0rem', '2rem'],
}}>
<Heading as="h4" sx={{
fontFamily: 'var(--font-inter)',
fontWeight: 900,
fontSize: ['1rem', '1.5vw'],
paddingBottom: '1.2rem',
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
} }>Create Firmware</Heading>
<Image sx={{
width:['28vh', '26vw'],
height:['32vh', '28vw'],
borderRadius: '10px',
paddingBottom: ['1rem', '2rem']
}}
src = "https://cloud-ix9a26xw1-hack-club-bot.vercel.app/0image.png"
></Image>
</Box>
</Grid>
)
return (
<Grid columns={[1, 1, 1, 3]} gap={[20, 20, 20]} sx={{
mt: '3vh',
maxwidth: '20rem',
px: ['0.5rem', '1rem', '1.5rem'],
textAlign: 'center',
justifyContent: 'center',
alignItems: 'center',
backgroundColor: 'rgba(0, 0, 0, 0.31)',
borderRadius: '1rem',
mx: 'auto',
mb: '5vh',
padding: '2.5vh',
}}>
<Box sx={{
alignItems: 'center',
justifyContent: 'center',
display: 'flex',
flexDirection: 'column',
mx: '1vw',
paddingTop: ['1rem', '2rem'],
borderRadius: '20px',
backgroundColor: 'rgba(255, 255, 255, 0.1)',
padding: '1rem',
overflow: 'hidden',
}}>
<Heading as="h4" sx={{
fontFamily: 'var(--font-inter)',
fontWeight: 900,
fontSize: ['1rem', '1.5vw'],
paddingBottom: '1rem',
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>Design a PCB</Heading>
<Image sx={{
width: '100%',
height: '300px',
borderRadius: '10px',
paddingBottom: '1rem',
objectFit: 'contain',
}}
src="https://cloud-qonvrpxwd-hack-club-bot.vercel.app/0image.png"
/>
<Text sx={{
fontFamily: 'var(--font-inter)',
fontSize: ['0.8rem', '1rem'],
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>Create your own PCB design and bring it to life!</Text>
</Box>
<Box sx={{
alignItems: 'center',
justifyContent: 'center',
display: 'flex',
flexDirection: 'column',
mx: '1vw',
paddingTop: ['1rem', '2rem'],
borderRadius: '20px',
backgroundColor: 'rgba(255, 255, 255, 0.1)',
padding: '1rem',
overflow: 'hidden',
}}>
<Heading as="h4" sx={{
fontFamily: 'var(--font-inter)',
fontWeight: 900,
fontSize: ['1rem', '1.5vw'],
paddingBottom: '1rem',
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>Design Art</Heading>
<Image sx={{
width: '100%',
height: '300px',
borderRadius: '10px',
paddingBottom: '1rem',
objectFit: 'contain',
}} src="https://cloud-go1uacpkk-hack-club-bot.vercel.app/0image.png" />
<Text sx={{
fontFamily: 'var(--font-inter)',
fontSize: ['0.8rem', '1rem'],
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>Create stunning art for your PCB design!</Text>
</Box>
<Box sx={{
alignItems: 'center',
justifyContent: 'center',
display: 'flex',
flexDirection: 'column',
mx: '1vw',
paddingTop: ['1rem', '2rem'],
borderRadius: '20px',
backgroundColor: 'rgba(255, 255, 255, 0.1)',
padding: '1rem',
overflow: 'hidden',
}}>
<Heading as="h4" sx={{
fontFamily: 'var(--font-inter)',
fontWeight: 900,
fontSize: ['1rem', '1.5vw'],
paddingBottom: '1rem',
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>Create Firmware</Heading>
<Image sx={{
width: '100%',
height: '300px',
borderRadius: '10px',
paddingBottom: '1rem',
objectFit: 'contain',
}}
src="https://cloud-ix9a26xw1-hack-club-bot.vercel.app/0image.png"
/>
<Text sx={{
fontFamily: 'var(--font-inter)',
fontSize: ['0.8rem', '1rem'],
color: 'white',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)'
}}>Develop firmware to control your PCB!</Text>
</Box>
</Grid>
)
}
export default Threebox;
16 changes: 6 additions & 10 deletions app/components/FAQcard.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import { kMaxLength } from 'buffer';
import React from 'react';
import { Box } from 'theme-ui';
// Define the type for the props
import { Box, Heading, Text } from 'theme-ui';

interface CardProps {
question: string;
answer: string;
}

// Create the component
const FAQcard: React.FC<CardProps> = ({ question, answer }) => {
return (
<div className="">
Expand All @@ -17,29 +15,27 @@ const FAQcard: React.FC<CardProps> = ({ question, answer }) => {
);
};

// Inline styles for the component
const styles = {
card: {
borderRadius: '20px',
padding: '16px',
margin: '16px',
backgroundColor: 'rgba(201, 227, 255, 0.73)',
boxShadow: '0 2px 4px rgba(0, 0, 0, 0.1)',
height: ['fill-content', '16vw'],
width: ['60vw', '26vw'],
width: ['90vw', '60vw', '26vw'],
border: '5px solid rgba(39, 114, 193, 0.42)',
overflow: 'hidden',
},
question: {
"insert tailwind"
},
answer: {
fontSize: 'calc(0.6vw + 0.6vh)',
fontSize: ['1rem', 'calc(0.6vw + 0.6vh)'],
color: '#003180',
marginTop: '8px',
marginTop: '15px',
textShadow: '0px 4px 4px rgba(0, 0, 0, 0.25)',
fontWeight: 600,
paddingLeft: '2%'
paddingLeft: '2%',
},
};

Expand Down
Loading

0 comments on commit 7474c6e

Please sign in to comment.