adding Projects feature (#85)

* update composer
log viewer
code style format

* fix composer

CONTRIBUTING.md

@@ -0,0 +1,23 @@
+# Contributing
+Thank you for your interest in contributing! There are a couple of contribution guidelines that make it easier to apply the incoming suggestions.
+
+If you want to contribute please start with the issues. Issues labeled with "Bug" are the higher priorities.
+
+## Issues
+1. Issues are the best place to propose a new feature.
+2. If you are adding a feature that there is no issue for yet, please first open an issue and label it as "feature" and lets discuss it before you implement it.
+3. Search the issues before proposing a feature to see if it is already under discussion. Referencing existing issues is a good way to increase the priority of your own.
+4. We don't have an issue template yet, but the more detailed your explanation, the more quickly we'll be able to evaluate it.
+5. Search for the issue that you also have. Give it a reaction (and comment, if you have something to add). We note that!
+
+## Pull Requests
+1. Open PRs represent issues that we're actively thinking about merging (at a pace we can manage). If we think a proposal needs more discussion, or that the existing code would require a lot of back-and-forth to merge, we might close it and suggest you make an issue.
+2. All PRs should be made against the `main` branch. This can be changed in the future.
+3. If you are making changes to the front-end layer, Please build the assets via `npm run build` and push it with the other changes.
+4. Write tests for your code. Tests can be Unit or Feature.
+5. Code refactors will be closed. For the architectural refactors open an issue first.
+6. Use `./vendor/bin/pint` to style your code before opening a PR otherwise the actions will fail.
+7. Typo fixes in documentation are welcome, but if it's at all debatable we might just close it.
+
+## Misc
+1. If you think we closed something incorrectly, feel free to (politely) tell us why! We're human and make mistakes.

README.md

@@ -10,9 +10,21 @@ ## Documentation
 
 https://vitodeploy.com
 
+## Feedbacks
+
+https://features.vitodeploy.com
+
+## Roadmap
+
+https://https://features.vitodeploy.com/roadmap
+
 ## Contribution
 
-Feel free to open a PR
+Please read the contribution guide [Here](/CONTRIBUTING.md)
+
+## Security
+
+Please read the security policy [Here](/SECURITY.md)
 
 ## Credits
 

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 0.x     | :white_check_mark: |
+
+## Reporting a Vulnerability
+
+If you see a vulnerability, please open an issue or report it directly to me (sa.vaziry@gmail.com) 

app/Actions/Projects/CreateProject.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace App\Actions\Projects;
+
+use App\Models\Project;
+use App\Models\User;
+use Illuminate\Support\Facades\Validator;
+
+class CreateProject
+{
+    public function create(User $user, array $input): Project
+    {
+        $this->validate($user, $input);
+
+        $project = new Project([
+            'user_id' => $user->id,
+            'name' => $input['name'],
+        ]);
+
+        $project->save();
+
+        return $project;
+    }
+
+    private function validate(User $user, array $input): void
+    {
+        Validator::make($input, [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+                'unique:projects,name,NULL,id,user_id,'.$user->id,
+            ],
+        ])->validate();
+    }
+}

app/Actions/Projects/DeleteProject.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Actions\Projects;
+
+use App\Models\Project;
+use App\Models\User;
+use Illuminate\Validation\ValidationException;
+
+class DeleteProject
+{
+    public function delete(User $user, int $projectId): void
+    {
+        /** @var Project $project */
+        $project = $user->projects()->findOrFail($projectId);
+
+        if ($user->projects()->count() === 1) {
+            throw ValidationException::withMessages([
+                'project' => __('Cannot delete the last project.'),
+            ]);
+        }
+
+        if ($user->current_project_id == $project->id) {
+            /** @var Project $randomProject */
+            $randomProject = $user->projects()->where('id', '!=', $project->id)->first();
+            $user->current_project_id = $randomProject->id;
+            $user->save();
+        }
+
+        $project->delete();
+    }
+}

app/Actions/Projects/UpdateProject.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Actions\Projects;
+
+use App\Models\Project;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+
+class UpdateProject
+{
+    public function update(Project $project, array $input): Project
+    {
+        $this->validate($project, $input);
+
+        $project->name = $input['name'];
+
+        $project->save();
+
+        return $project;
+    }
+
+    private function validate(Project $project, array $input): void
+    {
+        Validator::make($input, [
+            'name' => [
+                'required',
+                'string',
+                'max:255',
+                Rule::unique('projects')->ignore($project->id),
+            ],
+        ])->validate();
+    }
+}

app/Actions/Server/CreateServer.php

@@ -26,6 +26,7 @@ public function create(User $creator, array $input): Server
         $this->validateInputs($input);
 
         $server = new Server([
+            'project_id' => $creator->currentProject->id,
             'user_id' => $creator->id,
             'name' => $input['name'],
             'ssh_user' => config('core.server_providers_default_user')[$input['provider']][$input['os']],

app/Actions/Site/CreateSite.php

@@ -49,11 +49,6 @@ public function create(Server $server, array $input): Site
                 ]);
             }
 
-            // detect php version
-            if ($site->type()->language() === 'php') {
-                $site->php_version = $input['php_version'];
-            }
-
             // validate type
             $this->validateType($site, $input);
 

app/Actions/Site/UpdateSourceControl.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Actions\Site;
+
+use App\Models\Site;
+use Illuminate\Support\Facades\Validator;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\ValidationException;
+
+class UpdateSourceControl
+{
+    /**
+     * @throws ValidationException
+     */
+    public function update(Site $site, array $input): void
+    {
+        $this->validate($input);
+
+        $site->source_control_id = $input['source_control'];
+        $site->save();
+    }
+
+    /**
+     * @throws ValidationException
+     */
+    protected function validate(array $input): void
+    {
+        Validator::make($input, [
+            'source_control' => [
+                'required',
+                Rule::exists('source_controls', 'id'),
+            ],
+        ])->validate();
+    }
+}

app/Contracts/ProcessManager.php

@@ -15,13 +15,13 @@ public function create(
         ?int $siteId = null
     ): void;
 
-    public function delete(int $id, int $siteId = null): void;
+    public function delete(int $id, ?int $siteId = null): void;
 
-    public function restart(int $id, int $siteId = null): void;
+    public function restart(int $id, ?int $siteId = null): void;
 
-    public function stop(int $id, int $siteId = null): void;
+    public function stop(int $id, ?int $siteId = null): void;
 
-    public function start(int $id, int $siteId = null): void;
+    public function start(int $id, ?int $siteId = null): void;
 
     public function getLogs(string $logPath): string;
 }

app/Contracts/ServerProvider.php

@@ -12,7 +12,7 @@ public function credentialData(array $input): array;
 
     public function data(array $input): array;
 
-    public function connect(array $credentials = null): bool;
+    public function connect(?array $credentials = null): bool;
 
     public function plans(): array;
 

app/Contracts/SiteType.php

