diff --git a/client/src/Pages/Login.jsx b/client/src/Pages/Login.jsx
index e9646cd..c9bf093 100644
--- a/client/src/Pages/Login.jsx
+++ b/client/src/Pages/Login.jsx
@@ -1,4 +1,4 @@
-import React, { useEffect , useState } from "react";
+import React, { useEffect, useState } from "react";
import { Container, Col, Row } from "react-bootstrap";
import { FcGoogle } from "react-icons/fc";
import axios from "axios";
@@ -18,7 +18,6 @@ function AuthPage() {
const notifyError = (message) => {
toast.error(message);
};
-
function ToggleSign(event) {
event.preventDefault();
@@ -40,38 +39,39 @@ function AuthPage() {
async function handleSubmit(event) {
event.preventDefault();
- if (!formData.username.trim() && signin) {
- notifyError("Username cannot be empty");
- return;
- }
+ if (!formData.username.trim() && signin) {
+ notifyError("Username cannot be empty");
+ return;
+ }
- const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
- if (!emailRegex.test(formData.email)) {
- notifyError("Enter a valid email address");
- return;
- }
+ const emailRegex = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/;
+ if (!emailRegex.test(formData.email)) {
+ notifyError("Enter a valid email address");
+ return;
+ }
- // Check password length
- if (formData.password.length < 8) {
- notifyError("Password must be at least 8 characters long");
- return;
- }
+ // Check password length
+ if (formData.password.length < 8) {
+ notifyError("Password must be at least 8 characters long");
+ return;
+ }
try {
const response = await axios.post(
- `http://localhost:8080/api/${
- !signin ? "login" : "register"
- }`,
- formData
+ `http://localhost:8080/api/${!signin ? "login" : "register"}`,
+ formData,
+ { withCredentials: true }
);
- const { user } = response.data;
- delete user.password;
- const gravatarUrl = `https://www.gravatar.com/avatar/${md5(
- user.email
- )}?d=identicon`;
- user.profilePicture = gravatarUrl;
- localStorage.setItem("user", JSON.stringify(user));
- window.location.href = "/Welcom";
+ if (response.status === 200) {
+ const { user } = response.data;
+ delete user.password;
+ const gravatarUrl = `https://www.gravatar.com/avatar/${md5(
+ user.email
+ )}?d=identicon`;
+ user.profilePicture = gravatarUrl;
+
+ window.location.href = "/Welcome";
+ }
} catch (error) {
console.error("Authentication error:", error);
if (
@@ -88,11 +88,9 @@ function AuthPage() {
const handleGoogleLogin = (event) => {
event.preventDefault();
- window.location.href =
- "http://localhost:8080/auth/google";
+ window.location.href = "http://localhost:8080/auth/google";
};
-
return (
<>
diff --git a/client/src/Pages/Navbar.jsx b/client/src/Pages/Navbar.jsx
index 24bdb40..83dfe56 100644
--- a/client/src/Pages/Navbar.jsx
+++ b/client/src/Pages/Navbar.jsx
@@ -1,9 +1,26 @@
import React from "react";
import { FaUserCircle } from "react-icons/fa";
-import { NavLink } from "react-router-dom"; // Import NavLink for navigation
+import { NavLink, useNavigate } from "react-router-dom"; // Import NavLink for navigation
import "./Navbar.css"; // Navbar-specific styles
+import axios from "axios";
const Navbar = () => {
+ const navigate = useNavigate();
+
+ // Handle logout functionality
+ const handleLogout = async () => {
+ try {
+ // Call the logout API
+ await axios.get("http://localhost:8080/auth/logout", { withCredentials: true });
+
+ // Redirect to the login page after successful logout
+ navigate("/");
+ } catch (error) {
+ console.error("Error during logout:", error);
+ alert("Failed to log out. Please try again.");
+ }
+ };
+
return (