Merge branch 'next' into set-server-timzone-setting

resources/views/livewire/project/shared/destination.blade.php

@@ -19,9 +19,6 @@
                 <div class="box-description">
                     Network: {{ data_get($resource, 'destination.network') }}
                 </div>
-                @if ($resource->server_status == false)
-                    <div class="text-xs font-bold text-error"> This server has connection problems. </div>
-                @endif
             </div>
             @if ($resource?->additional_networks?->count() > 0)
                 <div class="flex gap-2">

resources/views/livewire/project/shared/environment-variable/all.blade.php

@@ -2,9 +2,11 @@
     <div>
         <div class="flex items-center gap-2">
             <h2>Environment Variables</h2>
-            <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
-                <livewire:project.shared.environment-variable.add />
-            </x-modal-input>
+            <div class="flex flex-col items-center">
+                <x-modal-input buttonTitle="+ Add" title="New Environment Variable">
+                    <livewire:project.shared.environment-variable.add />
+                </x-modal-input>
+            </div>
             <x-forms.button
                 wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
         </div>
@@ -12,7 +14,7 @@
         @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
             <div class="w-64 pt-2">
                 <x-forms.checkbox id="resource.settings.is_env_sorting_enabled" label="Sort alphabetically"
-                    helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order."
+                    helper="Turn this off if one environment is dependent on an other. It will be sorted by creation order (like you pasted them or in the order you created them)."
                     instantSave></x-forms.checkbox>
             </div>
         @endif
@@ -31,6 +33,10 @@
         @endif
     </div>
     @if ($view === 'normal')
+        <div>
+            <h3>Production Environment Variables</h3>
+            <div>Environment (secrets) variables for Production.</div>
+        </div>
         @forelse ($resource->environment_variables as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" :type="$resource->type()" />
@@ -39,7 +45,7 @@
         @endforelse
         @if ($resource->type() === 'application' && $resource->environment_variables_preview->count() > 0 && $showPreview)
             <div>
-                <h3>Preview Deployments</h3>
+                <h3>Preview Deployments Environment Variables</h3>
                 <div>Environment (secrets) variables for Preview Deployments.</div>
             </div>
             @foreach ($resource->environment_variables_preview as $env)
@@ -48,16 +54,15 @@
             @endforeach
         @endif
     @else
-        <form wire:submit='saveVariables(false)' class="flex flex-col gap-2">
-            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables"></x-forms.textarea>
-            <x-forms.button type="submit" class="btn btn-primary">Save</x-forms.button>
+        <form wire:submit.prevent='submit' class="flex flex-col gap-2">
+            <x-forms.textarea rows="10" class="whitespace-pre-wrap" id="variables" wire:model="variables" label="Production Environment Variables"></x-forms.textarea>
+            
+            @if ($showPreview)
+                <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Deployments Environment Variables"
+                    id="variablesPreview" wire:model="variablesPreview"></x-forms.textarea>
+            @endif
+            
+            <x-forms.button type="submit" class="btn btn-primary">Save All Environment Variables</x-forms.button>
         </form>
-        @if ($showPreview)
-            <form wire:submit='saveVariables(true)' class="flex flex-col gap-2">
-                <x-forms.textarea rows="10" class="whitespace-pre-wrap" label="Preview Environment Variables"
-                    id="variablesPreview"></x-forms.textarea>
-                <x-forms.button type="submit" class="btn btn-primary">Save</x-forms.button>
-            </form>
-        @endif
     @endif
-</div>
+</div>

resources/views/livewire/project/shared/environment-variable/show.blade.php

@@ -1,15 +1,6 @@
 <div>
     <form wire:submit='submit'
         class="flex flex-col items-center gap-4 p-4 bg-white border lg:items-start dark:bg-base dark:border-coolgray-300">
-        {{-- @if (!$env->isFoundInCompose && !$isSharedVariable)
-            <div class="flex items-center justify-center gap-2 dark:text-warning text-coollabs"> <svg
-                    class="hidden w-4 h-4 dark:text-warning lg:block" viewBox="0 0 256 256"
-                    xmlns="http://www.w3.org/2000/svg">
-                    <path fill="currentColor"
-                        d="M240.26 186.1L152.81 34.23a28.74 28.74 0 0 0-49.62 0L15.74 186.1a27.45 27.45 0 0 0 0 27.71A28.31 28.31 0 0 0 40.55 228h174.9a28.31 28.31 0 0 0 24.79-14.19a27.45 27.45 0 0 0 .02-27.71m-20.8 15.7a4.46 4.46 0 0 1-4 2.2H40.55a4.46 4.46 0 0 1-4-2.2a3.56 3.56 0 0 1 0-3.73L124 46.2a4.77 4.77 0 0 1 8 0l87.44 151.87a3.56 3.56 0 0 1 .02 3.73M116 136v-32a12 12 0 0 1 24 0v32a12 12 0 0 1-24 0m28 40a16 16 0 1 1-16-16a16 16 0 0 1 16 16">
-                    </path>
-                </svg>This variable is not found in the compose file, so it won't be used.</div>
-        @endif --}}
         @if ($isLocked)
             <div class="flex flex-1 w-full gap-2">
                 <x-forms.input disabled id="env.key" />

resources/views/livewire/project/shared/get-logs.blade.php

@@ -33,7 +33,7 @@
             screen.scrollTop = 0;
         }
     }">
