Skip to content

Commit

Permalink
Merge pull request #31 from ethb3rlin/init-schedule
Browse files Browse the repository at this point in the history
Init schedule
  • Loading branch information
kuzdogan authored Apr 29, 2024
2 parents 2880afb + d9b3cbd commit 27434af
Show file tree
Hide file tree
Showing 11 changed files with 737 additions and 12 deletions.
11 changes: 6 additions & 5 deletions src/components/Layout.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ 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">
<div className="flex-1 flex flex-col min-h-full font-bundessans text-black max-w-[100rem] min-w-full m-auto">
<Sidebar />
<Seo />
{/* Top Right items Desktop only */}
Expand All @@ -26,7 +27,7 @@ const Layout = ({ children, showEthDiamond, className, hidden }) => {

<div></div>

<div className="hidden md:block fixed -bottom-10 -right-10">
<div className="hidden md:block fixed -bottom-10 -right-10 -z-50">
<img
src={wolpy}
alt="Wolpy logo"
Expand Down Expand Up @@ -75,7 +76,7 @@ const Layout = ({ children, showEthDiamond, className, hidden }) => {
target="_blank"
rel="noreferrer"
>
&lt;&lt;<span className="text-berlin-red">S</span>&lt;OURCE CODE (&#94;)
SOURCE CODE (&#94;)
</a>
</footer>
</div>
Expand Down
15 changes: 11 additions & 4 deletions src/components/Sidebar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ const Sidebar = ({ className }) => {
{" "}
&lt;&lt;<span className="text-berlin-red">H</span>&lt;ACKER MANUAL
</a>
<a className="my-2" href="/schedule">
{" "}
&lt;&lt;<span className="text-berlin-red">S</span>&lt;CHEDULE
</a>
<a className="my-2" href="/face-idont">
{" "}
&lt;&lt;<span className="text-berlin-red">F</span>&lt;ACE IDON'T
Expand All @@ -37,10 +41,12 @@ const Sidebar = ({ className }) => {
{" "}
&lt;&lt;<span className="text-berlin-red">D</span>&lt;EPARTMENT
</a>
<a className="my-2"
<a
className="my-2"
href="https://blog.dod.ngo/"
target="_blank"
rel="noreferrer">
rel="noreferrer"
>
{" "}
&lt;&lt;<span className="text-berlin-red">B</span>&lt;LOG (&#94;)
</a>
Expand Down Expand Up @@ -110,8 +116,9 @@ 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
Expand Down
4 changes: 2 additions & 2 deletions src/components/VenueMapModal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const VenueMapModal = ({
bottom: 0,
backgroundColor: "rgba(255, 255, 255, 0.5)",
},
content: { zIndex: 40, backgroundColor: "rgba(0, 0, 0, 0.9)" },
content: { zIndex: 40, backgroundColor: "rgba(255, 255, 255, 0.9)" },
}}
overlayClassName="flex items-center z-40 px-4 md:px-16 lg:px-32 xl:px-48 transition-all duration-200 ease-in-out"
className="flex flex-col items-center justify-center"
Expand All @@ -31,7 +31,7 @@ const VenueMapModal = ({
closeTimeoutMS={500}
>
<div className=" p-8 ">
<h2 className="text-xl lg:text-3xl mb-4 text-berlin-yellow text-center font-w95">
<h2 className="text-xl lg:text-3xl mb-4 text-berlin-red text-center font-w95">
{activeMapName}
</h2>
<div className="mb-16 lg:px-32 py-2 ">
Expand Down
3 changes: 2 additions & 1 deletion src/html.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,12 @@ export default function HTML(props) {
case 'p':
window.location.href= "/privacy-policy";
break;
case 'f':
window.location.href= "/face-idont";
break;
case 's':
window.location.href= "https://github.com/ethb3rlin/4";
window.location.href= "/schedule";
break;
case 'b':
window.location.href= "https://blog.dod.ngo/";
Expand Down
Binary file added src/images/fifthFloor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/firstFloor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/fourthFloor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/groundFloor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/secondFloor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/images/thirdFloor.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 27434af

Please sign in to comment.