Production mix

# Conflicts:
#	public/js/app.js

.gitignore

@@ -12,3 +12,4 @@ npm-debug.log
 yarn-error.log
 .idea
 .php_cs.cache
+/public/js/resources*.js

.php-cs-fixer.php

@@ -8,11 +8,11 @@ $finder = Symfony\Component\Finder\Finder::create()
     ->name('*.php')
     ->notName('*.blade.php');
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config)
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
-        'ordered_imports' => ['sortAlgorithm' => 'length'],
+        'ordered_imports' => ['sort_algorithm' => 'length'],
         'no_unused_imports' => true,
     ])
     ->setFinder($finder);

app/Console/Commands/Core/Css.php

@@ -13,7 +13,7 @@ class Css extends Command
 
     public function handle()
     {
-        if(file_exists(storage_path('app/public/theme.css')) && !$this->confirm('You seem to already have a theme.css published, are you sure you want to overwrite?')){
+        if (file_exists(storage_path('app/public/theme.css')) && !$this->confirm('You seem to already have a theme.css published, are you sure you want to overwrite?')) {
             $this->warn('Aborted publishing of theme.css.');
 
             return 0;

app/Console/Commands/Core/CssBackup.php

@@ -13,7 +13,7 @@ class CssBackup extends Command
 
     public function handle()
     {
-        if(!file_exists(storage_path('app/public/theme.css'))){
+        if (!file_exists(storage_path('app/public/theme.css'))) {
             $this->warn('There is no custom theme.css, aborting backup.');
 
             return 0;

app/Console/Commands/Core/Install.php

@@ -7,16 +7,18 @@ use App\Models\User;
 use RuntimeException;
 use App\Models\Package;
 use App\Services\Ploi\Ploi;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Console\Command;
 use App\Services\VersionChecker;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Artisan;
 
 class Install extends Command
 {
     protected $company;
-    protected $signature = 'core:install';
+    protected $signature = 'core:install {--force}';
     protected $description = 'Installation command for Ploi Core';
     protected $versionChecker;
     protected $installationFile = 'app/installation';
@@ -34,8 +36,14 @@ class Install extends Command
         $this->askAboutDefaultPackages();
         $this->checkApplicationUrl();
         $this->createInstallationFile();
+        $this->linkStorage();
 
-        $this->info('Succes! Installation has finished.');
+        $this->info('Success! Installation has finished.');
+        $this->line(' ');
+        $this->writeSeparationLine();
+        $this->info('Make sure to also setup emailing, the cronjob and the queue worker.');
+        $this->writeSeparationLine();
+        $this->line(' ');
         $this->info('Visit your platform at ' . env('APP_URL'));
     }
 
@@ -98,7 +106,7 @@ class Install extends Command
 
         Package::create([
             'name' => 'Professional',
-            'maximum_sites' => 5,
+            'maximum_sites' => 30,
             'site_permissions' => [
                 'create' => true,
                 'update' => true,
@@ -138,7 +146,9 @@ class Install extends Command
             ->get((new Ploi)->url . 'ping');
 
         if (!$response->ok() || !$response->json()) {
-            return false;
+            return [
+                'error' => Arr::get($response->json(), 'message', 'An unknown error has occurred.')
+            ];
         }
 
         return $response->json();
@@ -153,7 +163,7 @@ class Install extends Command
 
     protected function intro()
     {
-        $this->info('*---------------------------------------------------------------------------*');
+        $this->writeSeparationLine();
         $this->line('Ploi Core Installation');
         $this->line('Ploi Core version: ' . $this->versionChecker->currentVersion);
         $this->line('Ploi Core remote: ' . $this->versionChecker->remoteVersion);
@@ -163,13 +173,13 @@ class Install extends Command
         $this->line('Website: https://ploi-core.io');
         $this->line('E-mail: core@ploi.io');
         $this->line('Terms of service: https://ploi-core.io/terms');
-        $this->info('*---------------------------------------------------------------------------*');
+        $this->writeSeparationLine();
         $this->line('');
     }
 
     protected function isInstalled()
     {
-        if (file_exists(storage_path($this->installationFile))) {
+        if (file_exists(storage_path($this->installationFile)) && !$this->option('force')) {
             $this->line('');
             $this->comment('Ploi Core has already been installed before.');
             $this->comment('If you still want to start installation, remove this file to continue: ./storage/' . $this->installationFile);
@@ -203,6 +213,11 @@ class Install extends Command
         file_put_contents(storage_path($this->installationFile), json_encode($this->getInstallationPayload(), JSON_PRETTY_PRINT));
     }
 
+    protected function linkStorage()
+    {
+        Artisan::call('storage:link');
+    }
+
     protected function createDatabaseCredentials(): bool
     {
         $storeCredentials = $this->confirm(
@@ -269,6 +284,18 @@ class Install extends Command
             exit();
         }
 
+        if (isset($this->company['error'])) {
+            $this->error($this->company['error']);
+
+            exit();
+        }
+
+        if ($this->company['user']['subscription'] !== 'unlimited') {
+            $this->error('Your subscription does not cover the usage of Ploi Core. Please upgrade your subscription to Unlimited.');
+
+            exit();
+        }
+
         $this->writeToEnvironmentFile('PLOI_TOKEN', $ploiApiToken);
         $this->writeToEnvironmentFile('PLOI_CORE_TOKEN', $ploiCoreKey);
 
@@ -372,4 +399,9 @@ class Install extends Command
     {
         $this->laravel['config'][$key] = $value;
     }
+
+    protected function writeSeparationLine()
+    {
+        $this->info('*---------------------------------------------------------------------------*');
+    }
 }

app/Console/Kernel.php

@@ -2,10 +2,10 @@
 
 namespace App\Console;
 
-use App\Console\Commands\Core\Css;
-use App\Console\Commands\Core\CssBackup;
 use App\Jobs\Core\Ping;
+use App\Console\Commands\Core\Css;
 use App\Console\Commands\Core\Install;
+use App\Console\Commands\Core\CssBackup;
 use App\Console\Commands\Core\Synchronize;
 use Illuminate\Console\Scheduling\Schedule;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;

app/Helpers/Country.php

@@ -0,0 +1,281 @@
+<?php
+
+if (!function_exists('countries')) {
+    function countries($key = null)
+    {
+        $arr = [
+            'af' => 'Afghanistan',
+            'al' => 'Albania',
+            'dz' => 'Algeria',
+            'as' => 'American Samoa',
+            'ad' => 'Andorra',
+            'ao' => 'Angola',
+            'ai' => 'Anguilla',
+            'aq' => 'Antarctica',
+            'ag' => 'Antigua and Barbuda',
+            'ar' => 'Argentina',
+            'am' => 'Armenia',
+            'aw' => 'Aruba',
+            'au' => 'Australia',
+            'at' => 'Austria',
+            'az' => 'Azerbaijan',
+            'bs' => 'Bahamas',
+            'bh' => 'Bahrain',
+            'bd' => 'Bangladesh',
+            'bb' => 'Barbados',
+            'by' => 'Belarus',
+            'be' => 'Belgium',
+            'bz' => 'Belize',
+            'bj' => 'Benin',
+            'bm' => 'Bermuda',
+            'bt' => 'Bhutan',
+            'bo' => 'Bolivia',
+            'ba' => 'Bosnia and Herzegovina',
+            'bw' => 'Botswana',
+            'bv' => 'Bouvet Island',
+            'br' => 'Brazil',
+            'bq' => 'British Antarctic Territory',
+            'io' => 'British Indian Ocean Territory',
+            'vg' => 'British Virgin Islands',
+            'bn' => 'Brunei',
+            'bg' => 'Bulgaria',
+            'bf' => 'Burkina Faso',
+            'bi' => 'Burundi',
+            'kh' => 'Cambodia',
+            'cm' => 'Cameroon',
+            'ca' => 'Canada',
+            'ct' => 'Canton and Enderbury Islands',
+            'cv' => 'Cape Verde',
+            'ky' => 'Cayman Islands',
+            'cf' => 'Central African Republic',
+            'td' => 'Chad',
+            'cl' => 'Chile',
+            'cn' => 'China',
+            'cx' => 'Christmas Island',
+            'cc' => 'Cocos [Keeling] Islands',
+            'co' => 'Colombia',
+            'km' => 'Comoros',
+            'cg' => 'Congo - Brazzaville',
+            'cd' => 'Congo - Kinshasa',
+            'ck' => 'Cook Islands',
+            'cr' => 'Costa Rica',
+            'hr' => 'Croatia',
+            'cu' => 'Cuba',
+            'cy' => 'Cyprus',
+            'cz' => 'Czech Republic',
+            'ci' => 'Côte d’Ivoire',
+            'dk' => 'Denmark',
+            'dj' => 'Djibouti',
+            'dm' => 'Dominica',
+            'do' => 'Dominican Republic',
+            'nq' => 'Dronning Maud Land',
+            'dd' => 'East Germany',
+            'ec' => 'Ecuador',
+            'eg' => 'Egypt',
+            'sv' => 'El Salvador',
+            'gq' => 'Equatorial Guinea',
+            'er' => 'Eritrea',
+            'ee' => 'Estonia',
+            'et' => 'Ethiopia',
+            'fk' => 'Falkland Islands',
+            'fo' => 'Faroe Islands',
+            'fj' => 'Fiji',
+            'fi' => 'Finland',
+            'fr' => 'France',
+            'gf' => 'French Guiana',
+            'pf' => 'French Polynesia',
+            'tf' => 'French Southern Territories',
+            'fq' => 'French Southern and Antarctic Territories',
+            'ga' => 'Gabon',
+            'gm' => 'Gambia',
+            'ge' => 'Georgia',
+            'de' => 'Germany',
+            'gh' => 'Ghana',
+            'gi' => 'Gibraltar',
+            'gr' => 'Greece',
+            'gl' => 'Greenland',
+            'gd' => 'Grenada',
+            'gp' => 'Guadeloupe',
+            'gu' => 'Guam',
+            'gt' => 'Guatemala',
+            'gg' => 'Guernsey',
+            'gn' => 'Guinea',
+            'gw' => 'Guinea-Bissau',
+            'gy' => 'Guyana',
+            'ht' => 'Haiti',
+            'hm' => 'Heard Island and McDonald Islands',
+            'hn' => 'Honduras',
+            'hk' => 'Hong Kong SAR China',
+            'hu' => 'Hungary',
+            'is' => 'Iceland',
+            'in' => 'India',
+            'id' => 'Indonesia',
+            'ir' => 'Iran',
+            'iq' => 'Iraq',
+            'ie' => 'Ireland',
+            'im' => 'Isle of Man',
+            'il' => 'Israel',
+            'it' => 'Italy',
+            'jm' => 'Jamaica',
+            'jp' => 'Japan',
+            'je' => 'Jersey',
+            'jt' => 'Johnston Island',
+            'jo' => 'Jordan',
+            'kz' => 'Kazakhstan',
+            'ke' => 'Kenya',
+            'ki' => 'Kiribati',
+            'kw' => 'Kuwait',
+            'kg' => 'Kyrgyzstan',
+            'la' => 'Laos',
+            'lv' => 'Latvia',
+            'lb' => 'Lebanon',
+            'ls' => 'Lesotho',
+            'lr' => 'Liberia',
+            'ly' => 'Libya',
+            'li' => 'Liechtenstein',
+            'lt' => 'Lithuania',
+            'lu' => 'Luxembourg',
+            'mo' => 'Macau SAR China',
+            'mk' => 'Macedonia',
+            'mg' => 'Madagascar',
+            'mw' => 'Malawi',
+            'my' => 'Malaysia',
+            'mv' => 'Maldives',
+            'ml' => 'Mali',
+            'mt' => 'Malta',
+            'mh' => 'Marshall Islands',
+            'mq' => 'Martinique',
+            'mr' => 'Mauritania',
+            'mu' => 'Mauritius',
+            'yt' => 'Mayotte',
+            'fx' => 'Metropolitan France',
+            'mx' => 'Mexico',
+            'fm' => 'Micronesia',
+            'mi' => 'Midway Islands',
+            'md' => 'Moldova',
+            'mc' => 'Monaco',
+            'mn' => 'Mongolia',
+            'me' => 'Montenegro',
+            'ms' => 'Montserrat',
+            'ma' => 'Morocco',
+            'mz' => 'Mozambique',
+            'mm' => 'Myanmar [Burma]',
+            'na' => 'Namibia',
+            'nr' => 'Nauru',
+            'np' => 'Nepal',
+            'nl' => 'Netherlands',
+            'an' => 'Netherlands Antilles',
+            'nt' => 'Neutral Zone',
+            'nc' => 'New Caledonia',
+            'nz' => 'New Zealand',
+            'ni' => 'Nicaragua',
+            'ne' => 'Niger',
+            'ng' => 'Nigeria',
+            'nu' => 'Niue',
+            'nf' => 'Norfolk Island',
+            'kp' => 'North Korea',
+            'vd' => 'North Vietnam',
+            'mp' => 'Northern Mariana Islands',
+            'no' => 'Norway',
+            'om' => 'Oman',
+            'pc' => 'Pacific Islands Trust Territory',
+            'pk' => 'Pakistan',
+            'pw' => 'Palau',
+            'ps' => 'Palestinian Territories',
+            'pa' => 'Panama',
+            'pz' => 'Panama Canal Zone',
+            'pg' => 'Papua New Guinea',
+            'py' => 'Paraguay',
+            'yd' => 'People\'s Democratic Republic of Yemen',
+            'pe' => 'Peru',
+            'ph' => 'Philippines',
+            'pn' => 'Pitcairn Islands',
+            'pl' => 'Poland',
+            'pt' => 'Portugal',
+            'pr' => 'Puerto Rico',
+            'qa' => 'Qatar',
+            'ro' => 'Romania',
+            'ru' => 'Russia',
+            'rw' => 'Rwanda',
+            're' => 'Réunion',
+            'bl' => 'Saint Barthélemy',
+            'sh' => 'Saint Helena',
+            'kn' => 'Saint Kitts and Nevis',
+            'lc' => 'Saint Lucia',
+            'mf' => 'Saint Martin',
+            'pm' => 'Saint Pierre and Miquelon',
+            'vc' => 'Saint Vincent and the Grenadines',
+            'ws' => 'Samoa',
+            'sm' => 'San Marino',
+            'sa' => 'Saudi Arabia',
+            'sn' => 'Senegal',
+            'rs' => 'Serbia',
+            'cs' => 'Serbia and Montenegro',
+            'sc' => 'Seychelles',
+            'sl' => 'Sierra Leone',
+            'sg' => 'Singapore',
+            'sk' => 'Slovakia',
+            'si' => 'Slovenia',
+            'sb' => 'Solomon Islands',
+            'so' => 'Somalia',
+            'za' => 'South Africa',
+            'gs' => 'South Georgia and the South Sandwich Islands',
+            'kr' => 'South Korea',
+            'es' => 'Spain',
+            'lk' => 'Sri Lanka',
+            'sd' => 'Sudan',
+            'sr' => 'Suriname',
+            'sj' => 'Svalbard and Jan Mayen',
+            'sz' => 'Swaziland',
+            'se' => 'Sweden',
+            'ch' => 'Switzerland',
+            'sy' => 'Syria',
+            'st' => 'São Tomé and Príncipe',
+            'tw' => 'Taiwan',
+            'tj' => 'Tajikistan',
+            'tz' => 'Tanzania',
+            'th' => 'Thailand',
+            'tl' => 'Timor-Leste',
+            'tg' => 'Togo',
+            'tk' => 'Tokelau',
+            'to' => 'Tonga',
+            'tt' => 'Trinidad and Tobago',
+            'tn' => 'Tunisia',
+            'tr' => 'Turkey',
+            'tm' => 'Turkmenistan',
+            'tc' => 'Turks and Caicos Islands',
+            'tv' => 'Tuvalu',
+            'um' => 'U.S. Minor Outlying Islands',
+            'pu' => 'U.S. Miscellaneous Pacific Islands',
+            'vi' => 'U.S. Virgin Islands',
+            'ug' => 'Uganda',
+            'ua' => 'Ukraine',
+            'su' => 'Union of Soviet Socialist Republics',
+            'ae' => 'United Arab Emirates',
+            'en' => 'United Kingdom (EN)',
+            'uk' => 'United Kingdom (UK)',
+            'gb' => 'United Kingdom (GB)',
+            'us' => 'United States',
+            'zz' => 'Unknown or Invalid Region',
+            'uy' => 'Uruguay',
+            'uz' => 'Uzbekistan',
+            'vu' => 'Vanuatu',
+            'va' => 'Vatican City',
+            've' => 'Venezuela',
+            'vn' => 'Vietnam',
+            'wk' => 'Wake Island',
+            'wf' => 'Wallis and Futuna',
+            'eh' => 'Western Sahara',
+            'ye' => 'Yemen',
+            'zm' => 'Zambia',
+            'zw' => 'Zimbabwe',
+            'ax' => 'Åland Islands',
+        ];
+
+        if ($key && array_key_exists($key, $arr)) {
+            return $arr[strtolower($key)];
+        }
+
+        return $arr;
+    }
+}

app/Helpers/Languages.php

@@ -1,7 +1,7 @@
 <?php
 
 if (!function_exists('languages')) {
-    function languages()
+    function languages(): array
     {
         $languages = [
             'en'

app/Http/Controllers/Admin/AlertController.php

@@ -2,10 +2,9 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\Alert;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\AlertRequest;
-use App\Models\Alert;
-use Illuminate\Http\Request;
 
 class AlertController extends Controller
 {

app/Http/Controllers/Admin/SettingController.php

@@ -3,10 +3,10 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Package;
-use App\Http\Controllers\Controller;
-use App\Http\Requests\Admin\SettingRequest;
-use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Str;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Storage;
+use App\Http\Requests\Admin\SettingRequest;
 
 class SettingController extends Controller
 {
@@ -56,6 +56,18 @@ class SettingController extends Controller
                 $value = encrypt($value);
             }
 
+            if ($key === 'default_package' && $value === 'false') {
+                $value = null;
+            }
+
+            if ($value === 'false') {
+                $value = 0;
+            }
+
+            if ($value === 'true') {
+                $value = 1;
+            }
+
             setting([$key => $value]);
         }
 

app/Http/Controllers/Admin/SynchronizeServerController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Models\Server;
-use App\Services\Ploi\Ploi;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
@@ -11,15 +10,15 @@ class SynchronizeServerController extends Controller
 {
     public function index()
     {
-        if (config('app.demo')) {
+        if ($this->isDemo()) {
             return redirect('/')->with('info', __('This feature is not available in demo mode.'));
         }
 
-        $ploi = new Ploi(config('services.ploi.token'));
+        $availableServers = $this->getPloi()->synchronize()->servers()->getData();
 
-        $availableServers = $ploi->synchronize()->servers()->getData();
-
-        $currentServers = Server::whereNotIn('id', array_keys((array)$availableServers))->get();
+        $currentServers = Server::query()
+            ->whereNotIn('id', array_keys((array)$availableServers))
+            ->get();
 
         return inertia('Admin/Services/Servers', [
             'availableServers' => $availableServers,
@@ -29,7 +28,8 @@ class SynchronizeServerController extends Controller
 
     public function synchronizeServer(Request $request)
     {
-        Server::updateOrCreate([
+        Server::query()
+            ->updateOrCreate([
                 'ploi_id' => $request->input('id')
             ], [
                 'status' => $request->input('status'),
@@ -40,4 +40,25 @@ class SynchronizeServerController extends Controller
                 'available_php_versions' => $request->input('installed_php_versions')
             ]);
     }
+
+    public function synchronizeAll(Request $request)
+    {
+        $availableServers = $this->getPloi()->synchronize()->servers()->getData();
+
+        foreach ($availableServers as $availableServer) {
+            Server::query()
+                ->updateOrCreate([
+                    'ploi_id' => $availableServer->id
+                ], [
+                    'status' => $availableServer->status,
+                    'name' => $availableServer->name,
+                    'ip' => $availableServer->ip_address,
+                    'ssh_port' => $availableServer->ssh_port,
+                    'internal_ip' => $availableServer->internal_ip,
+                    'available_php_versions' => $availableServer->installed_php_versions
+                ]);
+        }
+
+        return response('ok');
+    }
 }

app/Http/Controllers/Admin/SynchronizeSiteController.php

@@ -2,12 +2,66 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\Site;
+use App\Models\Server;
+use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 class SynchronizeSiteController extends Controller
 {
     public function index()
     {
-        return inertia('Admin/Services/Sites');
+        if ($this->isDemo()) {
+            return redirect('/')->with('info', __('This feature is not available in demo mode.'));
+        }
+
+        $availableSites = $this->getPloi()->synchronize()->sites()->getData();
+
+        $currentSites = Site::query()
+            ->whereNotIn('id', array_keys((array)$availableSites))
+            ->get();
+
+        return inertia('Admin/Services/Sites', [
+            'availableSites' => $availableSites,
+            'currentSites' => $currentSites
+        ]);
+    }
+
+    public function synchronizeSite(Request $request)
+    {
+        $server = Server::query()->where('ploi_id', $request->input('server_id'))->firstOrFail();
+
+        $site = Site::query()
+            ->updateOrCreate([
+                'ploi_id' => $request->input('id')
+            ], [
+                'domain' => $request->input('domain'),
+                'php_version' => $request->input('php_version'),
+            ]);
+
+        $site->status = $request->input('status');
+        $site->server_id = $server->id;
+        $site->save();
+    }
+
+    public function synchronizeAll(Request $request)
+    {
+        $availableSites = $this->getPloi()->synchronize()->sites()->getData();
+
+        foreach ($availableSites as $availableSite) {
+            $server = Server::query()->where('ploi_id', $availableSite->server_id)->firstOrFail();
+
+            $site = Site::query()
+                ->updateOrCreate([
+                    'ploi_id' => $availableSite->server_id
+                ], [
+                    'domain' => $availableSite->domain,
+                    'php_version' => $availableSite->php_version,
+                ]);
+
+            $site->status = $availableSite->status;
+            $site->server_id = $server->id;
+            $site->save();
+        }
     }
 }

app/Http/Controllers/Admin/UserController.php

@@ -45,8 +45,8 @@ class UserController extends Controller
             $user->save();
         }
 
-        if ($package = $request->input('package')) {
-            $user->package_id = $package;
+        if ($request->input('package') && Package::find($request->input('package'))) {
+            $user->package_id = $request->input('package');
             $user->save();
         }
 
@@ -55,7 +55,17 @@ class UserController extends Controller
 
     public function show($id)
     {
-        // TODO: Implement show feature for a user
+        $user = User::query()->findOrFail($id);
+
+        $servers = $user->servers()->withCount('sites')->latest()->paginate(5, ['*'], 'page_servers');
+
+        $sites = $user->sites()->with('server:id,name')->latest()->paginate(5, ['*'], 'page_sites');
+
+        return inertia('Admin/Users/Show', [
+            'user' => $user,
+            'sites' => $sites,
+            'servers' => $servers,
+        ]);
     }
 
     public function edit($id)

app/Http/Controllers/Auth/RegisterController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Providers\RouteServiceProvider;
 use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rules\Password;
 use Illuminate\Foundation\Auth\RegistersUsers;
 
 class RegisterController extends Controller
@@ -30,7 +31,15 @@ class RegisterController extends Controller
         return Validator::make($data, [
             'name' => ['required', 'string', 'max:255'],
             'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
+            'password' => [
+                'required',
+                'string',
+                'confirmed',
+                Password::min(6)
+                    ->letters()
+                    ->numbers()
+                    ->uncompromised()
+            ],
         ]);
     }
 
@@ -45,8 +54,8 @@ class RegisterController extends Controller
 
     protected function registered(Request $request, $user)
     {
-        if ($defaultPackage = setting('default_package')) {
-            $user->package_id = $defaultPackage;
+        if (setting('default_package') && setting('default_package') != 'false') {
+            $user->package_id = setting('default_package');
             $user->save();
         }
     }

app/Http/Controllers/Controller.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use App\Services\Ploi\Ploi;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
@@ -9,4 +10,14 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 class Controller extends BaseController
 {
     use ValidatesRequests, AuthorizesRequests;
+
+    protected function isDemo()
+    {
+        return config('app.demo');
+    }
+
+    protected function getPloi()
+    {
+        return new Ploi(config('services.ploi.token'));
+    }
 }

app/Http/Controllers/DocumentationController.php

@@ -2,17 +2,43 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Support\Str;
 use App\Models\DocumentationItem;
-use App\Http\Resources\DocumentationItemResource;
+use App\Models\DocumentationCategory;
+use App\Http\Resources\DocumentationCategoryRouteResource;
 
 class DocumentationController extends Controller
 {
     public function index()
     {
-        $documentationItems = DocumentationItem::latest()->paginate();
+        $items = DocumentationCategory::query()->oldest()->get();
 
         return inertia('Documentation/Index', [
-            'items' => DocumentationItemResource::collection($documentationItems)
+            'items' => DocumentationCategoryRouteResource::collection($items)
+        ]);
+    }
+
+    public function show(DocumentationCategory $documentationCategory)
+    {
+        $items = DocumentationCategory::query()->oldest()->get();
+
+        return inertia('Documentation/Show', [
+            'category' => $documentationCategory,
+            'articles' => $documentationCategory->items()->latest()->get(),
+            'items' => DocumentationCategoryRouteResource::collection($items)
+        ]);
+    }
+
+    public function showArticle(DocumentationCategory $documentationCategory, DocumentationItem $documentationItem)
+    {
+        $items = DocumentationCategory::query()->oldest()->get();
+
+        $documentationItem->content = Str::markdown($documentationItem->content);
+
+        return inertia('Documentation/Article', [
+            'category' => $documentationCategory,
+            'article' => $documentationItem,
+            'items' => DocumentationCategoryRouteResource::collection($items)
         ]);
     }
 }

app/Http/Controllers/Profile/ProfileBillingController.php

@@ -20,9 +20,13 @@ class ProfileBillingController extends Controller
         $sortByType = array_key_first($request->input('sortBy', []));
 
         $packages = Package::query()
+            ->where(function ($query) {
+                return $query
                     ->where(function ($query) {
                         return $query
                             ->where('price_monthly', '>', 0)
+                            ->orWhere('price_yearly', '>', 0);
+                    })
                     ->whereNotNull('plan_id');
             })
             ->when($request->input('sortBy.' . $sortByType), function ($query, $value) use ($sortByType) {
@@ -53,27 +57,32 @@ class ProfileBillingController extends Controller
             })
             ->get()
             ->transform(function (Package $package) {
-                $currencies = [
-                    Package::CURRENCY_EURO => '€',
-                    Package::CURRENCY_USD => '$',
-                    Package::CURRENCY_NOK => 'KR ',
-                    Package::CURRENCY_CAD => 'CAD $',
-                    Package::CURRENCY_AUD => 'AUD $',
-                ];
+                $currency = $this->transformCurrency($package->currency);
 
-                $package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
+                $package->period = 'monthly';
+
+                if ($package->price_yearly > 0) {
+                    $package->period = 'yearly';
+                }
+
+                $package->price_monthly = ($currency ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');
+                $package->price_yearly = ($currency ?? '[Unknown currency]') . number_format($package->price_yearly, 2, ',', '.');
 
                 return $package;
             });
 
+        try {
+            $clientSecret = $user->createSetupIntent()->client_secret;
+        } catch (\Exception $exception) {
+            return inertia('Profile/BillingError');
+        }
+
         return inertia('Profile/Billing', [
             'packages' => $packages,
+            'countries' => countries(),
             'subscription' => $user->subscription('default'),
             'public_key' => config('cashier.key'),
-            'data_client_secret' => function () use ($user) {
-                $intent = $user->createSetupIntent();
-                return $intent->client_secret;
-            },
+            'data_client_secret' => $clientSecret,
             'card' => [
                 'last_four' => $user->card_last_four,
                 'brand' => $user->card_brand
@@ -92,8 +101,14 @@ class ProfileBillingController extends Controller
         $user = $request->user();
 
         $user->createOrGetStripeCustomer([
-            'name' => $user->name,
-            'description' => $request->input('billing_details')
+            'name' => $request->input('billing_details.name'),
+            'description' => 'Ploi Core Customer ' . $request->input('billing_details.name'),
+            'address' => [
+                'line1' => $request->input('billing_details.address.line1'),
+                'postal_code' => $request->input('billing_details.address.postal_code'),
+                'city' => $request->input('billing_details.address.city'),
+                'country' => $request->input('billing_details.address.country'),
+            ]
         ]);
 
         foreach ($user->paymentMethods() as $paymentMethod) {
@@ -163,7 +178,7 @@ class ProfileBillingController extends Controller
     public function invoices(Request $request)
     {
         return $request->user()->invoices()->map(function ($invoice) {
-            $symbol = $invoice->currency === Package::CURRENCY_EURO ? '€' : '$';
+            $symbol = $this->transformCurrency($invoice->currency);
 
             return [
                 'id' => $invoice->id,
@@ -183,4 +198,20 @@ class ProfileBillingController extends Controller
             'product' => 'Webhosting'
         ]);
     }
+
+    protected function transformCurrency($key)
+    {
+        $currencies = [
+            Package::CURRENCY_EURO => '€',
+            Package::CURRENCY_USD => '$',
+            Package::CURRENCY_NOK => 'KR ',
+            Package::CURRENCY_CAD => 'CAD $',
+            Package::CURRENCY_AUD => 'AUD $',
+            Package::CURRENCY_GBP => 'GBP £',
+            Package::CURRENCY_INR => 'INR ₹',
+            Package::CURRENCY_THB => 'THB ',
+        ];
+
+        return $currencies[strtolower($key)] ?? '$';
+    }
 }

app/Http/Controllers/Profile/ProfileController.php

@@ -12,7 +12,8 @@ class ProfileController extends Controller
     public function index()
     {
         return inertia('Profile/Index', [
-            'profile' => new UserProfileResource(auth()->user())
+            'profile' => new UserProfileResource(auth()->user()),
+            'countries' => countries()
         ]);
     }
 

app/Http/Controllers/Profile/ProfileIntegrationController.php

@@ -2,16 +2,15 @@
 
 namespace App\Http\Controllers\Profile;
 
+use App\Models\UserProvider;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\ProfileIntegrationRequest;
-use App\Models\UserProvider;
-use Illuminate\Http\Request;
 
 class ProfileIntegrationController extends Controller
 {
     public function index()
     {
-        $providers = auth()->user()->providers()->latest()->get()->map(function($provider){
+        $providers = auth()->user()->providers()->latest()->get()->map(function ($provider) {
             return [
                 'id' => $provider->id,
                 'type' => $provider->type,
@@ -28,7 +27,7 @@ class ProfileIntegrationController extends Controller
     {
         $request->user()->providers()->updateOrCreate([
             'type' => UserProvider::TYPE_CLOUDFLARE
-        ],[
+        ], [
             'type' => UserProvider::TYPE_CLOUDFLARE,
             'token' => $request->input('meta.api_key'),
             'meta' => [

app/Http/Controllers/SiteCertificateController.php

@@ -25,6 +25,9 @@ class SiteCertificateController extends Controller
 
         $certificate = $site->certificates()->create([
             'domain' => $request->input('domain'),
+            'type' => $request->input('type', 'letsencrypt'),
+            'certificate' => $request->input('certificate'),
+            'private' => $request->input('private')
         ]);
 
         $certificate->server_id = $site->server_id;

app/Http/Controllers/SiteController.php

@@ -37,7 +37,18 @@ class SiteController extends Controller
             $server = $request->user()->servers()->findOrFail($serverId);
         } else {
             $server = Server::query()
-                ->doesntHave('users')
+                ->where('maximum_sites', '>', 0)
+                ->where(function ($query) {
+                    return $query
+                        ->where(function ($query) {
+                            return $query->whereHas('users', function ($query) {
+                                return $query->where('user_id', auth()->id());
+                            });
+                        })
+                        ->orWhere(function ($query) {
+                            return $query->doesntHave('users');
+                        });
+                })
                 ->withCount('sites')
                 ->inRandomOrder()
                 ->first();

app/Http/Controllers/SiteDnsController.php

@@ -2,12 +2,12 @@
 
 namespace App\Http\Controllers;
 
-use App\Http\Requests\SiteDnsRequest;
 use App\Models\Site;
+use Illuminate\Support\Arr;
 use App\Models\UserProvider;
 use App\Services\Cloudflare;
 use Illuminate\Http\Request;
-use Illuminate\Support\Arr;
+use App\Http\Requests\SiteDnsRequest;
 
 class SiteDnsController extends Controller
 {

app/Http/Middleware/HandleInertiaRequests.php

@@ -3,9 +3,9 @@
 namespace App\Http\Middleware;
 
 use App\Models\Alert;
-use App\Models\UserProvider;
 use Inertia\Middleware;
 use Illuminate\Support\Arr;
+use App\Models\UserProvider;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Session;
@@ -61,6 +61,10 @@ class HandleInertiaRequests extends Middleware
                         'theme' => Auth::user()->theme,
                         'keyboard_shortcuts' => Auth::user()->keyboard_shortcuts,
                         'requires_password_for_ftp' => Auth::user()->requires_password_for_ftp,
+                        'address' => Auth::user()->address,
+                        'country' => Auth::user()->country,
+                        'zip' => Auth::user()->zip,
+                        'city' => Auth::user()->city,
                     ] : null,
                     'package' => auth()->user() && auth()->user()->package ? [
                         'name' => auth()->user()->package->name,

app/Http/Requests/Admin/AlertRequest.php

@@ -3,8 +3,8 @@
 namespace App\Http\Requests\Admin;
 
 use App\Models\Alert;
-use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
+use Illuminate\Foundation\Http\FormRequest;
 
 class AlertRequest extends FormRequest
 {

app/Http/Requests/Admin/PackageRequest.php

@@ -39,6 +39,9 @@ class PackageRequest extends FormRequest
                     Package::CURRENCY_NOK,
                     Package::CURRENCY_AUD,
                     Package::CURRENCY_CAD,
+                    Package::CURRENCY_GBP,
+                    Package::CURRENCY_INR,
+                    Package::CURRENCY_THB,
                 ])
             ],
             'maximum_sites' => [
@@ -56,7 +59,11 @@ class PackageRequest extends FormRequest
             ],
             'price_monthly' => [
                 'nullable',
-                'numeric'
+                'numeric',
+            ],
+            'price_yearly' => [
+                'nullable',
+                'numeric',
             ],
             'server_permissions' => [
                 'array'
@@ -76,8 +83,12 @@ class PackageRequest extends FormRequest
             $merge['price_monthly'] = 0.000;
         }
 
+        if (!$this->price_yearly) {
+            $merge['price_yearly'] = 0.000;
+        }
+
         // If we don't have the currency filled in, merge a default
-        if (!$this->price_monthly) {
+        if (!$this->price_monthly || !$this->price_yearly) {
             $merge['currency'] = Package::CURRENCY_USD;
         }
 

app/Http/Requests/ProfileIntegrationRequest.php

@@ -3,9 +3,9 @@
 namespace App\Http\Requests;
 
 use App\Models\UserProvider;
+use Illuminate\Validation\Rule;
 use App\Rules\CloudflareGeneralTest;
 use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Validation\Rule;
 
 class ProfileIntegrationRequest extends FormRequest
 {

app/Http/Requests/SiteCertificateRequest.php

@@ -25,7 +25,10 @@ class SiteCertificateRequest extends FormRequest
      */
     public function rules()
     {
-        return [
+        $rules = [];
+
+        if ($this->input('type') === 'letsencrypt') {
+            $rules = [
                 'domain' => [
                     'required',
                     'string',
@@ -36,4 +39,22 @@ class SiteCertificateRequest extends FormRequest
                 ]
             ];
         }
+
+        if ($this->input('type') === 'custom') {
+            $rules = [
+                'certificate' => [
+                    'required',
+                    'string',
+                    'min:5'
+                ],
+                'private' => [
+                    'required',
+                    'string',
+                    'min:5'
+                ]
+            ];
+        }
+
+        return $rules;
+    }
 }

app/Http/Requests/UserProfileRequest.php

@@ -41,6 +41,22 @@ class UserProfileRequest extends FormRequest
                 'required',
                 'string',
                 Rule::in(languages()),
+            ],
+            'address' => [
+                'nullable',
+                'string'
+            ],
+            'country' => [
+                'nullable',
+                'string'
+            ],
+            'zip' => [
+                'nullable',
+                'string'
+            ],
+            'city' => [
+                'nullable',
+                'string'
             ]
         ];
     }

app/Http/Resources/DocumentationCategoryRouteResource.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class DocumentationCategoryRouteResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array
+     */
+    public function toArray($request)
+    {
+        return [
+            'title' => $this->title,
+            'to' => route('documentation.show', $this->id),
+            'active' => object_get(request()->route('documentationCategory'), 'id') === $this->id ? true : false
+        ];
+    }
+}

app/Http/Resources/UserProfileResource.php

@@ -19,7 +19,11 @@ class UserProfileResource extends JsonResource
         return [
             'name' => $this->name,
             'email' => $this->email,
-            'language' => $this->language
+            'language' => $this->language,
+            'address' => $this->address,
+            'country' => $this->country,
+            'zip' => $this->zip,
+            'city' => $this->city
         ];
     }
 }

app/Jobs/Certificates/CreateCertificate.php

@@ -14,27 +14,18 @@ class CreateCertificate implements ShouldQueue
 {
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    public $certificate;
+    public Certificate $certificate;
 
-    /**
-     * Create a new job instance.
-     *
-     * @param Certificate $certificate
-     */
     public function __construct(Certificate $certificate)
     {
         $this->certificate = $certificate;
     }
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
     public function handle()
     {
         $ploi = new Ploi(config('services.ploi.token'));
 
+        if ($this->certificate->type === 'letsencrypt') {
             $ploiCertificate = $ploi->server($this->certificate->server->ploi_id)
                 ->sites($this->certificate->site->ploi_id)
                 ->certificates()
@@ -44,6 +35,21 @@ class CreateCertificate implements ShouldQueue
 
             $this->certificate->ploi_id = $ploiCertificate->id;
             $this->certificate->save();
+        }
+
+        if ($this->certificate->type === 'custom') {
+            $ploiCertificate = $ploi->server($this->certificate->server->ploi_id)
+                ->sites($this->certificate->site->ploi_id)
+                ->certificates()
+                ->create(
+                    $this->certificate->certificate,
+                    $this->certificate->type,
+                    $this->certificate->private
+                );
+
+            $this->certificate->ploi_id = $ploiCertificate->id;
+            $this->certificate->save();
+        }
 
         // Lets fetch the status after 5 seconds
         dispatch(new FetchCertificateStatus($this->certificate))->delay(now()->addSeconds(5));

app/Jobs/Core/Ping.php

@@ -3,8 +3,8 @@
 namespace App\Jobs\Core;
 
 use App\Services\Ploi\Ploi;
-use App\Services\VersionChecker;
 use Illuminate\Bus\Queueable;
+use App\Services\VersionChecker;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Queue\InteractsWithQueue;
@@ -19,6 +19,8 @@ class Ping implements ShouldQueue
     {
         $version = new VersionChecker;
 
+        $version->flushVersionData();
+
         $response = Http::withHeaders([
             'Accept' => 'application/json',
             'Content-Type' => 'application/json',

app/Models/Certificate.php

@@ -18,6 +18,8 @@ class Certificate extends Model
 
     public $fillable = [
         'domain',
-        'type'
+        'type',
+        'certificate',
+        'private',
     ];
 }

app/Models/Package.php

@@ -12,6 +12,9 @@ class Package extends Model
     const CURRENCY_NOK = 'nok';
     const CURRENCY_AUD = 'aud';
     const CURRENCY_CAD = 'cad';
+    const CURRENCY_GBP = 'gbp';
+    const CURRENCY_INR = 'inr';
+    const CURRENCY_THB = 'thb';
 
     public $fillable = [
         'name',
@@ -19,6 +22,7 @@ class Package extends Model
         'currency',
         'price_hourly',
         'price_monthly',
+        'price_yearly',
         'maximum_sites',
         'maximum_servers',
         'site_permissions',

app/Models/Provider.php

@@ -41,12 +41,12 @@ class Provider extends Model
 
     public static function booted()
     {
-        static::deleting(function(self $provider){
+        static::deleting(function (self $provider) {
             $provider->regions()->delete();
             $provider->plans()->delete();
             $provider->packages()->detach();
 
-            foreach($provider->servers as $server){
+            foreach ($provider->servers as $server) {
                 $server->provider_id = null;
                 $server->provider_plan_id = null;
                 $server->provider_region_id = null;

app/Models/User.php

@@ -28,6 +28,7 @@ class User extends Authenticatable implements HasLocalePreference
         'address',
         'city',
         'country',
+        'zip',
         'notes',
         'language',
         'blocked',
@@ -109,6 +110,11 @@ class User extends Authenticatable implements HasLocalePreference
         return $this->hasMany(SupportTicket::class);
     }
 
+    public function supportTicketReplies()
+    {
+        return $this->hasMany(SupportTicketReply::class);
+    }
+
     public function systemLogs()
     {
         return $this->hasMany(SystemLog::class);
@@ -138,6 +144,10 @@ class User extends Authenticatable implements HasLocalePreference
             $user->systemLogs()->delete();
             $user->servers()->detach();
             $user->sites()->detach();
+            foreach ($user->supportTickets as $supportTicket) {
+                $supportTicket->replies()->delete();
+            }
+            $user->supportTickets()->delete();
         });
     }
 }

app/Providers/AppServiceProvider.php

@@ -3,19 +3,10 @@
 namespace App\Providers;
 
 use App\Models\Setting;
-use Illuminate\Support\Collection;
-use Illuminate\Pagination\UrlWindow;
-use Illuminate\Support\Facades\Request;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Pagination\LengthAwarePaginator;
 
 class AppServiceProvider extends ServiceProvider
 {
-    /**
-     * Register any application services.
-     *
-     * @return void
-     */
     public function register()
     {
         $this->app->singleton('settings', function ($app) {
@@ -27,75 +18,5 @@ class AppServiceProvider extends ServiceProvider
                 }
             });
         });
-
-        if (!$this->app->request->is('api*')) {
-            $this->registerLengthAwarePaginator();
-        }
-    }
-
-    protected function registerLengthAwarePaginator()
-    {
-        $this->app->bind(LengthAwarePaginator::class, function ($app, $values) {
-            return new class(...array_values($values)) extends LengthAwarePaginator {
-                public function only(...$attributes)
-                {
-                    return $this->transform(function ($item) use ($attributes) {
-                        return $item->only($attributes);
-                    });
-                }
-
-                public function transform($callback)
-                {
-                    $this->items->transform($callback);
-
-                    return $this;
-                }
-
-                public function toArray()
-                {
-                    return [
-                        'data' => $this->items->toArray(),
-                        'links' => $this->links(),
-                        'per_page' => $this->perPage(),
-                        'total' => $this->total(),
-                    ];
-                }
-
-                public function links($view = null, $data = [])
-                {
-                    $this->appends(Request::all());
-
-                    $window = UrlWindow::make($this);
-
-                    $elements = array_filter([
-                        $window['first'],
-                        is_array($window['slider']) ? '...' : null,
-                        $window['slider'],
-                        is_array($window['last']) ? '...' : null,
-                        $window['last'],
-                    ]);
-
-                    return Collection::make($elements)->flatMap(function ($item) {
-                        if (is_array($item)) {
-                            return Collection::make($item)->map(function ($url, $page) {
-                                return [
-                                    'url' => $url,
-                                    'label' => $page,
-                                    'active' => $this->currentPage() === $page,
-                                ];
-                            });
-                        } else {
-                            return [
-                                [
-                                    'url' => null,
-                                    'label' => '...',
-                                    'active' => false,
-                                ],
-                            ];
-                        }
-                    });
-                }
-            };
-        });
     }
 }

app/Providers/HorizonServiceProvider.php

@@ -34,7 +34,7 @@ class HorizonServiceProvider extends HorizonApplicationServiceProvider
     protected function gate()
     {
         Gate::define('viewHorizon', function ($user) {
-            return $user->isAdmin();
+            return $user->isAdmin() && !config('app.demo');
         });
     }
 }

app/Services/Cloudflare.php

@@ -2,8 +2,8 @@
 
 namespace App\Services;
 
-use GuzzleHttp\Exception\ClientException;
 use Illuminate\Support\Str;
+use GuzzleHttp\Exception\ClientException;
 
 class Cloudflare
 {

app/Services/Ploi/Exceptions/Http/Unauthenticated.php

@@ -21,4 +21,9 @@ class Unauthenticated extends Exception
     {
         parent::__construct($message);
     }
+
+    public function render($request)
+    {
+        return redirect()->route('dashboard')->with('error', 'Unable to authenticate with backend server, please check API keys and connection.');
+    }
 }

app/Services/Ploi/Resources/Certificate.php

@@ -43,7 +43,7 @@ class Certificate extends Resource
         return $this->getPloi()->makeAPICall($this->getEndpoint());
     }
 
-    public function create(string $certificate, string $type = 'letsencrypt'): stdClass
+    public function create(string $certificate, string $type = 'letsencrypt', string $private = null): stdClass
     {
         // Remove the id
         $this->setId(null);
@@ -51,8 +51,9 @@ class Certificate extends Resource
         // Set the options
         $options = [
             'body' => json_encode([
-                'certificate' => $certificate,
                 'type' => $type,
+                'certificate' => $certificate,
+                'private' => $private,
             ]),
         ];
 

app/Services/Ploi/Resources/Server.php

@@ -61,9 +61,9 @@ class Server extends Resource
 
     public function create(
         string $name,
-        int $provider,
-        int $region,
-        int $plan
+        $provider,
+        $region,
+        $plan
     ): stdClass {
 
         // Remove the id
@@ -89,8 +89,6 @@ class Server extends Resource
         } catch (NotValid $exception) {
             $errors = json_decode($exception->getMessage())->errors;
 
-            dd($errors);
-
             throw $exception;
         }
 

app/Services/Ploi/Resources/Site.php

@@ -98,6 +98,13 @@ class Site extends Resource
             }
 
             throw $exception;
+        } catch (\Exception $exception) {
+            info($exception->getMessage());
+        }
+
+        // TODO: Debugging purposes
+        if (!$response->getJson() || !isset($response->getJson()->data)) {
+            throw new \Exception($response->getJson()->error ?? 'Unknown error has occured');
         }
 
         // Set the id of the site
@@ -142,7 +149,7 @@ class Site extends Resource
         return $response->getJson()->data;
     }
 
-    public function phpVersion($version = '7.4') :stdClass
+    public function phpVersion($version = '7.4'): stdClass
     {
         // Set the options
         $options = [

app/Services/Ploi/Resources/Synchronize.php

@@ -19,4 +19,9 @@ class Synchronize extends Resource
     {
         return $this->getPloi()->makeAPICall($this->getEndpoint() . '/servers');
     }
+
+    public function sites()
+    {
+        return $this->getPloi()->makeAPICall($this->getEndpoint() . '/sites');
+    }
 }

app/Services/VersionChecker.php

@@ -34,4 +34,13 @@ class VersionChecker
     {
         return $this->currentVersion < $this->remoteVersion || $this->currentVersion != $this->remoteVersion;
     }
+
+    public function flushVersionData()
+    {
+        try {
+            cache()->forget('ploi-core-current-version');
+            cache()->forget('ploi-core-remote-version');
+        } catch (\Exception $exception) {
+        }
+    }
 }

composer.json

@@ -9,30 +9,32 @@
     ],
     "license": "MIT",
     "require": {
-        "php": "^7.3",
+        "php": "^7.4|^8.0",
         "ext-json": "*",
         "cloudflare/sdk": "^1.1",
         "fideloper/proxy": "^4.2",
         "fruitcake/laravel-cors": "^1.0",
         "guzzlehttp/guzzle": "^6.2|^7.0.1",
-        "inertiajs/inertia-laravel": "^0.3.1",
+        "inertiajs/inertia-laravel": "^v0.4.3",
         "laravel/cashier": "^12.3",
         "laravel/framework": "^8.4",
         "laravel/horizon": "^5.0",
         "laravel/tinker": "^2.0",
-        "laravel/ui": "^2.1",
+        "laravel/ui": "^2.1|^3.3.0",
         "league/glide": "^1.6",
         "pragmarx/google2fa-laravel": "^1.3",
-        "tightenco/ziggy": "^0.9.4"
+        "predis/predis": "^1.1",
+        "tightenco/ziggy": "^1.3"
     },
     "require-dev": {
         "barryvdh/laravel-debugbar": "^3.3",
         "facade/ignition": "^2.3",
         "friendsofphp/php-cs-fixer": "^2.16",
         "fzaninotto/faker": "^1.9.1",
+        "laravel/dusk": "^6.15",
         "mockery/mockery": "^1.3.1",
         "nunomaduro/collision": "^5.0",
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^9.5.4"
     },
     "config": {
         "optimize-autoloader": true,

config/horizon.php

@@ -15,7 +15,7 @@ return [
     |
     */
 
-    'domain' => null,
+    'domain' => env('HORIZON_DOMAIN', null),
 
     /*
     |--------------------------------------------------------------------------
@@ -28,7 +28,7 @@ return [
     |
     */
 
-    'path' => 'horizon',
+    'path' => env('HORIZON_PATH', 'horizon'),
 
     /*
     |--------------------------------------------------------------------------
@@ -145,13 +145,13 @@ return [
     | Memory Limit (MB)
     |--------------------------------------------------------------------------
     |
-    | This value describes the maximum amount of memory the Horizon worker
-    | may consume before it is terminated and restarted. You should set
-    | this value according to the resources available to your server.
+    | This value describes the maximum amount of memory the Horizon master
+    | supervisor may consume before it is terminated and restarted. For
+    | configuring these limits on your workers, see the next section.
     |
     */
 
-    'memory_limit' => 64,
+    'memory_limit' => env('HORIZON_MEMORY_LIMIT', 64),
 
     /*
     |--------------------------------------------------------------------------
@@ -164,6 +164,9 @@ return [
     |
     */
 
+    'defaults' => [
+    ],
+
     'environments' => [
         'production' => [
             'supervisor-1' => [

database/migrations/2020_11_17_102907_create_alerts_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class CreateAlertsTable extends Migration
 {

database/migrations/2020_11_19_095907_add_meta_to_user_providers_table.php

@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
 
 class AddMetaToUserProvidersTable extends Migration
 {

database/migrations/2021_05_11_083348_add_zip_to_users_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddZipToUsersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('zip')->after('city')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('zip');
+        });
+    }
+}

database/migrations/2021_07_12_100447_add_price_yearly_to_packages_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddPriceYearlyToPackagesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('packages', function (Blueprint $table) {
+            $table->decimal('price_yearly', 10, 4)->after('price_monthly')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('packages', function (Blueprint $table) {
+            $table->dropColumn('price_yearly');
+        });
+    }
+}

database/migrations/2021_07_29_073822_add_columns_to_certificates_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddColumnsToCertificatesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('certificates', function (Blueprint $table) {
+            $table->after('domain', function ($table) {
+                $table->longText('certificate')->nullable();
+                $table->longText('private')->nullable();
+            });
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('certificates', function (Blueprint $table) {
+            //
+        });
+    }
+}

package.json

@@ -2,34 +2,37 @@
     "private": true,
     "scripts": {
         "dev": "npm run development",
-        "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "watch": "npm run development -- --watch",
-        "watch-poll": "npm run watch -- --watch-poll",
-        "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --disable-host-check --config=node_modules/laravel-mix/setup/webpack.config.js",
-        "prod": "npm run production",
-        "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js"
+        "development": "mix",
+        "watch": "mix watch",
+        "watch-poll": "mix watch -- --watch-options-poll=1000",
+        "hot": "mix watch --hot",
+        "production": "mix --production"
     },
     "devDependencies": {
         "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-        "@inertiajs/inertia": "^0.4.3",
-        "@inertiajs/inertia-vue": "^0.3.2",
-        "@inertiajs/progress": "^0.1.2",
-        "@tailwindcss/ui": "^0.3.0",
-        "axios": "^0.19",
+        "@inertiajs/inertia": "^0.10.0",
+        "@inertiajs/inertia-vue": "^0.7.1",
+        "@inertiajs/progress": "^0.2.6",
+        "@tailwindcss/forms": "^0.3.2",
+        "@tailwindcss/typography": "^0.4.1",
+        "autoprefixer": "^10.2.5",
+        "axios": "^0.21.1",
         "balloon-css": "^1.2.0",
-        "cross-env": "^7.0",
-        "laravel-mix": "^5.0.1",
+        "cross-env": "^7.0.3",
+        "laravel-mix": "^6.0.25",
         "lodash": "^4.17.15",
         "portal-vue": "^2.1.7",
+        "postcss": "^8.2.13",
         "resolve-url-loader": "^3.1.0",
         "sass": "^1.15.2",
         "sass-loader": "^8.0.0",
-        "tailwindcss": "^1.9.6",
-        "v-click-outside": "^3.0.1",
+        "tailwindcss": "^2.2.4",
+        "v-click-outside": "^3.1.2",
         "vue": "^2.6.11",
         "vue-clipboard2": "^0.3.1",
+        "vue-loader": "^15.9.6",
         "vue-meta": "^2.4.0",
         "vue-template-compiler": "^2.6.11",
-        "vuex": "^3.5.1"
+        "vuex": "^3.6.2"
     }
 }

public/js/1355.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[1355],{1355:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>r});const i={data:function(){return{items:[{title:this.__("Categories"),to:this.route("admin.documentation.index"),active:this.route().current("admin.documentation.index")},{title:this.__("Create category"),to:this.route("admin.documentation.create"),active:this.route().current("admin.documentation.create")},{title:this.__("Articles"),to:this.route("admin.documentation.articles.index"),active:this.route().current("admin.documentation.articles.index")},{title:this.__("Create article"),to:this.route("admin.documentation.articles.create"),active:this.route().current("admin.documentation.articles.create")}]}}};const r=(0,n(1900).Z)(i,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return n("li",[n("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route)+"\n        ")])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,n)=>{"use strict";function i(t,e,n,i,r,s,o,a){var c,u="function"==typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=n,u._compiled=!0),i&&(u.functional=!0),s&&(u._scopeId="data-v-"+s),o?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),r&&r.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(o)},u._ssrRegister=c):r&&(c=a?function(){r.call(this,(u.functional?this.parent:this).$root.$options.shadowRoot)}:r),c)if(u.functional){u._injectStyles=c;var d=u.render;u.render=function(t,e){return c.call(e),d(t,e)}}else{var l=u.beforeCreate;u.beforeCreate=l?[].concat(l,c):[c]}return{exports:t,options:u}}n.d(e,{Z:()=>i})}}]);

public/js/1966.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[1966],{3852:(e,t,s)=>{"use strict";s.r(t),s.d(t,{default:()=>r});const i={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.services.index"),active:this.route().current("admin.services.index")},{title:this.__("Synchronize servers"),to:this.route("admin.services.servers.index"),active:this.route().current("admin.services.servers.index")},{title:this.__("Synchronize providers"),to:this.route("admin.services.providers.index"),active:this.route().current("admin.services.providers.index")}]}}};const r=(0,s(1900).Z)(i,(function(){var e=this,t=e.$createElement,s=e._self._c||t;return s("ul",{staticClass:"-ml-4 space-y-1"},e._l(e.items,(function(t){return s("li",[s("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":t.active},attrs:{href:t.to}},[e._v(e._s(t.title)+" "+e._s(t.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(e,t,s)=>{"use strict";function i(e,t,s,i,r,n,o,a){var c,d="function"==typeof e?e.options:e;if(t&&(d.render=t,d.staticRenderFns=s,d._compiled=!0),i&&(d.functional=!0),n&&(d._scopeId="data-v-"+n),o?(c=function(e){(e=e||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(e=__VUE_SSR_CONTEXT__),r&&r.call(this,e),e&&e._registeredComponents&&e._registeredComponents.add(o)},d._ssrRegister=c):r&&(c=a?function(){r.call(this,(d.functional?this.parent:this).$root.$options.shadowRoot)}:r),c)if(d.functional){d._injectStyles=c;var u=d.render;d.render=function(e,t){return c.call(t),u(e,t)}}else{var l=d.beforeCreate;d.beforeCreate=l?[].concat(l,c):[c]}return{exports:e,options:d}}s.d(t,{Z:()=>i})}}]);

public/js/2446.js

@@ -0,0 +1 @@
+(self.webpackChunk=self.webpackChunk||[]).push([[2446],{2446:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>i});const s={data:function(){return{items:[{title:this.__("Overview"),to:this.route("admin.packages.index"),active:this.route().current("admin.packages.index")},{title:this.__("Create"),to:this.route("admin.packages.create"),active:this.route().current("admin.packages.create")}]}}};const i=(0,n(1900).Z)(s,(function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("ul",{staticClass:"-ml-4 space-y-1"},t._l(t.items,(function(e){return n("li",[n("inertia-link",{staticClass:"flex items-center h-10 px-4 font-medium text-medium-emphasis",class:{"rounded shadow text-primary bg-surface-3":e.active},attrs:{href:e.to}},[t._v(t._s(e.title)+" "+t._s(e.route))])],1)})),0)}),[],!1,null,null,null).exports},1900:(t,e,n)=>{"use strict";function s(t,e,n,s,i,r,a,o){var c,u="function"==typeof t?t.options:t;if(e&&(u.render=e,u.staticRenderFns=n,u._compiled=!0),s&&(u.functional=!0),r&&(u._scopeId="data-v-"+r),a?(c=function(t){(t=t||this.$vnode&&this.$vnode.ssrContext||this.parent&&this.parent.$vnode&&this.parent.$vnode.ssrContext)||"undefined"==typeof __VUE_SSR_CONTEXT__||(t=__VUE_SSR_CONTEXT__),i&&i.call(this,t),t&&t._registeredComponents&&t._registeredComponents.add(a)},u._ssrRegister=c):i&&(c=o?function(){i.call(this,(u.functional?this.parent:this).$root.$options.shadowRoot)}:i),c)if(u.functional){u._injectStyles=c;var l=u.render;u.render=function(t,e){return c.call(e),l(t,e)}}else{var d=u.beforeCreate;u.beforeCreate=d?[].concat(d,c):[c]}return{exports:t,options:u}}n.d(e,{Z:()=>s})}}]);