Skip to content

testing #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dagreatcode merged 1 commit into from
Nov 29, 2025
Merged

testing #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
108 changes: 104 additions & 4 deletions client/src/components/NavBar/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,22 +67,118 @@

// export default NavBar;

// import React, { useState, useEffect } from "react";
// import { Link, NavLink, useNavigate } from "react-router-dom";
// import "./NavBar.css";

// const NavBar: React.FC = () => {
// const [isCollapsed, setIsCollapsed] = useState(true);
// const [isLoggedIn, setIsLoggedIn] = useState(false);
// const navigate = useNavigate();

// const toggleNavbar = () => setIsCollapsed(!isCollapsed);

// // Check login status on mount
// useEffect(() => {
// const token = localStorage.getItem("token");
// setIsLoggedIn(!!token);
// }, []);

// // Logout handler
// const handleLogout = () => {
// localStorage.removeItem("token");
// localStorage.removeItem("userId");
// setIsLoggedIn(false);
// navigate("/Login");
// };

// return (
// <nav className="navbar-container">
// <div className="navbar-inner">
// <Link to="/" className="navbar-logo">
// <img src="./favicon-32x32.png" alt="GADZ Up" className="logo-img" />
// <span>GADZConnect</span>
// </Link>

// {/* Hamburger */}
// <button className="navbar-toggler" onClick={toggleNavbar}>
// <span className="hamburger-icon"></span>
// </button>

// <div className={`navbar-links-container ${isCollapsed ? "collapsed" : ""}`}>
// <ul className="navbar-links">
// <li>
// <NavLink to="/AboutUs" className="nav-link">
// About Us
// </NavLink>
// </li>
// <li>
// <NavLink to="/Services" className="nav-link">
// Services
// </NavLink>
// </li>
// <li>
// <NavLink to="/ContactUs" className="nav-link">
// Contact Us
// </NavLink>
// </li>

// {/* LOGIN OR LOGOUT BUTTON */}
// {!isLoggedIn ? (
// <li>
// <NavLink to="/Login" className="nav-link login-link">
// Login
// </NavLink>
// </li>
// ) : (
// <li>
// <button onClick={handleLogout} className="nav-link login-link" style={{ border: "none", background: "transparent", cursor: "pointer" }}>
// Logout
// </button>
// </li>
// )}
// </ul>

// <div className="navbar-social">
// <a href="https://twitter.com" target="_blank" rel="noopener noreferrer">
// <i className="fab fa-twitter"></i>
// </a>
// <a href="https://facebook.com/global.asset.dispatching.service" target="_blank" rel="noopener noreferrer">
// <i className="fab fa-facebook-f"></i>
// </a>
// <a href="https://youtube.com" target="_blank" rel="noopener noreferrer">
// <i className="fab fa-youtube"></i>
// </a>
// <a href="https://instagram.com/Global_assetleader/" target="_blank" rel="noopener noreferrer">
// <i className="fab fa-instagram"></i>
// </a>
// </div>
// </div>
// </div>
// </nav>
// );
// };

// export default NavBar;

// NavBar.tsx
import React, { useState, useEffect } from "react";
import { Link, NavLink, useNavigate } from "react-router-dom";
import { Link, NavLink, useNavigate, useLocation } from "react-router-dom";
import "./NavBar.css";

const NavBar: React.FC = () => {
const [isCollapsed, setIsCollapsed] = useState(true);
const [isLoggedIn, setIsLoggedIn] = useState(false);
const navigate = useNavigate();
const location = useLocation(); // Track route changes

const toggleNavbar = () => setIsCollapsed(!isCollapsed);

// Check login status on mount
// Update login state on mount and whenever the route changes
useEffect(() => {
const token = localStorage.getItem("token");
setIsLoggedIn(!!token);
}, []);
}, [location]);

// Logout handler
const handleLogout = () => {
Expand Down Expand Up @@ -132,7 +228,11 @@ const NavBar: React.FC = () => {
</li>
) : (
<li>
<button onClick={handleLogout} className="nav-link login-link" style={{ border: "none", background: "transparent", cursor: "pointer" }}>
<button
onClick={handleLogout}
className="nav-link login-link"
style={{ border: "none", background: "transparent", cursor: "pointer" }}
>
Logout
</button>
</li>
Expand Down
Loading