From d7ce62c0473d03b46999996f627203f49617cf64 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 3 Feb 2019 14:49:04 -0800
Subject: [PATCH] Re-add socket mixin, works fine?

---
 .../scripts/components/server/Server.ts       | 23 +++++++++++--------
 webpack.config.js                             |  1 +
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/resources/assets/scripts/components/server/Server.ts b/resources/assets/scripts/components/server/Server.ts
index 9d712ac84..cbcb78aa8 100644
--- a/resources/assets/scripts/components/server/Server.ts
+++ b/resources/assets/scripts/components/server/Server.ts
@@ -1,16 +1,21 @@
 import Vue from 'vue';
-import Navigation from '../core/Navigation';
+import Navigation from '@/components/core/Navigation';
 import ProgressBar from './components/ProgressBar';
 import { mapState } from 'vuex';
 import * as io from 'socket.io-client';
+import { Socketio } from "@/mixins/socketio";
+import Icon from "@/components/core/Icon";
+import PowerButtons from "@/components/server/components/PowerButtons";
 
 export default Vue.component('server', {
-    components: { ProgressBar, Navigation },
+    components: { ProgressBar, PowerButtons, Navigation, Icon },
     computed: {
         ...mapState('server', ['server', 'credentials']),
         ...mapState('socket', ['connected', 'connectionError']),
     },
 
+    mixins: [ Socketio ],
+
     // Watch for route changes that occur with different server parameters. This occurs when a user
     // uses the search bar. Because of the way vue-router works, it won't re-mount the server component
     // so we will end up seeing the wrong server data if we don't perform this watch.
@@ -83,25 +88,25 @@ export default Vue.component('server', {
                         </div>
                         <div class="mt-6 sidenav mr-6 bg-white border rounded">
                             <router-link :to="{ name: 'server', params: { id: $route.params.id } }">
-                                <terminal-icon class="h-4"></terminal-icon> Console
+                                <icon name="terminal" class="h-4"></icon> Console
                             </router-link>
                             <router-link :to="{ name: 'server-files' }">
-                                <folder-icon class="h-4"></folder-icon> Files
+                                <icon name="folder" class="h-4"></icon> Files
                             </router-link>
                             <router-link :to="{ name: 'server-subusers' }">
-                                <users-icon class="h-4"></users-icon> Subusers
+                                <icon name="users" class="h-4"></icon> Subusers
                             </router-link>
                             <router-link :to="{ name: 'server-schedules' }">
-                                <calendar-icon class="h-4"></calendar-icon> Schedules
+                                <icon name="calendar" class="h-4"></icon> Schedules
                             </router-link>
                             <router-link :to="{ name: 'server-databases' }">
-                                <database-icon class="h-4"></database-icon> Databases
+                                <icon name="database" class="h-4"></icon> Databases
                             </router-link>
                             <router-link :to="{ name: 'server-allocations' }">
-                                <globe-icon class="h-4"></globe-icon> Allocations
+                                <icon name="globe" class="h-4"></icon> Allocations
                             </router-link>
                             <router-link :to="{ name: 'server-settings' }">
-                                <settings-icon class="h-4"></settings-icon> Settings
+                                <icon name="settings" class="h-4"></icon> Settings
                             </router-link>
                         </div>
                     </div>
diff --git a/webpack.config.js b/webpack.config.js
index 6ef2fd69a..d27f35443 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -164,6 +164,7 @@ module.exports = {
         extensions: ['.ts', '.js', '.vue', '.json'],
         alias: {
             'vue$': 'vue/dist/vue.esm.js',
+            '@': path.join(__dirname, 'resources/assets/scripts'),
         },
         symlinks: false,
     },