From 034e759298c7a7d23394693f65d41db4770024a3 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sat, 21 Jul 2018 22:37:41 -0700
Subject: [PATCH] Show a spinner on the console when loading the contents
 initially

---
 .../scripts/components/server/Server.vue      | 14 ++++++----
 .../server/subpages/ConsolePage.vue           | 28 +++++++++++++++++--
 resources/assets/scripts/helpers/statuses.js  |  6 ++++
 3 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 resources/assets/scripts/helpers/statuses.js

diff --git a/resources/assets/scripts/components/server/Server.vue b/resources/assets/scripts/components/server/Server.vue
index 1b8f07da4..3026a7320 100644
--- a/resources/assets/scripts/components/server/Server.vue
+++ b/resources/assets/scripts/components/server/Server.vue
@@ -25,7 +25,7 @@
                     </div>
                 </div>
                 <div class="sidenav">
-                    <router-link :to="{ name: '', params: { id: this.$route.params.id } }">
+                    <router-link :to="{ name: 'server', params: { id: this.$route.params.id } }">
                         <terminal-icon style="height: 1em;"></terminal-icon>
                         Console
                     </router-link>
@@ -67,13 +67,12 @@
     import Navigation from '../core/Navigation';
     import ProgressBar from './components/ProgressBar';
     import {mapState} from 'vuex';
-    import { ConsolePage } from './subpages/ConsolePage';
 
     import io from 'socket.io-client';
 
     export default {
         components: {
-            ProgressBar, Navigation, ConsolePage, TerminalIcon, FolderIcon, UsersIcon,
+            ProgressBar, Navigation, TerminalIcon, FolderIcon, UsersIcon,
             CalendarIcon, DatabaseIcon, GlobeIcon, SettingsIcon
         },
 
@@ -87,6 +86,10 @@
             this.$on('send-command', data => {
                 this.socket.emit('send command', data);
             });
+
+            this.$on('send-initial-log', () => {
+                this.socket.emit('send server log');
+            })
         },
 
         data: function () {
@@ -126,14 +129,15 @@
             },
 
             _socket_error: function (err) {
-                console.error('there was a socket error:', err);
+                this.$emit('socket-error', {err});
             },
 
             _socket_connect: function () {
-                this.socket.emit('send server log');
+                this.$emit('socket-connected');
             },
 
             _socket_status: function (data) {
+                this.$emit('socket-status', {data});
             },
 
             _socket_serverLog: function (data) {
diff --git a/resources/assets/scripts/components/server/subpages/ConsolePage.vue b/resources/assets/scripts/components/server/subpages/ConsolePage.vue
index f8a1eb8cf..cf3356158 100644
--- a/resources/assets/scripts/components/server/subpages/ConsolePage.vue
+++ b/resources/assets/scripts/components/server/subpages/ConsolePage.vue
@@ -2,6 +2,9 @@
     <div>
         <div class="text-xs font-mono">
             <div class="rounded-t p-2 bg-black overflow-scroll w-full" style="min-height: 16rem;max-height:64rem;">
+                <div v-if="loadingConsole">
+                    <div class="spinner spinner-xl mt-24"></div>
+                </div>
                 <div class="mb-2 text-grey-light" ref="terminal"></div>
             </div>
             <div class="rounded-b bg-grey-darkest text-white flex">
@@ -24,19 +27,36 @@
 <script>
     import { Terminal } from 'xterm';
     import * as TerminalFit from 'xterm/lib/addons/fit/fit';
+    import Status from './../../../helpers/statuses';
 
     Terminal.applyAddon(TerminalFit);
 
     export default {
         name: 'console-page',
 
+        /**
+         * Mount the component and setup all of the terminal actions. Also fetches the initial
+         * logs from the server to populate into the terminal.
+         */
         mounted: function () {
-            this.terminal.open(this.$refs.terminal);
-            this.terminal.fit();
+            this.$parent.$on('socket-connected', () => {
+                this.terminal.open(this.$refs.terminal);
+                this.terminal.fit();
+                this.terminal.clear();
+
+                this.$parent.$emit('send-initial-log');
+            });
 
             this.$parent.$on('console', data => {
+                this.loadingConsole = false;
                 this.terminal.writeln(data);
             });
+
+            this.$parent.$on('socket-status', s => {
+                if (s === Status.STATUS_OFF) {
+                    this.loadingConsole = false;
+                }
+            });
         },
 
         data: function () {
@@ -56,10 +76,14 @@
                 command: '',
                 commandHistory: [],
                 commandHistoryIndex: -1,
+                loadingConsole: true,
             };
         },
 
         methods: {
+            /**
+             * Send a command to the server using the configured websocket.
+             */
             sendCommand: function () {
                 this.commandHistoryIndex = -1;
                 this.commandHistory.unshift(this.command);
diff --git a/resources/assets/scripts/helpers/statuses.js b/resources/assets/scripts/helpers/statuses.js
new file mode 100644
index 000000000..7ed02f15a
--- /dev/null
+++ b/resources/assets/scripts/helpers/statuses.js
@@ -0,0 +1,6 @@
+export default {
+    STATUS_OFF: 0,
+    STATUS_ON: 1,
+    STATUS_STARTING: 2,
+    STATUS_STOPPING: 3,
+};