krageon/zer.ooo-web
1
0
Fork 0
forked from zer.ooo/web
Code Issues Pull requests Releases Wiki Activity

update all panel pages

Browse source
This commit is contained in:
Corne Oppelaar 2016-08-23 20:52:01 +02:00
parent 414f17476f
commit 45ee7b2ebc
13 changed files with 291 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Vagrantfile vendored
View file

@ -18,9 +18,10 @@ installphp
vpn.vm.box = "ubuntu/wily64"
vpn.vm.network "private_network", ip: "192.168.50.8"
vpn.vm.synced_folder "../zer.ooo-server", "/server"
vpn.vm.synced_folder "../zer.ooo-service", "/service"
vpn.vm.network "forwarded_port", guest: 7864, host: 7864
vpn.vm.provision :shell, inline: <<installnode
bash /server/main.sh all "http://192.168.50.4:8888";
SERVICE_REPO="/service" bash /server/main.sh all "http://192.168.50.4:8888";
installnode
end

1
config/routes.yml
View file

@ -27,6 +27,7 @@ routes:
/download/{name}: Panel\Certificates\Download
/revoke:
post: Panel\Certificates\Revoke
/servers: Panel\Servers
/server:
/remove:
post: Panel\Servers\Remove

108
public/css/main.css
View file

