add blank php site (#94)

* add blank php site * fix frontend * fix source control check
vitodeploy · Jan 18, 2024 · 8665435 · 8665435
1 parent 0ec6a9d
commit 8665435
Show file tree

Hide file tree

Showing 16 changed files with 223 additions and 70 deletions.
diff --git a/app/Enums/SiteType.php b/app/Enums/SiteType.php
@@ -8,6 +8,8 @@ final class SiteType extends Enum
 {
     const PHP = 'php';
 
+    const PHP_BLANK = 'php-blank';
+
     const LARAVEL = 'laravel';
 
     const WORDPRESS = 'wordpress';

diff --git a/app/Http/Livewire/Application/PhpBlankApp.php b/app/Http/Livewire/Application/PhpBlankApp.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Livewire\Application;
+
+use App\Models\Site;
+use App\Traits\RefreshComponentOnBroadcast;
+use Livewire\Component;
+
+class PhpBlankApp extends Component
+{
+    use RefreshComponentOnBroadcast;
+
+    public Site $site;
+
+    public function render()
+    {
+        return view('livewire.application.php-blank-app');
+    }
+}
diff --git a/app/SiteTypes/PHPBlank.php b/app/SiteTypes/PHPBlank.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace App\SiteTypes;
+
+use App\Enums\SiteFeature;
+use App\Jobs\Site\CreateVHost;
+use Illuminate\Support\Facades\Bus;
+use Illuminate\Validation\Rule;
+use Throwable;
+
+class PHPBlank extends PHPSite
+{
+    public function supportedFeatures(): array
+    {
+        return [
+            SiteFeature::DEPLOYMENT,
+            SiteFeature::ENV,
+            SiteFeature::SSL,
+            SiteFeature::QUEUES,
+        ];
+    }
+
+    public function createValidationRules(array $input): array
+    {
+        return [
+            'php_version' => [
+                'required',
+                Rule::in($this->site->server->installedPHPVersions()),
+            ],
+        ];
+    }
+
+    public function createFields(array $input): array
+    {
+        return [
+            'web_directory' => $input['web_directory'] ?? '',
+            'php_version' => $input['php_version'] ?? '',
+        ];
+    }
+
+    public function data(array $input): array
+    {
+        return [];
+    }
+
+    public function install(): void
+    {
+        $chain = [
+            new CreateVHost($this->site),
+            $this->progress(65),
+            function () {
+                $this->site->php()?->restart();
+            },
+        ];
+
+        $chain[] = function () {
+            $this->site->installationFinished();
+        };
+
+        Bus::chain($chain)
+            ->catch(function (Throwable $e) {
+                $this->site->installationFailed($e);
+            })
+            ->onConnection('ssh-long')
+            ->dispatch();
+    }
+}
diff --git a/config/core.php b/config/core.php
@@ -25,6 +25,7 @@
 use App\ServiceHandlers\ProcessManager\Supervisor;
 use App\ServiceHandlers\Webserver\Nginx;
 use App\SiteTypes\Laravel;
+use App\SiteTypes\PHPBlank;
 use App\SiteTypes\PHPSite;
 use App\SiteTypes\Wordpress;
 use App\SourceControlProviders\Bitbucket;
@@ -263,11 +264,13 @@
      */
     'site_types' => [
         \App\Enums\SiteType::PHP,
+        \App\Enums\SiteType::PHP_BLANK,
         \App\Enums\SiteType::LARAVEL,
         \App\Enums\SiteType::WORDPRESS,
     ],
     'site_types_class' => [
         \App\Enums\SiteType::PHP => PHPSite::class,
+        \App\Enums\SiteType::PHP_BLANK => PHPBlank::class,
         \App\Enums\SiteType::LARAVEL => Laravel::class,
         \App\Enums\SiteType::WORDPRESS => Wordpress::class,
     ],

diff --git a/public/build/assets/app-8b808e33.css b/public/build/assets/app-8b808e33.css
diff --git a/public/build/assets/app-ae945733.css b/public/build/assets/app-ae945733.css
diff --git a/public/build/manifest.json b/public/build/manifest.json
@@ -1,6 +1,6 @@
 {
   "resources/css/app.css": {
-    "file": "assets/app-8b808e33.css",
+    "file": "assets/app-ae945733.css",
     "isEntry": true,
     "src": "resources/css/app.css"
   },

diff --git a/public/static/images/php-blank.svg b/public/static/images/php-blank.svg
diff --git a/resources/views/livewire/application/laravel-app.blade.php b/resources/views/livewire/application/laravel-app.blade.php
@@ -1,36 +1 @@
-<div>
-    <x-card-header>
-        <x-slot name="title">{{ __("Application") }}</x-slot>
-        <x-slot name="description">{{ __("Here you can manage your application") }}</x-slot>
-        <x-slot name="aside">
-            <div class="flex items-center">
-                <div class="mr-2">
-                    <livewire:application.deploy :site="$site" />
-                </div>
-                <div class="mr-2">
-                    <livewire:application.auto-deployment :site="$site" />
-                </div>
-                <x-dropdown>
-                    <x-slot name="trigger">
-                        <x-secondary-button>
-                            {{ __('Manage') }}
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5 ml-1">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9" />
-                            </svg>
-                        </x-secondary-button>
-                    </x-slot>
-                    <x-slot name="content">
-                        <x-dropdown-link class="cursor-pointer" x-on:click="$dispatch('open-modal', 'change-branch')">{{ __("Branch") }}</x-dropdown-link>
-                        <x-dropdown-link class="cursor-pointer" x-on:click="$dispatch('open-modal', 'deployment-script')">{{ __("Deployment Script") }}</x-dropdown-link>
-                        <x-dropdown-link class="cursor-pointer" x-on:click="$dispatch('open-modal', 'update-env')">{{ __(".env") }}</x-dropdown-link>
-                    </x-slot>
-                </x-dropdown>
-                <livewire:application.change-branch :site="$site" />
-                <livewire:application.deployment-script :site="$site" />
-                <livewire:application.env :site="$site" />
-            </div>
-        </x-slot>
-    </x-card-header>
-
-    <livewire:application.deployments-list :site="$site" />
-</div>
+@include('livewire.application.php-app')
diff --git a/resources/views/livewire/application/php-app.blade.php b/resources/views/livewire/application/php-app.blade.php
@@ -1,3 +1,62 @@
 <div>
+    <x-card-header>
+        <x-slot name="title">{{ __('Application') }}</x-slot>
+        <x-slot name="description">{{ __('Here you can manage your application') }}</x-slot>
+        <x-slot name="aside">
+            <div class="flex items-center">
+                <div class="mr-2">
+                    <livewire:application.deploy :site="$site" />
+                </div>
+                @if ($site->source_control_id)
+                    <div class="mr-2">
+                        <livewire:application.auto-deployment :site="$site" />
+                    </div>
+                @endif
+                <x-dropdown>
+                    <x-slot name="trigger">
+                        <x-secondary-button>
+                            {{ __('Manage') }}
+                            <svg
+                                xmlns="http://www.w3.org/2000/svg"
+                                fill="none"
+                                viewBox="0 0 24 24"
+                                stroke-width="1.5"
+                                stroke="currentColor"
+                                class="ml-1 h-5 w-5"
+                            >
+                                <path
+                                    stroke-linecap="round"
+                                    stroke-linejoin="round"
+                                    d="M8.25 15L12 18.75 15.75 15m-7.5-6L12 5.25 15.75 9"
+                                />
+                            </svg>
+                        </x-secondary-button>
+                    </x-slot>
+                    <x-slot name="content">
+                        @if ($site->source_control_id)
+                            <x-dropdown-link
+                                class="cursor-pointer"
+                                x-on:click="$dispatch('open-modal', 'change-branch')"
+                            >{{ __('Branch') }}</x-dropdown-link>
+                        @endif
+                        <x-dropdown-link
+                            class="cursor-pointer"
+                            x-on:click="$dispatch('open-modal', 'deployment-script')"
+                        >{{ __('Deployment Script') }}</x-dropdown-link>
+                        <x-dropdown-link
+                            class="cursor-pointer"
+                            x-on:click="$dispatch('open-modal', 'update-env')"
+                        >{{ __('.env') }}</x-dropdown-link>
+                    </x-slot>
+                </x-dropdown>
+                @if ($site->source_control_id)
+                    <livewire:application.change-branch :site="$site" />
+                @endif
+                <livewire:application.deployment-script :site="$site" />
+                <livewire:application.env :site="$site" />
+            </div>
+        </x-slot>
+    </x-card-header>
 
+    <livewire:application.deployments-list :site="$site" />
 </div>
diff --git a/resources/views/livewire/application/php-blank-app.blade.php b/resources/views/livewire/application/php-blank-app.blade.php
@@ -0,0 +1 @@
+@include('livewire.application.php-app')
diff --git a/resources/views/livewire/sites/partials/create/php-blank.blade.php b/resources/views/livewire/sites/partials/create/php-blank.blade.php
@@ -0,0 +1,3 @@
+@include('livewire.sites.partials.create.fields.php-version')
+
+@include('livewire.sites.partials.create.fields.web-directory')
diff --git a/resources/views/livewire/sites/show-site.blade.php b/resources/views/livewire/sites/show-site.blade.php
@@ -10,16 +10,6 @@
         <livewire:server-logs.logs-list :server="$site->server" :site="$site" :count="10" />
     @endif
     @if($site->status === \App\Enums\SiteStatus::READY)
-        @if($site->type == \App\Enums\SiteType::LARAVEL)
-            <livewire:application.laravel-app :site="$site" />
-        @endif
-
-        @if($site->type == \App\Enums\SiteType::PHP)
-            <livewire:application.php-app :site="$site" />
-        @endif
-
-        @if($site->type == \App\Enums\SiteType::WORDPRESS)
-            <livewire:application.wordpress-app :site="$site" />
-        @endif
+        @livewire('application.' . $site->type . '-app', ['site' => $site])
     @endif
 </div>
diff --git a/resources/views/sites/application.blade.php b/resources/views/sites/application.blade.php
@@ -1,15 +1,11 @@
-<x-site-layout :site="$site">
-    <x-slot name="pageTitle">{{ __("Application") }}</x-slot>
+@if($site->type == \App\Enums\SiteType::LARAVEL)
+<livewire:application.laravel-app :site="$site" />
+@endif
 
-    @if($site->type == \App\Enums\SiteType::LARAVEL)
-        <livewire:application.laravel-app :site="$site" />
-    @endif
+@if($site->type == \App\Enums\SiteType::PHP)
+<livewire:application.php-app :site="$site" />
+@endif
 
-    @if($site->type == \App\Enums\SiteType::PHP)
-        <livewire:application.php-app :site="$site" />
-    @endif
-
-    @if($site->type == \App\Enums\SiteType::WORDPRESS)
-        <livewire:application.wordpress-app :site="$site" />
-    @endif
-</x-site-layout>
+@if($site->type == \App\Enums\SiteType::WORDPRESS)
+<livewire:application.wordpress-app :site="$site" />
+@endif
diff --git a/resources/views/sites/settings.blade.php b/resources/views/sites/settings.blade.php
@@ -1,18 +1,20 @@
 <x-site-layout :site="$site">
-    <x-slot name="pageTitle">{{ __("Settings") }}</x-slot>
+    <x-slot name="pageTitle">{{ __('Settings') }}</x-slot>
 
-    <livewire:sites.change-php-version :site="$site"/>
+    <livewire:sites.change-php-version :site="$site" />
 
-    <livewire:sites.update-source-control-provider :site="$site"/>
+    @if ($site->source_control_id)
+        <livewire:sites.update-source-control-provider :site="$site" />
+    @endif
 
-    <livewire:sites.update-v-host :site="$site"/>
+    <livewire:sites.update-v-host :site="$site" />
 
     <x-card>
-        <x-slot name="title">{{ __("Delete Site") }}</x-slot>
-        <x-slot name="description">{{ __("Permanently delete the site from server") }}</x-slot>
-        <p>{{ __("Once your site is deleted, all of its files will be deleted from the server.") }}</p>
+        <x-slot name="title">{{ __('Delete Site') }}</x-slot>
+        <x-slot name="description">{{ __('Permanently delete the site from server') }}</x-slot>
+        <p>{{ __('Once your site is deleted, all of its files will be deleted from the server.') }}</p>
         <div class="mt-5">
-            <livewire:sites.delete-site :site="$site"/>
+            <livewire:sites.delete-site :site="$site" />
         </div>
     </x-card>
 </x-site-layout>
diff --git a/tests/Feature/Http/SitesTest.php b/tests/Feature/Http/SitesTest.php
@@ -172,6 +172,15 @@ public static function create_data(): array
                     'inputs.database_password' => 'password',
                 ],
             ],
+            [
+                [
+                    'inputs.type' => SiteType::PHP_BLANK,
+                    'inputs.domain' => 'example.com',
+                    'inputs.alias' => 'www.example.com',
+                    'inputs.php_version' => '8.2',
+                    'inputs.web_directory' => 'public',
+                ],
+            ],
         ];
     }
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		@include('livewire.sites.partials.create.fields.php-version')

		@include('livewire.sites.partials.create.fields.web-directory')