Merge pull request ronhedwigzape#175 from kulotsystems/dev

Update screensaver path.
aclc-iriga · May 21, 2023 · 9c95993 · 9c95993
2 parents d526880 + 04338c7
commit 9c95993
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/screensaver.js → assets/js/screensaver.js b/src/screensaver.js → assets/js/screensaver.js
@@ -42,6 +42,4 @@ window.addEventListener('mousemove', function() {
 window.addEventListener('keypress', function() {
     if(!forced)
         clearIdleTime();
-});
-
-export default forceScreensaver;
+});
diff --git a/index.html b/index.html
@@ -21,6 +21,6 @@
     <script type="module" src="/src/main.js"></script>
 
     <!-- Screensaver JS -->
-    <script type="module" src="/src/screensaver.js"></script>
+    <script src="/js/screensaver.js"></script>
 </body>
 </html>
diff --git a/src/components/nav/SideNav.vue b/src/components/nav/SideNav.vue
@@ -37,9 +37,9 @@
 		<template v-slot:append>
 			<v-row class="text-center mt-2 mb-1 mx-1">
 				<v-col cols="12">
-					<v-btn class="mb-2" variant="tonal" @click="coverRating" block>COVER</v-btn>
+					<v-btn class="mb-2" variant="tonal" @click="cover" block>COVER</v-btn>
 					<v-btn class="mb-2" variant="tonal" @click="refresh" block :loading="refreshing">REFRESH</v-btn>
-					<div class="mb-2 text-disabled text-uppercase">
+					<div class="pt-2 text-disabled text-uppercase">
 						&copy; {{ $store.state.app.org }}
 					</div>
 				</v-col>
@@ -50,7 +50,6 @@
 
 <script>
 import $ from 'jquery';
-import forceScreensaver from "@/screensaver";
 
 export default {
 	name: "SideNav",
@@ -77,7 +76,7 @@ export default {
             this.refreshing = true;
             window.location.reload();
         },
-        coverRating() {
+        cover() {
             forceScreensaver();
         }
 	},

diff --git a/src/views/Login.vue b/src/views/Login.vue
@@ -38,11 +38,12 @@
                                 class="mt-4 login-btn text-white"
                                 variant="outlined"
                                 type="submit"
+                                size="large"
                                 :loading="loading"
                                 :disabled="loading"
                                 block
                             >
-                                log in
+                                Log in
                             </v-btn>
                             <div class="d-flex align-center justify-center text-disabled pt-3 pt-lg-6">
                                 &copy; {{ $store.state.app.org }}