Merge pull request #38 from ethb3rlin/q9f/floors

update floor plans

src/components/Sidebar.jsx

@@ -33,6 +33,10 @@ const Sidebar = ({ className }) => {
         {" "}
         &lt;&lt;<span className="text-berlin-red">S</span>&lt;CHEDULE
       </a>
+      <a className="my-2" href="/venue">
+        {" "}
+        &lt;&lt;<span className="text-berlin-red">V</span>&lt;ENUE
+      </a>
       <a className="my-2" href="/face-idont">
         {" "}
         &lt;&lt;<span className="text-berlin-red">F</span>&lt;ACE IDON'T

src/html.js

@@ -57,6 +57,9 @@ export default function HTML(props) {
                     case 's':
                         window.location.href= "/schedule";
                         break;
+                    case 'v':
+                        window.location.href= "/venue";
+                        break;
                     case 'b':
                         window.location.href= "https://blog.dod.ngo/";
                         break;

src/pages/hacker-manual.jsx

@@ -556,7 +556,7 @@ const Hack = () => {
         <VenueMapModal
           isOpen={isMapModalOpen}
           handleCloseModal={handleCloseModal}
-          activeMapName={"Ground Floor / Floor 0"}
+          activeMapName={"Ground Floor (#0)"}
           activeMap={groundFloor} // only ground floor
           activeRoomClass={"yard1"}
         />

src/pages/schedule.jsx

@@ -7,9 +7,10 @@ import "../styles/rooms/firstFloor.css";
 import "../styles/rooms/secondFloor.css";
 import "../styles/rooms/fifthFloor.css";
 import groundFloor from "../images/groundFloor.png";
-import thirdFloor from "../images/thirdFloor.png";
 import firstFloor from "../images/firstFloor.png";
 import secondFloor from "../images/secondFloor.png";
+import thirdFloor from "../images/thirdFloor.png";
+import fourthFloor from "../images/fourthFloor.png";
 import fifthFloor from "../images/fifthFloor.png";
 import ETHBerlin from "../components/ETHBerlin";
 import VenueMapModal from "../components/VenueMapModal";
@@ -215,9 +216,7 @@ const Program = () => {
   const [isMapModalOpen, setIsMapModalOpen] = React.useState(false);
   const [activeMap, setActiveMap] = React.useState(groundFloor);
   const [activeRoomClass, setActiveRoomClass] = React.useState("lexis");
-  const [activeMapName, setActiveMapName] = React.useState(
-    "Ground Floor / Floor 0"
-  );
+  const [activeMapName, setActiveMapName] = React.useState("Ground Floor (#0)");
   const [isExtravaganza, setIsExtravaganza] = React.useState(false);
   const [isSticky, setIsSticky] = React.useState(false);
 
@@ -230,21 +229,32 @@ const Program = () => {
 
   const handleGroundFloor = () => {
     setActiveMap(groundFloor);
-    setActiveMapName("Ground Floor / Floor 0");
+    setActiveMapName("Ground Floor (#0)");
   };
 
   const handleFirstFloor = () => {
     setActiveMap(firstFloor);
-    setActiveMapName("First Floor / Floor 1");
+    setActiveMapName("First Floor (#1)");
   };
 
   const handleSecondFloor = () => {
     setActiveMap(secondFloor);
-    setActiveMapName("Second Floor / Floor 2");
+    setActiveMapName("Second Floor (#2)");
+  };
+
+  const handleThirdFloor = () => {
+    setActiveMap(thirdFloor);
+    setActiveMapName("Third Floor (#3)");
+  };
+
+  const handleFourthFloor = () => {
+    setActiveMap(fourthFloor);
+    setActiveMapName("Fourth Floor (#4)");
   };
+
   const handleFifthFloor = () => {
     setActiveMap(fifthFloor);
-    setActiveMapName("Fifth Floor / Floor 5");
+    setActiveMapName("Fifth Floor (#5)");
   };
 
   const locations = {
@@ -264,6 +274,14 @@ const Program = () => {
         setIsMapModalOpen(true);
       },
     },
+    yard0: {
+      name: "Yard 0",
+      handler: () => {
+        handleGroundFloor();
+        setActiveRoomClass("yard0");
+        setIsMapModalOpen(true);
+      },
+    },
     yard1: {
       name: "Yard 1",
       handler: () => {
@@ -280,14 +298,6 @@ const Program = () => {
         setIsMapModalOpen(true);
       },
     },
-    yard3: {
-      name: "Yard 3",
-      handler: () => {
-        handleGroundFloor();
-        setActiveRoomClass("yard3");
-        setIsMapModalOpen(true);
-      },
-    },
     mainEnterence: {
       name: "Main Enterance",
       handler: () => {
@@ -328,14 +338,6 @@ const Program = () => {
         setIsMapModalOpen(true);
       },
     },
-    watergate: {
-      name: "Watergate",
-      handler: () => {
-        window
-          .open("http://water-gate.de/de/contact/contact.html", "_blank")
-          .focus();
-      },
-    },
     wildenbruch: {
       name: "Wildenbruch",
       handler: () => {
@@ -376,14 +378,6 @@ const Program = () => {
         setIsMapModalOpen(true);
       },
     },
-    yard1: {
-      name: "Yard 1",
-      handler: () => {
-        handleGroundFloor();
-        setActiveRoomClass("yard1");
-        setIsMapModalOpen(true);
-      },
-    },
   };
 
   React.useEffect(() => {
@@ -531,7 +525,7 @@ const Program = () => {
                 startTime="19:00"
                 endTime="21:00"
                 title="Dinner"
-                eventLocations={[locations.restaurant]}
+                eventLocations={[locations.lexis]}
               />
               {isExtravaganza && (
                 <ProgramItem
@@ -727,7 +721,7 @@ const Program = () => {
               endDayStr="2024-05-26"
               endTime="01:00"
               title="DJs in Courtyard 1"
-              eventLocations={[locations.yard1]}
+              eventLocations={[locations.yard0]}
             />
             <ProgramItem
               dayStr="2024-05-25"
@@ -746,7 +740,7 @@ const Program = () => {
                   </a>
                 </span>
               }
-              eventLocations={[locations.yard1]}
+              eventLocations={[locations.yard0]}
               className="ml-12"
             />
             <ProgramItem
@@ -774,7 +768,7 @@ const Program = () => {
                   </a>
                 </span>
               }
-              eventLocations={[locations.yard1]}
+              eventLocations={[locations.yard0]}
               className="ml-12"
             />
             <ProgramItem
@@ -794,7 +788,7 @@ const Program = () => {
                   </a>
                 </span>
               }
-              eventLocations={[locations.yard1]}
+              eventLocations={[locations.yard0]}
               className="ml-12"
             />
             <ProgramItem
@@ -815,7 +809,7 @@ const Program = () => {
                   </a>
                 </span>
               }
-              eventLocations={[locations.yard1]}
+              eventLocations={[locations.yard0]}
               className="ml-12"
             />
             <ProgramItem

src/pages/venue.jsx

@@ -0,0 +1,75 @@
+import Layout from "../components/Layout";
+import React from "react";
+import groundFloor from "../images/groundFloor.png";
+import firstFloor from "../images/firstFloor.png";
+import secondFloor from "../images/secondFloor.png";
+import thirdFloor from "../images/thirdFloor.png";
+import fourthFloor from "../images/fourthFloor.png";
+import fifthFloor from "../images/fifthFloor.png";
+
+const Venue = () => {
+  return (
+    <Layout>
+      <div className="textbox">
+        <h1 className="my-4 underline text-secondary font-ocra">
+          &lt;&lt;V&lt;ENUE
+        </h1>
+        <div className="">
+          <p className="mt-4">
+            You have access to almost the entire venue for ETHBerlin04. Go
+            explore, find all experiences, eat at the restaurant, chill in the
+            cinema or discover the best rooms for hacking. This venue map will
+            help you navigate all the floors.
+          </p>
+          <p className="mt-4">
+            Start at the registration and gift shop on the ground floor. A
+            secondary entrance and exit is available through backyard 0
+            (registered hackers only).
+          </p>
+          <p className="mt-4">
+            Note, areas marked in grey (and the entire 4th floor) are not
+            available for hackers this year.
+          </p>
+          <div className="relative mb-16">
+            <h2 className="text-3xl text-center mt-12 font-bold">
+              Ground Floor
+            </h2>
+            <img src={groundFloor} alt="ground floor"></img>
+          </div>
+          <div className="relative mb-16">
+            <h2 className="text-3xl text-center mt-12 font-bold">
+              First Floor
+            </h2>
+            <img src={firstFloor} alt="first floor"></img>
+          </div>
+          <div className="relative mb-16">
+            <h2 className="text-3xl text-center mt-12 font-bold">
+              Second Floor
+            </h2>
+            <img src={secondFloor} alt="second floor"></img>
+          </div>
+          <div className="relative mb-16">
+            <h2 className="text-3xl text-center mt-12 font-bold">
+              Third Floor
+            </h2>
+            <img src={thirdFloor} alt="third floor"></img>
+          </div>
+          <div className="relative mb-16">
+            <h2 className="text-3xl text-center mt-12 font-bold">
+              Fourth Floor
+            </h2>
+            <img src={fourthFloor} alt="fourth floor"></img>
+          </div>
+          <div className="relative mb-16">
+            <h2 className="text-3xl text-center mt-12 font-bold">
+              Fifth Floor
+            </h2>
+            <img src={fifthFloor} alt="fifth floor"></img>
+          </div>
+        </div>
+      </div>
+    </Layout>
+  );
+};
+
+export default Venue;