Merge pull request #53 from ComputerScienceHouse/develop

merge Develop into main

Author: IsaacIngram

src/components/Navbar.tsx

@@ -51,12 +51,12 @@ export function Navbar() {
 
           {/* CTA Button */}
           <div className="hidden md:flex items-center gap-2">
-            <Link to="/registration">
+            {/* <Link to="/registration">
               <Button variant="hero" size="lg">
                 <UserPlus className="w-4 h-4" />
                 Late Registration
               </Button>
-            </Link>
+            </Link> */}
           </div>
 
           {/* Mobile Menu Button */}
@@ -88,11 +88,11 @@ export function Navbar() {
                 </Link>
               ))}
               <div className="mt-2">
-                <Link to="/registration">
+                {/* <Link to="/registration">
                   <Button variant="hero" className="w-full">
                     Late Registration
                   </Button>
-                </Link>
+                </Link> */}
               </div>
             </div>
           </div>

src/pages/Events.tsx

@@ -43,12 +43,12 @@ const Events = () => {
               From casual meetups to the main gala dinner, here's everything happening during the 50th anniversary celebration.
             </p>
             <div className="flex flex-wrap justify-center gap-4">
-              <a href="/registration" target="_blank" rel="noopener noreferrer">
+              {/* <a href="/registration" target="_blank" rel="noopener noreferrer">
                 <Button variant="hero" size="lg">
                   <Ticket className="w-5 h-5" />
                   Late Registration
                 </Button>
-              </a>
+              </a> */}
               <Link to="/schedule">
                 <Button variant="hero-outline" size="lg">
                   <Calendar className="w-5 h-5" />
@@ -192,13 +192,13 @@ const Events = () => {
             Don't miss out on this once-in-a-lifetime anniversary celebration. Get your tickets now!
           </p>
           {/* PLACEHOLDER: Replace with actual ticket purchase URL */}
-          <a href="/registration" target="_blank" rel="noopener noreferrer">
+          {/* <a href="/registration" target="_blank" rel="noopener noreferrer">
             <Button variant="hero" size="xl">
               <Ticket className="w-5 h-5" />
               Late Registration
               <ArrowRight className="w-5 h-5" />
             </Button>
-          </a>
+          </a> */}
         </div>
       </section>
     </Layout>

src/pages/EventsData.ts

@@ -200,19 +200,19 @@ export const events: ScheduleEvent[] = [ // PLACEHOLDERS: Update all event times
   {
     id: 19,
     title: "Mechanical Keyboard Meetup",
-    description: "CSHers will be showing off their mechnical keyboard setups! Stop by to check it out and spend some time learning about keyboards. There will be special guests and giveaways!",
+    description: "CSHers will be showing off their mechnical keyboard setups! Stop by to check it out and maybe even showcase your own setup. Featuring special guest Joe Scotto of ScottoKeebs (a Chittenango MK enthusiast, vendor, and handwiring expert) giving a talk, answering questions, and wiring up some keyboards. There will be giveaways from Alchemist Keyboards and Signature Plastics!!",
     date: "Friday, April 10, 2026",
-    time: "12:30 PM - 2:00 PM",
-    location: "Douglass Sprague Perry Hall (DSP) Room 1250", 
-    address: "43 Greenleaf Ct, Rochester, NY 14623",
+    time: "12:30 PM - 2:30 PM",
+    location: "Kate Gleason Hall Room A055", 
+    address: "1 Lomb Memorial Dr, Rochester, NY 14623",
     capacity: "All attendees",
     dressCode: "Casual",
     type: "activity",
   },
   {
     id: 20,
     title: "Seminar: Intro to GPUI and hacking on Zed",
-    description: "Hosted by CSH's very own Nick Moshe (@nickm)! Learn how Zed.dev works under the hood, how to use its rust-native desktop app framework GPUI, and how to build custom plugins embedded into Zed itself.",
+    description: "Hosted by Nick Moshe (@nickm)! Learn how Zed.dev works under the hood, how to use its rust-native desktop app framework GPUI, and how to build custom plugins embedded into Zed itself.",
     date: "Friday, April 10, 2026",
     time: "3:00 PM - 4:00 PM",
     location: "CSH, DSP Floor 3",
@@ -221,6 +221,18 @@ export const events: ScheduleEvent[] = [ // PLACEHOLDERS: Update all event times
     dressCode: "Casual",
     type: "seminar",
   },
+  {
+    id: 21,
+    title: "Ultimate Frisbee Game!!",
+    description: "Hosted by @Mattyb! Come join us for a casual ultimate frisbee game on the GPC Turf Field. Everyone welcome! Bring your sneakers.",
+    date: "Saturday, April 11, 2026",
+    time: "10:00 AM - 12:00 PM",
+    location: "GPC Turf Field",
+    address: "",
+    capacity: "All attendees",
+    dressCode: "Casual",
+    type: "activity",
+  },
   {
     id: 17,
     title: "IGM Symposium",

src/pages/Index.tsx

@@ -60,14 +60,14 @@ const Index = () => {
             </p>
 
             {/* CTA Buttons */}
-            <div className="flex flex-col sm:flex-row gap-4 justify-center mb-12 animate-fade-up" style={{ animationDelay: "0.3s" }}>
+            {/* <div className="flex flex-col sm:flex-row gap-4 justify-center mb-12 animate-fade-up" style={{ animationDelay: "0.3s" }}>
               <Link to="/registration">
                 <Button variant="hero" size="xl" className="w-full sm:w-auto">
                   <UserPlus className="w-5 h-5" />
                   Late Registration
                 </Button>
               </Link>
-            </div>
+            </div> */}
 
             {/* Countdown */}
             <div className="animate-fade-up" style={{ animationDelay: "0.4s" }}>