sonot
/
PteroTheme
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace tabs with Spaces 

I *really* wish Atom would stop doing this to me.
This commit is contained in:
Dane Everitt 2016-01-12 23:49:56 -05:00
parent 695728295a
commit 4604500349
17 changed files with 240 additions and 238 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/Http/Controllers/API/UserController.php
View File

@ -24,7 +24,7 @@ class UserController extends BaseController
* @Get("/{?page}") * @Get("/{?page}")
* @Versions({"v1"}) * @Versions({"v1"})
* @Parameters({ * @Parameters({
* @Parameter("page", type="integer", description="The page of results to view.", default=1) * @Parameter("page", type="integer", description="The page of results to view.", default=1)
* }) * })
* @Response(200) * @Response(200)
*/ */
@ -42,8 +42,8 @@ class UserController extends BaseController
* @Get("/{id}/{fields}") * @Get("/{id}/{fields}")
* @Versions({"v1"}) * @Versions({"v1"})
* @Parameters({ * @Parameters({
* @Parameter("id", type="integer", required=true, description="The ID of the user to get information on."), * @Parameter("id", type="integer", required=true, description="The ID of the user to get information on."),
* @Parameter("fields", type="string", required=false, description="A comma delimidated list of fields to include.") * @Parameter("fields", type="string", required=false, description="A comma delimidated list of fields to include.")
* }) * })
* @Response(200) * @Response(200)
*/ */
@ -68,18 +68,18 @@ class UserController extends BaseController
* @Post("/") * @Post("/")
* @Versions({"v1"}) * @Versions({"v1"})
* @Transaction({ * @Transaction({
* @Request({ * @Request({
* "email": "foo@example.com", * "email": "foo@example.com",
* "password": "foopassword", * "password": "foopassword",
* "admin": false * "admin": false
* }, headers={"Authorization": "Bearer <jwt-token>"}), * }, headers={"Authorization": "Bearer <jwt-token>"}),
* @Response(200, body={"id": 1}), * @Response(200, body={"id": 1}),
* @Response(422, body{ * @Response(422, body{
* "message": "A validation error occured.", * "message": "A validation error occured.",
* "errors": { * "errors": {
* "email": ["The email field is required."], * "email": ["The email field is required."],
* "password": ["The password field is required."], * "password": ["The password field is required."],
* "admin": ["The admin field is required."] * "admin": ["The admin field is required."]
* }, * },
* "status_code": 422 * "status_code": 422
* }) * })
@ -106,9 +106,9 @@ class UserController extends BaseController
* @Patch("/{id}") * @Patch("/{id}")
* @Versions({"v1"}) * @Versions({"v1"})
* @Transaction({ * @Transaction({
* @Request({ * @Request({
* "email": "new@email.com" * "email": "new@email.com"
* }, headers={"Authorization": "Bearer <jwt-token>"}), * }, headers={"Authorization": "Bearer <jwt-token>"}),
* @Response(200, body={"email": "new@email.com"}), * @Response(200, body={"email": "new@email.com"}),
* @Response(422) * @Response(422)
* }) * })
@ -127,12 +127,12 @@ class UserController extends BaseController
* @Delete("/{id}") * @Delete("/{id}")
* @Versions({"v1"}) * @Versions({"v1"})
* @Transaction({ * @Transaction({
* @Request(headers={"Authorization": "Bearer <jwt-token>"}), * @Request(headers={"Authorization": "Bearer <jwt-token>"}),
* @Response(204), * @Response(204),
* @Response(422) * @Response(422)
* }) * })
* @Parameters({ * @Parameters({
* @Parameter("id", type="integer", required=true, description="The ID of the user to delete.") * @Parameter("id", type="integer", required=true, description="The ID of the user to delete.")
* }) * })
*/ */
public function deleteUser(Request $request, $id) public function deleteUser(Request $request, $id)

8
app/Models/User.php
View File

@ -70,10 +70,10 @@ class User extends Model implements AuthenticatableContract,
/** /**
* Set a user password to a new value assuming it meets the following requirements: * Set a user password to a new value assuming it meets the following requirements:
* - 8 or more characters in length * - 8 or more characters in length
* - at least one uppercase character * - at least one uppercase character
* - at least one lowercase character * - at least one lowercase character
* - at least one number * - at least one number
* *
* @param string $password The raw password to set the account password to. * @param string $password The raw password to set the account password to.
* @param string $regex The regex to use when validating the password. Defaults to '((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,})'. * @param string $regex The regex to use when validating the password. Defaults to '((?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,})'.

2
app/Repositories/UserRepository.php
View File

@ -84,6 +84,8 @@ class UserRepository
*/ */
public function delete($id) public function delete($id)
{ {
// @TODO cannot delete user with associated servers!
// clean up subusers!
return User::destroy($id); return User::destroy($id);
} }

2
resources/lang/de/auth.php
View File

@ -18,7 +18,7 @@ return [
'sendlink' => 'Senden Sie Passwort-Reset Link.', /* Send password reset link */ 'sendlink' => 'Senden Sie Passwort-Reset Link.', /* Send password reset link */
'emailsent' => 'E-Mail gesendet.', /* Email Sent */ 'emailsent' => 'E-Mail gesendet.', /* Email Sent */
'remeberme' => 'Login merken.', /* Remember my Login*/ 'remeberme' => 'Login merken.', /* Remember my Login*/
'totp_failed' => 'Die TOTP Token vorgesehen war ist ungültig.' /* The TOTP token was provided is not valid. */ 'totp_failed' => 'Die TOTP Token vorgesehen war ist ungültig.' /* The TOTP token was provided is not valid. */
]; ];
/* /*

2
resources/lang/de/validation.php
View File

@ -69,7 +69,7 @@ return [
'array' => 'The :attribute must contain :size items.', 'array' => 'The :attribute must contain :size items.',
], ],
'string' => 'The :attribute must be a string.', 'string' => 'The :attribute must be a string.',
'totp' => 'The totp token is invalid. Did it expire?', 'totp' => 'The totp token is invalid. Did it expire?',
'timezone' => 'The :attribute must be a valid zone.', 'timezone' => 'The :attribute must be a valid zone.',
'unique' => 'The :attribute has already been taken.', 'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is invalid.', 'url' => 'The :attribute format is invalid.',

36
resources/views/admin/accounts/index.blade.php
View File

@ -7,35 +7,35 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li> <li><a href="/admin">Admin Control</a></li>
<li class="active">Accounts</li> <li class="active">Accounts</li>
</ul> </ul>
<h3>All Registered Users</h3><hr /> <h3>All Registered Users</h3><hr />
<table class="table table-striped table-bordered table-hover"> <table class="table table-striped table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Email</th> <th>Email</th>
<th>Account Created</th> <th>Account Created</th>
<th>Account Updated</th> <th>Account Updated</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($users as $user) @foreach ($users as $user)
<tr> <tr>
<td><a href="/admin/accounts/view/{{ $user->id }}"><code>{{ $user->email }}</code></a> @if($user->root_admin === 1)<span class="badge">Administrator</span>@endif</td> <td><a href="/admin/accounts/view/{{ $user->id }}"><code>{{ $user->email }}</code></a> @if($user->root_admin === 1)<span class="badge">Administrator</span>@endif</td>
<td>{{ $user->created_at }}</td> <td>{{ $user->created_at }}</td>
<td>{{ $user->updated_at }}</td> <td>{{ $user->updated_at }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<div class="row"> <div class="row">
<div class="col-md-12 text-center">{!! $users->render() !!}</div> <div class="col-md-12 text-center">{!! $users->render() !!}</div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin/accounts']").addClass('active'); $('#sidebar_links').find("a[href='/admin/accounts']").addClass('active');
}); });
</script> </script>
@endsection @endsection

96
resources/views/admin/accounts/new.blade.php
View File

@ -10,65 +10,65 @@
<li><a href="/admin">Admin Controls</a></li> <li><a href="/admin">Admin Controls</a></li>
<li><a href="/admin/accounts">Accounts</a></li> <li><a href="/admin/accounts">Accounts</a></li>
<li class="active">Add New Account</li> <li class="active">Add New Account</li>
</ul> </ul>
<h3>Create New Account</h3><hr /> <h3>Create New Account</h3><hr />
<form action="new" method="post"> <form action="new" method="post">
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="email" class="control-label">Email</label> <label for="email" class="control-label">Email</label>
<div> <div>
<input type="text" autocomplete="off" name="email" class="form-control" /> <input type="text" autocomplete="off" name="email" class="form-control" />
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div id="gen_pass" class=" alert alert-success" style="display:none;margin-bottom: 10px;"></div> <div id="gen_pass" class=" alert alert-success" style="display:none;margin-bottom: 10px;"></div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pass" class="control-label">Password</label> <label for="pass" class="control-label">Password</label>
<div> <div>
<input type="password" name="password" class="form-control" /> <input type="password" name="password" class="form-control" />
</div> </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="pass_2" class="control-label">Password Again</label> <label for="pass_2" class="control-label">Password Again</label>
<div> <div>
<input type="password" name="password_confirmation" class="form-control" /> <input type="password" name="password_confirmation" class="form-control" />
</div> </div>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div> <div>
{!! csrf_field() !!} {!! csrf_field() !!}
<button class="btn btn-primary btn-sm" type="submit">Create Account</button> <button class="btn btn-primary btn-sm" type="submit">Create Account</button>
<button class="btn btn-default btn-sm" id="gen_pass_bttn" type="button">Generate Password</button> <button class="btn btn-default btn-sm" id="gen_pass_bttn" type="button">Generate Password</button>
</div> </div>
</div> </div>
</fieldset> </fieldset>
</form> </form>
</div> </div>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
$("#sidebar_links").find("a[href='/admin/account/new']").addClass('active'); $("#sidebar_links").find("a[href='/admin/account/new']").addClass('active');
$("#gen_pass_bttn").click(function(e){ $("#gen_pass_bttn").click(function(e){
e.preventDefault(); e.preventDefault();
$.ajax({ $.ajax({
type: "GET", type: "GET",
url: "/password-gen/12", url: "/password-gen/12",
headers: { headers: {
'X-CSRF-TOKEN': '{{ csrf_token() }}' 'X-CSRF-TOKEN': '{{ csrf_token() }}'
}, },
success: function(data) { success: function(data) {
$("#gen_pass").html('<strong>Generated Password:</strong> ' + data).slideDown(); $("#gen_pass").html('<strong>Generated Password:</strong> ' + data).slideDown();
$('input[name="password"], input[name="password_confirmation"]').val(data); $('input[name="password"], input[name="password_confirmation"]').val(data);
return false; return false;
} }
}); });
return false; return false;
}); });
}); });
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin/accounts/new']").addClass('active'); $('#sidebar_links').find("a[href='/admin/accounts/new']").addClass('active');
}); });
</script> </script>
@endsection @endsection

6
resources/views/admin/index.blade.php
View File

@ -7,14 +7,14 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li class="active">Admin Control</li> <li class="active">Admin Control</li>
</ul> </ul>
<h3 class="nopad">Pterodactyl Admin Control Panel</h3><hr /> <h3 class="nopad">Pterodactyl Admin Control Panel</h3><hr />
<p>Welcome to the most advanced, lightweight, and user-friendly open source game server control panel.</p> <p>Welcome to the most advanced, lightweight, and user-friendly open source game server control panel.</p>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin']").addClass('active'); $('#sidebar_links').find("a[href='/admin']").addClass('active');
}); });
</script> </script>
@endsection @endsection

38
resources/views/admin/locations/index.blade.php
View File

@ -7,37 +7,37 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li> <li><a href="/admin">Admin Control</a></li>
<li class="active">Locations</li> <li class="active">Locations</li>
</ul> </ul>
<h3>All Locations</h3><hr /> <h3>All Locations</h3><hr />
<table class="table table-bordered table-hover table-striped"> <table class="table table-bordered table-hover table-striped">
<thead> <thead>
<tr> <tr>
<th>Location</th> <th>Location</th>
<th>Description</th> <th>Description</th>
<th class="text-center">Nodes</th> <th class="text-center">Nodes</th>
<th class="text-center">Servers</th> <th class="text-center">Servers</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($locations as $location) @foreach ($locations as $location)
<tr> <tr>
<td><a href="#/edit/{{ $location->id }}" data-action="edit" data-location="{{ $location->id }}"><code>{{ $location->short }}</code></td> <td><a href="#/edit/{{ $location->id }}" data-action="edit" data-location="{{ $location->id }}"><code>{{ $location->short }}</code></td>
<td>{{ $location->long }}</td> <td>{{ $location->long }}</td>
<td class="text-center">{{ $location->a_nodeCount }}</td> <td class="text-center">{{ $location->a_nodeCount }}</td>
<td class="text-center">{{ $location->a_serverCount }}</td> <td class="text-center">{{ $location->a_serverCount }}</td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<div class="row"> <div class="row">
<div class="col-md-12 text-center">{!! $locations->render() !!}</div> <div class="col-md-12 text-center">{!! $locations->render() !!}</div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin/locations']").addClass('active'); $('#sidebar_links').find("a[href='/admin/locations']").addClass('active');
}); });
</script> </script>
@endsection @endsection

38
resources/views/admin/nodes/index.blade.php
View File

@ -7,27 +7,27 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li> <li><a href="/admin">Admin Control</a></li>
<li class="active">Nodes</li> <li class="active">Nodes</li>
</ul> </ul>
<h3>All Nodes</h3><hr /> <h3>All Nodes</h3><hr />
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Name</th> <th>Name</th>
<th class="visible-lg">Location</th> <th class="visible-lg">Location</th>
<th>FQDN</th> <th>FQDN</th>
<th class="hidden-xs">Memory</th> <th class="hidden-xs">Memory</th>
<th class="hidden-xs">Disk</th> <th class="hidden-xs">Disk</th>
<th class="text-center hidden-xs">Servers</th> <th class="text-center hidden-xs">Servers</th>
<th class="text-center">HTTPS</th> <th class="text-center">HTTPS</th>
<th class="text-center">Public</th> <th class="text-center">Public</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($nodes as $node) @foreach ($nodes as $node)
<tr> <tr>
<td><a href="/admin/nodes/view/{{ $node->id }}">{{ $node->name }}</td> <td><a href="/admin/nodes/view/{{ $node->id }}">{{ $node->name }}</td>
<td class="visible-lg">{{ $node->a_locationName }}</td> <td class="visible-lg">{{ $node->a_locationName }}</td>
<td><code>{{ $node->fqdn }}</code></td> <td><code>{{ $node->fqdn }}</code></td>
<td class="hidden-xs">{{ $node->memory }} MB</td> <td class="hidden-xs">{{ $node->memory }} MB</td>
@ -35,17 +35,17 @@
<td class="text-center hidden-xs">{{ $node->a_serverCount }}</td> <td class="text-center hidden-xs">{{ $node->a_serverCount }}</td>
<td class="text-center" style="color:{{ ($node->scheme === 'https') ? '#50af51' : '#d9534f' }}"><i class="fa fa-{{ ($node->scheme === 'https') ? 'lock' : 'unlock' }}"></i></td> <td class="text-center" style="color:{{ ($node->scheme === 'https') ? '#50af51' : '#d9534f' }}"><i class="fa fa-{{ ($node->scheme === 'https') ? 'lock' : 'unlock' }}"></i></td>
<td class="text-center"><i class="fa fa-{{ ($node->public === 1) ? 'check' : 'times' }}"></i></td> <td class="text-center"><i class="fa fa-{{ ($node->public === 1) ? 'check' : 'times' }}"></i></td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<div class="row"> <div class="row">
<div class="col-md-12 text-center">{!! $nodes->render() !!}</div> <div class="col-md-12 text-center">{!! $nodes->render() !!}</div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin/nodes']").addClass('active'); $('#sidebar_links').find("a[href='/admin/nodes']").addClass('active');
}); });
</script> </script>
@endsection @endsection

8
resources/views/admin/nodes/new.blade.php
View File

@ -7,10 +7,10 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li> <li><a href="/admin">Admin Control</a></li>
<li><a href="/admin/nodes">Nodes</a></li> <li><a href="/admin/nodes">Nodes</a></li>
<li class="active">Create New Node</li> <li class="active">Create New Node</li>
</ul> </ul>
<h3>Create New Node</h3><hr /> <h3>Create New Node</h3><hr />
<form action="/admin/nodes/new" method="POST"> <form action="/admin/nodes/new" method="POST">
<div class="well"> <div class="well">
@ -158,7 +158,7 @@
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin/nodes/new']").addClass('active'); $('#sidebar_links').find("a[href='/admin/nodes/new']").addClass('active');
$('[data-toggle="popover"]').popover({ $('[data-toggle="popover"]').popover({
placement: 'auto' placement: 'auto'
}); });

38
resources/views/admin/servers/index.blade.php
View File

@ -7,39 +7,39 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><a href="/admin">Admin Control</a></li> <li><a href="/admin">Admin Control</a></li>
<li class="active">Servers</li> <li class="active">Servers</li>
</ul> </ul>
<h3>All Servers</h3><hr /> <h3>All Servers</h3><hr />
<table class="table table-bordered table-hover"> <table class="table table-bordered table-hover">
<thead> <thead>
<tr> <tr>
<th>Server Name</th> <th>Server Name</th>
<th>Owner</th> <th>Owner</th>
<th class="hidden-xs">Node</th> <th class="hidden-xs">Node</th>
<th>Default Connection</th> <th>Default Connection</th>
<th class="hidden-xs">SFTP Username</th> <th class="hidden-xs">SFTP Username</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@foreach ($servers as $server) @foreach ($servers as $server)
<tr class="dynUpdate @if($server->active !== 1)active @endif" id="{{ $server->uuidShort }}"> <tr class="dynUpdate @if($server->active !== 1)active @endif" id="{{ $server->uuidShort }}">
<td><a href="/admin/servers/view/{{ $server->id }}">{{ $server->name }}</td> <td><a href="/admin/servers/view/{{ $server->id }}">{{ $server->name }}</td>
<td><a href="/admin/accounts/view/{{ $server->owner }}">{{ $server->a_ownerEmail }}</a></td> <td><a href="/admin/accounts/view/{{ $server->owner }}">{{ $server->a_ownerEmail }}</a></td>
<td class="hidden-xs"><a href="/admin/nodes/view/{{ $server->node }}">{{ $server->a_nodeName }}</a></td> <td class="hidden-xs"><a href="/admin/nodes/view/{{ $server->node }}">{{ $server->a_nodeName }}</a></td>
<td><code>{{ $server->ip }}:{{ $server->port }}</code></td> <td><code>{{ $server->ip }}:{{ $server->port }}</code></td>
<td class="hidden-xs"><code>{{ $server->username }}</code></td> <td class="hidden-xs"><code>{{ $server->username }}</code></td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
<div class="row"> <div class="row">
<div class="col-md-12 text-center">{!! $servers->render() !!}</div> <div class="col-md-12 text-center">{!! $servers->render() !!}</div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
$('#sidebar_links').find("a[href='/admin/servers']").addClass('active'); $('#sidebar_links').find("a[href='/admin/servers']").addClass('active');
}); });
</script> </script>
@endsection @endsection

6
resources/views/auth/reset.blade.php
View File

@ -14,20 +14,20 @@
<form action="/auth/password/verify" method="POST"> <form action="/auth/password/verify" method="POST">
<legend>{{ trans('auth.resetpassword') }}</legend> <legend>{{ trans('auth.resetpassword') }}</legend>
<fieldset> <fieldset>
<input type="hidden" name="token" value="{{ $token }}"> <input type="hidden" name="token" value="{{ $token }}">
<div class="form-group"> <div class="form-group">
<label for="email" class="control-label">{{ trans('strings.email') }}</label> <label for="email" class="control-label">{{ trans('strings.email') }}</label>
<div> <div>
<input type="text" class="form-control" name="email" id="email" value="{{ old('email') }}" placeholder="{{ trans('strings.email') }}" /> <input type="text" class="form-control" name="email" id="email" value="{{ old('email') }}" placeholder="{{ trans('strings.email') }}" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password" class="control-label">{{ trans('strings.password') }}</label> <label for="password" class="control-label">{{ trans('strings.password') }}</label>
<div> <div>
<input type="password" class="form-control" name="password" id="password" placeholder="{{ trans('strings.password') }}" /> <input type="password" class="form-control" name="password" id="password" placeholder="{{ trans('strings.password') }}" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password_confirmation" class="control-label">{{ trans('auth.confirmpassword') }}</label> <label for="password_confirmation" class="control-label">{{ trans('auth.confirmpassword') }}</label>
<div> <div>
<input type="password" class="form-control" id="password_confirmation" name="password_confirmation" /> <input type="password" class="form-control" id="password_confirmation" name="password_confirmation" />

108
resources/views/base/account.blade.php
View File

@ -7,61 +7,61 @@
@section('content') @section('content')
<div class="col-md-12"> <div class="col-md-12">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<h3 class="nopad">{{ trans('base.account.update_pass') }}</h3><hr /> <h3 class="nopad">{{ trans('base.account.update_pass') }}</h3><hr />
<form action="/account/password" method="post"> <form action="/account/password" method="post">
<div class="form-group"> <div class="form-group">
<label for="current_password" class="control-label">{{ trans('strings.current_password') }}</label> <label for="current_password" class="control-label">{{ trans('strings.current_password') }}</label>
<div> <div>
<input type="password" class="form-control" name="current_password" /> <input type="password" class="form-control" name="current_password" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="new_password" class="control-label">{{ trans('base.account.new_password') }}</label> <label for="new_password" class="control-label">{{ trans('base.account.new_password') }}</label>
<div> <div>
<input type="password" class="form-control" name="new_password" /> <input type="password" class="form-control" name="new_password" />
<p class="text-muted"><small>{{ trans('base.password_req') }}</small></p> <p class="text-muted"><small>{{ trans('base.password_req') }}</small></p>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="new_password_again" class="control-label">{{ trans('base.account.new_password') }} {{ trans('strings.again') }}</label> <label for="new_password_again" class="control-label">{{ trans('base.account.new_password') }} {{ trans('strings.again') }}</label>
<div> <div>
<input type="password" class="form-control" name="new_password_confirmation" /> <input type="password" class="form-control" name="new_password_confirmation" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div> <div>
{!! csrf_field() !!} {!! csrf_field() !!}
<input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_pass') }}" /> <input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_pass') }}" />
</div> </div>
</div> </div>
</form> </form>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<h3 class="nopad">{{ trans('base.account.update_email') }}</h3><hr /> <h3 class="nopad">{{ trans('base.account.update_email') }}</h3><hr />
<form action="/account/email" method="post"> <form action="/account/email" method="post">
<div class="form-group"> <div class="form-group">
<label for="new_email" class="control-label">{{ trans('base.account.new_email') }}</label> <label for="new_email" class="control-label">{{ trans('base.account.new_email') }}</label>
<div> <div>
<input type="text" class="form-control" name="new_email" /> <input type="text" class="form-control" name="new_email" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="password" class="control-label">{{ trans('strings.current_password') }}</label> <label for="password" class="control-label">{{ trans('strings.current_password') }}</label>
<div> <div>
<input type="password" class="form-control" name="password" /> <input type="password" class="form-control" name="password" />
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div> <div>
{!! csrf_field() !!} {!! csrf_field() !!}
<input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_email') }}" /> <input type="submit" class="btn btn-primary btn-sm" value="{{ trans('base.account.update_email') }}" />
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</div> </div>
<script> <script>
$(document).ready(function () { $(document).ready(function () {

22
resources/views/emails/new_password.blade.php
View File

@ -1,14 +1,14 @@
<html> <html>
<head> <head>
<title>Pterodactyl - Admin Reset Password</title> <title>Pterodactyl - Admin Reset Password</title>
</head> </head>
<body> <body>
<center><h1>Pterodactyl - Admin Reset Password</h1></center> <center><h1>Pterodactyl - Admin Reset Password</h1></center>
<p>Hello there! You are receiving this email because an admin has reset the password on your Pterodactyl account.</p> <p>Hello there! You are receiving this email because an admin has reset the password on your Pterodactyl account.</p>
<p><strong>Login:</strong> <a href="{{ config('app.url') }}/auth/login">{{ config('app.url') }}/auth/login</a><br> <p><strong>Login:</strong> <a href="{{ config('app.url') }}/auth/login">{{ config('app.url') }}/auth/login</a><br>
<strong>Email:</strong> {{ $user->email }}<br> <strong>Email:</strong> {{ $user->email }}<br>
<strong>Password:</strong> {{ $password }}</p> <strong>Password:</strong> {{ $password }}</p>
<p>Thanks,<br>Pterodactyl</p> <p>Thanks,<br>Pterodactyl</p>
</body> </body>
</html> </html>

22
resources/views/emails/password.blade.php
View File

@ -1,14 +1,14 @@
<html> <html>
<head> <head>
<title>Pterodactyl Lost Password Recovery</title> <title>Pterodactyl Lost Password Recovery</title>
</head> </head>
<body> <body>
<center><h1>Pterodactyl Lost Password Recovery</h1></center> <center><h1>Pterodactyl Lost Password Recovery</h1></center>
<p>Hello there! You are receiving this email because you requested a new password for your Pterodactyl account.</p> <p>Hello there! You are receiving this email because you requested a new password for your Pterodactyl account.</p>
<p>Please click the link below to confirm that you wish to change your password. If you did not make this request, or do not wish to continue simply ignore this email and nothing will happen. <strong>This link will expire in 1 hour.</strong></p> <p>Please click the link below to confirm that you wish to change your password. If you did not make this request, or do not wish to continue simply ignore this email and nothing will happen. <strong>This link will expire in 1 hour.</strong></p>
<p><a href="{{ url('auth/password/verify/'.$token) }}">{{ url('auth/password/verify/'.$token) }}</a></p> <p><a href="{{ url('auth/password/verify/'.$token) }}">{{ url('auth/password/verify/'.$token) }}</a></p>
<p>Please do not hesitate to contact us if you belive something is wrong. <p>Please do not hesitate to contact us if you belive something is wrong.
<p>Thanks!<br />Pterodactyl</p> <p>Thanks!<br />Pterodactyl</p>
</body> </body>
</html> </html>

8
resources/views/errors/installing.blade.php
View File

@ -10,10 +10,10 @@
</div> </div>
<div class="panel-body"> <div class="panel-body">
<p style="margin-bottom:0;">The requested server is still completing the install process. Please check back in a few minutes, you should recieve an email as soon as this process is completed.</p> <p style="margin-bottom:0;">The requested server is still completing the install process. Please check back in a few minutes, you should recieve an email as soon as this process is completed.</p>
<br /><br /> <br /><br />
<div class="progress progress-striped active"> <div class="progress progress-striped active">
<div class="progress-bar progress-bar-danger" style="width: 75%"></div> <div class="progress-bar progress-bar-danger" style="width: 75%"></div>
</div> </div>
</div> </div>
</div> </div>
<p style="text-align:center;"><a href="{{ URL::previous() }}">Take me back</a> or <a href="/">go home</a>.</p> <p style="text-align:center;"><a href="{{ URL::previous() }}">Take me back</a> or <a href="/">go home</a>.</p>