From 8158f8a8aae6c08b4b41189d6856f6d73221115f Mon Sep 17 00:00:00 2001
From: Mathieu Lagace <thekilleurcraft@gmail.com>
Date: Fri, 31 Jul 2020 17:29:47 -0400
Subject: [PATCH] add first login logic

---
 app/Course.php                                |   6 +-
 app/Http/Controllers/AdminController.php      |  38 ++-
 app/Http/Controllers/EventController.php      |   6 +-
 app/Http/Controllers/ScheduleController.php   |   5 +-
 app/Http/Controllers/UserController.php       |  12 +-
 app/Http/Kernel.php                           |   1 +
 app/Http/Middleware/FirstLogin.php            |  28 ++
 app/Providers/TelescopeServiceProvider.php    |   2 +-
 config/telescope.php                          |   5 +-
 .../2014_10_12_000000_create_users_table.php  |   5 +-
 database/seeds/UsersTableSeeder.php           |   4 +-
 public/css/custom.css                         |  14 +
 public/js/plugins/parsley-extra.min.js        |  55 +++
 public/js/plugins/parsley.min.js              |   2 +
 resources/custom.css                          |  14 +
 resources/views/admin/update.blade.php        |  13 +-
 resources/views/admin/user/add.blade.php      | 246 +++++++-------
 resources/views/admin/user/edit.blade.php     | 163 ++++-----
 .../views/admin/user/profil/setup.blade.php   | 103 ++++++
 .../views/layouts/admin/scripts.blade.php     |   3 +
 routes/breadcrumbs.php                        |   8 +-
 routes/web.php                                | 315 +++++++++---------
 22 files changed, 655 insertions(+), 393 deletions(-)
 create mode 100644 app/Http/Middleware/FirstLogin.php
 create mode 100644 public/js/plugins/parsley-extra.min.js
 create mode 100644 public/js/plugins/parsley.min.js
 create mode 100644 resources/views/admin/user/profil/setup.blade.php

diff --git a/app/Course.php b/app/Course.php
index 6f5c241f..9b5ed857 100644
--- a/app/Course.php
+++ b/app/Course.php
@@ -62,7 +62,11 @@ class Course extends Model
         if (\App\User::find($this->user_id)) {
             return \App\User::find($this->user_id)->fullname();
         } else {
-            return $this->user_id;
+            if (is_numeric($this->user_id)) {
+                return 'Utilisateur inconnu';
+            } else {
+                return $this->user_id;
+            }
         }
     }
 
diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php
index e7ad000f..6f051985 100644
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@@ -2,8 +2,11 @@
 
 namespace App\Http\Controllers;
 
+use Illuminate\Contracts\Foundation\Application;
+use Illuminate\Contracts\View\Factory;
 use Illuminate\Http\Request;
 use \App\Log;
+use Illuminate\View\View;
 
 class AdminController extends Controller
 {
@@ -20,7 +23,7 @@ class AdminController extends Controller
     /**
      * Show the application dashboard.
      *
-     * @return \Illuminate\Http\Response
+     * @return Application|Factory|View
      */
     public function index()
     {
@@ -29,6 +32,39 @@ class AdminController extends Controller
         return view('admin.dashboard',['futureEvent' => \App\Event::future()->take(3),'userClasse' => \Auth::user()->futureCourses()->forPage(1,6)]);
     }
 
+    public function setup()
+    {
+        if (\Auth::user()->use_default_psw == true)
+        {
+            return view('admin.user.profil.setup');
+        }
+        return redirect('/admin');
+    }
+
+    public function saveSetup()
+    {
+        $user = \Auth::user();
+        $user->firstname = \request('firstname');
+        $user->lastname = \request('lastname');
+        $user->password = bcrypt(request('psw'));
+
+        if (\request('address') != null)
+        {
+            $user->adress = \request('address');
+        }
+        if (\request('telephone') != null)
+        {
+            $user->telephone = \request('telephone');
+        }
+        if (\request('sexe') != null)
+        {
+            $user->sexe = \request('sexe');
+        }
+        $user->use_default_psw = false;
+        $user->save();
+        return redirect('/admin');
+    }
+
     public function update()
     {
         clog('navigate','success','consulte les notes de mise à jours');
diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php
index 801ccf98..6bf5fb62 100644
--- a/app/Http/Controllers/EventController.php
+++ b/app/Http/Controllers/EventController.php
@@ -147,7 +147,11 @@ class EventController extends Controller
                     }
 
                     $course->user_id = $instructor;
-                    $course->location = request('location_n'.$l.'_p'.$p);
+                    if (request('location_n'.$l.'_p'.$p) != null) {
+                        $course->location = request('location_n'.$l.'_p'.$p);
+                    } else {
+                        $course->location = "";
+                    }
                     $course->periode = $p;
                     $course->level = $l;
 
diff --git a/app/Http/Controllers/ScheduleController.php b/app/Http/Controllers/ScheduleController.php
index 73cb6e0e..5722d60c 100644
--- a/app/Http/Controllers/ScheduleController.php
+++ b/app/Http/Controllers/ScheduleController.php
@@ -216,7 +216,10 @@ class ScheduleController extends Controller
     public function delete($id)
     {
         $event  = \App\Event::find($id);
-
+        foreach ($event->courses as $course)
+        {
+            $course->delete();
+        }
         $event->delete();
     }
 }
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 4a85966f..d020936b 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -49,13 +49,13 @@ class UserController extends Controller
         $user->email = request('email');
 
         if (request('adresse') == null) {
-            $user->adress = "Inconnu";
+            $user->adress = "";
         } else {
             $user->adress = request('adresse');
         }
 
         if (request('telephone') == null) {
-            $user->telephone = "Inconnu";
+            $user->telephone = "";
         } else {
             $user->telephone = request('telephone');
         }
@@ -63,7 +63,7 @@ class UserController extends Controller
         $user->sexe = request('sexe');
 
         if (request('age') == null) {
-            $user->age = "Inconnu";
+            $user->age = "";
         } else {
             $user->age = request('age');
         }
@@ -122,13 +122,13 @@ class UserController extends Controller
         $user->email = request('email');
 
         if (request('adresse') == null) {
-            $user->adress = "Inconnu";
+            $user->adress = "";
         } else {
             $user->adress = request('adresse');
         }
 
         if (request('telephone') == null) {
-            $user->telephone = "Inconnu";
+            $user->telephone = "";
         } else {
             $user->telephone = request('telephone');
         }
@@ -136,7 +136,7 @@ class UserController extends Controller
         $user->sexe = request('sexe');
 
         if (request('age') == null) {
-            $user->age = "Inconnu";
+            $user->age = "";
         } else {
             $user->age = request('age');
         }
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 27361b03..ebb97580 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -64,5 +64,6 @@ class Kernel extends HttpKernel
         'perm' => \App\Http\Middleware\CheckPerm::class,
         'fileperm' => \App\Http\Middleware\CheckFilePerm::class,
         'courseperm' => \App\Http\Middleware\CheckCoursePerm::class,
+        'firstlogin' => \App\Http\Middleware\FirstLogin::class
     ];
 }
diff --git a/app/Http/Middleware/FirstLogin.php b/app/Http/Middleware/FirstLogin.php
new file mode 100644
index 00000000..65b1a5db
--- /dev/null
+++ b/app/Http/Middleware/FirstLogin.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+
+class FirstLogin
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        if ($request->isMethod('get'))
+        {
+            if (\Auth::user()->use_default_psw == true)
+            {
+                return redirect('/admin/setup');
+            }
+        }
+        return $next($request);
+    }
+}
diff --git a/app/Providers/TelescopeServiceProvider.php b/app/Providers/TelescopeServiceProvider.php
index a9ddad22..e35852b6 100644
--- a/app/Providers/TelescopeServiceProvider.php
+++ b/app/Providers/TelescopeServiceProvider.php
@@ -64,7 +64,7 @@ class TelescopeServiceProvider extends TelescopeApplicationServiceProvider
     {
         Gate::define('viewTelescope', function ($user) {
             return in_array($user->email, [
-                //
+                'admin@exvps.ca'
             ]);
         });
     }
