added attributes, major refactoring

resources/views/fields/checkbox.blade.php

@@ -1,13 +1,13 @@
 <div>
-    @if($field->isMultiple())
+    @if($field->isGroup())
         @include('moonshine::fields.multi-checkbox', [
             'field' => $field,
             'item' => $item,
             'resource' => $resource
         ])
     @else
         @include('moonshine::fields.shared.checkbox', [
-            'meta' => $field->meta(),
+            'attributes' => $field->attributes(),
             'id' => $field->id(),
             'name' => $field->name(),
             'value' => $field->formViewValue($item),

resources/views/fields/has-many.blade.php

@@ -2,6 +2,6 @@
     'field' => $field,
     'resource' => $resource,
     'item' => $item,
-    'model' => $field->formViewValue($item)->first() ?? $item->{$field->relation()}()->getRelated(),
+    'model' => $field->formViewValue($item)->first() ?? $field->getRelated($item),
     'level' => $level ?? 0
-])
+])

resources/views/fields/has-one.blade.php

@@ -2,6 +2,6 @@
     'field' => $field,
     'resource' => $resource,
     'item' => $item,
-    'model' => $field->formViewValue($item) ?? $resource->getModel(),
+    'model' => $field->formViewValue($item) ?? $field->getRelated($item),
     'level' => $level ?? 0
-])
+])

resources/views/fields/input.blade.php

@@ -1,22 +1,14 @@
-<input {!! $field->meta() ?? '' !!}
-   @if($field->getMask()) x-mask="{{ $field->getMask() }}" @endif
+<input {{ $field->attributes()->merge(['class' => 'text-black dark:text-white bg-white dark:bg-darkblue focus:outline-none focus:shadow-outline border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal']) }}
    id="{{ $field->id() }}"
-   aria-label="{{ $field->label() ?? '' }}"
    placeholder="{{ $field->label() ?? '' }}"
    name="{{ $field->name() }}"
    type="{{ $field->type() }}"
-   min="{{ $field->getAttribute('min') ?? 0 }}"
-   max="{{ $field->getAttribute('max') ?? 100000 }}"
-   step="{{ $field->getAttribute('step') ?? 1 }}"
-   class="{{ $field->getAttribute('class') ?? "text-black dark:text-white bg-white dark:bg-darkblue focus:outline-none focus:shadow-outline border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal" }}"
 
    {{ $field->isRequired() ? "required" : "" }}
-   {{ $field->isMultiple() ? "multiple" : "" }}
    {{ $field->isDisabled() ? "disabled" : "" }}
    {{ $field->isReadonly() ? "readonly" : "" }}
 
-   @if($field->getAutocomplete()) autocomplete="{{ $field->getAutocomplete() }}" @endif
-   @if($field->type() !== 'file')
+   @if(!$field->isFile())
         @if(isset($valueKey))
             value="{!! is_array($field->formViewValue($item)) ? ($field->formViewValue($item)[$valueKey] ?? '') : ''  !!}"
         @else

resources/views/fields/multi-select.blade.php

@@ -2,11 +2,10 @@
     <select
             x-model="{{ $field->isMultiple() ? 'selectValues' : 'selectValue' }}"
             x-ref="multi_select_{{ $field->id() }}"
-            {!! $field->meta() ?? '' !!}
+            {{ $field->attributes()  }}
             id="{{ $field->id() }}"
             name="{{ $field->name() }}"
             {{ $field->isRequired() ? "required" : "" }}
-            {{ $field->isMultiple() ? "multiple" : "" }}
             style="display: none;"
     >
         @if(!$field->isMultiple() && $field->isNullable())

resources/views/fields/select.blade.php

@@ -6,12 +6,10 @@
     ])
 @else
     <select
-            {!! $field->meta() ?? '' !!}
+            {{ $field->attributes()->merge(['class' => 'text-black dark:text-white bg-white dark:bg-darkblue block appearance-none w-full border border-gray-200 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:border-gray-500']) }}
             id="{{ $field->id() }}"
             name="{{ $field->name() }}"
             {{ $field->isRequired() ? "required" : "" }}
