Move various utility functions to their own JS libraries.

WaterWolfDev · Jul 23, 2024 · 7b7d5f6 · 7b7d5f6
1 parent 6b7d542
commit 7b7d5f6
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 23 deletions.
diff --git a/backend/templates/account/recover.twig b/backend/templates/account/recover.twig
@@ -3,6 +3,8 @@
 {% block head %}
     {{ parent() }}
 
+    {{ renderAssets('frontend/passwordStrength.js') }}
+
     <script>
         ready(() => {
             passwordStrength();

diff --git a/backend/templates/account/register.twig b/backend/templates/account/register.twig
@@ -2,6 +2,8 @@
 
 {% block head %}
     {{ parent() }}
+
+    {{ renderAssets('frontend/passwordStrength.js') }}
 
     <script>
         ready(() => {

diff --git a/backend/templates/dashboard/password.twig b/backend/templates/dashboard/password.twig
@@ -5,6 +5,8 @@
 {% block head %}
     {{ parent() }}
 
+    {{ renderAssets('frontend/passwordStrength.js') }}
+
     <script>
         ready(() => {
             passwordStrength();

diff --git a/backend/templates/events/defective.twig b/backend/templates/events/defective.twig
@@ -3,6 +3,8 @@
 {% block head %}
     {{ parent() }}
 
+    {{ renderAssets('frontend/dateTime.js') }}
+
     <script>
         ready(() => {
             const tz = {{ tz|json_encode|raw }};

diff --git a/frontend/dateTime.js b/frontend/dateTime.js
@@ -0,0 +1,12 @@
+import {
+    dateTimeToDateTimeString, dateTimeToRelative,
+    dateTimeToTimeString,
+    nowToDateTime,
+    timestampToDateTime
+} from "~/js/dateTimeUtils.js";
+
+window.nowToDateTime = nowToDateTime;
+window.timestampToDateTime = timestampToDateTime;
+window.dateTimeToDateTimeString = dateTimeToDateTimeString;
+window.dateTimeToTimeString = dateTimeToTimeString;
+window.dateTimeToRelative = dateTimeToRelative;
diff --git a/frontend/layout.js b/frontend/layout.js
@@ -1,35 +1,16 @@
-// Frontend styling
 import "~/scss/style.scss";
 
-// Frontend JS
 import * as bootstrap from "bootstrap";
 import $ from "jquery";
 
-// Custom functions
-import passwordStrength from './js/passwordStrength.js';
 import {confirmDanger} from './js/sweetalert.js';
-import {
-    dateTimeToDateTimeString,
-    dateTimeToRelative,
-    dateTimeToTimeString,
-    nowToDateTime,
-    timestampToDateTime,
-} from './js/dateTimeUtils.js';
 
 window.bootstrap = bootstrap;
 
 window.jQuery = window.$ = $;
 
-window.passwordStrength = passwordStrength;
-
 window.confirmDanger = confirmDanger;
 
-window.nowToDateTime = nowToDateTime;
-window.timestampToDateTime = timestampToDateTime;
-window.dateTimeToDateTimeString = dateTimeToDateTimeString;
-window.dateTimeToTimeString = dateTimeToTimeString;
-window.dateTimeToRelative = dateTimeToRelative;
-
 const ready = (callback) => {
     if (document.readyState !== "loading") callback();
     else document.addEventListener("DOMContentLoaded", callback);

diff --git a/frontend/passwordStrength.js b/frontend/passwordStrength.js
@@ -0,0 +1,3 @@
+import passwordStrength from "~/js/passwordStrength.js";
+
+window.passwordStrength = passwordStrength;
diff --git a/vite.config.js b/vite.config.js
@@ -1,10 +1,16 @@
 import {defineConfig} from "vite";
+import {glob} from "glob";
 import {resolve} from "path";
 
-const inputs = {
-    "layout": resolve(__dirname, "./frontend/layout.js"),
-    "wwradio": resolve(__dirname, "./frontend/wwradio.js")
-};
+const inputs = glob.sync('./frontend/*.js').reduce((acc, path) => {
+    // vue/pages/Admin/Index becomes AdminIndex
+    const entry = path.replace(/\.js$/g, '')
+        .replace(/^frontend\//g, '')
+        .replace(/\//g, '');
+
+    acc[entry] = resolve(__dirname, path)
+    return acc
+}, {});
 
 console.log(inputs);
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		import passwordStrength from "~/js/passwordStrength.js";

		window.passwordStrength = passwordStrength;