Break console page into a component

This commit is contained in:
Dane Everitt 2018-07-20 22:34:30 -07:00
parent 2ab66ba8c8
commit 784c73becd
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
5 changed files with 29 additions and 50 deletions

View file

@ -25,7 +25,7 @@
</div> </div>
</div> </div>
<div class="sidenav"> <div class="sidenav">
<router-link :to="{ name: 'server', params: { id: this.$route.params.id } }"> <router-link :to="{ name: '', params: { id: this.$route.params.id } }">
<terminal-icon style="height: 1em;"></terminal-icon> <terminal-icon style="height: 1em;"></terminal-icon>
Console Console
</router-link> </router-link>
@ -64,14 +64,14 @@
<script> <script>
import { TerminalIcon, FolderIcon, UsersIcon, CalendarIcon, DatabaseIcon, GlobeIcon, SettingsIcon } from 'vue-feather-icons' import { TerminalIcon, FolderIcon, UsersIcon, CalendarIcon, DatabaseIcon, GlobeIcon, SettingsIcon } from 'vue-feather-icons'
import ServerConsole from "./ServerConsole";
import Navigation from '../core/Navigation'; import Navigation from '../core/Navigation';
import ProgressBar from './components/ProgressBar'; import ProgressBar from './components/ProgressBar';
import {mapState} from 'vuex'; import {mapState} from 'vuex';
import { ConsolePage } from './subpages/ConsolePage';
export default { export default {
components: { components: {
ProgressBar, Navigation, ServerConsole, TerminalIcon, FolderIcon, UsersIcon, ProgressBar, Navigation, ConsolePage, TerminalIcon, FolderIcon, UsersIcon,
CalendarIcon, DatabaseIcon, GlobeIcon, SettingsIcon CalendarIcon, DatabaseIcon, GlobeIcon, SettingsIcon
}, },

View file

@ -1,44 +0,0 @@
<template>
<div>
<div class="text-xs font-mono">
<div class="rounded-t p-2 bg-black text-grey-lightest" style="height: 400px;">openjdk version "1.8.0_151"<br/>
OpenJDK Runtime Environment (IcedTea 3.6.0) (Alpine 8.151.12-r0)<br/>
OpenJDK 64-Bit Server VM (build 25.151-b12, mixed mode)<br/>
:/home/container$ java -Xms128M -Xmx512M -jar server.jar<br/>
[14:07:28] [Server thread/INFO]: Starting minecraft server version 1.12.2<br/>
[14:07:28] [Server thread/WARN]: To start the server with more ram, launch it as "java -Xmx1024M
-Xms1024M -jar minecraft_server.jar"<br/>
[14:07:28] [Server thread/INFO]: Loading properties<br/>
[14:07:29] [Server thread/INFO]: Default game type: SURVIVAL<br/>
[14:07:29] [Server thread/INFO]: Generating keypair<br/>
[14:07:29] [Server thread/INFO]: Starting Minecraft server on 0.0.0.0:25565<br/>
[14:07:29] [Server thread/INFO]: Using epoll channel type<br/>
[14:07:29] [Server thread/INFO]: Preparing level "world"<br/>
[14:07:30] [Server thread/INFO]: Loaded 488 advancements<br/>
[14:07:30] [Server thread/INFO]: Preparing start region for level 0<br/>
[14:07:31] [Server thread/INFO]: Preparing spawn area: 4%<br/>
[14:07:32] [Server thread/INFO]: Preparing spawn area: 33%<br/>
[14:07:33] [Server thread/INFO]: Preparing spawn area: 99%<br/>
[14:07:33] [Server thread/INFO]: Done (3.856s)! For help, type "help" or "?"<br/>
[14:07:33] [Server thread/INFO]: Starting GS4 status listener<br/>
[14:07:33] [Query Listener #1/INFO]: Query running on 0.0.0.0:25565<br/></div>
<div class="rounded-b p-2 bg-grey-darkest text-white">$</div>
</div>
<div class="flex mt-8">
<div class="flex-1 p-4 mr-4 border border-grey-lighter rounded"><h3 class="mb-4 text-center">CPU Usage in
%</h3>
<canvas class="w-1/2" id="chartCPU"></canvas>
</div>
<div class="flex-1 p-4 ml-4 border border-grey-lighter rounded"><h3 class="mb-4 text-center">Memory Usage in
GB</h3>
<canvas class="w-1/2" id="chartMemory"></canvas>
</div>
</div>
</div>
</template>
<script>
export default {
name: "ServerConsole",
}
</script>

View file

@ -1,6 +1,6 @@
export {default as Server} from './Server'; export {default as Server} from './Server';
export {default as ServerAllocations} from './ServerAllocations'; export {default as ServerAllocations} from './ServerAllocations';
export {default as ServerConsole} from './ServerConsole'; export {default as ConsolePage} from './subpages/ConsolePage';
export {default as ServerDatabases} from './ServerDatabases'; export {default as ServerDatabases} from './ServerDatabases';
export {default as ServerFiles} from './ServerFiles'; export {default as ServerFiles} from './ServerFiles';
export {default as ServerSchedules} from './ServerSchedules'; export {default as ServerSchedules} from './ServerSchedules';

View file

@ -0,0 +1,22 @@
<template>
<div>
<div class="text-xs font-mono">
<div class="rounded-t p-2 bg-black text-grey-lightest h-48">
</div>
<div class="rounded-b p-2 bg-grey-darkest text-white">$</div>
</div>
</div>
</template>
<script>
export default {
name: 'console-page',
data: function () {
return {
lines: [],
};
}
};
</script>

View file

@ -12,7 +12,8 @@ import User from './models/user';
import { import {
Server, Server,
ServerAllocations, ServerAllocations,
ServerConsole, ServerDatabases, ConsolePage,
ServerDatabases,
ServerFiles, ServerFiles,
ServerSchedules, ServerSchedules,
ServerSettings, ServerSettings,
@ -39,7 +40,7 @@ const routes = [
{ path: '/server/:id', component: Server, { path: '/server/:id', component: Server,
children: [ children: [
{ name: 'server', path: '', component: ServerConsole }, { name: 'server', path: '', component: ConsolePage },
{ name: 'server-files', path: 'files', component: ServerFiles }, { name: 'server-files', path: 'files', component: ServerFiles },
{ name: 'server-subusers', path: 'subusers', component: ServerSubusers }, { name: 'server-subusers', path: 'subusers', component: ServerSubusers },
{ name: 'server-schedules', path: 'schedules', component: ServerSchedules }, { name: 'server-schedules', path: 'schedules', component: ServerSchedules },