@ -133,11 +133,21 @@ body {
border-right: 3px solid #d2d5e7;
padding: 15px;
margin-top: 20px; }
.panel-content .buttons {
float: right; }
.panel-content .buttons button {
padding: 10px;
font-size: 15px; }
.panel-content::after {
content: "";
display: table;
clear: both; }
.invite-create {
float: right; }
.certificate-create, .invite-create button {
.certificate-create,
.invite-create button {
font-size: 16px;
font-weight: normal;
background: #53257e;
@ -158,57 +168,119 @@ body {
color: #999999;
margin-bottom: 25px; }
.certificate-list, .invites {
.certificate-list,
.servers,
.invites {
margin: 0;
list-style: none;
padding: 0; }
.certificate-list li, .invites li {
.certificate-list li,
.servers li,
.invites li {
border-left: 3px #e3b2a6 solid;
padding-left: 5px;
margin-bottom: 10px;
position: relative; }
.certificate-list li .text .expiry, .invites li .text .expiry {
.certificate-list li .text .expiry,
.servers li .text .expiry,
.invites li .text .expiry {
font-size: 14px;
color: #999999; }
.certificate-list li .revoke-q, .invites li .revoke-q {
.certificate-list li .revoke-q,
.servers li .revoke-q,
.invites li .revoke-q {
display: none; }
.certificate-list li .actions, .certificate-list li .revoke-q, .invites li .actions, .invites li .revoke-q {
.certificate-list li .actions, .certificate-list li .revoke-q,
.servers li .actions,
.servers li .revoke-q,
.invites li .actions,
.invites li .revoke-q {
position: absolute;
right: 0;
bottom: 0; }
.certificate-list li .actions span, .certificate-list li .revoke-q span, .invites li .actions span, .invites li .revoke-q span {
.certificate-list li .actions span, .certificate-list li .revoke-q span,
.servers li .actions span,
.servers li .revoke-q span,
.invites li .actions span,
.invites li .revoke-q span {
transition: .2s;
cursor: pointer;
padding: 5px;
float: left;
display: block; }
.certificate-list li .actions span a, .certificate-list li .revoke-q span a, .invites li .actions span a, .invites li .revoke-q span a {
.certificate-list li .actions span a,
.certificate-list li .actions span button, .certificate-list li .revoke-q span a,
.certificate-list li .revoke-q span button,
.servers li .actions span a,
.servers li .actions span button,
.servers li .revoke-q span a,
.servers li .revoke-q span button,
.invites li .actions span a,
.invites li .actions span button,
.invites li .revoke-q span a,
.invites li .revoke-q span button {
background: none;
font-size: 100%;
font-family: 'Karla', sans-serif;
color: black;
text-decoration: none;
display: block;
margin: -5px;
padding: 5px; }
padding: 5px;
cursor: pointer; }
.certificate-list li .actions .certificate-delete:hover,
.certificate-list li .actions .yes:hover, .certificate-list li .revoke-q .certificate-delete:hover,
.certificate-list li .revoke-q .yes:hover, .invites li .actions .certificate-delete:hover,
.invites li .actions .yes:hover, .invites li .revoke-q .certificate-delete:hover,
.invites li .revoke-q .yes:hover {
.certificate-list li .actions .yes:hover,
.certificate-list li .actions .delete:hover, .certificate-list li .revoke-q .certificate-delete:hover,
.certificate-list li .revoke-q .yes:hover,
.certificate-list li .revoke-q .delete:hover,
.servers li .actions .certificate-delete:hover,
.servers li .actions .yes:hover,
.servers li .actions .delete:hover,
.servers li .revoke-q .certificate-delete:hover,
.servers li .revoke-q .yes:hover,
.servers li .revoke-q .delete:hover,
.invites li .actions .certificate-delete:hover,
.invites li .actions .yes:hover,
.invites li .actions .delete:hover,
.invites li .revoke-q .certificate-delete:hover,
.invites li .revoke-q .yes:hover,
.invites li .revoke-q .delete:hover {
background: #dc6a6a; }
.certificate-list li .actions .certificate-download:hover,
.certificate-list li .actions .certificate-download-key:hover,
.certificate-list li .actions .no:hover,
.certificate-list li .actions .copy:hover, .certificate-list li .revoke-q .certificate-download:hover,
.certificate-list li .actions .copy:hover,
.certificate-list li .actions .edit:hover, .certificate-list li .revoke-q .certificate-download:hover,
.certificate-list li .revoke-q .certificate-download-key:hover,
.certificate-list li .revoke-q .no:hover,
.certificate-list li .revoke-q .copy:hover, .invites li .actions .certificate-download:hover,
.certificate-list li .revoke-q .copy:hover,
.certificate-list li .revoke-q .edit:hover,
.servers li .actions .certificate-download:hover,
.servers li .actions .certificate-download-key:hover,
.servers li .actions .no:hover,
.servers li .actions .copy:hover,
.servers li .actions .edit:hover,
.servers li .revoke-q .certificate-download:hover,
.servers li .revoke-q .certificate-download-key:hover,
.servers li .revoke-q .no:hover,
.servers li .revoke-q .copy:hover,
.servers li .revoke-q .edit:hover,
.invites li .actions .certificate-download:hover,
.invites li .actions .certificate-download-key:hover,
.invites li .actions .no:hover,
.invites li .actions .copy:hover, .invites li .revoke-q .certificate-download:hover,
.invites li .actions .copy:hover,
.invites li .actions .edit:hover,
.invites li .revoke-q .certificate-download:hover,
.invites li .revoke-q .certificate-download-key:hover,
.invites li .revoke-q .no:hover,
.invites li .revoke-q .copy:hover {
.invites li .revoke-q .copy:hover,
.invites li .revoke-q .edit:hover {
background: #aca4bc; }
.certificate-list li .actions .no, .certificate-list li .revoke-q .no, .invites li .actions .no, .invites li .revoke-q .no {
.certificate-list li .actions .no, .certificate-list li .revoke-q .no,
.servers li .actions .no,
.servers li .revoke-q .no,
.invites li .actions .no,
.invites li .revoke-q .no {
width: 65px;
text-align: center; }

2
public/css/main.css.map
View file

File diff suppressed because one or more lines are too long

36
public/css/partials/_base.scss
View file

@ -146,13 +146,30 @@ body {
border-right: 3px solid #d2d5e7;
padding: 15px;
margin-top: 20px;
.buttons {
float: right;
button {
padding: 10px;
font-size: 15px;
}
}
&::after {
content: "";
display: table;
clear: both;
}
}
.invite-create {
float:right;
}
.certificate-create, .invite-create button {
.certificate-create,
.invite-create button {
font-size: 16px;
font-weight: normal;
background: hsl(271, 55%, 32%);
@ -176,7 +193,9 @@ body {
margin-bottom: 25px;
}
.certificate-list, .invites {
.certificate-list,
.servers,
.invites {
margin: 0;
list-style: none;
padding: 0;
@ -210,17 +229,23 @@ body {
float: left;
display: block;
a {
a,
button {
background: none;
font-size: 100%;
font-family: 'Karla', sans-serif;
color: black;
text-decoration: none;
display: block;
margin: -5px;
padding: 5px;
cursor: pointer;
}
}
.certificate-delete,
.yes {
.yes,
.delete {
&:hover {
background: hsl(0, 62%, 64%);
}
@ -229,7 +254,8 @@ body {
.certificate-download,
.certificate-download-key,
.no,
.copy {
.copy,
.edit {
&:hover {
background: #aca4bc;
}

11
public/js/edit_server.js → public/js/pages/servers/edit.js
View file

@ -1,5 +1,9 @@
$(function () {
var error = $('<div class="alert alert-danger" role="alert"></div>');
var errorDiv = $('<div>').addClass('error-message');
function error(msg) {
$('.title').after(errorDiv.text(msg));
}
$('.save').click(function () {
save(function(){});
@ -17,9 +21,8 @@ $(function () {
var data = $('.server-form input,.server-form select').serializeArray();
$.post('/panel/server/' + fingerprint, data, function (data) {
console.log(data);
if (!data.success) {
$('h2').after(error.text(data.error));
error(data.error);
return;
}
@ -36,7 +39,7 @@ $(function () {
},
function (data) {
if (!data.success) {
$('h2').after(error.text(data.error));
error(data.error);
return;
}

2
src/Handler/Panel/Certificates/Revoke.php
View file

@ -40,7 +40,7 @@ class Revoke extends Session
/**
* @var CA $ca
*/
$ca = $this->get('ca');
$ca = $this->get('ca');
try {
$ca->revoke($cert->getCertificate());

34
src/Handler/Panel/Servers.php Normal file
View file

@ -0,0 +1,34 @@
<?php
namespace Eater\Glim\Handler\Panel;
use Aura\Session\Segment;
use Eater\Glim\Handler\Panel;
use Eater\Glim\Model\ServerQuery;
class Servers extends Panel
{
public function handle()
{
/** @var Segment $segment */
$segment = $this->get('session')->getSegment('main');
$this->get('twig-vars')->def('message', $segment->getFlash('message'));
$superuser = $this->getUser()->getSuperuser();
$vars = [
'superuser' => $superuser,
'servers' => $this->fetchServers()
];
if ($superuser) {
$vars['registered_servers'] = $this->fetchServers('registered');
}
return $this->render('panel/servers.html.twig', $vars);
}
public function fetchServers($status = "signed")
{
return ServerQuery::create()->filterByStatus($status)->find();
}
}

4
src/Handler/Panel/Servers/Edit/Show.php
View file

@ -9,10 +9,10 @@
namespace Eater\Glim\Handler\Panel\Servers\Edit;
use Eater\Glim\Handler\Session;
use Eater\Glim\Handler\Panel;
use Eater\Glim\Model\ServerQuery;
class Show extends Session
class Show extends Panel
{
protected $shouldHaveSuperuser = true;

14
src/Handler/Panel/Servers/Remove.php
View file

@ -15,10 +15,18 @@ class Remove extends Session
public function handle()
{
$server = ServerQuery::create()->findOneByFingerprint($this->post('fingerprint'));
if ($server === null || $server->getStatus() !== 'registered') {
/** @var \Aura\Session\Session $session */
$session = $this->get('session');
$segment = $session->getSegment('main');
$segment->setFlash("message", "Couldn't delete server that is already signed");
return $this->redirect('/panel/servers');
}
$server->delete();
return $this->json([
'success' => true
]);
return $this->redirect('/panel/servers');
}
}

56
views/panel/servers.html.twig Normal file
View file

@ -0,0 +1,56 @@
{% extends "panel.html.twig" %}
{% block head %}
{{ parent() }}
<script src="/js/clipboard.min.js"></script>
<script src="/js/pages/invites.js"></script>
{% endblock %}
{% block panel_contents %}
<h1>Servers</h1>
{% if message %}
<div class="error-message">{{ message }}</div>
{% endif %}
<ul class="servers">
{% for server in servers %}
<li>
<div class="text">
{{ server.getName() }}
</div>
<div class="actions">
<span><a href="/panel/servers/{{ server.getFingerprint() }}">Details</a></span>
</div>
</li>
{% else %}
<li>
There are no servers :(
</li>
{% endfor %}
</ul>
{% if superuser %}
<h1>Registered servers</h1>
<ul class="servers">
{% for server in registered_servers %}
<li>
<div class="text">
{{ server.getFingerprint() }}
</div>
<div class="actions">
<span class="delete">
<form action="/panel/server/remove" method="post">
<input type="hidden" value="{{ server.getFingerprint() }}" name="fingerprint">
<button type="submit">remove</button>
</form>
</span>
<span class="edit" >
<a href="/panel/server/{{ server.getFingerprint() }}">edit</a>
</span>
</div>
</li>
{% else %}
<li>No servers registered</li>
{% endfor %}
</ul>
{% endif %}
{% endblock %}

141
views/panel/servers/edit.html.twig
View file

@ -1,4 +1,4 @@
{% extends "base_bootstrap.html.twig" %}
{% extends "panel.html.twig" %}
{% block head %}
{{ parent() }}
@ -6,91 +6,60 @@
<script src="/js/edit_server.js"></script>
{% endblock %}
{% block content %}
<div class="container">
<div data-fingerprint="{{ server.getFingerprint() }}" class="row server-form">
<div class="col-md-6 col-md-offset-3">
<div class="row">
<h2>Editing server '{{ server.getFqdn() }}'</h2>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-md-4" for="fqdn">Hostname</label>
<div class="col-md-8">
<input name="fqdn" id="fqdn" type="text" class="form-control" value="{{ server.getFqdn() }}">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="external-ip">External IP</label>
<div class="col-md-8">
<input name="external-ip" id="external-ip" type="text" min="-1" class="form-control" value="{{ server.getExternalIp() }}">
</div>
</div>
<h3>Details</h3>
<div class="form-group">
<label class="control-label col-md-4" for="location">Location</label>
<div class="col-md-8">
<input name="location" id="location" type="text" class="form-control" value="{{ server.getLocation() }}">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="speed">Speed</label>
<div class="col-md-8">
<input name="speed" id="speed" type="number" min="-1" class="form-control" value="{{ server.getSpeed() }}">
</div>
</div>
<h3>Config</h3>
<div class="form-group">
<label class="control-label col-md-4" for="internal-ip">Internal IP</label>
<div class="col-md-8">
<input name="internal-ip" id="internal-ip" type="text" min="-1" class="form-control" value="{{ server.getInternalIp() ?: '10.24.0.0' }}">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="speed">Netmask</label>
<div class="col-md-8">
<input name="netmask" id="netmask" type="number" min="8" max="24" class="form-control" value="{{ server.getNetmask() ?: 16 }}">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="port">Port</label>
<div class="col-md-8">
<input name="port" id="port" type="number" class="form-control" value="{{ server.getPort() ?: 1194 }}">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="protocol">Protocol</label>
<div class="col-md-8">
<select name="protocol" id="protocol" class="form-control">
<option value="udp" {{ server.getProtocol() == 'udp' ? 'selected' }}>UDP</option>
<option value="tcp" {{ server.getProtocol() == 'tcp' ? 'selected' }}>TCP</option>
</select>
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="first-dns">First DNS</label>
<div class="col-md-8">
<input name="first-dns" id="first-dns" type="text" class="form-control" value="{{ server.getFirstDns() ?: '8.8.8.8' }}">
</div>
</div>
<div class="form-group">
<label class="control-label col-md-4" for="second-dns">second DNS</label>
<div class="col-md-8">
<input name="second-dns" id="first-dns" type="text" class="form-control" value="{{ server.getSecondDns() ?: '8.8.4.4' }}">
</div>
</div>
<div class="form-group">
<div class="col-md-12">
<div class="pull-right">
<button type="button" class="btn save">Save</button>
{% if server.getStatus() == 'registered' %}
<button type="button" class="btn btn-primary save-and-sign">Sign and save</button>
{% endif %}
</div>
</div>
</div>
</div>
</div>
{% block panel_contents %}
<h1>Editing server '{{ server.getFqdn() }}'</h1>
<div class="server-form">
<div class="row">
<label for="fqdn">Hostname</label>
<input name="fqdn" id="fqdn" type="text" value="{{ server.getFqdn() }}">
</div>
<div class="row">
<label for="external-ip">External IP</label>
<input name="external-ip" id="external-ip" type="text" value="{{ server.getExternalIp() }}">
</div>
<h2>Details</h2>
<div class="row">
<label for="location">Location</label>
<input name="location" id="location" type="text" value="{{ server.getLocation() }}">
</div>
<div class="row">
<label for="speed">Speed</label>
<input name="speed" id="speed" type="number" min="-1" value="{{ server.getSpeed() }}">
</div>
<h2>Config</h2>
<div class="row">
<label for="internal-ip">Internal IP</label>
<input name="internal-ip" id="internal-ip" type="text" value="{{ server.getInternalIp() ?: '10.24.0.0' }}">
</div>
<div class="row">
<label for="netmask">Netmask</label>
<input name="netmask" id="netmask" type="number" min="8" max="24" value="{{ server.getNetmask() ?: 16 }}">
</div>
<div class="row">
<label for="port">Port</label>
<input name="port" id="port" type="number" value="{{ server.getPort() ?: 1194 }}">
</div>
<div class="row">
<label for="protocol">Protocol</label>
<select name="protocol" id="protocol">
<option value="udp" {{ server.getProtocol() == 'udp' ? 'selected' }}>UDP</option>
<option value="tcp" {{ server.getProtocol() == 'tcp' ? 'selected' }}>TCP</option>
</select>
</div>
<div class="row">
<label for="second-dns">second DNS</label>
<input name="second-dns" id="first-dns" type="text" value="{{ server.getSecondDns() ?: '8.8.4.4' }}" />
</div>
<div class="row">
<label class="control-label col-md-4" for="second-dns">second DNS</label>
<input name="second-dns" id="first-dns" type="text" class="form-control" value="{{ server.getSecondDns() ?: '8.8.4.4' }}" />
</div>
</div>
<div class="buttons">
<button type="button">Save</button>
{% if server.getStatus() == 'registered' %}
<button type="button">Sign and save</button>
{% endif %}
</div>
{% endblock %}

0
views/panel/servers/show.html.twig Normal file
View file