Fixes.

themesberg · Jan 12, 2023 · 634ae93 · 634ae93
1 parent 6c01fac
commit 634ae93
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 64 deletions.
diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html
@@ -1,2 +1,2 @@
 <script src="{{ .Site.BaseURL }}/app.bundle.js"></script>
-<script src="https://unpkg.com/flowbite@1.6.0/dist/datepicker.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/flowbite/1.6.1/datepicker.min.js"></script>
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app.js → src/index.js b/src/app.js → src/index.js
diff --git a/src/sidebar.js b/src/sidebar.js
@@ -54,68 +54,70 @@ const toggleSidebar = (sidebarEl, expand, setExpanded = false) => {
 const toggleSidebarEl = document.getElementById('toggleSidebar');
 const sidebar = document.getElementById('sidebar');
 
-document.querySelectorAll('#' + sidebar.getAttribute('id') + ' ul > li > ul > li > a').forEach(e => {
-    var fullText = e.textContent;
-    var firstLetter = fullText.substring(0, 1);
-
-    var fullTextEl = document.createElement('span');
-    var firstLetterEl = document.createElement('span');
-    firstLetterEl.classList.add('hidden');
-    fullTextEl.textContent = fullText;
-    firstLetterEl.textContent = firstLetter;
-
-    e.textContent = '';
-    e.appendChild(fullTextEl);
-    e.appendChild(firstLetterEl);
-});
-
-// initialize sidebar
-if (localStorage.getItem('sidebarExpanded') !== null) {
-    if (localStorage.getItem('sidebarExpanded') === 'true') {
-        toggleSidebar(sidebar, true, false);
-    } else {
-        toggleSidebar(sidebar, false, true);
-    }
-}
-
-toggleSidebarEl.addEventListener('click', () => {
-    localStorage.setItem('sidebarExpanded', !isSidebarExpanded(toggleSidebarEl));
-    toggleSidebar(sidebar, !isSidebarExpanded(toggleSidebarEl), true);
-});
-
-sidebar.addEventListener('mouseenter', () => {
-    if (!isSidebarExpanded(toggleSidebarEl)) {
-        toggleSidebar(sidebar, true);
+if (sidebar && toggleSidebar) {
+    document.querySelectorAll('#' + sidebar.getAttribute('id') + ' ul > li > ul > li > a').forEach(e => {
+        var fullText = e.textContent;
+        var firstLetter = fullText.substring(0, 1);
+
+        var fullTextEl = document.createElement('span');
+        var firstLetterEl = document.createElement('span');
+        firstLetterEl.classList.add('hidden');
+        fullTextEl.textContent = fullText;
+        firstLetterEl.textContent = firstLetter;
+
+        e.textContent = '';
+        e.appendChild(fullTextEl);
+        e.appendChild(firstLetterEl);
+    });
+
+    // initialize sidebar
+    if (localStorage.getItem('sidebarExpanded') !== null) {
+        if (localStorage.getItem('sidebarExpanded') === 'true') {
+            toggleSidebar(sidebar, true, false);
+        } else {
+            toggleSidebar(sidebar, false, true);
+        }
     }
-});
-
-sidebar.addEventListener('mouseleave', () => {
-    if (!isSidebarExpanded(toggleSidebarEl)) {
-        toggleSidebar(sidebar, false);
+
+    toggleSidebarEl.addEventListener('click', () => {
+        localStorage.setItem('sidebarExpanded', !isSidebarExpanded(toggleSidebarEl));
+        toggleSidebar(sidebar, !isSidebarExpanded(toggleSidebarEl), true);
+    });
+
+    sidebar.addEventListener('mouseenter', () => {
+        if (!isSidebarExpanded(toggleSidebarEl)) {
+            toggleSidebar(sidebar, true);
+        }
+    });
+
+    sidebar.addEventListener('mouseleave', () => {
+        if (!isSidebarExpanded(toggleSidebarEl)) {
+            toggleSidebar(sidebar, false);
+        }
+    });
+
+    const toggleSidebarMobile = (sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose) => {
+        sidebar.classList.toggle('hidden');
+        sidebarBackdrop.classList.toggle('hidden');
+        toggleSidebarMobileHamburger.classList.toggle('hidden');
+        toggleSidebarMobileClose.classList.toggle('hidden');
     }
-});
-
-const toggleSidebarMobile = (sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose) => {
-    sidebar.classList.toggle('hidden');
-    sidebarBackdrop.classList.toggle('hidden');
-    toggleSidebarMobileHamburger.classList.toggle('hidden');
-    toggleSidebarMobileClose.classList.toggle('hidden');
+
+    const toggleSidebarMobileEl = document.getElementById('toggleSidebarMobile');
+    const sidebarBackdrop = document.getElementById('sidebarBackdrop');
+    const toggleSidebarMobileHamburger = document.getElementById('toggleSidebarMobileHamburger');
+    const toggleSidebarMobileClose = document.getElementById('toggleSidebarMobileClose');
+    const toggleSidebarMobileSearch = document.getElementById('toggleSidebarMobileSearch');
+
+    toggleSidebarMobileSearch.addEventListener('click', () => {
+        toggleSidebarMobile(sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose);
+    });
+
+    toggleSidebarMobileEl.addEventListener('click', () => {
+        toggleSidebarMobile(sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose);
+    });
+
+    sidebarBackdrop.addEventListener('click', () => {
+        toggleSidebarMobile(sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose);
+    });
 }
-
-const toggleSidebarMobileEl = document.getElementById('toggleSidebarMobile');
-const sidebarBackdrop = document.getElementById('sidebarBackdrop');
-const toggleSidebarMobileHamburger = document.getElementById('toggleSidebarMobileHamburger');
-const toggleSidebarMobileClose = document.getElementById('toggleSidebarMobileClose');
-const toggleSidebarMobileSearch = document.getElementById('toggleSidebarMobileSearch');
-
-toggleSidebarMobileSearch.addEventListener('click', () => {
-    toggleSidebarMobile(sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose);
-});
-
-toggleSidebarMobileEl.addEventListener('click', () => {
-    toggleSidebarMobile(sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose);
-});
-
-sidebarBackdrop.addEventListener('click', () => {
-    toggleSidebarMobile(sidebar, sidebarBackdrop, toggleSidebarMobileHamburger, toggleSidebarMobileClose);
-});
diff --git a/webpack.config.js b/webpack.config.js
@@ -5,7 +5,7 @@ const path = require('path');
 
 module.exports = {
   entry: {
-    app: path.resolve(__dirname, 'src/app.js')
+    app: path.resolve(__dirname, 'src/index.js')
   },
   output: {
     filename: '[name].bundle.js',