Fixes usage of dashboard with different backend timezone config

laravel · Sep 18, 2020 · 3d7d269 · 3d7d269
1 parent 0e4b13e
commit 3d7d269
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 14 deletions.
diff --git a/public/app.js b/public/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,4 +1,4 @@
 {
-    "/app.js": "/app.js?id=ac38bd55e57dcc3a94bf",
+    "/app.js": "/app.js?id=4cd65553f3baa40505e0",
     "/app.css": "/app.css?id=ac312744bf7a06265c21"
 }
diff --git a/resources/js/app.js b/resources/js/app.js
@@ -14,7 +14,7 @@ if (token) {
 
 Vue.use(VueRouter);
 
-moment.tz.setDefault(App.timezone);
+moment.tz.setDefault('utc');
 
 const router = new VueRouter({
     routes: Routes,

diff --git a/resources/js/mixins/interactsWithMetrics.js b/resources/js/mixins/interactsWithMetrics.js
@@ -27,7 +27,15 @@ export default {
          * Formats the given label to a tooltip title.
          */
         formatTooltipTitle([{ label }]) {
-            return label + ' - ' + moment(label, 'LT').add(1, 'hours').format('LT');
+            return (
+                label +
+                ' - ' +
+                moment(label, 'LT')
+                    .add(1, 'hours')
+                    .local(true)
+                    .format('LT')
+                    .replace(/:[0-9]{2}/, '')
+            );
         },
 
         /**

diff --git a/resources/views/layout.blade.php b/resources/views/layout.blade.php
@@ -115,11 +115,6 @@ class="group flex items-center px-2 py-2 text-sm leading-5 font-medium text-gray
             <router-view></router-view>
         </div>
 
-        <!-- Global App Object -->
-        <script>
-            window.App = @json($appVars);
-        </script>
-
         <script src="{{ asset(mix('app.js', 'vendor/vapor-ui')) }}"></script>
     </body>
 </html>
diff --git a/src/Http/Controllers/HomeController.php b/src/Http/Controllers/HomeController.php
@@ -13,10 +13,6 @@ class HomeController
      */
     public function __invoke()
     {
-        return view('vapor-ui::layout', [
-            'appVars' => [
-                'timezone' => config('app.timezone'),
-            ],
-        ]);
+        return view('vapor-ui::layout');
     }
 }