Use Form Component and some little changes.

iamlux · Sep 8, 2016 · 75905c2 · 75905c2
1 parent 67923fc
commit 75905c2
Show file tree

Hide file tree

Showing 33 changed files with 187 additions and 231 deletions.
diff --git a/app/Http/Requests/Auth/RegisterRequest.php b/app/Http/Requests/Auth/RegisterRequest.php
@@ -16,7 +16,7 @@ public function rules()
         return [
             'username' => 'bail|required|max:30|alpha|unique:users',
             'email' => 'bail|required|email|max:255|unique:users',
-            'password' => 'bail|required|min:3|confirmed',
+            'password' => 'bail|required|min:6|confirmed',
         ];
     }
 }
diff --git a/app/Http/Requests/Auth/ResetPasswordRequest.php b/app/Http/Requests/Auth/ResetPasswordRequest.php
@@ -16,7 +16,7 @@ public function rules()
         return [
             'token' => 'required',
             'email' => 'required',
-            'password' => 'bail|required|min:8|confirmed',
+            'password' => 'bail|required|min:6|confirmed',
         ];
     }
 }
diff --git a/app/Http/Requests/UserCreateRequest.php b/app/Http/Requests/UserCreateRequest.php
@@ -14,7 +14,7 @@ public function rules()
         return [
             'username' => 'bail|required|max:30|alpha|unique:users',
             'email' => 'bail|required|email|unique:users',
-            'password' => 'bail|required|min:3|confirmed'
+            'password' => 'bail|required|min:6|confirmed'
         ];
     }
 }
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Providers;
+
+use Illuminate\Support\ServiceProvider;
+use App\Services\FormBuilder;
+
+class AppServiceProvider extends ServiceProvider
+{
+    /**
+     * Bootstrap any application services.
+     *
+     * @return void
+     */
+    public function boot()
+    {
+        FormBuilder::boot();
+    }
+
+    /**
+     * Register any application services.
+     *
+     * @return void
+     */
+    public function register()
+    {
+        //
+    }
+}
diff --git a/app/Services/FormBuilder.php b/app/Services/FormBuilder.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Services;
+
+use Form;
+
+class FormBuilder
+{
+    /**
+     * Boot the Form Builder components.
+     *
+     * @return void
+     */
+     public static function boot()
+    {
+        Form::component('submitBootstrap', 'components.submit', [
+            'value',
+            'class' => '',
+        ]);
+        Form::component('destroyBootstrap', 'components.destroy', [
+            'value',
+            'message',
+            'class' => '',
+        ]);
+        Form::component('controlBootstrap', 'components.control', [
+            'type',
+            'columns',
+            'name',
+            'errors',
+            'label' => null,
+            'value' => null,
+            'pop' => null,
+            'placeholder' => '',
+        ]);
+        Form::component('checkboxBootstrap', 'components.checkbox', [
+            'name',
+            'label',
+        ]);
+        Form::component('checkboxHorizontalBootstrap', 'components.checkboxHorizontal', [
+            'name',
+            'label',
+            'value',
+        ]);
+        Form::component('selectBootstrap', 'components.select', [
+            'name',
+            'list' => [],
+            'selected' => null,
+            'label' => null,
+        ]);    	
+    }
+}
diff --git a/app/Services/Html/FormBuilder.php b/app/Services/Html/FormBuilder.php
diff --git a/app/Services/Html/HtmlServiceProvider.php b/app/Services/Html/HtmlServiceProvider.php
diff --git a/config/app.php b/config/app.php
@@ -202,10 +202,11 @@
         /*
          * Application Service Providers...
          */
+        App\Providers\AppServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,
-        App\Services\Html\HtmlServiceProvider::class,
+        Collective\Html\HtmlServiceProvider::class,
         Magyarjeti\LaravelLipsum\LipsumServiceProvider::class,
         App\Providers\ComposerServiceProvider::class,
         App\Providers\ElfinderServiceProvider::class,

diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
@@ -1,4 +1,4 @@
-<?php
+    <?php
 
 return [
 
@@ -140,6 +140,10 @@
         'time'                  => 'Heure',
         'available'             => 'Disponible',
         'size'                  => 'Taille',
+        'comments'              => 'Commentaire',
+        'slug'                  => 'Permalien',
+        'summary'               => 'Sommaire',
+        'log'                   => 'Connexion',
     ],
 
 ];
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
@@ -16,10 +16,10 @@
 
                     <div class="row">
 
-                        {!! Form::control('text', 6, 'log', $errors, trans('front/login.log')) !!}
-                        {!! Form::control('password', 6, 'password', $errors, trans('front/login.password')) !!}
-                        {!! Form::submit(trans('front/form.send'), ['col-lg-12']) !!}
-                        {!! Form::check('memory', trans('front/login.remind')) !!}
+                        {!! Form::controlBootstrap('text', 6, 'log', $errors, trans('front/login.log')) !!}
+                        {!! Form::controlBootstrap('password', 6, 'password', $errors, trans('front/login.password')) !!}
+                        {!! Form::submitBootstrap(trans('front/form.send'), 'col-lg-12') !!}
+                        {!! Form::checkboxBootstrap('memory', trans('front/login.remind')) !!}
                         {!! Form::text('address', '', ['class' => 'hpet']) !!}		  
                         <div class="col-lg-12">					
                             {!! link_to('password/reset', trans('front/login.forget')) !!}

diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
@@ -18,8 +18,8 @@
 
                 <div class="row">
 
-                    {!! Form::control('email', 6, 'email', $errors, trans('front/password.email')) !!}
-                    {!! Form::submit(trans('front/form.send'), ['col-lg-12']) !!}
+                    {!! Form::controlBootstrap('email', 6, 'email', $errors, trans('front/password.email')) !!}
+                    {!! Form::submitBootstrap(trans('front/form.send'), 'col-lg-12') !!}
                     {!! Form::text('address', '', ['class' => 'hpet']) !!}  
 
                 </div>

diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
@@ -14,15 +14,15 @@
 
                 {!! Form::open(['url' => 'password/reset', 'method' => 'post', 'role' => 'form']) !!}   
 
-                <div class="row">
+                    <div class="row">
 
-                    {!! Form::hidden('token', $token) !!}
-                    {!! Form::control('email', 6, 'email', $errors, trans('front/password.email')) !!}
-                    {!! Form::control('password', 6, 'password', $errors, trans('front/password.password'), null, [trans('front/password.warning'), trans('front/password.warning-password')]) !!}
-                    {!! Form::control('password', 6, 'password_confirmation', $errors, trans('front/password.confirm-password')) !!}
-                    {!! Form::submit(trans('front/form.send'), ['col-lg-12']) !!}
+                        {!! Form::hidden('token', $token) !!}
+                        {!! Form::controlBootstrap('email', 6, 'email', $errors, trans('front/password.email')) !!}
+                        {!! Form::controlBootstrap('password', 6, 'password', $errors, trans('front/password.password'), null, [trans('front/password.warning'), trans('front/password.warning-password')]) !!}
+                        {!! Form::controlBootstrap('password', 6, 'password_confirmation', $errors, trans('front/password.confirm-password')) !!}
+                        {!! Form::submitBootstrap(trans('front/form.send'), 'col-lg-12') !!}
 
-                </div>
+                    </div>
 
                 {!! Form::close() !!}
 

diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
@@ -11,19 +11,18 @@
 
                 {!! Form::open(['url' => 'register']) !!}	
 
-                <div class="row">
-                    {!! Form::control('text', 6, 'username', $errors, trans('front/register.pseudo'), null, [trans('front/register.warning'), trans('front/register.warning-name')]) !!}
-                    {!! Form::control('email', 6, 'email', $errors, trans('front/register.email')) !!}
-                </div>
-                <div class="row">	
-                    {!! Form::control('password', 6, 'password', $errors, trans('front/register.password'), null, [trans('front/register.warning'), trans('front/register.warning-password')]) !!}
-                    {!! Form::control('password', 6, 'password_confirmation', $errors, trans('front/register.confirm-password')) !!}
-                </div>
-                {!! Form::text('address', '', ['class' => 'hpet']) !!}	
-
-                <div class="row">	
-                    {!! Form::submit(trans('front/form.send'), ['col-lg-12']) !!}
-                </div>
+                    <div class="row">
+                        {!! Form::controlBootstrap('text', 6, 'username', $errors, trans('front/register.pseudo'), null, [trans('front/register.warning'), trans('front/register.warning-name')]) !!}
+                        {!! Form::controlBootstrap('email', 6, 'email', $errors, trans('front/register.email')) !!}
+                    </div>
+                    <div class="row">	
+                        {!! Form::controlBootstrap('password', 6, 'password', $errors, trans('front/register.password'), null, [trans('front/register.warning'), trans('front/register.warning-password')]) !!}
+                        {!! Form::controlBootstrap('password', 6, 'password_confirmation', $errors, trans('front/register.confirm-password')) !!}
+                    </div>
+                    {!! Form::text('address', '', ['class' => 'hpet']) !!}	
+                    <div class="row">	
+                        {!! Form::submitBootstrap(trans('front/form.send'), 'col-lg-12') !!}
+                    </div>
 
                 {!! Form::close() !!}
 

diff --git a/resources/views/back/blog/table.blade.php b/resources/views/back/blog/table.blade.php
@@ -11,7 +11,7 @@
         <td>{!! link_to_route('blog.edit', trans('back/blog.edit'), [$post->id], ['class' => 'btn btn-warning btn-block']) !!}</td>
         <td>
             {!! Form::open(['method' => 'DELETE', 'route' => ['blog.destroy', $post->id]]) !!}
-                {!! Form::destroy(trans('back/blog.destroy'), trans('back/blog.destroy-warning')) !!}
+                {!! Form::destroyBootstrap(trans('back/blog.destroy'), trans('back/blog.destroy-warning')) !!}
             {!! Form::close() !!}
         </td>
     </tr>