From f7c23e9fc5810f7e7742c0a84610a90426285ff6 Mon Sep 17 00:00:00 2001 From: AVMG20 Date: Sun, 6 Jun 2021 23:04:04 +0200 Subject: [PATCH] clean up --- README.md | 9 ++++---- app/Console/Commands/MakeUserCommand.php | 27 +++++++++++------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 454c83d8..3d634b05 100644 --- a/README.md +++ b/README.md @@ -68,8 +68,6 @@ mkdir -p /var/www/dashboard cd /var/www/dashboard ``` -TEXT - ``` bash git clone https://github.com/ControlPanel-gg/dashboard.git ./ chmod -R 755 storage/* bootstrap/cache/ @@ -103,7 +101,7 @@ Store it somewhere safe - not just on your server. If you lose it all encrypted ### Environment Configuration Simply edit the .env to your needs -Please do not forget to enter the database creds in here or the next step wont work +Please **do not** forget to enter the database creds in here or the next step wont work ``` bash nano .env @@ -119,8 +117,9 @@ php artisan migrate --seed --force ``` ### Add The First User -Currenly I haven't made a easy command for this so just enter your databse with phpmyadmin and create a new user with the role 'admin' - +``` bash +php artisan make:user +``` ### Set Permissions The last step in the installation process is to set the correct permissions on the Panel files so that the webserver can diff --git a/app/Console/Commands/MakeUserCommand.php b/app/Console/Commands/MakeUserCommand.php index 0d7ea249..5221a983 100644 --- a/app/Console/Commands/MakeUserCommand.php +++ b/app/Console/Commands/MakeUserCommand.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; use App\Classes\Pterodactyl; use App\Models\User; +use Illuminate\Console\Command; use Illuminate\Support\Facades\Hash; class createUser extends Command @@ -39,33 +39,29 @@ class createUser extends Command * @return int */ public function handle() - { - + { $ptero_id = $this->option('ptero_id') ?? $this->ask('Please specify your Pterodactyl ID.'); - $password = $this->option('password') ?? $this->ask('Please specify your password.'); - - + if (strlen($password) < 8) { - print_r('Your password need to be atleast 8 characters long'); + print_r('Your password need to be at least 8 characters long'); return false; - }; - - $response = Pterodactyl::getUser($ptero_id); + } + $response = Pterodactyl::getUser($ptero_id); if (is_null($response)) { print_r('It seems that your Pterodactyl ID isnt correct. Rerun the command and input an correct ID'); return false; - }; + } $user = User::create([ - 'name' => $response['first_name'], - 'email' => $response['email'], - 'role' => 'admin', - 'password' => Hash::make($password), + 'name' => $response['first_name'], + 'email' => $response['email'], + 'role' => 'admin', + 'password' => Hash::make($password), 'pterodactyl_id' => $response['id'] ]); @@ -76,6 +72,7 @@ class createUser extends Command ['Ptero-ID', $user->pterodactyl_id], ['Admin', $user->role], ]); + return true; } }