Merge pull request #77 from GeneaLabs/laravel-5.5

Laravel 5.5
mikebronner · Nov 9, 2017 · 1a0dc18 · 1a0dc18
2 parents 2185078 + 6f35ef0
commit 1a0dc18
Show file tree

Hide file tree

Showing 28 changed files with 1,571 additions and 919 deletions.
diff --git a/public/bootstrap3-datetimepicker.css b/public/bootstrap3-datetimepicker.css
diff --git a/public/bootstrap3-datetimepicker.js b/public/bootstrap3-datetimepicker.js
diff --git a/public/bootstrap3.css b/public/bootstrap3.css
diff --git a/public/bootstrap4-datetimepicker.css b/public/bootstrap4-datetimepicker.css
@@ -1,5 +1,5 @@
 /*@preserve
- * Tempus Dominus Bootstrap4 v5.0.0-alpha (https://tempusdominus.github.io/bootstrap-4/)
+ * Tempus Dominus Bootstrap4 v5.0.0-alpha8 (https://tempusdominus.github.io/bootstrap-4/)
  * Copyright 2016-2017 Jonathan Peterson
  * Licensed under MIT (https://github.com/tempusdominus/bootstrap-3/blob/master/LICENSE)
  */
@@ -20,7 +20,7 @@
     display: block;
     margin: 2px 0;
     padding: 4px;
-    width: 19em; }
+    width: 12.8vw; }
     @media (min-width: 576px) {
       .bootstrap-datetimepicker-widget.dropdown-menu.timepicker-sbs {
         width: 38em; } }
@@ -60,10 +60,10 @@
       border-top: 6px solid white;
       bottom: -6px;
       left: 7px; }
-    .bootstrap-datetimepicker-widget.dropdown-menu.pull-right:before {
+    .bootstrap-datetimepicker-widget.dropdown-menu.float-right:before {
       left: auto;
       right: 6px; }
-    .bootstrap-datetimepicker-widget.dropdown-menu.pull-right:after {
+    .bootstrap-datetimepicker-widget.dropdown-menu.float-right:after {
       left: auto;
       right: 7px; }
   .bootstrap-datetimepicker-widget .list-unstyled {

diff --git a/public/bootstrap4-datetimepicker.js b/public/bootstrap4-datetimepicker.js
diff --git a/public/moment.js b/public/moment.js
diff --git a/resources/views/components/bootstrap4/combobox.blade.php b/resources/views/components/bootstrap4/combobox.blade.php
@@ -16,6 +16,9 @@
 @if ($isHorizontal)
     </div>
 @endif
+@php
+    dump($options);
+@endphp
 
 @section ('genealabs-laravel-casts')
     @parent

diff --git a/resources/views/components/tailwind/button.blade.php b/resources/views/components/tailwind/button.blade.php
@@ -0,0 +1,17 @@
+@if(! $isInButtonGroup)
+    @if($isHorizontal)
+        <div class="col-sm-{{ $fieldWidth }}">
+    @endif
+
+    <div>
+@endif
+
+{!! $controlHtml !!}
+
+@if(! $isInButtonGroup)
+    </div>
+
+    @if($isHorizontal)
+        </div>
+    @endif
+@endif
diff --git a/resources/views/components/tailwind/color.blade.php b/resources/views/components/tailwind/color.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/control.blade.php b/resources/views/components/tailwind/control.blade.php
@@ -0,0 +1,19 @@
+@php
+    $wrapperClass = (! $errors->isEmpty() && $errors->has($name))
+        ? ' failure'
+        : (! $errors->isEmpty() && ! $errors->has($name)
+            ? ' success'
+            : '');
+@endphp
+
+<div class="form-group{{ $wrapperClass }}">
+
+    @label ($name, $name, $options, $options['escapeLabel'] ?? false)
+
+    @include("genealabs-laravel-casts::components.tailwind.{$type}")
+
+    @if(! $errors->isEmpty() && $errors->has($name))
+        <p class="help-text">{{ implode(' ', $errors->get($name)) }}</p>
+    @endif
+
+</div>
diff --git a/resources/views/components/tailwind/email.blade.php b/resources/views/components/tailwind/email.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/input.blade.php b/resources/views/components/tailwind/input.blade.php
@@ -0,0 +1 @@
+{!! $controlHtml !!}
diff --git a/resources/views/components/tailwind/label.blade.php b/resources/views/components/tailwind/label.blade.php
@@ -0,0 +1 @@
+@label($name, $value, $options, $options['escapeLabel'] ?? false)
diff --git a/resources/views/components/tailwind/month.blade.php b/resources/views/components/tailwind/month.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/number.blade.php b/resources/views/components/tailwind/number.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/password.blade.php b/resources/views/components/tailwind/password.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/radio.blade.php b/resources/views/components/tailwind/radio.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/range.blade.php b/resources/views/components/tailwind/range.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/search.blade.php b/resources/views/components/tailwind/search.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/select.blade.php b/resources/views/components/tailwind/select.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/tel.blade.php b/resources/views/components/tailwind/tel.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/text.blade.php b/resources/views/components/tailwind/text.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/textarea.blade.php b/resources/views/components/tailwind/textarea.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/url.blade.php b/resources/views/components/tailwind/url.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/resources/views/components/tailwind/week.blade.php b/resources/views/components/tailwind/week.blade.php
@@ -0,0 +1 @@
+@include('genealabs-laravel-casts::components.tailwind.input')
diff --git a/src/Label.php b/src/Label.php
@@ -12,6 +12,7 @@ public function __construct(string $name, $value = null, array $options = [], bo
     {
         $value = str_replace('_id', '', $value);
         $value = str_replace('[]', '', $value);
+        $value = str_replace('-', ' ', $value);
         $value = $options['label'] ?? (ucwords($value) ?: '');
         $options['class'] = $options['class'] ?? '';
 

diff --git a/src/Providers/LaravelCastsService.php b/src/Providers/LaravelCastsService.php
@@ -170,6 +170,12 @@ private function registerComponents()
             $options
         );
 
+        app('form')->component(
+            "tailwindControl",
+            "genealabs-laravel-casts::components.tailwind.control",
+            $options
+        );
+
         app('form')->component(
             "vanillaControl",
             "genealabs-laravel-casts::components.vanilla.control",