-            {{ $field->isMultiple() ? "multiple" : "" }}
-            class="text-black dark:text-white bg-white dark:bg-darkblue block appearance-none w-full border border-gray-200 py-3 px-4 pr-8 rounded leading-tight focus:outline-none focus:border-gray-500"
     >
             @if($field->isNullable())
                 <option @selected(!$field->formViewValue($item)) value="">-</option>
@@ -23,4 +21,4 @@ class="text-black dark:text-white bg-white dark:bg-darkblue block appearance-non
                 </option>
             @endforeach
     </select>
-@endif
+@endif

resources/views/fields/shared/checkbox.blade.php

@@ -1,5 +1,5 @@
 <div>
-    <input {!! $meta ?? '' !!}
+    <input {{ $attributes }}
            id="{{ $id }}"
            type="checkbox"
            name="{{ $name }}"

resources/views/fields/shared/full-fields.blade.php

@@ -1,7 +1,7 @@
 <div x-data="handler_{{ $field->id() }}()" x-init="handler_init_{{ $field->id() }}">
     <template x-for="(item, index{{ $level }}) in items" :key="index{{ $level }}">
         <div :data-id="item.id" class="full_fields_{{ $field->id() }}">
-            @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+            @if(!$field->toOne())
                 <div class="font-bold text-purple my-4" x-text="index{{ $level }} + 1"></div>
             @endif
 
@@ -11,7 +11,7 @@
                 </x-moonshine::field-container>
             @endforeach
 
-            @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+            @if(!$field->toOne())
                 <div class="my-4">
                     @if($field->isRemovable())
                         <button @click="removeField(index{{ $level }})" type="button" class="text-pink hover:text-pink inline-block">
@@ -24,7 +24,7 @@
     </template>
 
     <div class="my-4">
-    @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+        @if(!$field->toOne())
             <button type="button"
                 class="bg-gradient-to-r from-purple to-pink text-white
                             text-white font-semibold py-2 px-4 rounded"

resources/views/fields/shared/table-fields.blade.php

@@ -5,7 +5,7 @@
                 <table class="min-w-full">
                     <thead class="bg-whiteblue dark:bg-purple">
                     <tr>
-                        @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+                        @if(!$field->toOne())
                             <th class="px-6 py-3 text-left text-xs leading-4 font-medium uppercase tracking-wider">#</th>
                         @endif
 
@@ -15,7 +15,7 @@
                             </th>
                         @endforeach
 
-                        @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+                        @if(!$field->toOne())
                             <th class="px-6 py-3 text-left text-xs leading-4 font-medium uppercase tracking-wider"></th>
                         @endif
                     </tr>
@@ -25,7 +25,7 @@
                     <template x-for="(item, index{{ $level }}) in items" :key="index{{ $level }}"
                     >
                         <tr :data-id="item.id" class="table_fields_{{ $field->id() }}">
-                            @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+                            @if(!$field->toOne())
                                 <td class="px-6 py-4 whitespace-no-wrap" x-text="index{{ $level }} + 1"></td>
                             @endif
 
@@ -35,7 +35,7 @@
                                 </td>
                             @endforeach
 
-                            @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+                            @if(!$field->toOne())
                                 <td class="px-6 py-4 whitespace-no-wrap">
                                     @if($field->isRemovable())
                                         <button @click="removeField(index{{ $level }})" type="button" class="text-pink hover:text-pink inline-block">
@@ -51,7 +51,7 @@
                     <tfoot class="bg-whiteblue dark:bg-purple">
                     <tr>
                         <td colspan="{{ count($field->getFields())+2 }}" class="px-6 py-4 whitespace-no-wrap">
-                            @if(!method_exists($field, 'isRelationToOne') || !$field->isRelationToOne())
+                            @if(!$field->toOne())
                                 <button type="button"
                                         class="bg-gradient-to-r from-purple to-pink text-white
     text-white font-semibold py-2 px-4 rounded"
