Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@LimesKey
LimesKey committed Dec 17, 2024
1 parent f40015c commit 5dbde9e
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 43 deletions.
6 changes: 3 additions & 3 deletions app/components/3box.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ const Threebox = () => {
} }>Design a PCB</Heading>
<Image sx={{
width:['28vh', '26vw'],
height:['32vh', '28vw'],
height:['30vh', '25vw'],
borderRadius: '10px',
paddingBottom: '2rem',
fill: 'true'
Expand All @@ -71,7 +71,7 @@ const Threebox = () => {
} }>Design Art</Heading>
<Image sx={{
width:['28vh', '26vw'],
height:['32vh', '28vw'],
height:['30vh', '25vw'],
borderRadius: '10px',
paddingBottom: '2rem'
}} src="https://cloud-go1uacpkk-hack-club-bot.vercel.app/0image.png"></Image>
Expand All @@ -95,7 +95,7 @@ const Threebox = () => {
} }>Create Firmware</Heading>
<Image sx={{
width:['28vh', '26vw'],
height:['32vh', '28vw'],
height:['30vh', '25vw'],
borderRadius: '10px',
paddingBottom: ['1rem', '2rem']
}}
Expand Down
16 changes: 7 additions & 9 deletions app/components/FAQcard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,15 @@ interface CardProps {

const FAQcard: React.FC<CardProps> = ({ question, answer }) => {
return (
<div className={styles.card}>
<h3 className={styles.question}>{question}</h3>
<p className={styles.answer}>{answer}</p>
<div className="rounded-[20px] p-[16px] my-[16px] bg-[rgba(201,227,255,0.73)] shadow-[0_2px_4px_rgba(0,0,0,0.1)] w-[90vw] sm:w-auto md:w-auto lg:w-[26vw] sm:h-[auto] lg:h-[26vh] border-[5px] border-[rgba(39,114,193,0.42)] overflow-hidden">
<h3 className="text-[1rem] md:text-[calc(1vw+1vh)] font-[790] text-white pl-[2%] [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)] text-left break-words">
{question}
</h3>
<p className="text-[0.9rem] md:text-[calc(0.6vw+0.6vh)] text-[#003180] mt-[15px] font-[700] pl-[2%] text-left">
{answer}
</p>
</div>
);
};

const styles = {
card: "rounded-[20px] p-[16px] my-[16px] bg-[rgba(201,227,255,0.73)] shadow-[0_2px_4px_rgba(0,0,0,0.1)] w-[90vw] sm:w-auto md:w-auto lg:w-[26vw] sm:h-[auto] lg:h-[26vh] border-[5px] border-[rgba(39,114,193,0.42)] overflow-hidden",
question: "text-[1.2rem] md:text-[calc(1.2vw+1.2vh)] font-[790] text-white pl-[2%] [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)] text-left",
answer: "text-[1rem] md:text-[calc(0.6vw+0.6vh)] text-[#003180] mt-[15px] font-[700] pl-[2%] text-left"
};

export default FAQcard;
7 changes: 3 additions & 4 deletions app/components/top.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,14 @@ const ModelViewer = dynamic(() => import('../ModelViewer'), { ssr: false });
}}
/> */}
<div className="flex flex-col items-start ml-0 md:ml-[2vw] max-w-full">
<h1 className="font-[var(--font-inter)] text-[2.8rem] md:text-[7rem] font-bold text-center md:text-left text-white [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)]">
<h1 className="text-[2.8rem] md:text-[7rem] font-bold text-center md:text-left text-white [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)]">
Hacky Holidays!
</h1>
<h2 className="font-[var(--font-inter)] text-[0.7rem] md:text-[1.9rem] font-bold text-white [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)] md:-mt-4">
<h2 className="text-[0.7rem] md:text-[1.9rem] font-bold text-white [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)] md:-mt-4">
Design a PCB holiday decoration this winter, get one shipped!
</h2>
<a href = "/guide">
<button className="mx-auto mb-10 md:mx-0 font-[var(--font-inter)] text-[0.4rem] md:text-[calc(0.6vw+0.6vh)] font-bold text-white bg-[#f76f63] rounded-[2rem] px-[0.6rem] py-[0.6rem] md:px-[2rem] md:py-[1rem] mt-4 [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)]">
<b>&nbsp;Learn to Make a Decoration &nbsp; ➜</b>
<button className="mx-auto mb-10 md:mx-0 text-[0.8rem] md:text-[calc(0.6vw+0.6vh)] font-bold text-white bg-[#f76f63] rounded-[2rem] px-4 py-2 md:px-8 md:py-4 mt-4 [text-shadow:_0_4px_4px_rgb(0_0_0_/_25%)] text-center align-middle"> <b>&nbsp;Learn to Make a Decoration &nbsp; ➜</b>
</button>
</a>

