This commit is contained in:
Dennis
2022-08-16 08:15:05 +02:00
parent cc29f729d3
commit 58c91fe7bc
166 changed files with 520 additions and 515 deletions

View File

@@ -2,12 +2,12 @@
namespace App\Actions\Server;
use App\DataTransferObjects\ServerData;
use App\Jobs\Servers\CreateServer;
use App\Mail\Admin\Server\AdminServerCreatedEmail;
use App\Models\Server;
use App\Models\User;
use App\Models\Server;
use App\Jobs\Servers\CreateServer;
use Illuminate\Support\Facades\Mail;
use App\DataTransferObjects\ServerData;
use App\Mail\Admin\Server\AdminServerCreatedEmail;
class CreateServerAction
{

View File

@@ -2,14 +2,14 @@
namespace App\Actions\Site;
use App\DataTransferObjects\SiteData;
use App\Jobs\Sites\CreateSite;
use App\Mail\Admin\Site\AdminSiteCreatedEmail;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use Illuminate\Database\Eloquent\Model;
use App\Models\Server;
use App\Jobs\Sites\CreateSite;
use Illuminate\Support\Facades\Mail;
use App\DataTransferObjects\SiteData;
use Illuminate\Database\Eloquent\Model;
use App\Mail\Admin\Site\AdminSiteCreatedEmail;
class CreateSiteAction
{
@@ -17,7 +17,7 @@ class CreateSiteAction
{
$server = $this->determineServer($siteData);
if ( ! $server ) {
if (! $server) {
return null;
}
@@ -39,7 +39,7 @@ class CreateSiteAction
protected function determineServer(SiteData $siteData): ?Server
{
if ( $siteData->server_id ) {
if ($siteData->server_id) {
return $siteData->getUser()->servers()->findOrFail($siteData->server_id);
}
@@ -63,7 +63,7 @@ class CreateSiteAction
protected function sendAdminSiteCreatedEmails(Server $server, Model|Site $site, User $user): void
{
if ( ! setting('receive_email_on_site_creation') ) {
if (! setting('receive_email_on_site_creation')) {
return;
}

View File

@@ -2,8 +2,8 @@
namespace App\Actions\Site;
use App\Models\Server;
use App\Models\Site;
use App\Models\Server;
use App\Services\Ploi\Ploi;
use Filament\Notifications\Notification;
@@ -32,7 +32,7 @@ class SynchronizeSiteAction
$certificates = Ploi::make()->server($siteData->server_id)->sites($siteData->id)->certificates()->get()->getData();
if ( $certificates ) {
if ($certificates) {
foreach ($certificates as $certificate) {
$site->certificates()->updateOrCreate([
'ploi_id' => $certificate->id,

View File

@@ -2,9 +2,9 @@
namespace App\Console;
use App\Console\Commands\Core\Trial;
use App\Jobs\Core\Ping;
use App\Console\Commands\Core\Css;
use App\Console\Commands\Core\Trial;
use App\Console\Commands\Core\Cleanup;
use App\Console\Commands\Core\Install;
use App\Console\Commands\Core\CssBackup;

View File

@@ -2,8 +2,8 @@
namespace App\DataTransferObjects;
use App\DataTransferObjects\Support\Data;
use Illuminate\Support\Carbon;
use App\DataTransferObjects\Support\Data;
class PackageData extends Data
{
@@ -21,5 +21,6 @@ class PackageData extends Data
public array $server_permissions,
public array $site_permissions,
public Carbon $created_at,
) {}
) {
}
}

View File

@@ -2,21 +2,21 @@
namespace App\DataTransferObjects;
use App\DataTransferObjects\Support\Concerns\BelongsToUser;
use App\DataTransferObjects\Support\Data;
use App\Models\User;
use App\Models\Server;
use App\Models\Provider;
use App\Models\ProviderPlan;
use App\Models\ProviderRegion;
use App\Models\Server;
use App\Models\User;
use Illuminate\Support\Carbon;
use Spatie\LaravelData\Attributes\Validation\AlphaDash;
use Spatie\LaravelData\Attributes\Validation\Exists;
use App\DataTransferObjects\Support\Data;
use Spatie\LaravelData\Attributes\Validation\In;
use Spatie\LaravelData\Attributes\Validation\IntegerType;
use Spatie\LaravelData\Attributes\Validation\Max;
use Spatie\LaravelData\Attributes\Validation\NotIn;
use Spatie\LaravelData\Attributes\Validation\Exists;
use Spatie\LaravelData\Attributes\Validation\AlphaDash;
use Spatie\LaravelData\Attributes\Validation\StringType;
use Spatie\LaravelData\Attributes\Validation\IntegerType;
use App\DataTransferObjects\Support\Concerns\BelongsToUser;
class ServerData extends Data
{
@@ -26,20 +26,28 @@ class ServerData extends Data
public ?int $id = null,
#[StringType]
public ?string $status = null,
#[StringType, AlphaDash, Max( 40 )]
#[StringType,
AlphaDash,
Max(40)]
public string $name,
#[NotIn( 0 ), Exists( Provider::class, 'id' )]
#[NotIn(0),
Exists(Provider::class, 'id')]
public int $provider_id,
#[NotIn( 0 ), Exists( ProviderRegion::class, 'id' )]
#[NotIn(0),
Exists(ProviderRegion::class, 'id')]
public int $provider_region_id,
#[NotIn( 0 ), Exists( ProviderPlan::class, 'id' )]
#[NotIn(0),
Exists(ProviderPlan::class, 'id')]
public int $provider_plan_id,
#[StringType, In( ['mysql', 'mariadb', 'postgresql', 'postgresql13'] )]
#[StringType,
In(['mysql', 'mariadb', 'postgresql', 'postgresql13'])]
public string $database_type,
#[Exists( User::class, 'id' ), IntegerType]
#[Exists(User::class, 'id'),
IntegerType]
public ?int $user_id = null,
public ?Carbon $created_at = null,
) {}
) {
}
public static function fromModel(Server $server): static
{

View File

@@ -2,19 +2,19 @@
namespace App\DataTransferObjects;
use App\DataTransferObjects\Support\Concerns\BelongsToUser;
use App\DataTransferObjects\Support\Data;
use App\DataTransferObjects\Support\Rules\CustomRule;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use App\Models\Server;
use App\Rules\Hostname;
use App\Rules\ValidateMaximumSites;
use Illuminate\Support\Arr;
use Illuminate\Support\Carbon;
use App\Rules\ValidateMaximumSites;
use App\DataTransferObjects\Support\Data;
use Spatie\LaravelData\Attributes\Validation\Exists;
use Spatie\LaravelData\Attributes\Validation\IntegerType;
use App\DataTransferObjects\Support\Rules\CustomRule;
use Spatie\LaravelData\Attributes\Validation\StringType;
use Spatie\LaravelData\Attributes\Validation\IntegerType;
use App\DataTransferObjects\Support\Concerns\BelongsToUser;
class SiteData extends Data
{
@@ -23,18 +23,22 @@ class SiteData extends Data
public function __construct(
public ?int $id = null,
public ?string $status = null,
#[Exists( Server::class, 'id' ), IntegerType]
#[Exists(Server::class, 'id'),
IntegerType]
public ?int $server_id = null,
#[StringType, CustomRule(Hostname::class, ValidateMaximumSites::class)]
#[StringType,
CustomRule(Hostname::class, ValidateMaximumSites::class)]
public ?string $domain = null,
#[Exists(User::class, 'id'), IntegerType]
#[Exists(User::class, 'id'),
IntegerType]
public ?int $user_id = null,
public ?Carbon $created_at = null,
) {}
) {
}
public static function authorize(): bool
{
if ( auth()->guest() ) {
if (auth()->guest()) {
return true;
}

View File

@@ -2,11 +2,11 @@
namespace App\DataTransferObjects\Support;
use Illuminate\Contracts\Pagination\Paginator;
use Illuminate\Pagination\AbstractCursorPaginator;
use Illuminate\Pagination\AbstractPaginator;
use Illuminate\Support\Enumerable;
use Spatie\LaravelData\DataCollection;
use Illuminate\Pagination\AbstractPaginator;
use Illuminate\Contracts\Pagination\Paginator;
use Illuminate\Pagination\AbstractCursorPaginator;
class Data extends \Spatie\LaravelData\Data
{

View File

@@ -5,7 +5,7 @@ namespace App\DataTransferObjects\Support\Rules;
use Attribute;
use Spatie\LaravelData\Attributes\Validation\ValidationAttribute;
#[Attribute( Attribute::TARGET_PROPERTY )]
#[Attribute(Attribute::TARGET_PROPERTY)]
class CustomRule extends ValidationAttribute
{
protected array $rules = [];

View File

@@ -2,30 +2,36 @@
namespace App\DataTransferObjects;
use App\DataTransferObjects\Support\Data;
use App\Models\Package;
use App\Models\User;
use App\Models\Package;
use Illuminate\Support\Carbon;
use App\DataTransferObjects\Support\Data;
use Spatie\LaravelData\Attributes\Validation\Max;
use Spatie\LaravelData\Attributes\Validation\Email;
use Spatie\LaravelData\Attributes\Validation\Exists;
use Spatie\LaravelData\Attributes\Validation\IntegerType;
use Spatie\LaravelData\Attributes\Validation\Max;
use Spatie\LaravelData\Attributes\Validation\StringType;
use Spatie\LaravelData\Attributes\Validation\Unique;
use Spatie\LaravelData\Attributes\Validation\StringType;
use Spatie\LaravelData\Attributes\Validation\IntegerType;
class UserData extends Data
{
public function __construct(
public ?int $id = null,
public ?string $avatar = null,
#[StringType, Max(255)]
#[StringType,
Max(255)]
public ?string $name = null,
#[StringType, Email, Max(255), Unique(User::class)]
#[StringType,
Email,
Max(255),
Unique(User::class)]
public ?string $email = null,
#[Exists( Package::class, 'id'), IntegerType]
#[Exists(Package::class, 'id'),
IntegerType]
public ?int $package_id = null,
#[StringType]
public ?string $blocked = null,
public ?Carbon $created_at = null,
) {}
) {
}
}

View File

@@ -3,17 +3,17 @@
namespace App\Filament\Pages;
use App\Models\Package;
use Filament\Forms\Components\Actions\Action;
use Filament\Forms\Components\FileUpload;
use Filament\Pages\Page;
use Illuminate\Support\Str;
use Illuminate\Support\HtmlString;
use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Notifications\Notification;
use Filament\Pages\Page;
use Illuminate\Support\Facades\Storage;
use Illuminate\Support\HtmlString;
use Illuminate\Support\Str;
use Filament\Forms\Components\TextInput;
use Filament\Notifications\Notification;
use Filament\Forms\Components\FileUpload;
use Filament\Forms\Components\Actions\Action;
class Settings extends Page
{
@@ -155,7 +155,7 @@ class Settings extends Page
$oldDocumentation = setting('documentation');
$oldSupport = setting('support');
if ( $state['logo'] === null && $oldLogo ) {
if ($state['logo'] === null && $oldLogo) {
Storage::disk('logos')->delete($oldLogo);
}
@@ -168,7 +168,7 @@ class Settings extends Page
->body(__('Settings saved.'))
->send();
if ( $state['logo'] !== $oldLogo || $state['documentation'] !== $oldDocumentation || $state['support'] !== $oldSupport ) {
if ($state['logo'] !== $oldLogo || $state['documentation'] !== $oldDocumentation || $state['support'] !== $oldSupport) {
$this->redirectRoute('filament.pages.settings');
}
}

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Pages;
use Filament\Pages\Page;
use App\Services\VersionChecker;
use Filament\Notifications\Notification;
use Filament\Pages\Page;
use Laravel\Horizon\Contracts\MasterSupervisorRepository;
class System extends Page

View File

@@ -2,12 +2,12 @@
namespace App\Filament\Pages;
use Filament\Forms\Components\MarkdownEditor;
use Filament\Forms\Components\Toggle;
use Filament\Notifications\Notification;
use Filament\Pages\Actions\Action;
use Filament\Pages\Page;
use Illuminate\Support\Str;
use Filament\Pages\Actions\Action;
use Filament\Forms\Components\Toggle;
use Filament\Notifications\Notification;
use Filament\Forms\Components\MarkdownEditor;
class Terms extends Page
{

View File

@@ -2,18 +2,18 @@
namespace App\Filament\Resources;
use App\Filament\Resources\AlertResource\Pages;
use App\Models\Alert;
use Illuminate\Support\Str;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use Illuminate\Support\HtmlString;
use Filament\Forms\Components\Select;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Columns\BadgeColumn;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\MarkdownEditor;
use Filament\Forms\Components\Select;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables\Columns\BadgeColumn;
use Filament\Tables\Columns\TextColumn;
use Illuminate\Support\HtmlString;
use Illuminate\Support\Str;
use App\Filament\Resources\AlertResource\Pages;
class AlertResource extends Resource
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\AlertResource\Pages;
use App\Filament\Resources\AlertResource;
use Filament\Pages\Actions\DeleteAction;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\AlertResource;
class EditAlert extends EditRecord
{

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\AlertResource\Pages;
use App\Filament\Resources\AlertResource;
use Filament\Pages\Actions\CreateAction;
use App\Filament\Resources\AlertResource;
use Filament\Resources\Pages\ListRecords;
class ListAlerts extends ListRecords

View File

@@ -2,15 +2,14 @@
namespace App\Filament\Resources;
use App\Filament\Resources\CertificateResource\Pages;
use App\Filament\Resources\CertificateResource\RelationManagers;
use App\Models\Certificate;
use Filament\Forms;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use App\Models\Certificate;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use Illuminate\Database\Eloquent\Builder;
use App\Filament\Resources\CertificateResource\Pages;
class CertificateResource extends Resource
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\CertificateResource\Pages;
use App\Filament\Resources\CertificateResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\CertificateResource;
class ListCertificates extends ListRecords
{

View File

@@ -2,13 +2,12 @@
namespace App\Filament\Resources;
use App\Filament\Resources\CronjobResource\Pages;
use App\Filament\Resources\CronjobResource\RelationManagers;
use Filament\Tables;
use App\Models\Cronjob;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Resource;
use App\Filament\Resources\CronjobResource\Pages;
class CronjobResource extends Resource
{

View File

@@ -2,9 +2,8 @@
namespace App\Filament\Resources\CronjobResource\Pages;
use App\Filament\Resources\CronjobResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\CreateRecord;
use App\Filament\Resources\CronjobResource;
class CreateCronjob extends CreateRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\CronjobResource\Pages;
use App\Filament\Resources\CronjobResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\CronjobResource;
class EditCronjob extends EditRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\CronjobResource\Pages;
use App\Filament\Resources\CronjobResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\CronjobResource;
class ListCronjobs extends ListRecords
{

View File

@@ -2,13 +2,12 @@
namespace App\Filament\Resources;
use App\Filament\Resources\DatabaseResource\Pages;
use App\Filament\Resources\DatabaseResource\RelationManagers;
use Filament\Tables;
use App\Models\Database;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Resource;
use App\Filament\Resources\DatabaseResource\Pages;
class DatabaseResource extends Resource
{

View File

@@ -2,14 +2,14 @@
namespace App\Filament\Resources\DatabaseResource\Pages;
use App\Filament\Resources\DatabaseResource;
use App\Mail\Database\PasswordReset;
use App\Models\Database;
use App\Services\Ploi\Ploi;
use Filament\Resources\Pages\Page;
use App\Mail\Database\PasswordReset;
use Illuminate\Support\Facades\Mail;
use Filament\Forms\Components\Toggle;
use Filament\Notifications\Notification;
use Filament\Resources\Pages\Page;
use Illuminate\Support\Facades\Mail;
use App\Filament\Resources\DatabaseResource;
class EditDatabase extends Page
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\DatabaseResource\Pages;
use App\Filament\Resources\DatabaseResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\DatabaseResource;
class ListDatabases extends ListRecords
{

View File

@@ -2,18 +2,17 @@
namespace App\Filament\Resources;
use Illuminate\Support\Str;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use Illuminate\Support\HtmlString;
use App\Models\DocumentationCategory;
use Filament\Tables\Columns\TextColumn;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\MarkdownEditor;
use App\Filament\Resources\DocumentationCategoryResource\Pages;
use App\Filament\Resources\DocumentationCategoryResource\RelationManagers\DocumentationItemsRelationManager;
use App\Filament\Resources\DocumentationCategoryResource\RelationManagers\ItemsRelationManager;
use App\Models\DocumentationCategory;
use Filament\Forms\Components\MarkdownEditor;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables\Columns\TextColumn;
use Illuminate\Support\HtmlString;
use Illuminate\Support\Str;
class DocumentationCategoryResource extends Resource
{

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\DocumentationCategoryResource\Pages;
use App\Filament\Resources\DocumentationCategoryResource;
use Filament\Resources\Pages\CreateRecord;
use App\Filament\Resources\DocumentationCategoryResource;
class CreateDocumentationCategory extends CreateRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\DocumentationCategoryResource\Pages;
use App\Filament\Resources\DocumentationCategoryResource;
use Filament\Pages\Actions\DeleteAction;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\DocumentationCategoryResource;
class EditDocumentationCategory extends EditRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\DocumentationCategoryResource\Pages;
use App\Filament\Resources\DocumentationCategoryResource;
use Filament\Pages\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\DocumentationCategoryResource;
class ListDocumentationCategories extends ListRecords
{

View File

@@ -3,10 +3,10 @@
namespace App\Filament\Resources\DocumentationCategoryResource\RelationManagers;
use Filament\Forms;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\RelationManagers\RelationManager;
class DocumentationItemsRelationManager extends RelationManager
{

View File

@@ -2,15 +2,15 @@
namespace App\Filament\Resources;
use App\Filament\Resources\DocumentationItemResource\Pages;
use App\Models\DocumentationItem;
use Filament\Forms\Components\MarkdownEditor;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use App\Models\DocumentationItem;
use Filament\Forms\Components\Select;
use Filament\Tables\Columns\TextColumn;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\MarkdownEditor;
use App\Filament\Resources\DocumentationItemResource\Pages;
class DocumentationItemResource extends Resource
{

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\DocumentationItemResource\Pages;
use App\Filament\Resources\DocumentationItemResource;
use Filament\Resources\Pages\CreateRecord;
use App\Filament\Resources\DocumentationItemResource;
class CreateDocumentationItem extends CreateRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\DocumentationItemResource\Pages;
use App\Filament\Resources\DocumentationItemResource;
use Filament\Pages\Actions\DeleteAction;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\DocumentationItemResource;
class EditDocumentationItem extends EditRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\DocumentationItemResource\Pages;
use App\Filament\Resources\DocumentationItemResource;
use Filament\Pages\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\DocumentationItemResource;
class ListDocumentationItems extends ListRecords
{

View File

@@ -2,18 +2,18 @@
namespace App\Filament\Resources;
use Filament\Tables;
use App\Models\Package;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\TextInput;
use App\Filament\Resources\PackageResource\Pages;
use App\Filament\Resources\PackageResource\RelationManagers;
use App\Models\Package;
use Filament\Forms\Components\Checkbox;
use Filament\Forms\Components\Grid;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
class PackageResource extends Resource
{
@@ -107,7 +107,7 @@ class PackageResource extends Resource
Tables\Columns\TextColumn::make('name')
->label(__('Name'))
->description(function (Package $record) {
if ( ! $record->stripe_plan_id ) {
if (! $record->stripe_plan_id) {
return __('Not attached to Stripe.');
}

View File

@@ -2,9 +2,8 @@
namespace App\Filament\Resources\PackageResource\Pages;
use App\Filament\Resources\PackageResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\CreateRecord;
use App\Filament\Resources\PackageResource;
class CreatePackage extends CreateRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\PackageResource\Pages;
use App\Filament\Resources\PackageResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\PackageResource;
class EditPackage extends EditRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\PackageResource\Pages;
use App\Filament\Resources\PackageResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\PackageResource;
class ListPackages extends ListRecords
{

View File

@@ -2,13 +2,13 @@
namespace App\Filament\Resources\PackageResource\RelationManagers;
use App\Filament\Resources\UserResource;
use App\Models\User;
use Filament\Forms\Components\Select;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use Filament\Tables\Actions\Action;
use Filament\Forms\Components\Select;
use App\Filament\Resources\UserResource;
use Filament\Resources\RelationManagers\RelationManager;
class UsersRelationManager extends RelationManager
{

View File

@@ -2,14 +2,13 @@
namespace App\Filament\Resources;
use App\Filament\Resources\ProviderPlanResource\Pages;
use App\Filament\Resources\ProviderPlanResource\RelationManagers;
use Filament\Tables;
use App\Models\Provider;
use App\Models\ProviderPlan;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Resource;
use App\Filament\Resources\ProviderPlanResource\Pages;
class ProviderPlanResource extends Resource
{

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\ProviderPlanResource\Pages;
use App\Filament\Resources\ProviderPlanResource;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\ProviderPlanResource;
class ListProviderPlans extends ListRecords
{

View File

@@ -2,14 +2,13 @@
namespace App\Filament\Resources;
use App\Filament\Resources\ProviderRegionResource\Pages;
use App\Filament\Resources\ProviderRegionResource\RelationManagers;
use App\Models\Provider;
use App\Models\ProviderRegion;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use App\Models\Provider;
use Filament\Resources\Form;
use Filament\Resources\Table;
use App\Models\ProviderRegion;
use Filament\Resources\Resource;
use App\Filament\Resources\ProviderRegionResource\Pages;
class ProviderRegionResource extends Resource
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\ProviderRegionResource\Pages;
use App\Filament\Resources\ProviderRegionResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\ProviderRegionResource;
class ListProviderRegions extends ListRecords
{

View File

@@ -2,19 +2,18 @@
namespace App\Filament\Resources;
use App\Actions\Provider\SynchronizeProviderAction;
use App\Filament\Resources\ProviderResource\Pages;
use App\Filament\Resources\ProviderResource\RelationManagers;
use App\Filament\Resources\ProviderResource\Widgets\AvailableProvidersOverview;
use Filament\Forms;
use Filament\Tables;
use App\Models\Provider;
use App\Models\ProviderPlan;
use Filament\Forms;
use Filament\Notifications\Notification;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Resource;
use Filament\Notifications\Notification;
use Illuminate\Database\Eloquent\Builder;
use App\Filament\Resources\ProviderResource\Pages;
use App\Actions\Provider\SynchronizeProviderAction;
use App\Filament\Resources\ProviderResource\Widgets\AvailableProvidersOverview;
class ProviderResource extends Resource
{

View File

@@ -2,9 +2,8 @@
namespace App\Filament\Resources\ProviderResource\Pages;
use App\Filament\Resources\ProviderResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\ProviderResource;
class EditProvider extends EditRecord
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\ProviderResource\Pages;
use App\Filament\Resources\ProviderResource;
use Filament\Pages\Actions\Action;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\ProviderResource;
class ListProviders extends ListRecords
{

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\ProviderResource\Pages;
use App\Filament\Resources\ProviderResource;
use Filament\Resources\Pages\Page;
use App\Filament\Resources\ProviderResource;
class SynchronizeProviders extends Page
{

View File

@@ -2,13 +2,13 @@
namespace App\Filament\Resources\ProviderResource\Widgets;
use App\Actions\Provider\SynchronizeProviderAction;
use App\Models\AvailableProvider;
use Filament\Notifications\Notification;
use Filament\Widgets\TableWidget;
use Filament\Tables\Actions\Action;
use Filament\Tables\Columns\TextColumn;
use Filament\Widgets\TableWidget;
use Filament\Notifications\Notification;
use Illuminate\Database\Eloquent\Builder;
use App\Actions\Provider\SynchronizeProviderAction;
use Illuminate\Database\Eloquent\Relations\Relation;
class AvailableProvidersOverview extends TableWidget

View File

@@ -2,14 +2,13 @@
namespace App\Filament\Resources;
use App\Filament\Resources\RedirectResource\Pages;
use App\Filament\Resources\RedirectResource\RelationManagers;
use App\Models\Redirect;
use Filament\Forms;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use App\Models\Redirect;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use App\Filament\Resources\RedirectResource\Pages;
class RedirectResource extends Resource
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\RedirectResource\Pages;
use App\Filament\Resources\RedirectResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\RedirectResource;
class ListRedirects extends ListRecords
{

View File

@@ -2,18 +2,18 @@
namespace App\Filament\Resources;
use Filament\Forms;
use App\Models\User;
use Filament\Tables;
use App\Models\Server;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use Illuminate\Support\HtmlString;
use Illuminate\Database\Eloquent\Builder;
use App\Actions\Server\SynchronizeServerAction;
use App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource\RelationManagers;
use App\Models\Server;
use App\Models\User;
use Filament\Forms;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\HtmlString;
class ServerResource extends Resource
{
@@ -29,6 +29,14 @@ class ServerResource extends Resource
{
return $form
->schema([
Forms\Components\TextInput::make('name')
->required()
->label(__('Name'))
->columnSpan(2),
Forms\Components\TextInput::make('ip')
->required()
->label('IP address')
->columnSpan(2),
Forms\Components\TextInput::make('maximum_sites')
->label(__('Maximum sites'))
->integer()
@@ -114,5 +122,4 @@ class ServerResource extends Resource
'synchronize' => Pages\SynchronizeServers::route('/synchronize'),
];
}
}

View File

@@ -3,7 +3,6 @@
namespace App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\CreateRecord;
class CreateServer extends CreateRecord

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\EditRecord;
use App\Filament\Resources\ServerResource;
class EditServer extends EditRecord
{

View File

@@ -2,12 +2,12 @@
namespace App\Filament\Resources\ServerResource\Pages;
use App\Filament\Resources\ServerResource;
use App\Models\Server;
use App\Services\Ploi\Ploi;
use Filament\Notifications\Notification;
use Filament\Pages\Actions\Action;
use Filament\Resources\Pages\Page;
use Filament\Notifications\Notification;
use App\Filament\Resources\ServerResource;
class SynchronizeServers extends Page
{
@@ -30,6 +30,9 @@ class SynchronizeServers extends Page
Action::make('synchronize_servers')
->label(__('Synchronize all servers'))
->icon('heroicon-o-refresh')
->requiresConfirmation()
->modalHeading('Synchronize servers')
->modalSubheading('This will synchronize all the servers that are listed in the table, to your Ploi Core installation.')
->action(function () {
$availableServers = Ploi::make()->synchronize()->servers()->getData();

View File

@@ -2,11 +2,11 @@
namespace App\Filament\Resources\ServerResource\RelationManagers;
use App\Filament\Resources\UserResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Form;
use Filament\Resources\Table;
use App\Filament\Resources\UserResource;
use Filament\Resources\RelationManagers\RelationManager;
class UsersRelationManager extends RelationManager
{

View File

@@ -2,12 +2,12 @@
namespace App\Filament\Resources\ServerResource\Widgets;
use App\Actions\Server\SynchronizeServerAction;
use App\Models\AvailableServer;
use Filament\Widgets\TableWidget;
use Filament\Tables\Actions\Action;
use Filament\Tables\Columns\TextColumn;
use Filament\Widgets\TableWidget;
use Illuminate\Database\Eloquent\Builder;
use App\Actions\Server\SynchronizeServerAction;
use Illuminate\Database\Eloquent\Relations\Relation;
class AvailableServersOverview extends TableWidget

View File

@@ -2,18 +2,17 @@
namespace App\Filament\Resources;
use Filament\Forms;
use App\Models\Site;
use App\Models\User;
use Filament\Tables;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use Illuminate\Support\HtmlString;
use App\Actions\Site\SynchronizeSiteAction;
use App\Filament\Resources\SiteResource\Pages;
use App\Filament\Resources\SiteResource\RelationManagers;
use App\Models\Site;
use App\Models\User;
use Filament\Forms;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Illuminate\Contracts\Database\Builder;
use Illuminate\Support\HtmlString;
class SiteResource extends Resource
{

View File

@@ -3,7 +3,6 @@
namespace App\Filament\Resources\SiteResource\Pages;
use App\Filament\Resources\SiteResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\CreateRecord;
class CreateSite extends CreateRecord

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\SiteResource\Pages;
use App\Filament\Resources\SiteResource;
use Filament\Pages\Actions;
use App\Filament\Resources\SiteResource;
use Filament\Resources\Pages\EditRecord;
class EditSite extends EditRecord

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\SiteResource\Pages;
use App\Filament\Resources\SiteResource;
use App\Traits\HasPloi;
use Filament\Pages\Actions\Action;
use App\Filament\Resources\SiteResource;
use Filament\Resources\Pages\ListRecords;
use Illuminate\Database\Eloquent\Builder;
@@ -32,8 +32,8 @@ class ListSites extends ListRecords
if (filled($searchTerm = $this->getTableSearchQuery())) {
$query
->where('domain', 'LIKE', "%{$searchTerm}%")
->orWhereHas('users', fn(Builder $query) => $query->where('name', 'LIKE', "%{$searchTerm}%"))
->orWhereHas('users', fn(Builder $query) => $query->where('email', 'LIKE', "%{$searchTerm}%"));
->orWhereHas('users', fn (Builder $query) => $query->where('name', 'LIKE', "%{$searchTerm}%"))
->orWhereHas('users', fn (Builder $query) => $query->where('email', 'LIKE', "%{$searchTerm}%"));
}
return $query;

View File

@@ -2,13 +2,13 @@
namespace App\Filament\Resources\SiteResource\Pages;
use App\Filament\Resources\SiteResource;
use App\Models\Server;
use App\Models\Site;
use App\Models\Server;
use App\Services\Ploi\Ploi;
use Filament\Notifications\Notification;
use Filament\Pages\Actions\Action;
use Filament\Resources\Pages\Page;
use App\Filament\Resources\SiteResource;
use Filament\Notifications\Notification;
class SynchronizeSites extends Page
{
@@ -29,6 +29,9 @@ class SynchronizeSites extends Page
Action::make('synchronize_sites')
->label(__('Synchronize all sites'))
->icon('heroicon-o-refresh')
->requiresConfirmation()
->modalHeading('Synchronize sites')
->modalSubheading('This will synchronize all the sites that are listed in the table, to your Ploi Core installation.')
->action(function () {
$availableSites = Ploi::make()->synchronize()->sites()->getData();

View File

@@ -2,10 +2,10 @@
namespace App\Filament\Resources\SiteResource\RelationManagers;
use App\Filament\Resources\CertificateResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\CertificateResource;
use Filament\Resources\RelationManagers\RelationManager;
class CertificatesRelationManager extends RelationManager
{

View File

@@ -2,10 +2,10 @@
namespace App\Filament\Resources\SiteResource\RelationManagers;
use App\Filament\Resources\CronjobResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\CronjobResource;
use Filament\Resources\RelationManagers\RelationManager;
class CronjobsRelationManager extends RelationManager
{

View File

@@ -2,10 +2,10 @@
namespace App\Filament\Resources\SiteResource\RelationManagers;
use App\Filament\Resources\DatabaseResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\DatabaseResource;
use Filament\Resources\RelationManagers\RelationManager;
class DatabasesRelationManager extends RelationManager
{

View File

@@ -2,10 +2,10 @@
namespace App\Filament\Resources\SiteResource\RelationManagers;
use App\Filament\Resources\RedirectResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\RedirectResource;
use Filament\Resources\RelationManagers\RelationManager;
class RedirectsRelationManager extends RelationManager
{

View File

@@ -2,10 +2,10 @@
namespace App\Filament\Resources\SiteResource\RelationManagers;
use App\Filament\Resources\SiteSystemUserResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\SiteSystemUserResource;
use Filament\Resources\RelationManagers\RelationManager;
class SystemUsersRelationManager extends RelationManager
{

View File

@@ -2,12 +2,12 @@
namespace App\Filament\Resources\SiteResource\RelationManagers;
use App\Filament\Resources\UserResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\UserResource;
use Filament\Tables\Actions\AttachAction;
use Filament\Tables\Actions\DetachAction;
use Filament\Resources\RelationManagers\RelationManager;
class UsersRelationManager extends RelationManager
{

View File

@@ -2,12 +2,12 @@
namespace App\Filament\Resources\SiteResource\Widgets;
use App\Actions\Site\SynchronizeSiteAction;
use App\Models\AvailableSite;
use Filament\Widgets\TableWidget;
use Filament\Tables\Actions\Action;
use Filament\Tables\Columns\TextColumn;
use Filament\Widgets\TableWidget;
use Illuminate\Database\Eloquent\Builder;
use App\Actions\Site\SynchronizeSiteAction;
use Illuminate\Database\Eloquent\Relations\Relation;
class AvailableSitesOverview extends TableWidget

View File

@@ -2,13 +2,12 @@
namespace App\Filament\Resources;
use App\Filament\Resources\SiteSystemUserResource\Pages;
use App\Filament\Resources\SiteSystemUserResource\RelationManagers;
use App\Models\SiteSystemUser;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use Filament\Resources\Form;
use Filament\Resources\Table;
use App\Models\SiteSystemUser;
use Filament\Resources\Resource;
use App\Filament\Resources\SiteSystemUserResource\Pages;
class SiteSystemUserResource extends Resource
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\SiteSystemUserResource\Pages;
use App\Filament\Resources\SiteSystemUserResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\SiteSystemUserResource;
class ListSiteSystemUsers extends ListRecords
{

View File

@@ -2,15 +2,15 @@
namespace App\Filament\Resources;
use App\Filament\Resources\SupportTicketResource\Pages;
use App\Models\SupportTicket;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use App\Models\SupportTicket;
use Filament\Resources\Table;
use Filament\Tables\Columns\BadgeColumn;
use Filament\Resources\Resource;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\MultiSelectFilter;
use Filament\Tables\Columns\BadgeColumn;
use Illuminate\Database\Eloquent\Builder;
use Filament\Tables\Filters\MultiSelectFilter;
use App\Filament\Resources\SupportTicketResource\Pages;
class SupportTicketResource extends Resource
{

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\SupportTicketResource\Pages;
use App\Filament\Resources\SupportTicketResource;
use Filament\Pages\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;
use App\Filament\Resources\SupportTicketResource;
class ListSupportTickets extends ListRecords
{

View File

@@ -2,15 +2,15 @@
namespace App\Filament\Resources\SupportTicketResource\Pages;
use App\Filament\Resources\SupportTicketResource;
use App\Mail\Support\TicketRepliedToEmail;
use App\Models\SupportTicket;
use Filament\Forms\Components\MarkdownEditor;
use Filament\Notifications\Notification;
use Filament\Pages\Actions\Action;
use Filament\Resources\Pages\Page;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Mail;
use Filament\Notifications\Notification;
use App\Mail\Support\TicketRepliedToEmail;
use Filament\Forms\Components\MarkdownEditor;
use App\Filament\Resources\SupportTicketResource;
class ViewSupportTicket extends Page
{
@@ -108,5 +108,7 @@ class ViewSupportTicket extends Page
->send();
}
public function close(): void {}
public function close(): void
{
}
}

View File

@@ -2,15 +2,15 @@
namespace App\Filament\Resources;
use Filament\Forms;
use App\Models\User;
use Filament\Tables;
use Filament\Resources\Form;
use Filament\Resources\Table;
use Filament\Resources\Resource;
use STS\FilamentImpersonate\Impersonate;
use App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource\RelationManagers;
use App\Models\User;
use Filament\Forms;
use Filament\Resources\Form;
use Filament\Resources\Resource;
use Filament\Resources\Table;
use Filament\Tables;
use STS\FilamentImpersonate\Impersonate;
class UserResource extends Resource
{

View File

@@ -3,7 +3,6 @@
namespace App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource;
use Filament\Pages\Actions;
use Filament\Resources\Pages\CreateRecord;
class CreateUser extends CreateRecord

View File

@@ -2,9 +2,9 @@
namespace App\Filament\Resources\UserResource\Pages;
use Filament\Pages\Actions;
use App\Filament\Resources\UserResource;
use Filament\Notifications\Notification;
use Filament\Pages\Actions;
use Filament\Resources\Pages\EditRecord;
class EditUser extends EditRecord

View File

@@ -2,8 +2,8 @@
namespace App\Filament\Resources\UserResource\Pages;
use App\Filament\Resources\UserResource;
use Filament\Pages\Actions;
use App\Filament\Resources\UserResource;
use Filament\Resources\Pages\ListRecords;
class ListUsers extends ListRecords

View File

@@ -2,12 +2,12 @@
namespace App\Filament\Resources\UserResource\RelationManagers;
use App\Filament\Resources\ServerResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use Illuminate\Database\Eloquent\Builder;
use App\Filament\Resources\ServerResource;
use Illuminate\Database\Eloquent\Relations\Relation;
use Filament\Resources\RelationManagers\RelationManager;
class ServersRelationManager extends RelationManager
{

View File

@@ -2,10 +2,10 @@
namespace App\Filament\Resources\UserResource\RelationManagers;
use App\Filament\Resources\SiteResource;
use Filament\Resources\Form;
use Filament\Resources\RelationManagers\RelationManager;
use Filament\Resources\Table;
use App\Filament\Resources\SiteResource;
use Filament\Resources\RelationManagers\RelationManager;
class SitesRelationManager extends RelationManager
{

View File

@@ -2,11 +2,11 @@
namespace App\Filament\Widgets;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use Filament\Widgets\StatsOverviewWidget as BaseWidget;
use App\Models\Server;
use Filament\Widgets\StatsOverviewWidget\Card;
use Filament\Widgets\StatsOverviewWidget as BaseWidget;
class StatsOverview extends BaseWidget
{

View File

@@ -4,8 +4,8 @@ namespace App\Filament\Widgets;
use App\Models\SystemLog;
use Filament\Tables\Columns\TextColumn;
use Filament\Widgets\TableWidget as BaseWidget;
use Illuminate\Database\Eloquent\Builder;
use Filament\Widgets\TableWidget as BaseWidget;
class SystemLogs extends BaseWidget
{

View File

@@ -1,10 +1,10 @@
<?php
use App\Models\Setting;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Support\Arr;
use Illuminate\Contracts\Foundation\Application;
if ( ! function_exists('setting') ) {
if (! function_exists('setting')) {
/**
* @param null $key
* @param null $default
@@ -12,13 +12,13 @@ if ( ! function_exists('setting') ) {
*/
function setting($key = null, $default = null)
{
if ( is_array($settings = $key) ) {
if (is_array($settings = $key)) {
foreach ($settings as $key => $value) {
if ( $value === true ) {
if ($value === true) {
$value = '1';
}
if ( $value === false ) {
if ($value === false) {
$value = '0';
}
@@ -41,7 +41,7 @@ if ( ! function_exists('setting') ) {
$value = Arr::get(app('settings'), $key, $default);
// Boolean casting
if ( $value === "0" || $value === "1" && $key !== 'trial_package' ) {
if ($value === "0" || $value === "1" && $key !== 'trial_package') {
return (bool) $value;
}

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Api;
use App\DataTransferObjects\PackageData;
use App\Http\Controllers\Controller;
use App\Models\Package;
use App\Http\Controllers\Controller;
use App\DataTransferObjects\PackageData;
class PackageController extends Controller
{

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Api;
use App\Actions\Server\CreateServerAction;
use App\DataTransferObjects\ServerData;
use App\Http\Controllers\Controller;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use App\Http\Controllers\Controller;
use App\DataTransferObjects\ServerData;
use App\Actions\Server\CreateServerAction;
class ServerController extends Controller
{

View File

@@ -2,13 +2,13 @@
namespace App\Http\Controllers\Api;
use App\Actions\Site\CreateSiteAction;
use App\DataTransferObjects\SiteData;
use App\Http\Controllers\Controller;
use App\Models\Site;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse;
use App\Http\Controllers\Controller;
use App\DataTransferObjects\SiteData;
use App\Actions\Site\CreateSiteAction;
class SiteController extends Controller
{

View File

@@ -2,12 +2,12 @@
namespace App\Http\Controllers\Api;
use App\DataTransferObjects\UserData;
use App\Http\Controllers\Controller;
use App\Models\User;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Arr;
use App\Http\Controllers\Controller;
use App\DataTransferObjects\UserData;
class UserController extends Controller
{

View File

@@ -2,10 +2,10 @@
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use App\Providers\RouteServiceProvider;
class AuthenticateTwoFactorController extends Controller
{

View File

@@ -2,14 +2,14 @@
namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use App\Models\Package;
use App\Models\User;
use Carbon\Carbon;
use Exception;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Http\Request;
use Carbon\Carbon;
use App\Models\User;
use App\Models\Package;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Database\Eloquent\Builder;
use Stripe\Exception\InvalidRequestException;
class ProfileBillingController extends Controller
@@ -32,22 +32,22 @@ class ProfileBillingController extends Controller
->whereNotNull('stripe_plan_id');
})
->when($request->input('sortBy.' . $sortByType), function ($query, $value) use ($sortByType) {
if ( $sortByType === 'price' ) {
if ($sortByType === 'price') {
return $value === 'asc'
? $query->orderBy('price_monthly', 'asc')
: $query->orderBy('price_monthly', 'desc');
}
if ( $sortByType === 'servers' ) {
if ($sortByType === 'servers') {
return $value === 'asc'
? $query->orderBy('maximum_servers', 'asc')
: $query->orderBy('maximum_servers', 'desc');
}
if ( $sortByType === 'sites' ) {
if ($sortByType === 'sites') {
return $value === 'asc'
? $query->orderBy('maximum_sites', 'asc')
: $query->orderBy('maximum_sites', 'desc');
}
if ( $sortByType === 'name' ) {
if ($sortByType === 'name') {
return $value === 'asc'
? $query->orderBy('name', 'asc')
: $query->orderBy('name', 'desc');
@@ -63,12 +63,12 @@ class ProfileBillingController extends Controller
$package->period = 'monthly';
if ( $package->price_yearly > 0 ) {
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, ',', '.');
$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;
});
@@ -142,7 +142,7 @@ class ProfileBillingController extends Controller
/** @var User $user */
$user = auth()->user();
if ( ! $user->hasStripeId() || ! $user->defaultPaymentMethod() ) {
if (! $user->hasStripeId() || ! $user->defaultPaymentMethod()) {
return redirect()->route('profile.billing.index')->with('error', 'You cannot change your plan without a valid creditcard, please update your billing details first');
}
@@ -151,16 +151,16 @@ class ProfileBillingController extends Controller
$planId = $plan->stripe_plan_id;
// Only do something if the user is not already subscribed to this plan.
if ( $user->subscribedToPlan($planId, 'default') ) {
if ($user->subscribedToPlan($planId, 'default')) {
return redirect()->route('profile.billing.index')->with('error', 'You did not select a different plan');
}
// If the user is already subscribed to the default plan, we have to swap it. Otherwise create a new one.
try {
if ( $user->subscribed('default') ) {
if ($user->subscribed('default')) {
$user->subscription('default')->swap($planId);
} else {
if ( $coupon = $request->input('coupon') ) {
if ($coupon = $request->input('coupon')) {
$user->newSubscription('default', $planId)
->withCoupon($coupon)
->create($user->defaultPaymentMethod()->id);

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers\Profile;
use App\Models\User;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use App\Http\Requests\UserProfileRequest;
use App\Http\Resources\UserProfileResource;
use App\Models\User;
use Illuminate\Http\Request;
class ProfileController extends Controller
{

View File

@@ -2,10 +2,10 @@
namespace App\Http\Controllers\Profile;
use App\Http\Controllers\Controller;
use App\Rules\MatchOldPassword;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use App\Rules\MatchOldPassword;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
class ProfileSecurityController extends Controller
{

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Profile\TwoFactorAuthentication;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
class ConfirmTwoFactorAuthenticationController extends Controller
{

View File

@@ -2,9 +2,9 @@
namespace App\Http\Controllers\Profile\TwoFactorAuthentication;
use Illuminate\Http\Request;
use App\Http\Controllers\Controller;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
class RegenerateRecoveryCodesController extends Controller
{

View File

@@ -2,15 +2,15 @@
namespace App\Http\Controllers;
use App\Actions\Server\CreateServerAction;
use App\DataTransferObjects\ServerData;
use App\Http\Requests\ServerUpdateRequest;
use App\Http\Resources\ServerResource;
use App\Jobs\Servers\DeleteServer;
use App\Models\Server;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use App\Jobs\Servers\DeleteServer;
use Illuminate\Support\Facades\Auth;
use Illuminate\Http\RedirectResponse;
use App\Http\Resources\ServerResource;
use App\DataTransferObjects\ServerData;
use App\Actions\Server\CreateServerAction;
use App\Http\Requests\ServerUpdateRequest;
class ServerController extends Controller
{

View File

@@ -2,10 +2,9 @@
namespace App\Http\Controllers;
use App\Http\Requests\SiteAliasRequest;
use App\Http\Resources\SiteAliasResource;
use App\Jobs\Aliases\CreateAlias;
use App\Jobs\Aliases\DeleteAlias;
use App\Http\Requests\SiteAliasRequest;
class SiteAliasController extends Controller
{

View File

@@ -2,18 +2,13 @@
namespace App\Http\Controllers;
use App\Models\Site;
use App\Models\Server;
use Illuminate\Support\Arr;
use Illuminate\Http\Request;
use App\Jobs\Sites\DeleteSite;
use App\Http\Resources\SiteResource;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\SiteRequest;
use App\Jobs\Sites\CreateSite;
use App\Mail\Admin\Site\AdminSiteCreatedEmail;
use App\Models\Server;
use App\Models\Site;
use App\Models\User;
use Illuminate\Http\JsonResponse;
use App\Http\Resources\SiteResource;
use Illuminate\Support\Facades\Hash;
use App\DataTransferObjects\SiteData;
use Illuminate\Http\RedirectResponse;

View File

@@ -2,11 +2,11 @@
namespace App\Http\Controllers;
use App\Http\Requests\SiteDatabaseRequest;
use App\Http\Resources\SiteDatabaseResource;
use Illuminate\Support\Str;
use App\Jobs\Databases\CreateDatabase;
use App\Jobs\Databases\DeleteDatabase;
use Illuminate\Support\Str;
use App\Http\Requests\SiteDatabaseRequest;
use App\Http\Resources\SiteDatabaseResource;
class SiteDatabaseController extends Controller
{

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 App\Http\Requests\SiteDnsRequest;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Arr;
class SiteDnsController extends Controller
{

View File

@@ -5,7 +5,6 @@ namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Laragear\TwoFactor\Facades\Auth2FA;
class EnforceTwoFactorAuthenticationIfEnabled
{

View File

@@ -3,13 +3,13 @@
namespace App\Http\Middleware;
use App\Models\Alert;
use Inertia\Middleware;
use Illuminate\Support\Arr;
use App\Models\UserProvider;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
use Illuminate\Support\Facades\Storage;
use Inertia\Middleware;
class HandleInertiaRequests extends Middleware
{
@@ -123,7 +123,7 @@ class HandleInertiaRequests extends Middleware
})
->first(['message', 'expires_at', 'type']);
if ( ! $alert ) {
if (! $alert) {
return null;
}

View File

@@ -2,8 +2,8 @@
namespace App\Http\Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
class TrustProxies extends Middleware
{

Some files were not shown because too many files have changed in this diff Show More