style Continue as Guest button, patch account display on NavBar
This commit is contained in:
parent
0ec92dd5e9
commit
9cae5ff185
3 changed files with 39 additions and 15 deletions
|
@ -51,3 +51,8 @@ table {
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
border-spacing: 0;
|
border-spacing: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
}
|
|
@ -1,4 +1,5 @@
|
||||||
@import '../../../../public/stylesheets/partials/mixins';
|
@import '../../../../public/stylesheets/partials/mixins';
|
||||||
|
@import '../../../../public/stylesheets/partials/variables';
|
||||||
|
|
||||||
div.main-wrapper {
|
div.main-wrapper {
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -33,4 +34,15 @@ div.main-wrapper {
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
button {
|
||||||
|
color:map-get($colors, 'sidebar_link');
|
||||||
|
cursor: pointer;
|
||||||
|
font-family: inherit;
|
||||||
|
font-size: 110%;
|
||||||
|
font-weight: bold;
|
||||||
|
margin-bottom: .5em;
|
||||||
|
padding: 0;
|
||||||
|
text-decoration: none;
|
||||||
}
|
}
|
|
@ -1,29 +1,36 @@
|
||||||
import React from 'react';
|
import React from "react";
|
||||||
import { Link } from 'react-router-dom';
|
import { Link } from "react-router-dom";
|
||||||
import './NavBar.scss';
|
import "./NavBar.scss";
|
||||||
import Logo from '../../../components/Display/Logo/Logo';
|
import Logo from "../../../components/Display/Logo/Logo";
|
||||||
|
|
||||||
const NavBar = (props) => {
|
|
||||||
|
|
||||||
|
const NavBar = ({ state }) => {
|
||||||
return (
|
return (
|
||||||
<div className="NavBar" data-testid="NavBar">
|
<div className="NavBar" data-testid="NavBar">
|
||||||
<Link to="/home" >
|
<Link to="/home">
|
||||||
<div className="NavBar__logo"><Logo /></div>
|
<div className="NavBar__logo">
|
||||||
|
<Logo />
|
||||||
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
<Link to="/home" >
|
<Link to="/home">
|
||||||
<div className="NavBar__menu-item NavBar__home"><p className="--link">Find a Game</p></div>
|
<div className="NavBar__menu-item NavBar__home">
|
||||||
|
<p className="--link">Find a Game</p>
|
||||||
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
<Link to="/news">
|
<Link to="/news">
|
||||||
<div className="NavBar__menu-item NavBar__news"><p className="--link">News</p></div>
|
<div className="NavBar__menu-item NavBar__news">
|
||||||
|
<p className="--link">News</p>
|
||||||
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
|
|
||||||
<Link to="/account">
|
<Link to="/account">
|
||||||
<div className="NavBar__menu-item NavBar__account">{props.user ? props.user.username : <></>}</div>
|
<div className="NavBar__menu-item NavBar__account">
|
||||||
|
{state.user.username ? state.user.username : <></>}
|
||||||
|
</div>
|
||||||
</Link>
|
</Link>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
};
|
||||||
|
|
||||||
export default NavBar;
|
export default NavBar;
|
||||||
|
|
Loading…
Reference in a new issue