-        <div class="flex items-center gap-2 ">
+        <div class="flex gap-2 items-center">
             @if ($resource?->type() === 'application' || str($resource?->type())->startsWith('standalone'))
                 <h4>{{ $container }}</h4>
             @else
@@ -46,9 +46,9 @@
                 <x-loading wire:poll.2000ms='getLogs(true)' />
             @endif
         </div>
-        <form wire:submit='getLogs(true)' class="flex items-end gap-2 ">
+        <form wire:submit='getLogs(true)' class="flex gap-2 items-end">
             <div class="w-96">
-                <x-forms.input label="Only Show Number of Lines" placeholder="1000" required
+                <x-forms.input label="Only Show Number of Lines" placeholder="1000" type="number" required
                     id="numberOfLines"></x-forms.input>
             </div>
             <x-forms.button type="submit">Refresh</x-forms.button>
@@ -56,7 +56,7 @@
             <x-forms.checkbox instantSave label="Include Timestamps" id="showTimeStamps"></x-forms.checkbox>
         </form>
         <div :class="fullscreen ? 'fullscreen' : 'relative w-full py-4 mx-auto'">
-            <div class="flex flex-col-reverse w-full px-4 py-2 overflow-y-auto bg-white dark:text-white dark:bg-coolgray-100 scrollbar dark:border-coolgray-300"
+            <div class="flex overflow-y-auto flex-col-reverse px-4 py-2 w-full bg-white dark:text-white dark:bg-coolgray-100 scrollbar dark:border-coolgray-300"
                 :class="fullscreen ? '' : 'max-h-96 border border-solid rounded'">
                 <button title="Minimize" x-show="fullscreen" class="fixed top-4 right-4"
                     x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
@@ -76,7 +76,7 @@
                             stroke-width="2" d="M12 5v14m4-4l-4 4m-4-4l4 4" />
                     </svg></button>
 
-                <button title="Fullscreen" x-show="!fullscreen" class="absolute top-5 right-1"
+                <button title="Fullscreen" x-show="!fullscreen" class="absolute right-1 top-5"
                     x-on:click="makeFullscreen"><svg class="icon" viewBox="0 0 24 24"
                         xmlns="http://www.w3.org/2000/svg">
                         <g fill="none">

resources/views/livewire/project/shared/storages/add.blade.php

