Bugfix with Minify breaking static js, preload FA, move loadTheme fro…

…m footer
sondregronas · Aug 9, 2023 · 617a1e6 · 617a1e6
1 parent 5483295
commit 617a1e6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 7 deletions.
diff --git a/BookingSystem/app.py b/BookingSystem/app.py
@@ -35,7 +35,7 @@ def create_app() -> flask.Flask:
     Session(app)
 
     # Minify
-    Minify(app=app)
+    Minify(app=app, static=False)
 
     # Register blueprints
     app.register_blueprint(api.api)

diff --git a/BookingSystem/static/css/font-awesome.min.css b/BookingSystem/static/css/font-awesome.min.css
diff --git a/BookingSystem/static/css/tom-select.min.css b/BookingSystem/static/css/tom-select.min.css
diff --git a/BookingSystem/templates/partials/css_student.html b/BookingSystem/templates/partials/css_student.html
@@ -1,4 +1,5 @@
-<link rel="stylesheet" href="/static/css/font-awesome.min.css">
+<link rel="prelad" as="font" type="font/woff2" crossorigin href="/static/fonts/fontawesome-webfont.woff2?v=4.7.0">
+<link rel="preload" as="style" href="/static/css/font-awesome.min.css" onload="this.rel='stylesheet'">
 <link rel="stylesheet" href="/static/css/pico.classless.min.css">
 
 <style>

diff --git a/BookingSystem/templates/partials/footer.html b/BookingSystem/templates/partials/footer.html
@@ -1,3 +0,0 @@
-<script>
-  loadTheme();
-</script>

diff --git a/BookingSystem/templates/partials/js_student.html b/BookingSystem/templates/partials/js_student.html
@@ -25,4 +25,8 @@
     let theme = localStorage.getItem('theme') || 'dark';
     setTheme(theme);
   }
+
+  document.addEventListener("DOMContentLoaded", function (event) {
+    loadTheme();
+  });
 </script>
diff --git a/BookingSystem/templates/templates/tom-select.html b/BookingSystem/templates/templates/tom-select.html
@@ -1,5 +1,5 @@
 <script src="/static/js/tom-select.complete.min.js"></script>
-<link rel="stylesheet" href="/static/css/tom-select.css"/>
+<link rel="stylesheet" href="/static/css/tom-select.min.css"/>
 
 <style>
   .has-items .ts-control {