Corrections de commit précédent, terminaison du controlleur des utili…

…sateurs, leur modele, leur vues, corrrection du bug des parametres dans le header et les routes

RebelLegion/app/Http/Controllers/UserController.php

@@ -8,7 +8,7 @@
 use App\Http\Requests\UserUpdateRequest;
 
 use Illuminate\Pagination\Paginator;
-use Illuminate\Support\Facades\View;
+use View;
 
 use App;
 use App\User;
@@ -53,13 +53,7 @@ public function create()
      */
     public function store(UserCreateRequest $request)
     {
-      $user = new User;
-      $user->userName = $request->userName;
-      $user->firstName = $request->firstName;
-      $user->lastName = $request->lastName;
-      $user->email = $request->email;
-      $user->password = $request->password;
-      $user->save();
+      $user = User::create($request->only('userName', 'firstName', 'lastName', 'email', 'password'));
       return redirect()->route('users.index', App::getLocale());
     }
 
@@ -71,15 +65,8 @@ public function store(UserCreateRequest $request)
      */
     public function show($locale, $id)
     {
-      $user = User::find($id);
-      if (!is_null($user))
-      {
-        return View::make('users.show')->with('user', $user);
-      }
-      else
-      {
-        App::abort(404);
-      }
+      $user = User::findOrFail($id);
+      return View::make('users.show')->with('user', $user);
     }
 
     /**
@@ -88,17 +75,10 @@ public function show($locale, $id)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function edit($id)
+    public function edit($locale, $id)
     {
-      $user = User::find($id);
-      if (!is_null($user))
-      {
-        return View::make('users.edit')->with('user', $user);
-      }
-      else
-      {
-        App::abort(404);
-      }
+      $user = User::findOrFail($id);
+      return View::make('users.edit')->with('user', $user);
     }
 
     /**
@@ -126,17 +106,10 @@ public function update(UserUpdateRequest $request, $id)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function destroy($id)
+    public function destroy($locale, $id)
     {
-      $user = User::find($id);
-      if (!is_null($user))
-      {
-        $user->delete();
-      }
-      else
-      {
-        App::abort(404);
-      }
-      return redirect()->back();
+      $user = User::findOrFail($id);
+      $user->delete();
+      return redirect()->route('users.index', App::getLocale());
     }
 }

RebelLegion/app/User.php

@@ -15,7 +15,7 @@ class User extends Authenticatable
      * @var array
      */
     protected $fillable = [
-        'name', 'email', 'password',
+        'userName', 'firstName', 'lastName', 'email', 'password'
     ];
 
     /**

RebelLegion/public/css/app.css

@@ -3576,9 +3576,3 @@ table.hover tbody tr:nth-of-type(even):hover {
 
 .column-1of8 {
   width: 12.5%; }
-
-/*# sourceMappingURL=app.css.map */
-.error {
-  background-color: red;
-  color: white;
-}

RebelLegion/public/css/custom.css

@@ -614,3 +614,13 @@ font-size: 1.6rem;
 	0% { top: 60%; }
 	100% { top: -450%; }
 }
+
+.error {
+  background-color: red;
+  color: white;
+}
+
+.edit_delete_forms{
+  display: inline-block;
+  text-align: center;
+}

RebelLegion/resources/lang/en/forms_buttons_common.php

@@ -7,6 +7,9 @@
     | Form common Language Lines
     |--------------------------------------------------------------------------
     */
+    'user' => 'User',
     'create' => 'Create',
+    'edit' => 'Edit',
+    'delete' => 'Delete',
     'submit' => 'Submit'
 ];

RebelLegion/resources/lang/fr/forms_buttons_common.php

@@ -7,6 +7,9 @@
     | Form common Language Lines
     |--------------------------------------------------------------------------
     */
+    'user' => 'Utilisateur',
     'create' => 'Créer',
+    'edit' => 'Éditer',
+    'delete' => 'Supprimer',
     'submit' => 'Soumettre'
 ];

RebelLegion/resources/views/includes/header.blade.php

@@ -88,17 +88,29 @@
              </a>
              <ul class="submenu menu vertical is-dropdown-submenu first-sub" >
                <li>
+                @if( isset($user) )
+                  <a tabindex="0" href="{{ route( Route::currentRouteName(), ['lang' => 'fr', 'user' => $user->id]) }}">
+                @else
                  <a tabindex="0" href="{{ route( Route::currentRouteName(), ['lang' => 'fr']) }}">
+                @endif
                    {{ trans('menus.fr') }}
                  </a>
                </li>
                <li>
