Skip to content

Clear User Icon Focus on Browser Back Button in Admin, Employee, and User Navbars #146

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
merged 2 commits into from
Oct 2, 2025
Merged

Clear User Icon Focus on Browser Back Button in Admin, Employee, and User Navbars #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c5d6c6
Enhanced background with flag in waving motion
krishagandhi0711 Sep 29, 2025
5458cb7
Fix: remove focus/highlight from Navbar after using browser back button
krishagandhi0711 Sep 29, 2025
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
26 changes: 13 additions & 13 deletions admin/src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
import React from "react";
import React, { useEffect } from "react";
import { Button } from "./ui/button";
import { ArrowRightFromLine, ChevronDown } from "lucide-react";
import { ArrowRightFromLine } from "lucide-react";
import { Link, useLocation } from "react-router-dom";




const Navbar = () => {
const location = useLocation();

useEffect(() => {
// Remove focus/highlight from any active element when location changes
if (document.activeElement) {
document.activeElement.blur();
}
}, [location]);

return (
<div className="px-[5vw] py-2 w-full flex justify-between items-center bg-green-900 text-white text-xl gap-5 z-10 sticky top-0 left-0 h-16">
<div className="px-[5vw] py-2 w-full flex justify-between items-center bg-green-900 text-white text-xl gap-5 z-10 sticky top-0 left-0 h-16">
<div className="flex gap-5">
<Link to="/">
<p>Home</p>
Expand All @@ -24,19 +29,14 @@ const Navbar = () => {
<p>Contact Us</p>
</div>
<div className="flex gap-4">
{location.pathname === "/login" ||
location.pathname === "/userlogin" ? (
<></>
) : (
{location.pathname !== "/login" && location.pathname !== "/userlogin" && (
<Link to="/login">
<Button className="gap-2 px-5 text-xl bg-green-500 hover:bg-white hover:text-black">
LOGIN <ArrowRightFromLine />
</Button>
</Link>
)}
{location.pathname === "/register" ? (
<></>
) : (
{location.pathname !== "/register" && (
<Link to="/register">
<Button className="text-xl bg-transparent hover:bg-white hover:text-black">
REGISTER
Expand Down
23 changes: 13 additions & 10 deletions employee/src/components/Navbar.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
import React from "react";
import React, { useEffect } from "react";
import { Button } from "./ui/button";
import { ArrowRightFromLine, ChevronDown } from "lucide-react";
import { ArrowRightFromLine } from "lucide-react";
import { Link, useLocation } from "react-router-dom";

const Navbar = () => {
const location = useLocation();

useEffect(() => {
// Remove focus/highlight from any active element when location changes
if (document.activeElement) {
document.activeElement.blur();
}
}, [location]);

return (
<div className="px-[5vw] py-2 w-full flex justify-between items-center bg-green-900 text-white text-xl gap-5 z-10 sticky top-0 left-0 h-16">
<div className="px-[5vw] py-2 w-full flex justify-between items-center bg-green-900 text-white text-xl gap-5 z-10 sticky top-0 left-0 h-16">
<div className="flex gap-5">
<Link to="/">
<p>Home</p>
Expand All @@ -21,19 +29,14 @@ const Navbar = () => {
<p>Contact Us</p>
</div>
<div className="flex gap-4">
{location.pathname === "/login" ||
location.pathname === "/userlogin" ? (
<></>
) : (
{location.pathname !== "/login" && location.pathname !== "/userlogin" && (
<Link to="/login">
<Button className="gap-2 px-5 text-xl bg-green-500 hover:bg-white hover:text-black">
LOGIN <ArrowRightFromLine />
</Button>
</Link>
)}
{location.pathname === "/register" ? (
<></>
) : (
{location.pathname !== "/register" && (
<Link to="/register">
<Button className="text-xl bg-transparent hover:bg-white hover:text-black">
REGISTER
Expand Down
Loading