Merge pull request #55 from N5GEH/54-show-which-app-is-selected

Show which app is selected
N5GEH · Oct 10, 2022 · 25139fe · 25139fe
2 parents 9e50c53 + 0013abc
commit 25139fe
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/Entirety/devices/urls.py b/app/Entirety/devices/urls.py
@@ -6,7 +6,7 @@
     DeviceCreateSubmitView,
     DeviceEditSubmitView,
     DeviceEditView,
-    DeviceDeleteView
+    DeviceDeleteView,
 )
 
 app_name = "devices"
@@ -15,7 +15,7 @@
     path("edit", DeviceEditView.as_view(), name="edit"),
     path("edit-submit", DeviceEditSubmitView.as_view(), name="edit-submit"),
     path("create-submit", DeviceCreateSubmitView.as_view(), name="create_submit"),
-    path("list", DeviceListView.as_view(), name="list"),
+    path("", DeviceListView.as_view(), name="list"),
     path("list-submit", DeviceListSubmitView.as_view(), name="list_submit"),
-    path("delete", DeviceDeleteView.as_view(), name="delete")
+    path("delete", DeviceDeleteView.as_view(), name="delete"),
 ]
diff --git a/app/Entirety/static/js/main.js b/app/Entirety/static/js/main.js
@@ -6,7 +6,10 @@
 
     const sidebarItems = document.querySelectorAll('.btn-sidebar');
     [...sidebarItems].forEach(el => {
-        if (!el.classList.contains("hi-ignore")) {
+        if(el.getAttribute("href") === url){
+            el.classList.add("active")
+        }
+        else if (!el.classList.contains("hi-ignore")) {
             let regEx = new RegExp(`^${el.getAttribute("href")}.*$`, "i")
             if (regEx.test(url))
                 el.classList.add('active')

diff --git a/app/Entirety/templates/sidebar.html b/app/Entirety/templates/sidebar.html
@@ -74,7 +74,7 @@
                 </li>
 
                 <li class="nav-item  d-inline-flex {% if project %}mt-auto border-top{% else %} border-bottom {% endif %}">
-                    <a href="{% url "projects:index" %}" class="nav-link btn-sidebar py-md-2"
+                    <a href="{% url "projects:index" %}" class="nav-link btn-sidebar py-md-2 hi-ignore"
                        data-bs-toggle="tooltip" data-bs-placement="right" data-bs-custom-class="d-md-none"
                        title="Projects">
                         <i class="bi {% if project %}bi-arrow-left{% else %}bi-kanban{% endif %}"></i>