minor tweaks to layout

ethb3rlin · Apr 24, 2024 · 23f99c2 · 23f99c2
1 parent c715c71
commit 23f99c2
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 34 deletions.
diff --git a/src/components/ETHBerlin.jsx b/src/components/ETHBerlin.jsx
@@ -2,7 +2,7 @@ import React from "react";
 
 const ETHBerlin = ({ className }) => (
   <span className={`font-ocra text-sm ${className} break-all`}>
-    ETHBERLIN&lt;&lt;04&lt;&lt;&lt;&lt;IDENTITY&lt;&lt;CRISIS&lt;&lt;
+    ETHBERLIN04&lt;&lt;&lt;&lt;IDENTITY&lt;&lt;CRISIS&lt;&lt;
   </span>
 );
 

diff --git a/src/components/Layout.jsx b/src/components/Layout.jsx
@@ -6,9 +6,8 @@ import wolpy from "../assets/wolpy_transparent_red.png";
 const Layout = ({ children, showEthDiamond, className, hidden }) => {
   return (
     <div
-      className={`${
-        className ? className : ""
-      } flex flex-col min-h-screen min-w-screen`}
+      className={`${className ? className : ""
+        } flex flex-col min-h-screen min-w-screen`}
     >
       <div className="flex-1 flex flex-col min-h-full font-bundessans text-black max-w-[100rem] m-auto">
         <Sidebar />
@@ -48,7 +47,13 @@ const Layout = ({ children, showEthDiamond, className, hidden }) => {
         <footer
           className={`flex flex-col md:flex-row flex-wrap justify-evenly items-center text-center sm:justify-end my-4 z-20 sm:mr-6 text-xs font-ocra sm:ml-72 leading-3`}
         >
-          <a className="mx-4 my-2 sm:ml-4 text-black" href="/decentralization">
+          <a className="mx-4 my-2 sm:ml-4 text-black" href="/code-of-conduct">
+            CODE &lt;&lt;<span className="text-berlin-red">O</span>&lt;F CONDUCT
+          </a>
+          <a className="mx-4 my-2 sm:ml-4 text-black" href="/privacy-policy">
+            PRIVACY &lt;&lt;<span className="text-berlin-red">P</span>&lt;OLICY
+          </a>
+          {/* <a className="mx-4 my-2 sm:ml-4 text-black" href="/decentralization">
             department of &lt;&lt;<span className="text-berlin-red">d</span>
             &lt;ecentralization
           </a>
@@ -58,25 +63,19 @@ const Layout = ({ children, showEthDiamond, className, hidden }) => {
             target="_blank"
             rel="noreferrer"
           >
-            &lt;&lt;<span className="text-berlin-red">b</span>&lt;log
-          </a>
+            &lt;&lt;<span className="text-berlin-red">b</span>&lt;log[&#94;]
+          </a> */}
           <a className="mx-4 my-2 sm:ml-4 text-black" href="/contact">
-            contact & &lt;&lt;<span className="text-berlin-red">i</span>
-            &lt;mpressum
-          </a>
-          <a className="mx-4 my-2 sm:ml-4 text-black" href="/code-of-conduct">
-            code &lt;&lt;<span className="text-berlin-red">o</span>&lt;f conduct
-          </a>
-          <a className="mx-4 my-2 sm:ml-4 text-black" href="/privacy-policy">
-            privacy &lt;&lt;<span className="text-berlin-red">p</span>&lt;olicy
+            CONTACT &amp; &lt;&lt;<span className="text-berlin-red">I</span>
+            &lt;MPRESSUM
           </a>
           <a
             className="mx-4 my-2 sm:ml-4 text-black"
             href="https://github.com/ethb3rlin/4"
             target="_blank"
             rel="noreferrer"
           >
-            source
+            &lt;&lt;<span className="text-berlin-red">S</span>&lt;OURCE CODE (&#94;)
           </a>
         </footer>
       </div>

diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx
@@ -31,7 +31,18 @@ const Sidebar = ({ className }) => {
       </a>
       <a className="my-2" href="/face-idont">
         {" "}
-        &lt;&lt;<span className="text-berlin-red">F</span>&lt;ACE I&lt;DON'T
+        &lt;&lt;<span className="text-berlin-red">F</span>&lt;ACE IDON'T
+      </a>
+      <a className="my-2" href="/decentralization">
+        {" "}
+        &lt;&lt;<span className="text-berlin-red">D</span>&lt;EPARTMENT
+      </a>
+      <a className="my-2"
+        href="https://blog.dod.ngo/"
+        target="_blank"
+        rel="noreferrer">
+        {" "}
+        &lt;&lt;<span className="text-berlin-red">B</span>&lt;LOG (&#94;)
       </a>
     </nav>
   );
@@ -51,23 +62,22 @@ const Sidebar = ({ className }) => {
         <MenuItems className="mt-16" />
         <div className="mt-auto">
           <div className="my-2 text-sm">
-            join our{" "}
             <a
               className="underline"
               href="https://matrix.to/#/%23ethberlin:dod.ngo"
               target="_blank"
               rel="noreferrer"
             >
-              matrix space
+              #ethberlin:dod.ngo
             </a>
-            &nbsp;or{" "}
+            <br />
             <a
               className="underline"
               href="mailto:contact@ethberlin.org"
               target="_blank"
               rel="noreferrer"
             >
-              e-mail us
+              contact@ethberlin.org
             </a>
           </div>
         </div>
@@ -100,9 +110,8 @@ const Sidebar = ({ className }) => {
               </button>
             </div>
             <MenuItems
-              className={`flex z-30 ${
-                showNav ? "visible opacity-95" : "invisible opacity-0"
-              } flex-col items-center transition-all duration-200 ease-in-out text-xl fixed bg-black top-0 left-0 w-screen h-screen justify-center`}
+              className={`flex z-30 ${showNav ? "visible opacity-95" : "invisible opacity-0"
+                } flex-col items-center transition-all duration-200 ease-in-out text-xl fixed bg-black top-0 left-0 w-screen h-screen justify-center`}
               style={{ backgroundColor: "rgba(255, 255, 255, 0.95)" }}
               setShowNav={setShowNav}
               mobile

diff --git a/src/html.js b/src/html.js
@@ -50,6 +50,9 @@ export default function HTML(props) {
                     case 'f':
                         window.location.href= "/face-idont";
                         break;
+                    case 's':
+                        window.location.href= "https://github.com/ethb3rlin/4";
+                        break;
                     case 'b':
                         window.location.href= "https://blog.dod.ngo/";
                         break;

diff --git a/src/pages/index.jsx b/src/pages/index.jsx
@@ -109,15 +109,13 @@ const Home = () => {
     <>
       <EthBerlinLogo
         ref={ethBerlinTextRef}
-        className={`${
-          showSidebar ? "hidden" : "sm:flex"
-        } flex-col top-0 left-0 px-6 py-8 fixed w-auto  justify-center origin-center`}
+        className={`${showSidebar ? "hidden" : "sm:flex"
+          } flex-col top-0 left-0 px-6 py-8 fixed w-auto  justify-center origin-center`}
       />
       {/* Scroll indicator */}
       <button
-        className={`hidden ${
-          showSidebar ? "hidden" : "sm:flex"
-        } text-black  fixed left-1/2 bottom-0 font-light flex-col -translate-x-1/2 z-20`}
+        className={`hidden ${showSidebar ? "hidden" : "sm:flex"
+          } text-black  fixed left-1/2 bottom-0 font-light flex-col -translate-x-1/2 z-20`}
         onClick={sendToTopLeft}
       >
         <span className="material-symbols-outlined text-6xl -mb-4 light-up">
@@ -128,11 +126,10 @@ const Home = () => {
         </span>
       </button>
       <Layout
-        className={` ${
-          !showSidebar
+        className={` ${!showSidebar
             ? "invisible opacity-0"
             : "fade-in-left visible opacity-100"
-        } transition-opacity duration-2000 ease-in-out`}
+          } transition-opacity duration-2000 ease-in-out`}
       >
         {/* Page content */}
         <div className={`flex flex-col xl:flex-row-reverse`}>
@@ -149,6 +146,7 @@ const Home = () => {
               <p className="font-ocra my-0"> Event: ETHBerlin04</p>
               <p className="font-ocra my-0"> Theme: Identity Crisis</p>
               <p className="font-ocra my-0"> Dates: May 24-26, 2024</p>
+              <p className="font-ocra my-0"> Location: CIC, Berlin</p>
             </p>
           </div>
           {/* Left side text box */}
@@ -160,7 +158,7 @@ const Home = () => {
             </p>
 
             <p>
-              Loading <ETHBerlin />: May 24-26, 2024, Berlin, Germany.
+              Loading <ETHBerlin />: May 24-26, 2024, CIC Innovation Campus, Berlin, Germany.
             </p>
 
             <p>