Merge branch 'feature/vuejs' into feature/vue-serverview

resources/assets/scripts/components/dashboard/Dashboard.vue

@@ -29,6 +29,7 @@
 
 <script>
     import { DateTime } from 'luxon';
+    import Server from '../../models/server';
     import _ from 'lodash';
     import Flash from '../Flash';
     import ServerBox from './ServerBox';
@@ -75,7 +76,6 @@
         },
 
         methods: {
-
             /**
              * Handle a search for servers but only call the search function every 500ms
              * at the fastest.

resources/assets/scripts/components/dashboard/ServerBox.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="server-box animate fadein">
-        <router-link :to="{ name: 'server', params: { id: server.identifier }}" class="content">
+        <router-link :to="{ name: 'server', params: { serverID: server.identifier }}" class="content">
             <div class="float-right">
                 <div class="indicator" :class="status"></div>
             </div>