arsenaltech · ravatashvin · Mar 28, 2024 · Apr 3, 2024 · Apr 3, 2024 · Apr 3, 2024
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/resources/js/components/CreateFolderModal.vue b/resources/js/components/CreateFolderModal.vue
@@ -17,7 +17,7 @@
                  class="w-full h-full form-control form-input form-input-bordered py-3 dark:bg-gray-800"
                  :placeholder="__('Write a folder name')" v-model="folderName" autofocus
                  required v-on:keyup.enter="createFolder">
-          <p class="my-2 text-red-500" v-if="error">{{ errorMsg }}</p>
+          <p class="help-text mt-2 help-text-error" v-if="error">{{ errorMsg }}</p>
         </div>
 
         <div class="bg-30 dark:bg-gray-700 px-6 py-3 flex rounded-lg shadow-lg">

diff --git a/resources/js/components/DefaultField.vue b/resources/js/components/DefaultField.vue
@@ -7,7 +7,7 @@
       <slot>
         <form-label :for="field.name">
           {{ field.name || fieldName }}
-          <span v-if="field.required" class="text-red-500 text-sm">{{
+          <span v-if="field.required" class="help-text help-text-error text-sm">{{
               __('*')
             }}</span>
         </form-label>

diff --git a/resources/js/components/Manager.vue b/resources/js/components/Manager.vue
@@ -151,7 +151,7 @@
           <template v-else-if="!files.length">
             <div class="w-full text-lg text-center my-4">
               {{ __(`No ${filter || 'files or folders'} in current directory`) }}<br><br>
-              <button v-if="buttons.delete_folder && !filter" class="btn btn-default btn-danger text-red-500" @click="removeDirectory">
+              <button v-if="buttons.delete_folder && !filter" class="btn btn-default btn-danger help-text help-text-error" @click="removeDirectory">
                 {{ __('Remove directory') }}
               </button>
             </div>

diff --git a/resources/js/components/RenameModal.vue b/resources/js/components/RenameModal.vue
@@ -49,7 +49,7 @@
                  id="togglePassword"></i>
             </div>
 
-            <p class="my-2 text-red-500" v-if="error">{{ errorMsg }}</p>
+            <p class="help-text mt-2 help-text-error" v-if="error">{{ errorMsg }}</p>
 
           </template>
 

diff --git a/resources/js/components/autocomplete/FormField.vue b/resources/js/components/autocomplete/FormField.vue
@@ -22,7 +22,7 @@
 
       <p
         v-if="hasError"
-        class="my-2 text-red-500"
+        class="help-text mt-2 help-text-error"
       >
         {{ firstError }}
       </p>

diff --git a/resources/js/components/belongs-to/FormField.vue b/resources/js/components/belongs-to/FormField.vue
@@ -118,7 +118,7 @@
 
       <p
         v-if="hasError"
-        class="my-2 text-red-500"
+        class="help-text mt-2 help-text-error"
       >{{ firstError }}</p>
     </template>
   </r64-default-field>

diff --git a/resources/js/components/boolean-group/DetailField.vue b/resources/js/components/boolean-group/DetailField.vue
@@ -41,7 +41,7 @@ export default {
     value: [],
     classes: {
       true: 'bg-green-100 text-green-500',
-      false: 'bg-red-100 text-red-500',
+      false: 'bg-red-100 help-text help-text-error',
     },
   }),
 

diff --git a/resources/js/components/boolean/FormField.vue b/resources/js/components/boolean/FormField.vue
@@ -17,7 +17,7 @@
         :disabled="field.readonly"
       />
 
-      <p v-if="hasError" class="my-2 text-red-500" v-html="firstError" />
+      <p v-if="hasError" class="help-text mt-2 help-text-error" v-html="firstError" />
     </template>
   </r64-default-field>
 </template>

diff --git a/resources/js/components/computed/FormField.vue b/resources/js/components/computed/FormField.vue
@@ -24,7 +24,7 @@
 
       <p
         v-if="hasError"
-        class="my-2 text-red-500"
+        class="help-text mt-2 help-text-error"
       >
         {{ firstError }}
       </p>

diff --git a/resources/js/components/custom-autocomplete-multiselect/FormField.vue b/resources/js/components/custom-autocomplete-multiselect/FormField.vue
@@ -78,7 +78,7 @@
       >
         {{ __(reorderMode ? 'novaMultiselect.doneReordering' : 'novaMultiselect.reorder') }}
       </div>
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
 

diff --git a/resources/js/components/date-time/FormField.vue b/resources/js/components/date-time/FormField.vue
@@ -54,7 +54,7 @@
 
       <p
           v-if="hasError"
-          class="my-2 text-red-500"
+          class="help-text mt-2 help-text-error"
       >
         {{ firstError }}
       </p>

diff --git a/resources/js/components/date/FormField.vue b/resources/js/components/date/FormField.vue
@@ -39,7 +39,7 @@
       </div>
       <p
           v-if="hasError"
-          class="my-2 text-red-500"
+          class="help-text mt-2 help-text-error"
       >
         {{ firstError }}
       </p>

diff --git a/resources/js/components/dynamic-select/FormField.vue b/resources/js/components/dynamic-select/FormField.vue
@@ -22,7 +22,7 @@
           :class="[errorClasses, inputClasses, { 'form-input-border-error': hasError }]"
       >
       </Multiselect>
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/file/FormField.vue b/resources/js/components/file/FormField.vue
@@ -131,7 +131,7 @@
 
       <p
         v-if="hasError"
-        class="help-text mt-2 help-text-error"
+        class="help-text mt-2 help-text help-text-error"
       >
         {{ firstError }}
       </p>

diff --git a/resources/js/components/filemanager/FormField.vue b/resources/js/components/filemanager/FormField.vue
@@ -74,7 +74,7 @@
           @confirm="removeFile"
           @close="closeRemoveModal"></confirm-modal-remove-file>
 
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/multi-select-dual-box/FormField.vue b/resources/js/components/multi-select-dual-box/FormField.vue
@@ -15,10 +15,7 @@
           v-html="field.value"
       />
 
-      <MultiSelectDualBox ref="multi-select-dual-box" :resourceId="resourceId" :parentValue="parentValue" :field="field" :options="options"></MultiSelectDualBox>
-      <p v-if="hasError" class="my-2 text-red-500">
-        {{ firstError }}
-      </p>
+      <MultiSelectDualBox ref="multi-select-dual-box" :resourceId="resourceId" :parentValue="parentValue" :field="field" :options="options" :hasError="hasError" :error="firstError" ></MultiSelectDualBox>
     </template>
   </r64-default-field>
 </template>

diff --git a/resources/js/components/multi-select-dual-box/MultiSelectDualBox.vue b/resources/js/components/multi-select-dual-box/MultiSelectDualBox.vue
@@ -34,7 +34,7 @@
         </div>
         <input type="text" v-model="searchSelectedOptions" :placeholder="options.searchText2"
                class="w-full form-control form-input form-input-bordered">
-        <div class="overflow-x-auto multi-select-box p-0 mt-2 form-input-bordered multi-select-right-dualbox">
+        <div class="overflow-x-auto multi-select-box p-0 mt-2 form-input-bordered multi-select-right-dualbox" :class="hasError ? 'form-input-border-error' : ''">
           <draggable :move="checkMove" :list="filterSelected" class="list-group list-none" group="people" @start="drag=true" @end="drag=false" v-if="field.sortable">
             <div v-if="filterSelected.length > 0" class="p-2 cursor-pointer hover:bg-40" v-for="(item,index) in filterSelected"
                  v-bind:key="item.id" @click="changeValue('left',item)">
@@ -63,6 +63,9 @@
           <a class="btn btn-link dim cursor-pointer text-80 font-bold " v-if="searchSelectedOptions.length > 0"
              @click="searchSelectedOptions = ''">Clear</a>
         </div>
+        <p v-if="hasError" class="help-text mt-2 help-text-error">
+          {{ error }}
+        </p>
       </div>
     </div>
 
@@ -78,7 +81,7 @@ import {VueDraggableNext} from 'vue-draggable-next';
 import CustomModal from '../CustomModal.vue';
 export default {
   name: 'MultiSelectDualBox',
-  props: ["options","field","parentValue",'resourceId'],
+  props: ["options","field","parentValue",'resourceId', 'hasError', 'error'],
   components:{
     draggable : VueDraggableNext,
     CustomModal
@@ -171,7 +174,7 @@ export default {
       let vue = this;
       if (typeof item == 'object') {
         let index = vue.options.options.indexOf(item) > -1 ? vue.options.options.indexOf(item) : null;
-        if(this.resourceId != undefined && this.resourceId.length > 0){
+        if(index == null){
           index = vue.options.selected.indexOf(item) > -1 ? vue.options.selected.indexOf(item) : null;
         }
         if(index != null){

diff --git a/resources/js/components/multiselect/FormField.vue b/resources/js/components/multiselect/FormField.vue
@@ -73,7 +73,7 @@
       >
         {{ __(reorderMode ? 'novaMultiselect.doneReordering' : 'novaMultiselect.reorder') }}
       </div>
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/password/FormField.vue b/resources/js/components/password/FormField.vue
@@ -20,7 +20,7 @@
         @input="$emit('input', $event.target.value)"
       />
 
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/row/FormField.vue b/resources/js/components/row/FormField.vue
@@ -82,7 +82,7 @@
       </transition>
       <p
         v-if="hasError"
-        class="my-2 text-red-500"
+        class="help-text mt-2 help-text-error"
       >{{ firstError }}</p>
     </template>
   </r64-default-field>

diff --git a/resources/js/components/select/FormField.vue b/resources/js/components/select/FormField.vue
@@ -32,7 +32,7 @@
         </option>
       </SelectControl>
 
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/slug/FormField.vue b/resources/js/components/slug/FormField.vue
@@ -42,7 +42,7 @@
       >
         {{ __('Customize') }}
       </button>
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/text/FormField.vue b/resources/js/components/text/FormField.vue
@@ -24,7 +24,7 @@
         @input="handleChange"
       />
 
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/textarea/FormField.vue b/resources/js/components/textarea/FormField.vue
@@ -15,7 +15,7 @@
         v-bind="extraAttributes"
         :disabled="field.readonly"
       />
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/components/trix/FormField.vue b/resources/js/components/trix/FormField.vue
@@ -20,7 +20,7 @@
         :with-files="field.withFiles"
       />
 
-      <p v-if="hasError" class="my-2 text-red-500">
+      <p v-if="hasError" class="help-text mt-2 help-text-error">
         {{ firstError }}
       </p>
     </template>

diff --git a/resources/js/modules/Folder.vue b/resources/js/modules/Folder.vue
@@ -133,15 +133,15 @@
                 <svg data-v-4c9b71d8="" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block tooltip inline-block cursor-pointer hover:opacity-50 mr-2" role="presentation"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>
               </div>
               <div aria-label="Delete"  @click.prevent="deleteFolder($event)"  v-if="deletePermission" class="toolbar-button hover:text-primary-500 v-popper--has-tooltip" title="Delete" >
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block text-red-500" role="presentation" data-v-5a3b7268=""><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block help-text help-text-error" role="presentation" data-v-5a3b7268=""><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>
               </div>
 
               <div aria-label="Move"  @click.prevent="moveFolder($event)"  v-if="movePermission" class="toolbar-button hover:text-primary-500 v-popper--has-tooltip" title="Move" >
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block inline-block inline-block cursor-pointer hover:opacity-50 mr-2 ml-2" role="presentation" data-v-5a3b7268=""><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M8 7v8a2 2 0 002 2h6M8 7V5a2 2 0 012-2h4.586a1 1 0 01.707.293l4.414 4.414a1 1 0 01.293.707V15a2 2 0 01-2 2h-2M8 7H6a2 2 0 00-2 2v10a2 2 0 002 2h8a2 2 0 002-2v-2"></path></svg>
               </div>
               <!-- <Icon type="pencil-alt" width="20" height="20" v-if="renamePermission" class="inline-block cursor-pointer hover:opacity-50 mr-2"
                 @click.prevent="editFolder($event)" />
-              <Icon type="trash" class="text-red-500" width="20" height="20" v-if="deletePermission" 
+              <Icon type="trash" class="help-text help-text-error" width="20" height="20" v-if="deletePermission" 
                 @click.prevent="deleteFolder($event)" />
               <Icon type="document-duplicate" class="inline-block inline-block cursor-pointer hover:opacity-50 mr-2 ml-2" width="20" height="20"   v-if="movePermission" @click.prevent="moveFolder($event)" /> -->
             </div>

diff --git a/resources/js/modules/ImageLoader.vue b/resources/js/modules/ImageLoader.vue
@@ -67,7 +67,7 @@
                             <Icon type="pencil-alt" width="18" height="18" />
                         </div>
                         <div
-                            class="h-8 w-8 cursor-pointer hover:opacity-50 border-l border-gray-200 dark:border-gray-700 px-2 inline-flex items-center justify-center text-red-500"
+                            class="h-8 w-8 cursor-pointer hover:opacity-50 border-l border-gray-200 dark:border-gray-700 px-2 inline-flex items-center justify-center help-text help-text-error"
                             v-if="deletePermission"
                             @click.prevent="deleteFile($event)"
                         >
@@ -175,7 +175,7 @@
                         type="trash"
                         width="20"
                         height="20"
-                        class="cursor-pointer hover:opacity-50 text-red-500"
+                        class="cursor-pointer hover:opacity-50 help-text help-text-error"
                         v-if="deletePermission"
                         @click.prevent="deleteFile($event)"
                     />
@@ -191,7 +191,7 @@
                         <svg data-v-4c9b71d8="" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block tooltip inline-block cursor-pointer hover:opacity-50 mr-2" role="presentation"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z"></path></svg>
                     </div>
                     <div aria-label="Delete"  @click.prevent="deleteFile($event)"  v-if="deletePermission" class="toolbar-button hover:text-primary-500 v-popper--has-tooltip" title="Delete" >
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block text-red-500" role="presentation" data-v-5a3b7268=""><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" width="20" height="20" class="inline-block help-text help-text-error" role="presentation" data-v-5a3b7268=""><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16"></path></svg>
                     </div>
 
                     <div aria-label="Move"  @click.prevent="moveFile($event)"  v-if="movePermission" class="toolbar-button hover:text-primary-500 v-popper--has-tooltip" title="Move" >