diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php index e3cc7d9d7..006d73ed0 100644 --- a/app/Http/Controllers/API/UserController.php +++ b/app/Http/Controllers/API/UserController.php @@ -24,7 +24,7 @@ class UserController extends BaseController * @Get("/{?page}") * @Versions({"v1"}) * @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) */ @@ -42,8 +42,8 @@ class UserController extends BaseController * @Get("/{id}/{fields}") * @Versions({"v1"}) * @Parameters({ - * @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("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.") * }) * @Response(200) */ @@ -68,18 +68,18 @@ class UserController extends BaseController * @Post("/") * @Versions({"v1"}) * @Transaction({ - * @Request({ - * "email": "foo@example.com", - * "password": "foopassword", - * "admin": false + * @Request({ + * "email": "foo@example.com", + * "password": "foopassword", + * "admin": false * }, headers={"Authorization": "Bearer "}), * @Response(200, body={"id": 1}), * @Response(422, body{ - * "message": "A validation error occured.", - * "errors": { - * "email": ["The email field is required."], - * "password": ["The password field is required."], - * "admin": ["The admin field is required."] + * "message": "A validation error occured.", + * "errors": { + * "email": ["The email field is required."], + * "password": ["The password field is required."], + * "admin": ["The admin field is required."] * }, * "status_code": 422 * }) @@ -106,9 +106,9 @@ class UserController extends BaseController * @Patch("/{id}") * @Versions({"v1"}) * @Transaction({ - * @Request({ - * "email": "new@email.com" - * }, headers={"Authorization": "Bearer "}), + * @Request({ + * "email": "new@email.com" + * }, headers={"Authorization": "Bearer "}), * @Response(200, body={"email": "new@email.com"}), * @Response(422) * }) @@ -127,12 +127,12 @@ class UserController extends BaseController * @Delete("/{id}") * @Versions({"v1"}) * @Transaction({ - * @Request(headers={"Authorization": "Bearer "}), - * @Response(204), - * @Response(422) + * @Request(headers={"Authorization": "Bearer "}), + * @Response(204), + * @Response(422) * }) * @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) diff --git a/app/Models/User.php b/app/Models/User.php index df2aa8afe..742f194bc 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -70,10 +70,10 @@ class User extends Model implements AuthenticatableContract, /** * Set a user password to a new value assuming it meets the following requirements: - * - 8 or more characters in length - * - at least one uppercase character - * - at least one lowercase character - * - at least one number + * - 8 or more characters in length + * - at least one uppercase character + * - at least one lowercase character + * - at least one number * * @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,})'. diff --git a/app/Repositories/UserRepository.php b/app/Repositories/UserRepository.php index aa633d392..62f690871 100644 --- a/app/Repositories/UserRepository.php +++ b/app/Repositories/UserRepository.php @@ -84,6 +84,8 @@ class UserRepository */ public function delete($id) { + // @TODO cannot delete user with associated servers! + // clean up subusers! return User::destroy($id); } diff --git a/resources/lang/de/auth.php b/resources/lang/de/auth.php index 3e7428f63..6c30d699d 100644 --- a/resources/lang/de/auth.php +++ b/resources/lang/de/auth.php @@ -18,7 +18,7 @@ return [ 'sendlink' => 'Senden Sie Passwort-Reset Link.', /* Send password reset link */ 'emailsent' => 'E-Mail gesendet.', /* Email Sent */ '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. */ ]; /* diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index 346d3448b..e029d182c 100644 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -69,7 +69,7 @@ return [ 'array' => 'The :attribute must contain :size items.', ], '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.', 'unique' => 'The :attribute has already been taken.', 'url' => 'The :attribute format is invalid.', diff --git a/resources/views/admin/accounts/index.blade.php b/resources/views/admin/accounts/index.blade.php index 57ba64c19..98ae0dfb2 100644 --- a/resources/views/admin/accounts/index.blade.php +++ b/resources/views/admin/accounts/index.blade.php @@ -7,35 +7,35 @@ @section('content')
+
  • Admin Control
    • +
  • Accounts
    • +

    All Registered Users

    - - - - +
    Email
    + + + - - - - @foreach ($users as $user) - - + + + + @foreach ($users as $user) + + - - @endforeach - -
    Email Account Created Account Updated
    {{ $user->email }} @if($user->root_admin === 1)Administrator@endif
    {{ $user->email }} @if($user->root_admin === 1)Administrator@endif {{ $user->created_at }} {{ $user->updated_at }}
    + + @endforeach + +
    {!! $users->render() !!}
    @endsection diff --git a/resources/views/admin/accounts/new.blade.php b/resources/views/admin/accounts/new.blade.php index 398daa03a..0eefdbadf 100644 --- a/resources/views/admin/accounts/new.blade.php +++ b/resources/views/admin/accounts/new.blade.php @@ -10,65 +10,65 @@
  • Admin Controls
  • Accounts
  • Add New Account
    • - +

    Create New Account

    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    -
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    {!! csrf_field() !!} - - -
    -
    -
    - + + +
    +
    +
    + @endsection diff --git a/resources/views/admin/index.blade.php b/resources/views/admin/index.blade.php index 4f6dac515..f950c6a1d 100644 --- a/resources/views/admin/index.blade.php +++ b/resources/views/admin/index.blade.php @@ -7,14 +7,14 @@ @section('content')
      -
    • Admin Control
      • -
    +
  • Admin Control
    • +

    Pterodactyl Admin Control Panel

    Welcome to the most advanced, lightweight, and user-friendly open source game server control panel.

    @endsection diff --git a/resources/views/admin/locations/index.blade.php b/resources/views/admin/locations/index.blade.php index be73c9503..c84dd238e 100644 --- a/resources/views/admin/locations/index.blade.php +++ b/resources/views/admin/locations/index.blade.php @@ -7,37 +7,37 @@ @section('content')
    +
  • Admin Control
    • +
  • Locations
    • +

    All Locations

    - - - - +
    Location
    + + + - + - - - - @foreach ($locations as $location) - - + + + + @foreach ($locations as $location) + + - - @endforeach - -
    Location DescriptionNodesNodes Servers
    {{ $location->short }}
    {{ $location->short }} {{ $location->long }} {{ $location->a_nodeCount }} {{ $location->a_serverCount }}
    + + @endforeach + +
    {!! $locations->render() !!}
    @endsection diff --git a/resources/views/admin/nodes/index.blade.php b/resources/views/admin/nodes/index.blade.php index d8286f8b1..a6dee7ced 100644 --- a/resources/views/admin/nodes/index.blade.php +++ b/resources/views/admin/nodes/index.blade.php @@ -7,27 +7,27 @@ @section('content')
    +
  • Admin Control
    • +
  • Nodes
    • +

    All Nodes

    - - - - +
    Name
    + + + - + - - - - @foreach ($nodes as $node) - - + + + + @foreach ($nodes as $node) + + @@ -35,17 +35,17 @@ - - @endforeach - -
    Name LocationFQDNFQDN HTTPS Public
    {{ $node->name }}
    {{ $node->name }} {{ $node->a_locationName }} {{ $node->fqdn }}
    + + @endforeach + +
    {!! $nodes->render() !!}
    @endsection diff --git a/resources/views/admin/nodes/new.blade.php b/resources/views/admin/nodes/new.blade.php index d63ee4075..53269dbb8 100644 --- a/resources/views/admin/nodes/new.blade.php +++ b/resources/views/admin/nodes/new.blade.php @@ -7,10 +7,10 @@ @section('content')
    +
  • Create New Node
    • +

    Create New Node

    @@ -158,7 +158,7 @@
    @endsection diff --git a/resources/views/auth/reset.blade.php b/resources/views/auth/reset.blade.php index 4b0eb2f45..3cbd78db2 100644 --- a/resources/views/auth/reset.blade.php +++ b/resources/views/auth/reset.blade.php @@ -14,20 +14,20 @@ {{ trans('auth.resetpassword') }}
    - +
    -
    +
    -
    +
    diff --git a/resources/views/base/account.blade.php b/resources/views/base/account.blade.php index 516e93cff..7378398aa 100644 --- a/resources/views/base/account.blade.php +++ b/resources/views/base/account.blade.php @@ -7,61 +7,61 @@ @section('content')
    -
    -
    -

    {{ trans('base.account.update_pass') }}

    - -
    - -
    - -
    -
    -
    - -
    - +
    +
    +

    {{ trans('base.account.update_pass') }}

    + +
    + +
    + +
    +
    +
    + +
    +

    {{ trans('base.password_req') }}

    -
    -
    -
    - -
    - -
    -
    -
    -
    - {!! csrf_field() !!} - -
    -
    - -
    -
    -

    {{ trans('base.account.update_email') }}

    -
    -
    - -
    - -
    -
    -
    - -
    - -
    -
    -
    -
    - {!! csrf_field() !!} - -
    -
    -
    -
    -
    +
    +
    +
    + +
    + +
    +
    +
    +
    + {!! csrf_field() !!} + +
    +
    + +
    +
    +

    {{ trans('base.account.update_email') }}

    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + {!! csrf_field() !!} + +
    +
    +
    +
    +