Merge pull request #27 from snaeker58/main

Added touch icon, revised text phrasing, added disclaimer

src/layouts/components/BaseHead.astro

@@ -1,26 +1,32 @@
 ---
-import '../../styles/global.css';
-import Favicon from '@src/assets/img/icon.png';
+import "../../styles/global.css";
+import Favicon from "@src/assets/img/favicons/favicon.ico";
+import Favicon16 from "@src/assets/img/favicons/favicon-16x16.png";
+import Favicon32 from "@src/assets/img/favicons/favicon-32x32.png";
+import TouchIcon from "@src/assets/img/favicons/apple-touch-icon.png";
 
 interface Props {
-	title: string;
-	description: string;
-	image?: string;
+   title: string;
+   description: string;
+   image?: string;
 }
 
 const canonicalURL = new URL(Astro.url.pathname, Astro.site);
 
-const { title, description, image = '/syakir.webp' } = Astro.props;
+const { title, description, image = "/syakir.webp" } = Astro.props;
 ---
 
 <!-- Global Metadata -->
 <meta charset='utf-8' />
 <meta name='viewport' content='width=device-width,initial-scale=1' />
-<link rel='icon' href={Favicon.src} />
+<link rel='icon' href={Favicon} />
+<link rel='icon' type='image/png' sizes='16x16' href={Favicon16.src}/>
+<link rel='icon' type='image/png' sizes='32x32' href={Favicon32.src} />
+<link rel='apple-touch-icon' href={TouchIcon.src} />
 <meta name='generator' content={Astro.generator} />
 
 <!-- Analytics -->
-<script is:inline async defer src="https://cabin.zenithhacks.org/hello.js"></script>
+<script is:inline async defer src='https://cabin.zenithhacks.org/hello.js'></script>
 
 <!-- Canonical URL -->
 <link rel='canonical' href={canonicalURL} />

src/layouts/components/Footer.astro

@@ -41,7 +41,11 @@ const today = new Date();
             Zenith 2025 is a community-run part of The Hack Foundation (d.b.a. Hack Club), a 501(c)(3) nonprofit (EIN: 81-2908499).
             Contributions are tax-deductible to the fullest extent allowed by law.
          </p>
-         <p>Disclaimer: Zenith 2025 is not run by the offical Hack Club Foundation, but by leaders of high school Hack Clubs.</p>
+         <p>
+            Zenith 2025 is independently run and not an official event by the Hack Club Foundation. <br />
+            Information on this website may be inaccurate or subject to change.
+            Zenith 2025 is not responsible for any errors or omissions.
+         </p>
       </div>
    </div>
 </footer>

src/pages/index.astro

@@ -9,30 +9,19 @@ import { Image } from "astro:assets";
          <div class='my-[16vh] mx-10'>
             <h1 class="text-6xl font-['Roboto'] font-extrabold italic">Zenith 2025</h1>
             <p class="font-['Poppins'] max-w-[700px] inline-block text-xl">
-               Join a <span class='italic font-semibold'>community run</span> hackathon to compete and connect with Hack Club members from across
-               the world!
+               Join a <span class='italic font-semibold'>community run</span> hackathon to compete and connect with Hack Club members from across the world!
             </p>
             <div class='my-10'>
-               <a
-                  class='bg-transparent text-white px-6 py-2 pt-[.7rem] rounded-full font-bold uppercase border border-zinc-700 animate-[subtle-glow_2s_infinite_alternate] hover:scale-105 transition-transform duration-300'
-                  href='https://hcb.hackclub.com/donations/start/zenithhacks'
-                  target='_blank'
-               >
+               <a class='bg-transparent text-white px-6 py-2 pt-[.7rem] rounded-full font-bold uppercase border border-zinc-700 animate-[subtle-glow_2s_infinite_alternate] hover:scale-105 transition-transform duration-300' href='https://hcb.hackclub.com/donations/start/zenithhacks' target='_blank'>
                   Donate
                </a>
             </div>
          </div>
-         <div
-            class='inline-block h-[220vw] lg:h-[160vw] w-[160vw] bg-white rounded-full m-auto absolute left-[calc(50vw-80vw)]'
-            style='top: calc(100vh - 40vh); box-shadow: -1rem -1rem 4rem #fff, inset 0 0 8rem #333'
-         >
+         <div class='inline-block h-[220vw] lg:h-[160vw] w-[160vw] bg-white rounded-full m-auto absolute left-[calc(50vw-80vw)]' style='top: calc(100vh - 40vh); box-shadow: -1rem -1rem 4rem #fff, inset 0 0 8rem #333'>
             <div class='container mt-[40vh] mx-auto text-black w-[100vw] m-16'>
                <h2 class="text-4xl font-['Roboto'] font-bold text-center mb-4">What is Zenith 2025?</h2>
                <p class='text-center max-w-[700px] mx-auto text-xl leading-7'>
