From 20472a903c5f7d3146c664f92664266e3f423678 Mon Sep 17 00:00:00 2001
From: Jakob Schrettenbrunner <dev@schrej.net>
Date: Sun, 3 Jun 2018 18:31:43 +0200
Subject: [PATCH] merge remote changes

---
 package-lock.json                             | 21 +++++
 .../scripts/components/server/Server.vue      | 81 +++++++++++++------
 .../pterodactyl/templates/base/core.blade.php | 49 +++++++++++
 3 files changed, 125 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 283b1225..35933a2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -853,6 +853,12 @@
         "babel-types": "^6.24.1"
       }
     },
+    "babel-helper-vue-jsx-merge-props": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==",
+      "dev": true
+    },
     "babel-helpers": {
       "version": "6.24.1",
       "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz",
@@ -6524,6 +6530,12 @@
         "es5-ext": "~0.10.2"
       }
     },
+    "luxon": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-1.2.1.tgz",
+      "integrity": "sha512-ymX+7rWJjYw6jfmtkLqHJmXo+FYC69icT60x+utlzjIOc/U4SNXljUITwH4C1RDP0ZukWf4apHT/d1Ux/4eHPg==",
+      "dev": true
+    },
     "make-dir": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
@@ -11365,6 +11377,15 @@
       "integrity": "sha512-bq6AyYD0lTnL4vkyIMvN9NV30u9B+ys1AXmQgqtR1uLGbHOh5zNB9BXIl04F2q+ukaM7XRiAB4uQqXJyoWjgqA==",
       "dev": true
     },
+    "vue-feather-icons": {
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/vue-feather-icons/-/vue-feather-icons-4.7.1.tgz",
+      "integrity": "sha1-2MVfvufJrVlonruvB60eLx5cN9o=",
+      "dev": true,
+      "requires": {
+        "babel-helper-vue-jsx-merge-props": "^2.0.2"
+      }
+    },
     "vue-hot-reload-api": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz",
diff --git a/resources/assets/scripts/components/server/Server.vue b/resources/assets/scripts/components/server/Server.vue
index df244c37..2da6d0fa 100644
--- a/resources/assets/scripts/components/server/Server.vue
+++ b/resources/assets/scripts/components/server/Server.vue
@@ -1,8 +1,8 @@
 <template>
     <div>
         <navigation></navigation>
-        <div class="container mx-auto p-2 flex flex-no-shrink rounded">
-            <div class="sidebar border-grey-lighter flex-no-shrink w-1/4">
+        <div class="p-2 flex flex-no-shrink rounded">
+            <div class="sidebar border-grey-lighter flex-no-shrink w-1/3 max-w-xs">
                 <div class="pt-6 px-6 pb-4 text-center">
                     <h3 class="mb-2 text-blue">Pterodactylcraft</h3>
                     <span class="text-grey-dark">Minecraft / Vanilla</span>
@@ -12,46 +12,75 @@
                         <button class="btn btn-blue">Restart</button>
                         <button class="btn btn-red">Kill</button>
                     </div>
-                    <div class="mt-8 mb-6 text-grey-dark border-t border-grey-lighter usage">
-                        <span class="indicator-title">CPU - 2 Cores</span>
-                        <div class="rounded border-grey-lighter border mt-3 h-4">
+                    <div class="mt-8 mb-6 text-grey-dark border-t border-grey-light usage">
+                        <span class="bg-grey-lighter">CPU - 2 Cores</span>
+                        <div class="rounded border-grey-light border mt-3 h-4">
                             <div class="rounded bg-blue h-4 w-1/6"></div>
                         </div>
-                    </div>
-                    <div class="my-6 text-grey-dark border-t border-grey-lighter usage">
-                        <span class="indicator-title">RAM - 4 GB</span>
-                        <div class="rounded border-grey-lighter border mt-3 h-4">
-                            <div class="rounded bg-blue h-4 w-2/3"></div>
+                        <div class="mt-8 mb-6 text-grey-dark border-t border-grey-light usage">
+                            <span class="bg-grey-lighter">CPU - 2 Cores</span>
+                            <div class="rounded border-grey-light border mt-3 h-4">
+                                <div class="rounded bg-blue h-4 w-1/6"></div>
+                            </div>
                         </div>
-                    </div>
-                    <div class="my-6 text-grey-dark border-t border-grey-lighter usage">
-                        <span class="indicator-title">Disk - 20 GB</span>
-                        <div class="rounded border-grey-lighter border mt-3 h-4">
-                            <div class="rounded bg-blue h-4 w-1/3"></div>
+                        <div class="my-6 text-grey-dark border-t border-grey-light usage">
+                            <span class="bg-grey-lighter">RAM - 4 GB</span>
+                            <div class="rounded border-grey-light border mt-3 h-4">
+                                <div class="rounded bg-blue h-4 w-2/3"></div>
+                            </div>
+                        </div>
+                        <div class="my-6 text-grey-dark border-t border-grey-light usage">
+                            <span class="bg-grey-lighter">Disk - 20 GB</span>
+                            <div class="rounded border-grey-light border mt-3 h-4">
+                                <div class="rounded bg-blue h-4 w-1/3"></div>
+                            </div>
                         </div>
                     </div>
                 </div>
                 <div class="sidenav">
