Merge pull request #716 from Pterodactyl/feature/code-cleanup

Cleanup code, add more unit tests, prepare for beta

resources/lang/en/auth.php

@@ -18,4 +18,5 @@ return [
     '2fa_required' => '2-Factor Authentication',
     '2fa_failed' => 'The 2FA token provided was invalid.',
     'totp_failed' => 'There was an error while attempting to validate TOTP.',
+    '2fa_must_be_enabled' => 'The administrator has required that 2-Factor Authentication be enabled for your account in order to use the Panel.',
 ];

resources/themes/pterodactyl/base/api/index.blade.php

@@ -20,7 +20,12 @@
 @section('content')
 <div class="row">
     <div class="col-xs-12">
+        <div class="alert alert-danger">
+            API functionality is disabled in this beta release.
+        </div>
+
         <div class="box">
+            <div class="overlay"></div>
             <div class="box-header">
                 <h3 class="box-title">@lang('base.api.index.list')</h3>
                 <div class="box-tools">

resources/themes/pterodactyl/layouts/master.blade.php

@@ -205,6 +205,9 @@
                 </section>
             </aside>
             <div class="content-wrapper">
+                <section class="content-header">
+                    @include('partials/_internal/beta')
+                </section>
                 <section class="content-header">
                     @yield('content-header')
                 </section>

resources/themes/pterodactyl/partials/_internal/beta.blade.php

@@ -0,0 +1,9 @@
+@section('beta-notice')
+    <div class="row">
+        <div class="col-xs-12">
+            <div class="alert alert-warning no-margin-bottom">
+                <i class="fa fa-warning"></i> You are running a beta version of Pterodactyl Panel. Not all features are complete and bugs should be expected. Please report any bugs on Discord or via our Github issue tracker.
+            </div>
+        </div>
+    </div>
+@show

resources/themes/pterodactyl/server/users/index.blade.php

@@ -57,14 +57,14 @@
                                 <td class="middle hidden-xs">{{ $subuser->user->created_at }}</td>
                                 @can('view-subuser', $server)
                                     <td class="text-center middle">
-                                        <a href="{{ route('server.subusers.view', ['server' => $server->uuidShort, 'id' => $subuser->id]) }}">
+                                        <a href="{{ route('server.subusers.view', ['server' => $server->uuidShort, 'subuser' => $subuser->hashid]) }}">
                                             <button class="btn btn-xs btn-primary">@lang('server.users.configure')</button>
                                         </a>
                                     </td>
                                 @endcan
                                 @can('delete-subuser', $server)
                                     <td class="text-center middle">
-                                        <a href="#/delete/{{ $subuser->id }}" data-action="delete" data-id="{{ $subuser->id }}">
+                                        <a href="#/delete/{{ $subuser->hashid }}" data-action="delete" data-id="{{ $subuser->hashid }}">
                                             <button class="btn btn-xs btn-danger">@lang('strings.revoke')</button>
                                         </a>
                                     </td>
@@ -98,9 +98,9 @@
             }, function () {
                 $.ajax({
                     method: 'DELETE',
-                    url: Router.route('server.subusers.delete', {
+                    url: Router.route('server.subusers.view', {
                         server: Pterodactyl.server.uuidShort,
-                        id: self.data('id'),
+                        subuser: self.data('id'),
                     }),
                     headers: {
                         'X-CSRF-TOKEN': $('meta[name="_token"]').attr('content'),

resources/themes/pterodactyl/server/users/view.blade.php

@@ -21,7 +21,7 @@
 
 @section('content')
 @can('edit-subuser', $server)
-<form action="{{ route('server.subusers.view', [ 'uuid' => $server->uuidShort, 'id' => $subuser->id ]) }}" method="POST">
+<form action="{{ route('server.subusers.view', [ 'uuid' => $server->uuidShort, 'subuser' => $subuser->hashid ]) }}" method="POST">
 @endcan
     <div class="row">
         <div class="col-sm-12">