From 7fbacfb2d872bffc61e701062a874e5b9e2b7709 Mon Sep 17 00:00:00 2001
From: vimal-tech-dev <be08it929@gmail.com>
Date: Mon, 9 Mar 2026 16:38:27 +0530
Subject: [PATCH] Always active linked of NavBar updated

Signed-off-by: vimal-tech-dev <be08it929@gmail.com>
---
 css/common.css |  5 +++++
 index.html     |  3 +--
 js/common.js   | 56 ++++++++++++++++++++++++++++++++++++++------------
 services.html  |  4 ++--
 4 files changed, 51 insertions(+), 17 deletions(-)

diff --git a/css/common.css b/css/common.css
index 997066f..2bd8e0c 100644
--- a/css/common.css
+++ b/css/common.css
@@ -122,6 +122,11 @@ section {
     color: #ff6347;
 }
 
+.nav-links a.active {
+    color: #00bcd4;
+    font-weight: 600;
+}
+
 /* Hamburger menu */
 .hamburger {
     display: none;
diff --git a/index.html b/index.html
index f6c6334..caa6752 100644
--- a/index.html
+++ b/index.html
@@ -60,7 +60,6 @@
   <link rel="stylesheet" href="/css/whatsapp-floating.css">
   <!-- Font Awesome -->
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-  <!-- <script src="https://kit.fontawesome.com/your-fontawesome-kit.js" crossorigin="anonymous"></script> -->
 
   <script type="application/ld+json">
   {
@@ -72,7 +71,7 @@
     "email": "vimal.patel@vimaltech.dev",
     "telephone": "+91-9638474047",
     "sameAs": [
-      "https://github.com/vimal-tech-dev"
+      "https://github.com/vimal-java-dev"
     ]
   }
   </script>
diff --git a/js/common.js b/js/common.js
index 6a49da9..53542bc 100644
--- a/js/common.js
+++ b/js/common.js
@@ -15,7 +15,7 @@ document.addEventListener("DOMContentLoaded", () => {
     });
 
     // Close the menu when any nav link is clicked
-    navItems.forEach(link => {
+    navItems.forEach((link) => {
       link.addEventListener("click", () => {
         if (navLinks.classList.contains("active")) {
           navLinks.classList.remove("active");
@@ -27,7 +27,8 @@ document.addEventListener("DOMContentLoaded", () => {
 
     /* ✅ NEW: Close the menu when clicking outside */
     document.addEventListener("click", (event) => {
-      const isClickInside = navLinks.contains(event.target) || hamburger.contains(event.target);
+      const isClickInside =
+        navLinks.contains(event.target) || hamburger.contains(event.target);
       if (!isClickInside && navLinks.classList.contains("active")) {
         navLinks.classList.remove("active");
         hamburger.classList.remove("active");
@@ -67,7 +68,7 @@ document.addEventListener("DOMContentLoaded", () => {
     };
 
     const appearOnScroll = new IntersectionObserver((entries, observer) => {
-      entries.forEach(entry => {
+      entries.forEach((entry) => {
         if (!entry.isIntersecting) return;
 
         // Get the index of this element in the NodeList
@@ -82,7 +83,7 @@ document.addEventListener("DOMContentLoaded", () => {
     }, appearOptions);
 
     // Observe each .fade-in element
-    faders.forEach(fader => appearOnScroll.observe(fader));
+    faders.forEach((fader) => appearOnScroll.observe(fader));
   }
 
   /* ============================
@@ -94,18 +95,27 @@ document.addEventListener("DOMContentLoaded", () => {
     window.addEventListener("scroll", () => {
       let current = "";
 
-      sections.forEach(section => {
+      sections.forEach((section) => {
         const sectionTop = section.offsetTop - 100;
         const sectionHeight = section.clientHeight;
-        if (pageYOffset >= sectionTop && pageYOffset < sectionTop + sectionHeight) {
+        if (
+          pageYOffset >= sectionTop &&
+          pageYOffset < sectionTop + sectionHeight
+        ) {
           current = section.getAttribute("id");
         }
       });
 
-      navItems.forEach(link => {
-        link.classList.remove("active");
-        if (link.getAttribute("href") === `#${current}`) {
-          link.classList.add("active");
+      navItems.forEach((link) => {
+        const href = link.getAttribute("href");
+
+        // Only apply scroll spy to section links (#)
+        if (href.startsWith("#")) {
+          link.classList.remove("active");
+
+          if (href === `#${current}`) {
+            link.classList.add("active");
+          }
         }
       });
     });
@@ -114,7 +124,7 @@ document.addEventListener("DOMContentLoaded", () => {
   // Dropdown toggle for Desktop
   const dropdownToggles = document.querySelectorAll(".dropdown-toggle");
 
-  dropdownToggles.forEach(toggle => {
+  dropdownToggles.forEach((toggle) => {
     toggle.addEventListener("click", (e) => {
       e.preventDefault();
       const parent = toggle.parentElement;
@@ -130,7 +140,7 @@ document.addEventListener("DOMContentLoaded", () => {
   // Ensure all dropdowns are closed on page load (prevents an open menu after refresh)
   function resetDropdowns() {
     const dropdowns = document.querySelectorAll(".dropdown");
-    dropdowns.forEach(drop => {
+    dropdowns.forEach((drop) => {
       drop.classList.remove("open");
       const menu = drop.querySelector(".dropdown-menu");
       if (menu) menu.style.display = "none";
@@ -142,7 +152,7 @@ document.addEventListener("DOMContentLoaded", () => {
     const isDropdownToggle = e.target.matches(".dropdown-toggle");
     const dropdown = e.target.closest(".dropdown");
 
-    document.querySelectorAll(".dropdown").forEach(drop => {
+    document.querySelectorAll(".dropdown").forEach((drop) => {
       const menu = drop.querySelector(".dropdown-menu");
 
       // If clicked outside this dropdown, close it
@@ -153,4 +163,24 @@ document.addEventListener("DOMContentLoaded", () => {
     });
   });
 
+  /* ============================
+   Active Navbar Link per Page
+============================ */
+  const currentPage = window.location.pathname.split("/").pop();
+
+  navItems.forEach((link) => {
+    const linkPage = link.getAttribute("href");
+
+    if (linkPage === currentPage) {
+      link.classList.add("active");
+    }
+
+    // Special case: homepage
+    if (
+      (currentPage === "" || currentPage === "/") &&
+      linkPage === "index.html"
+    ) {
+      link.classList.add("active");
+    }
+  });
 });
diff --git a/services.html b/services.html
index 027bf8a..8abcabc 100644
--- a/services.html
+++ b/services.html
@@ -47,8 +47,8 @@
         "addressCountry": "IN"
       },
       "sameAs": [
-        "https://www.linkedin.com/",
-        "https://github.com/"
+        "https://www.linkedin.com/in/vimaltech",
+        "https://github.com/vimal-java-dev"
       ]
     },
     {