modify sidebar
This commit is contained in:
parent
8408889432
commit
950d4a9072
2 changed files with 43 additions and 19 deletions
|
|
@ -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 (
|
||||
|
||||
<div className="HomePage">
|
||||
<Body>
|
||||
|
||||
<ColoredSection >
|
||||
|
||||
|
|
@ -227,7 +230,7 @@ export default function HomePage() {
|
|||
</ContainerPadded>
|
||||
|
||||
</ColoredSection>
|
||||
<Sidebar />
|
||||
<Sidebar logout="{logout}" />
|
||||
<NavBar />
|
||||
|
||||
<div id="footer">
|
||||
|
|
@ -236,15 +239,7 @@ export default function HomePage() {
|
|||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</Body>
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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 (
|
||||
<StyledMenu open={open}>
|
||||
<StyledMenu open={props.open}>
|
||||
<a href="/#about-us">
|
||||
<span role="img" aria-label="about us">💁🏻♂️</span>
|
||||
About us
|
||||
|
|
@ -56,12 +59,34 @@ const Menu = ({ open }) => {
|
|||
<span role="img" aria-label="contact us">📩</span>
|
||||
Contact
|
||||
</a>
|
||||
|
||||
{userData.user ? (
|
||||
<Link >
|
||||
<span role="img" aria-label="{userData.user.username}">📩</span>
|
||||
{userData.user.username}
|
||||
</Link>
|
||||
|
||||
|
||||
):(
|
||||
<React.Fragment>
|
||||
<a href="/user/register">
|
||||
<span role="img" aria-label="Register">📩</span>
|
||||
Register
|
||||
</a>
|
||||
<a href="/user/login">
|
||||
<span role="img" aria-label="Login">📩</span>
|
||||
Login
|
||||
</a>
|
||||
</React.Fragment>
|
||||
)
|
||||
|
||||
}
|
||||
</StyledMenu>
|
||||
)
|
||||
}
|
||||
|
||||
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 (
|
||||
<div>
|
||||
|
||||
<div ref={node}>
|
||||
<Burger open={open} setOpen={setOpen} />
|
||||
<Menu open={open} setOpen={setOpen} />
|
||||
<Menu open={open} setOpen={setOpen} logout={props.logout} />
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in a new issue