@@ -6,6 +6,8 @@ interface SiteType
 {
     public function language(): string;
 
+    public function supportedFeatures(): array;
+
     public function createValidationRules(array $input): array;
 
     public function createFields(array $input): array;

app/Contracts/SourceControlProvider.php

@@ -6,7 +6,7 @@ interface SourceControlProvider
 {
     public function connect(): bool;
 
-    public function getRepo(string $repo = null): mixed;
+    public function getRepo(?string $repo = null): mixed;
 
     public function fullRepoUrl(string $repo, string $key): string;
 

app/Enums/SiteFeature.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Enums;
+
+use BenSampo\Enum\Enum;
+
+final class SiteFeature extends Enum
+{
+    const DEPLOYMENT = 'deployment';
+
+    const ENV = 'env';
+
+    const SSL = 'ssl';
+
+    const QUEUES = 'queues';
+}

app/Enums/SourceControl.php

@@ -11,6 +11,4 @@ final class SourceControl extends Enum
     const GITLAB = 'gitlab';
 
     const BITBUCKET = 'bitbucket';
-
-    const CUSTOM = 'custom';
 }

app/Exceptions/SourceControlIsNotConnected.php

@@ -7,7 +7,7 @@
 
 class SourceControlIsNotConnected extends Exception
 {
-    public function __construct(protected SourceControl|string $sourceControl, string $message = null)
+    public function __construct(protected SourceControl|string|null $sourceControl, ?string $message = null)
     {
         parent::__construct($message ?? 'Source control is not connected');
     }

app/Helpers/SSH.php

@@ -31,7 +31,7 @@ class SSH
 
     protected PrivateKey $privateKey;
 
-    public function init(Server $server, string $asUser = null): self
+    public function init(Server $server, ?string $asUser = null): self
     {
         $this->connection = null;
         $this->log = null;
@@ -87,7 +87,7 @@ public function connect(bool $sftp = false): void
     /**
      * @throws Throwable
      */
-    public function exec(string|array|SSHCommand $commands, string $log = '', int $siteId = null): string
+    public function exec(string|array|SSHCommand $commands, string $log = '', ?int $siteId = null): string
     {
         if ($log) {
             $this->setLog($log, $siteId);

app/Http/Controllers/GitHookController.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Exceptions\SourceControlIsNotConnected;
+use App\Models\GitHook;
+use Illuminate\Http\Request;
+use Throwable;
+
+class GitHookController extends Controller
+{
+    public function __invoke(Request $request)
+    {
+        if (! $request->input('secret')) {
+            abort(404);
+        }
+
+        /** @var GitHook $gitHook */
+        $gitHook = GitHook::query()
+            ->where('secret', $request->input('secret'))
+            ->firstOrFail();
+
+        foreach ($gitHook->actions as $action) {
+            if ($action == 'deploy') {
+                try {
+                    $gitHook->site->deploy();
+                } catch (SourceControlIsNotConnected) {
+                    // TODO: send notification
+                } catch (Throwable $e) {
+                    Log::error('git-hook-exception', (array) $e);
+                }
+            }
+        }
+
+        return response()->json([
+            'success' => true,
+        ]);
+    }
+}

app/Http/Controllers/ProjectController.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Models\Project;
+use App\Models\User;
+use Illuminate\Contracts\View\View;
+
+class ProjectController extends Controller
+{
+    public function index(): View
+    {
+        return view('projects.index');
+    }
+
+    public function switch($projectId)
+    {
+        /** @var User $user */
+        $user = auth()->user();
+
+        /** @var Project $project */
+        $project = $user->projects()->findOrFail($projectId);
+
+        $user->current_project_id = $project->id;
+        $user->save();
+
+        return redirect()->route('servers');
+    }
+}

app/Http/Livewire/Application/AutoDeployment.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace App\Http\Livewire\Application;
+
+use App\Exceptions\SourceControlIsNotConnected;
+use App\Models\Site;
+use App\Traits\HasToast;
+use App\Traits\RefreshComponentOnBroadcast;
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+use Throwable;
+
+class AutoDeployment extends Component
+{
+    use HasToast;
+    use RefreshComponentOnBroadcast;
+
+    public Site $site;
+
+    /**
+     * @throws Throwable
+     */
+    public function enable(): void
+    {
+        if (! $this->site->auto_deployment) {
+            try {
+                $this->site->enableAutoDeployment();
+
+                $this->site->refresh();
+
+                $this->toast()->success(__('Auto deployment has been enabled.'));
+            } catch (SourceControlIsNotConnected) {
+                $this->toast()->error(__('Source control is not connected. Check site\'s settings.'));
+            }
+        }
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function disable(): void
+    {
+        if ($this->site->auto_deployment) {
+            try {
+                $this->site->disableAutoDeployment();
+
+                $this->site->refresh();
+
+                $this->toast()->success(__('Auto deployment has been disabled.'));
+            } catch (SourceControlIsNotConnected) {
+                $this->toast()->error(__('Source control is not connected. Check site\'s settings.'));
+            }
+        }
+    }
+
+    public function render(): View
+    {
+        return view('livewire.application.auto-deployment');
+    }
+}

app/Http/Livewire/Application/Deploy.php

@@ -11,8 +11,8 @@
 
 class Deploy extends Component
 {
-    use RefreshComponentOnBroadcast;
     use HasToast;
+    use RefreshComponentOnBroadcast;
 
     public Site $site;
 

app/Http/Livewire/Application/DeploymentScript.php

@@ -28,6 +28,7 @@ public function save(): void
         session()->flash('status', 'script-updated');
 
         $this->emitTo(Deploy::class, '$refresh');
+        $this->emitTo(AutoDeployment::class, '$refresh');
     }
 
     public function render(): View

app/Http/Livewire/Application/DeploymentsList.php

@@ -10,8 +10,8 @@
 
 class DeploymentsList extends Component
 {
-    use RefreshComponentOnBroadcast;
     use HasCustomPaginationView;
+    use RefreshComponentOnBroadcast;
 
     public Site $site;
 

app/Http/Livewire/Php/InstalledVersions.php

@@ -3,11 +3,13 @@
 namespace App\Http\Livewire\Php;
 
 use App\Actions\PHP\InstallNewPHP;
+use App\Actions\PHP\InstallPHPExtension;
 use App\Actions\PHP\UpdatePHPIni;
 use App\Models\Server;
 use App\Models\Service;
 use App\SSHCommands\PHP\GetPHPIniCommand;
 use App\Traits\RefreshComponentOnBroadcast;
+use Exception;
 use Illuminate\Contracts\View\View;
 use Livewire\Component;
 use Throwable;
@@ -24,6 +26,10 @@ class InstalledVersions extends Component
 
     public string $ini = 'Loading php.ini';
 
+    public ?int $extensionId = null;
+
+    public string $extension = '';
+
     public function install(string $version): void
     {
         app(InstallNewPHP::class)->install($this->server, [
@@ -35,6 +41,7 @@ public function install(string $version): void
 
     public function restart(int $id): void
     {
+        /** @var Service $service */
         $service = Service::query()->findOrFail($id);
         $service->restart();
 
@@ -43,6 +50,7 @@ public function restart(int $id): void
 
     public function uninstall(): void
     {
+        /** @var Service $service */
         $service = Service::query()->findOrFail($this->uninstallId);
         $service->uninstall();
 
@@ -56,6 +64,7 @@ public function loadIni(int $id): void
         $this->iniId = $id;
         $this->ini = 'Loading php.ini';
 
+        /** @var Service $service */
         $service = Service::query()->findOrFail($this->iniId);
 
         try {
@@ -67,6 +76,7 @@ public function loadIni(int $id): void
 
     public function saveIni(): void
     {
+        /** @var Service $service */
         $service = Service::query()->findOrFail($this->iniId);
 
         app(UpdatePHPIni::class)->update($service, $this->all()['ini']);
@@ -76,10 +86,32 @@ public function saveIni(): void
         session()->flash('status', 'ini-updated');
     }
 
+    /**
+     * @throws Exception
+     */
+    public function installExtension(): void
+    {
+        /** @var Service $service */
+        $service = Service::query()->findOrFail($this->extensionId);
+
+        app(InstallPHPExtension::class)->handle($service, [
+            'name' => $this->extension,
+        ]);
+
+        session()->flash('status', 'started-installation');
+    }
+
     public function render(): View
     {
+        if ($this->extensionId) {
+            /** @var Service $php */
+            $php = Service::query()->findOrFail($this->extensionId);
+            $installedExtensions = $php->type_data['extensions'] ?? [];
+        }
+
         return view('livewire.php.installed-versions', [
             'phps' => $this->server->services()->where('type', 'php')->get(),
+            'installedExtensions' => $installedExtensions ?? [],
         ]);
     }
 }

app/Http/Livewire/Projects/CreateProject.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Livewire\Projects;
+
+use App\Traits\HasToast;
+use App\Traits\RefreshComponentOnBroadcast;
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+class CreateProject extends Component
+{
+    use HasToast;
+    use RefreshComponentOnBroadcast;
+
+    public bool $open = false;
+
+    public array $inputs = [];
+
+    public function create(): void
+    {
+        app(\App\Actions\Projects\CreateProject::class)
+            ->create(auth()->user(), $this->inputs);
+
+        $this->emitTo(ProjectsList::class, '$refresh');
+
+        $this->dispatchBrowserEvent('created', true);
+    }
+
+    public function render(): View
+    {
+        if (request()->query('create')) {
+            $this->open = true;
+        }
+
+        return view('livewire.projects.create-project');
+    }
+}

app/Http/Livewire/Projects/EditProject.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Http\Livewire\Projects;
+
+use App\Actions\Projects\UpdateProject;
+use App\Models\Project;
+use App\Traits\RefreshComponentOnBroadcast;
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+class EditProject extends Component
+{
+    use RefreshComponentOnBroadcast;
+
+    public Project $project;
+
+    public array $inputs = [];
+
+    public function save(): void
+    {
+        app(UpdateProject::class)->update($this->project, $this->inputs);
+
+        $this->redirect(route('projects'));
+    }
+
+    public function mount(): void
+    {
+        $this->inputs = [
+            'name' => $this->project->name,
+        ];
+    }
+
+    public function render(): View
+    {
+        return view('livewire.projects.edit-project');
+    }
+}

app/Http/Livewire/Projects/ProjectsList.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\Http\Livewire\Projects;
+
+use App\Actions\Projects\DeleteProject;
+use App\Traits\HasToast;
+use App\Traits\RefreshComponentOnBroadcast;
+use Illuminate\Contracts\View\View;
+use Illuminate\Validation\ValidationException;
+use Livewire\Component;
+
+class ProjectsList extends Component
+{
+    use HasToast;
+    use RefreshComponentOnBroadcast;
+
+    protected $listeners = [
+        '$refresh',
+    ];
+
+    public int $deleteId;
+
+    public function delete(): void
+    {
+        try {
+            app(DeleteProject::class)->delete(auth()->user(), $this->deleteId);
+
+            $this->redirect(route('projects'));
+
+            return;
+        } catch (ValidationException $e) {
+            $this->toast()->error($e->getMessage());
+        }
+    }
+
+    public function render(): View
+    {
+        return view('livewire.projects.projects-list', [
+            'projects' => auth()->user()->projects()->orderByDesc('id')->get(),
+        ]);
+    }
+}

app/Http/Livewire/ServerLogs/LogsList.php

@@ -11,8 +11,8 @@
 
 class LogsList extends Component
 {
-    use RefreshComponentOnBroadcast;
     use HasCustomPaginationView;
+    use RefreshComponentOnBroadcast;
 
     public ?int $count = null;
 

app/Http/Livewire/Servers/ServersList.php

@@ -2,7 +2,7 @@
 
 namespace App\Http\Livewire\Servers;
 
-use App\Models\Server;
+use App\Models\User;
 use App\Traits\RefreshComponentOnBroadcast;
 use Illuminate\Contracts\View\View;
 use Livewire\Component;
@@ -13,8 +13,12 @@ class ServersList extends Component
 
     public function render(): View
     {
+        /** @var User $user */
+        $user = auth()->user();
+        $servers = $user->currentProject->servers()->orderByDesc('created_at')->get();
+
         return view('livewire.servers.servers-list', [
-            'servers' => Server::all(),
+            'servers' => $servers,
         ]);
     }
 }

app/Http/Livewire/Sites/CreateSite.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Livewire\Sites;
 
-use App\Enums\SiteType;
 use App\Exceptions\SourceControlIsNotConnected;
 use App\Models\Server;
 use App\Models\SourceControl;
@@ -16,23 +15,12 @@ class CreateSite extends Component
 
     public Server $server;
 
-    public string $type = SiteType::LARAVEL;
-
-    public string $domain;
-
-    public string $alias;
-
-    public string $php_version = '';
-
-    public string $web_directory = 'public';
-
-    public string $source_control = '';
-
-    public string $repository;
-
-    public string $branch;
-
-    public bool $composer;
+    public array $inputs = [
+        'type' => '',
+        'web_directory' => 'public',
+        'source_control' => '',
+        'php_version' => '',
+    ];
 
     /**
      * @throws SourceControlIsNotConnected
@@ -41,7 +29,7 @@ public function create(): void
     {
         $site = app(\App\Actions\Site\CreateSite::class)->create(
             $this->server,
-            $this->all()
+            $this->inputs
         );
 
         $this->redirect(route('servers.sites.show', [

app/Http/Livewire/Sites/UpdateSourceControlProvider.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Livewire\Sites;
+
+use App\Actions\Site\UpdateSourceControl;
+use App\Models\Site;
+use Illuminate\Contracts\View\View;
+use Livewire\Component;
+
+class UpdateSourceControlProvider extends Component
+{
+    public Site $site;
+
+    public $source_control = null;
+
+    public function update(): void
+    {
+        app(UpdateSourceControl::class)->update($this->site, $this->all());
+
+        $this->resetErrorBag();
+
+        session()->flash('status', 'source-control-updated');
+    }
+
+    public function render(): View
+    {
+        if (! $this->source_control) {
+            $this->source_control = $this->site->source_control_id;
+        }
+
+        return view('livewire.sites.update-source-control-provider');
+    }
+}

app/Http/Livewire/Ssl/SslsList.php

@@ -10,8 +10,8 @@
 
 class SslsList extends Component
 {
-    use RefreshComponentOnBroadcast;
     use HasToast;
+    use RefreshComponentOnBroadcast;
 
     public Site $site;
 

app/Jobs/Installation/Initialize.php

@@ -13,7 +13,7 @@ class Initialize extends InstallationJob
 
     protected ?string $asUser;
 
-    public function __construct(Server $server, string $asUser = null)
+    public function __construct(Server $server, ?string $asUser = null)
     {
         $this->server = $server->refresh();
         $this->asUser = $asUser;

app/Jobs/Site/InstallWordpress.php

@@ -52,7 +52,7 @@ public function handle(): void
             $this->site->id
         );
 
-        if (! Str::contains($result, 'Wordpress installed!')) {
+        if (! Str::contains($result, 'Success')) {
             throw new FailedToInstallWordpress($result);
         }
     }

app/Models/Database.php

@@ -57,19 +57,19 @@ public function server(): BelongsTo
     /**
      * create database on server
      */
-    public function createOnServer(): void
+    public function createOnServer(string $queue = 'ssh'): void
     {
-        dispatch(new CreateOnServer($this))->onConnection('ssh');
+        dispatch(new CreateOnServer($this))->onConnection($queue);
     }
 
     /**
      * delete database from server
      */
-    public function deleteFromServer(): void
+    public function deleteFromServer(string $queue = 'ssh'): void
     {
         $this->status = DatabaseStatus::DELETING;
         $this->save();
-        dispatch(new DeleteFromServer($this))->onConnection('ssh');
+        dispatch(new DeleteFromServer($this))->onConnection($queue);
     }
 
     public function backups(): HasMany

app/Models/DatabaseUser.php

@@ -54,17 +54,17 @@ public function scopeHasDatabase(Builder $query, string $databaseName): Builder
         return $query->where('databases', 'like', "%\"$databaseName\"%");
     }
 
-    public function createOnServer(): void
+    public function createOnServer(string $queue = 'ssh'): void
     {
-        dispatch(new CreateOnServer($this))->onConnection('ssh');
+        dispatch(new CreateOnServer($this))->onConnection($queue);
     }
 
-    public function deleteFromServer(): void
+    public function deleteFromServer(string $queue = 'ssh'): void
     {
         $this->status = DatabaseStatus::DELETING;
         $this->save();
 
-        dispatch(new DeleteFromServer($this))->onConnection('ssh');
+        dispatch(new DeleteFromServer($this))->onConnection($queue);
     }
 
     public function linkNewDatabase(string $name): void
@@ -79,14 +79,14 @@ public function linkNewDatabase(string $name): void
         }
     }
 
-    public function linkUser(): void
+    public function linkUser(string $queue = 'ssh'): void
     {
-        dispatch(new LinkUser($this))->onConnection('ssh');
+        dispatch(new LinkUser($this))->onConnection($queue);
     }
 
-    public function unlinkUser(): void
+    public function unlinkUser(string $queue = 'ssh'): void
     {
-        dispatch(new UnlinkUser($this))->onConnection('ssh');
+        dispatch(new UnlinkUser($this))->onConnection($queue);
     }
 
     public function getFullUserAttribute(): string

app/Models/GitHook.php

@@ -2,9 +2,9 @@
 
 namespace App\Models;
 
-use App\Exceptions\FailedToDeployGitHook;
 use Exception;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Support\Facades\DB;
 use Throwable;
@@ -22,6 +22,8 @@
  */
 class GitHook extends AbstractModel
 {
+    use HasFactory;
+
     protected $fillable = [
         'site_id',
         'source_control_id',
@@ -55,9 +57,6 @@ public function scopeHasEvent(Builder $query, string $event): Builder
         return $query->where('events', 'like', "%\"{$event}\"%");
     }
 
-    /**
-     * @throws FailedToDeployGitHook
-     */
     public function deployHook(): void
     {
         $this->update(

app/Models/Project.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Models;
+
+use Carbon\Carbon;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+
+/**
+ * @property int $id
+ * @property int $user_id
+ * @property string $name
+ * @property Carbon $created_at
+ * @property Carbon $updated_at
+ * @property User $user
+ * @property Collection<Server> $servers
+ * @property Collection<NotificationChannel> $notificationChannels
+ */
+class Project extends Model
+{
+    use HasFactory;
+
+    protected $fillable = [
+        'user_id',
+        'name',
+    ];
+
+    public static function boot(): void
+    {
+        parent::boot();
+
+        static::deleting(function (Project $project) {
+            $project->servers()->each(function (Server $server) {
+                $server->delete();
+            });
+        });
+    }
+
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    public function servers(): HasMany
+    {
+        return $this->hasMany(Server::class);
+    }
+
+    public function notificationChannels(): HasMany
+    {
+        return $this->hasMany(NotificationChannel::class);
+    }
+}

app/Models/Server.php

@@ -18,6 +18,7 @@
 use Illuminate\Support\Str;
 
 /**
+ * @property int $project_id
  * @property int $user_id
  * @property string $name
  * @property string $ssh_user
@@ -38,6 +39,7 @@
  * @property int $security_updates
  * @property int $progress
  * @property string $progress_step
+ * @property Project $project
  * @property User $creator
  * @property ServerProvider $serverProvider
  * @property ServerLog[] $logs
@@ -59,6 +61,7 @@ class Server extends AbstractModel
     use HasFactory;
 
     protected $fillable = [
+        'project_id',
         'user_id',
         'name',
         'ssh_user',
@@ -82,6 +85,7 @@ class Server extends AbstractModel
     ];
 
     protected $casts = [
+        'project_id' => 'integer',
         'user_id' => 'integer',
         'type_data' => 'json',
         'port' => 'integer',
@@ -125,6 +129,11 @@ public static function boot(): void
         });
     }
 
+    public function project(): BelongsTo
+    {
+        return $this->belongsTo(Project::class, 'project_id');
+    }
+
     public function creator(): BelongsTo
     {
         return $this->belongsTo(User::class, 'user_id');
@@ -233,7 +242,7 @@ public function install(): void
         // $this->team->notify(new ServerInstallationStarted($this));
     }
 
-    public function ssh(string $user = null): \App\Helpers\SSH|SSHFake
+    public function ssh(?string $user = null): \App\Helpers\SSH|SSHFake
     {
         return SSH::init($this, $user);
     }
@@ -263,7 +272,7 @@ public function provider(): \App\Contracts\ServerProvider
         return new $providerClass($this);
     }
 
-    public function webserver(string $version = null): ?Service
+    public function webserver(?string $version = null): ?Service
     {
         if (! $version) {
             return $this->defaultService('webserver');
@@ -272,7 +281,7 @@ public function webserver(string $version = null): ?Service
         return $this->service('webserver', $version);
     }
 
-    public function database(string $version = null): ?Service
+    public function database(?string $version = null): ?Service
     {
         if (! $version) {
             return $this->defaultService('database');
@@ -281,7 +290,7 @@ public function database(string $version = null): ?Service
         return $this->service('database', $version);
     }
 
-    public function firewall(string $version = null): ?Service
+    public function firewall(?string $version = null): ?Service
     {
         if (! $version) {
             return $this->defaultService('firewall');
@@ -290,7 +299,7 @@ public function firewall(string $version = null): ?Service
         return $this->service('firewall', $version);
     }
 
-    public function processManager(string $version = null): ?Service
+    public function processManager(?string $version = null): ?Service
     {
         if (! $version) {
             return $this->defaultService('process_manager');
@@ -299,7 +308,7 @@ public function processManager(string $version = null): ?Service
         return $this->service('process_manager', $version);
     }
 
-    public function php(string $version = null): ?Service
+    public function php(?string $version = null): ?Service
     {
         if (! $version) {
             return $this->defaultService('php');

app/Models/Site.php

@@ -6,7 +6,7 @@
 use App\Enums\DeploymentStatus;
 use App\Enums\SiteStatus;
 use App\Enums\SslStatus;
-use App\Exceptions\FailedToDeployGitHook;
+use App\Events\Broadcast;
 use App\Exceptions\SourceControlIsNotConnected;
 use App\Jobs\Site\ChangePHPVersion;
 use App\Jobs\Site\Deploy;
@@ -19,7 +19,8 @@
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\Relations\HasOne;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Validation\ValidationException;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use Throwable;
 
 /**
@@ -341,22 +342,16 @@ public function getWebDirectoryPathAttribute(): string
 
     /**
      * @throws SourceControlIsNotConnected
-     * @throws ValidationException
-     * @throws FailedToDeployGitHook
      * @throws Throwable
      */
     public function enableAutoDeployment(): void
     {
         if ($this->gitHook) {
-            throw ValidationException::withMessages([
-                'auto_deployment' => __('Auto deployment already enabled'),
-            ])->errorBag('auto_deployment');
+            return;
         }
 
         if (! $this->sourceControl()) {
-            throw ValidationException::withMessages([
-                'auto_deployment' => __('Your application does not use any source controls'),
-            ])->errorBag('auto_deployment');
+            throw new SourceControlIsNotConnected($this->source_control);
         }
 
         try {
@@ -364,7 +359,7 @@ public function enableAutoDeployment(): void
             $gitHook = new GitHook([
                 'site_id' => $this->id,
                 'source_control_id' => $this->sourceControl()->id,
-                'secret' => generate_uid(),
+                'secret' => Str::uuid()->toString(),
                 'actions' => ['deploy'],
                 'events' => ['push'],
             ]);
@@ -399,4 +394,49 @@ public function getSshKeyNameAttribute(): string
     {
         return str('site_'.$this->id)->toString();
     }
+
+    public function installationFinished(): void
+    {
+        $this->update([
+            'status' => SiteStatus::READY,
+            'progress' => 100,
+        ]);
+        event(
+            new Broadcast('install-site-finished', [
+                'site' => $this,
+            ])
+        );
+        /** @todo notify */
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function installationFailed(Throwable $e): void
+    {
+        $this->update([
+            'status' => SiteStatus::INSTALLATION_FAILED,
+        ]);
+        event(
+            new Broadcast('install-site-failed', [
+                'site' => $this,
+            ])
+        );
+        /** @todo notify */
+        Log::error('install-site-error', [
+            'error' => (string) $e,
+        ]);
+
+        throw $e;
+    }
+
+    public function hasFeature(string $feature): bool
+    {
+        return in_array($feature, $this->type()->supportedFeatures());
+    }
+
+    public function isReady(): bool
+    {
+        return $this->status === SiteStatus::READY;
+    }
 }

app/Models/SourceControl.php

@@ -33,7 +33,7 @@ public function provider(): SourceControlProvider
         return new $providerClass($this);
     }
 
-    public function getRepo(string $repo = null): ?array
+    public function getRepo(?string $repo = null): ?array
     {
         return $this->provider()->getRepo($repo);
     }

app/Models/User.php

@@ -28,6 +28,9 @@
  * @property Collection $tokens
  * @property string $profile_photo_url
  * @property string $timezone
+ * @property int $current_project_id
+ * @property Project $currentProject
+ * @property Collection<Project> $projects
  */
 class User extends Authenticatable
 {
@@ -41,6 +44,7 @@ class User extends Authenticatable
         'email',
         'password',
         'timezone',
+        'current_project_id',
     ];
 
     protected $hidden = [
@@ -53,6 +57,20 @@ class User extends Authenticatable
     protected $appends = [
     ];
 
+    public static function boot(): void
+    {
+        parent::boot();
+
+        static::created(function (User $user) {
+            $user->createDefaultProject();
+        });
+    }
+
+    public function servers(): HasMany
+    {
+        return $this->hasMany(Server::class);
+    }
+
     public function sshKeys(): HasMany
     {
         return $this->hasMany(SshKey::class);
@@ -105,4 +123,36 @@ public function connectedSourceControls(): array
 
         return $connectedSourceControls;
     }
+
+    public function projects(): HasMany
+    {
+        return $this->hasMany(Project::class);
+    }
+
+    public function currentProject(): HasOne
+    {
+        return $this->HasOne(Project::class, 'id', 'current_project_id');
+    }
+
+    public function isMemberOfProject(Project $project): bool
+    {
+        return $project->user_id === $this->id;
+    }
+
+    public function createDefaultProject(): Project
+    {
+        $project = $this->projects()->first();
+
+        if (! $project) {
+            $project = new Project();
+            $project->user_id = $this->id;
+            $project->name = 'Default';
+            $project->save();
+        }
+
+        $this->current_project_id = $project->id;
+        $this->save();
+
+        return $project;
+    }
 }

app/ServerProviders/AWS.php

@@ -63,7 +63,7 @@ public function data(array $input): array
     /**
      * @throws CouldNotConnectToProvider
      */
-    public function connect(array $credentials = null): bool
+    public function connect(?array $credentials = null): bool
     {
         try {
             $this->connectToEc2ClientTest($credentials);

app/ServerProviders/AbstractProvider.php

@@ -10,7 +10,7 @@ abstract class AbstractProvider implements ServerProvider
 {
     protected ?Server $server;
 
-    public function __construct(Server $server = null)
+    public function __construct(?Server $server = null)
     {
         $this->server = $server;
     }

app/ServerProviders/Custom.php

@@ -42,7 +42,7 @@ public function data(array $input): array
         return [];
     }
 
-    public function connect(array $credentials = null): bool
+    public function connect(?array $credentials = null): bool
     {
         return true;
     }

app/ServerProviders/DigitalOcean.php

@@ -58,7 +58,7 @@ public function data(array $input): array
     /**
      * @throws CouldNotConnectToProvider
      */
-    public function connect(array $credentials = null): bool
+    public function connect(?array $credentials = null): bool
     {
         $connect = Http::withToken($credentials['token'])->get($this->apiUrl.'/account');
         if (! $connect->ok()) {

app/ServerProviders/Hetzner.php

@@ -45,7 +45,7 @@ public function data(array $input): array
     /**
      * @throws CouldNotConnectToProvider
      */
-    public function connect(array $credentials = null): bool
+    public function connect(?array $credentials = null): bool
     {
         $connect = Http::withToken($credentials['token'])->get($this->apiUrl.'/servers');
         if (! $connect->ok()) {

app/ServerProviders/Linode.php

@@ -57,7 +57,7 @@ public function data(array $input): array
     /**
      * @throws CouldNotConnectToProvider
      */
-    public function connect(array $credentials = null): bool
+    public function connect(?array $credentials = null): bool
     {
         $connect = Http::withToken($credentials['token'])->get($this->apiUrl.'/account');
         if (! $connect->ok()) {

app/ServerProviders/Vultr.php

@@ -59,7 +59,7 @@ public function data(array $input): array
     /**
      * @throws CouldNotConnectToProvider
      */
-    public function connect(array $credentials = null): bool
+    public function connect(?array $credentials = null): bool
     {
         $connect = Http::withToken($credentials['token'])->get($this->apiUrl.'/account');
         if (! $connect->ok()) {

app/ServerTypes/AbstractType.php

@@ -16,7 +16,7 @@ public function __construct(Server $server)
         $this->server = $server;
     }
 
-    protected function progress(int $percentage, string $step = null): Closure
+    protected function progress(int $percentage, ?string $step = null): Closure
     {
         return function () use ($percentage, $step) {
             $this->server->progress = $percentage;

app/ServiceHandlers/ProcessManager/Supervisor.php

@@ -47,7 +47,7 @@ public function create(
     /**
      * @throws Throwable
      */
-    public function delete(int $id, int $siteId = null): void
+    public function delete(int $id, ?int $siteId = null): void
     {
         $this->service->server->ssh()->exec(
             new DeleteWorkerCommand($id),
@@ -59,7 +59,7 @@ public function delete(int $id, int $siteId = null): void
     /**
      * @throws Throwable
      */
-    public function restart(int $id, int $siteId = null): void
+    public function restart(int $id, ?int $siteId = null): void
     {
         $this->service->server->ssh()->exec(
             new RestartWorkerCommand($id),
@@ -71,7 +71,7 @@ public function restart(int $id, int $siteId = null): void
     /**
      * @throws Throwable
      */
-    public function stop(int $id, int $siteId = null): void
+    public function stop(int $id, ?int $siteId = null): void
     {
         $this->service->server->ssh()->exec(
             new StopWorkerCommand($id),
@@ -83,7 +83,7 @@ public function stop(int $id, int $siteId = null): void
     /**
      * @throws Throwable
      */
-    public function start(int $id, int $siteId = null): void
+    public function start(int $id, ?int $siteId = null): void
     {
         $this->service->server->ssh()->exec(
             new StartWorkerCommand($id),

app/SiteTypes/PHPSite.php

@@ -2,14 +2,12 @@
 
 namespace App\SiteTypes;
 
-use App\Enums\SiteStatus;
-use App\Events\Broadcast;
+use App\Enums\SiteFeature;
 use App\Jobs\Site\CloneRepository;
 use App\Jobs\Site\ComposerInstall;
 use App\Jobs\Site\CreateVHost;
 use App\Jobs\Site\DeployKey;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rule;
 use Throwable;
 
@@ -20,12 +18,22 @@ public function language(): string
         return 'php';
     }
 
+    public function supportedFeatures(): array
+    {
+        return [
+            SiteFeature::DEPLOYMENT,
+            SiteFeature::ENV,
+            SiteFeature::SSL,
+            SiteFeature::QUEUES,
+        ];
+    }
+
     public function createValidationRules(array $input): array
     {
         return [
             'php_version' => [
                 'required',
-                'in:'.implode(',', $this->site->server->installedPHPVersions()),
+                Rule::in($this->site->server->installedPHPVersions()),
             ],
             'source_control' => [
                 'required',
@@ -53,7 +61,8 @@ public function createFields(array $input): array
     public function data(array $input): array
     {
         return [
-            'composer' => (bool) $input['composer'],
+            'composer' => isset($input['composer']) && $input['composer'],
+            'php_version' => $input['php_version'] ?? '',
         ];
     }
 
@@ -76,33 +85,12 @@ function () {
         }
 
         $chain[] = function () {
-            $this->site->update([
-                'status' => SiteStatus::READY,
-                'progress' => 100,
-            ]);
-            event(
-                new Broadcast('install-site-finished', [
-                    'site' => $this->site,
-                ])
-            );
-            /** @todo notify */
+            $this->site->installationFinished();
         };
 
         Bus::chain($chain)
             ->catch(function (Throwable $e) {
-                $this->site->update([
-                    'status' => SiteStatus::INSTALLATION_FAILED,
-                ]);
-                event(
-                    new Broadcast('install-site-failed', [
-                        'site' => $this->site,
-                    ])
-                );
-                /** @todo notify */
-                Log::error('install-site-error', [
-                    'error' => (string) $e,
-                ]);
-                throw $e;
+                $this->site->installationFailed($e);
             })
             ->onConnection('ssh-long')
             ->dispatch();

app/SiteTypes/Wordpress.php

@@ -2,13 +2,15 @@
 
 namespace App\SiteTypes;
 
-use App\Enums\SiteStatus;
-use App\Events\Broadcast;
+use App\Enums\SiteFeature;
 use App\Jobs\Site\CreateVHost;
 use App\Jobs\Site\InstallWordpress;
+use App\Models\Database;
+use App\Models\DatabaseUser;
 use App\SSHCommands\Wordpress\UpdateWordpressCommand;
+use Closure;
 use Illuminate\Support\Facades\Bus;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Rule;
 use Throwable;
 
 class Wordpress extends AbstractSiteType
@@ -18,94 +20,100 @@ public function language(): string
         return 'php';
     }
 
+    public function supportedFeatures(): array
+    {
+        return [
+            SiteFeature::SSL,
+        ];
+    }
+
     public function createValidationRules(array $input): array
     {
         return [
+            'php_version' => [
+                'required',
+                Rule::in($this->site->server->installedPHPVersions()),
+            ],
             'title' => 'required',
             'username' => 'required',
             'password' => 'required',
             'email' => 'required|email',
-            'database' => 'required',
-            'database_user' => 'required',
+            'database' => [
+                'required',
+                Rule::unique('databases', 'name')->where(function ($query) {
+                    return $query->where('server_id', $this->site->server_id);
+                }),
+                function (string $attribute, mixed $value, Closure $fail) {
+                    if (! $this->site->server->database()) {
+                        $fail(__('Database is not installed'));
+                    }
+                },
+            ],
+            'database_user' => [
+                'required',
+                Rule::unique('database_users', 'username')->where(function ($query) {
+                    return $query->where('server_id', $this->site->server_id);
+                }),
+            ],
+            'database_password' => 'required',
         ];
     }
 
     public function createFields(array $input): array
     {
         return [
-            'web_directory' => $input['web_directory'] ?? '',
+            'web_directory' => '',
+            'php_version' => $input['php_version'],
         ];
     }
 
     public function data(array $input): array
     {
-        $data = $this->site->type_data;
-        $data['url'] = $this->site->url;
-        if (isset($input['title']) && $input['title']) {
-            $data['title'] = $input['title'];
-        }
-        if (isset($input['username']) && $input['username']) {
-            $data['username'] = $input['username'];
-        }
-        if (isset($input['email']) && $input['email']) {
-            $data['email'] = $input['email'];
-        }
-        if (isset($input['password']) && $input['password']) {
-            $data['password'] = $input['password'];
-        }
-        if (isset($input['database']) && $input['database']) {
-            $data['database'] = $input['database'];
-        }
-        if (isset($input['database_user']) && $input['database_user']) {
-            $data['database_user'] = $input['database_user'];
-        }
-        if (isset($input['url']) && $input['url']) {
-            $data['url'] = $input['url'];
-        }
-
-        return $data;
+        return [
+            'url' => $this->site->url,
+            'title' => $input['title'],
+            'username' => $input['username'],
+            'email' => $input['email'],
+            'password' => $input['password'],
+            'database' => $input['database'],
+            'database_user' => $input['database_user'],
+            'database_password' => $input['database_password'],
+        ];
     }
 
     public function install(): void
     {
         $chain = [
             new CreateVHost($this->site),
-            $this->progress(30),
+            $this->progress(15),
+            function () {
+                /** @var Database $database */
+                $database = $this->site->server->databases()->create([
+                    'name' => $this->site->type_data['database'],
+                ]);
+                $database->createOnServer('sync');
+                /** @var DatabaseUser $databaseUser */
+                $databaseUser = $this->site->server->databaseUsers()->create([
+                    'username' => $this->site->type_data['database_user'],
+                    'password' => $this->site->type_data['database_password'],
+                    'databases' => [$this->site->type_data['database']],
+                ]);
+                $databaseUser->createOnServer('sync');
+                $databaseUser->unlinkUser('sync');
+                $databaseUser->linkUser('sync');
+            },
+            $this->progress(50),
             new InstallWordpress($this->site),
-            $this->progress(65),
+            $this->progress(75),
             function () {
                 $this->site->php()?->restart();
+                $this->site->installationFinished();
             },
         ];
 
-        $chain[] = function () {
-            $this->site->update([
-                'status' => SiteStatus::READY,
-                'progress' => 100,
-            ]);
-            event(
-                new Broadcast('install-site-finished', [
-                    'site' => $this->site,
-                ])
-            );
-            /** @todo notify */
-        };
-
         Bus::chain($chain)
             ->catch(function (Throwable $e) {
-                $this->site->update([
-                    'status' => SiteStatus::INSTALLATION_FAILED,
-                ]);
-                event(
-                    new Broadcast('install-site-failed', [
-                        'site' => $this->site,
-                    ])
-                );
-                /** @todo notify */
-                Log::error('install-site-error', [
-                    'error' => (string) $e,
-                ]);
-                throw $e;
+                $this->site->installationFailed($e);
             })
             ->onConnection('ssh-long')
             ->dispatch();
@@ -139,32 +147,13 @@ function () {
                     'update-wordpress',
                     $this->site->id
                 );
-                $this->site->update([
-                    'status' => SiteStatus::READY,
-                ]);
-                event(
-                    new Broadcast('install-site-finished', [
-                        'site' => $this->site,
-                    ])
-                );
+                $this->site->installationFinished();
             },
         ];
 
         Bus::chain($chain)
             ->catch(function (Throwable $e) {
-                $this->site->update([
-                    'status' => SiteStatus::INSTALLATION_FAILED,
-                ]);
-                event(
-                    new Broadcast('install-site-failed', [
-                        'site' => $this->site,
-                    ])
-                );
-                /** @todo notify */
-                Log::error('install-site-error', [
-                    'error' => (string) $e,
-                ]);
-                throw $e;
+                $this->site->installationFailed($e);
             })
             ->onConnection('ssh')
             ->dispatch();

app/SourceControlProviders/Bitbucket.php

@@ -24,7 +24,7 @@ public function connect(): bool
     /**
      * @throws Exception
      */
-    public function getRepo(string $repo = null): mixed
+    public function getRepo(?string $repo = null): mixed
     {
         $res = Http::withToken($this->sourceControl->access_token)
             ->get($this->apiUrl."/repositories/$repo");
@@ -46,7 +46,7 @@ public function deployHook(string $repo, array $events, string $secret): array
     {
         $response = Http::withToken($this->sourceControl->access_token)->post($this->apiUrl."/repositories/$repo/hooks", [
             'description' => 'deploy',
-            'url' => url('/git-hooks?secret='.$secret),
+            'url' => url('/api/git-hooks?secret='.$secret),
             'events' => [
                 'repo:'.implode(',', $events),
             ],

app/SourceControlProviders/Custom.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\SourceControlProviders;
-
-class Custom extends AbstractSourceControlProvider
-{
-    public function connect(): bool
-    {
-        return true;
-    }
-
-    public function getRepo(string $repo = null): string
-    {
-        return '';
-    }
-
-    public function fullRepoUrl(string $repo, string $key): string
-    {
-        return $repo;
-    }
-
-    public function deployHook(string $repo, array $events, string $secret): array
-    {
-        return [];
-    }
-
-    public function destroyHook(string $repo, string $hookId): void
-    {
-        // TODO: Implement destroyHook() method.
-    }
-
-    public function getLastCommit(string $repo, string $branch): ?array
-    {
-        return null;
-    }
-
-    public function deployKey(string $title, string $repo, string $key): void
-    {
-        // TODO: Implement deployKey() method.
-    }
-}

app/SourceControlProviders/Github.php

@@ -25,7 +25,7 @@ public function connect(): bool
     /**
      * @throws Exception
      */
-    public function getRepo(string $repo = null): mixed
+    public function getRepo(?string $repo = null): mixed
     {
         if ($repo) {
             $url = $this->apiUrl.'/repos/'.$repo;
@@ -59,7 +59,7 @@ public function deployHook(string $repo, array $events, string $secret): array
             'name' => 'web',
             'events' => $events,
             'config' => [
-                'url' => url('/git-hooks?secret='.$secret),
+                'url' => url('/api/git-hooks?secret='.$secret),
                 'content_type' => 'json',
             ],
             'active' => true,

app/SourceControlProviders/Gitlab.php

@@ -25,7 +25,7 @@ public function connect(): bool
     /**
      * @throws Exception
      */
-    public function getRepo(string $repo = null): mixed
+    public function getRepo(?string $repo = null): mixed
     {
         $repository = $repo ? urlencode($repo) : null;
         $res = Http::withToken($this->sourceControl->access_token)
@@ -53,7 +53,7 @@ public function deployHook(string $repo, array $events, string $secret): array
             $this->getApiUrl().'/projects/'.$repository.'/hooks',
             [
                 'description' => 'deploy',
-                'url' => url('/git-hooks?secret='.$secret),
+                'url' => url('/api/git-hooks?secret='.$secret),
                 'push_events' => in_array('push', $events),
                 'issues_events' => false,
                 'job_events' => false,

app/Support/Testing/SSHFake.php

@@ -15,7 +15,7 @@ class SSHFake
 
     protected string $output = '';
 
-    public function init(Server $server, string $asUser = null): self
+    public function init(Server $server, ?string $asUser = null): self
     {
         return $this;
     }
@@ -47,7 +47,7 @@ public function assertExecuted(array|string $commands): void
         PHPUnit::assertTrue(true, $allExecuted);
     }
 
-    public function exec(string|array|SSHCommand $commands, string $log = '', int $siteId = null): string
+    public function exec(string|array|SSHCommand $commands, string $log = '', ?int $siteId = null): string
     {
         if (! is_array($commands)) {
             $commands = [$commands];

composer.json

@@ -16,6 +16,7 @@
         "laravel/tinker": "^2.8",
         "livewire/livewire": "^2.12",
         "phpseclib/phpseclib": "~3.0",
+        "opcodesio/log-viewer": "^2.5",
         "ext-ftp": "*"
     },
     "require-dev": {
@@ -24,7 +25,6 @@
         "laravel/sail": "^1.18",
         "mockery/mockery": "^1.4.4",
         "nunomaduro/collision": "^7.0",
-        "opcodesio/log-viewer": "^2.5",
         "phpunit/phpunit": "^10.0",
         "spatie/laravel-ignition": "^2.0"
     },

config/core.php

@@ -25,8 +25,8 @@
 use App\ServiceHandlers\Webserver\Nginx;
 use App\SiteTypes\Laravel;
 use App\SiteTypes\PHPSite;
+use App\SiteTypes\Wordpress;
 use App\SourceControlProviders\Bitbucket;
-use App\SourceControlProviders\Custom;
 use App\SourceControlProviders\Github;
 use App\SourceControlProviders\Gitlab;
 use App\StorageProviders\Dropbox;
@@ -263,12 +263,12 @@
     'site_types' => [
         \App\Enums\SiteType::PHP,
         \App\Enums\SiteType::LARAVEL,
-        // \App\Enums\SiteType::WORDPRESS,
+        \App\Enums\SiteType::WORDPRESS,
     ],
     'site_types_class' => [
         \App\Enums\SiteType::PHP => PHPSite::class,
         \App\Enums\SiteType::LARAVEL => Laravel::class,
-        // \App\Enums\SiteType::WORDPRESS => Wordpress::class,
+        \App\Enums\SiteType::WORDPRESS => Wordpress::class,
     ],
 
     /*
@@ -284,7 +284,6 @@
         'github' => Github::class,
         'gitlab' => Gitlab::class,
         'bitbucket' => Bitbucket::class,
-        'custom' => Custom::class,
     ],
 
     /*
@@ -292,11 +291,12 @@
      */
     'php_extensions' => [
         'imagick',
-        'geoip',
         'exif',
         'gmagick',
         'gmp',
         'intl',
+        'sqlite3',
+        'opcache',
     ],
 
     /*

config/log-viewer.php

@@ -0,0 +1,217 @@
+<?php
+
+use Opcodes\LogViewer\Level;
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer
+    |--------------------------------------------------------------------------
+    | Log Viewer can be disabled, so it's no longer accessible via browser.
+    |
+    */
+
+    'enabled' => env('LOG_VIEWER_ENABLED', true),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer Domain
+    |--------------------------------------------------------------------------
+    | You may change the domain where Log Viewer should be active.
+    | If the domain is empty, all domains will be valid.
+    |
+    */
+
+    'route_domain' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer Route
+    |--------------------------------------------------------------------------
+    | Log Viewer will be available under this URL.
+    |
+    */
+
+    'route_path' => 'log-viewer',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Back to system URL
+    |--------------------------------------------------------------------------
+    | When set, displays a link to easily get back to this URL.
+    | Set to `null` to hide this link.
+    |
+    | Optional label to display for the above URL.
+    |
+    */
+
+    'back_to_system_url' => config('app.url', null),
+
+    'back_to_system_label' => null, // Displayed by default: "Back to {{ app.name }}"
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer time zone.
+    |--------------------------------------------------------------------------
+    | The time zone in which to display the times in the UI. Defaults to
+    | the application's timezone defined in config/app.php.
+    |
+    */
+
+    'timezone' => null,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer route middleware.
+    |--------------------------------------------------------------------------
+    | Optional middleware to use when loading the initial Log Viewer page.
+    |
+    */
+
+    'middleware' => [
+        'web',
+        \Opcodes\LogViewer\Http\Middleware\AuthorizeLogViewer::class,
+        'auth',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer API middleware.
+    |--------------------------------------------------------------------------
+    | Optional middleware to use on every API request. The same API is also
+    | used from within the Log Viewer user interface.
+    |
+    */
+
+    'api_middleware' => [
+        \Opcodes\LogViewer\Http\Middleware\EnsureFrontendRequestsAreStateful::class,
+        \Opcodes\LogViewer\Http\Middleware\AuthorizeLogViewer::class,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log Viewer Remote hosts.
+    |--------------------------------------------------------------------------
+    | Log Viewer supports viewing Laravel logs from remote hosts. They must
+    | be running Log Viewer as well. Below you can define the hosts you
+    | would like to show in this Log Viewer instance.
+    |
+    */
+
+    'hosts' => [
+        'local' => [
+            'name' => ucfirst(env('APP_ENV', 'local')),
+        ],
+
+        // 'staging' => [
+        //     'name' => 'Staging',
+        //     'host' => 'https://staging.example.com/log-viewer',
+        //     'auth' => [      // Example of HTTP Basic auth
+        //         'username' => 'username',
+        //         'password' => 'password',
+        //     ],
+        // ],
+        //
+        // 'production' => [
+        //     'name' => 'Production',
+        //     'host' => 'https://example.com/log-viewer',
+        //     'auth' => [      // Example of Bearer token auth
+        //         'token' => env('LOG_VIEWER_PRODUCTION_TOKEN'),
+        //     ],
+        //     'headers' => [
+        //         'X-Foo' => 'Bar',
+        //     ],
+        // ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Include file patterns
+    |--------------------------------------------------------------------------
+    |
+    */
+
+    'include_files' => [
+        '*.log',
+        '**/*.log',
+        // '/absolute/paths/supported',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Exclude file patterns.
+    |--------------------------------------------------------------------------
+    | This will take precedence over included files.
+    |
+    */
+
+    'exclude_files' => [
+        // 'my_secret.log'
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    |  Shorter stack trace filters.
+    |--------------------------------------------------------------------------
+    | Lines containing any of these strings will be excluded from the full log.
+    | This setting is only active when the function is enabled via the user interface.
+    |
+    */
+
+    'shorter_stack_trace_excludes' => [
+        '/vendor/symfony/',
+        '/vendor/laravel/framework/',
+        '/vendor/barryvdh/laravel-debugbar/',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Log matching patterns
+    |--------------------------------------------------------------------------
+    | Regexes for matching log files
+    |
+    */
+
+    'patterns' => [
+        'laravel' => [
+            'log_matching_regex' => '/^\[(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}\.?(\d{6}([\+-]\d\d:\d\d)?)?)\].*/',
+
+            /**
+             * This pattern, used for processing Laravel logs, returns these results:
+             * $matches[0] - the full log line being tested.
+             * $matches[1] - full timestamp between the square brackets (includes microseconds and timezone offset)
+             * $matches[2] - timestamp microseconds, if available
+             * $matches[3] - timestamp timezone offset, if available
+             * $matches[4] - contents between timestamp and the severity level
+             * $matches[5] - environment (local, production, etc)
+             * $matches[6] - log severity (info, debug, error, etc)
+             * $matches[7] - the log text, the rest of the text.
+             */
+            'log_parsing_regex' => '/^\[(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}\.?(\d{6}([\+-]\d\d:\d\d)?)?)\](.*?(\w+)\.|.*?)('
+                .implode('|', array_filter(Level::caseValues()))
+                .')?: (.*?)( in [\/].*?:[0-9]+)?$/is',
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Cache driver
+    |--------------------------------------------------------------------------
+    | Cache driver to use for storing the log indices. Indices are used to speed up
+    | log navigation. Defaults to your application's default cache driver.
+    |
+    */
+
+    'cache_driver' => env('LOG_VIEWER_CACHE_DRIVER', null),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Chunk size when scanning log files lazily
+    |--------------------------------------------------------------------------
+    | The size in MB of files to scan before updating the progress bar when searching across all files.
+    |
+    */
+
+    'lazy_scan_chunk_size_in_mb' => 50,
+];

database/factories/GitHookFactory.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\GitHook;
+use App\Models\Site;
+use App\Models\SourceControl;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
+
+class GitHookFactory extends Factory
+{
+    protected $model = GitHook::class;
+
+    public function definition(): array
+    {
+        return [
+            'secret' => $this->faker->word(),
+            'events' => $this->faker->words(),
+            'actions' => $this->faker->words(),
+            'hook_id' => $this->faker->word(),
+            'hook_response' => $this->faker->words(),
+            'created_at' => Carbon::now(),
+            'updated_at' => Carbon::now(),
+            'site_id' => Site::factory(),
+            'source_control_id' => SourceControl::factory(),
+        ];
+    }
+}

database/factories/ProjectFactory.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Project;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
+
+/**
+ * @extends Factory<Project>
+ */
+class ProjectFactory extends Factory
+{
+    protected $model = Project::class;
+
+    public function definition(): array
+    {
+        return [
+            'user_id' => $this->faker->randomNumber(),
+            'name' => $this->faker->name(),
+            'created_at' => Carbon::now(),
+            'updated_at' => Carbon::now(),
+        ];
+    }
+}

database/factories/SourceControlFactory.php

@@ -13,7 +13,6 @@ class SourceControlFactory extends Factory
     public function definition(): array
     {
         return [
-            'provider' => $this->faker->randomElement(\App\Enums\SourceControl::getValues()),
             'access_token' => Str::random(10),
         ];
     }
@@ -44,13 +43,4 @@ public function bitbucket(): Factory
             ];
         });
     }
-
-    public function custom(): Factory
-    {
-        return $this->state(function (array $attributes) {
-            return [
-                'provider' => \App\Enums\SourceControl::CUSTOM,
-            ];
-        });
-    }
 }

database/migrations/2023_10_01_120250_create_projects_table.php

@@ -0,0 +1,23 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('projects', function (Blueprint $table) {
+            $table->id();
+            $table->bigInteger('user_id');
+            $table->string('name');
+            $table->timestamps();
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('projects');
+    }
+};

database/migrations/2024_01_01_232932_update_servers_table.php

@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->unsignedBigInteger('project_id')->nullable()->after('id');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('servers', function (Blueprint $table) {
+            $table->dropColumn('project_id');
+        });
+    }
+};

database/migrations/2024_01_01_235900_update_users_table.php

@@ -0,0 +1,27 @@
+<?php
+
+use App\Models\User;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->unsignedBigInteger('current_project_id')->nullable()->after('timezone');
+        });
+        User::query()->each(function (User $user) {
+            $project = $user->createDefaultProject();
+            $user->servers()->update(['project_id' => $project->id]);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('current_project_id');
+        });
+    }
+};

database/seeders/DatabaseSeeder.php

@@ -22,6 +22,7 @@ public function run(): void
         ]);
         $server = Server::factory()->create([
             'user_id' => $user->id,
+            'project_id' => $user->currentProject->id,
         ]);
         $server->services()->create([
             'type' => 'database',

package-lock.json

@@ -10,10 +10,10 @@
                 "@tailwindcss/typography": "^0.5.9",
                 "alpinejs": "^3.4.2",
                 "autoprefixer": "^10.4.2",
-                "axios": "^1.1.2",
+                "axios": "^1.6.0",
                 "laravel-echo": "^1.15.0",
                 "laravel-vite-plugin": "^0.7.2",
-                "postcss": "^8.4.6",
+                "postcss": "^8.4.31",
                 "pusher-js": "^4.3.1",
                 "tailwindcss": "^3.1.0",
                 "toastr": "^2.1.4",
@@ -596,9 +596,9 @@
             }
         },
         "node_modules/axios": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
-            "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+            "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
             "dev": true,
             "dependencies": {
                 "follow-redirects": "^1.15.0",
@@ -1380,9 +1380,9 @@
             }
         },
         "node_modules/postcss": {
-            "version": "8.4.21",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
-            "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
+            "version": "8.4.31",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+            "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
             "dev": true,
             "funding": [
                 {
@@ -1392,10 +1392,14 @@
                 {
                     "type": "tidelift",
                     "url": "https://tidelift.com/funding/github/npm/postcss"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
                 }
             ],
             "dependencies": {
-                "nanoid": "^3.3.4",
+                "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
                 "source-map-js": "^1.0.2"
             },
@@ -2284,9 +2288,9 @@
             }
         },
         "axios": {
-            "version": "1.3.5",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.3.5.tgz",
-            "integrity": "sha512-glL/PvG/E+xCWwV8S6nCHcrfg1exGx7vxyUIivIA1iL7BIh6bePylCfVHwp6k13ao7SATxB6imau2kqY+I67kw==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.0.tgz",
+            "integrity": "sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==",
             "dev": true,
             "requires": {
                 "follow-redirects": "^1.15.0",
@@ -2852,12 +2856,12 @@
             "dev": true
         },
         "postcss": {
-            "version": "8.4.21",
-            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.21.tgz",
-            "integrity": "sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==",
+            "version": "8.4.31",
+            "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz",
+            "integrity": "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ==",
             "dev": true,
             "requires": {
-                "nanoid": "^3.3.4",
+                "nanoid": "^3.3.6",
                 "picocolors": "^1.0.0",
                 "source-map-js": "^1.0.2"
             }

package.json

@@ -12,10 +12,10 @@
         "@tailwindcss/typography": "^0.5.9",
         "alpinejs": "^3.4.2",
         "autoprefixer": "^10.4.2",
-        "axios": "^1.1.2",
+        "axios": "^1.6.0",
         "laravel-echo": "^1.15.0",
         "laravel-vite-plugin": "^0.7.2",
-        "postcss": "^8.4.6",
+        "postcss": "^8.4.31",
         "pusher-js": "^4.3.1",
         "tailwindcss": "^3.1.0",
         "toastr": "^2.1.4",

public/build/manifest.json

@@ -1,11 +1,11 @@
 {
   "resources/css/app.css": {
-    "file": "assets/app-46ad72d7.css",
+    "file": "assets/app-f482c864.css",
     "isEntry": true,
     "src": "resources/css/app.css"
   },
   "resources/js/app.js": {
-    "file": "assets/app-dfd48f80.js",
+    "file": "assets/app-9aa488bb.js",
     "isEntry": true,
     "src": "resources/js/app.js"
   }

public/vendor/log-viewer/mix-manifest.json

@@ -1,6 +1,6 @@
 {
-    "/app.js": "/app.js?id=2ca3fa12f273bd645611f1acf3d81355",
-    "/app.css": "/app.css?id=93151d8b186ef7758df8582425ff8082",
+    "/app.js": "/app.js?id=5f574f36f456b103dffcfa21d5612785",
+    "/app.css": "/app.css?id=b701a4344131bb2c00e9f0b1ef1ab3c1",
     "/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",
     "/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",
     "/img/log-viewer-64.png": "/img/log-viewer-64.png?id=8902d596fc883ca9eb8105bb683568c6"

resources/views/layouts/app.blade.php

@@ -37,110 +37,121 @@
         <div
             class="left-0 top-0 min-h-screen w-64 flex-none bg-gray-800 dark:bg-gray-800/50 p-3 dark:border-r-2 dark:border-gray-800">
             <div class="h-16 block">
-                <div class="flex items-center justify-start text-3xl font-extrabold text-white">
-                    Vito
+                <div class="flex items-center justify-start text-2xl font-extrabold text-white">
+                    <x-application-logo class="w-7 h-7 rounded-md" />
+                    <span class="ml-1">Deploy</span>
                 </div>
             </div>
 
-            <div class="mb-5 space-y-2">
-                @include('layouts.partials.server-select', ['server' => isset($server) ? $server : null])
+            <div class="mb-5">
+                <div class="uppercase text-gray-300 text-sm font-semibold">{{ __("Projects") }}</div>
+                <div class="mt-2">
+                    @include('layouts.partials.project-select', ['project' => auth()->user()->currentProject])
+                </div>
+
+                <div class="mt-5 uppercase text-gray-300 text-sm font-semibold">{{ __("Servers") }}</div>
+                <div class="mt-2">
+                    @include('layouts.partials.server-select', ['server' => isset($server) ? $server : null])
+                </div>
 
                 @if (isset($server))
-                    <x-sidebar-link :href="route('servers.show', ['server' => $server])" :active="request()->routeIs('servers.show')">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                            stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round"
-                                d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
-                        </svg>
-                        <span class="ml-2 text-gray-50">{{ __('Overview') }}</span>
-                    </x-sidebar-link>
-                    @if ($server->isReady())
-                        @if ($server->webserver())
-                            <x-sidebar-link :href="route('servers.sites', ['server' => $server])" :active="request()->routeIs('servers.sites') || request()->is('servers/*/sites/*')">
+                    <div class="mt-3 space-y-1">
+                        <x-sidebar-link :href="route('servers.show', ['server' => $server])" :active="request()->routeIs('servers.show')">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-6 h-6">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
+                            </svg>
+                            <span class="ml-2 text-gray-50">{{ __('Overview') }}</span>
+                        </x-sidebar-link>
+                        @if ($server->isReady())
+                            @if ($server->webserver())
+                                <x-sidebar-link :href="route('servers.sites', ['server' => $server])" :active="request()->routeIs('servers.sites') || request()->is('servers/*/sites/*')">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418" />
+                                    </svg>
+                                    <span class="ml-2 text-gray-50">{{ __('Sites') }}</span>
+                                </x-sidebar-link>
+                            @endif
+                            @if ($server->database())
+                                <x-sidebar-link :href="route('servers.databases', ['server' => $server])" :active="request()->routeIs('servers.databases') ||
+                                    request()->routeIs('servers.databases.backups')">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125" />
+                                    </svg>
+                                    <span class="ml-2 text-gray-50">{{ __('Databases') }}</span>
+                                </x-sidebar-link>
+                            @endif
+                            @if ($server->php())
+                                <x-sidebar-link :href="route('servers.php', ['server' => $server])" :active="request()->routeIs('servers.php')">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M17.25 6.75L22.5 12l-5.25 5.25m-10.5 0L1.5 12l5.25-5.25m7.5-3l-4.5 16.5" />
+                                    </svg>
+                                    <span class="ml-2 text-gray-50">{{ __('PHP') }}</span>
+                                </x-sidebar-link>
+                            @endif
+                            @if ($server->firewall())
+                                <x-sidebar-link :href="route('servers.firewall', ['server' => $server])" :active="request()->routeIs('servers.firewall')">
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.21 0 003 2.48z" />
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M12 18a3.75 3.75 0 00.495-7.467 5.99 5.99 0 00-1.925 3.546 5.974 5.974 0 01-2.133-1A3.75 3.75 0 0012 18z" />
+                                    </svg>
+                                    <span class="ml-2 text-gray-50">{{ __('Firewall') }}</span>
+                                </x-sidebar-link>
+                            @endif
+                            <x-sidebar-link :href="route('servers.cronjobs', ['server' => $server])" :active="request()->routeIs('servers.cronjobs')">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                     stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                                     <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M12 21a9.004 9.004 0 008.716-6.747M12 21a9.004 9.004 0 01-8.716-6.747M12 21c2.485 0 4.5-4.03 4.5-9S14.485 3 12 3m0 18c-2.485 0-4.5-4.03-4.5-9S9.515 3 12 3m0 0a8.997 8.997 0 017.843 4.582M12 3a8.997 8.997 0 00-7.843 4.582m15.686 0A11.953 11.953 0 0112 10.5c-2.998 0-5.74-1.1-7.843-2.918m15.686 0A8.959 8.959 0 0121 12c0 .778-.099 1.533-.284 2.253m0 0A17.919 17.919 0 0112 16.5c-3.162 0-6.133-.815-8.716-2.247m0 0A9.015 9.015 0 013 12c0-1.605.42-3.113 1.157-4.418" />
+                                        d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z" />
                                 </svg>
-                                <span class="ml-2 text-gray-50">{{ __('Sites') }}</span>
+                                <span class="ml-2 text-gray-50">{{ __('Cronjobs') }}</span>
                             </x-sidebar-link>
-                        @endif
-                        @if ($server->database())
-                            <x-sidebar-link :href="route('servers.databases', ['server' => $server])" :active="request()->routeIs('servers.databases') ||
-                                request()->routeIs('servers.databases.backups')">
+                            <x-sidebar-link :href="route('servers.ssh-keys', ['server' => $server])" :active="request()->routeIs('servers.ssh-keys')">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                     stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                                     <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M20.25 6.375c0 2.278-3.694 4.125-8.25 4.125S3.75 8.653 3.75 6.375m16.5 0c0-2.278-3.694-4.125-8.25-4.125S3.75 4.097 3.75 6.375m16.5 0v11.25c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125V6.375m16.5 0v3.75m-16.5-3.75v3.75m16.5 0v3.75C20.25 16.153 16.556 18 12 18s-8.25-1.847-8.25-4.125v-3.75m16.5 0c0 2.278-3.694 4.125-8.25 4.125s-8.25-1.847-8.25-4.125" />
+                                        d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z" />
                                 </svg>
-                                <span class="ml-2 text-gray-50">{{ __('Databases') }}</span>
+                                <span class="ml-2 text-gray-50">{{ __('SSH Keys') }}</span>
                             </x-sidebar-link>
-                        @endif
-                        @if ($server->php())
-                            <x-sidebar-link :href="route('servers.php', ['server' => $server])" :active="request()->routeIs('servers.php')">
+                            <x-sidebar-link :href="route('servers.services', ['server' => $server])" :active="request()->routeIs('servers.services')">
                                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                     stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                                     <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M17.25 6.75L22.5 12l-5.25 5.25m-10.5 0L1.5 12l5.25-5.25m7.5-3l-4.5 16.5" />
+                                        d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                                 </svg>
-                                <span class="ml-2 text-gray-50">{{ __('PHP') }}</span>
+                                <span class="ml-2 text-gray-50">{{ __('Services') }}</span>
                             </x-sidebar-link>
                         @endif
-                        @if ($server->firewall())
-                            <x-sidebar-link :href="route('servers.firewall', ['server' => $server])" :active="request()->routeIs('servers.firewall')">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.21 0 003 2.48z" />
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="M12 18a3.75 3.75 0 00.495-7.467 5.99 5.99 0 00-1.925 3.546 5.974 5.974 0 01-2.133-1A3.75 3.75 0 0012 18z" />
-                                </svg>
-                                <span class="ml-2 text-gray-50">{{ __('Firewall') }}</span>
-                            </x-sidebar-link>
-                        @endif
-                        <x-sidebar-link :href="route('servers.cronjobs', ['server' => $server])" :active="request()->routeIs('servers.cronjobs')">
+                        <x-sidebar-link :href="route('servers.settings', ['server' => $server])" :active="request()->routeIs('servers.settings')">
                             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                                 <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M12 6v6h4.5m4.5 0a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                    d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z" />
                             </svg>
-                            <span class="ml-2 text-gray-50">{{ __('Cronjobs') }}</span>
+                            <span class="ml-2 text-gray-50">{{ __('Settings') }}</span>
                         </x-sidebar-link>
-                        <x-sidebar-link :href="route('servers.ssh-keys', ['server' => $server])" :active="request()->routeIs('servers.ssh-keys')">
+                        <x-sidebar-link :href="route('servers.logs', ['server' => $server])" :active="request()->routeIs('servers.logs')">
                             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
                                 <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M15.75 5.25a3 3 0 013 3m3 0a6 6 0 01-7.029 5.912c-.563-.097-1.159.026-1.563.43L10.5 17.25H8.25v2.25H6v2.25H2.25v-2.818c0-.597.237-1.17.659-1.591l6.499-6.499c.404-.404.527-1 .43-1.563A6 6 0 1121.75 8.25z" />
+                                    d="M6.429 9.75L2.25 12l4.179 2.25m0-4.5l5.571 3 5.571-3m-11.142 0L2.25 7.5 12 2.25l9.75 5.25-4.179 2.25m0 0L21.75 12l-4.179 2.25m0 0l4.179 2.25L12 21.75 2.25 16.5l4.179-2.25m11.142 0l-5.571 3-5.571-3" />
                             </svg>
-                            <span class="ml-2 text-gray-50">{{ __('SSH Keys') }}</span>
+                            <span class="ml-2 text-gray-50">{{ __('Logs') }}</span>
                         </x-sidebar-link>
-                        <x-sidebar-link :href="route('servers.services', ['server' => $server])" :active="request()->routeIs('servers.services')">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                                <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.213 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
-                                <path stroke-linecap="round" stroke-linejoin="round"
-                                    d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                            </svg>
-                            <span class="ml-2 text-gray-50">{{ __('Services') }}</span>
-                        </x-sidebar-link>
-                    @endif
-                    <x-sidebar-link :href="route('servers.settings', ['server' => $server])" :active="request()->routeIs('servers.settings')">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                            stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round"
-                                d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-.233c.55-.164 1.163-.188 1.743-.14a4.5 4.5 0 004.486-6.336l-3.276 3.277a3.004 3.004 0 01-2.25-2.25l3.276-3.276a4.5 4.5 0 00-6.336 4.486c.091 1.076-.071 2.264-.904 2.95l-.102.085m-1.745 1.437L5.909 7.5H4.5L2.25 3.75l1.5-1.5L7.5 4.5v1.409l4.26 4.26m-1.745 1.437l1.745-1.437m6.615 8.206L15.75 15.75M4.867 19.125h.008v.008h-.008v-.008z" />
-                        </svg>
-                        <span class="ml-2 text-gray-50">{{ __('Settings') }}</span>
-                    </x-sidebar-link>
-                    <x-sidebar-link :href="route('servers.logs', ['server' => $server])" :active="request()->routeIs('servers.logs')">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                            stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round"
-                                d="M6.429 9.75L2.25 12l4.179 2.25m0-4.5l5.571 3 5.571-3m-11.142 0L2.25 7.5 12 2.25l9.75 5.25-4.179 2.25m0 0L21.75 12l-4.179 2.25m0 0l4.179 2.25L12 21.75 2.25 16.5l4.179-2.25m11.142 0l-5.571 3-5.571-3" />
-                        </svg>
-                        <span class="ml-2 text-gray-50">{{ __('Logs') }}</span>
-                    </x-sidebar-link>
+                    </div>
                 @endif
             </div>
         </div>
@@ -160,45 +171,7 @@ class="min-h-screen w-64 flex-none border-r border-gray-200 bg-white dark:border
                         <div class="flex items-center justify-center">
                             {{-- Search --}}
                         </div>
-                        {{-- Dark Mode Toggle Button section  --}}
-                        <div class="flex items-center" x-data="{
-                            isDarkMode: localStorage.theme,
-                            toggleTheme() {
-                                localStorage.theme = this.isDarkMode == 'dark' ? 'light' : 'dark';
-
-                                if (localStorage.theme === 'dark') {
-                                    document.documentElement.classList.add('dark')
-                                } else {
-                                    document.documentElement.classList.remove('dark')
-                                }
-
-                                this.isDarkMode = localStorage.theme
-                            }
-                        }" x-on:click="toggleTheme()">
-                            <div class="flex items-center">
-                                <div class="flex items-center justify-end">
-                                    <button id="theme-toggle" type="button" class="text-sm p-2"
-                                        :class="isDarkMode == 'dark' ? 'text-gray-300 border-gray-300' :
-                                            'text-gray-800 border-gray-800'">
-                                        <svg x-show="isDarkMode!='dark'" id="theme-toggle-dark-icon" class="w-5 h-5"
-                                            fill="currentColor" viewBox="0 0 20 20"
-                                            xmlns="http://www.w3.org/2000/svg">
-                                            <path
-                                                d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z">
-                                            </path>
-                                        </svg>
-                                        <svg x-show="isDarkMode=='dark'" id="theme-toggle-light-icon" class="w-5 h-5"
-                                            fill="currentColor" viewBox="0 0 20 20"
-                                            xmlns="http://www.w3.org/2000/svg">
-                                            <path
-                                                d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
-                                                fillRule="evenodd" clipRule="evenodd"></path>
-                                        </svg>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                        {{-- End of Dark Mode Toggle Button section  --}}
+                        @include('layouts.partials.color-scheme')
                         <div class="ml-6 flex items-center">
                             <div class="relative ml-5">
                                 <x-dropdown align="right" width="48">

resources/views/layouts/guest.blade.php

@@ -20,11 +20,14 @@
         <div class="min-h-screen flex flex-col sm:justify-center items-center pt-6 sm:pt-0 bg-gray-100 dark:bg-gray-900">
             <div>
                 <a href="/">
-                    <x-application-logo class="w-20 h-20 fill-current text-gray-500 rounded-lg" />
+                    <div class="flex items-center justify-start text-3xl font-extrabold">
+                        <x-application-logo class="w-9 h-9 rounded-md" />
+                        <span class="ml-1">Deploy</span>
+                    </div>
                 </a>
             </div>
 
-            <div class="w-full sm:max-w-md mt-6 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden rounded-lg">
+            <div class="w-full sm:max-w-md mt-10 px-6 py-4 bg-white dark:bg-gray-800 shadow-md overflow-hidden rounded-lg">
                 {{ $slot }}
             </div>
         </div>

resources/views/layouts/partials/color-scheme.blade.php

@@ -0,0 +1,37 @@
+<div class="flex items-center" x-data="{
+    isDarkMode: localStorage.theme,
+    toggleTheme() {
+        localStorage.theme = this.isDarkMode === 'dark' ? 'light' : 'dark';
+
+        if (localStorage.theme === 'dark') {
+            document.documentElement.classList.add('dark')
+        } else {
+            document.documentElement.classList.remove('dark')
+        }
+
+        this.isDarkMode = localStorage.theme
+    }
+}" x-on:click="toggleTheme()">
+    <div class="flex items-center">
+        <div class="flex items-center justify-end">
+            <button id="theme-toggle" type="button" class="text-sm p-2"
+                :class="isDarkMode === 'dark' ? 'text-gray-300 border-gray-300' :
+                    'text-gray-800 border-gray-800'">
+                <svg x-show="isDarkMode !== 'dark'" id="theme-toggle-dark-icon" class="w-5 h-5"
+                    fill="currentColor" viewBox="0 0 20 20"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        d="M17.293 13.293A8 8 0 016.707 2.707a8.001 8.001 0 1010.586 10.586z">
+                    </path>
+                </svg>
+                <svg x-show="isDarkMode === 'dark'" id="theme-toggle-light-icon" class="w-5 h-5"
+                    fill="currentColor" viewBox="0 0 20 20"
+                    xmlns="http://www.w3.org/2000/svg">
+                    <path
+                        d="M10 2a1 1 0 011 1v1a1 1 0 11-2 0V3a1 1 0 011-1zm4 8a4 4 0 11-8 0 4 4 0 018 0zm-.464 4.95l.707.707a1 1 0 001.414-1.414l-.707-.707a1 1 0 00-1.414 1.414zm2.12-10.607a1 1 0 010 1.414l-.706.707a1 1 0 11-1.414-1.414l.707-.707a1 1 0 011.414 0zM17 11a1 1 0 100-2h-1a1 1 0 100 2h1zm-7 4a1 1 0 011 1v1a1 1 0 11-2 0v-1a1 1 0 011-1zM5.05 6.464A1 1 0 106.465 5.05l-.708-.707a1 1 0 00-1.414 1.414l.707.707zm1.414 8.486l-.707.707a1 1 0 01-1.414-1.414l.707-.707a1 1 0 011.414 1.414zM4 11a1 1 0 100-2H3a1 1 0 000 2h1z"
+                        fillRule="evenodd" clipRule="evenodd"></path>
+                </svg>
+            </button>
+        </div>
+    </div>
+</div>

resources/views/layouts/partials/project-select.blade.php

@@ -0,0 +1,90 @@
+<div x-data="projectCombobox()">
+    <div class="relative">
+        <div @click="open = !open" class="z-0 w-full cursor-pointer px-4 py-3 pr-10 text-md leading-5 text-gray-100 focus:ring-1 focus:ring-gray-700 bg-gray-900 rounded-md h-10 flex items-center" x-text="selected.name ?? 'Select Project'"></div>
+        <button type="button" @click="open = !open" class="z-0 absolute inset-y-0 right-0 flex items-center pr-2">
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="h-5 w-5 text-gray-400"><path fill-rule="evenodd" d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z" clip-rule="evenodd"></path></svg>
+        </button>
+        <div
+            x-show="open"
+            @click.away="open = false"
+            class="z-10 absolute mt-1 w-full overflow-auto rounded-md pb-1 bg-white dark:bg-gray-700 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
+            <div class="p-2 relative">
+                <input x-model="query"
+                       @input="filterProjectsAndOpen"
+                       placeholder="Filter"
+                       class="w-full py-2 pl-3 pr-10 text-sm leading-5 dark:text-gray-100 focus:ring-1 focus:ring-gray-400 dark:focus:ring-800 bg-gray-200 dark:bg-gray-900 rounded-md"
+                >
+            </div>
+            <div class="relative max-h-[350px] overflow-y-auto">
+                <template x-for="(project, index) in filteredProjects" :key="index">
+                    <div
+                        @click="selectProject(project); open = false"
+                        :class="project.id === selected.id ? 'cursor-default bg-primary-600 text-white' : 'cursor-pointer'"
+                        class="relative select-none py-2 px-4 text-gray-700 dark:text-white hover:bg-primary-600 hover:text-white">
+                        <span class="block truncate" x-text="project.name"></span>
+                        <template x-if="project.id === selected.id">
+                            <span class="absolute inset-y-0 right-0 flex items-center pr-3 text-white">
+                                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="h-5 w-5"><path fill-rule="evenodd" d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z" clip-rule="evenodd"></path></svg>
+                            </span>
+                        </template>
+                    </div>
+                </template>
+            </div>
+            <div
+                x-show="filteredProjects.length === 0"
+                class="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-white block truncate">
+                No projects found!
+            </div>
+            <div class="py-1">
+                <hr class="border-gray-300 dark:border-gray-600">
+            </div>
+            <div>
+                <a
+                    href="{{ route('projects') }}"
+                    class="relative select-none py-2 px-4 text-gray-700 dark:text-white hover:bg-primary-600 hover:text-white block cursor-pointer">
+                    <span class="block truncate">Projects List</span>
+                </a>
+            </div>
+            <div>
+                <a
+                    href="{{ route('projects', ['create' => true]) }}"
+                    class="relative select-none py-2 px-4 text-gray-700 dark:text-white hover:bg-primary-600 hover:text-white block cursor-pointer">
+                    <span class="block truncate">Create a Project</span>
+                </a>
+            </div>
+        </div>
+    </div>
+</div>
+
+<script>
+    function projectCombobox() {
+        const projects = @json(auth()->user()->projects()->select('id', 'name')->get());
+        return {
+            open: false,
+            query: '',
+            projects: projects,
+            selected: @if(isset($project)) @json($project->only('id', 'name')) @else {} @endif,
+            filteredProjects: projects,
+            selectProject(project) {
+                if (this.selected.id !== project.id) {
+                    this.selected = project;
+                    window.location.href = '{{ url('/settings/projects/') }}/' + project.id
+                }
+            },
+            filterProjectsAndOpen() {
+                if (this.query === '') {
+                    this.filteredProjects = this.projects;
+                    this.open = false;
+                } else {
+                    this.filteredProjects = this.projects.filter((project) =>
+                        project.name
+                            .toLowerCase()
+                            .replace(/\s+/g, '')
+                            .includes(this.query.toLowerCase().replace(/\s+/g, ''))
+                    );
+                    this.open = true;
+                }
+            },
+        };
+    }
+</script>

resources/views/layouts/partials/server-select.blade.php

@@ -1,13 +1,13 @@
 <div x-data="serverCombobox()">
     <div class="relative">
-        <div @click="open = !open" class="w-full cursor-pointer px-4 py-3 pr-10 text-md leading-5 text-gray-100 focus:ring-1 focus:ring-gray-700 bg-gray-900 rounded-md h-10 flex items-center" x-text="selected.name ?? 'Select Server'"></div>
-        <button type="button" @click="open = !open" class="absolute inset-y-0 right-0 flex items-center pr-2">
+        <div @click="open = !open" class="z-0 w-full cursor-pointer px-4 py-3 pr-10 text-md leading-5 text-gray-100 focus:ring-1 focus:ring-gray-700 bg-gray-900 rounded-md h-10 flex items-center" x-text="selected.name ?? 'Select Server'"></div>
+        <button type="button" @click="open = !open" class="z-0 absolute inset-y-0 right-0 flex items-center pr-2">
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true" class="h-5 w-5 text-gray-400"><path fill-rule="evenodd" d="M10 3a.75.75 0 01.55.24l3.25 3.5a.75.75 0 11-1.1 1.02L10 4.852 7.3 7.76a.75.75 0 01-1.1-1.02l3.25-3.5A.75.75 0 0110 3zm-3.76 9.2a.75.75 0 011.06.04l2.7 2.908 2.7-2.908a.75.75 0 111.1 1.02l-3.25 3.5a.75.75 0 01-1.1 0l-3.25-3.5a.75.75 0 01.04-1.06z" clip-rule="evenodd"></path></svg>
         </button>
         <div
             x-show="open"
             @click.away="open = false"
-            class="absolute mt-1 w-full overflow-auto rounded-md pb-1 bg-white dark:bg-gray-700 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
+            class="z-10 absolute mt-1 w-full overflow-auto rounded-md pb-1 bg-white dark:bg-gray-700 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm">
             <div class="p-2 relative">
                 <input x-model="query"
                        @input="filterServersAndOpen"
@@ -58,7 +58,7 @@ class="relative select-none py-2 px-4 text-gray-700 dark:text-white hover:bg-pri
 
 <script>
     function serverCombobox() {
-        const servers = @json(\App\Models\Server::query()->select('id', 'name')->get());
+        const servers = @json(auth()->user()->currentProject->servers()->select('id', 'name')->get());
         return {
             open: false,
             query: '',

resources/views/layouts/profile.blade.php

@@ -16,6 +16,12 @@
                 </svg>
                 {{ __('Profile') }}
             </x-secondary-sidebar-link>
+            <x-secondary-sidebar-link :href="route('projects')" :active="request()->routeIs('projects')">
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-2">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="m7.875 14.25 1.214 1.942a2.25 2.25 0 0 0 1.908 1.058h2.006c.776 0 1.497-.4 1.908-1.058l1.214-1.942M2.41 9h4.636a2.25 2.25 0 0 1 1.872 1.002l.164.246a2.25 2.25 0 0 0 1.872 1.002h2.092a2.25 2.25 0 0 0 1.872-1.002l.164-.246A2.25 2.25 0 0 1 16.954 9h4.636M2.41 9a2.25 2.25 0 0 0-.16.832V12a2.25 2.25 0 0 0 2.25 2.25h15A2.25 2.25 0 0 0 21.75 12V9.832c0-.287-.055-.57-.16-.832M2.41 9a2.25 2.25 0 0 1 .382-.632l3.285-3.832a2.25 2.25 0 0 1 1.708-.786h8.43c.657 0 1.281.287 1.709.786l3.284 3.832c.163.19.291.404.382.632M4.5 20.25h15A2.25 2.25 0 0 0 21.75 18v-2.625c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125V18a2.25 2.25 0 0 0 2.25 2.25Z" />
+                </svg>
+                {{ __('Projects') }}
+            </x-secondary-sidebar-link>
             <x-secondary-sidebar-link :href="route('server-providers')" :active="request()->routeIs('server-providers')">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-2">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 14.25h13.5m-13.5 0a3 3 0 01-3-3m3 3a3 3 0 100 6h13.5a3 3 0 100-6m-16.5-3a3 3 0 013-3h13.5a3 3 0 013 3m-19.5 0a4.5 4.5 0 01.9-2.7L5.737 5.1a3.375 3.375 0 012.7-1.35h7.126c1.062 0 2.062.5 2.7 1.35l2.587 3.45a4.5 4.5 0 01.9 2.7m0 0a3 3 0 01-3 3m0 3h.008v.008h-.008v-.008zm0-6h.008v.008h-.008v-.008zm-3 6h.008v.008h-.008v-.008zm0-6h.008v.008h-.008v-.008z" />

resources/views/layouts/site.blade.php

@@ -1,3 +1,4 @@
+@php use App\Enums\SiteFeature; @endphp
 <x-app-layout :server="$site->server">
     @if(isset($pageTitle))
         <x-slot name="pageTitle">{{ $site->domain }} - {{ $pageTitle }}</x-slot>
@@ -58,10 +59,12 @@
             <x-secondary-sidebar-link :href="route('servers.sites.show', ['server' => $site->server, 'site' => $site])" :active="request()->routeIs('servers.sites.show')">
                 {{ __('Application') }}
             </x-secondary-sidebar-link>
-            @if($site->status == \App\Enums\SiteStatus::READY)
+            @if($site->isReady() && $site->hasFeature(SiteFeature::SSL))
                 <x-secondary-sidebar-link :href="route('servers.sites.ssl', ['server' => $site->server, 'site' => $site])" :active="request()->routeIs('servers.sites.ssl')">
                     {{ __('SSL') }}
                 </x-secondary-sidebar-link>
+            @endif
+            @if($site->isReady() && $site->hasFeature(SiteFeature::QUEUES))
                 <x-secondary-sidebar-link :href="route('servers.sites.queues', ['server' => $site->server, 'site' => $site])" :active="request()->routeIs('servers.sites.queues')">
                     {{ __('Queues') }}
                 </x-secondary-sidebar-link>

resources/views/livewire/application/auto-deployment.blade.php

@@ -0,0 +1,32 @@
+<div>
+    @if($site->deploymentScript?->content)
+        <x-dropdown>
+            <x-slot name="trigger">
+                <x-secondary-button>
+                    {{ __('Auto Deployment') }}
+                    <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" wire:click="enable">
+                    {{ __("Enable") }}
+                    @if($site->auto_deployment)
+                        <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 text-green-600">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                        </svg>
+                    @endif
+                </x-dropdown-link>
+                <x-dropdown-link class="cursor-pointer" wire:click="disable">
+                    {{ __("Disable") }}
+                    @if(!$site->auto_deployment)
+                        <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 text-green-600">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                        </svg>
+                    @endif
+                </x-dropdown-link>
+            </x-slot>
+        </x-dropdown>
+    @endif
+</div>

resources/views/livewire/application/change-branch.blade.php

@@ -1,5 +1,4 @@
 <div x-data="">
-    <x-secondary-button x-on:click="$dispatch('open-modal', 'change-branch')">{{ __("Branch") }}</x-secondary-button>
     <x-modal name="change-branch">
         <form wire:submit.prevent="change" class="p-6">
             <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">

resources/views/livewire/application/deployment-script.blade.php

@@ -1,5 +1,4 @@
 <div x-data="">
-    <x-secondary-button x-on:click="$dispatch('open-modal', 'deployment-script')">{{ __("Deployment Script") }}</x-secondary-button>
     <x-modal name="deployment-script">
         <form wire:submit.prevent="save" class="p-6">
             <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">

resources/views/livewire/application/env.blade.php

@@ -1,5 +1,4 @@
 <div x-data="">
-    <x-secondary-button x-on:click="$dispatch('open-modal', 'update-env')">{{ __(".env") }}</x-secondary-button>
     <x-modal name="update-env">
         <form wire:submit.prevent="save" class="p-6">
             <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">

resources/views/livewire/application/laravel-app.blade.php

@@ -5,17 +5,29 @@
         <x-slot name="aside">
             <div class="flex items-center">
                 <div class="mr-2">
-                    <livewire:application.change-branch :site="$site" />
-                </div>
-                <div class="mr-2">
-                    <livewire:application.deployment-script :site="$site" />
-                </div>
-                <div class="mr-2">
-                    <livewire:application.env :site="$site" />
-                </div>
-                <div>
                     <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>

resources/views/livewire/application/wordpress-app.blade.php

@@ -1,3 +1,6 @@
 <div>
-
+    <x-simple-card class="flex items-center justify-between">
+        <span>{{ __("Your Wordpress site is installed and ready to use! ") }}</span>
+        <x-secondary-button :href="$site->url" target="_blank">{{ __("Open Website") }}</x-secondary-button>
+    </x-simple-card>
 </div>

resources/views/livewire/php/installed-versions.blade.php

@@ -28,9 +28,9 @@
                                         </x-secondary-button>
                                     </x-slot>
                                     <x-slot name="content">
-                                        {{--<x-dropdown-link class="cursor-pointer">--}}
-                                        {{--    {{ __("Install Extension") }}--}}
-                                        {{--</x-dropdown-link>--}}
+                                        <x-dropdown-link class="cursor-pointer" x-on:click="$wire.extensionId = {{ $php->id }}; $dispatch('open-modal', 'install-extension')">
+                                            {{ __("Install Extension") }}
+                                        </x-dropdown-link>
                                         <x-dropdown-link class="cursor-pointer" x-on:click="$dispatch('open-modal', 'update-php-ini')" wire:click="loadIni({{ $php->id }})">
                                             {{ __("Edit php.ini") }}
                                         </x-dropdown-link>
@@ -52,6 +52,7 @@
         </div>
         @include('livewire.php.partials.uninstall-php')
         @include('livewire.php.partials.update-php-ini')
+        @include('livewire.php.partials.install-extension')
     @else
         <x-simple-card>
             <div class="text-center">

resources/views/livewire/php/partials/install-extension.blade.php

@@ -0,0 +1,36 @@
+<x-modal name="install-extension">
+    <form wire:submit.prevent="installExtension" class="p-6">
+        <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+            {{ __('Install Extension') }}
+        </h2>
+
+        <div class="mt-6">
+            <x-input-label for="extension" value="Name" />
+            <x-select-input wire:model.defer="extension" name="extension" class="mt-1 w-full">
+                <option value="" selected>{{ __("Select") }}</option>
+                @foreach(config('core.php_extensions') as $extension)
+                    <option value="{{ $extension }}" @if(in_array($extension, $installedExtensions)) disabled @endif>
+                        {{ $extension }} @if(in_array($extension, $installedExtensions)) ({{ __("Installed") }}) @endif
+                    </option>
+                @endforeach
+            </x-select-input>
+            @error('name')
+            <x-input-error class="mt-2" :messages="$message" />
+            @enderror
+        </div>
+
+        <div class="mt-6 flex items-center justify-end">
+            @if (session('status') === 'started-installation')
+                <p class="mr-2">{{ __('Installation Started!') }}</p>
+            @endif
+
+            <x-secondary-button type="button" x-on:click="$dispatch('close')">
+                {{ __('Cancel') }}
+            </x-secondary-button>
+
+            <x-primary-button class="ml-3">
+                {{ __('Install') }}
+            </x-primary-button>
+        </div>
+    </form>
+</x-modal>

resources/views/livewire/projects/create-project.blade.php

@@ -0,0 +1,31 @@
+<div>
+    <x-primary-button x-data="" x-on:click.prevent="$dispatch('open-modal', 'create-project')">
+        {{ __('Connect') }}
+    </x-primary-button>
+
+    <x-modal name="create-project" :show="$open">
+        <form wire:submit.prevent="create" class="p-6">
+            <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+                {{ __('Create Project') }}
+            </h2>
+
+            <div class="mt-6">
+                <x-input-label for="name" value="Name" />
+                <x-text-input wire:model.defer="inputs.name" id="name" name="name" type="text" class="mt-1 w-full" />
+                @error('name')
+                <x-input-error class="mt-2" :messages="$message" />
+                @enderror
+            </div>
+
+            <div class="mt-6 flex justify-end">
+                <x-secondary-button type="button" x-on:click="$dispatch('close')">
+                    {{ __('Cancel') }}
+                </x-secondary-button>
+
+                <x-primary-button class="ml-3" @created.window="$dispatch('close')">
+                    {{ __('Create') }}
+                </x-primary-button>
+            </div>
+        </form>
+    </x-modal>
+</div>

resources/views/livewire/projects/edit-project.blade.php

@@ -0,0 +1,31 @@
+<div>
+    <x-icon-button x-data="" x-on:click.prevent="$dispatch('open-modal', 'edit-project-{{ $project->id }}')">
+        {{ __('Edit') }}
+    </x-icon-button>
+
+    <x-modal name="edit-project-{{ $project->id }}">
+        <form wire:submit.prevent="save" class="p-6 text-left">
+            <h2 class="text-lg font-medium text-gray-900 dark:text-gray-100">
+                {{ __('Edit Project') }}
+            </h2>
+
+            <div class="mt-6">
+                <x-input-label for="edit-name-{{ $project->id }}" value="Name" />
+                <x-text-input wire:model.defer="inputs.name" id="edit-name-{{ $project->id }}" name="name" type="text" class="mt-1 w-full" />
+                @error('name')
+                <x-input-error class="mt-2" :messages="$message" />
+                @enderror
+            </div>
+
+            <div class="mt-6 flex justify-end">
+                <x-secondary-button type="button" x-on:click="$dispatch('close')">
+                    {{ __('Cancel') }}
+                </x-secondary-button>
+
+                <x-primary-button class="ml-3" @created.window="$dispatch('close')">
+                    {{ __('Save') }}
+                </x-primary-button>
+            </div>
+        </form>
+    </x-modal>
+</div>

resources/views/livewire/projects/projects-list.blade.php

@@ -0,0 +1,38 @@
+<div>
+    <x-card-header>
+        <x-slot name="title">{{ __("Projects") }}</x-slot>
+        <x-slot name="description">{{ __("Here you can manage your projects") }}</x-slot>
+        <x-slot name="aside">
+            <livewire:projects.create-project />
+        </x-slot>
+    </x-card-header>
+    <div x-data="" class="space-y-3">
+        @foreach($projects as $project)
+            <x-item-card>
+                <div class="ml-3 flex flex-grow flex-col items-start justify-center">
+                    <div class="mb-1 flex items-center">
+                        {{ $project->name }}
+                        @if($project->id == auth()->user()->current_project_id)
+                            <x-status status="success" class="ml-1">{{ __('Current') }}</x-status>
+                        @endif
+                    </div>
+                    <span class="text-sm text-gray-400">
+                        <x-datetime :value="$project->created_at" />
+                    </span>
+                </div>
+                <div class="flex items-center">
+                    <livewire:projects.edit-project :project="$project" />
+                    <x-icon-button x-on:click="$wire.deleteId = '{{ $project->id }}'; $dispatch('open-modal', 'delete-project')">
+                        Delete
+                    </x-icon-button>
+                </div>
+            </x-item-card>
+        @endforeach
+        <x-confirm-modal
+            name="delete-project"
+            :title="__('Confirm')"
+            :description="__('Deleting a project will delete all of its servers, sites, etc. Are you sure you want to delete this project?')"
+            method="delete"
+        />
+    </div>
+</div>

resources/views/livewire/sites/create-site.blade.php

@@ -5,10 +5,10 @@
         <form id="create-site" wire:submit.prevent="create" class="space-y-6">
             <div>
                 <x-input-label>{{ __("Select site type") }}</x-input-label>
-                <x-select-input wire:model="type" id="type" name="type" class="mt-1 w-full">
+                <x-select-input wire:model="inputs.type" id="type" name="type" class="mt-1 w-full">
                     <option value="" selected disabled>{{ __("Select") }}</option>
                     @foreach(config('core.site_types') as $t)
-                        <option value="{{ $t }}" @if($t === $type) selected @endif>
+                        <option value="{{ $t }}" @if($t === $inputs['type']) selected @endif>
                             {{ $t }}
                         </option>
                     @endforeach
@@ -20,7 +20,7 @@
 
             <div>
                 <x-input-label for="domain" :value="__('Domain')" />
-                <x-text-input wire:model.defer="domain" id="domain" name="domain" type="text" class="mt-1 block w-full" autocomplete="domain" placeholder="example.com" />
+                <x-text-input wire:model.defer="inputs.domain" id="domain" name="domain" type="text" class="mt-1 block w-full" autocomplete="domain" placeholder="example.com" />
                 @error('domain')
                 <x-input-error class="mt-2" :messages="$message" />
                 @enderror
@@ -28,75 +28,15 @@
 
             <div>
                 <x-input-label for="alias" :value="__('Alias')" />
-                <x-text-input wire:model.defer="alias" id="alias" name="alias" type="text" class="mt-1 block w-full" autocomplete="alias" placeholder="www.example.com" />
+                <x-text-input wire:model.defer="inputs.alias" id="alias" name="alias" type="text" class="mt-1 block w-full" autocomplete="alias" placeholder="www.example.com" />
                 @error('alias')
                 <x-input-error class="mt-2" :messages="$message" />
                 @enderror
             </div>
 
-            <div>
-                <x-input-label for="php_version" :value="__('PHP Version')" />
-                <x-select-input wire:model.defer="php_version" id="php_version" name="php_version" class="mt-1 w-full">
-                    <option value="" selected disabled>{{ __("Select") }}</option>
-                    @foreach($server->installedPHPVersions() as $version)
-                        <option value="{{ $version }}" @if($version === $php_version) selected @endif>
-                            PHP {{ $version }}
-                        </option>
-                    @endforeach
-                </x-select-input>
-                @error('php_version')
-                <x-input-error class="mt-2" :messages="$message" />
-                @enderror
-            </div>
-
-            <div>
-                <x-input-label for="web_directory" :value="__('Web Directory')" />
-                <x-text-input wire:model.defer="web_directory" id="web_directory" name="web_directory" type="text" class="mt-1 block w-full" autocomplete="web_directory" />
-                @error('web_directory')
-                <x-input-error class="mt-2" :messages="$message" />
-                @enderror
-            </div>
-
-            <div>
-                <x-input-label for="source_control" :value="__('Source Control')" />
-                <div class="flex items-center mt-1">
-                    <x-select-input wire:model="source_control" id="source_control" name="source_control" class="mt-1 w-full">
-                        <option value="" selected disabled>{{ __("Select") }}</option>
-                        @foreach($sourceControls as $sourceControl)
-                            <option value="{{ $sourceControl->id }}" @if($sourceControl->id === $source_control) selected @endif>
-                                {{ $sourceControl->profile }} ({{ $sourceControl->provider }})
-                            </option>
-                        @endforeach
-                    </x-select-input>
-                    <x-secondary-button :href="route('source-controls', ['redirect' => request()->url()])" class="flex-none ml-2">{{ __('Connect') }}</x-secondary-button>
-                </div>
-                @error('source_control')
-                <x-input-error class="mt-2" :messages="$message" />
-                @enderror
-            </div>
-
-            <div>
-                <x-input-label for="repository" :value="__('Repository')" />
-                <x-text-input wire:model.defer="repository" id="repository" name="repository" type="text" class="mt-1 block w-full" autocomplete="repository" placeholder="organization/repository" />
-                @error('repository')
-                <x-input-error class="mt-2" :messages="$message" />
-                @enderror
-            </div>
-
-            <div>
-                <x-input-label for="branch" :value="__('Branch')" />
-                <x-text-input wire:model.defer="branch" id="branch" name="branch" type="text" class="mt-1 block w-full" autocomplete="branch" placeholder="main" />
-                @error('branch')
-                <x-input-error class="mt-2" :messages="$message" />
-                @enderror
-            </div>
-
-            <div class="mt-6">
-                <label for="composer" class="inline-flex items-center">
-                    <input id="composer" wire:model.defer="composer" type="checkbox" class="rounded dark:bg-gray-900 border-gray-300 dark:border-gray-700 text-indigo-600 shadow-sm focus:ring-indigo-500 dark:focus:ring-indigo-600 dark:focus:ring-offset-gray-800" name="composer">
-                    <span class="ml-2 text-sm text-gray-600 dark:text-gray-400">{{ __('Run `composer install --no-dev`') }}</span>
-                </label>
-            </div>
+            @if (isset($inputs['type']) && $inputs['type'])
+                @include('livewire.sites.partials.create.' . $inputs['type'])
+            @endif
         </form>
         <x-slot name="actions">
             <x-primary-button form="create-site" wire:loading.attr="disabled">{{ __('Create') }}</x-primary-button>

resources/views/livewire/sites/partials/create/fields/branch.blade.php

@@ -0,0 +1,7 @@
+<div>
+    <x-input-label for="branch" :value="__('Branch')" />
+    <x-text-input wire:model.defer="inputs.branch" id="branch" name="branch" type="text" class="mt-1 block w-full" autocomplete="branch" placeholder="main" />
+    @error('branch')
+    <x-input-error class="mt-2" :messages="$message" />
+    @enderror
+</div>