Skip to content

Commit 20472a9

Browse files
schrejschrej
committed
merge remote changes
1 parent 7b6c14c commit 20472a9

File tree

3 files changed

+125
-26
lines changed

3 files changed

+125
-26
lines changed

‎package-lock.json‎

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/assets/scripts/components/server/Server.vue‎

Lines changed: 55 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
22
<div>
33
<navigation></navigation>
4-
<div class="container mx-auto p-2 flex flex-no-shrink rounded">
5-
<div class="sidebar border-grey-lighter flex-no-shrink w-1/4">
4+
<div class="p-2 flex flex-no-shrink rounded">
5+
<div class="sidebar border-grey-lighter flex-no-shrink w-1/3 max-w-xs">
66
<div class="pt-6 px-6 pb-4 text-center">
77
<h3 class="mb-2 text-blue">Pterodactylcraft</h3>
88
<span class="text-grey-dark">Minecraft / Vanilla</span>
@@ -12,46 +12,75 @@
1212
<button class="btn btn-blue">Restart</button>
1313
<button class="btn btn-red">Kill</button>
1414
</div>
15-
<div class="mt-8 mb-6 text-grey-dark border-t border-grey-lighter usage">
16-
<span class="indicator-title">CPU - 2 Cores</span>
17-
<div class="rounded border-grey-lighter border mt-3 h-4">
15+
<div class="mt-8 mb-6 text-grey-dark border-t border-grey-light usage">
16+
<span class="bg-grey-lighter">CPU - 2 Cores</span>
17+
<div class="rounded border-grey-light border mt-3 h-4">
1818
<div class="rounded bg-blue h-4 w-1/6"></div>
1919
</div>
20-
</div>
21-
<div class="my-6 text-grey-dark border-t border-grey-lighter usage">
22-
<span class="indicator-title">RAM - 4 GB</span>
23-
<div class="rounded border-grey-lighter border mt-3 h-4">
24-
<div class="rounded bg-blue h-4 w-2/3"></div>
20+
<div class="mt-8 mb-6 text-grey-dark border-t border-grey-light usage">
21+
<span class="bg-grey-lighter">CPU - 2 Cores</span>
22+
<div class="rounded border-grey-light border mt-3 h-4">
23+
<div class="rounded bg-blue h-4 w-1/6"></div>
24+
</div>
2525
</div>
26-
</div>
27-
<div class="my-6 text-grey-dark border-t border-grey-lighter usage">
28-
<span class="indicator-title">Disk - 20 GB</span>
29-
<div class="rounded border-grey-lighter border mt-3 h-4">
30-
<div class="rounded bg-blue h-4 w-1/3"></div>
26+
<div class="my-6 text-grey-dark border-t border-grey-light usage">
27+
<span class="bg-grey-lighter">RAM - 4 GB</span>
28+
<div class="rounded border-grey-light border mt-3 h-4">
29+
<div class="rounded bg-blue h-4 w-2/3"></div>
30+
</div>
31+
</div>
32+
<div class="my-6 text-grey-dark border-t border-grey-light usage">
33+
<span class="bg-grey-lighter">Disk - 20 GB</span>
34+
<div class="rounded border-grey-light border mt-3 h-4">
35+
<div class="rounded bg-blue h-4 w-1/3"></div>
36+
</div>
3137
</div>
3238
</div>
3339
</div>
3440
<div class="sidenav">
35-
<router-link :to="{ name: 'server' }"><font-awesome-icon class="mr-2" fixed-with icon="terminal" />Console</router-link>
36-
<router-link :to="{ name: 'server-files' }"><font-awesome-icon class="mr-2" fixed-with icon="folder-open" />Files</router-link>
37-
<router-link :to="{ name: 'server-subusers' }"><font-awesome-icon class="mr-2" fixed-with icon="users" />Subusers</router-link>
38-
<router-link :to="{ name: 'server-schedules' }"><font-awesome-icon class="mr-2" fixed-with icon="calendar-alt" />Schedules</router-link>
39-
<router-link :to="{ name: 'server-databases' }"><font-awesome-icon class="mr-2" fixed-with icon="database" />Databases</router-link>
40-
<router-link :to="{ name: 'server-allocations' }"><font-awesome-icon class="mr-2" fixed-with icon="globe" />Allocations</router-link>
41-
<router-link :to="{ name: 'server-settings' }"><font-awesome-icon class="mr-2" fixed-with icon="cog" />Settings</router-link>
41+
<router-link :to="{ name: 'server' }">
42+
<font-awesome-icon class="mr-2" fixed-with icon="terminal"/>
43+
Console
44+
</router-link>
45+
<router-link :to="{ name: 'server-files' }">
46+
<font-awesome-icon class="mr-2" fixed-with icon="folder-open"/>
47+
Files
48+
</router-link>
49+
<router-link :to="{ name: 'server-subusers' }">
50+
<font-awesome-icon class="mr-2" fixed-with icon="users"/>
51+
Subusers
52+
</router-link>
53+
<router-link :to="{ name: 'server-schedules' }">
54+
<font-awesome-icon class="mr-2" fixed-with icon="calendar-alt"/>
55+
Schedules
56+
</router-link>
57+
<router-link :to="{ name: 'server-databases' }">
58+
<font-awesome-icon class="mr-2" fixed-with icon="database"/>
59+
Databases
60+
</router-link>
61+
<router-link :to="{ name: 'server-allocations' }">
62+
<font-awesome-icon class="mr-2" fixed-with icon="globe"/>
63+
Allocations
64+
</router-link>
65+
<router-link :to="{ name: 'server-settings' }">
66+
<font-awesome-icon class="mr-2" fixed-with icon="cog"/>
67+
Settings
68+
</router-link>
4269
</div>
4370
</div>
44-
<div class="main bg-white p-6 rounded border border-grey-lighter flex-grow"><!--h1.text-blue.mb-6 Server Console-->
45-
<router-view></router-view>
71+
<div class="main bg-white p-6 rounded border border-grey-lighter flex-grow">
72+
<!--h1.text-blue.mb-6 Server Console-->
73+
<router-view></router-view>
74+
</div>
4675
</div>
47-
</div>
4876
</div>
4977
</template>
5078