Expand Down
12 changes: 1 addition & 11 deletions app/globals.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,4 @@
font-family: 'Inter';
src: url('./fonts/Inter-VariableFont_opsz,wght.ttf') format('ttf');
font-optical-sizing: auto;


}
/* body {
color: #FFFFFF;
background: linear-gradient(180deg, rgba(0,153,255,1) 0%, rgba(130,205,255,1) 100%);
font-family: Arial, Helvetica, sans-serif;
height: 100%;
margin: 0;
min-width: none;
} */
}
10 changes: 0 additions & 10 deletions app/layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,6 @@
import type { Metadata } from "next";
import localFont from "next/font/local";
import "./globals.css";
import {
Box,
Button,
Container,
Image,
Grid,
Heading,
Text,
} from 'theme-ui';
import Footer from './components/footer';

const geistSans = localFont({
src: "./fonts/GeistVF.woff",
Expand Down
22 changes: 16 additions & 6 deletions app/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default function Home() {
}
}, []);


return (
<div>
{/* Snowfall effect */}
Expand All @@ -26,7 +25,7 @@ export default function Home() {
radius={[2.0, 4.0]}
snowflakeCount={100}
wind={[-0.1, 0.1]}
style={{ position: "fixed", top: 0, left: 0, width: "100%", height: "100%", zIndex: 1}}
style={{ position: "fixed", top: 0, left: 0, width: "100%", height: "100%", zIndex: 1 }}
/>

{/* Main Content */}
Expand All @@ -48,14 +47,13 @@ export default function Home() {
<Top />

{/* Main Section */}
<div className="flex flex-col items-center justify-center text-center text-white px-6">
<div className="flex flex-col items-center justify-center text-center text-white px-4 md:px-20 lg:px-52">
<h3 className="font-inter font-bold text-lg md:text-2xl drop-shadow-md pt-8 sm:px-8 md:px-16">
Want a cool christmas decoration? A cool gift for someone you know? Design a unique PCB decoration from scratch and submit it via PR to OnBoard before the 30th! Once your PR gets approved, you will get your PCB decoration just in time for the holidays!🎄
Want a cool Christmas decoration? A cool gift for someone you know? Design a unique PCB decoration from scratch and submit it via PR to OnBoard before the 30th! Whether it's for Christmas, Hanukkah, New Year's, or any other holiday, once your PR gets approved, you will get your PCB decoration just in time for the celebrations!
</h3>
<ThreeGrid />
<h3 className="mt-6 font-inter font-bold text-lg md:text-2xl drop-shadow-md sm:px-8 md:px-16">
At the end, submissions will be peer-reviewed and voted for the top 3. The top 3 will
be re-made and can be given out as gifts!
At the end, submissions will be peer-reviewed and voted for the top 3. The top 3 designs will be re-made and can be given out as gifts! Winners will also receive special recognition and a feature on our website. Don't miss this chance to showcase your creativity and spread holiday cheer with your unique PCB decorations!
</h3>

{/* FAQ Section */}
Expand All @@ -72,6 +70,18 @@ export default function Home() {
question="What about the OnBoard Grant?"
answer="You can still apply for the OnBoard grant, but you cannot receive two grants for the same PCB design."
/>
<FAQcard
question="How can I get help?"
answer="Join huddles/calls on the Slack or ask in the #electronics channel on Slack."
/>
<FAQcard
question="What if I need to use standard assembly only parts?"
answer="A limited handful of people will be eligible to have their PCB hand soldered by a Hack Club staff member. You can apply for it on a form."
/>
<FAQcard
question="How do I submit my design?"
answer="Submit your design via a pull request (PR) to the OnBoard repository before the deadline."
/>
</div>

<h2 className="font-inter font-bold text-lg md:text-3xl mt-6 pb-8">
Expand Down

0 comments on commit 5dbde9e

Please sign in to comment.