diff --git a/config/telescope.php b/config/telescope.php
index 1fed214a..dd854eb2 100644
--- a/config/telescope.php
+++ b/config/telescope.php
@@ -29,7 +29,7 @@ return [
     |
     */
 
-    'path' => env('TELESCOPE_PATH', 'telescope'),
+    'path' => env('TELESCOPE_PATH', 'admin/telescope'),
 
     /*
     |--------------------------------------------------------------------------
@@ -62,7 +62,7 @@ return [
     |
     */
 
-    'enabled' => env('TELESCOPE_ENABLED', true),
+    'enabled' => env('TELESCOPE_ENABLED', false),
 
     /*
     |--------------------------------------------------------------------------
@@ -77,6 +77,7 @@ return [
 
     'middleware' => [
         'web',
+        'auth',
         Authorize::class,
     ],
 
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 6678198d..94c91536 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -20,12 +20,13 @@ class CreateUsersTable extends Migration
             $table->string('email')->unique();
             $table->string('password');
             $table->string('rank_id')->default(1);
-            $table->string('adress')->default('unknown');
-            $table->string('telephone')->default('unknown');
+            $table->string('adress')->default('');
+            $table->string('telephone')->default('');
             $table->string('age');
             $table->string('avatar')->default('1');
             $table->string('sexe');
             $table->string('job_id')->default(6);
+            $table->boolean('use_default_psw')->default(true);
             $table->string('api_token', 60)->unique()->default(str_shuffle(str_random(60)));
             $table->rememberToken();
             $table->timestamps();
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index 6603e464..f1049c69 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -18,7 +18,7 @@ class UsersTableSeeder extends Seeder
                 'email' => 'visiteur@exvps.ca',
                 'password' => bcrypt('f329er8kl2jHJGHdEj12567'),
                 'rank_id' => '1',
-                'adress' => 'Inconnu',
+                'adress' => '',
                 'age' => '99',
                 'avatar' => '3',
                 'sexe' => 'm',
@@ -31,7 +31,7 @@ class UsersTableSeeder extends Seeder
                 'email' => 'admin@exvps.ca',
                 'password' => bcrypt('SuperAdmin'),
                 'rank_id' => '1',
-                'adress' => 'Inconnu',
+                'adress' => '',
                 'age' => '99',
                 'avatar' => '3',
                 'sexe' => 'm',
diff --git a/public/css/custom.css b/public/css/custom.css
index 87b1a4c7..a648f115 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -1893,4 +1893,18 @@ tfoot > tr {
 
 .overflow-auto {
   overflow: auto;
+}
+
+.parsley-errors-list {
+  list-style: none;
+  padding: 0px;
+  color: #f44336;
+}
+
+.form-control {
+  padding-top: 15px;
+}
+
+.bootstrap-select {
+  margin-top: -12px;
 }
\ No newline at end of file
diff --git a/public/js/plugins/parsley-extra.min.js b/public/js/plugins/parsley-extra.min.js
new file mode 100644
index 00000000..e0107f54
--- /dev/null
+++ b/public/js/plugins/parsley-extra.min.js
@@ -0,0 +1,55 @@
+// Validation errors messages for Parsley
+// Load this after Parsley
+
+Parsley.addMessages('fr', {
+    defaultMessage: "Cette valeur semble non valide.",
+    type: {
+        email:        "Cette valeur n'est pas une adresse email valide.",
+        url:          "Cette valeur n'est pas une URL valide.",
+        number:       "Cette valeur doit être un nombre.",
+        integer:      "Cette valeur doit être un entier.",
+        digits:       "Cette valeur doit être numérique.",
+        alphanum:     "Cette valeur doit être alphanumérique."
+    },
+    notblank:       "Cette valeur ne peut pas être vide.",
+    required:       "Ce champ est requis.",
+    pattern:        "Cette valeur semble non valide.",
+    min:            "Cette valeur ne doit pas être inférieure à %s.",
+    max:            "Cette valeur ne doit pas excéder %s.",
+    range:          "Cette valeur doit être comprise entre %s et %s.",
+    minlength:      "Cette chaîne est trop courte. Elle doit avoir au minimum %s caractères.",
+    maxlength:      "Cette chaîne est trop longue. Elle doit avoir au maximum %s caractères.",
+    length:         "Cette valeur doit contenir entre %s et %s caractères.",
+    mincheck:       "Vous devez sélectionner au moins %s choix.",
+    maxcheck:       "Vous devez sélectionner %s choix maximum.",
+    check:          "Vous devez sélectionner entre %s et %s choix.",
+    equalto:        "Cette valeur devrait être identique."
+});
+
+Parsley.setLocale('fr');
+
+window.Parsley
+    .addValidator('password', {
+        requirementType: 'boolean',
+        validateString: function(value, requirement) {
+            console.log(/^(?=.*[\d])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*])[\w!@#$%^&*]{8,}$/.test(value));
+            return /^(?=.*[\d])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*])[\w!@#$%^&*]{8,}$/.test(value);
+        },
+        messages: {
+            fr: 'Le mot de passe doit contenir au moins 8 caractères, une lettre majuscule, une lettre minuscule, un chiffre et un caractères spécial'
+        }
+    });
+
+window.Parsley.on('field:error', function (fieldInstance) {
+    var messages = ParsleyUI.getErrorsMessages(fieldInstance);
+    var errorMsg = messages.join(';');
+    fieldInstance.$element.parent().addClass('has-danger');
+    fieldInstance.$element.parent().removeClass('has-success');
+
+});
+window.Parsley.on('field:success', function (fieldInstance) {
+    if (fieldInstance.$element.val() != "") {
+        fieldInstance.$element.parent().removeClass('has-danger');
+        fieldInstance.$element.parent().addClass('has-success');
+    }
+});
\ No newline at end of file
diff --git a/public/js/plugins/parsley.min.js b/public/js/plugins/parsley.min.js
new file mode 100644
index 00000000..09a24b30
--- /dev/null
+++ b/public/js/plugins/parsley.min.js
@@ -0,0 +1,2 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t=t||self).parsley=e(t.jQuery)}(this,function(h){"use strict";function n(t){return(n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function l(){return(l=Object.assign||function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var r in i)Object.prototype.hasOwnProperty.call(i,r)&&(t[r]=i[r])}return t}).apply(this,arguments)}function o(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if(!(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t)))return;var i=[],r=!0,n=!1,s=void 0;try{for(var a,o=t[Symbol.iterator]();!(r=(a=o.next()).done)&&(i.push(a.value),!e||i.length!==e);r=!0);}catch(t){n=!0,s=t}finally{try{r||null==o.return||o.return()}finally{if(n)throw s}}return i}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function u(t){return function(t){if(Array.isArray(t)){for(var e=0,i=new Array(t.length);e<t.length;e++)i[e]=t[e];return i}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var t=1,e={},d={attr:function(t,e,i){var r,n,s,a=new RegExp("^"+e,"i");if(void 0===i)i={};else for(r in i)i.hasOwnProperty(r)&&delete i[r];if(!t)return i;for(r=(s=t.attributes).length;r--;)(n=s[r])&&n.specified&&a.test(n.name)&&(i[this.camelize(n.name.slice(e.length))]=this.deserializeValue(n.value));return i},checkAttr:function(t,e,i){return t.hasAttribute(e+i)},setAttr:function(t,e,i,r){t.setAttribute(this.dasherize(e+i),String(r))},getType:function(t){return t.getAttribute("type")||"text"},generateID:function(){return""+t++},deserializeValue:function(e){var t;try{return e?"true"==e||"false"!=e&&("null"==e?null:isNaN(t=Number(e))?/^[\[\{]/.test(e)?JSON.parse(e):e:t):e}catch(t){return e}},camelize:function(t){return t.replace(/-+(.)?/g,function(t,e){return e?e.toUpperCase():""})},dasherize:function(t){return t.replace(/::/g,"/").replace(/([A-Z]+)([A-Z][a-z])/g,"$1_$2").replace(/([a-z\d])([A-Z])/g,"$1_$2").replace(/_/g,"-").toLowerCase()},warn:function(){var t;window.console&&"function"==typeof window.console.warn&&(t=window.console).warn.apply(t,arguments)},warnOnce:function(t){e[t]||(e[t]=!0,this.warn.apply(this,arguments))},_resetWarnings:function(){e={}},trimString:function(t){return t.replace(/^\s+|\s+$/g,"")},parse:{date:function(t){var e=t.match(/^(\d{4,})-(\d\d)-(\d\d)$/);if(!e)return null;var i=o(e.map(function(t){return parseInt(t,10)}),4),r=(i[0],i[1]),n=i[2],s=i[3],a=new Date(r,n-1,s);return a.getFullYear()!==r||a.getMonth()+1!==n||a.getDate()!==s?null:a},string:function(t){return t},integer:function(t){return isNaN(t)?null:parseInt(t,10)},number:function(t){if(isNaN(t))throw null;return parseFloat(t)},boolean:function(t){return!/^\s*false\s*$/i.test(t)},object:function(t){return d.deserializeValue(t)},regexp:function(t){var e="";return t=/^\/.*\/(?:[gimy]*)$/.test(t)?(e=t.replace(/.*\/([gimy]*)$/,"$1"),t.replace(new RegExp("^/(.*?)/"+e+"$"),"$1")):"^"+t+"$",new RegExp(t,e)}},parseRequirement:function(t,e){var i=this.parse[t||"string"];if(!i)throw'Unknown requirement specification: "'+t+'"';var r=i(e);if(null===r)throw"Requirement is not a ".concat(t,': "').concat(e,'"');return r},namespaceEvents:function(t,e){return(t=this.trimString(t||"").split(/\s+/))[0]?h.map(t,function(t){return"".concat(t,".").concat(e)}).join(" "):""},difference:function(t,i){var r=[];return h.each(t,function(t,e){-1==i.indexOf(e)&&r.push(e)}),r},all:function(t){return h.when.apply(h,u(t).concat([42,42]))},objectCreate:Object.create||function(t){if(1<arguments.length)throw Error("Second argument not supported");if("object"!=n(t))throw TypeError("Argument must be an object");i.prototype=t;var e=new i;return i.prototype=null,e},_SubmitSelector:'input[type="submit"], button:submit'};function i(){}function r(){this.__id__=d.generateID()}var s={namespace:"data-parsley-",inputs:"input, textarea, select",excluded:"input[type=button], input[type=submit], input[type=reset], input[type=hidden]",priorityEnabled:!0,multiple:null,group:null,uiEnabled:!0,validationThreshold:3,focus:"first",trigger:!1,triggerAfterFailure:"input",errorClass:"parsley-error",successClass:"parsley-success",classHandler:function(){},errorsContainer:function(){},errorsWrapper:'<ul class="parsley-errors-list"></ul>',errorTemplate:"<li></li>"};r.prototype={asyncSupport:!0,_pipeAccordingToValidationResult:function(){function t(){var t=h.Deferred();return!0!==e.validationResult&&t.reject(),t.resolve().promise()}var e=this;return[t,t]},actualizeOptions:function(){return d.attr(this.element,this.options.namespace,this.domOptions),this.parent&&this.parent.actualizeOptions&&this.parent.actualizeOptions(),this},_resetOptions:function(t){for(var e in this.domOptions=d.objectCreate(this.parent.options),this.options=d.objectCreate(this.domOptions),t)t.hasOwnProperty(e)&&(this.options[e]=t[e]);this.actualizeOptions()},_listeners:null,on:function(t,e){return this._listeners=this._listeners||{},(this._listeners[t]=this._listeners[t]||[]).push(e),this},subscribe:function(t,e){h.listenTo(this,t.toLowerCase(),e)},off:function(t,e){var i=this._listeners&&this._listeners[t];if(i)if(e)for(var r=i.length;r--;)i[r]===e&&i.splice(r,1);else delete this._listeners[t];return this},unsubscribe:function(t){h.unsubscribeTo(this,t.toLowerCase())},trigger:function(t,e,i){e=e||this;var r,n=this._listeners&&this._listeners[t];if(n)for(var s=n.length;s--;)if(!1===(r=n[s].call(e,e,i)))return r;return!this.parent||this.parent.trigger(t,e,i)},asyncIsValid:function(t,e){return d.warnOnce("asyncIsValid is deprecated; please use whenValid instead"),this.whenValid({group:t,force:e})},_findRelated:function(){return this.options.multiple?h(this.parent.element.querySelectorAll("[".concat(this.options.namespace,'multiple="').concat(this.options.multiple,'"]'))):this.$element}};function c(t){h.extend(!0,this,t)}c.prototype={validate:function(t,e){if(this.fn)return 3<arguments.length&&(e=[].slice.call(arguments,1,-1)),this.fn(t,e);if(Array.isArray(t)){if(!this.validateMultiple)throw"Validator `"+this.name+"` does not handle multiple values";return this.validateMultiple.apply(this,arguments)}var i=arguments[arguments.length-1];if(this.validateDate&&i._isDateInput())return arguments[0]=d.parse.date(arguments[0]),null!==arguments[0]&&this.validateDate.apply(this,arguments);if(this.validateNumber)return!t||!isNaN(t)&&(arguments[0]=parseFloat(arguments[0]),this.validateNumber.apply(this,arguments));if(this.validateString)return this.validateString.apply(this,arguments);throw"Validator `"+this.name+"` only handles multiple values"},parseRequirements:function(t,e){if("string"!=typeof t)return Array.isArray(t)?t:[t];var i=this.requirementType;if(Array.isArray(i)){for(var r=function(t,e){var i=t.match(/^\s*\[(.*)\]\s*$/);if(!i)throw'Requirement is not an array: "'+t+'"';var r=i[1].split(",").map(d.trimString);if(r.length!==e)throw"Requirement has "+r.length+" values when "+e+" are needed";return r}(t,i.length),n=0;n<r.length;n++)r[n]=d.parseRequirement(i[n],r[n]);return r}return h.isPlainObject(i)?function(t,e,i){var r=null,n={};for(var s in t)if(s){var a=i(s);"string"==typeof a&&(a=d.parseRequirement(t[s],a)),n[s]=a}else r=d.parseRequirement(t[s],e);return[r,n]}(i,t,e):[d.parseRequirement(i,t)]},requirementType:"string",priority:2};function a(t,e){this.__class__="ValidatorRegistry",this.locale="en",this.init(t||{},e||{})}var p={email:/^((([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-zA-Z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-zA-Z]|\d|-|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-zA-Z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))$/,number:/^-?(\d*\.)?\d+(e[-+]?\d+)?$/i,integer:/^-?\d+$/,digits:/^\d+$/,alphanum:/^\w+$/i,date:{test:function(t){return null!==d.parse.date(t)}},url:new RegExp("^(?:(?:https?|ftp)://)?(?:\\S+(?::\\S*)?@)?(?:(?:[1-9]\\d?|1\\d\\d|2[01]\\d|22[0-3])(?:\\.(?:1?\\d{1,2}|2[0-4]\\d|25[0-5])){2}(?:\\.(?:[1-9]\\d?|1\\d\\d|2[0-4]\\d|25[0-4]))|(?:(?:[a-zA-Z\\u00a1-\\uffff0-9]-*)*[a-zA-Z\\u00a1-\\uffff0-9]+)(?:\\.(?:[a-zA-Z\\u00a1-\\uffff0-9]-*)*[a-zA-Z\\u00a1-\\uffff0-9]+)*(?:\\.(?:[a-zA-Z\\u00a1-\\uffff]{2,})))(?::\\d{2,5})?(?:/\\S*)?$")};p.range=p.number;function f(t){var e=(""+t).match(/(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/);return e?Math.max(0,(e[1]?e[1].length:0)-(e[2]?+e[2]:0)):0}function m(s,a){return function(t){for(var e=arguments.length,i=new Array(1<e?e-1:0),r=1;r<e;r++)i[r-1]=arguments[r];return i.pop(),a.apply(void 0,[t].concat(u((n=s,i.map(d.parse[n])))));var n}}function g(t){return{validateDate:m("date",t),validateNumber:m("number",t),requirementType:t.length<=2?"string":["string","string"],priority:30}}a.prototype={init:function(t,e){for(var i in this.catalog=e,this.validators=l({},this.validators),t)this.addValidator(i,t[i].fn,t[i].priority);window.Parsley.trigger("parsley:validator:init")},setLocale:function(t){if(void 0===this.catalog[t])throw new Error(t+" is not available in the catalog");return this.locale=t,this},addCatalog:function(t,e,i){return"object"===n(e)&&(this.catalog[t]=e),!0===i?this.setLocale(t):this},addMessage:function(t,e,i){return void 0===this.catalog[t]&&(this.catalog[t]={}),this.catalog[t][e]=i,this},addMessages:function(t,e){for(var i in e)this.addMessage(t,i,e[i]);return this},addValidator:function(t,e,i){if(this.validators[t])d.warn('Validator "'+t+'" is already defined.');else if(s.hasOwnProperty(t))return void d.warn('"'+t+'" is a restricted keyword and is not a valid validator name.');return this._setValidator.apply(this,arguments)},hasValidator:function(t){return!!this.validators[t]},updateValidator:function(t,e,i){return this.validators[t]?this._setValidator.apply(this,arguments):(d.warn('Validator "'+t+'" is not already defined.'),this.addValidator.apply(this,arguments))},removeValidator:function(t){return this.validators[t]||d.warn('Validator "'+t+'" is not defined.'),delete this.validators[t],this},_setValidator:function(t,e,i){for(var r in"object"!==n(e)&&(e={fn:e,priority:i}),e.validate||(e=new c(e)),(this.validators[t]=e).messages||{})this.addMessage(r,t,e.messages[r]);return this},getErrorMessage:function(t){var e;"type"===t.name?e=(this.catalog[this.locale][t.name]||{})[t.requirements]:e=this.formatMessage(this.catalog[this.locale][t.name],t.requirements);return e||this.catalog[this.locale].defaultMessage||this.catalog.en.defaultMessage},formatMessage:function(t,e){if("object"!==n(e))return"string"==typeof t?t.replace(/%s/i,e):"";for(var i in e)t=this.formatMessage(t,e[i]);return t},validators:{notblank:{validateString:function(t){return/\S/.test(t)},priority:2},required:{validateMultiple:function(t){return 0<t.length},validateString:function(t){return/\S/.test(t)},priority:512},type:{validateString:function(t,e,i){var r=2<arguments.length&&void 0!==i?i:{},n=r.step,s=void 0===n?"any":n,a=r.base,o=void 0===a?0:a,l=p[e];if(!l)throw new Error("validator type `"+e+"` is not supported");if(!t)return!0;if(!l.test(t))return!1;if("number"===e&&!/^any$/i.test(s||"")){var u=Number(t),d=Math.max(f(s),f(o));if(f(u)>d)return!1;var h=function(t){return Math.round(t*Math.pow(10,d))};if((h(u)-h(o))%h(s)!=0)return!1}return!0},requirementType:{"":"string",step:"string",base:"number"},priority:256},pattern:{validateString:function(t,e){return!t||e.test(t)},requirementType:"regexp",priority:64},minlength:{validateString:function(t,e){return!t||t.length>=e},requirementType:"integer",priority:30},maxlength:{validateString:function(t,e){return t.length<=e},requirementType:"integer",priority:30},length:{validateString:function(t,e,i){return!t||t.length>=e&&t.length<=i},requirementType:["integer","integer"],priority:30},mincheck:{validateMultiple:function(t,e){return t.length>=e},requirementType:"integer",priority:30},maxcheck:{validateMultiple:function(t,e){return t.length<=e},requirementType:"integer",priority:30},check:{validateMultiple:function(t,e,i){return t.length>=e&&t.length<=i},requirementType:["integer","integer"],priority:30},min:g(function(t,e){return e<=t}),max:g(function(t,e){return t<=e}),range:g(function(t,e,i){return e<=t&&t<=i}),equalto:{validateString:function(t,e){if(!t)return!0;var i=h(e);return i.length?t===i.val():t===e},priority:256},euvatin:{validateString:function(t){if(!t)return!0;return/^[A-Z][A-Z][A-Za-z0-9 -]{2,}$/.test(t)},priority:30}}};var v={};v.Form={_actualizeTriggers:function(){var e=this;this.$element.on("submit.Parsley",function(t){e.onSubmitValidate(t)}),this.$element.on("click.Parsley",d._SubmitSelector,function(t){e.onSubmitButton(t)}),!1!==this.options.uiEnabled&&this.element.setAttribute("novalidate","")},focus:function(){if(!(this._focusedField=null)===this.validationResult||"none"===this.options.focus)return null;for(var t=0;t<this.fields.length;t++){var e=this.fields[t];if(!0!==e.validationResult&&0<e.validationResult.length&&void 0===e.options.noFocus&&(this._focusedField=e.$element,"first"===this.options.focus))break}return null===this._focusedField?null:this._focusedField.focus()},_destroyUI:function(){this.$element.off(".Parsley")}},v.Field={_reflowUI:function(){if(this._buildUI(),this._ui){var t=function t(e,i,r){for(var n=[],s=[],a=0;a<e.length;a++){for(var o=!1,l=0;l<i.length;l++)if(e[a].assert.name===i[l].assert.name){o=!0;break}o?s.push(e[a]):n.push(e[a])}return{kept:s,added:n,removed:r?[]:t(i,e,!0).added}}(this.validationResult,this._ui.lastValidationResult);this._ui.lastValidationResult=this.validationResult,this._manageStatusClass(),this._manageErrorsMessages(t),this._actualizeTriggers(),!t.kept.length&&!t.added.length||this._failedOnce||(this._failedOnce=!0,this._actualizeTriggers())}},getErrorsMessages:function(){if(!0===this.validationResult)return[];for(var t=[],e=0;e<this.validationResult.length;e++)t.push(this.validationResult[e].errorMessage||this._getErrorMessage(this.validationResult[e].assert));return t},addError:function(t,e){var i=1<arguments.length&&void 0!==e?e:{},r=i.message,n=i.assert,s=i.updateClass,a=void 0===s||s;this._buildUI(),this._addError(t,{message:r,assert:n}),a&&this._errorClass()},updateError:function(t,e){var i=1<arguments.length&&void 0!==e?e:{},r=i.message,n=i.assert,s=i.updateClass,a=void 0===s||s;this._buildUI(),this._updateError(t,{message:r,assert:n}),a&&this._errorClass()},removeError:function(t,e){var i=(1<arguments.length&&void 0!==e?e:{}).updateClass,r=void 0===i||i;this._buildUI(),this._removeError(t),r&&this._manageStatusClass()},_manageStatusClass:function(){this.hasConstraints()&&this.needsValidation()&&!0===this.validationResult?this._successClass():0<this.validationResult.length?this._errorClass():this._resetClass()},_manageErrorsMessages:function(t){if(void 0===this.options.errorsMessagesDisabled){if(void 0!==this.options.errorMessage)return t.added.length||t.kept.length?(this._insertErrorWrapper(),0===this._ui.$errorsWrapper.find(".parsley-custom-error-message").length&&this._ui.$errorsWrapper.append(h(this.options.errorTemplate).addClass("parsley-custom-error-message")),this._ui.$errorClassHandler.attr("aria-describedby",this._ui.errorsWrapperId),this._ui.$errorsWrapper.addClass("filled").attr("aria-hidden","false").find(".parsley-custom-error-message").html(this.options.errorMessage)):(this._ui.$errorClassHandler.removeAttr("aria-describedby"),this._ui.$errorsWrapper.removeClass("filled").attr("aria-hidden","true").find(".parsley-custom-error-message").remove());for(var e=0;e<t.removed.length;e++)this._removeError(t.removed[e].assert.name);for(e=0;e<t.added.length;e++)this._addError(t.added[e].assert.name,{message:t.added[e].errorMessage,assert:t.added[e].assert});for(e=0;e<t.kept.length;e++)this._updateError(t.kept[e].assert.name,{message:t.kept[e].errorMessage,assert:t.kept[e].assert})}},_addError:function(t,e){var i=e.message,r=e.assert;this._insertErrorWrapper(),this._ui.$errorClassHandler.attr("aria-describedby",this._ui.errorsWrapperId),this._ui.$errorsWrapper.addClass("filled").attr("aria-hidden","false").append(h(this.options.errorTemplate).addClass("parsley-"+t).html(i||this._getErrorMessage(r)))},_updateError:function(t,e){var i=e.message,r=e.assert;this._ui.$errorsWrapper.addClass("filled").find(".parsley-"+t).html(i||this._getErrorMessage(r))},_removeError:function(t){this._ui.$errorClassHandler.removeAttr("aria-describedby"),this._ui.$errorsWrapper.removeClass("filled").attr("aria-hidden","true").find(".parsley-"+t).remove()},_getErrorMessage:function(t){var e=t.name+"Message";return void 0!==this.options[e]?window.Parsley.formatMessage(this.options[e],t.requirements):window.Parsley.getErrorMessage(t)},_buildUI:function(){if(!this._ui&&!1!==this.options.uiEnabled){var t={};this.element.setAttribute(this.options.namespace+"id",this.__id__),t.$errorClassHandler=this._manageClassHandler(),t.errorsWrapperId="parsley-id-"+(this.options.multiple?"multiple-"+this.options.multiple:this.__id__),t.$errorsWrapper=h(this.options.errorsWrapper).attr("id",t.errorsWrapperId),t.lastValidationResult=[],t.validationInformationVisible=!1,this._ui=t}},_manageClassHandler:function(){if("string"==typeof this.options.classHandler&&h(this.options.classHandler).length)return h(this.options.classHandler);var t=this.options.classHandler;if("string"==typeof this.options.classHandler&&"function"==typeof window[this.options.classHandler]&&(t=window[this.options.classHandler]),"function"==typeof t){var e=t.call(this,this);if(void 0!==e&&e.length)return e}else{if("object"===n(t)&&t instanceof jQuery&&t.length)return t;t&&d.warn("The class handler `"+t+"` does not exist in DOM nor as a global JS function")}return this._inputHolder()},_inputHolder:function(){return this.options.multiple&&"SELECT"!==this.element.nodeName?this.$element.parent():this.$element},_insertErrorWrapper:function(){var t=this.options.errorsContainer;if(0!==this._ui.$errorsWrapper.parent().length)return this._ui.$errorsWrapper.parent();if("string"==typeof t){if(h(t).length)return h(t).append(this._ui.$errorsWrapper);"function"==typeof window[t]?t=window[t]:d.warn("The errors container `"+t+"` does not exist in DOM nor as a global JS function")}return"function"==typeof t&&(t=t.call(this,this)),"object"===n(t)&&t.length?t.append(this._ui.$errorsWrapper):this._inputHolder().after(this._ui.$errorsWrapper)},_actualizeTriggers:function(){var t,e=this,i=this._findRelated();i.off(".Parsley"),this._failedOnce?i.on(d.namespaceEvents(this.options.triggerAfterFailure,"Parsley"),function(){e._validateIfNeeded()}):(t=d.namespaceEvents(this.options.trigger,"Parsley"))&&i.on(t,function(t){e._validateIfNeeded(t)})},_validateIfNeeded:function(t){var e=this;t&&/key|input/.test(t.type)&&(!this._ui||!this._ui.validationInformationVisible)&&this.getValue().length<=this.options.validationThreshold||(this.options.debounce?(window.clearTimeout(this._debounced),this._debounced=window.setTimeout(function(){return e.validate()},this.options.debounce)):this.validate())},_resetUI:function(){this._failedOnce=!1,this._actualizeTriggers(),void 0!==this._ui&&(this._ui.$errorsWrapper.removeClass("filled").children().remove(),this._resetClass(),this._ui.lastValidationResult=[],this._ui.validationInformationVisible=!1)},_destroyUI:function(){this._resetUI(),void 0!==this._ui&&this._ui.$errorsWrapper.remove(),delete this._ui},_successClass:function(){this._ui.validationInformationVisible=!0,this._ui.$errorClassHandler.removeClass(this.options.errorClass).addClass(this.options.successClass)},_errorClass:function(){this._ui.validationInformationVisible=!0,this._ui.$errorClassHandler.removeClass(this.options.successClass).addClass(this.options.errorClass)},_resetClass:function(){this._ui.$errorClassHandler.removeClass(this.options.successClass).removeClass(this.options.errorClass)}};function y(t,e,i){this.__class__="Form",this.element=t,this.$element=h(t),this.domOptions=e,this.options=i,this.parent=window.Parsley,this.fields=[],this.validationResult=null}var _={pending:null,resolved:!0,rejected:!1};y.prototype={onSubmitValidate:function(t){var e=this;if(!0!==t.parsley){var i=this._submitSource||this.$element.find(d._SubmitSelector)[0];if(this._submitSource=null,this.$element.find(".parsley-synthetic-submit-button").prop("disabled",!0),!i||null===i.getAttribute("formnovalidate")){window.Parsley._remoteCache={};var r=this.whenValidate({event:t});"resolved"===r.state()&&!1!==this._trigger("submit")||(t.stopImmediatePropagation(),t.preventDefault(),"pending"===r.state()&&r.done(function(){e._submit(i)}))}}},onSubmitButton:function(t){this._submitSource=t.currentTarget},_submit:function(t){if(!1!==this._trigger("submit")){if(t){var e=this.$element.find(".parsley-synthetic-submit-button").prop("disabled",!1);0===e.length&&(e=h('<input class="parsley-synthetic-submit-button" type="hidden">').appendTo(this.$element)),e.attr({name:t.getAttribute("name"),value:t.getAttribute("value")})}this.$element.trigger(l(h.Event("submit"),{parsley:!0}))}},validate:function(t){if(1<=arguments.length&&!h.isPlainObject(t)){d.warnOnce("Calling validate on a parsley form without passing arguments as an object is deprecated.");var e=Array.prototype.slice.call(arguments);t={group:e[0],force:e[1],event:e[2]}}return _[this.whenValidate(t).state()]},whenValidate:function(t){var e,i=this,r=0<arguments.length&&void 0!==t?t:{},n=r.group,s=r.force,a=r.event;(this.submitEvent=a)&&(this.submitEvent=l({},a,{preventDefault:function(){d.warnOnce("Using `this.submitEvent.preventDefault()` is deprecated; instead, call `this.validationResult = false`"),i.validationResult=!1}})),this.validationResult=!0,this._trigger("validate"),this._refreshFields();var o=this._withoutReactualizingFormOptions(function(){return h.map(i.fields,function(t){return t.whenValidate({force:s,group:n})})});return(e=d.all(o).done(function(){i._trigger("success")}).fail(function(){i.validationResult=!1,i.focus(),i._trigger("error")}).always(function(){i._trigger("validated")})).pipe.apply(e,u(this._pipeAccordingToValidationResult()))},isValid:function(t){if(1<=arguments.length&&!h.isPlainObject(t)){d.warnOnce("Calling isValid on a parsley form without passing arguments as an object is deprecated.");var e=Array.prototype.slice.call(arguments);t={group:e[0],force:e[1]}}return _[this.whenValid(t).state()]},whenValid:function(t){var e=this,i=0<arguments.length&&void 0!==t?t:{},r=i.group,n=i.force;this._refreshFields();var s=this._withoutReactualizingFormOptions(function(){return h.map(e.fields,function(t){return t.whenValid({group:r,force:n})})});return d.all(s)},refresh:function(){return this._refreshFields(),this},reset:function(){for(var t=0;t<this.fields.length;t++)this.fields[t].reset();this._trigger("reset")},destroy:function(){this._destroyUI();for(var t=0;t<this.fields.length;t++)this.fields[t].destroy();this.$element.removeData("Parsley"),this._trigger("destroy")},_refreshFields:function(){return this.actualizeOptions()._bindFields()},_bindFields:function(){var n=this,t=this.fields;return this.fields=[],this.fieldsMappedById={},this._withoutReactualizingFormOptions(function(){n.$element.find(n.options.inputs).not(n.options.excluded).not("[".concat(n.options.namespace,"excluded=true]")).each(function(t,e){var i=new window.Parsley.Factory(e,{},n);if("Field"===i.__class__||"FieldMultiple"===i.__class__){var r=i.__class__+"-"+i.__id__;void 0===n.fieldsMappedById[r]&&(n.fieldsMappedById[r]=i,n.fields.push(i))}}),h.each(d.difference(t,n.fields),function(t,e){e.reset()})}),this},_withoutReactualizingFormOptions:function(t){var e=this.actualizeOptions;this.actualizeOptions=function(){return this};var i=t();return this.actualizeOptions=e,i},_trigger:function(t){return this.trigger("form:"+t)}};function b(t,e,i,r,n){var s=window.Parsley._validatorRegistry.validators[e],a=new c(s);l(this,{validator:a,name:e,requirements:i,priority:r=r||t.options[e+"Priority"]||a.priority,isDomConstraint:n=!0===n}),this._parseRequirements(t.options)}function w(t,e,i,r){this.__class__="Field",this.element=t,this.$element=h(t),void 0!==r&&(this.parent=r),this.options=i,this.domOptions=e,this.constraints=[],this.constraintsByName={},this.validationResult=!0,this._bindConstraints()}var F={pending:null,resolved:!0,rejected:!(b.prototype={validate:function(t,e){var i;return(i=this.validator).validate.apply(i,[t].concat(u(this.requirementList),[e]))},_parseRequirements:function(i){var r=this;this.requirementList=this.validator.parseRequirements(this.requirements,function(t){return i[r.name+((e=t)[0].toUpperCase()+e.slice(1))];var e})}})};w.prototype={validate:function(t){1<=arguments.length&&!h.isPlainObject(t)&&(d.warnOnce("Calling validate on a parsley field without passing arguments as an object is deprecated."),t={options:t});var e=this.whenValidate(t);if(!e)return!0;switch(e.state()){case"pending":return null;case"resolved":return!0;case"rejected":return this.validationResult}},whenValidate:function(t){var e,i=this,r=0<arguments.length&&void 0!==t?t:{},n=r.force,s=r.group;if(this.refresh(),!s||this._isInGroup(s))return this.value=this.getValue(),this._trigger("validate"),(e=this.whenValid({force:n,value:this.value,_refreshed:!0}).always(function(){i._reflowUI()}).done(function(){i._trigger("success")}).fail(function(){i._trigger("error")}).always(function(){i._trigger("validated")})).pipe.apply(e,u(this._pipeAccordingToValidationResult()))},hasConstraints:function(){return 0!==this.constraints.length},needsValidation:function(t){return void 0===t&&(t=this.getValue()),!(!t.length&&!this._isRequired()&&void 0===this.options.validateIfEmpty)},_isInGroup:function(t){return Array.isArray(this.options.group)?-1!==h.inArray(t,this.options.group):this.options.group===t},isValid:function(t){if(1<=arguments.length&&!h.isPlainObject(t)){d.warnOnce("Calling isValid on a parsley field without passing arguments as an object is deprecated.");var e=Array.prototype.slice.call(arguments);t={force:e[0],value:e[1]}}var i=this.whenValid(t);return!i||F[i.state()]},whenValid:function(t){var r=this,e=0<arguments.length&&void 0!==t?t:{},i=e.force,n=void 0!==i&&i,s=e.value,a=e.group;if(e._refreshed||this.refresh(),!a||this._isInGroup(a)){if(this.validationResult=!0,!this.hasConstraints())return h.when();if(null==s&&(s=this.getValue()),!this.needsValidation(s)&&!0!==n)return h.when();var o=this._getGroupedConstraints(),l=[];return h.each(o,function(t,e){var i=d.all(h.map(e,function(t){return r._validateConstraint(s,t)}));if(l.push(i),"rejected"===i.state())return!1}),d.all(l)}},_validateConstraint:function(t,e){var i=this,r=e.validate(t,this);return!1===r&&(r=h.Deferred().reject()),d.all([r]).fail(function(t){i.validationResult instanceof Array||(i.validationResult=[]),i.validationResult.push({assert:e,errorMessage:"string"==typeof t&&t})})},getValue:function(){var t;return null==(t="function"==typeof this.options.value?this.options.value(this):void 0!==this.options.value?this.options.value:this.$element.val())?"":this._handleWhitespace(t)},reset:function(){return this._resetUI(),this._trigger("reset")},destroy:function(){this._destroyUI(),this.$element.removeData("Parsley"),this.$element.removeData("FieldMultiple"),this._trigger("destroy")},refresh:function(){return this._refreshConstraints(),this},_refreshConstraints:function(){return this.actualizeOptions()._bindConstraints()},refreshConstraints:function(){return d.warnOnce("Parsley's refreshConstraints is deprecated. Please use refresh"),this.refresh()},addConstraint:function(t,e,i,r){if(window.Parsley._validatorRegistry.validators[t]){var n=new b(this,t,e,i,r);"undefined"!==this.constraintsByName[n.name]&&this.removeConstraint(n.name),this.constraints.push(n),this.constraintsByName[n.name]=n}return this},removeConstraint:function(t){for(var e=0;e<this.constraints.length;e++)if(t===this.constraints[e].name){this.constraints.splice(e,1);break}return delete this.constraintsByName[t],this},updateConstraint:function(t,e,i){return this.removeConstraint(t).addConstraint(t,e,i)},_bindConstraints:function(){for(var t=[],e={},i=0;i<this.constraints.length;i++)!1===this.constraints[i].isDomConstraint&&(t.push(this.constraints[i]),e[this.constraints[i].name]=this.constraints[i]);for(var r in this.constraints=t,this.constraintsByName=e,this.options)this.addConstraint(r,this.options[r],void 0,!0);return this._bindHtml5Constraints()},_bindHtml5Constraints:function(){null!==this.element.getAttribute("required")&&this.addConstraint("required",!0,void 0,!0),null!==this.element.getAttribute("pattern")&&this.addConstraint("pattern",this.element.getAttribute("pattern"),void 0,!0);var t=this.element.getAttribute("min"),e=this.element.getAttribute("max");null!==t&&null!==e?this.addConstraint("range",[t,e],void 0,!0):null!==t?this.addConstraint("min",t,void 0,!0):null!==e&&this.addConstraint("max",e,void 0,!0),null!==this.element.getAttribute("minlength")&&null!==this.element.getAttribute("maxlength")?this.addConstraint("length",[this.element.getAttribute("minlength"),this.element.getAttribute("maxlength")],void 0,!0):null!==this.element.getAttribute("minlength")?this.addConstraint("minlength",this.element.getAttribute("minlength"),void 0,!0):null!==this.element.getAttribute("maxlength")&&this.addConstraint("maxlength",this.element.getAttribute("maxlength"),void 0,!0);var i=d.getType(this.element);return"number"===i?this.addConstraint("type",["number",{step:this.element.getAttribute("step")||"1",base:t||this.element.getAttribute("value")}],void 0,!0):/^(email|url|range|date)$/i.test(i)?this.addConstraint("type",i,void 0,!0):this},_isRequired:function(){return void 0!==this.constraintsByName.required&&!1!==this.constraintsByName.required.requirements},_trigger:function(t){return this.trigger("field:"+t)},_handleWhitespace:function(t){return!0===this.options.trimValue&&d.warnOnce('data-parsley-trim-value="true" is deprecated, please use data-parsley-whitespace="trim"'),"squish"===this.options.whitespace&&(t=t.replace(/\s{2,}/g," ")),"trim"!==this.options.whitespace&&"squish"!==this.options.whitespace&&!0!==this.options.trimValue||(t=d.trimString(t)),t},_isDateInput:function(){var t=this.constraintsByName.type;return t&&"date"===t.requirements},_getGroupedConstraints:function(){if(!1===this.options.priorityEnabled)return[this.constraints];for(var t=[],e={},i=0;i<this.constraints.length;i++){var r=this.constraints[i].priority;e[r]||t.push(e[r]=[]),e[r].push(this.constraints[i])}return t.sort(function(t,e){return e[0].priority-t[0].priority}),t}};function C(){this.__class__="FieldMultiple"}C.prototype={addElement:function(t){return this.$elements.push(t),this},_refreshConstraints:function(){var t;if(this.constraints=[],"SELECT"===this.element.nodeName)return this.actualizeOptions()._bindConstraints(),this;for(var e=0;e<this.$elements.length;e++)if(h("html").has(this.$elements[e]).length){t=this.$elements[e].data("FieldMultiple")._refreshConstraints().constraints;for(var i=0;i<t.length;i++)this.addConstraint(t[i].name,t[i].requirements,t[i].priority,t[i].isDomConstraint)}else this.$elements.splice(e,1);return this},getValue:function(){if("function"==typeof this.options.value)return this.options.value(this);if(void 0!==this.options.value)return this.options.value;if("INPUT"===this.element.nodeName){var t=d.getType(this.element);if("radio"===t)return this._findRelated().filter(":checked").val()||"";if("checkbox"===t){var e=[];return this._findRelated().filter(":checked").each(function(){e.push(h(this).val())}),e}}return"SELECT"===this.element.nodeName&&null===this.$element.val()?[]:this.$element.val()},_init:function(){return this.$elements=[this.$element],this}};function A(t,e,i){this.element=t,this.$element=h(t);var r=this.$element.data("Parsley");if(r)return void 0!==i&&r.parent===window.Parsley&&(r.parent=i,r._resetOptions(r.options)),"object"===n(e)&&l(r.options,e),r;if(!this.$element.length)throw new Error("You must bind Parsley on an existing element.");if(void 0!==i&&"Form"!==i.__class__)throw new Error("Parent instance must be a Form instance");return this.parent=i||window.Parsley,this.init(e)}A.prototype={init:function(t){return this.__class__="Parsley",this.__version__="2.9.2",this.__id__=d.generateID(),this._resetOptions(t),"FORM"===this.element.nodeName||d.checkAttr(this.element,this.options.namespace,"validate")&&!this.$element.is(this.options.inputs)?this.bind("parsleyForm"):this.isMultiple()?this.handleMultiple():this.bind("parsleyField")},isMultiple:function(){var t=d.getType(this.element);return"radio"===t||"checkbox"===t||"SELECT"===this.element.nodeName&&null!==this.element.getAttribute("multiple")},handleMultiple:function(){var t,e,r=this;if(this.options.multiple=this.options.multiple||(t=this.element.getAttribute("name"))||this.element.getAttribute("id"),"SELECT"===this.element.nodeName&&null!==this.element.getAttribute("multiple"))return this.options.multiple=this.options.multiple||this.__id__,this.bind("parsleyFieldMultiple");if(!this.options.multiple)return d.warn("To be bound by Parsley, a radio, a checkbox and a multiple select input must have either a name or a multiple option.",this.$element),this;this.options.multiple=this.options.multiple.replace(/(:|\.|\[|\]|\{|\}|\$)/g,""),t&&h('input[name="'+t+'"]').each(function(t,e){var i=d.getType(e);"radio"!==i&&"checkbox"!==i||e.setAttribute(r.options.namespace+"multiple",r.options.multiple)});for(var i=this._findRelated(),n=0;n<i.length;n++)if(void 0!==(e=h(i.get(n)).data("Parsley"))){this.$element.data("FieldMultiple")||e.addElement(this.$element);break}return this.bind("parsleyField",!0),e||this.bind("parsleyFieldMultiple")},bind:function(t,e){var i;switch(t){case"parsleyForm":i=h.extend(new y(this.element,this.domOptions,this.options),new r,window.ParsleyExtend)._bindFields();break;case"parsleyField":i=h.extend(new w(this.element,this.domOptions,this.options,this.parent),new r,window.ParsleyExtend);break;case"parsleyFieldMultiple":i=h.extend(new w(this.element,this.domOptions,this.options,this.parent),new C,new r,window.ParsleyExtend)._init();break;default:throw new Error(t+"is not a supported Parsley type")}return this.options.multiple&&d.setAttr(this.element,this.options.namespace,"multiple",this.options.multiple),void 0!==e?this.$element.data("FieldMultiple",i):(this.$element.data("Parsley",i),i._actualizeTriggers(),i._trigger("init")),i}};var E=h.fn.jquery.split(".");if(parseInt(E[0])<=1&&parseInt(E[1])<8)throw"The loaded version of jQuery is too old. Please upgrade to 1.8.x or better.";E.forEach||d.warn("Parsley requires ES5 to run properly. Please include https://github.com/es-shims/es5-shim");var x=l(new r,{element:document,$element:h(document),actualizeOptions:null,_resetOptions:null,Factory:A,version:"2.9.2"});l(w.prototype,v.Field,r.prototype),l(y.prototype,v.Form,r.prototype),l(A.prototype,r.prototype),h.fn.parsley=h.fn.psly=function(t){if(1<this.length){var e=[];return this.each(function(){e.push(h(this).parsley(t))}),e}if(0!=this.length)return new A(this[0],t)},void 0===window.ParsleyExtend&&(window.ParsleyExtend={}),x.options=l(d.objectCreate(s),window.ParsleyConfig),window.ParsleyConfig=x.options,window.Parsley=window.psly=x,x.Utils=d,window.ParsleyUtils={},h.each(d,function(t,e){"function"==typeof e&&(window.ParsleyUtils[t]=function(){return d.warnOnce("Accessing `window.ParsleyUtils` is deprecated. Use `window.Parsley.Utils` instead."),d[t].apply(d,arguments)})});var $=window.Parsley._validatorRegistry=new a(window.ParsleyConfig.validators,window.ParsleyConfig.i18n);window.ParsleyValidator={},h.each("setLocale addCatalog addMessage addMessages getErrorMessage formatMessage addValidator updateValidator removeValidator hasValidator".split(" "),function(t,e){window.Parsley[e]=function(){return $[e].apply($,arguments)},window.ParsleyValidator[e]=function(){var t;return d.warnOnce("Accessing the method '".concat(e,"' through Validator is deprecated. Simply call 'window.Parsley.").concat(e,"(...)'")),(t=window.Parsley)[e].apply(t,arguments)}}),window.Parsley.UI=v,window.ParsleyUI={removeError:function(t,e,i){var r=!0!==i;return d.warnOnce("Accessing UI is deprecated. Call 'removeError' on the instance directly. Please comment in issue 1073 as to your need to call this method."),t.removeError(e,{updateClass:r})},getErrorsMessages:function(t){return d.warnOnce("Accessing UI is deprecated. Call 'getErrorsMessages' on the instance directly."),t.getErrorsMessages()}},h.each("addError updateError".split(" "),function(t,a){window.ParsleyUI[a]=function(t,e,i,r,n){var s=!0!==n;return d.warnOnce("Accessing UI is deprecated. Call '".concat(a,"' on the instance directly. Please comment in issue 1073 as to your need to call this method.")),t[a](e,{message:i,assert:r,updateClass:s})}}),!1!==window.ParsleyConfig.autoBind&&h(function(){h("[data-parsley-validate]").length&&h("[data-parsley-validate]").parsley()});function V(){d.warnOnce("Parsley's pubsub module is deprecated; use the 'on' and 'off' methods on parsley instances or window.Parsley")}var P=h({});function O(e,i){return e.parsleyAdaptedCallback||(e.parsleyAdaptedCallback=function(){var t=Array.prototype.slice.call(arguments,0);t.unshift(this),e.apply(i||P,t)}),e.parsleyAdaptedCallback}var T="parsley:";function M(t){return 0===t.lastIndexOf(T,0)?t.substr(T.length):t}return h.listen=function(t,e){var i;if(V(),"object"===n(arguments[1])&&"function"==typeof arguments[2]&&(i=arguments[1],e=arguments[2]),"function"!=typeof e)throw new Error("Wrong parameters");window.Parsley.on(M(t),O(e,i))},h.listenTo=function(t,e,i){if(V(),!(t instanceof w||t instanceof y))throw new Error("Must give Parsley instance");if("string"!=typeof e||"function"!=typeof i)throw new Error("Wrong parameters");t.on(M(e),O(i))},h.unsubscribe=function(t,e){if(V(),"string"!=typeof t||"function"!=typeof e)throw new Error("Wrong arguments");window.Parsley.off(M(t),e.parsleyAdaptedCallback)},h.unsubscribeTo=function(t,e){if(V(),!(t instanceof w||t instanceof y))throw new Error("Must give Parsley instance");t.off(M(e))},h.unsubscribeAll=function(e){V(),window.Parsley.off(M(e)),h("form,input,textarea,select").each(function(){var t=h(this).data("Parsley");t&&t.off(M(e))})},h.emit=function(t,e){V();var i=e instanceof w||e instanceof y,r=Array.prototype.slice.call(arguments,i?2:1);r.unshift(M(t)),i||(e=window.Parsley),e.trigger.apply(e,u(r))},h.extend(!0,x,{asyncValidators:{default:{fn:function(t){return 200<=t.status&&t.status<300},url:!1},reverse:{fn:function(t){return t.status<200||300<=t.status},url:!1}},addAsyncValidator:function(t,e,i,r){return x.asyncValidators[t]={fn:e,url:i||!1,options:r||{}},this}}),x.addValidator("remote",{requirementType:{"":"string",validator:"string",reverse:"boolean",options:"object"},validateString:function(t,e,i,r){var n,s,a={},o=i.validator||(!0===i.reverse?"reverse":"default");if(void 0===x.asyncValidators[o])throw new Error("Calling an undefined async validator: `"+o+"`");-1<(e=x.asyncValidators[o].url||e).indexOf("{value}")?e=e.replace("{value}",encodeURIComponent(t)):a[r.element.getAttribute("name")||r.element.getAttribute("id")]=t;var l=h.extend(!0,i.options||{},x.asyncValidators[o].options);n=h.extend(!0,{},{url:e,data:a,type:"GET"},l),r.trigger("field:ajaxoptions",r,n),s=h.param(n),void 0===x._remoteCache&&(x._remoteCache={});function u(){var t=x.asyncValidators[o].fn.call(r,d,e,i);return t=t||h.Deferred().reject(),h.when(t)}var d=x._remoteCache[s]=x._remoteCache[s]||h.ajax(n);return d.then(u,u)},priority:-1}),x.on("form:submit",function(){x._remoteCache={}}),r.prototype.addAsyncValidator=function(){return d.warnOnce("Accessing the method `addAsyncValidator` through an instance is deprecated. Simply call `Parsley.addAsyncValidator(...)`"),x.addAsyncValidator.apply(x,arguments)},x.addMessages("en",{defaultMessage:"This value seems to be invalid.",type:{email:"This value should be a valid email.",url:"This value should be a valid url.",number:"This value should be a valid number.",integer:"This value should be a valid integer.",digits:"This value should be digits.",alphanum:"This value should be alphanumeric."},notblank:"This value should not be blank.",required:"This value is required.",pattern:"This value seems to be invalid.",min:"This value should be greater than or equal to %s.",max:"This value should be lower than or equal to %s.",range:"This value should be between %s and %s.",minlength:"This value is too short. It should have %s characters or more.",maxlength:"This value is too long. It should have %s characters or fewer.",length:"This value length is invalid. It should be between %s and %s characters long.",mincheck:"You must select at least %s choices.",maxcheck:"You must select %s choices or fewer.",check:"You must select between %s and %s choices.",equalto:"This value should be the same.",euvatin:"It's not a valid VAT Identification Number."}),x.setLocale("en"),(new function(){var r=this,n=window||global;l(this,{isNativeEvent:function(t){return t.originalEvent&&!1!==t.originalEvent.isTrusted},fakeInputEvent:function(t){r.isNativeEvent(t)&&h(t.target).trigger("input")},misbehaves:function(t){r.isNativeEvent(t)&&(r.behavesOk(t),h(document).on("change.inputevent",t.data.selector,r.fakeInputEvent),r.fakeInputEvent(t))},behavesOk:function(t){r.isNativeEvent(t)&&h(document).off("input.inputevent",t.data.selector,r.behavesOk).off("change.inputevent",t.data.selector,r.misbehaves)},install:function(){if(!n.inputEventPatched){n.inputEventPatched="0.0.3";for(var t=0,e=["select",'input[type="checkbox"]','input[type="radio"]','input[type="file"]'];t<e.length;t++){var i=e[t];h(document).on("input.inputevent",i,{selector:i},r.behavesOk).on("change.inputevent",i,{selector:i},r.misbehaves)}}},uninstall:function(){delete n.inputEventPatched,h(document).off(".inputevent")}})}).install(),x});
+//# sourceMappingURL=parsley.min.js.map
diff --git a/resources/custom.css b/resources/custom.css
index 87b1a4c7..a648f115 100644
--- a/resources/custom.css
+++ b/resources/custom.css
@@ -1893,4 +1893,18 @@ tfoot > tr {
 
 .overflow-auto {
   overflow: auto;
+}
+
+.parsley-errors-list {
+  list-style: none;
+  padding: 0px;
+  color: #f44336;
+}
+
+.form-control {
+  padding-top: 15px;
+}
+
+.bootstrap-select {
+  margin-top: -12px;
 }
\ No newline at end of file
diff --git a/resources/views/admin/update.blade.php b/resources/views/admin/update.blade.php
index 688b9a3b..12f73261 100644
--- a/resources/views/admin/update.blade.php
+++ b/resources/views/admin/update.blade.php
@@ -16,6 +16,9 @@
                     </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>Plusieurs fonctionnalité sont <strong>DÉSACTIVÉ</strong> le temps de les moderniser
+                    </div>
                     <div class="row">
                         <div class="col-md-6">
                             <p>
@@ -41,16 +44,6 @@
                                         </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 d'un lien avec Google Drive
-                                        </div>
-                                    </div>
-                                </li>
                                 <li class="list-group-item">
                                     <div class="row">
                                         <div class="text-success" style="font-size: 1.3rem;width: 1.5rem">
diff --git a/resources/views/admin/user/add.blade.php b/resources/views/admin/user/add.blade.php
index e248c72d..db266d80 100644
--- a/resources/views/admin/user/add.blade.php
+++ b/resources/views/admin/user/add.blade.php
@@ -1,140 +1,144 @@
 @extends('layouts.admin.main')
 
 @section('content')
-<div class="col-md-12">
-    <div class="card">
-        <div class="card-header">
-            <strong class="card-title">Ajouter un utilisateur <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
-            </a></strong>
-        </div>
-        <div class="card-body">
-            <form action="/admin/user/add" method="post">
-                @csrf
-                <div class="row">
-                    <div class="col-6">
-                        <div class="form-group">
-                            <label for="firstname">Prénom</label>
-                            <input type="text" class="form-control" name="firstname" id="firstname" aria-describedby="helpId" placeholder="John" required>
-                            <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>  
-                    </div>
-                    <div class="col-6">
-                        <div class="form-group">
-                            <label for="lastname">Nom de famille</label>
-                            <input type="text" class="form-control" name="lastname" id="lastname" aria-describedby="helpId" placeholder="Doe" required>
-                            <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>  
-                    </div>
-                </div>
-                <div class="alert alert-warning" id="email_alert" role="alert" style="display:none;">
-                    Les adresses email doivent être identique
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <div class="form-group">
-                            <label for="email">Email</label>
-                            <input type="email" class="form-control" name="email" id="email" aria-describedby="emailHelp" placeholder="exemple@c-cms.cf" onkeyup="checkEmail()" required>
-                            <small id="emailHelp" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+    <div class="col-md-12">
+        <div class="card">
+            <div class="card-header">
+                <strong class="card-title">Ajouter un utilisateur <a href="#"><i class="fa fa-question-circle"
+                                                                                 aria-hidden="true"></i>
+                    </a></strong>
+            </div>
+            <div class="card-body">
+                <form id="form" action="/admin/user/add" method="post">
+                    @csrf
+                    <div class="row">
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="firstname">Prénom</label>
+                                <input type="text" class="form-control" name="firstname" id="firstname"
+                                       aria-describedby="helpId" placeholder="John" required>
+                            </div>
+                        </div>
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="lastname">Nom de famille</label>
+                                <input type="text" class="form-control" name="lastname" id="lastname"
+                                       aria-describedby="helpId" placeholder="Doe" required>
+                            </div>
                         </div>
                     </div>
-                    <div class="col-6">
-                        <div class="form-group">
-                            <label for="email">Confirmer l'addresse email</label>
-                            <input type="email" class="form-control" name="emailc" id="emailc" aria-describedby="emailHelp" placeholder="exemple@c-cms.cf" onkeyup="checkEmail()" required>
-                            <small id="emailHelp" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+                    <div class="alert alert-warning" id="email_alert" role="alert" style="display:none;">
+                        Les adresses email doivent être identique
+                    </div>
+                    <div class="row">
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="email">Email</label>
+                                <input type="email" class="form-control" name="email" id="email"
+                                       aria-describedby="emailHelp" placeholder="exemple@exvps.ca" required>
+                            </div>
+                        </div>
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="email">Confirmer l'addresse email</label>
+                                <input type="email" class="form-control" name="emailc" id="emailc"
+                                       aria-describedby="emailHelp" placeholder="exemple@exvps.ca"
+                                       data-parsley-equalto="#email" required
+                                       data-parsley-error-message="Les emails ne sont pas identique">
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <div class="form-group">
-                          <label for="adresse">Adresse</label>
-                          <input type="text" class="form-control" name="adresse" id="adresse" aria-describedby="helpId" placeholder="14 ave Des Rue, Rimouski">
-                          <small id="helpId" class="form-text text-muted"></small>
+                    <div class="row">
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="adresse">Adresse</label>
+                                <input type="text" class="form-control" name="adresse" id="adresse"
+                                       aria-describedby="helpId" placeholder="14 ave Des Rue, Rimouski">
+                                <small id="helpId" class="form-text text-muted"></small>
+                            </div>
+                        </div>
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="telephone">Telephone</label>
+                                <input type="tel"
+                                       class="form-control" name="telephone" id="telephone" aria-describedby="helpId"
+                                       placeholder="213-546-5401" pattern="([0-9]{3}-[0-9]{3}-[0-9]{4})*"
+                                       data-parsley-error-message="Le numéro de téléphone est invalide">
+                            </div>
                         </div>
                     </div>
-                    <div class="col-6">
-                        <div class="form-group">
-                          <label for="telephone">Telephone</label>
-                          <input type="tel"
-                            class="form-control" name="telephone" id="telephone" aria-describedby="helpId" placeholder="(XXX) XXX-XXXX">
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-info">Si vous souhaiter recevoir des notifications par SMS</span></small>
+                    <div class="row mb-4">
+                        <div class="col-3">
+                            <div class="form-group">
+                                <label for="sexe">Sexe</label>
+                                <select class="form-control selectpicker" data-style="btn btn-link" name="sexe"
+                                        id="sexe" required>
+                                    <option value="m">Homme</option>
+                                    <option value="f">Femme</option>
+                                    <option value="a">Autre</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-3">
+                            <div class="form-group" style="margin-top: 26px;">
+                                <label for="age" style="margin-top: -7px;">Age</label>
+                                <input type="number" class="form-control" name="age" id="age" aria-describedby="helpId"
+                                       placeholder="Age" min="0" max="100" style="padding-top: 17px;">
+                                <small id="helpId" class="form-text text-muted"></small>
+                            </div>
+                        </div>
+                        <div class="col-3">
+                            <div class="form-group">
+                                <label for="rank">Grade</label>
+                                <select class="form-control selectpicker" data-style="btn btn-link" name="rank"
+                                        id="rank" required>
+                                    @foreach ($RankList as $rank)
+                                        <option value="{{$rank->id}}">{{$rank->name}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-3">
+                            <div class="form-group">
+                                <label for="job">Poste</label>
+                                <select class="form-control selectpicker" data-style="btn btn-link" name="job" id="job"
+                                        required>
+                                    @foreach ($JobsList as $job)
+                                        <option value="{{$job->id}}">{{$job->name}}</option>
+                                    @endforeach
+                                </select>
+                            </div>
                         </div>
                     </div>
-                </div>
-                <div class="row">
-                    <div class="col-3">
-                        <div class="form-group">
-                          <label for="sexe">Sexe</label>
-                          <select class="form-control" name="sexe" id="sexe" required>
-                            <option value="m">Homme</option>
-                            <option value="f">Femme</option>
-                            <option value="a">Autre</option>
-                          </select>
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+                    <div class="alert alert-warning" id="psw_alert" role="alert" style="display:none;">
+                        Les mot de passe doivent être identique
+                    </div>
+                    <div class="row">
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="psw">Mot de passe</label>
+                                <input type="password" class="form-control" name="psw" id="psw"
+                                       placeholder="Supermotdepasse" data-parsley-password required>
+                            </div>
+                        </div>
+                        <div class="col-6">
+                            <div class="form-group">
+                                <label for="pswc">Confirmer le mot de passe</label>
+                                <input type="password" class="form-control" name="pswc" id="pswc"
+                                       placeholder="Supermotdepasse" data-parsley-equalto="#psw"
+                                       data-parsley-error-message="Les mot de passe ne sont pas identique" required>
+                            </div>
                         </div>
                     </div>
-                    <div class="col-3">
-                        <div class="form-group">
-                          <label for="age">Age</label>
-                          <input type="number" class="form-control" name="age" id="age" aria-describedby="helpId" placeholder="Age" min="0" max="100">
-                          <small id="helpId" class="form-text text-muted"></small>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div class="form-group">
-                          <label for="rank">Grade</label>
-                          <select class="form-control" name="rank" id="rank" required>
-                            @foreach ($RankList as $rank)
-                                <option value="{{$rank->id}}">{{$rank->name}}</option>                                   
-                            @endforeach    
-                          </select>
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>    
-                    </div>
-                    <div class="col-3">
-                        <div class="form-group">
-                        <label for="job">Poste</label>
-                        <select class="form-control" name="job" id="job" required>
-                            @foreach ($JobsList as $job)
-                                <option value="{{$job->id}}">{{$job->name}}</option>                                   
-                            @endforeach    
-                        </select>
-                        <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-                <div class="alert alert-warning" id="psw_alert" role="alert" style="display:none;">
-                    Les mot de passe doivent être identique
-                </div>
-                <div class="row">
-                    <div class="col-6">
-                        <div class="form-group">
-                          <label for="psw">Mot de passe</label>
-                          <input type="password" class="form-control" name="psw" id="psw" placeholder="Supermotdepasse" onkeyup="checkPassword()">
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>
-                    </div>
-                    <div class="col-6">
-                        <div class="form-group">
-                          <label for="pswc">Confirmer le mot de passe</label>
-                          <input type="password" class="form-control" name="pswc" id="pswc" placeholder="Supermotdepasse" onkeyup="checkPassword()">
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>
-                    </div>
-                </div>
-                <button type="submit" id="submit" class="btn btn-primary">Submit</button>
-            </form>
+                    <button type="submit" id="submit" class="btn btn-primary">Submit</button>
+                </form>
+            </div>
         </div>
     </div>
-</div>
-@endsection
-
-@section('breadcrumb')
-    Utilisateur / Ajouter
 @endsection
 
 @section('custom_scripts')
-<script src="/assets/admin/assets/js/user.js"></script>
+    <script>
+        $('#form').parsley();
+    </script>
 @endsection
diff --git a/resources/views/admin/user/edit.blade.php b/resources/views/admin/user/edit.blade.php
index bb153d63..31ee2fca 100644
--- a/resources/views/admin/user/edit.blade.php
+++ b/resources/views/admin/user/edit.blade.php
@@ -14,125 +14,112 @@
                     <div class="col-6">
                         <div class="form-group">
                             <label for="firstname">Prénom</label>
-                            <input type="text" class="form-control" name="firstname" id="firstname" aria-describedby="helpId" placeholder="John" required value={{$user->firstname}}>
-                            <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>  
+                            <input type="text" class="form-control" name="firstname" id="firstname"
+                                   aria-describedby="helpId" placeholder="John" required value="{{$user->firstname}}">
+                        </div>
                     </div>
                     <div class="col-6">
                         <div class="form-group">
                             <label for="lastname">Nom de famille</label>
-                            <input type="text" class="form-control" name="lastname" id="lastname" aria-describedby="helpId" placeholder="Doe" required value={{$user->lastname}}>
-                            <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>  
+                            <input type="text" class="form-control" name="lastname" id="lastname"
+                                   aria-describedby="helpId" placeholder="Doe" required value="{{$user->lastname}}">
+                        </div>
                     </div>
                 </div>
-                <div class="alert alert-warning" id="email_alert" role="alert" style="display:none;">
-                    Les adresses email doivent être identique
-                </div>
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group">
                             <label for="email">Email</label>
-                            <input type="email" class="form-control" name="email" id="email" aria-describedby="emailHelp" placeholder="exemple@c-cms.cf" onkeyup="checkEmail()" required value={{$user->email}}>
-                            <small id="emailHelp" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+                            <input type="email" class="form-control" name="email" id="email"
+                                   aria-describedby="emailHelp" placeholder="exemple@exvps.ca" value="{{$user->email}}" required>
                         </div>
                     </div>
                     <div class="col-6">
                         <div class="form-group">
                             <label for="email">Confirmer l'addresse email</label>
-                            <input type="email" class="form-control" name="emailc" id="emailc" aria-describedby="emailHelp" placeholder="exemple@c-cms.cf" onkeyup="checkEmail()" required value={{$user->email}}>
-                            <small id="emailHelp" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+                            <input type="email" class="form-control" name="emailc" id="emailc"
+                                   aria-describedby="emailHelp" placeholder="exemple@exvps.ca"
+                                   data-parsley-equalto="#email" required
+                                   data-parsley-error-message="Les emails ne sont pas identique" value="{{$user->email}}">
                         </div>
                     </div>
                 </div>
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group">
-                          <label for="adresse">Adresse</label>
-                          <input type="text" class="form-control" name="adresse" id="adresse" aria-describedby="helpId" placeholder="14 ave Des Rue, Rimouski" value={{$user->adress}}>
-                          <small id="helpId" class="form-text text-muted"></small>
+                            <label for="adresse">Adresse</label>
+                            <input type="text" class="form-control" name="adresse" id="adresse"
+                                   aria-describedby="helpId" placeholder="14 ave Des Rue, Rimouski" value="{{$user->adress}}">
+                            <small id="helpId" class="form-text text-muted"></small>
                         </div>
                     </div>
                     <div class="col-6">
                         <div class="form-group">
-                          <label for="telephone">Telephone</label>
-                          <input type="tel"
-                            class="form-control" name="telephone" id="telephone" aria-describedby="helpId" placeholder="(XXX) XXX-XXXX" value={{$user->telephone}}>
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-info">Si vous souhaiter recevoir des notifications par SMS</span></small>
+                            <label for="telephone">Telephone</label>
+                            <input type="tel"
+                                   class="form-control" name="telephone" id="telephone" aria-describedby="helpId"
+                                   placeholder="213-546-5401" pattern="([0-9]{3}-[0-9]{3}-[0-9]{4})*"
+                                   data-parsley-error-message="Le numéro de téléphone est invalide" value="{{$user->telephone}}">
+                        </div>
+                    </div>
+                </div>
+                <div class="row mb-4">
+                    <div class="col-3">
+                        <div class="form-group">
+                            <label for="sexe">Sexe</label>
+                            <select class="form-control selectpicker" data-style="btn btn-link" name="sexe"
+                                    id="sexe" required>
+                                <option value="m" @if($user->sexe == 'm') selected @endif >Homme</option>
+                                <option value="f" @if($user->sexe == 'm') selected @endif >Femme</option>
+                                <option value="a" @if($user->sexe == 'm') selected @endif >Autre</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group" style="margin-top: 26px;">
+                            <label for="age" style="margin-top: -7px;">Age</label>
+                            <input type="number" class="form-control" name="age" id="age" aria-describedby="helpId"
+                                   placeholder="Age" min="0" max="100" style="padding-top: 17px;">
+                            <small id="helpId" class="form-text text-muted"></small>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <label for="rank">Grade</label>
+                            <select class="form-control selectpicker" data-style="btn btn-link" name="rank"
+                                    id="rank" required>
+                                @foreach ($RankList as $rank)
+                                    <option value="{{$rank->id}}" @if($user->rank_id == $rank->id) selected @endif >{{$rank->name}}</option>
+                                @endforeach
+                            </select>
+                        </div>
+                    </div>
+                    <div class="col-3">
+                        <div class="form-group">
+                            <label for="job">Poste</label>
+                            <select class="form-control selectpicker" data-style="btn btn-link" name="job" id="job"
+                                    required>
+                                @foreach ($JobsList as $job)
+                                    <option value="{{$job->id}}" @if($user->job_id == $job->id) selected @endif>{{$job->name}}</option>
+                                @endforeach
+                            </select>
                         </div>
                     </div>
                 </div>
-                <div class="row">
-                    <div class="col-3">
-                        <div class="form-group">
-                          <label for="sexe">Sexe</label>
-                          <select class="form-control" name="sexe" id="sexe" required>
-                            @switch($user->sexe)
-                                @case("m")
-                                    <option value="m">Homme</option>
-                                    @break
-                                @case("f")
-                                    <option value="f">Femme</option>                                    
-                                    @break
-                                @default
-                                    <option value="a">Autre</option>                                    
-                            @endswitch
-                            <option value="m">Homme</option>
-                            <option value="f">Femme</option>
-                            <option value="a">Autre</option>
-                          </select>
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div class="form-group">
-                          <label for="age">Age</label>
-                        <input type="number" class="form-control" name="age" id="age" aria-describedby="helpId" placeholder="Age" min="0" max="100" value={{$user->age}}>
-                          <small id="helpId" class="form-text text-muted"></small>
-                        </div>
-                    </div>
-                    <div class="col-3">
-                        <div class="form-group">
-                          <label for="rank">Grade</label>
-                          <select class="form-control" name="rank" id="rank" required>
-                            <option value={{$user->rank->id}}>{{$user->rank->name}}</option>
-                            @foreach ($RankList as $rank)
-                                <option value="{{$rank->id}}">{{$rank->name}}</option>                                   
-                            @endforeach    
-                          </select>
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>    
-                    </div>
-                    <div class="col-3">
-                        <div class="form-group">
-                        <label for="job">Poste</label>
-                        <select class="form-control" name="job" id="job" required>
-                            <option value={{$user->job->id}}>{{$user->job->name}}</option>
-                            @foreach ($JobsList as $job)
-                                <option value="{{$job->id}}">{{$job->name}}</option>                                   
-                            @endforeach    
-                        </select>
-                        <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
-                        </div>
-                    </div>
-                </div>
-                <hr>
-                <div class="alert alert-warning" id="psw_alert" role="alert" style="display:none;">
-                    Les mot de passe doivent être identique
-                </div>
                 <div class="row">
                     <div class="col-6">
                         <div class="form-group">
-                          <label for="psw">Mot de passe</label>
-                          <input type="password" class="form-control" name="psw" id="psw" placeholder="Supermotdepasse" onkeyup="checkPassword()">
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+                            <label for="psw">Mot de passe</label>
+                            <input type="password" class="form-control" name="psw" id="psw"
+                                   placeholder="Supermotdepasse" data-parsley-password>
                         </div>
                     </div>
                     <div class="col-6">
                         <div class="form-group">
-                          <label for="pswc">Confirmer le mot de passe</label>
-                          <input type="password" class="form-control" name="pswc" id="pswc" placeholder="Supermotdepasse" onkeyup="checkPassword()">
-                          <small id="helpId" class="form-text text-muted"><span class="badge badge-warning">Requis</span></small>
+                            <label for="pswc">Confirmer le mot de passe</label>
+                            <input type="password" class="form-control" name="pswc" id="pswc"
+                                   placeholder="Supermotdepasse" data-parsley-equalto="#psw"
+                                   data-parsley-error-message="Les mot de passe ne sont pas identique">
                         </div>
                     </div>
                 </div>
@@ -143,10 +130,8 @@
 </div>
 @endsection
 
-@section('breadcrumb')
-    Utilisateur / Modifier
-@endsection
-
 @section('custom_scripts')
-<script src="/assets/admin/assets/js/user.js"></script>
+    <script>
+        $('#form').parsley();
+    </script>
 @endsection
diff --git a/resources/views/admin/user/profil/setup.blade.php b/resources/views/admin/user/profil/setup.blade.php
new file mode 100644
index 00000000..ac0ba86b
--- /dev/null
+++ b/resources/views/admin/user/profil/setup.blade.php
@@ -0,0 +1,103 @@
+@extends('layouts.admin.main')
+
+@section('content')
+    <div class="col-md-8 col-12 mr-auto ml-auto">
+        <!--      Wizard container        -->
+        <div class="wizard-container">
+            <div class="card card-wizard active" data-color="primary">
+                <form id="form" action="/admin/setup" method="post" data-parsley-validate novalidate>
+                    <div class="card-header text-center">
+                        <h3 class="card-title">
+                            Bienvenue {{ Auth::user()->fullname() }},
+                        </h3>
+                        <h5 class="card-description">Avant de pouvoir continer vous devez répondre a quelques
+                            questions</h5>
+                    </div>
+                    <div class="card-body">
+                        <h5>Renseignement personnel</h5>
+                        @csrf
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="">Nom <sup class="text-danger">*</sup></label>
+                                    <input type="text" class="form-control" name="lastname"
+                                           value="{{Auth::user()->lastname}}" id="" aria-describedby="helpId" required
+                                           placeholder="Doe">
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="">Prenom <sup class="text-danger">*</sup></label>
+                                    <input type="text" class="form-control" name="firstname" id=""
+                                           value="{{Auth::user()->firstname}}" aria-describedby="helpId"
+                                           placeholder="John" required>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="">Adresse</label>
+                                    <input type="text" class="form-control" name="address" id=""
+                                           value="{{Auth::user()->adress}}" aria-describedby="helpId"
+                                           placeholder="16 ave DesRoche, Montréal, QC G0L 1B0">
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="">Téléphone</label>
+                                    <input type="tel" class="form-control" name="telephone" id=""
+                                           value="{{Auth::user()->telephone}}" aria-describedby="helpId"
+                                           placeholder="213-546-5401" pattern="([0-9]{3}-[0-9]{3}-[0-9]{4})*"
+                                           data-parsley-error-message="Le numéro de téléphone est invalide">
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="">Sexe</label>
+                                    <select class="form-control selectpicker" data-style="btn btn-link" name="sexe" id="">
+                                        <option @if(Auth::user()->sexe == 'm') selected @endif value="m">Homme</option>
+                                        <option @if(Auth::user()->sexe == 'f') selected @endif value="f">Femme</option>
+                                        <option @if(Auth::user()->sexe == 'a') selected @endif value="a">Autre</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
+                        <h5 class="mt-5">Sécurité</h5>
+                        <div class="row">
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="psw">Nouveau mot de passe <sup class="text-danger">*</sup></label>
+                                    <input type="password" class="form-control" name="psw" id="psw"
+                                           aria-describedby="helpId" placeholder="" data-parsley-password required>
+                                </div>
+                            </div>
+                            <div class="col-md-6">
+                                <div class="form-group">
+                                    <label for="psw">Confimer le nouveau mot de passe <sup class="text-danger">*</sup></label>
+                                    <input type="password" class="form-control" name="psw" id="psw"
+                                           aria-describedby="helpId" placeholder="" data-parsley-equalto="#psw" required
+                                           data-parsley-error-message="Les mot de passe ne sont pas identique">
+                                </div>
+                            </div>
+                            <div class="col-12">
+                                <sup class="text-danger">*</sup> <small>Champ requis</small>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="card-footer">
+                        <input type="submit" class="btn btn-primary btn-block" value="Continuer">
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('breadcrumb')
+    Dashboard
+@endsection
+
+@section('scripts')
+    <script>
+        $('#form').parsley();
+    </script>
+@endsection
diff --git a/resources/views/layouts/admin/scripts.blade.php b/resources/views/layouts/admin/scripts.blade.php
index ef95422a..3c346539 100644
--- a/resources/views/layouts/admin/scripts.blade.php
+++ b/resources/views/layouts/admin/scripts.blade.php
@@ -29,6 +29,9 @@
 <script src="/js/plugins/Chart.min.js"></script>
 <!--  Notifications Plugin    -->
 <script src="/js/plugins/bootstrap-notify.js"></script>
+<!-- Parsley Plugin -->
+<script src="/js/plugins/parsley.min.js"></script>
+<script src="/js/plugins/parsley-extra.min.js"></script>
 
 <script src="/js/plugins/trumbowyg/trumbowyg.min.js"></script>
 <script src="/js/plugins/trumbowyg/langs/fr.js"></script>
diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php
index 3451aa8c..a97a4334 100644
--- a/routes/breadcrumbs.php
+++ b/routes/breadcrumbs.php
@@ -13,6 +13,12 @@ Breadcrumbs::for('admin.dashboard', function ($trail) {
     $trail->push('Dashboard', route('admin.dashboard'));
 });
 
+// Admin > Setup
+Breadcrumbs::for('admin.setup', function ($trail) {
+    $trail->parent('admin.dashboard');
+    $trail->push('Configuration initiale', route('admin.setup'));
+});
+
 // Admin > Update
 Breadcrumbs::for('admin.update', function ($trail) {
     $trail->parent('admin.dashboard');
@@ -64,7 +70,7 @@ Breadcrumbs::for('admin.user', function ($trail, $id) {
 
 // Admin > User > Add
 Breadcrumbs::for('admin.user.add', function ($trail) {
-    $trail->parent('admin.user');
+    $trail->parent('admin.users');
     $trail->push('Ajouter un utilisateur', route('admin.user.add'));
 });
 
diff --git a/routes/web.php b/routes/web.php
index 4509141b..9e19820b 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -1,7 +1,9 @@
 <?php
+
 use \App\Notifications\sms;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Storage;
+
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -16,8 +18,7 @@ use Illuminate\Support\Facades\Storage;
 /* Basic Auth Route */
 Auth::routes();
 Route::get('logout', 'Auth\LoginController@logout')->name('logout');
-Route::get('/ocom/create','OCOMController@updateOCOMDB');
-
+Route::get('/ocom/create', 'OCOMController@updateOCOMDB');
 
 
 /** Public Route */
@@ -29,187 +30,191 @@ Route::get('/activity/{id}', 'ComplementaryActivityController@show');
 Route::get('/picture/{id}', 'PictureController@show');
 Route::get('/pictures', 'PictureController@index');
 
-Route::get('/file/get','GoogleDriveController@getFile')->middleware('fileperm:file,r');
-@
-Route::middleware(['auth'])->name('admin.')->group(function () {
+Route::get('/file/get', 'GoogleDriveController@getFile')->middleware('fileperm:file,r');
+
+/** Setup */
+Route::get('/admin/setup', 'AdminController@setup')->middleware('auth')->name('admin.setup');
+Route::post('/admin/setup', 'AdminController@saveSetup')->middleware('auth');
+
+Route::middleware(['auth', 'firstlogin'])->name('admin.')->group(function () {
 
     /* Espace Administration Route */
 
-        /** Dashboard & General */
-        Route::get('/admin', 'AdminController@index')->name('dashboard');
-        Route::get('/admin/update', 'AdminController@update')->name('update');
-        Route::get('/admin/status','AdminController@status')->name('status');
+    /** Dashboard & General */
+    Route::get('/admin', 'AdminController@index')->name('dashboard');
+    Route::get('/admin/update', 'AdminController@update')->name('update');
+    Route::get('/admin/status', 'AdminController@status')->name('status');
 
-        /** Schedule */
-        Route::get('/admin/schedule', 'CalendarController@index')->middleware('perm:schedule_see')->name('schedule');
-        Route::get('/admin/schedule/pdf/event/{id}','ScheduleController@printtopdf')->middleware('perm:schedule_see')->name('schedule.pdf');
-        Route::get('/admin/schedule/add/{date}','ScheduleController@create')->middleware('perm:schedule_add')->name('schedule.add');
-        Route::get('/admin/schedule/edit/{id}','EventController@edit')->middleware('perm:schedule_edit')->name('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')->middleware('perm:stats_see')->name('stats.log');
-        Route::get('/admin/stats/instruction' , 'StatsController@instruction')->middleware('perm:stats_see')->name('stats.instruction');
+    /** Schedule */
+    Route::get('/admin/schedule', 'CalendarController@index')->middleware('perm:schedule_see')->name('schedule');
+    Route::get('/admin/schedule/pdf/event/{id}', 'ScheduleController@printtopdf')->middleware('perm:schedule_see')->name('schedule.pdf');
+    Route::get('/admin/schedule/add/{date}', 'ScheduleController@create')->middleware('perm:schedule_add')->name('schedule.add');
+    Route::get('/admin/schedule/edit/{id}', 'EventController@edit')->middleware('perm:schedule_edit')->name('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');
 
-        /** Message */
-        Route::get('/admin/message' , 'MessageController@index')->middleware('perm:msg_see')->name('message');
-        Route::get('/admin/message/add' , 'MessageController@create')->middleware('perm:msg_add')->name('message.add');
-        Route::post('/admin/message/add' , 'MessageController@store')->middleware('perm:msg_add');
-        Route::get('/admin/message/{id}', ['uses' =>'MessageController@show'])->middleware('perm:msg_see')->name('message.show');
+    /** Statistique */
+    Route::get('/admin/stats/log', 'LogController@index')->middleware('perm:stats_see')->name('stats.log');
+    Route::get('/admin/stats/instruction', 'StatsController@instruction')->middleware('perm:stats_see')->name('stats.instruction');
 
-        /** User */
-        Route::get('/admin/user' , 'UserController@index')->middleware('perm:user_see')->name('users');
-        Route::get('/admin/user/{id}' , 'UserController@show')->middleware('perm:user_see')->name('user');
-        Route::get('/admin/user/{id}/course','UserController@showCourses')->name('user.courses');
-        Route::get('/admin/user/add' , 'UserController@create')->middleware('perm:user_add')->name('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')->name('user.edit');
-        Route::post('/admin/user/edit/{id}' , 'UserController@update')->middleware('perm:user_edit');
+    /** Message */
+    Route::get('/admin/message', 'MessageController@index')->middleware('perm:msg_see')->name('message');
+    Route::get('/admin/message/add', 'MessageController@create')->middleware('perm:msg_add')->name('message.add');
+    Route::post('/admin/message/add', 'MessageController@store')->middleware('perm:msg_add');
+    Route::get('/admin/message/{id}', ['uses' => 'MessageController@show'])->middleware('perm:msg_see')->name('message.show');
 
-        /** Config */
-        Route::get('/admin/config/instruction', 'ScheduleController@index')->middleware('perm:config_edit')->name('config.schedule');
-        Route::get('/admin/config/instruction/event_type/create', 'EventTypeController@create')->middleware('perm:config_edit')->name('config.schedule.event_type.create');
-        Route::post('/admin/config/instruction/event_type/create', 'EventTypeController@store')->middleware('perm:config_edit');
-        Route::get('/admin/config/instruction/event_type/{id}', 'EventTypeController@show')->middleware('perm:config_edit')->name('config.schedule.event_type');
-        Route::patch('/admin/config/instruction/event_type/{id}', 'EventTypeController@update')->middleware('perm:config_edit');
-        Route::patch('/admin/config/instruction' , 'ScheduleController@update')->middleware('perm:config_edit');
-        Route::get('/admin/config/activity' , 'ComplementaryActivityController@index')->middleware('perm:config_edit')->name('config.complementary-activity');
-        Route::get('/admin/config/activity/add' , 'ComplementaryActivityController@create')->middleware('perm:config_edit')->name('config.complementary-activity.add');
-        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')->name('config.complementary-activity.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')->name('config.general');
-        Route::get('/admin/config/customisation','ConfigController@customisation')->middleware('perm:config_edit')->name('config.customisation');
-        Route::post('/admin/config/customisation','ConfigController@customisationUpdate')->middleware('perm:config_edit');
+    /** User */
+    Route::get('/admin/user', 'UserController@index')->middleware('perm:user_see')->name('users');
+    Route::get('/admin/user/add', 'UserController@create')->middleware('perm:user_add')->name('user.add');
+    Route::post('/admin/user/add', 'UserController@store')->middleware('perm:user_add');
+    Route::get('/admin/user/{id}', 'UserController@show')->middleware('perm:user_see')->name('user');
+    Route::get('/admin/user/{id}/course', 'UserController@showCourses')->name('user.courses');
+    Route::get('/admin/user/edit/{id}', 'UserController@edit')->middleware('perm:user_edit')->name('user.edit');
+    Route::post('/admin/user/edit/{id}', 'UserController@update')->middleware('perm:user_edit');
 
-        Route::get('/admin/config/ranks','RankController@index')->middleware('perm:config_edit')->name('config.rank');
-        Route::get('/admin/config/ranks/add','RankController@create')->middleware('perm:config_edit')->name('config.rank.add');
-        Route::post('/admin/config/ranks/add','RankController@store')->middleware('perm:config_edit');
-        Route::get('/admin/config/ranks/{id}','RankController@show')->middleware('perm:config_edit')->name('config.rank.edit');
-        Route::post('/admin/config/ranks/{id}','RankController@update')->middleware('perm:config_edit');
-        Route::get('/admin/config/jobs','JobController@index')->middleware('perm:config_edit')->name('config.jobs');
-        Route::get('/admin/config/jobs/add','JobController@create')->middleware('perm:config_edit')->name('config.jobs.add');
-        Route::post('/admin/config/jobs/add','JobController@store')->middleware('perm:config_edit');
-        Route::get('/admin/config/jobs/{id}','JobController@edit')->middleware('perm:config_edit')->name('config.jobs.edit');
-        Route::post('/admin/config/jobs/{id}','JobController@update')->middleware('perm:config_edit');
+    /** Config */
+    Route::get('/admin/config/instruction', 'ScheduleController@index')->middleware('perm:config_edit')->name('config.schedule');
+    Route::get('/admin/config/instruction/event_type/create', 'EventTypeController@create')->middleware('perm:config_edit')->name('config.schedule.event_type.create');
+    Route::post('/admin/config/instruction/event_type/create', 'EventTypeController@store')->middleware('perm:config_edit');
+    Route::get('/admin/config/instruction/event_type/{id}', 'EventTypeController@show')->middleware('perm:config_edit')->name('config.schedule.event_type');
+    Route::patch('/admin/config/instruction/event_type/{id}', 'EventTypeController@update')->middleware('perm:config_edit');
+    Route::patch('/admin/config/instruction', 'ScheduleController@update')->middleware('perm:config_edit');
+    Route::get('/admin/config/activity', 'ComplementaryActivityController@index')->middleware('perm:config_edit')->name('config.complementary-activity');
+    Route::get('/admin/config/activity/add', 'ComplementaryActivityController@create')->middleware('perm:config_edit')->name('config.complementary-activity.add');
+    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')->name('config.complementary-activity.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')->name('config.general');
+    Route::get('/admin/config/customisation', 'ConfigController@customisation')->middleware('perm:config_edit')->name('config.customisation');
+    Route::post('/admin/config/customisation', 'ConfigController@customisationUpdate')->middleware('perm:config_edit');
 
-        Route::get('/admin/config/files' , 'ConfigController@showfilesConfig')->middleware('perm:config_edit')->name('config.files');
-        Route::post('/admin/config/files' , 'ConfigController@editfilesConfig')->middleware('perm:config_edit');
+    Route::get('/admin/config/ranks', 'RankController@index')->middleware('perm:config_edit')->name('config.rank');
+    Route::get('/admin/config/ranks/add', 'RankController@create')->middleware('perm:config_edit')->name('config.rank.add');
+    Route::post('/admin/config/ranks/add', 'RankController@store')->middleware('perm:config_edit');
+    Route::get('/admin/config/ranks/{id}', 'RankController@show')->middleware('perm:config_edit')->name('config.rank.edit');
+    Route::post('/admin/config/ranks/{id}', 'RankController@update')->middleware('perm:config_edit');
+    Route::get('/admin/config/jobs', 'JobController@index')->middleware('perm:config_edit')->name('config.jobs');
+    Route::get('/admin/config/jobs/add', 'JobController@create')->middleware('perm:config_edit')->name('config.jobs.add');
+    Route::post('/admin/config/jobs/add', 'JobController@store')->middleware('perm:config_edit');
+    Route::get('/admin/config/jobs/{id}', 'JobController@edit')->middleware('perm:config_edit')->name('config.jobs.edit');
+    Route::post('/admin/config/jobs/{id}', 'JobController@update')->middleware('perm:config_edit');
 
-        /** Public page */
-        Route::get('/admin/public/edit/{config}', 'PublicController@edit')->middleware('perm:config_edit');
-        Route::post('/admin/public/edit/{config}', 'PublicController@update')->middleware('perm:config_edit');
+    Route::get('/admin/config/files', 'ConfigController@showfilesConfig')->middleware('perm:config_edit')->name('config.files');
+    Route::post('/admin/config/files', 'ConfigController@editfilesConfig')->middleware('perm:config_edit');
 
-        /** Picture */
-        Route::get('/admin/picture','PictureController@indexAdmin')->middleware('perm:picture_see')->name('picture');
-        Route::get('/admin/picture/add','PictureController@create')->middleware('perm:picture_add')->name('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')->name('picture.edit');
-        Route::post('/admin/picture/edit/{id}','PictureController@update')->middleware('perm:picture_edit');
+    /** Public page */
+    Route::get('/admin/public/edit/{config}', 'PublicController@edit')->middleware('perm:config_edit');
+    Route::post('/admin/public/edit/{config}', 'PublicController@update')->middleware('perm:config_edit');
 
-        /** Inventory */
-        Route::get('/admin/inventory' , 'InventoryController@index')->middleware('perm:inventory_see')->name('inv');
-        Route::get('/admin/inventory/management','InventoryController@management')->middleware('perm:inventory_edit')->name('inv.management');
+    /** Picture */
+    Route::get('/admin/picture', 'PictureController@indexAdmin')->middleware('perm:picture_see')->name('picture');
+    Route::get('/admin/picture/add', 'PictureController@create')->middleware('perm:picture_add')->name('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')->name('picture.edit');
+    Route::post('/admin/picture/edit/{id}', 'PictureController@update')->middleware('perm:picture_edit');
 
-        /** Item Category */
-        Route::get('/admin/inventory/management/category','ItemCategoryController@index')->middleware('perm:inventory_edit')->name('inv.management.category');
-        Route::get('/admin/inventory/management/category/add','ItemCategoryController@create')->middleware('perm:inventory_add')->name('inv.management.category.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')->name('inv.management.category.edit');
-        Route::post('/admin/inventory/management/category/edit/{id}','ItemCategoryController@update')->middleware('perm:inventory_edit');
+    /** Inventory */
+    Route::get('/admin/inventory', 'InventoryController@index')->middleware('perm:inventory_see')->name('inv');
+    Route::get('/admin/inventory/management', 'InventoryController@management')->middleware('perm:inventory_edit')->name('inv.management');
 
-        /** News */
-        Route::get('/admin/news','NewsController@indexAdmin')->middleware('perm:news_see')->name('news');
-        Route::get('/admin/news/add','NewsController@create')->middleware('perm:news_add')->name('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')->name('news.edit');
-        Route::post('/admin/news/edit/{id}','NewsController@update')->middleware('perm:news_edit');
+    /** Item Category */
+    Route::get('/admin/inventory/management/category', 'ItemCategoryController@index')->middleware('perm:inventory_edit')->name('inv.management.category');
+    Route::get('/admin/inventory/management/category/add', 'ItemCategoryController@create')->middleware('perm:inventory_add')->name('inv.management.category.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')->name('inv.management.category.edit');
+    Route::post('/admin/inventory/management/category/edit/{id}', 'ItemCategoryController@update')->middleware('perm:inventory_edit');
 
-        /** Articles */
-        Route::get('/admin/article','ArticleController@index')->middleware('perm:article_see')->name('article');
-        Route::get('/admin/article/activity/edit/{id}','ArticleController@editActivity')->middleware('perm:article_edit')->name('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');
+    /** News */
+    Route::get('/admin/news', 'NewsController@indexAdmin')->middleware('perm:news_see')->name('news');
+    Route::get('/admin/news/add', 'NewsController@create')->middleware('perm:news_add')->name('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')->name('news.edit');
+    Route::post('/admin/news/edit/{id}', 'NewsController@update')->middleware('perm:news_edit');
 
-        /** Booking */
-        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');
+    /** Articles */
+    Route::get('/admin/article', 'ArticleController@index')->middleware('perm:article_see')->name('article');
+    Route::get('/admin/article/activity/edit/{id}', 'ArticleController@editActivity')->middleware('perm:article_edit')->name('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');
 
-        /** Item */
-        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');
+    /** Booking */
+    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');
 
-        /** Notification */
-        Route::get('/admin/notication/mark','UserController@notificationmarkALL');
-        Route::post('/admin/notication/mark/{id}','UserController@notificationmark');
+    /** Item */
+    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');
 
-        /** Profil */
-        Route::get('/admin/profil/courses' , 'ProfilController@courses')->name('profil.courses');
-        Route::get('/admin/profil/avatar' , 'UserController@UserAvatar')->name('profil.avatar');
-        Route::get('/admin/profil/password' , 'UserController@UserPassword')->name('profil.psw');
-        Route::get('/admin/profil/adress' , 'UserController@UserAdress')->name('profil.adress');
-        Route::get('/admin/profil/notifications','UserController@userNotification')->name('profil.notifications');
-        Route::post('/admin/profil/edit/adress' , 'UserController@editUserAdress');
-        Route::post('/admin/profil/edit/password' , 'UserController@editUserPassword');
-        Route::get('/admin/profil/edit/avatar/{id}' , 'UserController@editUserAvatar');
-        Route::get('/admin/profil/{id?}' , 'UserController@showUserProfil')->name('profil');
+    /** Notification */
+    Route::get('/admin/notication/mark', 'UserController@notificationmarkALL');
+    Route::post('/admin/notication/mark/{id}', 'UserController@notificationmark');
 
-        /** Instruction */
-        Route::get('/admin/instruction','AdminController@instruction')->name('instruction');
-        Route::get('/admin/instruction/guide','FilesController@guide')->middleware('perm:instruction_guide_see')->name('instruction.guide');
-        Route::get('/admin/instruction/files','FilesController@instruction')->middleware('perm:file_see')->name('instruction.files');
+    /** Profil */
+    Route::get('/admin/profil/courses', 'ProfilController@courses')->name('profil.courses');
+    Route::get('/admin/profil/avatar', 'UserController@UserAvatar')->name('profil.avatar');
+    Route::get('/admin/profil/password', 'UserController@UserPassword')->name('profil.psw');
+    Route::get('/admin/profil/adress', 'UserController@UserAdress')->name('profil.adress');
+    Route::get('/admin/profil/notifications', 'UserController@userNotification')->name('profil.notifications');
+    Route::post('/admin/profil/edit/adress', 'UserController@editUserAdress');
+    Route::post('/admin/profil/edit/password', 'UserController@editUserPassword');
+    Route::get('/admin/profil/edit/avatar/{id}', 'UserController@editUserAvatar');
+    Route::get('/admin/profil/{id?}', 'UserController@showUserProfil')->name('profil');
 
-        /** Courses */
-        Route::get('/admin/course','CourseController@index')->name('course');
-        Route::get('/admin/course/{id}','CourseController@show')->name('course.show')->middleware('courseperm:see');
-        Route::patch('/admin/course/{id}/commentOfficer','CourseController@updateCommentOfficer')->middleware('courseperm:comment_officer');
-        Route::patch('/admin/course/{id}/comment','CourseController@updateComment')->middleware('courseperm:edit');
-        Route::patch('/admin/course/{id}/plan/commentOfficer','CourseController@updateCommentOfficerPlan')->middleware('courseperm:comment_plan_officer');
-        Route::patch('/admin/course/{id}/plan/comment','CourseController@updateCommentPlan')->middleware('courseperm:edit');
-        Route::post('/admin/course/{id}/lessonPlan','CourseController@updateLessonPlan')->middleware('courseperm:edit');
+    /** Instruction */
+    Route::get('/admin/instruction', 'AdminController@instruction')->name('instruction');
+    Route::get('/admin/instruction/guide', 'FilesController@guide')->middleware('perm:instruction_guide_see')->name('instruction.guide');
+    Route::get('/admin/instruction/files', 'FilesController@instruction')->middleware('perm:file_see')->name('instruction.files');
+
+    /** Courses */
+    Route::get('/admin/course', 'CourseController@index')->name('course');
+    Route::get('/admin/course/{id}', 'CourseController@show')->name('course.show')->middleware('courseperm:see');
+    Route::patch('/admin/course/{id}/commentOfficer', 'CourseController@updateCommentOfficer')->middleware('courseperm:comment_officer');
+    Route::patch('/admin/course/{id}/comment', 'CourseController@updateComment')->middleware('courseperm:edit');
+    Route::patch('/admin/course/{id}/plan/commentOfficer', 'CourseController@updateCommentOfficerPlan')->middleware('courseperm:comment_plan_officer');
+    Route::patch('/admin/course/{id}/plan/comment', 'CourseController@updateCommentPlan')->middleware('courseperm:edit');
+    Route::post('/admin/course/{id}/lessonPlan', 'CourseController@updateLessonPlan')->middleware('courseperm:edit');
 
     /** Files */
-        Route::post('/file/create','GoogleDriveController@createFile')->middleware('fileperm:folder,w');
-        Route::post('/file/upload','GoogleDriveController@uploadFile')->middleware('fileperm:folder,w');
-        Route::post('/folder/create','GoogleDriveController@createFolder')->middleware('fileperm:folder,w');
-        Route::get('/file/delete','GoogleDriveController@deleteFile')->middleware('perm:file_delete')->middleware('fileperm:folder,w');
-        Route::get('/folder/delete','GoogleDriveController@deleteDir')->middleware('perm:file_delete')->middleware('fileperm:folder,w');
-        Route::get('/admin/files','FilesController@index')->middleware('perm:file_see')->name('files');
-        Route::get('/admin/files/cadet','FilesController@cadet')->middleware('perm:file_see')->name('files.cadet')->middleware('fileperm:folder,r');
-        Route::get('/admin/files/staff','FilesController@staff')->middleware('perm:file_see')->name('files.staff')->middleware('fileperm:folder,r');
-        Route::get('/admin/files/etamas','FilesController@etamas')->middleware('perm:file_see')->name('files.etamas')->middleware('fileperm:folder,r');
-        Route::get('/admin/files/officier','FilesController@officier')->middleware('perm:file_see')->name('files.officier')->middleware('fileperm:folder,r');
-        Route::get('/admin/files/publique','FilesController@publique')->middleware('perm:file_see')->name('files.publique')->middleware('fileperm:folder,r');
-
-        Route::get('/admin/drive/{folder?}','GoogleDriveController@index')->middleware('fileperm:folder,r','perm:drive_see')->name('drive');
-        Route::get('/admin/folder/{folder?}','GoogleDriveController@index')->middleware('fileperm:folder,r')->name('drive');
-        Route::get('/admin/drive/{folder}/permission','GoogleDriveController@editPermission')->middleware('fileperm:folder,p')->name('drive.permission');
-        Route::patch('/admin/drive/{folder}/permission/{subject}/{id}','GoogleDriveController@patchPermission')->middleware('perm:file_see','fileperm:folder,p');
-        Route::get('/admin/drive/{folder}/deletepermission/{subject}/{id}','GoogleDriveController@deletePermission')->middleware('perm:file_see','fileperm:folder,p');
-        Route::patch('/admin/drive/{folder}/addpermission/{subject}','GoogleDriveController@addPermission')->middleware('perm:file_see','fileperm:folder,p');
+    Route::post('/file/create', 'GoogleDriveController@createFile')->middleware('fileperm:folder,w');
+    Route::post('/file/upload', 'GoogleDriveController@uploadFile')->middleware('fileperm:folder,w');
+    Route::post('/folder/create', 'GoogleDriveController@createFolder')->middleware('fileperm:folder,w');
+    Route::get('/file/delete', 'GoogleDriveController@deleteFile')->middleware('perm:file_delete')->middleware('fileperm:folder,w');
+    Route::get('/folder/delete', 'GoogleDriveController@deleteDir')->middleware('perm:file_delete')->middleware('fileperm:folder,w');
+    Route::get('/admin/files', 'FilesController@index')->middleware('perm:file_see')->name('files');
+    Route::get('/admin/files/cadet', 'FilesController@cadet')->middleware('perm:file_see')->name('files.cadet')->middleware('fileperm:folder,r');
+    Route::get('/admin/files/staff', 'FilesController@staff')->middleware('perm:file_see')->name('files.staff')->middleware('fileperm:folder,r');
+    Route::get('/admin/files/etamas', 'FilesController@etamas')->middleware('perm:file_see')->name('files.etamas')->middleware('fileperm:folder,r');
+    Route::get('/admin/files/officier', 'FilesController@officier')->middleware('perm:file_see')->name('files.officier')->middleware('fileperm:folder,r');
+    Route::get('/admin/files/publique', 'FilesController@publique')->middleware('perm:file_see')->name('files.publique')->middleware('fileperm:folder,r');
 
+    Route::get('/admin/drive/{folder?}', 'GoogleDriveController@index')->middleware('fileperm:folder,r', 'perm:drive_see')->name('drive');
+    Route::get('/admin/folder/{folder?}', 'GoogleDriveController@index')->middleware('fileperm:folder,r')->name('drive');
+    Route::get('/admin/drive/{folder}/permission', 'GoogleDriveController@editPermission')->middleware('fileperm:folder,p')->name('drive.permission');
+    Route::patch('/admin/drive/{folder}/permission/{subject}/{id}', 'GoogleDriveController@patchPermission')->middleware('perm:file_see', 'fileperm:folder,p');
+    Route::get('/admin/drive/{folder}/deletepermission/{subject}/{id}', 'GoogleDriveController@deletePermission')->middleware('perm:file_see', 'fileperm:folder,p');
+    Route::patch('/admin/drive/{folder}/addpermission/{subject}', 'GoogleDriveController@addPermission')->middleware('perm:file_see', 'fileperm:folder,p');
 
 
     /** OCOM */
-        Route::get('/admin/ocom','OCOMController@index')->name('ocom')->middleware('perm:instruction_db_ocom_see');
-        Route::get('/admin/ocom/generate','OCOMController@showgenerate')->name('ocom.generate')->middleware('perm:instruction_db_ocom_edit');
-        Route::put('/admin/ocom/generate','OCOMController@generate')->middleware('perm:instruction_db_ocom_edit');
-        Route::get('/admin/ocom/add','OCOMController@create')->name('ocom.add')->middleware('perm:instruction_db_ocom_add');
-        Route::put('/admin/ocom/add','OCOMController@store')->middleware('perm:instruction_db_ocom_add');
-        Route::get('/admin/ocom/{id}/edit','OCOMController@edit')->name('ocom.edit')->middleware('perm:instruction_db_ocom_edit');
-        Route::patch('/admin/ocom/{id}/edit','OCOMController@update')->middleware('perm:instruction_db_ocom_edit');
-        Route::get('/admin/ocom/{id}','OCOMController@show')->name('ocom.show')->middleware('perm:instruction_db_ocom_see');
+    Route::get('/admin/ocom', 'OCOMController@index')->name('ocom')->middleware('perm:instruction_db_ocom_see');
+    Route::get('/admin/ocom/generate', 'OCOMController@showgenerate')->name('ocom.generate')->middleware('perm:instruction_db_ocom_edit');
+    Route::put('/admin/ocom/generate', 'OCOMController@generate')->middleware('perm:instruction_db_ocom_edit');
+    Route::get('/admin/ocom/add', 'OCOMController@create')->name('ocom.add')->middleware('perm:instruction_db_ocom_add');
+    Route::put('/admin/ocom/add', 'OCOMController@store')->middleware('perm:instruction_db_ocom_add');
+    Route::get('/admin/ocom/{id}/edit', 'OCOMController@edit')->name('ocom.edit')->middleware('perm:instruction_db_ocom_edit');
+    Route::patch('/admin/ocom/{id}/edit', 'OCOMController@update')->middleware('perm:instruction_db_ocom_edit');
+    Route::get('/admin/ocom/{id}', 'OCOMController@show')->name('ocom.show')->middleware('perm:instruction_db_ocom_see');
 });