Merge branch 'develop' into 'main'

Develop

See merge request !34

package.json

@@ -16,7 +16,6 @@
     "i18next": "^21.6.6",
     "i18next-fs-backend": "^1.1.4",
     "i18next-http-middleware": "^3.1.5",
-    "jquery": "^3.6.4",
     "leaflet": "^1.9.3",
     "moment": "^2.29.1",
     "morgan": "~1.9.0",

public/javascripts/activeMenuLink.js

+// pathname eg: /home
+const path = $(location).attr('pathname').substr(1);
+
+// menu: active tab
+$('.nav-link').each(function() {
+	if (path != '') {
+		if (path == $(this).attr('id')) {
+			$(this).addClass('active');
+			$(this).attr('aria-current', 'page');
+		} else if (path.startsWith('masters')) {
+			$('#mastersDropdown').addClass('active');
+			$('#mastersDropdown').attr('aria-current', 'page');
+		}
+	} else {
+		$('#home').addClass('active');
+		$('#home').attr('aria-current', 'page');
+	}
+});
\ No newline at end of file

views/layout.pug

@@ -41,7 +41,11 @@ html
 								ul.navbar-nav.me-auto.mb-2.mb-lg-0
 									li.nav-item
 										a.nav-link#home(href="/")
-											| #[i.bi-house-door-fill] #{t("NAV.HOME")}
+											| #[i.bi-house-door-fill] !{t("NAV.HOME")}
+									li.nav-item
+										a.nav-link#program(href="/program")
+											| #[i.bi-calendar-check] !{t("NAV.PROG")}
+											
 								ul.navbar-nav#ulang
 									li.nav-item.mx-3
 										a.btn.btn-outline-mayo.email(href="mailto:infos.cssp@gmail.com")
@@ -93,9 +97,11 @@ html
 				block footer
 
 		block scripts
-			<!-- jQuery -->
-			script(src="/javascripts/jquery-3.6.4.min.js")
+			<!-- jQuery-->
+			script(src="/javascripts/jquery-3.7.1.min.js")
 			<!-- Bootstrap JS and Popper JS -->
 			script(src="/javascripts/bootstrap.bundle.min.js")
 			<!-- Rot13 -->
 			script(src="/javascripts/rot13.js")
+			<!-- Active Menu Link -->
+			script(src="/javascripts/activeMenuLink.js")