5179
<script>
5280
import ServerConsole from "./ServerConsole";
5381
import Navigation from '../core/Navigation';
82+
5483
export default {
55-
components: { Navigation, ServerConsole}
84+
components: {Navigation, ServerConsole}
5685
}
5786
</script>

‎resources/themes/pterodactyl/templates/base/core.blade.php‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,54 @@
11
@extends('templates/wrapper')
22

3+
{{--
4+
=======
5+
@section('above-container')
6+
<header class="bg-blue text-white text-xl rounded-b fixed pin-t w-full z-40 shadow-md">
7+
<div class="container h-16 mx-auto flex">
8+
<img class="h-12 mt-2 mr-3" src="/assets/img/pterodactyl-flat.svg">
9+
<div class="py-6">PTERODACTYL</div>
10+
<div class="flex-grow"></div>
11+
<nav class="nav text-lg">
12+
<router-link to="/"><font-awesome-icon class="mr-2" fixed-with icon="server"></font-awesome-icon>Servers</router-link>
13+
<a href="#"><font-awesome-icon class="mr-2" fixed-with icon="cogs"></font-awesome-icon>Admin</a>
14+
<a href="#"><font-awesome-icon class="mr-2" fixed-with icon="user"></font-awesome-icon>schrej</a>
15+
<a href="/auth/logout"><font-awesome-icon fixed-with icon="sign-out-alt"></font-awesome-icon></a>
16+
</nav>
17+
</div>
18+
</header>
19+
<div class="h-16 mb-6"></div>
20+
{{--<div class="nav">
21+
<div class="logo">
22+
Pterodactyl
23+
</div>
24+
<div class="menu">
25+
<ul>
26+
<li>
27+
<router-link to="/">
28+
<span>Your Servers</span>
29+
</router-link>
30+
</li>
31+
<li>
32+
<a href="#">
33+
<span>Admin</span>
34+
</a>
35+
</li>
36+
<li>
37+
<a href="#">
38+
<span>dane</span>
39+
</a>
40+
</li>
41+
<li>
42+
<a href="{{ route('auth.logout') }}">
43+
<span>Logout</span>
44+
</a>
45+
</li>
46+
</ul>
47+
</div>
48+
</div>
49+
@endsection
50+
--}}
51+
352
@section('container')
453
<router-view></router-view>
554
@endsection

0 commit comments

Comments
 (0)