- package updates

- feat: service fixes
- ui: help menu

resources/views/livewire/project/new/docker-compose.blade.php

@@ -12,8 +12,9 @@
     <br>
     - SERVICE_FQDN_*: FQDN - could be changable from the UI. (example: SERVICE_FQDN_GHOST)<br>
     - SERVICE_URL_*: URL parsed from FQDN - could be changable from the UI. (example: SERVICE_URL_GHOST)<br>
-    - SERVICE_USER_*: Generated user, not encrypted in database (example: SERVICE_USER_MYSQL)<br>
-    - SERVICE_PASSWORD_*: Generated password, encrypted in database (example: SERVICE_PASSWORD_MYSQL)<br>"
+    - SERVICE_BASE64_64_*: Generated 'base64' string with length of '64' (example: SERVICE_BASE64_64_GHOST, to generate 32 bit: SERVICE_BASE64_32_GHOST)<br>
+    - SERVICE_USER_*: Generated user (example: SERVICE_USER_MYSQL)<br>
+    - SERVICE_PASSWORD_*: Generated password (example: SERVICE_PASSWORD_MYSQL)<br>"
             rows="20" id="dockercompose"
             placeholder='services:
   ghost:

resources/views/livewire/project/service/application.blade.php

@@ -12,14 +12,14 @@
         <div class="flex gap-2">
             <x-forms.input label="Name" id="application.human_name" placeholder="Human readable name"></x-forms.input>
             <x-forms.input label="Description" id="application.description"></x-forms.input>
-            <x-forms.input placeholder="https://app.coolify.io" label="Domains" required
+            <x-forms.input placeholder="https://app.coolify.io" label="Domains"
                 id="application.fqdn"></x-forms.input>
         </div>
     </form>
-    @if ($application->fileStorages()->get()->count() > 0)
-        <h3 class="py-4">File Storages</h3>
+    @if ($fileStorages->count() > 0)
+        <h3 class="py-4">Files</h3>
         <div class="flex flex-col gap-4">
-            @foreach ($application->fileStorages()->get() as $fileStorage)
+            @foreach ($fileStorages->get() as $fileStorage)
                 <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
             @endforeach
         </div>

resources/views/livewire/project/service/database.blade.php

@@ -1,15 +1,25 @@
-<form wire:submit.prevent='submit'>
-    <div class="flex items-center gap-2 pb-4">
-        @if ($database->human_name)
-            <h2>{{ Str::headline($database->human_name) }}</h2>
-        @else
-            <h2>{{ Str::headline($database->name) }}</h2>
-        @endif
-        <x-forms.button type="submit">Save</x-forms.button>
-        <a target="_blank" href="{{ $database->documentation() }}">Documentation <x-external-link /></a>
-    </div>
-    <div class="flex gap-2">
-        <x-forms.input label="Name" id="database.human_name" placeholder="Name"></x-forms.input>
-        <x-forms.input label="Description" id="database.description"></x-forms.input>
-    </div>
-</form>
+<div>
+    <form wire:submit.prevent='submit'>
+        <div class="flex items-center gap-2 pb-4">
+            @if ($database->human_name)
+                <h2>{{ Str::headline($database->human_name) }}</h2>
+            @else
+                <h2>{{ Str::headline($database->name) }}</h2>
+            @endif
+            <x-forms.button type="submit">Save</x-forms.button>
+            <a target="_blank" href="{{ $database->documentation() }}">Documentation <x-external-link /></a>
+        </div>
+        <div class="flex gap-2">
+            <x-forms.input label="Name" id="database.human_name" placeholder="Name"></x-forms.input>
+            <x-forms.input label="Description" id="database.description"></x-forms.input>
+        </div>
+    </form>
+    @if ($database->fileStorages()->get()->count() > 0)
+        <h3 class="py-4">Mounted Files (binds)</h3>
+        <div class="flex flex-col gap-4">
+            @foreach ($database->fileStorages()->get() as $fileStorage)
+                <livewire:project.service.file-storage :fileStorage="$fileStorage" wire:key="{{ $loop->index }}" />
+            @endforeach
+        </div>
+    @endif
+</div>

resources/views/livewire/project/service/file-storage.blade.php

@@ -1,8 +1,20 @@
-<form wire:submit.prevent='submit' class="flex flex-col gap-2">
-    <div class="flex gap-2">
-        <x-forms.input readonly label="File Path" id="fileStorage.fs_path"></x-forms.input>
-        <x-forms.input readonly label="Mount Path (in container)" id="fileStorage.mount_path"></x-forms.input>
-    </div>
-    <x-forms.textarea label="Content" id="fileStorage.content"></x-forms.textarea>
-    <x-forms.button type="submit">Save</x-forms.button>
-</form>
+<x-collapsible>
+    <x-slot:title>
+        <div>{{ $fileStorage->mount_path }}
+            @empty($fileStorage->content)
+                <span class="text-xs text-warning">(empty)</span>
+            @endempty
+        </div>
+    </x-slot:title>
+    <x-slot:action>
+        <form wire:submit.prevent='submit' class="flex flex-col gap-2">
+            <div class="flex gap-2">
+                <x-forms.input readonly label="File in Docker Compose file" id="fileStorage.fs_path"></x-forms.input>
+                <x-forms.input readonly label="File on Filesystem" id="fs_path"></x-forms.input>
+            </div>
+            <x-forms.input readonly label="Mount (in container)" id="fileStorage.mount_path"></x-forms.input>
+            <x-forms.textarea label="Content" rows="20" id="fileStorage.content"></x-forms.textarea>
+            <x-forms.button type="submit">Save</x-forms.button>
+        </form>
+    </x-slot:action>
+</x-collapsible>

resources/views/livewire/project/service/index.blade.php

@@ -83,8 +83,9 @@
                         <br>
                         - SERVICE_FQDN_*: FQDN - could be changable from the UI. (example: SERVICE_FQDN_GHOST)<br>
                         - SERVICE_URL_*: URL parsed from FQDN - could be changable from the UI. (example: SERVICE_URL_GHOST)<br>
-                        - SERVICE_USER_*: Generated user, not encrypted in database (example: SERVICE_USER_MYSQL)<br>
-                        - SERVICE_PASSWORD_*: Generated password, encrypted in database (example: SERVICE_PASSWORD_MYSQL)<br>"
+                        - SERVICE_BASE64_64_*: Generated 'base64' string with length of '64' (example: SERVICE_BASE64_64_GHOST, to generate 32 bit: SERVICE_BASE64_32_GHOST)<br>
+                        - SERVICE_USER_*: Generated user (example: SERVICE_USER_MYSQL)<br>
+                        - SERVICE_PASSWORD_*: Generated password (example: SERVICE_PASSWORD_MYSQL)<br>"
                             rows="20" id="service.docker_compose_raw">
                         </x-forms.textarea>
                     </div>

resources/views/livewire/project/service/show.blade.php

@@ -9,7 +9,7 @@
             <a :class="activeTab === 'general' && 'text-white'"
                 @click.prevent="activeTab = 'general'; window.location.hash = 'general'" href="#">General</a>
             <a :class="activeTab === 'storages' && 'text-white'"
-                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Storages
+                @click.prevent="activeTab = 'storages'; window.location.hash = 'storages'" href="#">Persistent Storages
             </a>
         </div>
         <div class="w-full pl-8">