@@ -80,7 +80,7 @@ class="bg-gradient-to-r from-purple to-pink text-white
 <script>
   function handler_{{ $field->id() }}() {
     return {
-      handler_init_{{ $field->id() }} () {
+      handler_init_{{ $field->id() }}() {
         this.items = @json($field->jsonValues($item));
       },
       items: [],

resources/views/fields/textarea.blade.php

@@ -1,13 +1,10 @@
-<textarea {!! $field->meta() ?? '' !!}
+<textarea {{ $field->attributes()->merge(['class' => 'text-black dark:text-white bg-white dark:bg-darkblue focus:outline-none focus:shadow-outline border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal']) }}
        id="{{ $field->id() }}"
        aria-label="{{ $field->label() ?? '' }}"
        placeholder="{{ $field->label() ?? '' }}"
        name="{{ $field->name() }}"
-       class="{{ $field->getAttribute('class') ?? "text-black dark:text-white bg-white dark:bg-darkblue focus:outline-none focus:shadow-outline border border-gray-300 rounded-lg py-2 px-4 block w-full appearance-none leading-normal" }}"
 
        {{ $field->isRequired() ? "required" : "" }}
        {{ $field->isDisabled() ? "disabled" : "" }}
        {{ $field->isReadonly() ? "readonly" : "" }}
-
-       @if($field->getAutocomplete()) autocomplete="{{ $field->getAutocomplete() }}" @endif
->{!! $field->formViewValue($item) ?? '' !!}</textarea>
+>{!! $field->formViewValue($item) ?? '' !!}</textarea>

src/Contracts/Fields/Relationships/BelongsToRelationshipContract.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Leeto\MoonShine\Contracts\Fields\Relationships;
+
+interface BelongsToRelationshipContract
+{
+}

src/Contracts/Fields/Relationships/HasRelationshipContract.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace Leeto\MoonShine\Contracts\Fields\Relationships;
+
+use Illuminate\Database\Eloquent\Model;
+
+interface HasRelationshipContract
+{
+    public function relatedValues(Model $item): array;
+
+    public function values(): array;
+}

src/Contracts/Fields/Relationships/ManyToManyRelationshipContract.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Leeto\MoonShine\Contracts\Fields\Relationships;
+
+interface ManyToManyRelationshipContract
+{
+}

src/Contracts/Fields/Relationships/OneToManyRelationshipContract.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Leeto\MoonShine\Contracts\Fields\Relationships;
+
+interface OneToManyRelationshipContract
+{
+}

src/Contracts/Fields/Relationships/OneToOneRelationshipContract.php

@@ -0,0 +1,7 @@
+<?php
+
+namespace Leeto\MoonShine\Contracts\Fields\Relationships;
+
+interface OneToOneRelationshipContract
+{
+}

src/Fields/BelongsTo.php

@@ -3,15 +3,14 @@
 namespace Leeto\MoonShine\Fields;
 
 use Illuminate\Database\Eloquent\Model;
-use Leeto\MoonShine\Contracts\Fields\HasRelationshipContract;
-use Leeto\MoonShine\Traits\Fields\WithRelationshipsTrait;
-use Leeto\MoonShine\Traits\Fields\SearchableTrait;
+use Leeto\MoonShine\Contracts\Fields\Relationships\HasRelationshipContract;
+use Leeto\MoonShine\Contracts\Fields\Relationships\BelongsToRelationshipContract;
+use Leeto\MoonShine\Traits\Fields\WithRelationship;
+use Leeto\MoonShine\Traits\Fields\Searchable;
 
-class BelongsTo extends Field implements HasRelationshipContract
+class BelongsTo extends Field implements HasRelationshipContract, BelongsToRelationshipContract
 {
-    use WithRelationshipsTrait, SearchableTrait;
-
-    protected static bool $toOne = true;
+    use Searchable, WithRelationship;
 
     protected static string $view = 'select';
 
@@ -20,4 +19,4 @@ public function save(Model $item): Model
         return $item->{$this->relation()}()
             ->associate($this->requestValue());
     }
-}
+}