From f8f8ef93279b856499b37c6fbc49542633fccd0a Mon Sep 17 00:00:00 2001
From: Priyatham Sai Chand
Date: Mon, 5 Apr 2021 16:11:07 +0530
Subject: [PATCH] add after log in
---
src/components/LogInContainer.js | 52 +++++++++++++++++++++++++++-----
src/components/NavBar.js | 13 ++++----
2 files changed, 50 insertions(+), 15 deletions(-)
diff --git a/src/components/LogInContainer.js b/src/components/LogInContainer.js
index c4198f7..623cf94 100644
--- a/src/components/LogInContainer.js
+++ b/src/components/LogInContainer.js
@@ -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 (
-
@@ -154,6 +159,8 @@ const LogInContainer = (props) => {
+ {!userData.user ? (
+
Sign In
Sign Up
@@ -165,15 +172,44 @@ const LogInContainer = (props) => {
-
+
+ ) : (
+
+
+ Log in successful.
+
+
+
+
+
-
+
+ )}
+
+
+
-
-
+
+
);
}
diff --git a/src/components/NavBar.js b/src/components/NavBar.js
index bfe381d..4daba95 100644
--- a/src/components/NavBar.js
+++ b/src/components/NavBar.js
@@ -89,18 +89,17 @@ 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,
});
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() {
Contact us
{userData.user ? (
- {userData.user.username}
+ logout(setUserData)}>{userData.user.username}
) : (