Switch to svelte-adminlte template from NPM

theyosh · Jan 22, 2024 · 9c6f063 · 9c6f063
1 parent 319c775
commit 9c6f063
Show file tree

Hide file tree

Showing 29 changed files with 5,060 additions and 2,448 deletions.
diff --git a/gui/App.svelte b/gui/App.svelte
@@ -40,7 +40,7 @@
     DropdownButton,
     DropdownMenu,
     DropdownDivider,
-  } from 'svelte-adminlte';
+  } from '@keenmate/svelte-adminlte';
 
   import RoutePages, { onRouteLoaded, Pages, PageUrls } from './pages';
   import { listenPageTitleChanged, customPageTitleUsed } from './stores/page-title';
@@ -543,7 +543,7 @@
     </div>
   </div>
   <footer class="main-footer p-2 text-sm">
-    &copy; 2015 - 2023 <a target="_blank" rel="noopener noreferrer" href="https://theyosh.nl">TheYOSH</a>
+    &copy; 2015 - 2024 <a target="_blank" rel="noopener noreferrer" href="https://theyosh.nl">TheYOSH</a>
     <!-- Credits to the original builders. The least I can do -->
     <small>
       using <a target="_blank" rel="noopener noreferrer" href="https://adminlte.io">AdminLTE</a>,

diff --git a/gui/config.js b/gui/config.js
@@ -1,4 +1,5 @@
-import { getConfig, setConfig } from 'svelte-adminlte/src/config.js';
+import { get } from 'svelte/store';
+import { Config } from '@keenmate/svelte-adminlte';
 import { isAuthenticated } from './stores/authentication';
 import { default as currentUserStore } from './stores/current-user';
 
@@ -13,15 +14,15 @@ export const getCustomConfig = (extra) => {
   const settings = {
     ...custom,
     ...window.terrariumPI,
-    ...getConfig(),
+    ...get(Config),
     ...extra,
   };
-  setConfig(settings);
+  Config.set(settings);
 
   if (settings.logged_in && settings.username) {
     isAuthenticated.set(true);
     currentUserStore.set(settings.username);
   }
 
-  return getConfig();
+  return get(Config);
 };
diff --git a/gui/modals/ConfirmModal.svelte b/gui/modals/ConfirmModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Modal, ModalCloseButton } from 'svelte-adminlte';
+  import { Modal, ModalCloseButton } from '@keenmate/svelte-adminlte';
   import { createEventDispatcher } from 'svelte';
   import { _ } from 'svelte-i18n';
 

diff --git a/gui/modals/LoadingModal.svelte b/gui/modals/LoadingModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Modal } from 'svelte-adminlte';
+  import { Modal } from '@keenmate/svelte-adminlte';
 
   import { _ } from 'svelte-i18n';
 

diff --git a/gui/modals/LoginFormModal.svelte b/gui/modals/LoginFormModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Modal, ModalCloseButton } from 'svelte-adminlte';
+  import { Modal, ModalCloseButton } from '@keenmate/svelte-adminlte';
   import { onMount } from 'svelte';
   import { successNotification, errorNotification } from '../providers/notification-provider';
 

diff --git a/gui/modals/WebcamMarkerModal.svelte b/gui/modals/WebcamMarkerModal.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Modal } from 'svelte-adminlte';
+  import { Modal } from '@keenmate/svelte-adminlte';
   import { onMount, getContext } from 'svelte';
   import { _ } from 'svelte-i18n';
   import { createForm } from 'felte';

diff --git a/gui/pages/About.svelte b/gui/pages/About.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Audiofiles.svelte b/gui/pages/Audiofiles.svelte
@@ -4,7 +4,7 @@
   dayjs.extend(duration);
   import { onMount, onDestroy, getContext } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { PageHeader, FileInput } from 'svelte-adminlte';
+  import { PageHeader, FileInput } from '@keenmate/svelte-adminlte';
 
   import { locale } from '../locale/i18n';
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Buttons.svelte b/gui/pages/Buttons.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy, getContext, setContext } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Calendar.svelte b/gui/pages/Calendar.svelte
@@ -4,7 +4,7 @@
   dayjs.extend(duration);
   import { onDestroy, onMount, getContext } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import tippy from 'sveltejs-tippy';
   import { followCursor } from 'tippy.js';
 

diff --git a/gui/pages/Dashboard.svelte b/gui/pages/Dashboard.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { PageHeader, InfoBox } from 'svelte-adminlte';
+  import { PageHeader, InfoBox } from '@keenmate/svelte-adminlte';
   import { _, number } from 'svelte-i18n';
   import { onMount, onDestroy, setContext } from 'svelte';
   import { dayjs } from 'svelte-time';

diff --git a/gui/pages/Enclosures.svelte b/gui/pages/Enclosures.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy, getContext, setContext } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Home.svelte b/gui/pages/Home.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
   import { onMount, onDestroy } from 'svelte';
 

diff --git a/gui/pages/Log.svelte b/gui/pages/Log.svelte
@@ -1,7 +1,7 @@
 <script>
   import { _ } from 'svelte-i18n';
   import { onMount, onDestroy } from 'svelte';