-                 <a href="{{ route( Route::currentRouteName(), ['lang' => 'de']) }}">
+                 @if( isset($user) )
+                   <a tabindex="0" href="{{ route( Route::currentRouteName(), ['lang' => 'de', 'user' => $user->id]) }}">
+                 @else
+                  <a tabindex="0" href="{{ route( Route::currentRouteName(), ['lang' => 'de']) }}">
+                 @endif
                    {{ trans('menus.de') }}
                  </a>
                </li>
                <li>
-                 <a href="{{ route( Route::currentRouteName(), ['lang' => 'en']) }}">
+                 @if( isset($user) )
+                   <a tabindex="0" href="{{ route( Route::currentRouteName(), ['lang' => 'en', 'user' => $user->id]) }}">
+                 @else
+                  <a tabindex="0" href="{{ route( Route::currentRouteName(), ['lang' => 'en']) }}">
+                 @endif
                    {{ trans('menus.en') }}
                  </a>
                </li>

RebelLegion/resources/views/users/create.blade.php

@@ -2,76 +2,68 @@
 
 @section('content')
 
+<div class="row">
+  <div class="large-6 large-centered medium-8 medium-centered small-10 small-centered columns">
 
-  {{ Form::open( ['method' => 'POST', 'route' => ['users.store', 'lang' => App::getLocale()]] ) }}
-    <div class="row">
-      <div class="large-6 columns">
+    <h1>@lang('forms_buttons_common.create') @lang('forms_buttons_common.user')</h1>
+
+    {{ Form::open( ['method' => 'POST', 'route' => ['users.store', 'lang' => App::getLocale()]] ) }}
+      <div class="row">
         <label for="userName">@lang('users.userName')</label>
         <input type="text" id="userName" name="userName" value="{{ old('userName') }}" required autofocus/>
         @if ($errors->has('userName'))
           <small class="error">{{ $errors->first('userName') }}</small>
         @endif
       </div>
-    </div>
 
-    <div class="row">
-      <div class="large-6 columns">
+      <div class="row">
         <label for="firstName">@lang('users.firstName')</label>
         <input type="text" id="firstName" name="firstName" value="{{ old('firstName') }}" required/>
         @if ($errors->has('firstName'))
           <small class="error">{{ $errors->first('firstName') }}</small>
         @endif
       </div>
-    </div>
 
-    <div class="row">
-      <div class="large-6 columns">
+      <div class="row">
         <label for="lastName">@lang('users.lastName')</label>
         <input type="text" id="lastName" name="lastName" value="{{ old('lastName') }}" required/>
         @if ($errors->has('lastName'))
           <small class="error">{{ $errors->first('lastName') }}</small>
         @endif
       </div>
-    </div>
 
-    <div class="row">
-      <div class="large-6 columns">
+      <div class="row">
         <label for="email">@lang('users.email')</label>
         <input type="email" id="email" name="email" value="{{ old('email') }}" required/>
         @if ($errors->has('email'))
           <small class="error">{{ $errors->first('email') }}</small>
         @endif
       </div>
-    </div>
 
-    <div class="row">
-      <div class="large-6 columns">
+      <div class="row">
         <label for="password">@lang('users.password')</label>
         <input type="password" id="password" name="password" required/>
         @if ($errors->has('password'))
           <small class="error">{{ $errors->first('password') }}</small>
         @endif
       </div>
-    </div>
 
-    <div class="row">
-      <div class="large-6 columns">
+      <div class="row">
         <label for="passwordConfirmation">@lang('users.passwordConfirmation')</label>
         <input type="password" id="passwordConfirmation" name="passwordConfirmation" required />
         @if ($errors->has('passwordConfirmation'))
           <small class="error">{{ $errors->first('passwordConfirmation') }}</small>
         @endif
       </div>
-    </div>
 
-    <div class="row">
-      <div class="large-6 columns">
+      <div class="row">
         <button type="submit" class="button">
           @lang('forms_buttons_common.create')
         </button>
       </div>
-    </div>
 
-  {{ Form::close() }}
+    {{ Form::close() }}
+  </div>
+</div>
 
 @endsection

RebelLegion/resources/views/users/edit.blade.php