-                    <router-link :to="{ name: 'server' }"><font-awesome-icon class="mr-2" fixed-with icon="terminal" />Console</router-link>
-                    <router-link :to="{ name: 'server-files' }"><font-awesome-icon class="mr-2" fixed-with icon="folder-open" />Files</router-link>
-                    <router-link :to="{ name: 'server-subusers' }"><font-awesome-icon class="mr-2" fixed-with icon="users" />Subusers</router-link>
-                    <router-link :to="{ name: 'server-schedules' }"><font-awesome-icon class="mr-2" fixed-with icon="calendar-alt" />Schedules</router-link>
-                    <router-link :to="{ name: 'server-databases' }"><font-awesome-icon class="mr-2" fixed-with icon="database" />Databases</router-link>
-                    <router-link :to="{ name: 'server-allocations' }"><font-awesome-icon class="mr-2" fixed-with icon="globe" />Allocations</router-link>
-                    <router-link :to="{ name: 'server-settings' }"><font-awesome-icon class="mr-2" fixed-with icon="cog" />Settings</router-link>
+                    <router-link :to="{ name: 'server' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="terminal"/>
+                        Console
+                    </router-link>
+                    <router-link :to="{ name: 'server-files' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="folder-open"/>
+                        Files
+                    </router-link>
+                    <router-link :to="{ name: 'server-subusers' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="users"/>
+                        Subusers
+                    </router-link>
+                    <router-link :to="{ name: 'server-schedules' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="calendar-alt"/>
+                        Schedules
+                    </router-link>
+                    <router-link :to="{ name: 'server-databases' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="database"/>
+                        Databases
+                    </router-link>
+                    <router-link :to="{ name: 'server-allocations' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="globe"/>
+                        Allocations
+                    </router-link>
+                    <router-link :to="{ name: 'server-settings' }">
+                        <font-awesome-icon class="mr-2" fixed-with icon="cog"/>
+                        Settings
+                    </router-link>
                 </div>
             </div>
-            <div class="main bg-white p-6 rounded border border-grey-lighter flex-grow"><!--h1.text-blue.mb-6 Server Console-->
-                <router-view></router-view>
+                <div class="main bg-white p-6 rounded border border-grey-lighter flex-grow">
+                    <!--h1.text-blue.mb-6 Server Console-->
+                    <router-view></router-view>
+                </div>
             </div>
-        </div>
     </div>
 </template>
 
 <script>
     import ServerConsole from "./ServerConsole";
     import Navigation from '../core/Navigation';
+
     export default {
-        components: { Navigation, ServerConsole}
+        components: {Navigation, ServerConsole}
     }
 </script>
diff --git a/resources/themes/pterodactyl/templates/base/core.blade.php b/resources/themes/pterodactyl/templates/base/core.blade.php
index 120cfbe0..7ccb14e7 100644
--- a/resources/themes/pterodactyl/templates/base/core.blade.php
+++ b/resources/themes/pterodactyl/templates/base/core.blade.php
@@ -1,5 +1,54 @@
 @extends('templates/wrapper')
 
+{{--
+=======
+@section('above-container')
+    <header class="bg-blue text-white text-xl rounded-b fixed pin-t w-full z-40 shadow-md">
+        <div class="container h-16 mx-auto flex">
+            <img class="h-12 mt-2 mr-3" src="/assets/img/pterodactyl-flat.svg">
+            <div class="py-6">PTERODACTYL</div>
+            <div class="flex-grow"></div>
+            <nav class="nav text-lg">
+                <router-link to="/"><font-awesome-icon class="mr-2" fixed-with icon="server"></font-awesome-icon>Servers</router-link>
+                <a href="#"><font-awesome-icon class="mr-2" fixed-with icon="cogs"></font-awesome-icon>Admin</a>
+                <a href="#"><font-awesome-icon class="mr-2" fixed-with icon="user"></font-awesome-icon>schrej</a>
+                <a href="/auth/logout"><font-awesome-icon fixed-with icon="sign-out-alt"></font-awesome-icon></a>
+            </nav>
+        </div>
+    </header>
+    <div class="h-16 mb-6"></div>
+    {{--<div class="nav">
+        <div class="logo">
+            Pterodactyl
+        </div>
+        <div class="menu">
+            <ul>
+                <li>
+                    <router-link to="/">
+                        <span>Your Servers</span>
+                    </router-link>
+                </li>
+                <li>
+                    <a href="#">
+                        <span>Admin</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="#">
+                        <span>dane</span>
+                    </a>
+                </li>
+                <li>
+                    <a href="{{ route('auth.logout') }}">
+                        <span>Logout</span>
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+@endsection
+--}}
+
 @section('container')
     <router-view></router-view>
 @endsection