-  import { PageHeader, BreadcrumbItem } from 'svelte-adminlte';
+  import { PageHeader, BreadcrumbItem } from '@keenmate/svelte-adminlte';
   import { date, time } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/NotFound.svelte b/gui/pages/NotFound.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Notifications.svelte b/gui/pages/Notifications.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy, getContext } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Playlists.svelte b/gui/pages/Playlists.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onDestroy, onMount, getContext } from 'svelte';
   import { _ } from 'svelte-i18n';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { dayjs } from 'svelte-time';
   import duration from 'dayjs/esm/plugin/duration';
   dayjs.extend(duration);

diff --git a/gui/pages/Relays.svelte b/gui/pages/Relays.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
   import { onMount, onDestroy, getContext, setContext } from 'svelte';
 

diff --git a/gui/pages/Sensors.svelte b/gui/pages/Sensors.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy, getContext, setContext } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Settings.svelte b/gui/pages/Settings.svelte
@@ -2,9 +2,9 @@
   import { onMount, onDestroy } from 'svelte';
   import { writable } from 'svelte/store';
   import { _, number } from 'svelte-i18n';
-  import { PageHeader, BreadcrumbItem } from 'svelte-adminlte';
+  import { PageHeader, BreadcrumbItem } from '@keenmate/svelte-adminlte';
   import { createForm } from 'felte';
-  import { setConfig } from 'svelte-adminlte/src/config.js';
+  import { Config } from '@keenmate/svelte-adminlte';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';
   import { successNotification, errorNotification } from '../providers/notification-provider';
@@ -99,7 +99,7 @@
 
           changeLang(values.language);
           currency.set(values.currency);
-          setConfig(formToJSON(context.form));
+          Config.set(formToJSON(context.form));
           autoDarkMode($isDay, $isDarkDesktop);
         } catch (error) {
           errorNotification(error.message, $_('notification.form.save.error.title', { default: 'Save Error' }));

diff --git a/gui/pages/Status.svelte b/gui/pages/Status.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount, onDestroy, setContext } from 'svelte';
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Weather.svelte b/gui/pages/Weather.svelte
@@ -14,7 +14,7 @@
   ChartJS.register(Title, Tooltip, Legend, TimeScale, LinearScale, PointElement, LineElement);
   import 'chartjs-adapter-dayjs-3';
   import { _ } from 'svelte-i18n';
-  import { PageHeader, BreadcrumbItem } from 'svelte-adminlte';
+  import { PageHeader, BreadcrumbItem } from '@keenmate/svelte-adminlte';
   import { date, time } from 'svelte-i18n';
 
   import { setCustomPageTitle, customPageTitleUsed } from '../stores/page-title';

diff --git a/gui/pages/Webcams.svelte b/gui/pages/Webcams.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { PageHeader } from 'svelte-adminlte';
+  import { PageHeader } from '@keenmate/svelte-adminlte';
   import { _ } from 'svelte-i18n';
   import { onMount, onDestroy, getContext, setContext } from 'svelte';
 

diff --git a/gui/patch.sh b/gui/patch.sh
@@ -4,4 +4,7 @@
 sed -i 's@\&\.bg-#{$name} {@#{if\(\&, "\&.bg-#{\$name}",".bg-#{\$name}"\)} {@' node_modules/admin-lte/build/scss/mixins/*
 
 # Bootstrap old abs() function fix
-sed -i 's@  $dividend: abs($dividend);@  $dividend: math.abs($dividend);@' node_modules/bootstrap/scss/vendor/_rfs.scss
+sed -i 's@  $dividend: abs($dividend);@  $dividend: math.abs($dividend);@' node_modules/bootstrap/scss/vendor/_rfs.scss
+
+# Fix broken lazy loader...
+sed -i 's@export { default as WithLazyLoader }@//export { default as WithLazyLoader }@' node_modules/@keenmate/svelte-adminlte/dist/index.js
diff --git a/gui/providers/notification-provider.js b/gui/providers/notification-provider.js
@@ -1,4 +1,4 @@
-import { Toastr } from 'svelte-adminlte';
+import { Toastr } from '@keenmate/svelte-adminlte';
 
 import { nl2br } from '../helpers/string-helpers';
 

diff --git a/gui/user-controls/Card.svelte b/gui/user-controls/Card.svelte
@@ -1,6 +1,6 @@
 <script>
   import { onMount } from 'svelte';
-  import { Card as BaseCard } from 'svelte-adminlte';
+  import { Card as BaseCard } from '@keenmate/svelte-adminlte';
 
   import CardDefaultTools from '../components/common/CardDefaultTools.svelte';
   import { getRandomString } from '../helpers/string-helpers';

diff --git a/gui/user-controls/ModalForm.svelte b/gui/user-controls/ModalForm.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Modal, ModalCloseButton } from 'svelte-adminlte';
+  import { Modal, ModalCloseButton } from '@keenmate/svelte-adminlte';
   import { onMount } from 'svelte';
   import { _ } from 'svelte-i18n';