@@ -0,0 +1,70 @@
+@extends('layouts.app')
+
+@section('content')
+
+<div class="row">
+  <div class="large-6 large-centered medium-8 medium-centered small-10 small-centered columns">
+
+    <h1>@lang('forms_buttons_common.edit') @lang('forms_buttons_common.user') : {{ $user->userName }}</h1>
+
+
+  {{ Form::open( ['method' => 'PUT', 'route' => ['users.update', 'lang' => App::getLocale(), 'user' => $user->id]] ) }}
+    <div class="row">
+        <label for="userName">@lang('users.userName')</label>
+        <input type="text" id="userName" name="userName" value="{{ $user->userName }}" required autofocus/>
+        @if ($errors->has('userName'))
+          <small class="error">{{ $errors->first('userName') }}</small>
+        @endif
+    </div>
+
+    <div class="row">
+        <label for="firstName">@lang('users.firstName')</label>
+        <input type="text" id="firstName" name="firstName" value="{{ $user->firstName }}" required/>
+        @if ($errors->has('firstName'))
+          <small class="error">{{ $errors->first('firstName') }}</small>
+        @endif
+    </div>
+
+    <div class="row">
+        <label for="lastName">@lang('users.lastName')</label>
+        <input type="text" id="lastName" name="lastName" value="{{ $user->lastName }}" required/>
+        @if ($errors->has('lastName'))
+          <small class="error">{{ $errors->first('lastName') }}</small>
+        @endif
+    </div>
+
+    <div class="row">
+        <label for="email">@lang('users.email')</label>
+        <input type="email" id="email" name="email" value="{{ $user->email }}" required/>
+        @if ($errors->has('email'))
+          <small class="error">{{ $errors->first('email') }}</small>
+        @endif
+    </div>
+
+    <div class="row">
+        <label for="password">@lang('users.password')</label>
+        <input type="password" id="password" name="password" required/>
+        @if ($errors->has('password'))
+          <small class="error">{{ $errors->first('password') }}</small>
+        @endif
+    </div>
+
+    <div class="row">
+        <label for="passwordConfirmation">@lang('users.passwordConfirmation')</label>
+        <input type="password" id="passwordConfirmation" name="passwordConfirmation" required />
+        @if ($errors->has('passwordConfirmation'))
+          <small class="error">{{ $errors->first('passwordConfirmation') }}</small>
+        @endif
+    </div>
+
+    <div class="row">
+        <button type="submit" class="button">
+          @lang('forms_buttons_common.create')
+        </button>
+    </div>
+
+  {{ Form::close() }}
+  </div>
+</div>
+
+@endsection

RebelLegion/resources/views/users/index.blade.php

@@ -2,7 +2,11 @@
 
 @section('content')
 
-  <a href="{{ route('users.create', [ 'lang' => App::getLocale()] ) }}" class="button">@lang('forms_buttons_common.create')</a>
+  <div class="row">
+    <div class="large-1 large-centered medium-1 medium-centered small-1 small-centered columns">
+      <a href="{{ route('users.create', [ 'lang' => App::getLocale()] ) }}" class="button">@lang('forms_buttons_common.create')</a>
+    </div>
+  </div>
 
 	<div class="first-element row">
 		<div class="small-centered small-12 large-10 columns game_info_desc">

RebelLegion/resources/views/users/show.blade.php

@@ -2,9 +2,43 @@
 
 @section('content')
 
-<p>{{ $user->userName }}</p>
-<p>{{ $user->firstName }}</p>
-<p>{{ $user->lastName }}</p>
-<p>{{ $user->email }}</p>
+<div class="row">
+  <div class="large-6 large-centered medium-8 medium-centered small-10 small-centered columns">
+
+    <h1>@lang('forms_buttons_common.user') : {{ $user->userName }}</h1>
+
+    <table>
+      <tbody>
+        <tr>
+          <th>@lang('users.userName')</th>
+          <td>{{ $user->userName }}</td>
+        </tr>
+        <tr>
+          <th>@lang('users.firstName')</th>
+          <td>{{ $user->firstName }}</td>
+        </tr>
+        <tr>
+          <th>@lang('users.lastName')</th>
+          <td>{{ $user->lastName }}</td>
+        </tr>
+        <tr>
+          <th>@lang('users.email')</th>
+          <td>{{ $user->email }}</td>
+        </tr>
+      </tbody>
+    </table>
+
+    <div class="row">
+      {{ Form::open([ 'class' => 'edit_delete_forms', 'method' => 'GET', 'route' => ['users.edit', 'lang' => App::getLocale(), 'user' => $user->id] ]) }}
+        <button type="submit" class="button success">@lang('forms_buttons_common.edit')</button>
+      {{ Form::close() }}
+
+      {{ Form::open([ 'class' => 'edit_delete_forms', 'method' => 'DELETE', 'route' => ['users.destroy', 'lang' => App::getLocale(), 'user' => $user->id] ]) }}
+        <button type="submit" class="button alert">@lang('forms_buttons_common.delete')</button>
+      {{ Form::close() }}
+    </div>
+
+  </div>
+</div>
 
 @endsection