Merge 17cffa7528 into 03beef8006

Co-authored-by: Frank Elsinga <frank@elsinga.de>

server/modules/apicache/apicache.js

@@ -485,7 +485,7 @@ function ApiCache() {
         }
 
         if (typeof duration === "string") {
-            let split = duration.match(/^([\d\.,]+)\s?(\w+)$/);
+            let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/);
 
             if (split.length === 3) {
                 let len = parseFloat(split[1]);

src/pages/List.vue

@@ -11,6 +11,18 @@ export default {
     components: {
         MonitorList,
     },
+    watch: {
+        "$root.isMobile"(newVal) {
+            if (!newVal && this.$route.path === "/list") {
+                this.$router.replace({ path: "/dashboard" });
+            }
+        },
+    },
+    mounted() {
+        if (!this.$root.isMobile && this.$route.path === "/list") {
+            this.$router.replace({ path: "/dashboard" });
+        }
+    },
 };
 </script>
 
@@ -20,5 +32,4 @@ export default {
 .shadow-box {
     padding: 20px;
 }
-
 </style>