Merge pull request #51 from ComputerScienceHouse/develop

merge Develop to main

Author: IsaacIngram

src/components/Navbar.tsx

@@ -10,7 +10,7 @@ const navLinks = [
   { name: "Events", path: "/events" },
   { name: "Other Events", path: "/otherevents"},
   { name: "Hotels", path: "/hotels" },
-  { name: "Ticket Prices", path: "/ticket-prices" },
+  { name: "Tickets", path: "/ticket-prices" },
   { name: "FAQ", path: "/faq" },
 ];
 
@@ -54,7 +54,7 @@ export function Navbar() {
             <Link to="/registration">
               <Button variant="hero" size="lg">
                 <UserPlus className="w-4 h-4" />
-                Register
+                Late Registration
               </Button>
             </Link>
           </div>
@@ -90,7 +90,7 @@ export function Navbar() {
               <div className="mt-2">
                 <Link to="/registration">
                   <Button variant="hero" className="w-full">
-                    Register
+                    Late Registration
                   </Button>
                 </Link>
               </div>

src/pages/Events.tsx

@@ -27,7 +27,7 @@ const Events = () => {
       <div className="bg-amber-500/20 border-2 border-amber-500/50 py-4 px-4">
         <div className="container mx-auto text-center">
           <p className="text-amber-400 font-bold text-sm md:text-base tracking-wider">
-            ⚠️ Tickets are available for purchase! Check your email for more info. Reach out to 50th@csh.rit.edu with any questions!
+            ⚠️ Tickets are available for purchase! Click on the "Tickets" tab for more info. Reach out to 50th@csh.rit.edu with any questions!
           </p>
         </div>
       </div>
@@ -46,7 +46,7 @@ const Events = () => {
               <a href="/registration" target="_blank" rel="noopener noreferrer">
                 <Button variant="hero" size="lg">
                   <Ticket className="w-5 h-5" />
-                  Register
+                  Late Registration
                 </Button>
               </a>
               <Link to="/schedule">
@@ -195,7 +195,7 @@ const Events = () => {
           <a href="/registration" target="_blank" rel="noopener noreferrer">
             <Button variant="hero" size="xl">
               <Ticket className="w-5 h-5" />
-              Register Now
+              Late Registration
               <ArrowRight className="w-5 h-5" />
             </Button>
           </a>

src/pages/EventsData.ts

@@ -83,7 +83,7 @@ export const events: ScheduleEvent[] = [ // PLACEHOLDERS: Update all event times
     description: "The check-in table will be available from 9am-1pm to accomadate attendees arriving in Rochester on Saturday. Stop by at any time to pick up your badge, swag bag, and event materials. Ask questions about the weekend's events and chat with CSHers.",
     date: "Saturday, April 11, 2026",
     time: "9:00 AM - 1:00 PM",
-    location: "TBD", // PLACEHOLDER: Confirm location
+    location: "TBD", 
     address: "TBD",
     capacity: "All attendees",
     dressCode: "Casual",
@@ -191,19 +191,43 @@ export const events: ScheduleEvent[] = [ // PLACEHOLDERS: Update all event times
     description: "TICKETED EVENT! Before you head home, join us for a farewell brunch. Last chance to exchange contact info, take group photos, and say your goodbyes. Ticket packages include options for open bar, food, and play tokens.",
     date: "Sunday, April 12, 2026",
     time: "11:00 AM - 2:00 PM",
-    location: "Swillburger/Playhouse", // Confirm location
+    location: "Swillburger/Playhouse", 
     address: "820 South Clinton, Rochester, NY 14620",
     capacity: "All attendees",
     dressCode: "Casual",
     type: "food",
   },
+  {
+    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!",
+    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",
+    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.",
+    date: "Friday, April 10, 2026",
+    time: "3:00 PM - 4:00 PM",
+    location: "CSH, DSP Floor 3",
+    address: "43 Greenleaf Ct, Rochester, NY 14623",
+    capacity: "All attendees",
+    dressCode: "Casual",
+    type: "seminar",
+  },
   {
     id: 17,
     title: "IGM Symposium",
     description: "https://www.rit.edu/computing/school-interactive-games-and-media/ims",
     date: "Saturday, April 11, 2026",
     time: "10:00 AM - 5:00 PM",
-    location: "RIT's MAGIC Spell Studios", // Confirm location
+    location: "RIT's MAGIC Spell Studios", 
     address: "1 Lomb Memorial Dr, Rochester, NY",
     capacity: "",
     dressCode: "",

src/pages/Index.tsx

@@ -23,7 +23,7 @@ const Index = () => {
       <div className="bg-amber-500/20 border-2 border-amber-500/50 py-4 px-4">
         <div className="container mx-auto text-center">
           <p className="text-amber-400 font-bold text-sm md:text-base tracking-wider">
-            ⚠️ Tickets are available for purchase! Check your email for more info. Reach out to 50th@csh.rit.edu with any questions!
+            ⚠️ Tickets are available for purchase! Click on the "Tickets" tab for more info. Reach out to 50th@csh.rit.edu with any questions!
           </p>
         </div>
       </div>
@@ -64,7 +64,7 @@ const Index = () => {
               <Link to="/registration">
                 <Button variant="hero" size="xl" className="w-full sm:w-auto">
                   <UserPlus className="w-5 h-5" />
-                  Register
+                  Late Registration
                 </Button>
               </Link>
             </div>

src/pages/Schedule.tsx

@@ -62,6 +62,7 @@ export const typeColors: Record<string, string> = {
   main: "bg-gradient-csh text-primary-foreground",
   food: "bg-amber-500/70 text-amber-200 border-amber-500/30",
   activity: "bg-emerald-500/70 text-emerald-200 border-emerald-500/30",
+  seminar: "bg-purple-500/70 text-purple-200 border-purple-500/30",
   external: "bg-orange-500/70 text-orange-200 border-orange-500/30"
 };
 
@@ -273,7 +274,7 @@ const Schedule = () => {
         <div className="bg-amber-500/20 border-2 border-amber-500/50 py-4 px-4">
           <div className="container mx-auto text-center">
             <p className="text-amber-400 font-bold text-sm md:text-base tracking-wider">
-              ⚠️ Tickets are available for purchase! Check your email for more info. Reach out to 50th@csh.rit.edu with any questions!
+              ⚠️ Tickets are available for purchase! Click on the "Tickets" tab for more info. Reach out to 50th@csh.rit.edu with any questions!
             </p>
           </div>
         </div>

src/pages/ScheduleEvent.ts

@@ -11,5 +11,5 @@ export interface ScheduleEvent {
   address: string,
   capacity: string,
   dressCode: string,
-  type: "social" | "main" | "food" | "activity" | "external"
+  type: "social" | "main" | "food" | "activity" | "seminar" | "external"
 }

src/pages/TicketPrices.tsx

@@ -10,22 +10,22 @@ const TicketPrices = () => {
         <div className="container mx-auto px-4">
           <div className="text-center max-w-3xl mx-auto">
             <h1 className="text-4xl md:text-6xl font-display font-bold mb-4">
-              Ticket <span className="text-gradient">Prices</span>
+              Ticket <span className="text-gradient">Purchasing</span>
             </h1>
-            <div className="bg-amber-500/20 border-2 border-amber-500/50 rounded-xl p-4 mb-8">
+            {/* <div className="bg-amber-500/20 border-2 border-amber-500/50 rounded-xl p-4 mb-8">
               <p className="text-amber-400 font-bold text-lg">
-                ⚠️ Tickets are available for purchase! Check your email for more info. Reach out to 50th@csh.rit.edu with any questions!
+                ⚠️ Tickets are available for purchase! Click on the "Tickets" tab for more info. Reach out to 50th@csh.rit.edu with any questions!
               </p>
-            </div>
-            <p className="text-muted-foreground text-lg mb-8">
+            </div> */}
+            {/* <p className="text-muted-foreground text-lg mb-8">
                 We will send an email to the email you provided at registration when tickets are available for purchase. If you haven't registered yet, please do so!
             </p>
             <a href="/registration" target="_blank" rel="noopener noreferrer">
               <Button variant="hero" size="lg">
                 <UserPlus className="w-5 h-5" />
                 Register For 50th
               </Button>
-            </a>
+            </a> */}
           </div>
         </div>
       </section>
@@ -40,8 +40,10 @@ const TicketPrices = () => {
           <div className="grid grid-cols-1 lg:grid-cols-3 gap-6 items-start">
             {/* Open Sauce Mixer */}
             <div className="glass rounded-2xl p-8">
-              <h3 className="text-2xl font-display font-semibold mb-3">
-                Open Sauce Mixer
+              <h3 className="text-2xl font-display font-semibold mb-3 hover:underline">
+                <a href="https://rittickets.com/Online/seatSelect.asp?createBO::WSmap=1&BOparam::WSmap::loadBestAvailable::performance_ids=8EF606AA-ADED-4902-AE69-3610E0CDD7C0" target="_blank" rel="noopener noreferrer">
+                  Open Sauce Mixer
+                </a>
               </h3>
 
               <p className="text-muted-foreground text-sm mb-4">
@@ -92,8 +94,10 @@ const TicketPrices = () => {
                   Main Event
                 </span>
               </div>
-              <h3 className="text-2xl font-display font-semibold mb-3">
-                Formal Dinner
+              <h3 className="text-2xl font-display font-semibold mb-3 hover:underline">
+                <a href="https://rittickets.com/Online/seatSelect.asp?createBO::WSmap=1&BOparam::WSmap::loadBestAvailable::performance_ids=3F172321-51FE-45FE-81F4-369CCDBD7B85" target="_blank" rel="noopener noreferrer">
+                  Formal Dinner
+                </a>
               </h3>
 
               <p className="text-muted-foreground text-sm mb-4">
@@ -154,8 +158,10 @@ const TicketPrices = () => {
 
             {/* Farewell Brunch */}
             <div className="glass rounded-2xl p-8">
-              <h3 className="text-2xl font-display font-semibold mb-3">
-                Farewell Brunch
+              <h3 className="text-2xl font-display font-semibold mb-3 hover:underline">
+                <a href="https://rittickets.com/Online/seatSelect.asp?createBO::WSmap=1&BOparam::WSmap::loadBestAvailable::performance_ids=9B6701AD-A667-4D9B-9DB7-B9938CDE3FDF" target="_blank" rel="noopener noreferrer">
+                  Farewell Brunch
+                </a>
               </h3>
 
               <p className="text-muted-foreground text-sm mb-4">
@@ -182,19 +188,29 @@ const TicketPrices = () => {
                   <div className="flex justify-between items-start mb-2">
                     <div>
                       <p className="font-semibold">All Inclusive</p>
-                      <p className="text-xs text-muted-foreground">Open Bar + Meal + 50 Tokens</p>
+                      <p className="text-xs text-muted-foreground">3 Drink Tickets + Entree + Side + NA Drink + 50 Tokens</p>
                     </div>
-                    <p className="text-2xl font-display font-bold text-primary">WIP</p>
+                    <p className="text-2xl font-display font-bold text-primary">$40</p>
                   </div>
                 </div>
 
                 <div className="glass rounded-lg p-4 border border-border hover:border-primary/50 transition-colors">
                   <div className="flex justify-between items-start mb-2">
                     <div>
-                      <p className="font-semibold">Standard</p>
-                      <p className="text-xs text-muted-foreground">Meal Ticket + 50 Tokens</p>
+                      <p className="font-semibold">Drinks Only</p>
+                      <p className="text-xs text-muted-foreground">3 Drink Tickets</p>
                     </div>
-                    <p className="text-2xl font-display font-bold text-primary">WIP</p>
+                    <p className="text-2xl font-display font-bold text-primary">$11</p>
+                  </div>
+                </div>
+
+                <div className="glass rounded-lg p-4 border border-border hover:border-primary/50 transition-colors">
+                  <div className="flex justify-between items-start mb-2">
+                    <div>
+                      <p className="font-semibold">Meal Only</p>
+                      <p className="text-xs text-muted-foreground">Entree + Side + NA Drink</p>
+                    </div>
+                    <p className="text-2xl font-display font-bold text-primary">$18</p>
                   </div>
                 </div>
 
@@ -204,7 +220,7 @@ const TicketPrices = () => {
                       <p className="font-semibold">Tokens Only</p>
                       <p className="text-xs text-muted-foreground">50 Tokens</p>
                     </div>
-                    <p className="text-2xl font-display font-bold text-primary">WIP</p>
+                    <p className="text-2xl font-display font-bold text-primary">$12.50</p>
                   </div>
                 </div>
               </div>
@@ -220,7 +236,7 @@ const TicketPrices = () => {
       </section>
 
       {/* CTA Section */}
-      <section className="py-16">
+      {/* <section className="py-16">
         <div className="container mx-auto px-4 text-center">
           <h2 className="text-2xl md:text-3xl font-display font-bold mb-4">
             Ready to Celebrate 50 Years of CSH?
@@ -239,7 +255,7 @@ const TicketPrices = () => {
             </Button>
           </a>
         </div>
-      </section>
+      </section> */}
     </Layout>
   );
 };