From 3943ba49b6e04f225318384222871899699bedd9 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Wed, 7 Aug 2024 17:41:56 +0300
Subject: [PATCH] Fixes sidebar collapsing

---
 public_html/static/all.css            | 40 ++++++++-------------------
 public_html/static/sidebar.js         |  1 +
 public_html/templates/page-header.php | 11 +++++++-
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/public_html/static/all.css b/public_html/static/all.css
index cdd5542..0819941 100644
--- a/public_html/static/all.css
+++ b/public_html/static/all.css
@@ -78,31 +78,6 @@
     color: white;
 }
 
-/*
-.results {
-    margin-bottom: 50px;
-}
-
-.results table {
-    width: 100%;
-    border-collapse: collapse;
-    margin: 20px 0;
-}
-.results table, th, td {
-    border: 1px solid #ddd;
-}
-.results th, td {
-    padding: 8px;
-    text-align: left;
-}
-.results th {
-    background-color: #f2f2f2;
-}
-.results p {
-    text-align: center;
-}
-*/
-
 .results-header {
     display: flex;
     justify-content: space-between;
@@ -126,7 +101,7 @@
 .toggle-sidebar-button {
     position: absolute;
     top: -10px;
-    left: 0;
+    right: -10px;
     z-index: 100;
     margin: 10px;
     height: 22px;
@@ -143,6 +118,9 @@
 .sidebar-wrapper.collapsed {
     width: 3em;
 }
+.sidebar-collapsed .sidebar-wrapper {
+    width: 3em;
+}
 .sidebar-content {
     width: 250px;
     border: none;
@@ -153,11 +131,15 @@
 }
 
 .main-content {
-    transition: width: 0.5s ease;
-    width: 80%; /* 75% */
+    flex-grow: 1;
+    transition: width 0.5s ease;
+    width: 80%;
 }
 .main-content.expanded {
-    width: 95%; /* none */
+    width: calc(70% + 250px);
+}
+.sidebar-collapsed .main-content {
+    width: calc(70% + 3em);
 }
 
 .logo {
diff --git a/public_html/static/sidebar.js b/public_html/static/sidebar.js
index d1ed7b9..6da0401 100644
--- a/public_html/static/sidebar.js
+++ b/public_html/static/sidebar.js
@@ -32,6 +32,7 @@ document.addEventListener('DOMContentLoaded', function () {
     toggleButton.addEventListener('click', function () {
         // toggle sidebar and main content
         sidebar.classList.toggle('collapsed');
+        document.documentElement.classList.toggle('sidebar-collapsed');
         mainContent.classList.toggle('expanded');
         // Toggle the value between ">>" and "<<"
         if (toggleButton.value === ">>") {
diff --git a/public_html/templates/page-header.php b/public_html/templates/page-header.php
index 3c8e56b..1a89dac 100644
--- a/public_html/templates/page-header.php
+++ b/public_html/templates/page-header.php
@@ -7,7 +7,16 @@
 <script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/popper.js@1.12.9/dist/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
 <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js" integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl" crossorigin="anonymous"></script>
-<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css" integrity="sha384-lZN37f5QGtY3VHgisS14W3ExzMWZxybE1SJSEsQp9S+oqd12jhcu+A56Ebc1zFSJ" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.7.0/css/all.css" integrity="sha384-lZN37f5QGtY3VHgisS14W3ExzMWZxybE1SJSEsQp9S+oqd12jhcu+A56Ebc1zFSJ" crossorigin="anonymous">
+    <script>
+    // restore sidebar state before the page is rendered
+        (function () {
+            var savedState = localStorage.getItem('sidebarState');
+            if (savedState === 'collapsed') {
+                document.documentElement.classList.add('sidebar-collapsed');
+            }
+        })();
+    </script>
     <title>Jilo Web</title>
 </head>