davidl/ploi-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Dennis
2021-05-13 20:37:09 +02:00
parent ac3cf16377 1a6b14a250
commit 0eb66c10f6
32 changed files with 182081 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.php_cs → .php-cs-fixer.php
View File

@@ -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);

2
app/Console/Commands/Core/Css.php
View File

@@ -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;

2
app/Console/Commands/Core/CssBackup.php
View File

@@ -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;

2
app/Console/Commands/Core/Install.php
View File

@@ -4,7 +4,6 @@ namespace App\Console\Commands\Core;
use Exception;
use App\Models\User;
use Illuminate\Support\Facades\Artisan;
use RuntimeException;
use App\Models\Package;
use App\Services\Ploi\Ploi;
@@ -13,6 +12,7 @@ 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
{

4
app/Console/Kernel.php
View File

@@ -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;

3
app/Http/Controllers/Admin/AlertController.php
View File

@@ -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
{

6
app/Http/Controllers/Admin/SettingController.php
View File

@@ -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
{

4
app/Http/Controllers/DocumentationController.php
View File

@@ -2,10 +2,10 @@
namespace App\Http\Controllers;
use Illuminate\Support\Str;
use App\Models\DocumentationItem;
use App\Models\DocumentationCategory;
use App\Http\Resources\DocumentationCategoryRouteResource;
use App\Models\DocumentationItem;
use Illuminate\Support\Str;
class DocumentationController extends Controller
{

1
app/Http/Controllers/Profile/ProfileBillingController.php
View File

@@ -60,6 +60,7 @@ class ProfileBillingController extends Controller
Package::CURRENCY_CAD => 'CAD $',
Package::CURRENCY_AUD => 'AUD $',
Package::CURRENCY_GBP => 'GBP £',
Package::CURRENCY_INR => 'INR ',
];
$package->price_monthly = ($currencies[$package->currency] ?? '[Unknown currency]') . number_format($package->price_monthly, 2, ',', '.');

7
app/Http/Controllers/Profile/ProfileIntegrationController.php
View File

@@ -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' => [

4
app/Http/Controllers/SiteDnsController.php
View File

@@ -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
{

2
app/Http/Middleware/HandleInertiaRequests.php
View File

@@ -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;

2
app/Http/Requests/Admin/AlertRequest.php
View File

@@ -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
{

1
app/Http/Requests/Admin/PackageRequest.php
View File

@@ -40,6 +40,7 @@ class PackageRequest extends FormRequest
Package::CURRENCY_AUD,
Package::CURRENCY_CAD,
Package::CURRENCY_GBP,
Package::CURRENCY_INR,
])
],
'maximum_sites' => [

2
app/Http/Requests/ProfileIntegrationRequest.php
View File

@@ -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
{

2
app/Jobs/Core/Ping.php
View File

@@ -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;

1
app/Models/Package.php
View File

@@ -13,6 +13,7 @@ class Package extends Model
const CURRENCY_AUD = 'aud';
const CURRENCY_CAD = 'cad';
const CURRENCY_GBP = 'gbp';
const CURRENCY_INR = 'inr';
public $fillable = [
'name',

4
app/Models/Provider.php
View File

@@ -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;

2
app/Services/Cloudflare.php
View File

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

1
app/Services/VersionChecker.php
View File

@@ -41,7 +41,6 @@ class VersionChecker
cache()->forget('ploi-core-current-version');
cache()->forget('ploi-core-remote-version');
} catch (\Exception $exception) {
}
}
}

4
database/migrations/2020_11_17_102907_create_alerts_table.php
View File

@@ -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
{

4
database/migrations/2020_11_19_095907_add_meta_to_user_providers_table.php
View File

@@ -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
{

4
database/migrations/2021_05_11_083348_add_zip_to_users_table.php
View File

@@ -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 AddZipToUsersTable extends Migration
{

160519
public/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

21522
public/js/app.js vendored
View File

File diff suppressed because one or more lines are too long

1
resources/js/Pages/Admin/Packages/Create.vue
View File

@@ -35,6 +35,7 @@
<option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
<option value="aud">{{ __('AUD (Australian dollar)') }}</option>
<option value="cad">{{ __('CAD (Canadian dollar)') }}</option>
<option value="inr">{{ __('INR (Indian rupee)') }}</option>
</FormSelect>
<div class="space-y-4">

1
resources/js/Pages/Admin/Packages/Edit.vue
View File

@@ -37,6 +37,7 @@
<option value="nok">{{ __('NOK (Norwegian Krone)') }}</option>
<option value="aud">{{ __('AUD (Australian dollar)') }}</option>
<option value="cad">{{ __('CAD (Canadian dollar)') }}</option>
<option value="inr">{{ __('INR (Indian rupee)') }}</option>
</FormSelect>
<div class="space-y-4">

2
resources/js/Pages/Profile/Billing.vue
View File

@@ -22,7 +22,7 @@
:errors="$page.props.errors.address"
:disabled="sending"
:label="__('Address')"/>
<form-select :label="__('Country')" :errors="$page.props.errors.country" v-model="country">
<form-select :disabled="sending" :label="__('Country')" :errors="$page.props.errors.country" v-model="country">
<option :value="code" v-for="(country, code) in countries" v-text="country"></option>
</form-select>
<form-input v-model="zip"

3
tests/Browser/DashboardTest.php
View File

@@ -3,9 +3,8 @@
namespace Tests\Browser;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Laravel\Dusk\Browser;
use Tests\DuskTestCase;
use Laravel\Dusk\Browser;
class DashboardTest extends DuskTestCase
{

3
tests/Browser/LoginTest.php
View File

@@ -3,9 +3,8 @@
namespace Tests\Browser;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Laravel\Dusk\Browser;
use Tests\DuskTestCase;
use Laravel\Dusk\Browser;
class LoginTest extends DuskTestCase
{

3
tests/Browser/ProfileChangeTest.php
View File

@@ -3,9 +3,8 @@
namespace Tests\Browser;
use App\Models\User;
use Illuminate\Foundation\Testing\DatabaseMigrations;
use Laravel\Dusk\Browser;
use Tests\DuskTestCase;
use Laravel\Dusk\Browser;
class ProfileChangeTest extends DuskTestCase
{

9
tests/DuskTestCase.php
View File

@@ -2,10 +2,10 @@
namespace Tests;
use Facebook\WebDriver\Chrome\ChromeOptions;
use Facebook\WebDriver\Remote\DesiredCapabilities;
use Facebook\WebDriver\Remote\RemoteWebDriver;
use Laravel\Dusk\TestCase as BaseTestCase;
use Facebook\WebDriver\Chrome\ChromeOptions;
use Facebook\WebDriver\Remote\RemoteWebDriver;
use Facebook\WebDriver\Remote\DesiredCapabilities;
abstract class DuskTestCase extends BaseTestCase
{
@@ -43,7 +43,8 @@ abstract class DuskTestCase extends BaseTestCase
return RemoteWebDriver::create(
$_ENV['DUSK_DRIVER_URL'] ?? 'http://localhost:9515',
DesiredCapabilities::chrome()->setCapability(
ChromeOptions::CAPABILITY, $options
ChromeOptions::CAPABILITY,
$options
)
);
}