add after log in
This commit is contained in:
parent
80db290d4d
commit
f8f8ef9327
|
@ -1,9 +1,12 @@
|
|||
import React from 'react';
|
||||
import { BrowserRouter, Route, NavLink, Switch,withRouter } from 'react-router-dom';
|
||||
import React, {useContext} from 'react';
|
||||
import { useHistory,BrowserRouter, Route, NavLink, Switch,withRouter } from 'react-router-dom';
|
||||
import Register from './Register';
|
||||
import Login from './Login';
|
||||
import Footer from './Footer';
|
||||
import styled, {css} from 'styled-components';
|
||||
import {Button} from './miscellaneous/Styles';
|
||||
import UserContext from "../context/UserContext";
|
||||
import {logout} from "./NavBar"
|
||||
|
||||
const BaseApp = styled.div`
|
||||
display: flex;
|
||||
|
@ -66,7 +69,8 @@ const TextContainer = styled.p`
|
|||
`;
|
||||
|
||||
const BannerText = styled.p`
|
||||
color:white;
|
||||
|
||||
color:${props => props.colour ? props.colour : "white"};
|
||||
font-size: 1.25em;
|
||||
font-style:italic;
|
||||
|
||||
|
@ -137,8 +141,9 @@ const FormTitle = styled.div`
|
|||
|
||||
`;
|
||||
const LogInContainer = (props) => {
|
||||
const { userData, setUserData } = useContext(UserContext);
|
||||
const history = useHistory();
|
||||
return (
|
||||
<BrowserRouter basename="user">
|
||||
<BaseApp>
|
||||
<AppSide>
|
||||
<PlaneContainer>
|
||||
|
@ -154,6 +159,8 @@ const LogInContainer = (props) => {
|
|||
</SkyContainer>
|
||||
</AppSide>
|
||||
<AppForm>
|
||||
{!userData.user ? (
|
||||
<BrowserRouter basename="user">
|
||||
<PageSwitcherContainer>
|
||||
<PageSwitcher to="/login" >Sign In</PageSwitcher>
|
||||
<PageSwitcher to="/register" >Sign Up</PageSwitcher>
|
||||
|
@ -165,15 +172,44 @@ const LogInContainer = (props) => {
|
|||
<Route path="/register" component={Register} />
|
||||
<Route path="/login" component={Login} />
|
||||
</Switch>
|
||||
<p>
|
||||
</BrowserRouter>
|
||||
) : (
|
||||
|
||||
<React.Fragment>
|
||||
<BannerText colour="black">Log in successful.</BannerText>
|
||||
<Button
|
||||
type="submit"
|
||||
radiuscolor="#009578"
|
||||
textcolor="#009578"
|
||||
hovercolor="#009578"
|
||||
hovertextcolor="white"
|
||||
onClick={() => { history.push("/")}}
|
||||
|
||||
>home</Button>
|
||||
|
||||
<Button
|
||||
type="submit"
|
||||
radiuscolor="#009578"
|
||||
textcolor="#009578"
|
||||
hovercolor="#009578"
|
||||
hovertextcolor="white"
|
||||
onClick={() => {logout(setUserData); history.push("/")}}
|
||||
|
||||
>Logout</Button>
|
||||
|
||||
</React.Fragment>
|
||||
|
||||
|
||||
)}
|
||||
|
||||
|
||||
|
||||
</p>
|
||||
|
||||
</AppForm>
|
||||
|
||||
</BaseApp>
|
||||
<Footer background="blue"/>
|
||||
</BrowserRouter>
|
||||
|
||||
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
@ -89,11 +89,7 @@ const Linker = styled(Link)`
|
|||
|
||||
`;
|
||||
|
||||
|
||||
export default function NavBar() {
|
||||
const { userData, setUserData } = useContext(UserContext);
|
||||
const [scrolled, setScrolled] = useState();
|
||||
const logout = () => {
|
||||
export const logout = (setUserData) => {
|
||||
setUserData({
|
||||
token: undefined,
|
||||
user: undefined,
|
||||
|
@ -101,6 +97,9 @@ export default function NavBar() {
|
|||
localStorage.setItem("auth-token", "");
|
||||
};
|
||||
|
||||
export default function NavBar() {
|
||||
const [scrolled, setScrolled] = useState();
|
||||
const { userData, setUserData } = useContext(UserContext);
|
||||
|
||||
const handleScroll=() => {
|
||||
const offset=window.scrollY;
|
||||
|
@ -129,7 +128,7 @@ export default function NavBar() {
|
|||
<ListElement><Anchor href="/#footer">Contact us</Anchor></ListElement>
|
||||
{userData.user ? (
|
||||
<React.Fragment>
|
||||
<ListElement><Linker onClick={logout}>{userData.user.username}</Linker></ListElement>
|
||||
<ListElement><Linker onClick={() => logout(setUserData)}>{userData.user.username}</Linker></ListElement>
|
||||
</React.Fragment>
|
||||
|
||||
) : (
|
||||
|
|
Loading…
Reference in New Issue