From 2de54f9fcfbfc521b8db69f7c553fdd267598b72 Mon Sep 17 00:00:00 2001
From: James Brooks <james@alt-three.com>
Date: Fri, 27 Oct 2023 13:23:27 +0100
Subject: [PATCH] Small fixes

---
 resources/assets/js/app.js                   | 10 +++++++---
 resources/assets/js/cachet.js                | 20 ++------------------
 resources/assets/js/components/Setup.vue     |  3 +--
 resources/views/partials/incidents.blade.php |  2 +-
 4 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 9a3dec94..e5185ca6 100644
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -25,6 +25,10 @@ window.axios.defaults.headers.common = {
  */
 const Flatpickr = require('flatpickr');
 
+import Metric from './components/status-page/Metric.vue';
+import Dashboard from './components/dashboard/Dashboard.vue';
+import Setup from './components/Setup.vue';
+
 ((win, doc) => {
     /**
      * Next, we will create a fresh Vue application instance and attach it to
@@ -56,9 +60,9 @@ const Flatpickr = require('flatpickr');
             });
         },
         components: {
-            'setup': require('./components/Setup'),
-            'dashboard': require('./components/dashboard/Dashboard'),
-            'metric-chart': require('./components/status-page/Metric'),
+            'setup': Setup,
+            'dashboard': Dashboard,
+            'metric-chart': Metric,
         }
     });
 })()
diff --git a/resources/assets/js/cachet.js b/resources/assets/js/cachet.js
index 5e6c6836..9e019bdf 100644
--- a/resources/assets/js/cachet.js
+++ b/resources/assets/js/cachet.js
@@ -1,4 +1,4 @@
-$(function () {
+(function () {
     // Ajax Setup
     $.ajaxPrefilter(function(options, originalOptions, jqXHR) {
         var token;
@@ -310,22 +310,6 @@ $(function () {
         sparkLine();
     }
 
-    function goToStep(current, next) {
-        // validation was ok. We can go on next step.
-        $('.block-' + current)
-          .removeClass('show')
-          .addClass('hidden');
-
-        $('.block-' + next)
-          .removeClass('hidden')
-          .addClass('show');
-
-        $('.steps .step')
-            .removeClass("active")
-            .filter(":lt(" + (next) + ")")
-            .addClass("active");
-    }
-
     // Check for updates.
     if ($('#update-alert').length > 0) {
         $.ajax({
@@ -357,4 +341,4 @@ $(function () {
             if (_.isFunction(cancelCallback)) cancelCallback();
         });
     }
-});
+}());
diff --git a/resources/assets/js/components/Setup.vue b/resources/assets/js/components/Setup.vue
index 23a705c1..160dc08d 100644
--- a/resources/assets/js/components/Setup.vue
+++ b/resources/assets/js/components/Setup.vue
@@ -1,6 +1,5 @@
 <script>
-module.exports = {
-    props: [],
+export default {
     data () {
         return {
             env: {
diff --git a/resources/views/partials/incidents.blade.php b/resources/views/partials/incidents.blade.php
index c280bb99..b775aa40 100644
--- a/resources/views/partials/incidents.blade.php
+++ b/resources/views/partials/incidents.blade.php
@@ -34,7 +34,7 @@
                         <div class="list-group">
                             @foreach($incident->updates as $update)
                             <li class="list-group-item incident-update-item">
-                                
+
                                 <i class="{{ $update->icon }}" title="{{ $update->human_status }}" data-toggle="tooltip"></i>
                                 {!! $update->formatted_message !!}
                                 <small>