Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/components/Login.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const Login = () => {
const [cookies, setCookie] = useCookies(["jwtToken"]);
const { dark, setDark } = useGlobalContext();
const navigate = useNavigate();
const {logged, setLogged} = useGlobalContext();
const {userName, setUserName} = useGlobalContext();

function login(event) {
event.preventDefault();
Expand All @@ -28,6 +30,8 @@ const Login = () => {
)
.then((response) => {
setCookie("jwtToken", response.data.jwtToken, { path: "/" });
setLogged(true);
setUserName(userData.username);
navigate("/");
});
} catch (error) {
Expand Down
9 changes: 6 additions & 3 deletions src/components/NavbarComp.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const NavbarComp = () => {
const { dark, setDark } = useGlobalContext();
const [cookies, setCookie] = useCookies(["jwtToken"]);
const navigate = useNavigate();
const {logged, setLogged} = useGlobalContext();
const {userName, setUserName} = useGlobalContext();

function toggleColorMode() {
if (dark === "dark") {
Expand All @@ -23,6 +25,7 @@ const NavbarComp = () => {

function logout(){
setCookie("jwtToken", "", { path: "/" });
setLogged(false);
navigate("/");
}

Expand All @@ -41,20 +44,20 @@ const NavbarComp = () => {
<Nav.Link style={{ marginRight: "40px" }} as={Link} to="/gamepage">
GamePage
</Nav.Link>
{cookies.jwtToken == "" || cookies.jwtToken == null ? (
{!logged ? (
<Nav.Link as={Link} to="/register">
Register
</Nav.Link>
) : (
""
)}
{cookies.jwtToken == "" || cookies.jwtToken == null ? (
{!logged ? (
<Nav.Link as={Link} to="/login">
Login
</Nav.Link>
) : (
<Nav.Link onClick={() => logout()}>
Logout
{userName} Logout
</Nav.Link>
)}
</Nav>
Expand Down
4 changes: 4 additions & 0 deletions src/components/Register.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ const Register = () => {
const [cookies, setCookie] = useCookies(["jwtToken"]);
const { dark, setDark } = useGlobalContext();
const navigate = useNavigate();
const {logged, setLogged} = useGlobalContext();
const {userName, setUserName} = useGlobalContext();


function register(event) {
Expand Down Expand Up @@ -38,6 +40,8 @@ const Register = () => {
)
.then((response) => {
setCookie("jwtToken", response.data.jwtToken, { path: "/" });
setLogged(true);
setUserName(userData.username);
navigate("/");
});
})
Expand Down
8 changes: 7 additions & 1 deletion src/components/context.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@ export const GlobalProvider = ({ children }) => {
"linear-gradient(to bottom, #121212, #333 60%, #eee 85%)"
);
const [dark, setDark] = useState("dark")
const [logged, setLogged] = useState(false)
const [userName, setUserName] = useState("")

return (
<GlobalContext.Provider
value={{
bgColor,
setBgColor,
dark,
setDark
setDark,
logged,
setLogged,
userName,
setUserName
}}
>
{children}
Expand Down
Loading