-                  Zenith 2025 is a hackathon organised by and for teens. We're coming together for 2 days to share our knowledge and
-                  collaborate with like minded individuals in a supportive environment where mistakes are welcomed. The event will be hosted
-                  in the tech centre of the modern world - San Francisco. And with the help of our sponsors, we're going to make sure
-                  everyone, regardless of their background, can attend!
+                  Zenith 2025 is a hackathon organised by and for teens. Join us for 2 days to share and collaborate with like minded individuals in a supportive, mistake friendly environment. The event will be hosted in the tech capital of the world - San Francisco. We thank our sponsors, for ensuring everyone, regardless of their background, can attend!
                </p>
             </div>
          </div>
@@ -42,20 +31,14 @@ import { Image } from "astro:assets";
          <div class='grid grid-cols-1 md:grid-cols-2 min-h-[400px] p-6'>
             <div class='flex items-center justify-center text-center p-6'>
                <div>
-                  <h2 class="text-3xl md:text-4xl font-['Roboto'] leading-7 my-2">Hackathon?</h2>
+                  <h2 class="text-3xl md:text-4xl font-['Roboto'] leading-7 my-2">Hack- a what?</h2>
                   <p class='text-lg md:text-xl'>
-                     A hackathon is a social coding marathon where teenagers come together to learn, build, and share their results with the
-                     world!
+                     A hackathon is a social event focused on coding where teenagers come together to learn, build, and share their results with others!
                   </p>
                </div>
             </div>
             <div class='p-6'>
-               <Image
-                  class='w-full h-auto rounded-lg'
-                  src='https://miro.medium.com/v2/resize:fit:7940/1*i5VHWsPa9k-u9ffVz0CQdw.jpeg'
-                  alt='Room full of teens'
-                  inferSize={true}
-               />
+               <Image class='w-full h-auto rounded-lg' src='https://miro.medium.com/v2/resize:fit:7940/1*i5VHWsPa9k-u9ffVz0CQdw.jpeg' alt='Room full of teens' inferSize={true} />
             </div>
          </div>
 
@@ -65,11 +48,9 @@ import { Image } from "astro:assets";
             </div>
             <div class='flex items-center justify-center text-center p-6'>
                <div>
-                  <h2 class="text-3xl md:text-4xl font-['Roboto'] leading-7 my-2">Everyone?</h2>
+                  <h2 class="text-3xl md:text-4xl font-['Roboto'] leading-7 my-2">Everyone, even me?</h2>
                   <p class='text-lg md:text-xl'>
-                     Too often communities that are less privileged or outside the USA don't get the same opportunities, so we're providing
-                     travel stipends to all eligible teens after a vetting process to ensure that everyone, no matter their background or
-                     educational status can access life-changing partnerships with other teens.
+                     Yes, everyone! Too often less privileged communities or families, in or outside the US, don't get the same opportunities, so we're providing travel stipends to all eligible teens, no matter their background or education!
                   </p>
                </div>
             </div>
@@ -79,8 +60,7 @@ import { Image } from "astro:assets";
       <hr />
 
       <div id='sponsors' class='bg-white text-center py-16'>
-         <h1 class="text-3xl text-black font-['Poppins'] mx-4">Our sponsors, who will make this event possible</h1>
-         <h1 class="text-3xl my-4 mb-8 text-black font-['Poppins']">💖💖💖</h1>
+         <h1 class="text-5xl font-medium text-black font-['Poppins'] mx-4">Our sponsors</h1>
          <style>
             .sponsor {
                display: inline-block;
@@ -91,7 +71,6 @@ import { Image } from "astro:assets";
                height: 100px;
                width: 100px;
             }
-
             @media (max-width: 768px) {
                .sponsor {
                   display: block;
@@ -109,26 +88,13 @@ import { Image } from "astro:assets";
          <Image class='sponsor' src='/logos/disney-on-light.svg' alt='Disney logo' width={400} height={200} />
          <Image class='sponsor' src='/logos/redbull.svg' alt='Redbull logo' width={400} height={200} />
          <Image class='sponsor' src='/logos/desmos-on-light.png' alt='Desmos non-profit logo' width={400} height={200} />
-         <Image
-            class='sponsor bg-[#222] rounded-xl'
-            src='/logos/codeforcause.png'
-            alt='Code for Cause logo and text'
-            width={400}
-            height={200}
-         />
+         <Image class='sponsor bg-[#222] rounded-xl' src='/logos/codeforcause.png' alt='Code for Cause logo and text' width={400} height={200} />
          <Image class='sponsor' src='/logos/1password-blue.svg' alt='1Password logo' width={400} height={200} />
          <Image class='sponsor' src='/logos/axure.svg' alt='Axure logo' width={400} height={200} />
          <Image class='sponsor' src='/logos/codecrafters.png' title='Code Crafters' alt='Code Crafters logo' width={400} height={200} />
-
-         <br />
-         <br />
-         <hr />
-         <br />
-         <br />
-         <div>
-            <h2 class='text-2xl py-2'>✨ Individual Sponsors ✨</h2>
-            <p>John Tan-Aristy</p>
-         </div>
+         <br /><br /><hr /><br /><br />
+         <h2 class='text-2xl py-2'>✨ Individual Sponsors ✨</h2>
+         <p>John Tan-Aristy</p>
       </div>
    </div>
-</BaseLayout>
+</BaseLayout>