From 2331beab172ab02ba05ead7f46d52578b9275fbe Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Thu, 12 Sep 2019 07:53:18 -0400
Subject: [PATCH 1/7] 3.2.3

---
 app/Http/Controllers/PermissionController.php |  85 +++++++++
 app/Http/Controllers/RankController.php       |   6 +-
 app/Permission.php                            |  95 ++++++++++
 app/Rank.php                                  |   7 +-
 .../2018_08_21_094646_create_ranks_table.php  |  19 +-
 database/seeds/RanksTableSeeder.php           | 171 +-----------------
 public/js/permissions.js                      |  40 ++++
 resources/assets/js/permissions.js            |   8 +
 .../views/admin/configs/ranks/index.blade.php |  34 ++++
 .../views/admin/configs/ranks/show.blade.php  |  87 +++++++++
 .../views/layouts/admin/sidebar.blade.php     |  12 ++
 routes/web.php                                |   4 +
 12 files changed, 378 insertions(+), 190 deletions(-)
 create mode 100644 app/Http/Controllers/PermissionController.php
 create mode 100644 app/Permission.php
 create mode 100644 public/js/permissions.js
 create mode 100644 resources/assets/js/permissions.js
 create mode 100644 resources/views/admin/configs/ranks/index.blade.php
 create mode 100644 resources/views/admin/configs/ranks/show.blade.php

diff --git a/app/Http/Controllers/PermissionController.php b/app/Http/Controllers/PermissionController.php
new file mode 100644
index 00000000..3e656a99
--- /dev/null
+++ b/app/Http/Controllers/PermissionController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Permission;
+use Illuminate\Http\Request;
+
+class PermissionController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Permission  $permission
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Permission $permission)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Permission  $permission
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Permission $permission)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Permission  $permission
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Permission $permission)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Permission  $permission
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Permission $permission)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/RankController.php b/app/Http/Controllers/RankController.php
index db5b967b..523dc6bd 100644
--- a/app/Http/Controllers/RankController.php
+++ b/app/Http/Controllers/RankController.php
@@ -14,7 +14,7 @@ class RankController extends Controller
      */
     public function index()
     {
-        //
+        return view('admin.configs.ranks.index',['ranks' => Rank::all()]);
     }
 
     /**
@@ -44,9 +44,9 @@ class RankController extends Controller
      * @param  \App\Rank  $rank
      * @return \Illuminate\Http\Response
      */
-    public function show(Rank $rank)
+    public function show($rank)
     {
-        //
+        return view('admin.configs.ranks.show',['rank' => Rank::find($rank)]);
     }
 
     /**
diff --git a/app/Permission.php b/app/Permission.php
new file mode 100644
index 00000000..76395ee4
--- /dev/null
+++ b/app/Permission.php
@@ -0,0 +1,95 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Arr;
+
+class Permission extends Model
+{
+    public static function all($columns = null)
+    {
+        $perm = [
+            'news' => [
+                'news_see' => [
+                    'id' => 'news_see',
+                    'communName' => 'Voir les nouvelles',
+                    'desc' => 'L\'utilisateur peut-il consulter les nouvelles',
+                    'icon' => 'fa-eye',
+                    'valeur' => 0
+                ],
+                'news_add' => [
+                    'id' => 'news_add',
+                    'communName' => 'Ajouter une nouvelles',
+                    'desc' => 'L\'utilisateur peut-il ajouter une nouvelle',
+                    'icon' => 'fa-plus',
+                    'valeur' => 0
+                ],
+                'news_edit' => [
+                    'id' => 'news_edit',
+                    'communName' => 'Modifier une nouvelles',
+                    'desc' => 'L\'utilisateur peut-il modifier une nouvelle',
+                    'icon' => 'fa-edit',
+                    'valeur' => 0
+                ],
+                'news_delete' => [
+                    'id' => 'news_delete',
+                    'communName' => 'Supprimer une nouvelles',
+                    'desc' => 'L\'utilisateur peut-il supprimer une nouvelle',
+                    'icon' => 'fa-close',
+                    'valeur' => 0
+                ]
+            ],
+            'message' => [
+                'msg_see' => [
+                    'id' => 'msg_see',
+                    'communName' => 'Voir les messages',
+                    'desc' => 'L\'utilisateur peut-il consulter les messages de la semaine',
+                    'icon' => 'fa-eye',
+                    'valeur' => 0
+                ],
+                'msg_add' => [
+                    'id' => 'msg_add',
+                    'communName' => 'Ajouter un message',
+                    'desc' => 'L\'utilisateur peut-il ajouter un message de la semaine',
+                    'icon' => 'fa-eye',
+                    'valeur' => 0
+                ],
+                'msg_edit' => [
+                    'id' => 'msg_edit',
+                    'communName' => 'Modifier un message',
+                    'desc' => 'L\'utilisateur peut-il modifier les messages de la semaine',
+                    'icon' => 'fa-eye',
+                    'valeur' => 0
+                ],
+                'msg_delete' => [
+                    'id' => 'msg_delete',
+                    'communName' => 'Supprimer un message',
+                    'desc' => 'L\'utilisateur peut-il supprimer un message de la semaine',
+                    'icon' => 'fa-eye',
+                    'valeur' => 0
+                ]
+            ]
+        ];
+
+        return $perm;
+    }
+
+    public static function allToArray()
+    {
+        $permissions = [];
+        foreach (Permission::all() as $cat)
+        {
+            foreach ($cat as $perm)
+            {
+                $permissions[$perm['id']] = 0;
+            }
+        }
+        return $permissions;
+    }
+
+    public static function allToString()
+    {
+        return json_encode(Permission::allToArray());
+    }
+}
diff --git a/app/Rank.php b/app/Rank.php
index 1e74e9cb..18e499e8 100644
--- a/app/Rank.php
+++ b/app/Rank.php
@@ -6,7 +6,8 @@ use Illuminate\Database\Eloquent\Model;
 
 class Rank extends Model
 {
-    protected $casts = [
-        'perm' => 'array',
-    ];
+    public function permissions()
+    {
+        return collect(json_decode($this->permissions,true));
+    }
 }
diff --git a/database/migrations/2018_08_21_094646_create_ranks_table.php b/database/migrations/2018_08_21_094646_create_ranks_table.php
index 69bea7da..3d81f0c0 100644
--- a/database/migrations/2018_08_21_094646_create_ranks_table.php
+++ b/database/migrations/2018_08_21_094646_create_ranks_table.php
@@ -15,23 +15,10 @@ class CreateRanksTable extends Migration
     {
         Schema::create('ranks', function (Blueprint $table) {
             $table->increments('id');
-            $table->string('name');            
+            $table->string('name');
+            $table->text('desc');
             $table->text('acces_level');
-            $table->boolean('schedule_see');          
-            $table->boolean('schedule_edit');          
-            $table->boolean('schedule_notify');          
-            $table->boolean('message_see');          
-            $table->boolean('message_edit');          
-            $table->boolean('message_notify');            
-            $table->boolean('paper_edit');          
-            $table->boolean('paper_publish');         
-            $table->boolean('paper_notify');                   
-            $table->boolean('inventory_see');          
-            $table->boolean('inventory_edit');          
-            $table->boolean('inventory_notify');          
-            $table->boolean('user_see');          
-            $table->boolean('user_edit');          
-            $table->boolean('user_notify');
+            $table->text('permissions');
             $table->timestamps();
         });
     }
diff --git a/database/seeds/RanksTableSeeder.php b/database/seeds/RanksTableSeeder.php
index e5ca8a9c..34d0537c 100644
--- a/database/seeds/RanksTableSeeder.php
+++ b/database/seeds/RanksTableSeeder.php
@@ -15,174 +15,9 @@ class RanksTableSeeder extends Seeder
             [
                 'name' => "SuperAdmin",
                 'acces_level' => '2',
-                'schedule_see' => true,
-                'schedule_edit' => true,
-                'schedule_notify' => true,
-                'message_see' => true,
-                'message_edit' => true,
-                'message_notify' => true,
-                'paper_edit' => true,
-                'paper_publish' => true,
-                'paper_notify' => true,
-                'inventory_see' => true,
-                'inventory_edit' => true,
-                'inventory_notify' => true,
-                'user_see' => true,
-                'user_edit' => true,
-                'user_notify' => true
-            ],
-            [
-                'name' => "Cadet",
-                'acces_level' => '0',
-                'schedule_see' => false,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => false,
-                'message_edit' => false,
-                'message_notify' => false,
-                'paper_edit' => false,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => false,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => false,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "1er classe",
-                'acces_level' => '0',
-                'schedule_see' => false,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => false,
-                'message_edit' => false,
-                'message_notify' => false,
-                'paper_edit' => false,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => false,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => false,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "Caporal",
-                'acces_level' => '0',
-                'schedule_see' => false,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => false,
-                'message_edit' => false,
-                'message_notify' => false,
-                'paper_edit' => false,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => false,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => false,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "Caporal de section",
-                'acces_level' => '0',
-                'schedule_see' => false,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => false,
-                'message_edit' => false,
-                'message_notify' => false,
-                'paper_edit' => false,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => false,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => false,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "Sergent",
-                'acces_level' => '1',
-                'schedule_see' => true,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => true,
-                'message_edit' => false,
-                'message_notify' => true,
-                'paper_edit' => false,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => true,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => false,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "Sergent de section",
-                'acces_level' => '1',
-                'schedule_see' => true,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => true,
-                'message_edit' => false,
-                'message_notify' => true,
-                'paper_edit' => false,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => true,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => false,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "Adjudant 2e Classe",
-                'acces_level' => '2',
-                'schedule_see' => true,
-                'schedule_edit' => false,
-                'schedule_notify' => false,
-                'message_see' => true,
-                'message_edit' => true,
-                'message_notify' => true,
-                'paper_edit' => true,
-                'paper_publish' => false,
-                'paper_notify' => false,
-                'inventory_see' => true,
-                'inventory_edit' => false,
-                'inventory_notify' => false,
-                'user_see' => true,
-                'user_edit' => false,
-                'user_notify' => false
-            ],
-            [
-                'name' => "Adjudant 1er Classe",
-                'acces_level' => '2',
-                'schedule_see' => true,
-                'schedule_edit' => true,
-                'schedule_notify' => true,
-                'message_see' => true,
-                'message_edit' => true,
-                'message_notify' => true,
-                'paper_edit' => true,
-                'paper_publish' => true,
-                'paper_notify' => true,
-                'inventory_see' => true,
-                'inventory_edit' => true,
-                'inventory_notify' => true,
-                'user_see' => true,
-                'user_edit' => true,
-                'user_notify' => true
-            ],
+                'desc' => 'Compte SuperAdmin donne toutes les permissions ne peux être modifié',
+                'permissions' => \App\Permission::allToString()
+            ]
         ]);
     }
 }
diff --git a/public/js/permissions.js b/public/js/permissions.js
new file mode 100644
index 00000000..35ca3962
--- /dev/null
+++ b/public/js/permissions.js
@@ -0,0 +1,40 @@
+function switchPermissionSwitch(rank,valeur)
+{
+    switch (valeur) {
+        case 'close':
+            $('#'+rank).val('-1');
+            $('#'+rank+'-close').addClass('btn-danger');
+            $('#'+rank+'-close').removeClass('btn-outline-danger');
+
+            $('#'+rank+'-slash').removeClass('btn-warning');
+            $('#'+rank+'-slash').addClass('btn-outline-warning');
+
+            $('#'+rank+'-plus').addClass('btn-outline-success');
+            $('#'+rank+'-plus').removeClass('btn-success');
+            break;
+
+        case 'slash':
+            $('#'+rank).val('0');
+            $('#'+rank+'-close').addClass('btn-outline-danger');
+            $('#'+rank+'-close').removeClass('btn-danger');
+
+            $('#'+rank+'-slash').addClass('btn-warning');
+            $('#'+rank+'-slash').removeClass('btn-outline-warning');
+
+            $('#'+rank+'-plus').addClass('btn-outline-success');
+            $('#'+rank+'-plus').removeClass('btn-success');
+            break;
+
+        case 'plus':
+            $('#'+rank).val('1');
+            $('#'+rank+'-close').addClass('btn-outline-danger');
+            $('#'+rank+'-close').removeClass('btn-danger');
+
+            $('#'+rank+'-slash').removeClass('btn-warning');
+            $('#'+rank+'-slash').addClass('btn-outline-warning');
+
+            $('#'+rank+'-plus').addClass('btn-success');
+            $('#'+rank+'-plus').removeClass('btn-outline-success');
+            break;
+    }
+}
diff --git a/resources/assets/js/permissions.js b/resources/assets/js/permissions.js
new file mode 100644
index 00000000..6f33d8cd
--- /dev/null
+++ b/resources/assets/js/permissions.js
@@ -0,0 +1,8 @@
+function switchPermissionSwitch(rank,valeur)
+{
+    switch (valeur) {
+        case 'close':
+            $('#'+rank+'-close').addClass('btn-danger');
+            $('#'+rank+'-close').removeClass('btn-danger');
+    }
+}
diff --git a/resources/views/admin/configs/ranks/index.blade.php b/resources/views/admin/configs/ranks/index.blade.php
new file mode 100644
index 00000000..87c484c7
--- /dev/null
+++ b/resources/views/admin/configs/ranks/index.blade.php
@@ -0,0 +1,34 @@
+@extends('layouts.admin.main')
+
+@section('content')
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header card-header-primary">
+                <h4>Configuration des grades</h4>
+            </div>
+            <div class="card-body mt-5">
+                <div class="row">
+                    @foreach($ranks as $rank)
+                        <div class="col-md-4">
+                            <div class="card">
+                                <div class="card-header @if($rank->id == 1) card-header-danger @else card-header-primary @endif">
+                                    <h4>{{$rank->name}}</h4>
+                                </div>
+                                <div class="card-body">
+                                    <div>
+                                        {{$rank->desc}}
+                                    </div>
+                                    <div class="row">
+                                        <div class="col-md-12">
+                                            <a href="/admin/config/ranks/{{$rank->id}}" class="btn btn-primary btn-block">Gérer</a>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
diff --git a/resources/views/admin/configs/ranks/show.blade.php b/resources/views/admin/configs/ranks/show.blade.php
new file mode 100644
index 00000000..292a49df
--- /dev/null
+++ b/resources/views/admin/configs/ranks/show.blade.php
@@ -0,0 +1,87 @@
+@extends('layouts.admin.main')
+
+@section('content')
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header card-header-primary">
+                <h4>Configuration du grade {{$rank->name}}</h4>
+            </div>
+            <div class="card-body mt-5">
+                <form method="post" action="">
+                    @csrf
+
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Nom</label>
+                                <input class="form-control" type="text" name="name" value="{{$rank->name}}">
+                                <small class="form-text text-muted">Nom du grade</small>
+                            </div>
+                        </div>
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea id="desc" name="desc">{!! $rank->desc !!}</textarea>
+                                <small class="form-text text-muted">Description du grade</small>
+                            </div>
+                        </div>
+                        <hr>
+                        <div class="col-md-12">
+                            <h3>Permissions du Grade</h3>
+                            <p>
+                                Choisissez quels permissions doivent être associé avec ce grade.
+                            </p>
+                            <div id="accordion" role="tablist">
+                                @foreach(\App\Permission::all() as $key => $cat)
+                                    <div class="card card-collapse">
+                                        <div class="card-header" role="tab" id="headingOne">
+                                            <h5 class="mb-0">
+                                                <a class="text-capitalize" data-toggle="collapse" href="#coll-{{$key}}"  @if ($loop->first) aria-expanded="true" @endif aria-controls="collapseOne">
+                                                    {{$key}}
+                                                    <i class="material-icons">keyboard_arrow_down</i>
+                                                </a>
+                                            </h5>
+                                        </div>
+
+                                        <div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
+                                            <div class="card-body">
+                                                <div class="row">
+                                                    @foreach($cat as $rank)
+                                                        <div class="col text-center">
+                                                            <input class="d-none" type="text" id="{{$rank['id']}}" name="{{$rank['id']}}" value="0">
+                                                            <h5>{{$rank['communName']}}</h5>
+                                                            <div class="btn-group">
+                                                                <button type="button" id="{{$rank['id']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$rank['id']}}','close')"><i class="fa fa-close"></i></button>
+                                                                <button type="button" id="{{$rank['id']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$rank['id']}}','slash')"><i class="fa fa-slash"></i></button>
+                                                                <button type="button" id="{{$rank['id']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$rank['id']}}','plus')"><i class="fa fa-plus"></i></button>
+                                                            </div>
+                                                            <p>
+                                                                <small>{{$rank['desc']}}</small>
+                                                            </p>
+                                                        </div>
+                                                    @endforeach
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endforeach
+                            </div>
+                        </div>
+                        <div class="col-md-12 mt-5">
+                            <button type="submit" class="btn btn-primary">Sauvegarder</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+    <script src="/js/permissions.js"></script>
+    <script>
+        $('#desc').trumbowyg({
+            lang: 'fr'
+        });
+    </script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php
index cde959a2..093c8f12 100644
--- a/resources/views/layouts/admin/sidebar.blade.php
+++ b/resources/views/layouts/admin/sidebar.blade.php
@@ -234,6 +234,18 @@
                                 <span class="sidebar-normal"> Apparence </span>
                             </a>
                         </li>
+                        <li class="nav-item ">
+                            <a class="nav-link" href="/admin/config/ranks">
+                                <span class="sidebar-mini"> <i class="fas fa-user-tag"></i> </span>
+                                <span class="sidebar-normal"> Grade </span>
+                            </a>
+                        </li>
+                        <li class="nav-item ">
+                            <a class="nav-link" href="/admin/config/jobs">
+                                <span class="sidebar-mini"> <i class="fas fa-user-shield"></i> </span>
+                                <span class="sidebar-normal"> Poste </span>
+                            </a>
+                        </li>
                     </ul>
                 </div>
             </li>
diff --git a/routes/web.php b/routes/web.php
index fe0509a5..7593a1d4 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -86,6 +86,10 @@ Route::middleware(['auth','admin'])->group(function () {
         Route::get('/admin/config/customisation','ConfigController@customisation');
         Route::post('/admin/config/customisation','ConfigController@customisationUpdate');
 
+        Route::get('/admin/config/ranks','RankController@index');
+        Route::get('/admin/config/ranks/{id}','RankController@show');
+        Route::get('/admin/config/jobs','JobController@index');
+
         /** Public page */
         Route::get('/admin/public/edit/{config}', 'PublicController@edit');
         Route::post('/admin/public/edit/{config}', 'PublicController@update');

