update compatibility for custom field classes (#5)

* fix default value for select box

* update compatibility for custom field classes

* update compatibility for custom field classes

Author: agus24

src/Gustiawan/FormBuilder/Components/Form.php

@@ -25,10 +25,7 @@ public function __construct($form)
      */
     public function render()
     {
-        $view = view('form-generator::components.tailwind.base');
-        if (config('form_generator.style') == "bootstrap") {
-            $view = view('form-generator::components.bootstrap.base');
-        }
+        $view = view('form-generator::components.base');
 
         if (config('form_generator.form_template') != null) {
             return view(config('form_generator.form_template'));

src/Gustiawan/FormBuilder/Form.php

@@ -110,6 +110,19 @@ public function date(string $name, string $label, array $options=[])
         $this->fields[] = $this->parseField("date", $name, $label, $options);
     }
 
+    /**
+     * Form Date Input
+     *
+     * @param string $name
+     * @param string $label
+     * @param array $options
+     * @return void
+     */
+    public function number(string $name, string $label, array $options=[]) 
+    {
+        $this->fields[] = $this->parseField("number", $name, $label, $options);
+    }
+
     /**
      * Form Text Area Input
      *
@@ -215,6 +228,7 @@ private function parseField(string $type, string $name, string $label, array $op
             "type" => $type,
             "name" => $name,
             "required" => array_key_exists("required", $options) ? $options['required'] : false,
+            "class" => array_key_exists("class", $options) ? $options['class'] : "",
         ];
 
         if (array_key_exists("value", $options)) {

src/Gustiawan/FormBuilder/views/components/tailwind/base.blade.php renamed to src/Gustiawan/FormBuilder/views/components/base.blade.php

@@ -6,9 +6,10 @@ class="flex justify-center"
         @csrf
     @endif
 
-    @if($form->method != "POST" || $form->method != "GET")
+    @if($form->method != "POST" && $form->method != "GET")
         @method($form->method)
     @endif
+    @include('form-generator::components.' .config('form_generator.style'). '.inputs', ["form" => $form])
 
-    @include('form-generator::components.tailwind.inputs', ["form" => $form])
+    {{ $slot }}
 </form>

src/Gustiawan/FormBuilder/views/components/bootstrap/base.blade.php

@@ -1,7 +1,7 @@
 @foreach($field['choices'] as $value => $choice)
     <div class="form-check">
         <input type="checkbox" 
-            class="form-check-input" 
+            class="form-check-input {{ $field['class'] }}" 
             name="{{ $field['name'] }}[]"
             id="{{ $field['name']."-{$value}" }}"
             value="{{ $value }}"

src/Gustiawan/FormBuilder/views/components/bootstrap/fields/checkbox.blade.php

@@ -1,4 +1,4 @@
-<input class="form-control" 
+<input class="form-control {{ $field['class'] }}" 
     id="{{ $field['name'] }}" 
     type="{{ $field['type'] }}" 
     name="{{ $field['name'] }}" 

src/Gustiawan/FormBuilder/views/components/bootstrap/fields/input.blade.php

@@ -1,7 +1,7 @@
 @foreach($field['choices'] as $value => $choice)
     <div class="form-check">
         <input type="radio" 
-            class="form-check-input"
+            class="form-check-input {{ $field['class'] }}"
             name="{{ $field['name'] }}"
             value="{{ $value }}" 
             id="{{ $field['name']."-{$value}" }}"

src/Gustiawan/FormBuilder/views/components/bootstrap/fields/radio.blade.php

@@ -1,4 +1,7 @@
-<select name="{{ $field['name'] }}" id="{{ $field['name'] }}" class="form-control" {{ $field['required'] ? "required" : "" }}>
+<select name="{{ $field['name'] }}" id="{{ $field['name'] }}" 
+    class="form-control {{ $field['class'] }}" 
+    {{ $field['required'] ? "required" : "" }}
+>
     <option value="">Select</option>
     @foreach($field['choices'] as $value => $choice)
         <option value="{{ $value }}" {{ (old($field['name']) ?? $field['value']) == $value ? "selected" : "" }} >{{ $choice }}</option>

src/Gustiawan/FormBuilder/views/components/bootstrap/fields/select.blade.php

@@ -1,5 +1,5 @@
 <textarea name="{{ $field['name'] }}" 
-    class="form-control" 
+    class="form-control {{ $field['class'] }}" 
     id="{{ $field['name'] }}"
     {{ $field['required'] ? "required" : "" }}
 >{{ old($field['name']) ?? $field['value'] }}</textarea>

src/Gustiawan/FormBuilder/views/components/bootstrap/fields/textarea.blade.php

@@ -1,7 +1,7 @@
 @foreach($form->fields as $field)
     <div class="form-group">
         <label for="{{ $field['name'] }}" class="font-weight-bold">{!! $field['label'] !!}</label>
-        @if( !in_array($field['type'], ["text", "date", "password"]))
+        @if( !in_array($field['type'], ["text", "date", "password", "number"]))
             @include('form-generator::components.bootstrap.fields.'.$field['type'], ["field" => $field])
         @else
             @include('form-generator::components.bootstrap.fields.input', ["field" => $field])