@@ -1,43 +1,47 @@
-<div class="flex flex-col w-full gap-2 rounded">
-    You can add Volumes, Files and Directories to your resources here.
-    <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitPersistentVolume'>
-        <h3>Volume Mount</h3>
-        @if ($isSwarm)
-            <h5>Swarm Mode detected: You need to set a shared volume (EFS/NFS/etc) on all the worker nodes if you would
-                like to use a persistent volumes.</h5>
-        @endif
-        <x-forms.input placeholder="pv-name" id="name" label="Name" required helper="Volume name." />
-        @if ($isSwarm)
-            <x-forms.input placeholder="/root" id="host_path" label="Source Path" required
+<div class="flex flex-col w-full gap-2 rounded max-h-[80vh] overflow-y-auto scrollbar">
+    <div class="p-4">
+        You can add Volumes, Files and Directories to your resources here.
+        <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitPersistentVolume'>
+            <h3>Volume Mount</h3>
+            @if ($isSwarm)
+                <h5>Swarm Mode detected: You need to set a shared volume (EFS/NFS/etc) on all the worker nodes if you
+                    would
+                    like to use a persistent volumes.</h5>
+            @endif
+            <x-forms.input placeholder="pv-name" id="name" label="Name" required helper="Volume name." />
+            @if ($isSwarm)
+                <x-forms.input placeholder="/root" id="host_path" label="Source Path" required
+                    helper="Directory on the host system." />
+            @else
+                <x-forms.input placeholder="/root" id="host_path" label="Source Path"
+                    helper="Directory on the host system." />
+            @endif
+            <x-forms.input placeholder="/tmp/root" id="mount_path" label="Destination Path" required
+                helper="Directory inside the container." />
+            <x-forms.button type="submit" @click="modalOpen=false">
+                Save
+            </x-forms.button>
+
+        </form>
+        <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitFileStorage'>
+            <h3>File Mount</h3>
+            <x-forms.input placeholder="/etc/nginx/nginx.conf" id="file_storage_path" label="Destination Path" required
+                helper="File inside the container" />
+            <x-forms.textarea label="Content" id="file_storage_content"></x-forms.textarea>
+            <x-forms.button type="submit" @click="modalOpen=false">
+                Save
+            </x-forms.button>
+        </form>
+        <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitFileStorageDirectory'>
+            <h3>Directory Mount</h3>
+            <x-forms.input placeholder="{{ application_configuration_dir() }}/{{ $resource->uuid }}/etc/nginx"
+                id="file_storage_directory_source" label="Source Directory" required
                 helper="Directory on the host system." />
-        @else
-            <x-forms.input placeholder="/root" id="host_path" label="Source Path"
-                helper="Directory on the host system." />
-        @endif
-        <x-forms.input placeholder="/tmp/root" id="mount_path" label="Destination Path" required
-            helper="Directory inside the container." />
-        <x-forms.button type="submit" @click="modalOpen=false">
-            Save
-        </x-forms.button>
-    </form>
-    <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitFileStorage'>
-        <h3>File Mount</h3>
-        <x-forms.input placeholder="/etc/nginx/nginx.conf" id="file_storage_path" label="Destination Path" required
-            helper="File inside the container" />
-        <x-forms.textarea label="Content" id="file_storage_content"></x-forms.textarea>
-        <x-forms.button type="submit" @click="modalOpen=false">
-            Save
-        </x-forms.button>
-    </form>
-    <form class="flex flex-col w-full gap-2 rounded" wire:submit='submitFileStorageDirectory'>
-        <h3>Directory Mount</h3>
-        <x-forms.input placeholder="{{ application_configuration_dir() }}/{{ $resource->uuid }}/etc/nginx"
-            id="file_storage_directory_source" label="Source Directory" required
-            helper="Directory on the host system." />
-        <x-forms.input placeholder="/etc/nginx" id="file_storage_directory_destination" label="Destination Directory"
-            required helper="Directory inside the container." />
-        <x-forms.button type="submit" @click="modalOpen=false">
-            Save
-        </x-forms.button>
-    </form>
+            <x-forms.input placeholder="/etc/nginx" id="file_storage_directory_destination"
+                label="Destination Directory" required helper="Directory inside the container." />
+            <x-forms.button type="submit" @click="modalOpen=false">
+                Save
+            </x-forms.button>
+        </form>
+    </div>
 </div>