From b7c2b8a632f21844cdeb7486375931116b5d4559 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Thu, 12 Sep 2019 18:21:55 -0400
Subject: [PATCH 2/7] Perm

---
 app/Permission.php | 214 ++++++++++++++++++++++++++++++---------------
 1 file changed, 142 insertions(+), 72 deletions(-)

diff --git a/app/Permission.php b/app/Permission.php
index 76395ee4..daa5175d 100644
--- a/app/Permission.php
+++ b/app/Permission.php
@@ -7,89 +7,159 @@ use Illuminate\Support\Arr;
 
 class Permission extends Model
 {
+    const PERMISSIONS = [
+        'news' => [
+            'news_see' => [
+                'id' => 'news_see',
+                'communName' => 'Voir les nouvelles',
+                'desc' => 'L\'utilisateur peut-il consulter les nouvelles',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'news_add' => [
+                'id' => 'news_add',
+                'communName' => 'Ajouter une nouvelles',
+                'desc' => 'L\'utilisateur peut-il ajouter une nouvelle',
+                'icon' => 'fa-plus',
+                'valeur' => 0
+            ],
+            'news_edit' => [
+                'id' => 'news_edit',
+                'communName' => 'Modifier une nouvelles',
+                'desc' => 'L\'utilisateur peut-il modifier une nouvelle',
+                'icon' => 'fa-edit',
+                'valeur' => 0
+            ],
+            'news_delete' => [
+                'id' => 'news_delete',
+                'communName' => 'Supprimer une nouvelles',
+                'desc' => 'L\'utilisateur peut-il supprimer une nouvelle',
+                'icon' => 'fa-close',
+                'valeur' => 0
+            ]
+        ],
+        'message' => [
+            'msg_see' => [
+                'id' => 'msg_see',
+                'communName' => 'Voir les messages',
+                'desc' => 'L\'utilisateur peut-il consulter les messages de la semaine',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'msg_add' => [
+                'id' => 'msg_add',
+                'communName' => 'Ajouter un message',
+                'desc' => 'L\'utilisateur peut-il ajouter un message de la semaine',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'msg_edit' => [
+                'id' => 'msg_edit',
+                'communName' => 'Modifier un message',
+                'desc' => 'L\'utilisateur peut-il modifier les messages de la semaine',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'msg_delete' => [
+                'id' => 'msg_delete',
+                'communName' => 'Supprimer un message',
+                'desc' => 'L\'utilisateur peut-il supprimer un message de la semaine',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ]
+        ],
+        'inventory' => [
+            'inventory_see' => [
+                'id' => 'inventory_see',
+                'communName' => 'Voir l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il consulter l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'inventory_add' => [
+                'id' => 'inventory_add',
+                'communName' => 'Ajouter item a l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il ajouter un item a l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'inventory_edit' => [
+                'id' => 'inventory_edit',
+                'communName' => 'Modifier un item de l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il modifier un item de l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'inventory_delete' => [
+                'id' => 'inventory_delete',
+                'communName' => 'Supprimer un item de l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il supprimer un item de l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+        ],
+        'booking' => [
+            'booking_see' => [
+                'id' => 'booking_see',
+                'communName' => 'Voir les réservations',
+                'desc' => 'L\'utilisateur peut-il consulter la liste des réservations',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'booking_see_self' => [
+                'id' => 'booking_see_self',
+                'communName' => 'Voir ses propres réservations',
+                'desc' => 'L\'utilisateur peut-il consulter la liste de ses réservations',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'booking_add' => [
+                'id' => 'booking_add',
+                'communName' => 'Ajouter item a l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il ajouter un item a l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'booking_edit' => [
+                'id' => 'booking_edit',
+                'communName' => 'Modifier un item de l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il modifier un item de l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'booking_delete' => [
+                'id' => 'booking_delete',
+                'communName' => 'Supprimer un item de l\'inventaire',
+                'desc' => 'L\'utilisateur peut-il supprimer un item de l\'inventaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ]
+        ]
+    ];
+
     public static function all($columns = null)
     {
-        $perm = [
-            'news' => [
-                'news_see' => [
-                    'id' => 'news_see',
-                    'communName' => 'Voir les nouvelles',
-                    'desc' => 'L\'utilisateur peut-il consulter les nouvelles',
-                    'icon' => 'fa-eye',
-                    'valeur' => 0
-                ],
-                'news_add' => [
-                    'id' => 'news_add',
-                    'communName' => 'Ajouter une nouvelles',
-                    'desc' => 'L\'utilisateur peut-il ajouter une nouvelle',
-                    'icon' => 'fa-plus',
-                    'valeur' => 0
-                ],
-                'news_edit' => [
-                    'id' => 'news_edit',
-                    'communName' => 'Modifier une nouvelles',
-                    'desc' => 'L\'utilisateur peut-il modifier une nouvelle',
-                    'icon' => 'fa-edit',
-                    'valeur' => 0
-                ],
-                'news_delete' => [
-                    'id' => 'news_delete',
-                    'communName' => 'Supprimer une nouvelles',
-                    'desc' => 'L\'utilisateur peut-il supprimer une nouvelle',
-                    'icon' => 'fa-close',
-                    'valeur' => 0
-                ]
-            ],
-            'message' => [
-                'msg_see' => [
-                    'id' => 'msg_see',
-                    'communName' => 'Voir les messages',
-                    'desc' => 'L\'utilisateur peut-il consulter les messages de la semaine',
-                    'icon' => 'fa-eye',
-                    'valeur' => 0
-                ],
-                'msg_add' => [
-                    'id' => 'msg_add',
-                    'communName' => 'Ajouter un message',
-                    'desc' => 'L\'utilisateur peut-il ajouter un message de la semaine',
-                    'icon' => 'fa-eye',
-                    'valeur' => 0
-                ],
-                'msg_edit' => [
-                    'id' => 'msg_edit',
-                    'communName' => 'Modifier un message',
-                    'desc' => 'L\'utilisateur peut-il modifier les messages de la semaine',
-                    'icon' => 'fa-eye',
-                    'valeur' => 0
-                ],
-                'msg_delete' => [
-                    'id' => 'msg_delete',
-                    'communName' => 'Supprimer un message',
-                    'desc' => 'L\'utilisateur peut-il supprimer un message de la semaine',
-                    'icon' => 'fa-eye',
-                    'valeur' => 0
-                ]
-            ]
-        ];
 
-        return $perm;
-    }
-
-    public static function allToArray()
-    {
-        $permissions = [];
-        foreach (Permission::all() as $cat)
+        $permissions = collect();
+        foreach (self::PERMISSIONS as $key => $cat)
         {
-            foreach ($cat as $perm)
+            foreach ($cat as $c)
             {
-                $permissions[$perm['id']] = 0;
+                $p = new Permission();
+                $p->id = $c['id'];
+                $p->communName = $c['communName'];
+                $p->desc = $c['desc'];
+                $p->icon = $c['icon'];
+                $p->value = $c['valeur'];
+                $permissions->push($p);
             }
         }
+
         return $permissions;
     }
 
     public static function allToString()
     {
-        return json_encode(Permission::allToArray());
+        return \GuzzleHttp\json_encode(Permission::all());
     }
 }

From 7dedd9586b42e2fcb3be5f44f375ae234f4b3884 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Fri, 13 Sep 2019 16:25:36 -0400
Subject: [PATCH 3/7] 3.2.3

---
 app/Http/Controllers/Auth/LoginController.php |   9 +-
 app/Http/Controllers/EventController.php      |   4 +-
 app/Http/Controllers/RankController.php       |  45 ++-
 app/Http/Controllers/UserController.php       |   8 +-
 app/Http/Kernel.php                           |   1 +
 app/Http/Middleware/CheckPerm.php             |  25 ++
 app/Permission.php                            | 224 ++++++++++++---
 app/Rank.php                                  |  18 ++
 app/User.php                                  |  15 +
 .../2014_10_12_000000_create_users_table.php  |   2 +-
 database/seeds/RanksTableSeeder.php           |   2 +-
 database/seeds/UsersTableSeeder.php           |   4 +-
 resources/views/admin/article/index.blade.php |   8 +-
 .../views/admin/configs/ranks/add.blade.php   |  87 ++++++
 .../views/admin/configs/ranks/show.blade.php  |  16 +-
 resources/views/admin/dashboard.blade.php     | 267 ++++++++----------
 .../views/admin/inventory/index.blade.php     |  10 +-
 resources/views/admin/log/display.blade.php   |   4 +-
 resources/views/admin/news/index.blade.php    |  17 +-
 resources/views/admin/update.blade.php        | 107 +++++++
 resources/views/admin/user/edit.blade.php     |   2 +-
 resources/views/admin/user/index.blade.php    |   2 +-
 resources/views/admin/user/profil.blade.php   |   2 +-
 .../admin/user/profil/password.blade.php      |   4 +-
 resources/views/layouts/admin/alert.blade.php |   7 +
 resources/views/layouts/admin/main.blade.php  |   1 +
 .../views/layouts/admin/sidebar.blade.php     | 119 +++++---
 .../layouts/modal/schedule/show.blade.php     |   6 +-
 routes/api.php                                |  60 ++--
 routes/web.php                                | 181 +++++-------
 30 files changed, 834 insertions(+), 423 deletions(-)
 create mode 100644 app/Http/Middleware/CheckPerm.php
 create mode 100644 resources/views/admin/configs/ranks/add.blade.php

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 660e753e..39e16ac7 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -22,12 +22,9 @@ class LoginController extends Controller
 
     protected function redirectTo()
     {
-        if(\Auth::User()->getAcces(2))
-        {
-            return '/admin';
-        } else if(\Auth::User()->getAcces(1)){
-            return '/ecc';
-        }
+
+        return '/admin';
+
     }
     /**
      * Where to redirect users after login.
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index 87d4cacb..ffdb46d2 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -84,7 +84,7 @@ class EventController extends Controller
             }   
         }
         clog('add','success','a ajouté un évènement',null,'App\Event',$event->id);
-        return redirect('/admin/calendar')->with('success','Événement ajouter à l\'horaire');
+        return redirect('/admin/schedule')->with('success','Événement ajouter à l\'horaire');
     }
 
     /**
@@ -175,7 +175,7 @@ class EventController extends Controller
             }
         }
         clog('edit','success','a modifié un évènement',null,'App\Event',$event->id);
-        return redirect('/admin/calendar')->with('success','Modification à l\'événement sauvegarder à l\'horaire');
+        return redirect('/admin/schedule')->with('success','Modification à l\'événement sauvegarder à l\'horaire');
     }
 
     /**
diff --git a/app/Http/Controllers/RankController.php b/app/Http/Controllers/RankController.php
index 523dc6bd..eb809eb5 100644
--- a/app/Http/Controllers/RankController.php
+++ b/app/Http/Controllers/RankController.php
@@ -24,7 +24,7 @@ class RankController extends Controller
      */
     public function create()
     {
-        //
+        return view('admin.configs.ranks.add');
     }
 
     /**
@@ -35,7 +35,25 @@ class RankController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $r = new Rank();
+
+        $r->name = $request->name;
+        $r->desc = $request->desc;
+        $r->acces_level = 1;
+
+        $tpermission = [];
+
+        foreach (\App\Permission::all() as $perm)
+        {
+            $tkey = $perm->ckey;
+            $tpermission[$tkey] = $request->$tkey;
+        }
+
+        $r->permissions = json_encode($tpermission);
+        $r->save();
+
+        clog('add','success','Grade ajouté avec succès');
+        return redirect('/admin/config/ranks')->with('success','Grade ajouté avec succès');
     }
 
     /**
@@ -57,7 +75,7 @@ class RankController extends Controller
      */
     public function edit(Rank $rank)
     {
-        //
+
     }
 
     /**
@@ -67,9 +85,26 @@ class RankController extends Controller
      * @param  \App\Rank  $rank
      * @return \Illuminate\Http\Response
      */
-    public function update(Request $request, Rank $rank)
+    public function update(Request $request, $rank)
     {
-        //
+        $r = Rank::find($rank);
+
+        $r->name = $request->name;
+        $r->desc = $request->desc;
+
+        $tpermission = [];
+
+        foreach (\App\Permission::all() as $perm)
+        {
+            $tkey = $perm->ckey;
+            $tpermission[$tkey] = $request->$tkey;
+        }
+
+        $r->permissions = json_encode($tpermission);
+        $r->save();
+
+        clog('edit','success','Grade modifié avec succès');
+        return redirect('/admin/config/ranks')->with('success','Grade modifié avec succès');
     }
 
     /**
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 8c5512fd..c64b3952 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -69,7 +69,7 @@ class UserController extends Controller
         }
 
         $user->avatar = rand(1,16);
-        $user->rank = request('rank');
+        $user->rank_id = request('rank');
         $user->job = request('job');
         $user->password = bcrypt(request('psw'));
         $user->api_token = str_random(60);
@@ -141,7 +141,7 @@ class UserController extends Controller
             $user->age = request('age');
         }
 
-        $user->rank = request('rank');
+        $user->rank_id = request('rank');
         $user->job = request('job');
         if (request('psw') != null) {
             $user->password = bcrypt(request('psw'));
@@ -231,7 +231,7 @@ class UserController extends Controller
 
         $user->save();
 
-        return back()->with('success', 'Modification enregistré');
+        return redirect('/admin/profil')->with('success', 'Modification enregistré');
     }
     
     public function UserAdress()
@@ -247,7 +247,7 @@ class UserController extends Controller
 
         $user->save();
 
-        return back()->with('success', 'Modification enregistré');
+        return redirect('/admin/profil')->with('success', 'Modification enregistré');
     }
 
     public function apiList()
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 76785d61..649e7b55 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -61,5 +61,6 @@ class Kernel extends HttpKernel
         'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
         'staff' => \App\Http\Middleware\AccesStaff::class,
         'admin' => \App\Http\Middleware\AccesAdmin::class,
+        'perm' => \App\Http\Middleware\CheckPerm::class,
     ];
 }
diff --git a/app/Http/Middleware/CheckPerm.php b/app/Http/Middleware/CheckPerm.php
new file mode 100644
index 00000000..ced3b4df
--- /dev/null
+++ b/app/Http/Middleware/CheckPerm.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class CheckPerm
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next,$permission)
+    {
+        if (\Auth::user()->p($permission) != 1)
+        {
+            clog('navigate','danger','L\'utilisateur n\'est pas autorisé à effectuer cette action',\Auth::user()->id);
+            return redirect('/admin')->with('error','Vous n\'êtes pas autorisé à effectuer cette action');
+        }
+        return $next($request);
+    }
+}
diff --git a/app/Permission.php b/app/Permission.php
index daa5175d..9f60eee4 100644
--- a/app/Permission.php
+++ b/app/Permission.php
@@ -10,28 +10,28 @@ class Permission extends Model
     const PERMISSIONS = [
         'news' => [
             'news_see' => [
-                'id' => 'news_see',
+                'ckey' => 'news_see',
                 'communName' => 'Voir les nouvelles',
                 'desc' => 'L\'utilisateur peut-il consulter les nouvelles',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'news_add' => [
-                'id' => 'news_add',
+                'ckey' => 'news_add',
                 'communName' => 'Ajouter une nouvelles',
                 'desc' => 'L\'utilisateur peut-il ajouter une nouvelle',
                 'icon' => 'fa-plus',
                 'valeur' => 0
             ],
             'news_edit' => [
-                'id' => 'news_edit',
+                'ckey' => 'news_edit',
                 'communName' => 'Modifier une nouvelles',
                 'desc' => 'L\'utilisateur peut-il modifier une nouvelle',
                 'icon' => 'fa-edit',
                 'valeur' => 0
             ],
             'news_delete' => [
-                'id' => 'news_delete',
+                'ckey' => 'news_delete',
                 'communName' => 'Supprimer une nouvelles',
                 'desc' => 'L\'utilisateur peut-il supprimer une nouvelle',
                 'icon' => 'fa-close',
@@ -40,28 +40,28 @@ class Permission extends Model
         ],
         'message' => [
             'msg_see' => [
-                'id' => 'msg_see',
+                'ckey' => 'msg_see',
                 'communName' => 'Voir les messages',
                 'desc' => 'L\'utilisateur peut-il consulter les messages de la semaine',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'msg_add' => [
-                'id' => 'msg_add',
+                'ckey' => 'msg_add',
                 'communName' => 'Ajouter un message',
                 'desc' => 'L\'utilisateur peut-il ajouter un message de la semaine',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'msg_edit' => [
-                'id' => 'msg_edit',
+                'ckey' => 'msg_edit',
                 'communName' => 'Modifier un message',
                 'desc' => 'L\'utilisateur peut-il modifier les messages de la semaine',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'msg_delete' => [
-                'id' => 'msg_delete',
+                'ckey' => 'msg_delete',
                 'communName' => 'Supprimer un message',
                 'desc' => 'L\'utilisateur peut-il supprimer un message de la semaine',
                 'icon' => 'fa-eye',
@@ -70,28 +70,28 @@ class Permission extends Model
         ],
         'inventory' => [
             'inventory_see' => [
-                'id' => 'inventory_see',
+                'ckey' => 'inventory_see',
                 'communName' => 'Voir l\'inventaire',
                 'desc' => 'L\'utilisateur peut-il consulter l\'inventaire',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'inventory_add' => [
-                'id' => 'inventory_add',
+                'ckey' => 'inventory_add',
                 'communName' => 'Ajouter item a l\'inventaire',
                 'desc' => 'L\'utilisateur peut-il ajouter un item a l\'inventaire',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'inventory_edit' => [
-                'id' => 'inventory_edit',
+                'ckey' => 'inventory_edit',
                 'communName' => 'Modifier un item de l\'inventaire',
                 'desc' => 'L\'utilisateur peut-il modifier un item de l\'inventaire',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'inventory_delete' => [
-                'id' => 'inventory_delete',
+                'ckey' => 'inventory_delete',
                 'communName' => 'Supprimer un item de l\'inventaire',
                 'desc' => 'L\'utilisateur peut-il supprimer un item de l\'inventaire',
                 'icon' => 'fa-eye',
@@ -100,44 +100,182 @@ class Permission extends Model
         ],
         'booking' => [
             'booking_see' => [
-                'id' => 'booking_see',
+                'ckey' => 'booking_see',
                 'communName' => 'Voir les réservations',
                 'desc' => 'L\'utilisateur peut-il consulter la liste des réservations',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
-            'booking_see_self' => [
-                'id' => 'booking_see_self',
-                'communName' => 'Voir ses propres réservations',
-                'desc' => 'L\'utilisateur peut-il consulter la liste de ses réservations',
-                'icon' => 'fa-eye',
-                'valeur' => 0
-            ],
             'booking_add' => [
-                'id' => 'booking_add',
-                'communName' => 'Ajouter item a l\'inventaire',
-                'desc' => 'L\'utilisateur peut-il ajouter un item a l\'inventaire',
+                'ckey' => 'booking_add',
+                'communName' => 'Ajouter une réservation',
+                'desc' => 'L\'utilisateur peut-il ajouter une réservation',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'booking_edit' => [
-                'id' => 'booking_edit',
-                'communName' => 'Modifier un item de l\'inventaire',
-                'desc' => 'L\'utilisateur peut-il modifier un item de l\'inventaire',
+                'ckey' => 'booking_edit',
+                'communName' => 'Modifier une réservation',
+                'desc' => 'L\'utilisateur peut-il modifier une réservation',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ],
             'booking_delete' => [
-                'id' => 'booking_delete',
-                'communName' => 'Supprimer un item de l\'inventaire',
-                'desc' => 'L\'utilisateur peut-il supprimer un item de l\'inventaire',
+                'ckey' => 'booking_delete',
+                'communName' => 'Supprimer une réservation',
+                'desc' => 'L\'utilisateur peut-il supprimer une réservation',
                 'icon' => 'fa-eye',
                 'valeur' => 0
             ]
+        ],
+        'user' => [
+            'user_see' => [
+                'ckey' => 'user_see',
+                'communName' => 'Voir la liste des utilisateurs',
+                'desc' => 'L\'utilisateur peut-il consulter la liste des utilisateurs',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'user_add' => [
+                'ckey' => 'user_add',
+                'communName' => 'Ajouter un utilisateur',
+                'desc' => 'L\'utilisateur peut-il ajouter un autre utilisateur',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'user_edit' => [
+                'ckey' => 'user_edit',
+                'communName' => 'Modifier un utilisateur',
+                'desc' => 'L\'utilisateur peut-il modifier un autre utilisateur',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'user_delete' => [
+                'ckey' => 'user_delete',
+                'communName' => 'Supprimer un utilisateur',
+                'desc' => 'L\'utilisateur peut-il supprimer un autre utilisateur',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+        ],
+        'config' => [
+            'config_see' => [
+                'ckey' => 'config_see',
+                'communName' => 'Voir les configurations',
+                'desc' => 'L\'utilisateur peut-il consulter les configurations',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'config_edit' => [
+                'ckey' => 'config_edit',
+                'communName' => 'Modifier les configurations',
+                'desc' => 'L\'utilisateur peut-il modifier les configurations',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ]
+        ],
+        'statistique' => [
+            'stats_see' => [
+                'ckey' => 'stats_see',
+                'communName' => 'Voir les statistiques',
+                'desc' => 'L\'utilisateur peut-il consulter les statistiques',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ]
+        ],
+        'schedule' => [
+            'schedule_see' => [
+                'ckey' => 'schedule_see',
+                'communName' => 'Voir l\'horaire',
+                'desc' => 'L\'utilisateur peut-il consulter l\'horaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'schedule_add' => [
+                'ckey' => 'schedule_add',
+                'communName' => 'Ajouter un évènement à l\'horaire',
+                'desc' => 'L\'utilisateur peut-il ajouter un évènement à l\'horaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'schedule_edit' => [
+                'ckey' => 'schedule_edit',
+                'communName' => 'Modifier un évènement à l\'horaire',
+                'desc' => 'L\'utilisateur peut-il modifier un évènement à l\'horaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'schedule_delete' => [
+                'ckey' => 'schedule_delete',
+                'communName' => 'Supprimer un évènement à l\'horaire',
+                'desc' => 'L\'utilisateur peut-il supprimer un évènement à l\'horaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ]
+        ],
+        'article' => [
+            'article_see' => [
+                'ckey' => 'article_see',
+                'communName' => 'Voir les articles',
+                'desc' => 'L\'utilisateur peut-il consulter les articles',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'article_add' => [
+                'ckey' => 'article_add',
+                'communName' => 'Ajouter un article',
+                'desc' => 'L\'utilisateur peut-il ajouter un article',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'article_edit' => [
+                'ckey' => 'article_edit',
+                'communName' => 'Modifier un article',
+                'desc' => 'L\'utilisateur peut-il modifier un évènement à l\'horaire',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'article_delete' => [
+                'ckey' => 'article_delete',
+                'communName' => 'Supprimer un article',
+                'desc' => 'L\'utilisateur peut-il supprimer un article',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+        ],
+        'picture' => [
+            'picture_see' => [
+                'ckey' => 'picture_see',
+                'communName' => 'Voir les images',
+                'desc' => 'L\'utilisateur peut-il consulter les images',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'picture_add' => [
+                'ckey' => 'picture_add',
+                'communName' => 'Ajouter une image',
+                'desc' => 'L\'utilisateur peut-il ajouter une image',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'picture_edit' => [
+                'ckey' => 'picture_edit',
+                'communName' => 'Modifier une image',
+                'desc' => 'L\'utilisateur peut-il modifier une image',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
+            'picture_delete' => [
+                'ckey' => 'picture_delete',
+                'communName' => 'Supprimer une image',
+                'desc' => 'L\'utilisateur peut-il supprimer une image',
+                'icon' => 'fa-eye',
+                'valeur' => 0
+            ],
         ]
     ];
 
-    public static function all($columns = null)
+    public static function all($value = null,$columns = null)
     {
 
         $permissions = collect();
@@ -146,11 +284,18 @@ class Permission extends Model
             foreach ($cat as $c)
             {
                 $p = new Permission();
-                $p->id = $c['id'];
+                $p->ckey = $c['ckey'];
                 $p->communName = $c['communName'];
                 $p->desc = $c['desc'];
                 $p->icon = $c['icon'];
-                $p->value = $c['valeur'];
+                if ($value == null)
+                {
+                    $p->value = $c['valeur'];
+                }
+                else
+                {
+                    $p->value = $value;
+                }
                 $permissions->push($p);
             }
         }
@@ -158,8 +303,19 @@ class Permission extends Model
         return $permissions;
     }
 
-    public static function allToString()
+    public static function allToArray()
     {
-        return \GuzzleHttp\json_encode(Permission::all());
+        return self::PERMISSIONS;
+    }
+
+    public static function allToString($value = null)
+    {
+        $perm = [];
+        foreach (Permission::all($value) as $p)
+        {
+            $perm[$p->ckey] = $p->value;
+        }
+
+        return \GuzzleHttp\json_encode($perm);
     }
 }
diff --git a/app/Rank.php b/app/Rank.php
index 18e499e8..92f07c20 100644
--- a/app/Rank.php
+++ b/app/Rank.php
@@ -10,4 +10,22 @@ class Rank extends Model
     {
         return collect(json_decode($this->permissions,true));
     }
+
+    public function permission($permission)
+    {
+        foreach ($this->permissions() as $perm => $value)
+        {
+            if ($permission == $perm)
+            {
+                return $value;
+            }
+        }
+
+        return 0;
+    }
+
+    public function p($perm)
+    {
+        return $this->permission($perm);
+    }
 }
diff --git a/app/User.php b/app/User.php
index 6fe3f330..32b5fae3 100644
--- a/app/User.php
+++ b/app/User.php
@@ -27,6 +27,11 @@ class User extends Authenticatable
         'password', 'remember_token',
     ];
 
+    public function rank()
+    {
+        return $this->belongsTo('App\Rank');
+    }
+
     public function logs()
     {
         return $this->hasMany(Log::class);
@@ -279,4 +284,14 @@ class User extends Authenticatable
     {
         return $this->hasMany('App\News');
     }
+
+    public function permission($perm)
+    {
+        return $this->rank->permission($perm);
+    }
+
+    public function p($perm)
+    {
+        return $this->permission($perm);
+    }
 }
diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php
index 6f8f739b..bbb8c931 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -19,7 +19,7 @@ class CreateUsersTable extends Migration
             $table->string('lastname');
             $table->string('email')->unique();
             $table->string('password');
-            $table->string('rank')->default(1);
+            $table->string('rank_id')->default(1);
             $table->string('adress')->default('unknown');
             $table->string('telephone')->default('unknown');
             $table->string('age');
diff --git a/database/seeds/RanksTableSeeder.php b/database/seeds/RanksTableSeeder.php
index 34d0537c..170727f4 100644
--- a/database/seeds/RanksTableSeeder.php
+++ b/database/seeds/RanksTableSeeder.php
@@ -16,7 +16,7 @@ class RanksTableSeeder extends Seeder
                 'name' => "SuperAdmin",
                 'acces_level' => '2',
                 'desc' => 'Compte SuperAdmin donne toutes les permissions ne peux être modifié',
-                'permissions' => \App\Permission::allToString()
+                'permissions' => \App\Permission::allToString(1)
             ]
         ]);
     }
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index e5f20ab1..6e303df5 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -17,7 +17,7 @@ class UsersTableSeeder extends Seeder
                 'lastname' => 'Autre',
                 'email' => 'visiteur@exvps.ca',
                 'password' => bcrypt('f329er8kl2jHJGHdEj12567'),
-                'rank' => '1',
+                'rank_id' => '1',
                 'adress' => 'Inconnu',
                 'age' => '99',
                 'avatar' => '3',
@@ -30,7 +30,7 @@ class UsersTableSeeder extends Seeder
                 'lastname' => 'Administrateur',
                 'email' => 'admin@exvps.ca',
                 'password' => bcrypt('SuperAdmin'),
-                'rank' => '1',
+                'rank_id' => '1',
                 'adress' => 'Inconnu',
                 'age' => '99',
                 'avatar' => '3',
diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php
index cc771dab..7ea11e73 100644
--- a/resources/views/admin/article/index.blade.php
+++ b/resources/views/admin/article/index.blade.php
@@ -24,8 +24,12 @@
                                     <div class="row">
                                         <div class="col-md-12">
                                             <div class="btn-group w-100">
-                                                <a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-cog"></i>&nbsp; Modifier l'article</a>
-                                                <a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-picture-o"></i>&nbsp; Gérer les photos</a>
+                                                @if(\Auth::user()->p('article_edit') == 1)
+                                                    <a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-cog"></i>&nbsp; Modifier l'article</a>
+                                                @endif
+                                                @if(\Auth::user()->p('article_edit') == 1 && \Auth::user()->p('picture_add'))
+                                                    <a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-picture-o"></i>&nbsp; Gérer les photos</a>
+                                                @endif
                                             </div>
                                         </div>
                                         <div class="col-md-12">
diff --git a/resources/views/admin/configs/ranks/add.blade.php b/resources/views/admin/configs/ranks/add.blade.php
new file mode 100644
index 00000000..11409aa2
--- /dev/null
+++ b/resources/views/admin/configs/ranks/add.blade.php
@@ -0,0 +1,87 @@
+@extends('layouts.admin.main')
+
+@section('content')
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header card-header-primary">
+                <h4>Ajouter un grade</h4>
+            </div>
+            <div class="card-body mt-5">
+                <form method="post" action="/admin/config/ranks/add">
+                    @csrf
+
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Nom</label>
+                                <input class="form-control" type="text" name="name">
+                                <small class="form-text text-muted">Nom du grade</small>
+                            </div>
+                        </div>
+                        <div class="col-md-12">
+                            <div class="form-group">
+                                <label>Description</label>
+                                <textarea id="desc" name="desc"></textarea>
+                                <small class="form-text text-muted">Description du grade</small>
+                            </div>
+                        </div>
+                        <hr>
+                        <div class="col-md-12">
+                            <h3>Permissions du Grade</h3>
+                            <p>
+                                Choisissez quels permissions doivent être associé avec ce grade.
+                            </p>
+                            <div id="accordion" role="tablist">
+                                @foreach(\App\Permission::allToArray() as $key => $cat)
+                                    <div class="card card-collapse">
+                                        <div class="card-header" role="tab" id="headingOne">
+                                            <h5 class="mb-0">
+                                                <a class="text-capitalize" data-toggle="collapse" href="#coll-{{$key}}"  @if ($loop->first) aria-expanded="true" @endif aria-controls="collapseOne">
+                                                    {{$key}}
+                                                    <i class="material-icons">keyboard_arrow_down</i>
+                                                </a>
+                                            </h5>
+                                        </div>
+
+                                        <div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
+                                            <div class="card-body">
+                                                <div class="row">
+                                                    @foreach($cat as $r)
+                                                        <div class="col text-center">
+                                                            <input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}">
+                                                            <h5>{{$r['communName']}}</h5>
+                                                            <div class="btn-group">
+                                                                <button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fa fa-close"></i></button>
+                                                            <!--<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>-->
+                                                                <button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
+                                                            </div>
+                                                            <p>
+                                                                <small>{{$r['desc']}}</small>
+                                                            </p>
+                                                        </div>
+                                                    @endforeach
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endforeach
+                            </div>
+                        </div>
+                        <div class="col-md-12 mt-5">
+                            <button type="submit" class="btn btn-primary">Sauvegarder</button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+    <script src="/js/permissions.js"></script>
+    <script>
+        $('#desc').trumbowyg({
+            lang: 'fr'
+        });
+    </script>
+@endsection
\ No newline at end of file
diff --git a/resources/views/admin/configs/ranks/show.blade.php b/resources/views/admin/configs/ranks/show.blade.php
index 292a49df..839c00e1 100644
--- a/resources/views/admin/configs/ranks/show.blade.php
+++ b/resources/views/admin/configs/ranks/show.blade.php
@@ -32,7 +32,7 @@
                                 Choisissez quels permissions doivent être associé avec ce grade.
                             </p>
                             <div id="accordion" role="tablist">
-                                @foreach(\App\Permission::all() as $key => $cat)
+                                @foreach(\App\Permission::allToArray() as $key => $cat)
                                     <div class="card card-collapse">
                                         <div class="card-header" role="tab" id="headingOne">
                                             <h5 class="mb-0">
@@ -46,17 +46,17 @@
                                         <div id="coll-{{$key}}" class="collapse @if ($loop->first) show @endif" role="tabpanel" aria-labelledby="headingOne" data-parent="#accordion">
                                             <div class="card-body">
                                                 <div class="row">
-                                                    @foreach($cat as $rank)
+                                                    @foreach($cat as $r)
                                                         <div class="col text-center">
-                                                            <input class="d-none" type="text" id="{{$rank['id']}}" name="{{$rank['id']}}" value="0">
-                                                            <h5>{{$rank['communName']}}</h5>
+                                                            <input class="d-none" type="text" id="{{$r['ckey']}}" name="{{$r['ckey']}}" value="{{$rank->p($r['ckey'])}}">
+                                                            <h5>{{$r['communName']}}</h5>
                                                             <div class="btn-group">
-                                                                <button type="button" id="{{$rank['id']}}-close" class="btn btn-just-icon btn-outline-danger" onclick="switchPermissionSwitch('{{$rank['id']}}','close')"><i class="fa fa-close"></i></button>
-                                                                <button type="button" id="{{$rank['id']}}-slash" class="btn btn-just-icon btn-warning" onclick="switchPermissionSwitch('{{$rank['id']}}','slash')"><i class="fa fa-slash"></i></button>
-                                                                <button type="button" id="{{$rank['id']}}-plus" class="btn btn-just-icon btn-outline-success" onclick="switchPermissionSwitch('{{$rank['id']}}','plus')"><i class="fa fa-plus"></i></button>
+                                                                <button type="button" id="{{$r['ckey']}}-close" class="btn btn-just-icon @if($rank->p($r['ckey']) != -1) btn-outline-danger @else btn-danger @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','close')"><i class="fa fa-close"></i></button>
+                                                                <!--<button type="button" id="{{$r['ckey']}}-slash" class="btn btn-just-icon @if($rank->p($r['ckey']) == 0) btn-warning @else btn-outline-warning @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','slash')"><i class="fa fa-slash"></i></button>-->
+                                                                <button type="button" id="{{$r['ckey']}}-plus" class="btn btn-just-icon @if($rank->p($r['ckey']) != 1) btn-outline-success @else btn-success @endif" onclick="switchPermissionSwitch('{{$r['ckey']}}','plus')"><i class="fa fa-plus"></i></button>
                                                             </div>
                                                             <p>
-                                                                <small>{{$rank['desc']}}</small>
+                                                                <small>{{$r['desc']}}</small>
                                                             </p>
                                                         </div>
                                                     @endforeach
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 91344cfb..c7b3dddc 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -1,162 +1,137 @@
 @extends('layouts.admin.main')
 
 @section('content')
-<div class="row">
-    <div class="col-md-12">
-        <div class="card">
-            <div class="card-header card-header-primary">
-                <h4 class="card-title"> Cours à venir</h4>
-            </div>
-            <div class="card-body">
-                    @if(count($userClasse) == 0)
-                    <div class="col-sm-12">
-                            <div class="alert alert-info alert-with-icon">
-                                <span data-notify="icon" class="ti-alert"></span>
-                                <span data-notify="message">Aucun cours à venir</span>
-                            </div>
-                        </div>
-                    @endif
-                    @foreach ($userClasse as $classe)
-                    <div class="col-sm-6">
-                        @if ($classe['plan_done'] == "on")
-                        <div class="alert alert-success alert-with-icon">
-                            <span data-notify="icon" class="ti-crown"></span>
-                            <span data-notify="message">Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} est remis.<br>
-                            @if ($classe['material'] != "")
-                                - Vous avez réservé 
-                                @foreach (\App\Item::explodeItems($classe['material']) as $item)
-                                    @if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item)
-                                        et
-                                    @endif
-                                    {{$item->name}}
-                                @endforeach
-                            @else
-                                - Aucun matériel réservé
-                            @endif
-                            </span>
-                        </div>
-                        @else
-                        <div class="alert alert-warning alert-with-icon">
-                            <span data-notify="icon" class="ti-alert"></span>
-                            <span data-notify="message">Le cours {{$classe['ocom']}} - {{$classe['name']}} du {{$classe['date']}} n'est pas remis.<br>
-                            @if ($classe['material'] != "")
-                                - Vous avez réservé 
-                                @foreach (\App\Item::explodeItems($classe['material']) as $item)
-                                    @if (\App\Item::explodeItems($classe['material'])->last() == $item && \App\Item::explodeItems($classe['material'])->first() != $item)
-                                        et
-                                    @endif
-                                    {{$item->name}}
-                                @endforeach
-                            @else
-                                - Aucun matériel réservé
-                            @endif
-                            </span>
-                        </div>
-                        @endif
-                    </div>
-                @endforeach
-            </div>
-        </div>
-    </div>
-</div>
-<div class="row">
-    <div class="col-sm-6 col-lg-6">
-        <div class="card">
-            <div class="card-header card-header-primary">
-                <h4 class="card-title">Activité à venir</h4>
-            </div>
-            <div class="card-body">
-                <div class="row">
-                    @if(count($futureEvent) == 0)
-                    <div class="col-sm-12">
-                        <div class="alert alert-infi alert-with-icon">
-                            <span data-notify="icon" class="ti-alert"></span>
-                            <span data-notify="message">Aucune activité à venir</span>
-                        </div>
-                    </div>
-                    @endif
-                @foreach ($futureEvent as $event)
-                    <div class="col-md-12">
-                        <div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
-                            <div class="row text-white">
-                                <div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
-                                    <h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
-                                </div>
-                                <div class="col-md">
-                                    {{$event->name}}
-                                </div>
-                                <div class="col-md-4">
-                                    {{$event->date_begin}}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                @endforeach
-                </div>
-                <br>
-                <a href="/admin/calendar" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
-            </div>
-        </div>
-    </div>
-    <div class="col-sm-6 col-lg-6">
-        <div class="card">
-            <div class="card-header card-header-primary">
-                <h4 class="card-title">Activité sur le site</h4>
-            </div>
-            <div class="card-body">
-                @foreach (\App\Log::all()->forPage(1,3); as $event)
-                    <i class="fa fa-arrow-right" aria-hidden="true"></i> {{$event->action}}<br>
-                @endforeach
-                <br>
-                <a href="/admin/stats/log" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
-            </div>
-        </div>
-    </div>
-</div>
 <div class="row">
     <div class="col-lg-8 col-md-12">
-        <div class="card">
-            <div class="card-header card-header-primary">
-                    <h4 class="card-title">Message publié</h4>
-            </div>
-            <div class="card-body">
-                <div class="row">
-                @foreach (\App\Message::all()->forPage(1,4); as $msg)
-                        <div class="col-lg-6 text-center">
-                            <a href="/admin/message/{{$msg->id}}">
-                                <div style="height:2rem;">{{$msg->title}}</div>
-                                <br>
-                                <div class="msg-body" style="height:12rem;overflow:hidden">
-                                    {!!$msg->body!!}
-                                </div>
-                                <br>
-                            </a>
-                        </div>
-                @endforeach
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header card-header-primary">
+                    <h4 class="card-title"> Cours à venir</h4>
+                </div>
+                <div class="card-body">
+                    @if(\Auth::user()->courses->isEmpty())
+                        <div class="col-sm-12 text-center">
+                            <h4 class="m-4">Aucun cours à venir</h4>
+                        </div>
+                    @endif
+                    @foreach (\Auth::user()->courses->take(6) as $course)
+                        <div class="col-sm-6">
+                            <div class="card">
+                                <div class="card-body">
+                                    <h4><strong>{{$course->ocom}} - {{$course->name}}</strong></h4>
+                                    <p class="float-left">{{date('Y-m-d',strtotime($course->event->date_begin))}}</p>
+                                    <p class="float-right">Période {{$course->periode}}, Niveau {{$course->level}}</p>
+                                </div>
+                            </div>
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+        </div>
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header card-header-primary">
+                    <h4 class="card-title">Activité à venir</h4>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        @if(count($futureEvent) == 0)
+                            <div class="col-sm-12 text-center">
+                                <h4 class="m-4">Aucune activité à venir</h4>
+                            </div>
+                        @endif
+                        @foreach ($futureEvent as $event)
+                            <div class="col-md-12">
+                                <div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
+                                    <div class="row text-white">
+                                        <div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
+                                            <h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
+                                        </div>
+                                        <div class="col-md">
+                                            {{$event->name}}
+                                        </div>
+                                        <div class="col-md-4">
+                                            {{$event->date_begin}}
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        @endforeach
+                    </div>
+                    <br>
+                    <a href="/admin/schedule" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
                 </div>
-                <br>
-                <a href="/admin/message" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
             </div>
         </div>
     </div>
-    <div class="col-sm-4 col-lg-4">
-        <div class="card card-profile">
-            <div class="card-avatar">
-                <a>
-                    <img class="img" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg">
-                </a>
-            </div>
-            <div class="card-body">
-                <div class="mx-auto d-block">
-                    <h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
-                    <div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\App\Rank::find(\Auth::User()->rank)->name}}</div>
+    <div class="col-lg-4">
+        <div class="col-12">
+            <div class="card card-profile">
+                <div class="card-avatar">
+                    <a>
+                        <img class="img" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg">
+                    </a>
                 </div>
-                <hr>
-                <div class="card-text text-sm-center">
-                    <a class="btn btn-block btn-secondary" href="/admin/profil">Profil</a>
+                <div class="card-body">
+                    <div class="mx-auto d-block">
+                        <h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
+                        <div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\Auth::User()->rank->name}}</div>
+                    </div>
+                    <hr>
+                    <div class="card-text text-sm-center">
+                        <a class="btn btn-block btn-secondary" href="/admin/profil">Profil</a>
+                    </div>
                 </div>
             </div>
         </div>
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header card-header-info">
+                    <h4 class="card-title">Nouvelles</h4>
+                </div>
+                <div class="card-body">
+                    <div class="row">
+                        @foreach (\App\News::all()->forPage(1,4); as $msg)
+                            <div class="col-12 text-center">
+                                <a href="/admin/message/{{$msg->id}}">
+                                    <div style="height:2rem;">{{$msg->title}}</div>
+                                    <br>
+                                    <div class="msg-body" style="height:12rem;overflow:hidden">
+                                        {!!$msg->body!!}
+                                    </div>
+                                    <br>
+                                </a>
+                            </div>
+                        @endforeach
+                    </div>
+                    <br>
+                    <a href="/admin/news" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
+                </div>
+            </div>
+        </div>
+        @if(\Auth::user()->p('stats_see') == 1)
+            <div class="col-12">
+                <div class="card">
+                    <div class="card-header card-header-primary">
+                        <h4 class="card-title">Activité sur le site</h4>
+                    </div>
+                    <div class="card-body">
+                        @foreach (\App\Log::all()->forPage(1,3); as $log)
+                            <div class="row mt-3">
+                                <div class="col-lg-12 col-xl-3 mx-3 my-auto">
+                                    <span class="badge badge-pill badge-{{$log->typeColor()}} mr-2">{{$log->type}}</span>
+                                </div>
+                                <div class="col">
+                                    {{$log->user->fullname()}} - {{$log->event}}
+                                </div>
+                            </div>
+                        @endforeach
+                        <br>
+                        <a href="/admin/stats/log" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
+                    </div>
+                </div>
+            </div>
+        @endif
     </div>
 </div>
 @endsection
diff --git a/resources/views/admin/inventory/index.blade.php b/resources/views/admin/inventory/index.blade.php
index e297c198..85c04297 100644
--- a/resources/views/admin/inventory/index.blade.php
+++ b/resources/views/admin/inventory/index.blade.php
@@ -9,7 +9,9 @@
         </div>
         <div class="card-body">
             <div class="btn-group btn-block">
-                <a name="add" id="add" class="btn btn-primary btn-block" href="/admin/item/add" role="button">Ajouter un item</a>
+                @if(\Auth::user()->p('inventory_add') == 1)
+                    <a name="add" id="add" class="btn btn-primary btn-block" href="/admin/item/add" role="button">Ajouter un item</a>
+                @endif
             </div>
             <hr>
             <table id="log-data" class="table table-striped table-bordered">
@@ -35,8 +37,12 @@
                             <td>{!! $item->desc !!}</td>
                             <td style="width: 12%;">
                                 <div class="btn-group">
+                                    @if(\Auth::user()->p('inventory_edit') == 1)
                                     <a href="/admin/item/edit/{{$item->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier</a>
-                                    <a type="button" class="btn btn-danger" onclick="deleteEvent({{$item->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
+                                    @endif
+                                    @if(\Auth::user()->p('inventory_delete') == 1)
+                                        <a type="button" class="btn btn-danger" onclick="deleteEvent({{$item->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
+                                    @endif
                                 </div>
                             </td>
                         </tr>
diff --git a/resources/views/admin/log/display.blade.php b/resources/views/admin/log/display.blade.php
index 66b649f7..b82e7849 100644
--- a/resources/views/admin/log/display.blade.php
+++ b/resources/views/admin/log/display.blade.php
@@ -8,8 +8,6 @@
             </a></strong>
         </div>
         <div class="card-body">
-            <button type="button" class="btn btn-primary btn-lg btn-block">Afficher toutes les activitées</button>
-            <hr>
             <div class="material-datatables">
                 <table id="log-data" class="table table-striped table-no-bordered table-hover dataTable dtr-inline">
                     <thead>
@@ -26,7 +24,7 @@
                             <tr>
                                 <td>{{$item->created_at}}</td>
                                 <th><span class="badge badge-pill badge-{{$item->typeColor()}}">{{$item->type}}</span></th>
-                                <th><span class="badge badge-pill badge-{{$item->result}}">Success</span></th>
+                                <th><span class="badge badge-pill badge-{{$item->result}} text-uppercase">{{$item->result}}</span></th>
                                 <td>{{\App\User::find($item->user_id)->fullname()}}</td>
                                 <td><a href="">{{$item->event}}</a></td>
                             </tr>
diff --git a/resources/views/admin/news/index.blade.php b/resources/views/admin/news/index.blade.php
index 636dcef2..ffcb60d0 100644
--- a/resources/views/admin/news/index.blade.php
+++ b/resources/views/admin/news/index.blade.php
@@ -9,10 +9,17 @@
             </div>
             <div class="card-body">
                 <div class="btn-group btn-block">
-                    <a name="add" id="add" class="btn btn-primary btn-block" href="/admin/news/add" role="button">Ajouter un nouvelle</a>
+                    @if(\Auth::user()->p('news_add') == 1)
+                        <a name="add" id="add" class="btn btn-primary btn-block" href="/admin/news/add" role="button">Ajouter un nouvelle</a>
+                    @endif
                 </div>
                 <hr>
                 <div class="row">
+                    @if($news->isEmpty())
+                        <div class="col-md-12 text-center">
+                            <h4 class="m-4">Aucune nouvelle</h4>
+                        </div>
+                    @endif
                     @foreach($news as $n)
                         <div class="col-md-4">
                             <div class="card">
@@ -26,8 +33,12 @@
                                 </div>
                                 <div class="card-footer">
                                     <div class="btn-group">
-                                        <a href="/admin/news/edit/{{$n->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier</a>
-                                        <a type="button" class="btn btn-danger" onclick="deleteEvent({{$n->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
+                                        @if(\Auth::user()->p('news_edit') == 1)
+                                            <a href="/admin/news/edit/{{$n->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier</a>
+                                        @endif
+                                        @if(\Auth::user()->p('news_delete') == 1)
+                                            <a type="button" class="btn btn-danger" onclick="deleteEvent({{$n->id}});"><i class="fa fa-times-circle" style="color:white;"></i></a>
+                                        @endif
                                     </div>
                                 </div>
                             </div>
diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php
index 4d8ab345..26fd0a0d 100644
--- a/resources/views/admin/update.blade.php
+++ b/resources/views/admin/update.blade.php
@@ -2,6 +2,113 @@
 
 @section('content')
     <div class="row">
+        <div class="col-md-12">
+            <div class="card">
+                <div class="card-header">
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <h3 class="card-title">3.2.3</h3>
+                            <p class="category">2019-09-13</p>
+                        </div>
+                        <div class="col-sm-6 text-right">
+                            <span class="badge badge-pill badge-success">STABLE</span>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div class="alert alert-danger" role="alert">
+                        <i class="fas fa-exclamation-triangle text-white fa-2x mr-3"></i>La gestion des postes est <strong>DÉSACTIVÉ</strong> le temps de moderniser la base de donnée
+                    </div>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <p>
+                                Nouveauté
+                            <ul class="list-group list-group-flush ml-3">
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-coffee"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            La gestion des grades est maintenant possible.
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-coffee"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            Refonte du code responsable de la gestion des grades
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-coffee"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            Modernisation de la base de données des grades
+                                        </div>
+                                    </div>
+                                </li>
+
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-coffee"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            Suppression de L'ECC au profit d'un nouveau systeme de permission. Le grade et les permissions du grade définissent ce que peux faire un utilisateur sur le site.
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-plus"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            Ajout de la possibilité d'imprimer une activité depuis l'horaire
+                                        </div>
+                                    </div>
+                                </li>
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-plus"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            Ajout de la possibilité de réserver du matériel depuis l'horaire
+                                        </div>
+                                    </div>
+                                </li>
+                            </ul>
+                            </p>
+                        </div>
+                        <div class="col-md-6">
+                            <p>
+                                Bug
+                            <ul class="list-group list-group-flush ml-3">
+                                <li class="list-group-item">
+                                    <div class="row">
+                                        <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
+                                            <i class="fas fa-bug"></i>
+                                        </div>
+                                        <div class="col m-auto text-left">
+                                            Correction de <a href="https://op.exvps.ca/versions/8">4 bugs</a>
+                                        </div>
+                                    </div>
+                                </li>
+                            </ul>
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
         <div class="col-md-12">
             <div class="card">
                 <div class="card-header">
diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php
index 7ba19dbb..12d462df 100644
--- a/resources/views/admin/user/edit.blade.php
+++ b/resources/views/admin/user/edit.blade.php
@@ -95,7 +95,7 @@
                         <div class="form-group">
                           <label for="rank">Grade</label>
                           <select class="form-control" name="rank" id="rank" required>
-                            <option value={{$user->rank}}>{{\App\Rank::find($user->rank)->name}}</option>
+                            <option value={{$user->rank->id}}>{{$user->rank->name}}</option>
                             @foreach ($RankList as $rank)
                                 <option value="{{$rank->id}}">{{$rank->name}}</option>                                   
                             @endforeach    
diff --git a/resources/views/admin/user/index.blade.php b/resources/views/admin/user/index.blade.php
index 0736a239..b3b6e295 100644
--- a/resources/views/admin/user/index.blade.php
+++ b/resources/views/admin/user/index.blade.php
@@ -22,7 +22,7 @@
                         <tr>
                             <td style="width: 5%;">{{$item->id}}</td>  
                             <td>{{$item->fullname()}}</td>
-                            <td>{{\App\Rank::find($item->rank)->name}}</td>
+                            <td>{{$item->rank->name}}</td>
                             <td>{{\App\Job::find($item->job)->name}}</td>
                             <td class="td-actions text-right" style="width: 12%;">
                                 <a class="btn btn-info p-2 text-white" href="/admin/user/edit/{{$item->id}}"><i class="material-icons">edit</i></a>
diff --git a/resources/views/admin/user/profil.blade.php b/resources/views/admin/user/profil.blade.php
index a780b09e..5a8df742 100644
--- a/resources/views/admin/user/profil.blade.php
+++ b/resources/views/admin/user/profil.blade.php
@@ -10,7 +10,7 @@
                         <div class="mx-auto d-block">
                             <img class="rounded-circle mx-auto d-block" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg" alt="Card image cap" style="height:12rem">
                             <h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
-                            <div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\App\Rank::find(\Auth::User()->rank)->name}}</div>
+                            <div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\Auth::User()->rank->name}}</div>
                         </div>
                     </div>
                     <div class="col-sm-6 text-center">
diff --git a/resources/views/admin/user/profil/password.blade.php b/resources/views/admin/user/profil/password.blade.php
index 6549efb7..8b9a4ea2 100644
--- a/resources/views/admin/user/profil/password.blade.php
+++ b/resources/views/admin/user/profil/password.blade.php
@@ -24,11 +24,11 @@
                 </div>
                 <div class="form-group">
                   <label for="pws">Entrer votre nouveau mot de passe</label>
-                  <input type="password" class="form-control" name="psw" id="psw" placeholder="Mot de passe" onkeyup="checkPassword()">
+                  <input type="password" class="form-control" name="psw" id="psw" onkeyup="checkPassword()">
                 </div>
                 <div class="form-group">
                     <label for="pwsc">Confirmer votre nouveau mot de passe</label>
-                    <input type="password" class="form-control" name="pswc" id="pswc" placeholder="Mot de passe" onkeyup="checkPassword()">
+                    <input type="password" class="form-control" name="pswc" id="pswc" onkeyup="checkPassword()">
                 </div>
                 <button type="submit" id="submit" class="btn btn-primary" disabled>Enregistrer</button>
             </form>
diff --git a/resources/views/layouts/admin/alert.blade.php b/resources/views/layouts/admin/alert.blade.php
index 70c93f50..a79c59b4 100644
--- a/resources/views/layouts/admin/alert.blade.php
+++ b/resources/views/layouts/admin/alert.blade.php
@@ -64,6 +64,13 @@
             }, false);
         </script>
     @endif
+    @if (session('danger'))
+        <script>
+            document.addEventListener('DOMContentLoaded', function() {
+                showNotification('error','{{ session('error') }}','top', 'center')
+            }, false);
+        </script>
+    @endif
     @if (session('warning'))
         <script>
             document.addEventListener('DOMContentLoaded', function() {
diff --git a/resources/views/layouts/admin/main.blade.php b/resources/views/layouts/admin/main.blade.php
index d149d619..525ae2eb 100644
--- a/resources/views/layouts/admin/main.blade.php
+++ b/resources/views/layouts/admin/main.blade.php
@@ -1,6 +1,7 @@
 <?php
 
 use App\Notifications\Alert;
+setlocale(LC_ALL,'fr');
 
 ?>
 <!doctype html>
diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php
index 093c8f12..00d790e9 100644
--- a/resources/views/layouts/admin/sidebar.blade.php
+++ b/resources/views/layouts/admin/sidebar.blade.php
@@ -15,9 +15,8 @@
                     <p> Dashboard </p>
                 </a>
             </li>
-            <h6 class="ml-4 mt-5" style="color:white">
-                Espace Cadet Cadre
-            </h6>
+            <hr>
+            @if(\Auth::user()->p('msg_see') == 12)
             <li class="nav-item ">
                 <a class="nav-link" data-toggle="collapse" href="#message">
                     <i class="material-icons">email</i>
@@ -33,78 +32,77 @@
                                 <span class="sidebar-normal"> Afficher les messages </span>
                             </a>
                         </li>
+                        @if(\Auth::user()->p('msg_add') == 1)
                         <li class="nav-item ">
                             <a class="nav-link" href="/admin/message/add">
                                 <span class="sidebar-mini"> <i class="fas fa-plus"></i> </span>
                                 <span class="sidebar-normal"> Ajouter un message </span>
                             </a>
                         </li>
+                        @endif
+                        @if(\Auth::user()->p('msg_delete') == 1)
                         <li class="nav-item ">
                             <a class="nav-link" href="/admin/message">
                                 <span class="sidebar-mini"> <i class="fas fa-times"></i> </span>
                                 <span class="sidebar-normal"> Supprimer un message </span>
                             </a>
                         </li>
+                        @endif
                     </ul>
                 </div>
             </li>
-            <li class="nav-item ">
-                <a class="nav-link" href="/admin/files">
-                    <i class="material-icons">folder</i>
-                    <p> Fichier</p>
-                </a>
-            </li>
-            <li class="nav-item ">
-                <a class="nav-link" href="/admin/guide">
-                    <i class="material-icons">library_books</i>
-                    <p> Guide pédagogique</p>
-                </a>
-            </li>
-            <h6 class="ml-4 mt-5" style="color:white">
-                Espace Administration
-            </h6>
-            <li class="nav-item ">
-                <a class="nav-link" href="/admin/calendar">
-                    <i class="material-icons">calendar_today</i>
-                    <p> Horaire</p>
-                </a>
-            </li>
-            <li class="nav-item ">
-                <a class="nav-link" data-toggle="collapse" href="#news">
-                    <i class="material-icons">new_releases</i>
-                    <p> Nouvelles
-                        <b class="caret"></b>
-                    </p>
-                </a>
-                <div class="collapse" id="news">
-                    <ul class="nav">
-                        <li class="nav-item ">
-                            <a class="nav-link" href="/admin/news">
-                                <span class="sidebar-mini"> <i class="fas fa-eye"></i> </span>
-                                <span class="sidebar-normal"> Voir les nouvelles </span>
-                            </a>
-                        </li>
-                        <li class="nav-item ">
-                            <a class="nav-link" href="/admin/news/add">
-                                <span class="sidebar-mini"> <i class="fas fa-plus"></i> </span>
-                                <span class="sidebar-normal"> Ajouter une nouvelle </span>
-                            </a>
-                        </li>
+            @endif
+            @if(\Auth::user()->p('news_see') == 1)
+                <li class="nav-item ">
+                    <a class="nav-link" data-toggle="collapse" href="#news">
+                        <i class="material-icons">new_releases</i>
+                        <p> Nouvelles
+                            <b class="caret"></b>
+                        </p>
+                    </a>
+                    <div class="collapse" id="news">
+                        <ul class="nav">
+                            <li class="nav-item ">
+                                <a class="nav-link" href="/admin/news">
+                                    <span class="sidebar-mini"> <i class="fas fa-eye"></i> </span>
+                                    <span class="sidebar-normal"> Voir les nouvelles </span>
+                                </a>
+                            </li>
+                            @if(\Auth::user()->p('news_add') == 1)
+                                <li class="nav-item ">
+                                    <a class="nav-link" href="/admin/news/add">
+                                        <span class="sidebar-mini"> <i class="fas fa-plus"></i> </span>
+                                        <span class="sidebar-normal"> Ajouter une nouvelle </span>
+                                    </a>
+                                </li>
+                        @endif
                         <!--<li class="nav-item ">
                             <a class="nav-link" href="/admin/inventory/booking">
                                 <span class="sidebar-mini"> <i class="fas fa-bookmark"></i> </span>
                                 <span class="sidebar-normal"> Réservation</span>
                             </a>
                         </li>-->
-                    </ul>
-                </div>
+                        </ul>
+                    </div>
+                </li>
+            @endif
+            @if(\Auth::user()->p('schedule_see') == 1)
+            <li class="nav-item ">
+                <a class="nav-link" href="/admin/schedule">
+                    <i class="material-icons">calendar_today</i>
+                    <p> Horaire</p>
+                </a>
             </li>
+            @endif
+            @if(\Auth::user()->p('article_see') == 1)
             <li class="nav-item ">
                 <a class="nav-link" href="/admin/article">
                     <i class="material-icons">description</i>
                     <p> Articles</p>
                 </a>
             </li>
+            @endif
+            @if(\Auth::user()->p('inventory_see') == 1)
             <li class="nav-item ">
                 <a class="nav-link" data-toggle="collapse" href="#inventory">
                     <i class="material-icons">shopping_basket</i>
@@ -120,12 +118,14 @@
                                 <span class="sidebar-normal"> Voir l'inventaire </span>
                             </a>
                         </li>
+                        @if(\Auth::user()->p('inventory_edit') == 1)
                         <li class="nav-item ">
                             <a class="nav-link" href="/admin/inventory/management">
                                 <span class="sidebar-mini"> <i class="fas fa-cogs"></i> </span>
                                 <span class="sidebar-normal"> Gestion de l'inventaire </span>
                             </a>
                         </li>
+                        @endif
                         <!--<li class="nav-item ">
                             <a class="nav-link" href="/admin/inventory/booking">
                                 <span class="sidebar-mini"> <i class="fas fa-bookmark"></i> </span>
@@ -135,6 +135,8 @@
                     </ul>
                 </div>
             </li>
+            @endif
+            @if(\Auth::user()->p('picture_see') == 1)
             <li class="nav-item ">
                 <a class="nav-link" data-toggle="collapse" href="#picture">
                     <i class="material-icons">image</i>
@@ -150,15 +152,19 @@
                                 <span class="sidebar-normal"> Afficher toutes les images </span>
                             </a>
                         </li>
+                        @if(\Auth::user()->p('picture_add') == 1)
                         <li class="nav-item ">
                             <a class="nav-link" href="/admin/picture/add">
                                 <span class="sidebar-mini"> <i class="fas fa-plus"></i> </span>
                                 <span class="sidebar-normal"> Ajouter une image </span>
                             </a>
                         </li>
+                        @endif
                     </ul>
                 </div>
             </li>
+            @endif
+            @if(\Auth::user()->p('stats_see') == 1)
             <li class="nav-item ">
                 <a class="nav-link" data-toggle="collapse" href="#stats">
                     <i class="material-icons">timeline</i>
@@ -177,6 +183,8 @@
                     </ul>
                 </div>
             </li>
+            @endif
+            @if(\Auth::user()->p('user_see') == 1)
             <li class="nav-item ">
                 <a class="nav-link" data-toggle="collapse" href="#user">
                     <i class="material-icons">supervised_user_circle</i>
@@ -186,12 +194,14 @@
                 </a>
                 <div class="collapse" id="user">
                     <ul class="nav">
+                        @if(\Auth::user()->p('user_add') == 1)
                         <li class="nav-item ">
                             <a class="nav-link" href="/admin/user/add">
                                 <span class="sidebar-mini"> <i class="fas fa-plus"></i> </span>
                                 <span class="sidebar-normal"> Ajouter un utilisateur </span>
                             </a>
                         </li>
+                        @endif
                         <li class="nav-item ">
                             <a class="nav-link" href="/admin/user">
                                 <span class="sidebar-mini"> <i class="fas fa-list"></i> </span>
@@ -201,6 +211,20 @@
                     </ul>
                 </div>
             </li>
+            @endif
+            <li class="nav-item ">
+                <a class="nav-link" href="/admin/files">
+                    <i class="material-icons">folder</i>
+                    <p> Fichier</p>
+                </a>
+            </li>
+            <li class="nav-item ">
+                <a class="nav-link" href="/admin/guide">
+                    <i class="material-icons">library_books</i>
+                    <p> Guide pédagogique</p>
+                </a>
+            </li>
+            @if(\Auth::user()->p('config_edit') == 1)
             <li class="nav-item ">
                 <a class="nav-link" data-toggle="collapse" href="#config">
                     <i class="material-icons">settings</i>
@@ -249,6 +273,7 @@
                     </ul>
                 </div>
             </li>
+            @endif
             <h6 class="ml-4 mt-5" style="color:white">
                 Outils
             </h6>
diff --git a/resources/views/layouts/modal/schedule/show.blade.php b/resources/views/layouts/modal/schedule/show.blade.php
index 3a96adef..fd42ed55 100644
--- a/resources/views/layouts/modal/schedule/show.blade.php
+++ b/resources/views/layouts/modal/schedule/show.blade.php
@@ -12,9 +12,13 @@
 <div class="modal-footer">
         <div class="col-md-6">
             <div class="btn-group">
+                @if(\Auth::user()->p('schedule_edit') == 1)
                 <a class="btn btn-primary" href="/admin/schedule/edit/{{$event->id}}" data-toggle="tooltip" data-placement="bottom" title="Modifier"><i class="material-icons">edit</i></a>
+                @endif
                 <a class="btn btn-primary" href="/admin/schedule/pdf/event/{{$event->id}}" target="_blank" data-toggle="tooltip" data-placement="bottom" title="Imprimer"><i class="material-icons">print</i></a>
-                <button class="btn btn-danger" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button>
+                @if(\Auth::user()->p('schedule_delete') == 1)
+                    <button class="btn btn-danger" data-toggle="tooltip" data-placement="bottom" title="Supprimer" onclick="deleteEvent({{$event->id}})"><i class="material-icons">close</i></button>
+                @endif
             </div>
         </div>
         <div class="col-md-6 text-right">
diff --git a/routes/api.php b/routes/api.php
index e9b25b8f..bf10442a 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -20,47 +20,41 @@ Route::middleware('auth:api')->group(function () {
         return $request->user();
     });
 
-    /** Calendar Route */
-    Route::post('/calendar/generate', 'CalendarController@generate');
-    Route::post('/calendar_ecc/generate', 'ECCController@generateCalendar');
-    Route::post('/calendar/loadDay', 'CalendarController@show');
-    Route::post('/calendar/delete', 'CalendarController@delete');
-
-    Route::get('/schedule/events/modal/full/{id}/{db_type}','ScheduleController@loadModalFull');
-    Route::get('/schedule/events/add/modal/{type}/{date}','ScheduleController@loadModalDefautType');
-    Route::post('/schedule/event/delete/{id}','ScheduleController@delete');
+    Route::get('/schedule/events/modal/full/{id}/{db_type}','ScheduleController@loadModalFull')->middleware('perm:schedule_see');
+    Route::get('/schedule/events/add/modal/{type}/{date}','ScheduleController@loadModalDefautType')->middleware('perm:schedule_add');
+    Route::post('/schedule/event/delete/{id}','ScheduleController@delete')->middleware('perm:schedule_delete');
 
     /** Booking */
-    Route::get('/booking/modal/item/{id}/{event_type}/{event_id}','BookingController@modalItem');
-    Route::get('/booking/modal/edit/item/{id}/{event_type}/{event_id}','BookingController@modalItemEdit');
-    Route::post('/booking/delete','BookingController@destroy');
+    Route::get('/booking/modal/item/{id}/{event_type}/{event_id}','BookingController@modalItem')->middleware('perm:booking_see');
+    Route::get('/booking/modal/edit/item/{id}/{event_type}/{event_id}','BookingController@modalItemEdit')->middleware('perm:booking_edit');
+    Route::post('/booking/delete','BookingController@destroy')->middleware('perm:booking_delete');
     /** Picture */
-    Route::post('/picture/delete/{id}','PictureController@destroy');
+    Route::post('/picture/delete/{id}','PictureController@destroy')->middleware('perm:picture_delete');
 
     /** Message Route */
-    Route::post('/message/delete', 'MessageController@destroy');
+    Route::post('/message/delete', 'MessageController@destroy')->middleware('perm:msg_delete');
 
     /** News Route */
-    Route::post('/news/delete','NewsController@destroy');
+    Route::post('/news/delete','NewsController@destroy')->middleware('perm:news_delete');
 
     /** User Route */
-    Route::post('/user/delete', 'UserController@destroy');
-    Route::get('/user/list', 'UserController@apiList');
+    Route::post('/user/delete', 'UserController@destroy')->middleware('perm:user_delete');
+    Route::get('/user/list', 'UserController@apiList')->middleware('perm:user_see');
 
     /** Inventory Route */
-    Route::post('/item/delete', 'ItemController@destroy');
+    Route::post('/item/delete', 'ItemController@destroy')->middleware('perm:inventory_delete');
 
     /** Item Category */
-    Route::post('/itemcategory/delete/{id}','ItemCategoryController@destroy');
+    Route::post('/itemcategory/delete/{id}','ItemCategoryController@destroy')->middleware('perm:inventory_edit');
 
     /** Config Route */
-    Route::post('/config/general/save', 'ConfigController@update');
-    Route::post('/config/activity/delete', 'ComplementaryActivityController@destroy');
+    Route::post('/config/general/save', 'ConfigController@update')->middleware('perm:config_edit');
+    Route::post('/config/activity/delete', 'ComplementaryActivityController@destroy')->middleware('perm:config_delete');
 
     Route::get('/user/perm/{id}', function($id) {
         $user = \App\User::find($id);
         return $user->getPerm("schedule_edit");
-    });
+    })->middleware('perm:user_see');
 });
 Route::get('/admin/ping', function(){
     $users = \App\User::all();
@@ -84,25 +78,3 @@ Route::get('/admin/ping', function(){
         return "pong";
     }
 });
-Route::get('/ecc/ping', function(){
-    $users = \App\User::all();
-    $schedules = \App\Schedule::all();
-    $oups = false;
-
-    foreach ($users as $user) {
-        if($user == null){
-            $oups = true;
-        }
-    }
-    foreach ($schedules as $schedule) {
-        if($schedule == null){
-            $oups = true;
-        }
-    }
-    
-    if ($oups) {
-        return "oups";
-    } else {
-        return "pong";
-    }
-});
diff --git a/routes/web.php b/routes/web.php
index 7593a1d4..390a9688 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -31,7 +31,7 @@ Route::get('/test',function(){
    clog('add','success','Test');
 });
 
-Route::middleware(['auth','admin'])->group(function () {
+Route::middleware(['auth'])->group(function () {
 
     /* Espace Administration Route */
 
@@ -39,111 +39,105 @@ Route::middleware(['auth','admin'])->group(function () {
         Route::get('/admin', 'AdminController@index')->name('admin');
         Route::get('/admin/update', 'AdminController@update');
 
-        /** Calendar */
-        Route::get('/admin/calendar', 'CalendarController@index');
-        Route::get('/admin/calendar/add/{date}', ['uses' =>'CalendarController@add']);
-        Route::get('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@edit']);
-        Route::post('/admin/calendar/add', 'CalendarController@store');
-        Route::patch('/admin/calendar/edit/{id}', ['uses' =>'CalendarController@patch']);
-
         /** Schedule */
-        Route::get('/admin/schedule/pdf/event/{id}','ScheduleController@printtopdf');
-        Route::get('/admin/schedule/add/{date}','ScheduleController@create');
-        Route::get('/admin/schedule/edit/{id}','EventController@edit');
-        Route::post('/admin/schedule/event/add','EventController@Store');
-        Route::post('/admin/schedule/event/edit/{id}','EventController@update');
+        Route::get('/admin/schedule', 'CalendarController@index')->middleware('perm:schedule_see');
+        Route::get('/admin/schedule/pdf/event/{id}','ScheduleController@printtopdf')->middleware('perm:schedule_see');
+        Route::get('/admin/schedule/add/{date}','ScheduleController@create')->middleware('perm:schedule_add');
+        Route::get('/admin/schedule/edit/{id}','EventController@edit')->middleware('perm:schedule_edit');
+        Route::post('/admin/schedule/event/add','EventController@Store')->middleware('perm:schedule_add');
+        Route::post('/admin/schedule/event/edit/{id}','EventController@update')->middleware('perm:schedule_edit');
 
         /** Statistique */
-        Route::get('/admin/stats/log' , 'LogController@index');
+        Route::get('/admin/stats/log' , 'LogController@index')->middleware('perm:stats_see');;
 
         /** Message */
-        Route::get('/admin/message' , 'MessageController@index');
-        Route::get('/admin/message/add' , 'MessageController@create');
-        Route::post('/admin/message/add' , 'MessageController@store');
-        Route::get('/admin/message/{id}', ['uses' =>'MessageController@show']);
+        Route::get('/admin/message' , 'MessageController@index')->middleware('perm:msg_see');
+        Route::get('/admin/message/add' , 'MessageController@create')->middleware('perm:msg_add');
+        Route::post('/admin/message/add' , 'MessageController@store')->middleware('perm:msg_add');
+        Route::get('/admin/message/{id}', ['uses' =>'MessageController@show'])->middleware('perm:msg_see');
 
         /** User */
-        Route::get('/admin/user' , 'UserController@index');
-        Route::get('/admin/user/add' , 'UserController@create');
-        Route::post('/admin/user/add' , 'UserController@store');
-        Route::get('/admin/user/edit/{id}' , 'UserController@edit');
-        Route::post('/admin/user/edit/{id}' , 'UserController@update');
+        Route::get('/admin/user' , 'UserController@index')->middleware('perm:user_see');
+        Route::get('/admin/user/add' , 'UserController@create')->middleware('perm:user_add');
+        Route::post('/admin/user/add' , 'UserController@store')->middleware('perm:user_add');
+        Route::get('/admin/user/edit/{id}' , 'UserController@edit')->middleware('perm:user_edit');
+        Route::post('/admin/user/edit/{id}' , 'UserController@update')->middleware('perm:user_edit');
 
         /** Config */
-        Route::get('/admin/config/job' , 'JobController@index');
-        Route::get('/admin/config/job/add' , 'JobController@create');
-        Route::post('/admin/config/job/add' , 'JobController@store');
-        Route::get('/admin/config/job/edit/{id}' , 'JobController@edit');
-        Route::get('/admin/config/schedule' , 'ScheduleController@index');
-        Route::post('/admin/config/schedule/edit' , 'ScheduleController@update');
-        Route::get('/admin/config/activity' , 'ComplementaryActivityController@index');
-        Route::get('/admin/config/activity/add' , 'ComplementaryActivityController@create');
-        Route::post('/admin/config/activity/add' , 'ComplementaryActivityController@store');
-        Route::get('/admin/config/activity/edit/{id}' , 'ComplementaryActivityController@edit');
-        Route::post('/admin/config/activity/edit/{id}' , 'ComplementaryActivityController@update');
-        Route::post('/admin/config/general/edit','ConfigController@update');
-        Route::get('/admin/config/' , 'ConfigController@index');
-        Route::get('/admin/config/customisation','ConfigController@customisation');
-        Route::post('/admin/config/customisation','ConfigController@customisationUpdate');
+        Route::get('/admin/config/job' , 'JobController@index')->middleware('perm:config_see');
+        Route::get('/admin/config/job/add' , 'JobController@create')->middleware('perm:config_add');
+        Route::post('/admin/config/job/add' , 'JobController@store')->middleware('perm:config_add');
+        Route::get('/admin/config/job/edit/{id}' , 'JobController@edit')->middleware('perm:config_add');
+        Route::get('/admin/config/schedule' , 'ScheduleController@index')->middleware('perm:config_edit');
+        Route::post('/admin/config/schedule/edit' , 'ScheduleController@update')->middleware('perm:config_edit');
+        Route::get('/admin/config/activity' , 'ComplementaryActivityController@index')->middleware('perm:config_edit');
+        Route::get('/admin/config/activity/add' , 'ComplementaryActivityController@create')->middleware('perm:config_edit');
+        Route::post('/admin/config/activity/add' , 'ComplementaryActivityController@store')->middleware('perm:config_edit');
+        Route::get('/admin/config/activity/edit/{id}' , 'ComplementaryActivityController@edit')->middleware('perm:config_edit');
+        Route::post('/admin/config/activity/edit/{id}' , 'ComplementaryActivityController@update')->middleware('perm:config_edit');
+        Route::post('/admin/config/general/edit','ConfigController@update')->middleware('perm:config_edit');
+        Route::get('/admin/config/' , 'ConfigController@index')->middleware('perm:config_edit');
+        Route::get('/admin/config/customisation','ConfigController@customisation')->middleware('perm:config_edit');
+        Route::post('/admin/config/customisation','ConfigController@customisationUpdate')->middleware('perm:config_edit');
 
-        Route::get('/admin/config/ranks','RankController@index');
-        Route::get('/admin/config/ranks/{id}','RankController@show');
-        Route::get('/admin/config/jobs','JobController@index');
+        Route::get('/admin/config/ranks','RankController@index')->middleware('perm:config_edit');
+        Route::get('/admin/config/ranks/add','RankController@create')->middleware('perm:config_edit');
+        Route::post('/admin/config/ranks/add','RankController@store')->middleware('perm:config_edit');
+        Route::get('/admin/config/ranks/{id}','RankController@show')->middleware('perm:config_edit');
+        Route::post('/admin/config/ranks/{id}','RankController@update')->middleware('perm:config_edit');
+        Route::get('/admin/config/jobs','JobController@index')->middleware('perm:config_edit');
 
         /** Public page */
-        Route::get('/admin/public/edit/{config}', 'PublicController@edit');
-        Route::post('/admin/public/edit/{config}', 'PublicController@update');
+        Route::get('/admin/public/edit/{config}', 'PublicController@edit')->middleware('perm:config_edit');
+        Route::post('/admin/public/edit/{config}', 'PublicController@update')->middleware('perm:config_edit');
 
         /** Picture */
-        Route::get('/admin/picture','PictureController@indexAdmin');
-        Route::get('/admin/picture/add','PictureController@create');
-        Route::post('/admin/picture/add','PictureController@store');
-        Route::get('/admin/picture/edit/{id}','PictureController@edit');
-        Route::post('/admin/picture/edit/{id}','PictureController@update');
+        Route::get('/admin/picture','PictureController@indexAdmin')->middleware('perm:picture_see');
+        Route::get('/admin/picture/add','PictureController@create')->middleware('perm:picture_add');
+        Route::post('/admin/picture/add','PictureController@store')->middleware('perm:picture_add');
+        Route::get('/admin/picture/edit/{id}','PictureController@edit')->middleware('perm:picture_edit');
+        Route::post('/admin/picture/edit/{id}','PictureController@update')->middleware('perm:picture_edit');
 
         /** Inventory */
-        Route::get('/admin/inventory' , 'InventoryController@index');
-        Route::get('/admin/inventory/management','InventoryController@management');
+        Route::get('/admin/inventory' , 'InventoryController@index')->middleware('perm:inventory_see');
+        Route::get('/admin/inventory/management','InventoryController@management')->middleware('perm:inventory_edit');
 
         /** Item Category */
-        Route::get('/admin/inventory/management/category','ItemCategoryController@index');
-        Route::get('/admin/inventory/management/category/add','ItemCategoryController@create');
-        Route::post('/admin/inventory/management/category/add','ItemCategoryController@store');
-        Route::get('/admin/inventory/management/category/edit/{id}','ItemCategoryController@edit');
-        Route::post('/admin/inventory/management/category/edit/{id}','ItemCategoryController@update');
+        Route::get('/admin/inventory/management/category','ItemCategoryController@index')->middleware('perm:inventory_edit');
+        Route::get('/admin/inventory/management/category/add','ItemCategoryController@create')->middleware('perm:inventory_add');
+        Route::post('/admin/inventory/management/category/add','ItemCategoryController@store')->middleware('perm:inventory_add');
+        Route::get('/admin/inventory/management/category/edit/{id}','ItemCategoryController@edit')->middleware('perm:inventory_edit');
+        Route::post('/admin/inventory/management/category/edit/{id}','ItemCategoryController@update')->middleware('perm:inventory_edit');
 
         /** News */
-        Route::get('/admin/news','NewsController@indexAdmin');
-        Route::get('/admin/news/add','NewsController@create');
-        Route::post('/admin/news/add','NewsController@store');
-        Route::get('/admin/news/edit/{id}','NewsController@edit');
-        Route::post('/admin/news/edit/{id}','NewsController@update');
+        Route::get('/admin/news','NewsController@indexAdmin')->middleware('perm:news_see');
+        Route::get('/admin/news/add','NewsController@create')->middleware('perm:news_add');
+        Route::post('/admin/news/add','NewsController@store')->middleware('perm:news_add');
+        Route::get('/admin/news/edit/{id}','NewsController@edit')->middleware('perm:news_edit');
+        Route::post('/admin/news/edit/{id}','NewsController@update')->middleware('perm:news_edit');
 
         /** Articles */
-        Route::get('/admin/article','ArticleController@index');
-        Route::get('/admin/article/activity/edit/{id}','ArticleController@editActivity');
-        Route::post('/admin/article/activity/edit/{id}','ArticleController@updateActivity');
-        Route::get('/admin/article/activity/picture/{id}','ArticleController@pictureActivity');
-        Route::get('/admin/article/activity/picture/{id}/add','ArticleController@pictureActivityCreate');
-        Route::post('/admin/article/activity/picture/{id}/add','ArticleController@pictureActivityStore');
+        Route::get('/admin/article','ArticleController@index')->middleware('perm:article_see');
+        Route::get('/admin/article/activity/edit/{id}','ArticleController@editActivity')->middleware('perm:article_edit');
+        Route::post('/admin/article/activity/edit/{id}','ArticleController@updateActivity')->middleware('perm:article_edit');
+        Route::get('/admin/article/activity/picture/{id}','ArticleController@pictureActivity')->middleware('perm:article_edit');
+        Route::get('/admin/article/activity/picture/{id}/add','ArticleController@pictureActivityCreate')->middleware('perm:article_edit');
+        Route::post('/admin/article/activity/picture/{id}/add','ArticleController@pictureActivityStore')->middleware('perm:article_edit');
 
         /** Booking */
-        Route::get('/admin/booking','BookingController@index');
-        Route::get('/admin/booking/{id}','BookingController@show');
-        Route::get('/admin/booking/{type}/{id}','BookingController@index');
-        Route::get('/admin/booking/{type}/{id}/add','BookingController@create');
-        Route::post('/admin/booking/{type}/{id}/add','BookingController@store');
-        Route::get('/admin/inventory/booking' , 'InventoryController@booking');
-        Route::post('/admin/booking/edit','BookingController@update');
+        Route::get('/admin/booking','BookingController@index')->middleware('perm:booking_see');
+        Route::get('/admin/booking/{id}','BookingController@show')->middleware('perm:booking_see');
+        Route::get('/admin/booking/{type}/{id}','BookingController@index')->middleware('perm:booking_see');
+        Route::get('/admin/booking/{type}/{id}/add','BookingController@create')->middleware('perm:booking_add');
+        Route::post('/admin/booking/{type}/{id}/add','BookingController@store')->middleware('perm:booking_add');
+        Route::get('/admin/inventory/booking' , 'InventoryController@booking')->middleware('perm:inventory_see');
+        Route::post('/admin/booking/edit','BookingController@update')->middleware('perm:booking_see')->middleware('perm:booking_edit');
 
         /** Item */
-        Route::get('/admin/item/add' , 'ItemController@create');
-        Route::get('/admin/item/edit/{id}' , 'ItemController@edit');
-        Route::post('/admin/item/add' , 'ItemController@store');
-        Route::post('/admin/item/edit/{id}' , 'ItemController@update');
-
-        /** Local */
-        Route::get('/admin/config/local' , 'LocalController@index');
+        Route::get('/admin/item/add' , 'ItemController@create')->middleware('perm:inventory_add');
+        Route::get('/admin/item/edit/{id}' , 'ItemController@edit')->middleware('perm:inventory_edit');
+        Route::post('/admin/item/add' , 'ItemController@store')->middleware('perm:inventory_add');
+        Route::post('/admin/item/edit/{id}' , 'ItemController@update')->middleware('perm:inventory_edit');
 
         /** Notification */
         Route::get('/admin/notication/mark','UserController@notificationmarkALL');
@@ -165,31 +159,4 @@ Route::middleware(['auth','admin'])->group(function () {
         Route::get('/admin/guide','FilesController@guide');
 });
 
-Route::middleware(['auth','staff'])->group(function () {
-
-    /** Espace Cadet cadre */
-        Route::get('/ecc','ECCController@index');
-        Route::get('/ecc/messages','ECCController@messages');
-        Route::get('/ecc/messages/{page}','ECCController@messages');
-        Route::get('/ecc/message/{id}','ECCController@message');
-        Route::get('/ecc/guide','ECCController@guide');
-        Route::get('/ecc/update','ECCController@update');
-        Route::get('/ecc/calendar','ECCController@calendar');
-        Route::get('/ecc/calendar/{date}','ECCController@calendar_date');
-        Route::get('/ecc/inventory/{id}/{niveau}/{periode}' , 'ECCController@booking');
-        Route::post('/ecc/inventory/add/{id}/{periode}/{niveau}' , 'ECCController@booking_add');
-        Route::post('/ecc/inventory/remove/{id}/{periode}/{niveau}' , 'ECCController@booking_remove');
-        Route::get('/ecc/list','ECCController@list');
-        Route::get('/ecc/files','ECCController@files');
-        Route::get('/ecc/settings','ECCController@settings');
-        Route::get('/ecc/settings/password' , 'ECCController@UserPassword');
-        Route::post('/ecc/settings/edit/password' , 'UserController@editUserPassword');
-        Route::get('/ecc/settings/avatar', 'ECCController@UserAvatar');
-        Route::get('/ecc/settings/edit/avatar/{id}' , 'UserController@editUserAvatar');
-        Route::get('/ecc/settings/adress', 'ECCController@UserAdress');
-        Route::post('/ecc/settings/edit/adress', 'UserController@editUserAdress');
-
-
-});
-
 

From 5f7894781cfbdd31a9d1eaa12ff3110045b05d9c Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Fri, 13 Sep 2019 16:40:43 -0400
Subject: [PATCH 4/7] 3.2.3

---
 resources/views/layouts/admin/alert.blade.php | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/resources/views/layouts/admin/alert.blade.php b/resources/views/layouts/admin/alert.blade.php
index a79c59b4..4ab04da3 100644
--- a/resources/views/layouts/admin/alert.blade.php
+++ b/resources/views/layouts/admin/alert.blade.php
@@ -5,29 +5,6 @@
         $id_warning = 1;
     @endphp
 
-    @if (!$scheduleWarning->isEmpty())
-        @if (\Auth::User()->getPerm('schedule_edit'))
-            <div class="alert alert-warning" role="alert">
-               <a data-toggle="collapse" href="#schedulewarning" role="button" aria-expanded="false" aria-controls="schedulewarning"> Attention ! De potentiel erreur on été détecté dans l'horaire <span class="badge badge-warning">{{$scheduleWarning->count()}}</span> <i class="fa fa-caret-down" aria-hidden="true"></i></a>
-                <div class="collapse" id="schedulewarning">
-                    <div class="ml-4 row">
-                        @foreach ($scheduleWarning as $warning)
-                            <div class="col-sm-12">   
-                                Le {{$warning['date']}} à la 
-                                @if ($warning['periode'] == 1) 1er période @else 2e période @endif du
-                                @if ($warning['niveau'] == 1) niveau 1 @elseif($warning['niveau'] == 2)  niveau 2 @else niveau 3 @endif
-                                : {{$warning['warning']}}
-                            </div>
-                            @php
-                                $id_warning = $id_warning + 1;
-                            @endphp
-                        @endforeach     
-                    </div> 
-                </div>
-            </div>
-        @endif
-    @endif
-
     @if (\App\Config::getData('is_schedule_public') == null)
         @if (\Auth::User()->getPerm('schedule_edit'))
             <div class="alert alert-danger" role="alert">

From 9fee30f1ee263bc0e2905868a79d0d519ebdc951 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Fri, 13 Sep 2019 16:46:51 -0400
Subject: [PATCH 5/7] 3.2.3

---
 resources/views/admin/dashboard.blade.php | 251 +++++++++++-----------
 1 file changed, 127 insertions(+), 124 deletions(-)

diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index c7b3dddc..9db85bbc 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -1,139 +1,142 @@
 @extends('layouts.admin.main')
 
 @section('content')
-<div class="row">
-    <div class="col-lg-8 col-md-12">
-        <div class="col-md-12">
-            <div class="card">
-                <div class="card-header card-header-primary">
-                    <h4 class="card-title"> Cours à venir</h4>
-                </div>
-                <div class="card-body">
-                    @if(\Auth::user()->courses->isEmpty())
-                        <div class="col-sm-12 text-center">
-                            <h4 class="m-4">Aucun cours à venir</h4>
-                        </div>
-                    @endif
-                    @foreach (\Auth::user()->courses->take(6) as $course)
-                        <div class="col-sm-6">
-                            <div class="card">
-                                <div class="card-body">
-                                    <h4><strong>{{$course->ocom}} - {{$course->name}}</strong></h4>
-                                    <p class="float-left">{{date('Y-m-d',strtotime($course->event->date_begin))}}</p>
-                                    <p class="float-right">Période {{$course->periode}}, Niveau {{$course->level}}</p>
-                                </div>
-                            </div>
-                        </div>
-                    @endforeach
-                </div>
-            </div>
-        </div>
-        <div class="col-md-12">
-            <div class="card">
-                <div class="card-header card-header-primary">
-                    <h4 class="card-title">Activité à venir</h4>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        @if(count($futureEvent) == 0)
-                            <div class="col-sm-12 text-center">
-                                <h4 class="m-4">Aucune activité à venir</h4>
-                            </div>
-                        @endif
-                        @foreach ($futureEvent as $event)
-                            <div class="col-md-12">
-                                <div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
-                                    <div class="row text-white">
-                                        <div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
-                                            <h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
-                                        </div>
-                                        <div class="col-md">
-                                            {{$event->name}}
-                                        </div>
-                                        <div class="col-md-4">
-                                            {{$event->date_begin}}
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        @endforeach
-                    </div>
-                    <br>
-                    <a href="/admin/schedule" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="col-lg-4">
-        <div class="col-12">
-            <div class="card card-profile">
-                <div class="card-avatar">
-                    <a>
-                        <img class="img" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg">
-                    </a>
-                </div>
-                <div class="card-body">
-                    <div class="mx-auto d-block">
-                        <h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
-                        <div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\Auth::User()->rank->name}}</div>
-                    </div>
-                    <hr>
-                    <div class="card-text text-sm-center">
-                        <a class="btn btn-block btn-secondary" href="/admin/profil">Profil</a>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-md-12">
-            <div class="card">
-                <div class="card-header card-header-info">
-                    <h4 class="card-title">Nouvelles</h4>
-                </div>
-                <div class="card-body">
-                    <div class="row">
-                        @foreach (\App\News::all()->forPage(1,4); as $msg)
-                            <div class="col-12 text-center">
-                                <a href="/admin/message/{{$msg->id}}">
-                                    <div style="height:2rem;">{{$msg->title}}</div>
-                                    <br>
-                                    <div class="msg-body" style="height:12rem;overflow:hidden">
-                                        {!!$msg->body!!}
-                                    </div>
-                                    <br>
-                                </a>
-                            </div>
-                        @endforeach
-                    </div>
-                    <br>
-                    <a href="/admin/news" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
-                </div>
-            </div>
-        </div>
-        @if(\Auth::user()->p('stats_see') == 1)
-            <div class="col-12">
+    <div class="row">
+        <div class="col-lg-8 col-md-12">
+            <div class="col-md-12">
                 <div class="card">
                     <div class="card-header card-header-primary">
-                        <h4 class="card-title">Activité sur le site</h4>
+                        <h4 class="card-title"> Cours à venir</h4>
                     </div>
                     <div class="card-body">
-                        @foreach (\App\Log::all()->forPage(1,3); as $log)
-                            <div class="row mt-3">
-                                <div class="col-lg-12 col-xl-3 mx-3 my-auto">
-                                    <span class="badge badge-pill badge-{{$log->typeColor()}} mr-2">{{$log->type}}</span>
-                                </div>
-                                <div class="col">
-                                    {{$log->user->fullname()}} - {{$log->event}}
-                                </div>
+                        @if(\Auth::user()->courses->isEmpty())
+                            <div class="col-sm-12 text-center">
+                                <h4 class="m-4">Aucun cours à venir</h4>
                             </div>
-                        @endforeach
-                        <br>
-                        <a href="/admin/stats/log" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
+                        @else
+                            @foreach (\Auth::user()->courses->take(6) as $course)
+                                @if($course->event != null)
+                                <div class="col-sm-6">
+                                    <div class="card">
+                                        <div class="card-body">
+                                            <h4><strong>{{$course->ocom}} - {{$course->name}}</strong></h4>
+                                            <p class="float-left">{{date('Y-m-d',strtotime($course->event->date_begin))}}</p>
+                                            <p class="float-right">Période {{$course->periode}}, Niveau {{$course->level}}</p>
+                                        </div>
+                                    </div>
+                                </div>
+                                @endif
+                            @endforeach
+                        @endif
                     </div>
                 </div>
             </div>
-        @endif
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header card-header-primary">
+                        <h4 class="card-title">Activité à venir</h4>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            @if(count($futureEvent) == 0)
+                                <div class="col-sm-12 text-center">
+                                    <h4 class="m-4">Aucune activité à venir</h4>
+                                </div>
+                            @endif
+                            @foreach ($futureEvent as $event)
+                                <div class="col-md-12">
+                                    <div class="alert" style="background-color: {{\App\ComplementaryActivity::find($event->type)->calendar_color}}">
+                                        <div class="row text-white">
+                                            <div class="col-md-2 text-capitalize m-auto d-none d-md-flex">
+                                                <h3 class="m-0 p-0" style="margin-top: -0.5rem !important;">{!! \App\ComplementaryActivity::find($event->type)->calendar_icon !!}</h3>
+                                            </div>
+                                            <div class="col-md">
+                                                {{$event->name}}
+                                            </div>
+                                            <div class="col-md-4">
+                                                {{$event->date_begin}}
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            @endforeach
+                        </div>
+                        <br>
+                        <a href="/admin/schedule" type="button" class="btn btn-primary btn-lg btn-block">Afficher plus</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-lg-4">
+            <div class="col-12">
+                <div class="card card-profile">
+                    <div class="card-avatar">
+                        <a>
+                            <img class="img" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg">
+                        </a>
+                    </div>
+                    <div class="card-body">
+                        <div class="mx-auto d-block">
+                            <h5 class="text-sm-center mt-2 mb-1">{{\Auth::User()->fullname()}}</h5>
+                            <div class="location text-sm-center"><i class="fa fa-id-card-o" aria-hidden="true"></i> {{\Auth::User()->rank->name}}</div>
+                        </div>
+                        <hr>
+                        <div class="card-text text-sm-center">
+                            <a class="btn btn-block btn-secondary" href="/admin/profil">Profil</a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="col-md-12">
+                <div class="card">
+                    <div class="card-header card-header-info">
+                        <h4 class="card-title">Nouvelles</h4>
+                    </div>
+                    <div class="card-body">
+                        <div class="row">
+                            @foreach (\App\News::all()->forPage(1,4); as $msg)
+                                <div class="col-12 text-center">
+                                    <a href="/admin/message/{{$msg->id}}">
+                                        <div style="height:2rem;">{{$msg->title}}</div>
+                                        <br>
+                                        <div class="msg-body" style="height:12rem;overflow:hidden">
+                                            {!!$msg->body!!}
+                                        </div>
+                                        <br>
+                                    </a>
+                                </div>
+                            @endforeach
+                        </div>
+                        <br>
+                        <a href="/admin/news" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
+                    </div>
+                </div>
+            </div>
+            @if(\Auth::user()->p('stats_see') == 1)
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-header card-header-primary">
+                            <h4 class="card-title">Activité sur le site</h4>
+                        </div>
+                        <div class="card-body">
+                            @foreach (\App\Log::all()->forPage(1,3); as $log)
+                                <div class="row mt-3">
+                                    <div class="col-lg-12 col-xl-3 mx-3 my-auto">
+                                        <span class="badge badge-pill badge-{{$log->typeColor()}} mr-2">{{$log->type}}</span>
+                                    </div>
+                                    <div class="col">
+                                        {{$log->user->fullname()}} - {{$log->event}}
+                                    </div>
+                                </div>
+                            @endforeach
+                            <br>
+                            <a href="/admin/stats/log" type="button" class="btn btn-primary btn-lg btn-block text-white">Afficher plus</a>
+                        </div>
+                    </div>
+                </div>
+            @endif
+        </div>
     </div>
-</div>
 @endsection
 
 @section('breadcrumb')

From b24f0baddbd14aa3a521d5aba6ad510a087281a9 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Fri, 13 Sep 2019 16:49:03 -0400
Subject: [PATCH 6/7] 3.2.3

---
 resources/views/layouts/admin/alert.blade.php | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/resources/views/layouts/admin/alert.blade.php b/resources/views/layouts/admin/alert.blade.php
index 4ab04da3..148ab6e1 100644
--- a/resources/views/layouts/admin/alert.blade.php
+++ b/resources/views/layouts/admin/alert.blade.php
@@ -4,23 +4,6 @@
         $scheduleWarning = \App\Schedule::checkForWarning();
         $id_warning = 1;
     @endphp
-
-    @if (\App\Config::getData('is_schedule_public') == null)
-        @if (\Auth::User()->getPerm('schedule_edit'))
-            <div class="alert alert-danger" role="alert">
-                Attention ! L'horaire n'est présentement pas visible par le publique ! <a href="/admin/config#schedule_public">Cliquer ici pour accéder aux options</a>
-            </div>
-        @endif
-    @endif
-
-    @if (\App\Config::getData('is_schedule_build') == null)
-        @if (\Auth::User()->getPerm('schedule_edit'))
-            <div class="alert alert-warning" role="alert">
-                Attention ! L'horaire n'est pas marqué comme complet, les utilisateurs ne receverons pas de notification concernant l'horaire <a href="/admin/config#schedule_build">Cliquer ici pour accéder aux options</a>
-            </div> 
-        @endif
-    @endif
-
     <!-- Notification -->
     @if (session('status'))
         <div class="alert alert-info" role="alert">

From 2eabeb420533e648f40eebc541dc95ddf61e9f64 Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Tue, 17 Sep 2019 21:40:55 -0400
Subject: [PATCH 7/7] 3.2.4

---
 public/js/calendar.js                         |  1 +
 resources/views/admin/article/index.blade.php | 12 ++---
 .../views/admin/configs/activity.blade.php    | 10 ++---
 resources/views/admin/dashboard.blade.php     |  2 +
 .../views/admin/schedule/event/add.blade.php  |  1 +
 .../views/admin/schedule/modal/add.blade.php  | 44 ++++++++++++++-----
 resources/views/admin/user/profil.blade.php   |  6 ++-
 7 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/public/js/calendar.js b/public/js/calendar.js
index baca88e2..4a0ea46a 100644
--- a/public/js/calendar.js
+++ b/public/js/calendar.js
@@ -45,6 +45,7 @@ function switchType(date) {
     $.get( "/api/schedule/events/add/modal/"+selectInput.val()+"/"+date+"?api_token="+api_token, function( data ) {
         $( "#container" ).html( data );
         console.log( "Loading defaut value for activity type ("+selectInput.val()+")" );
+        $('select').selectpicker();
       });
 
 }
diff --git a/resources/views/admin/article/index.blade.php b/resources/views/admin/article/index.blade.php
index 7ea11e73..95a9810f 100644
--- a/resources/views/admin/article/index.blade.php
+++ b/resources/views/admin/article/index.blade.php
@@ -10,7 +10,7 @@
             <div class="card-body">
                 <div class="row">
                     @foreach($activity as $a)
-                        <div class="col-md-4">
+                        <div class="col-xl-4 col-lg-6">
                             <div class="card">
                                 <div class="card-header">
                                     <h4 class="card-title">{{$a->name}}</h4>
@@ -23,17 +23,17 @@
                                 <div class="card-footer">
                                     <div class="row">
                                         <div class="col-md-12">
-                                            <div class="btn-group w-100">
+                                            <div class="text-center">
                                                 @if(\Auth::user()->p('article_edit') == 1)
-                                                    <a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-cog"></i>&nbsp; Modifier l'article</a>
+                                                    <a href="/admin/article/activity/edit/{{$a->id}}" type="button" class="btn btn-secondary"><i class="fa fa-cog"></i>&nbsp; Modifier l'article</a>
                                                 @endif
                                                 @if(\Auth::user()->p('article_edit') == 1 && \Auth::user()->p('picture_add'))
-                                                    <a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary btn-block"><i class="fa fa-picture-o"></i>&nbsp; Gérer les photos</a>
+                                                    <a href="/admin/article/activity/picture/{{$a->id}}" type="button" class="btn btn-secondary"><i class="fa fa-picture-o"></i>&nbsp; Gérer les photos</a>
                                                 @endif
                                             </div>
                                         </div>
-                                        <div class="col-md-12">
-                                            <a href="/activity/{{$a->id}}" target="_blank" type="button" class="btn btn-outline-secondary btn-block"><i class="fa fa-picture-o"></i>&nbsp; Voir l'article</a>
+                                        <div class="col-md-12 text-center">
+                                            <a href="/activity/{{$a->id}}" target="_blank" type="button" class="btn btn-outline-secondary"><i class="fa fa-picture-o"></i>&nbsp; Voir l'article</a>
                                         </div>
                                     </div>
                                 </div>
diff --git a/resources/views/admin/configs/activity.blade.php b/resources/views/admin/configs/activity.blade.php
index a9297b14..1ebb03a9 100644
--- a/resources/views/admin/configs/activity.blade.php
+++ b/resources/views/admin/configs/activity.blade.php
@@ -7,18 +7,18 @@
             Configuration Générale
         </div>
         <div class="card-body">
-            <div class="row form-group">
+            <div class="row">
                 @foreach ($activities as $activity)
-                    <div class="col-md-6 p-2">
+                    <div class="col-lg-12 col-xl-6 p-2">
                         <div class="row m-auto">
-                            <div class="col-md-8">
+                            <div class="col">
                                 <label for="text-input" class=" form-control-label">{{$activity->name}}</label>
                                 <small class="form-text text-muted">{{$activity->admin_desc}}</small>
                             </div>
-                            <div class="col-md-3">
+                            <div class="col text-right">
                                 <div class="btn-group">
                                     <a href="/admin/config/activity/edit/{{$activity->id}}" class="btn btn-primary"><i class="fa fa-cog" aria-hidden="true"></i> Modifier</a>
-                                    <button class="btn btn-danger" onclick="delActivity({{$activity->id}})" ><i class="fa fa-times" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="Supprimer"></i></button>        
+                                    <button class="btn btn-danger" onclick="delActivity({{$activity->id}})" ><i class="fa fa-times" aria-hidden="true" data-toggle="tooltip" data-placement="bottom" title="Supprimer"></i></button>
                                 </div>
                             </div>
                         </div>
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 9db85bbc..5d2cef59 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -9,6 +9,7 @@
                         <h4 class="card-title"> Cours à venir</h4>
                     </div>
                     <div class="card-body">
+                        <div class="row">
                         @if(\Auth::user()->courses->isEmpty())
                             <div class="col-sm-12 text-center">
                                 <h4 class="m-4">Aucun cours à venir</h4>
@@ -28,6 +29,7 @@
                                 @endif
                             @endforeach
                         @endif
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/resources/views/admin/schedule/event/add.blade.php b/resources/views/admin/schedule/event/add.blade.php
index c4d78ef3..a2f7622c 100644
--- a/resources/views/admin/schedule/event/add.blade.php
+++ b/resources/views/admin/schedule/event/add.blade.php
@@ -49,6 +49,7 @@ $('.datetimepicker').datetimepicker({
         close: 'fa fa-remove'
     }
 });
+$('select').selectpicker();
 </script>
     
 @endsection
\ No newline at end of file
diff --git a/resources/views/admin/schedule/modal/add.blade.php b/resources/views/admin/schedule/modal/add.blade.php
index 10a256c1..74522596 100644
--- a/resources/views/admin/schedule/modal/add.blade.php
+++ b/resources/views/admin/schedule/modal/add.blade.php
@@ -1,3 +1,6 @@
+<div class="col-md-12 mt-4 text-center">
+    <h4>Information Générale</h4>
+</div>
 <div class="col-md-12">
     <div class="form-group">
         <label for="name">Nom de l'événement</label>
@@ -5,34 +8,34 @@
         <small id="nameHelp" class="text-muted">Veuillez entrer le nom de l'événement</small>
     </div>  
 </div>
-<div class="col-md-2">
+<div class="col-lg-3 col-md-4">
     <div class="form-group">
         <label class="label-control">Date et Heure de début</label>
         <input name="begin" type="text" id="datetimepickerbegin" class="form-control datetimepicker" required/>
     </div> 
 </div>
-<div class="col-md-2">
+<div class="col-lg-3 col-md-4">
     <div class="form-group">
         <label class="label-control">Date et Heure de fin</label>
         <input name="end" type="text" id="datetimepickerend" class="form-control datetimepicker" required/>
     </div> 
 </div>
-<div class="col-md-5">
+<div class="col-lg-6 col-md-4">
     <div class="form-group">
         <label for="name">Lieux</label>
         <input type="text" name="location" id="location" class="form-control" placeholder="" aria-describedby="nameHelp" value="{{$activity->location}}" required>
         <small id="nameHelp" class="text-muted">Veuillez entrer le lieu de l'événement</small>
     </div>  
 </div>
-<div class="col-md-3 m-auto">
+<div class="col-md-5 my-auto">
     <div class="form-group">
         <div class="form-check">
             <label class="form-check-label">
-                <input class="form-check-input" name="is_mandatory" type="checkbox" value="1" 
-                @if ($activity->is_mandatory == 1)
-                    checked
-                @endif>
-                L'événement est obligatoire
+                <input class="form-check-input" name="is_mandatory" type="checkbox" value="1"
+                       @if ($activity->is_mandatory == 1)
+                       checked
+                        @endif>
+                L'événement est t-il obligatoire pour tous les cadets ?
                 <span class="form-check-sign">
                     <span class="check"></span>
                 </span>
@@ -40,6 +43,19 @@
         </div>
     </div>
 </div>
+<div class="col-md-12 mt-4 text-center">
+    <h4>Options Supplémentaires</h4>
+</div>
+<div class="col-md-12 mt-4">
+    <ul class="nav nav-tabs">
+        <li class="nav-item">
+            <a class="nav-link active text-primary" href="#">Active</a>
+        </li>
+        <li class="nav-item">
+            <a class="nav-link text-primary" href="#">Link</a>
+        </li>
+    </ul>
+</div>
 <div class="col-md-12">
     <div class="form-group">
       <label for="desc">Commentaire</label>
@@ -48,6 +64,9 @@
 </div>
 
 @if ($activity->id == 1)
+    <div class="col-md-12 mt-4 text-center">
+        <h4>Horaire d'instruction</h4>
+    </div>
 <div class="col-md-12">
     <div id="accordion" role="tablist">
         @for ($i = 1; $i <= \App\Config::getData('admin_level_in_schedule_nb'); $i++)
@@ -78,7 +97,11 @@
                                     <div class="form-group">
                                         <div class="form-group">
                                             <label for="name">Instructeur</label>
-                                            <input type="text" name="instruc_n{{$i}}_p{{$p}}" id="instruc_n{{$i}}_p{{$p}}" class="form-control basicAutoComplete" aria-describedby="nameHelp" required>
+                                            <select class="selectpicker d-block" data-style="btn btn-outline-primary w-100">
+                                                @foreach(\App\User::all() as $user)
+                                                    <option value="{{$user->id}}">{{$user->fullname()}}</option>
+                                                @endforeach
+                                            </select>
                                             <small id="nameHelp" class="text-muted">Veuillez entrer le nom de l'instructeur</small>
                                         </div> 
                                     </div>  
@@ -111,7 +134,6 @@
 </div>
     
 @endif
-
 <script>
 var begin = "<?php echo $begin_time ?>";
 var end = "<?php echo $end_time ?>";
diff --git a/resources/views/admin/user/profil.blade.php b/resources/views/admin/user/profil.blade.php
index 5a8df742..f7fc0b17 100644
--- a/resources/views/admin/user/profil.blade.php
+++ b/resources/views/admin/user/profil.blade.php
@@ -71,6 +71,7 @@
                             <thead class="thead-default">
                             <tr>
                                 <th>Horodatage</th>
+                                <th>Résultat</th>
                                 <th>Action</th>
                             </tr>
                             </thead>
@@ -78,7 +79,8 @@
                                 @foreach ($user->logs()->take(6)->get() as $log)
                                 <tr>
                                     <td scope="row">{{$log->created_at}}</td>
-                                    <td>{{$log->action}}</td>
+                                    <td><span class="badge badge-pill badge-{{$log->result}} text-uppercase">{{$log->result}}</span></td>
+                                    <td>{{$log->event}}</td>
                                 </tr>
                                 @endforeach
                             </tbody>
@@ -95,7 +97,7 @@
                     <a name="changepsw" id="changepsw" class="btn btn-warning btn-block" href="/admin/profil/password" role="button">Modifier mon mot de passe</a>
                     <a class="btn btn-secondary btn-block" href="/admin/profil/avatar" role="button">Modifier ma photo de profil</a>
                     <button disabled class="btn btn-secondary btn-block" href="/admin/profil/phone" role="button">Modifier mon numéro de téléphone</button>
-                    <button disabled class="btn btn-secondary btn-block" href="/admin/profil/adress" role="button">Modifier mon adresse</button>
+                    <a class="btn btn-secondary btn-block" href="/admin/profil/adress" role="button">Modifier mon adresse</a>
                     <button disabled class="btn btn-primary btn-block" href="/admin/profil/preference" role="button">Modifier mes préférences</button>
                     <a class="btn btn-danger btn-block" href="/logout" role="button">Déconnexion</a>
                 </div>