diff --git a/src/components/HomePage.js b/src/components/HomePage.js index 99bb24c..e265238 100644 --- a/src/components/HomePage.js +++ b/src/components/HomePage.js @@ -11,6 +11,9 @@ import { Bullseye } from "@styled-icons/fa-solid"; import { StyledIconBase } from '@styled-icons/styled-icon' import Sidebar from './Sidebar'; +const Body = styled.div` +`; + const IconStyler = styled.div` ${StyledIconBase} { width: ${props => props.width ? props.width : 26}px; @@ -93,7 +96,7 @@ export default function HomePage() { return ( -
+ @@ -227,7 +230,7 @@ export default function HomePage() { - + - - - - - - - - + ); } diff --git a/src/components/Sidebar.js b/src/components/Sidebar.js index 28dcd80..30530ba 100644 --- a/src/components/Sidebar.js +++ b/src/components/Sidebar.js @@ -1,10 +1,12 @@ -import React, {useState} from 'react'; +import React, {useState, useContext} from 'react'; +import { Link } from 'react-router-dom' import styled from 'styled-components'; - +import UserContext from '../context/UserContext'; const StyledMenu = styled.nav` display: flex; flex-direction: column; + position:fixed !important; justify-content: center; background: #EFFFFA; transform: ${({ open }) => open ? 'translateX(0)' : 'translateX(-100%)'}; @@ -41,9 +43,10 @@ const StyledMenu = styled.nav` } ` -const Menu = ({ open }) => { +const Menu = (props) => { + const { userData, setUserData } = useContext(UserContext); return ( - + 💁🏻‍♂️ About us @@ -56,12 +59,34 @@ const Menu = ({ open }) => { 📩 Contact + + {userData.user ? ( + + 📩 + {userData.user.username} + + + + ):( + + + 📩 + Register + + + 📩 + Login + + + ) + + } ) } const StyledBurger = styled.button` - position: absolute; + position: fixed; top: 5%; left: 2rem; display: flex; @@ -78,6 +103,10 @@ const StyledBurger = styled.button` &:focus { outline: none; } + &:hover{ + background: transparent; + + } div { width: 2rem; @@ -117,15 +146,15 @@ const Burger = ({ open, setOpen }) => { } -const Sidebar = () => { - const [open, setOpen] = React.useState(false); +const Sidebar = (props) => { + const [open, setOpen] = useState(false); const node = React.useRef(); return (
- +
)