From b4b1c671bd353d82c7a307f61c69c38ecb99e135 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 8 Aug 2023 14:46:23 +0200
Subject: [PATCH] fix: input and textarea

---
 app/View/Components/Forms/Input.php            |  2 +-
 app/View/Components/Forms/Textarea.php         |  2 +-
 .../views/components/forms/input.blade.php     | 18 ++++++++++--------
 .../views/components/forms/textarea.blade.php  |  4 ++--
 .../project/shared/storages/all.blade.php      |  2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/View/Components/Forms/Input.php b/app/View/Components/Forms/Input.php
index c74bfa2ec..ab77e7491 100644
--- a/app/View/Components/Forms/Input.php
+++ b/app/View/Components/Forms/Input.php
@@ -20,7 +20,7 @@ class Input extends Component
         public bool        $readonly = false,
         public string|null $helper = null,
         public bool        $allowToPeak = true,
-        public string      $defaultClass = "input input-sm bg-coolgray-200 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500"
+        public string      $defaultClass = "input input-sm bg-coolgray-200 rounded text-white w-full disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     )
     {
     }
diff --git a/app/View/Components/Forms/Textarea.php b/app/View/Components/Forms/Textarea.php
index 7c4d6ae3c..61f4f757f 100644
--- a/app/View/Components/Forms/Textarea.php
+++ b/app/View/Components/Forms/Textarea.php
@@ -24,7 +24,7 @@ class Textarea extends Component
         public bool        $disabled = false,
         public bool        $readonly = false,
         public string|null $helper = null,
-        public string      $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500"
+        public string      $defaultClass = "textarea bg-coolgray-200 rounded text-white scrollbar disabled:bg-coolgray-200/50 disabled:border-none placeholder:text-coolgray-500 read-only:text-neutral-500 read-only:bg-coolgray-200/50"
     )
     {
         //
diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
index 4921a49a9..16c9f6a2f 100644
--- a/resources/views/components/forms/input.blade.php
+++ b/resources/views/components/forms/input.blade.php
@@ -9,12 +9,7 @@
             @endif
         </label>
     @endif
-    @if ($type !== 'password')
-        <input {{ $attributes->merge(['class' => $defaultClass]) }} @required($required)
-               wire:model.defer={{ $id }} wire:dirty.class.remove='text-white'
-               wire:dirty.class="text-black bg-warning" wire:loading.attr="disabled" type="{{ $type }}"
-               @disabled($readonly) @disabled($disabled) id="{{ $id }}" name="{{ $name }}">
-    @elseif ($type === 'password')
+    @if ($type === 'password')
         <div class="relative" x-data>
             @if ($allowToPeak)
                 <div x-on:click="changePasswordFieldType"
@@ -29,11 +24,18 @@
             @endif
             <input {{ $attributes->merge(['class' => $defaultClass . ' pl-10']) }} @required($required)
                    wire:model.defer={{ $id }} wire:dirty.class.remove='text-white'
-                   wire:dirty.class="text-black bg-warning" wire:loading.attr="disabled" type="{{ $type }}"
-                   @disabled($readonly) @disabled($disabled) id="{{ $id }}"
+                   wire:dirty.class="input-warning" wire:loading.attr="disabled" type="{{ $type }}"
+                   @readonly($readonly)
+                   @disabled($disabled) id="{{ $id }}"
                    name="{{ $name }}">
 
         </div>
+    @else
+        <input
+            {{ $attributes->merge(['class' => $defaultClass]) }} @required($required) @readonly($readonly)
+            wire:model.defer={{ $id }} wire:dirty.class.remove='text-white'
+            wire:dirty.class="input-warning" wire:loading.attr="disabled" type="{{ $type }}"
+            @disabled($disabled) id="{{ $id }}" name="{{ $name }}">
     @endif
     @if (!$label && $helper)
         <x-helper :helper="$helper"/>
diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
index a9b9ff07c..684196816 100644
--- a/resources/views/components/forms/textarea.blade.php
+++ b/resources/views/components/forms/textarea.blade.php
@@ -30,8 +30,8 @@
         </label>
     @endif
     <textarea placeholder="{{$placeholder}}"
-              {{ $attributes->merge(['class' => $defaultClass]) }} @required($required) wire:model.defer={{ $id }}
-        @disabled($disabled) id="{{ $id }}" name="{{ $name }}" name={{ $id }}
+              {{ $attributes->merge(['class' => $defaultClass]) }}  wire:model.defer={{ $id }}
+        @disabled($disabled) @readonly($readonly) @required($required) id="{{ $id }}" name="{{ $name }}" name={{ $id }}
         wire:model.defer={{ $value ?? $id }} wire:dirty.class="input-warning"></textarea>
     @error($id)
     <label class="label">
diff --git a/resources/views/livewire/project/shared/storages/all.blade.php b/resources/views/livewire/project/shared/storages/all.blade.php
index 2950b9b68..6aaacd633 100644
--- a/resources/views/livewire/project/shared/storages/all.blade.php
+++ b/resources/views/livewire/project/shared/storages/all.blade.php
@@ -9,7 +9,7 @@
             <x-forms.button class="btn" onclick="newStorage.showModal()">+ Add</x-forms.button>
             <livewire:project.shared.storages.add/>
         </div>
-        <div class="">Persistent storage to preserve data between deployments.</div>
+        <div>Persistent storage to preserve data between deployments.</div>
     </div>
     <div class="flex flex-col gap-2 py-4">
         @forelse ($resource->persistentStorages as $storage)