diff --git a/package.json b/package.json index ca4f31e..234062d 100644 --- a/package.json +++ b/package.json @@ -5,6 +5,7 @@ "dependencies": { "cz": "^1.8.2", "react": "^18.2.0", + "react-burger-menu": "^3.0.8", "react-dom": "^18.2.0", "react-router-dom": "^6.3.0", "react-scripts": "5.0.1", diff --git a/src/App.css b/src/App.css index ad51632..188226b 100644 --- a/src/App.css +++ b/src/App.css @@ -17,4 +17,12 @@ a { color: #fff; text-decoration: none; +} + +* { + box-sizing: border-box; +} + +#page-wrap { + padding-bottom: 10px; } \ No newline at end of file diff --git a/src/App.js b/src/App.js index 021f164..e3da424 100644 --- a/src/App.js +++ b/src/App.js @@ -3,19 +3,21 @@ import { HashRouter, Routes, Route } from "react-router-dom"; import Genesis from './pages/Genesis'; import Home from './pages/Home'; import './App.css'; +import Sidebar from "./components/Sidebar"; function App() { - console.log('process.env.PUBLIC_URL: ', process.env.PUBLIC_URL) - console.log('process.env.NODE_ENV: ', process.env.NODE_ENV) return ( -
- - - } /> - } /> - - -
+ +
+ +
+ + } /> + } /> + +
+
+ ); } diff --git a/src/common.js b/src/common.js index 12bb376..be4876d 100644 --- a/src/common.js +++ b/src/common.js @@ -30,24 +30,28 @@ export const organizers = [ logo: 'dxdao.png', name: 'DXDAO', rol: 'INFINIT INITIATOR', - description:'DECENTRALIZATION SUPER SOLDIER' + description:'DECENTRALIZATION SUPER SOLDIER', + url: 'https://dxdao.eth.limo/' }, { logo: 'hopr.png', name: 'HOPR', rol: 'GENESIS CO-ORGANIZER', - description:'PRIVACY PIONEERS' + description:'PRIVACY PIONEERS', + url: 'https://hoprnet.org/' }, { logo: 'brink.png', name: 'BRINK', rol: 'GENESIS CO-ORGANIZER', - description:'AUTOMATION AFICIANDOS' + description:'AUTOMATION AFICIANDOS', + url: 'https://brink.trade/' }, { logo: 'join.png', name: 'JOIN US', rol: 'BECOME AN ORGANIZER', + url: 'https://twitter.com/messages/compose?recipient_id=1544019424382009345' }, ] diff --git a/src/components/Button.js b/src/components/Button.js index 46e5b5f..9b0965b 100644 --- a/src/components/Button.js +++ b/src/components/Button.js @@ -16,7 +16,7 @@ export default function Button(props) { ) : - + {img} {text} diff --git a/src/components/Header.js b/src/components/Header.js index f175208..b265f06 100644 --- a/src/components/Header.js +++ b/src/components/Header.js @@ -19,7 +19,7 @@ export default function Header(props) { <>
- + infinite
diff --git a/src/components/Organizer.js b/src/components/Organizer.js index 8a1e9ca..48918f4 100644 --- a/src/components/Organizer.js +++ b/src/components/Organizer.js @@ -1,22 +1,24 @@ import '../styles/Organizers.css'; export default function Organizer(props) { - const { logo, name, rol, description } = props + const { logo, name, rol, description, url } = props return ( -
+ <>
-
- {name} - {name} +
+ + {name} + {name} + +
+ {rol} +
+
+ + {description} + +
-
- {rol} -
-
- - {description} - -
-
+ ) } \ No newline at end of file diff --git a/src/components/Organizers.js b/src/components/Organizers.js index c3ed2ba..002564f 100644 --- a/src/components/Organizers.js +++ b/src/components/Organizers.js @@ -14,7 +14,7 @@ export default function Organizers() {
- {organizers.map(o => )} + {organizers.map(o => )}
diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js new file mode 100644 index 0000000..911bcfb --- /dev/null +++ b/src/components/Sidebar.js @@ -0,0 +1,62 @@ +//external imports +import { Link } from "react-router-dom"; +import { slide as Menu } from 'react-burger-menu'; +import { useState } from "react"; + +//styles +import '../styles/Sidebar.css'; + +//internal imports +import Button from './Button'; +import infinite from '../static/infinite-white-background.png' +import cross from '../static/cross.png' +import burger from '../static/burger-button.png' + + + +export default function Sidebar(props) { + + const [isOpen, setOpen] = useState(false) + + const handleIsOpen = () => { + setOpen(!isOpen) + } + + const closeSideBar = () => { + setOpen(false) + } + + return ( + } customCrossIcon={cross}> +
+ infinite +
+
+ + HOME + + + GENESIS + +
+
+
+ + ); +}; \ No newline at end of file diff --git a/src/pages/Genesis/index.js b/src/pages/Genesis/index.js index 8bcba01..b228b7e 100644 --- a/src/pages/Genesis/index.js +++ b/src/pages/Genesis/index.js @@ -60,7 +60,7 @@ export default function Home() { footer='Learn More' /> diff --git a/src/pages/Home/index.js b/src/pages/Home/index.js index 0d814e6..2c5d55c 100644 --- a/src/pages/Home/index.js +++ b/src/pages/Home/index.js @@ -27,11 +27,11 @@ export default function Home() {
+ - - +