diff --git a/.env.example b/.env.example
index 0710ce52..aaf8f7e5 100644
--- a/.env.example
+++ b/.env.example
@@ -1,7 +1,7 @@
 APP_NAME=C-CMS
 APP_ENV=local
 APP_KEY=
-APP_DEBUG=true
+APP_DEBUG=false
 APP_URL=https://dev.c-cms.cf/ # Adresse de votre site web
 
 SQN_NUMBER=000 # Numéro de votre escadron
diff --git a/app/ComplementaryActivity.php b/app/ComplementaryActivity.php
new file mode 100644
index 00000000..bc0597e4
--- /dev/null
+++ b/app/ComplementaryActivity.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ComplementaryActivity extends Model
+{
+    public function pictures()
+    {
+        return $this->morphMany('App\Picture', 'pictureable');
+    }
+}
diff --git a/app/Config.php b/app/Config.php
index 161d2b8d..b4dce0e5 100644
--- a/app/Config.php
+++ b/app/Config.php
@@ -6,5 +6,17 @@ use Illuminate\Database\Eloquent\Model;
 
 class Config extends Model
 {
-    //
+    protected $casts = [
+        'data' => 'array',
+    ];
+
+    public function data() 
+    {
+        return $this->data[0];
+    }
+
+    public static function getData($configName)
+    {
+        return Config::where('name',$configName)->first()->data();
+    }
 }
diff --git a/app/Http/Controllers/ComplementaryActivityController.php b/app/Http/Controllers/ComplementaryActivityController.php
new file mode 100644
index 00000000..2f2679df
--- /dev/null
+++ b/app/Http/Controllers/ComplementaryActivityController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\ComplementaryActivity;
+use Illuminate\Http\Request;
+
+class ComplementaryActivityController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view('public.activity');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\ComplementaryActivity  $complementaryActivity
+     * @return \Illuminate\Http\Response
+     */
+    public function show(ComplementaryActivity $complementaryActivity)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\ComplementaryActivity  $complementaryActivity
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(ComplementaryActivity $complementaryActivity)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\ComplementaryActivity  $complementaryActivity
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, ComplementaryActivity $complementaryActivity)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\ComplementaryActivity  $complementaryActivity
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(ComplementaryActivity $complementaryActivity)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/ECCController.php b/app/Http/Controllers/ECCController.php
index 998add2b..8ddedd85 100644
--- a/app/Http/Controllers/ECCController.php
+++ b/app/Http/Controllers/ECCController.php
@@ -325,4 +325,24 @@ class ECCController extends Controller
     {
         return view('ecc.files');
     }
+
+    public function settings()
+    {
+        return view('ecc.settings');
+    }
+
+    public function UserPassword()
+    {
+        return view('ecc.settings.password');
+    }
+
+    public function UserAvatar() 
+    {
+        return view('ecc.settings.avatar');
+    }
+
+    public function UserAdress()
+    {
+        return view('ecc.settings.adress');
+    }
 }
diff --git a/app/Http/Controllers/FilesController.php b/app/Http/Controllers/FilesController.php
index f47fd437..135234ae 100644
--- a/app/Http/Controllers/FilesController.php
+++ b/app/Http/Controllers/FilesController.php
@@ -81,4 +81,9 @@ class FilesController extends Controller
     {
         //
     }
+
+    public function guide()
+    {
+        return view('admin.files.guide');
+    }
 }
diff --git a/app/Http/Controllers/NewsController.php b/app/Http/Controllers/NewsController.php
new file mode 100644
index 00000000..125835d9
--- /dev/null
+++ b/app/Http/Controllers/NewsController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\News;
+use Illuminate\Http\Request;
+
+class NewsController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view('public.allnews',['news' => \App\News::all()]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\News  $news
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\News  $news
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(News $news)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\News  $news
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, News $news)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\News  $news
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(News $news)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/PictureController.php b/app/Http/Controllers/PictureController.php
new file mode 100644
index 00000000..f55ed74c
--- /dev/null
+++ b/app/Http/Controllers/PictureController.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Picture;
+use Illuminate\Http\Request;
+
+class PictureController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        //
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  \App\Picture  $picture
+     * @return \Illuminate\Http\Response
+     */
+    public function show(Picture $picture)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \App\Picture  $picture
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Picture $picture)
+    {
+        //
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Picture  $picture
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, Picture $picture)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \App\Picture  $picture
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Picture $picture)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/PublicController.php b/app/Http/Controllers/PublicController.php
new file mode 100644
index 00000000..12113b98
--- /dev/null
+++ b/app/Http/Controllers/PublicController.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+
+class PublicController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index()
+    {
+        return view('public.index',['news' => \App\News::all()]);
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function create()
+    {
+        //
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(Request $request)
+    {
+        //
+    }
+
+    /**
+     * Display the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function show($id)
+    {
+        //
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function edit($config)
+    {
+        return view('admin.public.edit',['config' => \App\Config::where('name',$config)->first()]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function update(Request $request, $config)
+    {
+        $config = \App\Config::where('name',$config)->first();
+
+        $config->data = [request('data')];
+
+        $config->save();
+
+        return redirect('/');;
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  int  $id
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy($id)
+    {
+        //
+    }
+}
diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index 9a398a34..fac4d2f9 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -208,11 +208,43 @@ class UserController extends Controller
 
         $user->save();
 
-        return redirect('/admin/profil/avatar')->with('status', 'Modification enregistré');
+        return back()->with('status', 'Votre avatar a été mis à jour !');
     }
 
     public function UserAvatar()
     {
         return view('admin.user.profil.avatar');
     }
+
+    public function UserPassword()
+    {
+        return view('admin.user.profil.password');
+    }
+
+    public function editUserPassword()
+    {
+        $user = \Auth::User();
+
+        $user->password = bcrypt(request('psw'));
+
+        $user->save();
+
+        return back()->with('status', 'Modification enregistré');
+    }
+    
+    public function UserAdress()
+    {
+        return view('admin.user.profil.adress');
+    }
+
+    public function editUserAdress()
+    {
+        $user = \Auth::user();
+
+        $user->adress = request('adress');
+
+        $user->save();
+
+        return back()->with('status', 'Modification enregistré');
+    }
 }
diff --git a/app/News.php b/app/News.php
new file mode 100644
index 00000000..f1b5fbeb
--- /dev/null
+++ b/app/News.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class News extends Model
+{
+    public function user()
+    {
+        return $this->belongsTo('App\User');
+    }
+}
diff --git a/app/Picture.php b/app/Picture.php
new file mode 100644
index 00000000..bafe295c
--- /dev/null
+++ b/app/Picture.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Picture extends Model
+{
+    public function pictureable()
+    {
+        return $this->morphTo();
+    }
+}
diff --git a/app/User.php b/app/User.php
index 6b451982..69657d4c 100644
--- a/app/User.php
+++ b/app/User.php
@@ -259,4 +259,9 @@ class User extends Authenticatable
             $this_msg->save();
         }
     }
+
+    public function news()
+    {
+        return $this->hasMany('App\News');
+    }
 }
diff --git a/database/migrations/2019_07_19_171303_create_news_table.php b/database/migrations/2019_07_19_171303_create_news_table.php
new file mode 100644
index 00000000..27907a05
--- /dev/null
+++ b/database/migrations/2019_07_19_171303_create_news_table.php
@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateNewsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('news', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('title');
+            $table->text('body');
+            $table->integer('user_id');
+            $table->boolean('publish');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('news');
+    }
+}
diff --git a/database/migrations/2019_07_19_183610_create_complementary_activities_table.php b/database/migrations/2019_07_19_183610_create_complementary_activities_table.php
new file mode 100644
index 00000000..ddff3157
--- /dev/null
+++ b/database/migrations/2019_07_19_183610_create_complementary_activities_table.php
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateComplementaryActivitiesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('complementary_activities', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('name');
+            $table->text('public_body');
+            $table->text('admin_desc');
+            $table->string('begin_time')->default('12:00');
+            $table->string('end_time')->default('13:00');
+            $table->string('location')->default('Escadron');
+            $table->boolean('is_mandatory')->default(false);
+            $table->boolean('is_promoted')->default(false);
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('complementary_activities');
+    }
+}
diff --git a/database/migrations/2019_07_20_095729_create_pictures_table.php b/database/migrations/2019_07_20_095729_create_pictures_table.php
new file mode 100644
index 00000000..7fc25b13
--- /dev/null
+++ b/database/migrations/2019_07_20_095729_create_pictures_table.php
@@ -0,0 +1,36 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreatePicturesTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('pictures', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('url');
+            $table->string('title');
+            $table->text('desc');
+            $table->integer('pictureable_id');
+            $table->string('pictureable_type');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('pictures');
+    }
+}
diff --git a/database/seeds/ConfigsTableSeeder.php b/database/seeds/ConfigsTableSeeder.php
index cefb3ea9..d096ab56 100644
--- a/database/seeds/ConfigsTableSeeder.php
+++ b/database/seeds/ConfigsTableSeeder.php
@@ -21,6 +21,106 @@ class ConfigsTableSeeder extends Seeder
                 'name' => 'is_schedule_build',
                 'state' => 0,
                 'data' => 'null'
+            ],
+            [
+                'name' => 'text_public_banner_cadet_desc',
+                'state' => 0,
+                'data' => '["Les cadets de l\'air s\'adressent aux jeunes de 12 à 18 ans qui désirent vivre des expériences enrichissantes et relever de nouveaux défis, en participant à des activités stimulantes dans un cadre dynamique et chaleureux."]'
+            ],
+            [
+                'name' => 'text_public_banner_apprendre_plus',
+                'state' => 0,
+                'data' => '["En apprendre plus!"]'
+            ],
+            [
+                'name' => 'text_public_intro_title',
+                'state' => 0,
+                'data' => '["L\'escadron c\'est ..."]'
+            ],
+            [
+                'name' => 'text_public_intro_desc',
+                'state' => 0,
+                'data' => '["De nombreuses activités hebdomadaires dont : les soirées du vendredi, les soirées de musique (fanfare), l\'entrainement au tir, une équipe de biathlon, des cours de pilotage et plus encore !"]'
+            ],
+            [
+                'name' => 'text_public_picture_title',
+                'state' => 0,
+                'data' => '["Photos"]'
+            ],
+            [
+                'name' => 'text_public_picture_desc',
+                'state' => 0,
+                'data' => '["Voici quelques photos de nos activités, même s\'il est mieux d\'y participer réellement!"]'
+            ],
+            [
+                'name' => 'text_public_picture_nb',
+                'state' => 0,
+                'data' => '["6"]'
+            ],
+            [
+                'name' => 'text_public_cta',
+                'state' => 0,
+                'data' => '["Êtes-vous prêt à en faire partie ?"]'
+            ],
+            [
+                'name' => 'media_facebook',
+                'state' => 0,
+                'data' => '["https://www.facebook.com/"]'
+            ],
+            [
+                'name' => 'media_twitter',
+                'state' => 0,
+                'data' => '["https://twitter.com"]'
+            ],
+            [
+                'name' => 'media_instagram',
+                'state' => 0,
+                'data' => '["https://www.instagram.com"]'
+            ],
+            [
+                'name' => 'media_email',
+                'state' => 0,
+                'data' => '["exemple@email.com"]'
+            ],
+            [
+                'name' => 'escadron_address', 
+                'state' => 0,
+                'data' => '["000 Rue Exemple, Québec, Canada"]'
+            ],
+            [
+                'name' => 'escadron_name_full', 
+                'state' => 0,
+                'data' => '["Escadron 000 Exemple"]'
+            ],
+            [
+                'name' => 'escadron_name_short', 
+                'state' => 0,
+                'data' => '["Escadron 000"]'
+            ],
+            [
+                'name' => 'escadron_number', 
+                'state' => 0,
+                'data' => '["000"]'
+            ],
+            [
+                'name' => 'escadron_element', 
+                'state' => 0,
+                'data' => '["Aviation"]'
+            ],
+            [
+                'name' => 'element_title', 
+                'state' => 0,
+                'data' => '["Cadet de l\'aviation royale du Canada"]'
+            ],
+            [
+                'name' => 'escadron_direct_googlemap_link', 
+                'state' => 0,
+                'data' => '["https://goo.gl/maps/iLwGZLwWXujwoAg59"]'
+            ],
+            [
+                'name' => 'escadron_phone', 
+                'state' => 0,
+                'data' => '["(418) 722-7712"]'
             ]
         ]);
     }
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index ca430b50..9ef2b2df 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -14,7 +14,8 @@ class DatabaseSeeder extends Seeder
         $this->call([
             JobsTableSeeder::class,
             RanksTableSeeder::class,
-            ConfigsTableSeeder::class
+            ConfigsTableSeeder::class,
+            UsersTableSeeder::class
         ]);
     }
 }
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index 362668fb..d21eb8e7 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -11,6 +11,17 @@ class UsersTableSeeder extends Seeder
      */
     public function run()
     {
-        //
+        DB::table('users')->insert([
+            'firstname' => 'Administrateur',
+            'lastname' => 'Administrateur',
+            'email' => 'admin@exvps.ca',
+            'password' => bcrypt('SuperAdmin'),
+            'rank' => '1',
+            'adress' => 'Inconnu',
+            'age' => '99',
+            'avatar' => '3',
+            'sexe' => 'm',
+            'job' => '1',
+        ]);
     }
 }
diff --git a/resources/views/admin/dashboard.blade.php b/resources/views/admin/dashboard.blade.php
index 5663ca4c..b2267d52 100644
--- a/resources/views/admin/dashboard.blade.php
+++ b/resources/views/admin/dashboard.blade.php
@@ -105,14 +105,16 @@
         <div class="card-body">
             <div class="row">
             @foreach (\App\Message::all()->forPage(1,4); as $msg)
-                <div class="col-lg-6 text-center">
-                    <div style="height:2rem;">{{$msg->title}}</div>
-                    <br>
-                    <div class="msg-body" style="height:12rem;overflow:hidden">
-                        {!!$msg->body!!}
+                    <div class="col-lg-6 text-center">
+                        <a href="/admin/message/{{$msg->id}}">
+                            <div style="height:2rem;">{{$msg->title}}</div>
+                            <br>
+                            <div class="msg-body" style="height:12rem;overflow:hidden">
+                                {!!$msg->body!!}
+                            </div>
+                            <br>
+                        </a>
                     </div>
-                    <br>
-                </div>
             @endforeach
             </div>
             <br>
diff --git a/resources/views/admin/files/guide.blade.php b/resources/views/admin/files/guide.blade.php
new file mode 100644
index 00000000..861ba307
--- /dev/null
+++ b/resources/views/admin/files/guide.blade.php
@@ -0,0 +1,103 @@
+@extends('layouts.admin.main')
+
+@section('content')
+<div class="col-md-12">
+    <div class="card">
+        <div class="card-header">
+            <strong class="card-title">Fichiers <a href="#"><i class="fa fa-question-circle" aria-hidden="true"></i>
+            </a></strong>
+        </div>
+        <div class="card-body">
+            <div class="content table-responsive table-full-width">
+                <p>Les fichiers si dessous sont disponible autant dans l'espace administration que dans l'espace cadet cadre.
+                <table class="table">
+                    <thead>
+                        <tr><th style="width:85%;">Nom</th>
+                        <th></th>
+                    </tr></thead>
+                    <tbody>
+                        <tr>
+                            <td><strong>Niveau 1</strong><hr></td>
+                        </tr>
+                        <tr>
+                            <td>Guide Pédagogique</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1sqkeUp-djZDjltitGvjR0efMQgyB_sos">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Guide de Qualification</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1RjSSwK9NIVUFbHKlu0hbkK5IeTnAFWq9">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td><strong>Niveau 2</strong><hr></td>
+                        </tr>
+                        <tr>
+                            <td>Guide Pédagogique</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1sqkeUp-djZDjltitGvjR0efMQgyB_sos">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td>Guide de Qualification</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1RjSSwK9NIVUFbHKlu0hbkK5IeTnAFWq9">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td><strong>Niveau 3</strong><hr></td>
+                        </tr>
+                        <tr>
+                            <td>Guide Pédagogique</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1sqkeUp-djZDjltitGvjR0efMQgyB_sos">Télécharger</a></td>                                </tr>
+                        <tr>
+                            <td>Guide de Qualification</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1RjSSwK9NIVUFbHKlu0hbkK5IeTnAFWq9">Télécharger</a></td>
+                        </tr>
+                        <tr>
+                            <td><strong>Niveau 4</strong><hr></td>
+                        </tr>
+                        <tr>
+                            <td>Guide Pédagogique</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1sqkeUp-djZDjltitGvjR0efMQgyB_sos">Télécharger</a></td>                                </tr>
+                        <tr>
+                            <td>Guide de Qualification</td>
+                            <td><a class="btn btn-primary" href="https://drive.google.com/uc?export=download&amp;id=1RjSSwK9NIVUFbHKlu0hbkK5IeTnAFWq9">Télécharger</a></td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('breadcrumb')
+    <div class="breadcrumbs">
+        <div class="col-sm-4">
+            <div class="page-header float-left">
+                <div class="page-title">
+                    <h1>Fichiers</h1>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-8">
+            <div class="page-header float-right">
+                <div class="page-title">
+                    <ol class="breadcrumb text-right">
+                        <li class="active">Fichiers/Guide Pédagogique</li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/lib/data-table/datatables.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/dataTables.bootstrap.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/dataTables.buttons.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.bootstrap.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/jszip.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/pdfmake.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/vfs_fonts.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.html5.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.print.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.colVis.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/datatables-init.js"></script>
+
+@endsection
diff --git a/resources/views/admin/public/edit.blade.php b/resources/views/admin/public/edit.blade.php
new file mode 100644
index 00000000..8356b7c6
--- /dev/null
+++ b/resources/views/admin/public/edit.blade.php
@@ -0,0 +1,66 @@
+@extends('layouts.admin.main')
+
+@section('content')
+<div class="col-md-12">
+    <div class="card">
+        <div class="card-header">
+            <strong class="card-title">Modifier la page d'accueil</strong>
+        </div>
+        <div class="card-body">
+            <form action="/admin/public/edit/{{$config->name}}" method="post">
+                @csrf
+                <div class="row">
+                    <div class="col-12">
+                        <div class="form-group">
+                          <label for="data">Texte</label>
+                            <textarea class="form-control" name="data" id="data" rows="5" required>{{$config->data()}}</textarea>
+                          <small id="helpdata" class="form-text text-muted">Texte à afficher sur la page d'accueil</small>
+                        </div>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-12">
+                        <button type="submit" class="btn btn-primary">Submit</button>
+                    </div>
+                </div>
+            </form>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('breadcrumb')
+    <div class="breadcrumbs">
+        <div class="col-sm-4">
+            <div class="page-header float-left">
+                <div class="page-title">
+                    <h1>Inventaire</h1>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-8">
+            <div class="page-header float-right">
+                <div class="page-title">
+                    <ol class="breadcrumb text-right">
+                        <li class="active">Inventaire</li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/lib/data-table/datatables.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/dataTables.bootstrap.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/dataTables.buttons.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.bootstrap.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/jszip.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/pdfmake.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/vfs_fonts.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.html5.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.print.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/buttons.colVis.min.js"></script>
+<script src="/assets/admin/assets/js/lib/data-table/datatables-init.js"></script>
+
+@endsection
diff --git a/resources/views/admin/user/profil.blade.php b/resources/views/admin/user/profil.blade.php
index 288e280c..52fa2bea 100644
--- a/resources/views/admin/user/profil.blade.php
+++ b/resources/views/admin/user/profil.blade.php
@@ -4,6 +4,15 @@
 <div @if ($user->id == \Auth::User()->id) class="col-md-12 col-lg-9" @else class="col-sm-12" @endif>
     <div class="card">
         <div class="card-body">
+                @if (session('status'))
+                <div class="sufee-alert alert with-close alert-success alert-dismissible fade show">
+                    <span class="badge badge-pill badge-success">Félicitation</span>
+                        {{session('status')}}
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                    </button>
+                </div>
+            @endif
             <div class="col-sm-6">
                 <div class="mx-auto d-block">
                     <img class="rounded-circle mx-auto d-block" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg" alt="Card image cap" style="height:12rem">
diff --git a/resources/views/admin/user/profil/adress.blade.php b/resources/views/admin/user/profil/adress.blade.php
new file mode 100644
index 00000000..34bfe01a
--- /dev/null
+++ b/resources/views/admin/user/profil/adress.blade.php
@@ -0,0 +1,56 @@
+@extends('layouts.admin.main')
+
+@section('content')
+<div class="col-sm-12">
+    <div class="card">
+        <div class="card-header">
+            <strong class="card-title">Modification de mon adresse <i class="fa fa-question-circle" aria-hidden="true"></i>
+            </a></strong>
+        </div>
+        <div class="card-body">
+            @if (session('status'))
+                <div class="sufee-alert alert with-close alert-success alert-dismissible fade show">
+                    <span class="badge badge-pill badge-success">Félicitation</span>
+                        {{session('status')}}
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                    </button>
+                </div>
+            @endif
+            <form autocomplete="off" action="/admin/profil/edit/adress" method="POST">
+                @csrf
+                <div class="form-group">
+                  <label for="adress">Entrer votre nouvelle adresse</label>
+                  <input type="text" class="form-control" name="adress" id="adress" placeholder="17 ave Pico">
+                </div>
+                <button type="submit" id="submit" class="btn btn-primary">Enregistrer</button>
+            </form>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('breadcrumb')
+    <div class="breadcrumbs">
+        <div class="col-sm-4">
+            <div class="page-header float-left">
+                <div class="page-title">
+                    <h1>Profil d'utilisateur</h1>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-8">
+            <div class="page-header float-right">
+                <div class="page-title">
+                    <ol class="breadcrumb text-right">
+                        <li class="active">Utilisateur/Profil/Adresse</li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/user.js"></script>
+@endsection
diff --git a/resources/views/admin/user/profil/password.blade.php b/resources/views/admin/user/profil/password.blade.php
new file mode 100644
index 00000000..6549efb7
--- /dev/null
+++ b/resources/views/admin/user/profil/password.blade.php
@@ -0,0 +1,63 @@
+@extends('layouts.admin.main')
+
+@section('content')
+<div class="col-sm-12">
+    <div class="card">
+        <div class="card-header">
+            <strong class="card-title">Modification du mot de passe <i class="fa fa-question-circle" aria-hidden="true"></i>
+            </a></strong>
+        </div>
+        <div class="card-body">
+            @if (session('status'))
+                <div class="sufee-alert alert with-close alert-success alert-dismissible fade show">
+                    <span class="badge badge-pill badge-success">Félicitation</span>
+                        Votre avatar a été mis a jour !
+                        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                        <span aria-hidden="true">×</span>
+                    </button>
+                </div>
+            @endif
+            <form autocomplete="off" action="/admin/profil/edit/password" method="POST">
+                @csrf
+                <div class="alert alert-warning" id="psw_alert" role="alert" style="display:none;">
+                    Les mot de passe doivent être identique
+                </div>
+                <div class="form-group">
+                  <label for="pws">Entrer votre nouveau mot de passe</label>
+                  <input type="password" class="form-control" name="psw" id="psw" placeholder="Mot de passe" onkeyup="checkPassword()">
+                </div>
+                <div class="form-group">
+                    <label for="pwsc">Confirmer votre nouveau mot de passe</label>
+                    <input type="password" class="form-control" name="pswc" id="pswc" placeholder="Mot de passe" onkeyup="checkPassword()">
+                </div>
+                <button type="submit" id="submit" class="btn btn-primary" disabled>Enregistrer</button>
+            </form>
+        </div>
+    </div>
+</div>
+@endsection
+
+@section('breadcrumb')
+    <div class="breadcrumbs">
+        <div class="col-sm-4">
+            <div class="page-header float-left">
+                <div class="page-title">
+                    <h1>Profil d'utilisateur</h1>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-8">
+            <div class="page-header float-right">
+                <div class="page-title">
+                    <ol class="breadcrumb text-right">
+                        <li class="active">Utilisateur/Profil/Mot de passe</li>
+                    </ol>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/user.js"></script>
+@endsection
diff --git a/resources/views/ecc/settings.blade.php b/resources/views/ecc/settings.blade.php
new file mode 100644
index 00000000..4808feb2
--- /dev/null
+++ b/resources/views/ecc/settings.blade.php
@@ -0,0 +1,50 @@
+@extends('layouts.ecc.main')
+
+@section('content')
+<div class="row">
+    <div class="col-md-12 offset-md-4">
+        <div class="card">
+            <div class="content">
+                <div class="row">
+                    <div class="col-xs-2">
+                        <div class="icon-big icon-info text-center">
+                            <i class="fa fa-cogs"></i>
+                        </div>
+                    </div>
+                    <div class="col-xs-10">
+                        <div class="numbers">
+                            <p>Options</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="row" style="padding:25px;">
+                    <h5>Mes options</h5>
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <div class="text-center">
+                                <div class="list-group">
+                                    <a href="/ecc/settings/password" class="list-group-item list-group-item-action">Modifier mon mot de passe</a>
+                                    <a href="/ecc/settings/avatar" class="list-group-item list-group-item-action">Modifier ma photo de profil</a>
+                                </div>
+                             </div>  
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="text-center">
+                                <div class="list-group">
+                                    <a href="/ecc/settings/adress" class="list-group-item list-group-item-action">Modifier mon adresse</a>
+                                    <a href="/ecc/settings/phone" class="list-group-item list-group-item-action disabled">Modifier mon numéro de téléphone</a>
+                                </div>
+                             </div>  
+                        </div>
+                    </div>
+                </div>
+                <hr>
+            </div>
+        </div>    
+    </div>
+</div>  
+@endsection
+
+@section('active_page')
+    <?php $active_page = "guide" ?>
+@endsection
\ No newline at end of file
diff --git a/resources/views/ecc/settings/adress.blade.php b/resources/views/ecc/settings/adress.blade.php
new file mode 100644
index 00000000..d4210cb8
--- /dev/null
+++ b/resources/views/ecc/settings/adress.blade.php
@@ -0,0 +1,50 @@
+@extends('layouts.ecc.main')
+
+@section('content')
+<div class="row">
+    <div class="col-md-12 offset-md-4">
+        <div class="card">
+            <div class="content">
+                <div class="row">
+                    <div class="col-xs-2">
+                        <div class="icon-big icon-info text-center">
+                            <i class="fa fa-cogs"></i>
+                        </div>
+                    </div>
+                    <div class="col-xs-10">
+                        <div class="numbers">
+                            <p>Options</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="row" style="padding:25px;">
+                    <h5>Modifier mon adresse</h5>
+                    @if (session('status'))
+                    <div class="alert alert-success">
+                        <button type="button" aria-hidden="true" class="close">×</button>
+                        <span><b> {{session('status')}}</span>
+                    </div>
+                    @endif
+                    <form autocomplete="off" action="/ecc/settings/edit/adress" method="POST">
+                        @csrf
+                        <div class="form-group">
+                          <label for="adress">Entrer votre nouvelle adresse</label>
+                          <input type="text" class="form-control" name="adress" id="adress" placeholder="17 ave Pico">
+                        </div>
+                        <button type="submit" id="submit" class="btn btn-primary">Enregistrer</button>
+                    </form>
+                </div>
+                <hr>
+            </div>
+        </div>    
+    </div>
+</div>  
+@endsection
+
+@section('active_page')
+    <?php $active_page = "guide" ?>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/user.js"></script>    
+@endsection
\ No newline at end of file
diff --git a/resources/views/ecc/settings/avatar.blade.php b/resources/views/ecc/settings/avatar.blade.php
new file mode 100644
index 00000000..198d4311
--- /dev/null
+++ b/resources/views/ecc/settings/avatar.blade.php
@@ -0,0 +1,55 @@
+@extends('layouts.ecc.main')
+
+@section('content')
+<div class="row">
+    <div class="col-md-12 offset-md-4">
+        <div class="card">
+            <div class="content">
+                <div class="row">
+                    <div class="col-xs-2">
+                        <div class="icon-big icon-info text-center">
+                            <i class="fa fa-cogs"></i>
+                        </div>
+                    </div>
+                    <div class="col-xs-10">
+                        <div class="numbers">
+                            <p>Options</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="row" style="padding:25px;">
+                    <h5>Modifier mon mot de passe</h5>
+                    @if (session('status'))
+                    <div class="alert alert-success">
+                        <button type="button" aria-hidden="true" class="close">×</button>
+                        <span><b> {{session('status')}}</span>
+                    </div>
+                @endif
+                Votre Avatar
+            <div class="mx-auto d-block">
+                <img class="rounded-circle mx-auto d-block" src="/assets/admin/images/avatar/user-{{\Auth::User()->avatar}}.jpg" alt="Card image cap" style="height:12rem">
+            </div>
+            <hr>
+            Cliquer sur un avatar pour mettre a jour votre avatar
+            <div class="row">
+            @for ($i = 1; $i < 16; $i++)
+                <div class="col-md-6 col-lg-4">
+                    <a href="/ecc/settings/edit/avatar/{{$i}}"><img class="rounded-circle mx-auto d-block" src="/assets/admin/images/avatar/user-{{$i}}.jpg" alt="Card image cap" style="height:12rem"></a>                   
+                </div>
+            @endfor
+            </div>
+                </div>
+                <hr>
+            </div>
+        </div>    
+    </div>
+</div>  
+@endsection
+
+@section('active_page')
+    <?php $active_page = "guide" ?>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/user.js"></script>    
+@endsection
\ No newline at end of file
diff --git a/resources/views/ecc/settings/password.blade.php b/resources/views/ecc/settings/password.blade.php
new file mode 100644
index 00000000..65a1dedc
--- /dev/null
+++ b/resources/views/ecc/settings/password.blade.php
@@ -0,0 +1,57 @@
+@extends('layouts.ecc.main')
+
+@section('content')
+<div class="row">
+    <div class="col-md-12 offset-md-4">
+        <div class="card">
+            <div class="content">
+                <div class="row">
+                    <div class="col-xs-2">
+                        <div class="icon-big icon-info text-center">
+                            <i class="fa fa-cogs"></i>
+                        </div>
+                    </div>
+                    <div class="col-xs-10">
+                        <div class="numbers">
+                            <p>Options</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="row" style="padding:25px;">
+                    <h5>Modifier mon mot de passe</h5>
+                    @if (session('status'))
+                    <div class="alert alert-success">
+                        <button type="button" aria-hidden="true" class="close">×</button>
+                        <span><b> Votre mot de passe a été mis a jour !</span>
+                    </div>
+                @endif
+                <form autocomplete="off" action="/ecc/settings/edit/password" method="POST">
+                    @csrf
+                    <div class="alert alert-warning" id="psw_alert" role="alert" style="display:none;">
+                        Les mot de passe doivent être identique
+                    </div>
+                    <div class="form-group">
+                      <label for="pws">Entrer votre nouveau mot de passe</label>
+                      <input type="password" class="form-control" name="psw" id="psw" placeholder="Mot de passe" onkeyup="checkPassword()">
+                    </div>
+                    <div class="form-group">
+                        <label for="pwsc">Confirmer votre nouveau mot de passe</label>
+                        <input type="password" class="form-control" name="pswc" id="pswc" placeholder="Mot de passe" onkeyup="checkPassword()">
+                    </div>
+                    <button type="submit" id="submit" class="btn btn-primary" disabled>Enregistrer</button>
+                </form>
+                </div>
+                <hr>
+            </div>
+        </div>    
+    </div>
+</div>  
+@endsection
+
+@section('active_page')
+    <?php $active_page = "guide" ?>
+@endsection
+
+@section('custom_scripts')
+<script src="/assets/admin/assets/js/user.js"></script>    
+@endsection
\ No newline at end of file
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
deleted file mode 100644
index 45d047b9..00000000
--- a/resources/views/home.blade.php
+++ /dev/null
@@ -1,22 +0,0 @@
-@extends('layouts.admin')
-
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">Dashboard</div>
-
-                <div class="card-body">
-                    @if (session('status'))
-                        <div class="alert alert-success" role="alert">
-                            {{ session('status') }}
-                        </div>
-                    @endif
-                    You are logged in!
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-@endsection
diff --git a/resources/views/layouts/admin/header.blade.php b/resources/views/layouts/admin/header.blade.php
index 83b6ba23..4e8a4e1a 100644
--- a/resources/views/layouts/admin/header.blade.php
+++ b/resources/views/layouts/admin/header.blade.php
@@ -57,8 +57,8 @@ foreach (Auth::user()->unreadNotifications as $notification) {
               </a>
 
               <div class="user-menu dropdown-menu">
-                      <!--<a class="nav-link" href="/admin/profil"><i class="fa fa-user"></i> {{ trans('admin/header.profil')}}</a>
-                      <a class="nav-link" href="/admin/settings"><i class="fa fa-cog"></i> {{ trans('admin/header.settings')}}</a>-->
+                      <a class="nav-link" href="/admin/profil"><i class="fa fa-user"></i> {{ trans('admin/header.profil')}}</a>
+                      <!--<a class="nav-link" href="/admin/settings"><i class="fa fa-cog"></i> {{ trans('admin/header.settings')}}</a>-->
                       <a class="nav-link" href="/logout"><i class="fa fa-power-off"></i> {{ trans('admin/header.logout')}}</a>
               </div>
           </div>
diff --git a/resources/views/layouts/admin/sidebar.blade.php b/resources/views/layouts/admin/sidebar.blade.php
index fcee491e..054e50a4 100644
--- a/resources/views/layouts/admin/sidebar.blade.php
+++ b/resources/views/layouts/admin/sidebar.blade.php
@@ -18,13 +18,14 @@
               <li class="menu-item-has-children dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-envelope"></i>{{ trans('admin/sidebar.msg_title')}}</a>
                   <ul class="sub-menu children dropdown-menu">
-                      <li><i class="menu-icon fa fa-eye "></i><a href="/admin/message">Afficher les messages</a></li>
+                      <li><i class="menu-icon fa fa-eye"></i><a href="/admin/message">Afficher les messages</a></li>
                       <li><i class="menu-icon fa fa-plus"></i><a href="/admin/message/add">Ajouter un message</a></li>
                       <li><i class="menu-icon fa fa-times"></i><a href="/admin/message">Supprimer un message</a></li>
                   </ul>
               </li>
               <li>
                 <a href="/admin/files"> <i class="menu-icon fa fa-file"></i>Fichiers </a>
+                <a href="/admin/guide"> <i class="menu-icon fa fa-book"></i>Guide pédagogique </a>
                 </li>
               <!--<li class="menu-item-has-children dropdown">
                   <a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="menu-icon fa fa-map"></i>{{ trans('admin/sidebar.blueprint')}}</a>
diff --git a/resources/views/layouts/public/activity.blade.php b/resources/views/layouts/public/activity.blade.php
new file mode 100644
index 00000000..2ccbf9d2
--- /dev/null
+++ b/resources/views/layouts/public/activity.blade.php
@@ -0,0 +1,24 @@
+<section class="spotlight">
+    <div class="image"><img src="/assets/public/images/pic01.jpg" alt="" /></div>
+    <div class="content">
+        <h2>Activité complémentaire</h2>
+        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Consequatur, delectus sint voluptates ullam quis animi atque natus asperiores exercitationem accusamus architecto vero sunt, totam iste minima, quaerat distinctio repudiandae. Lorem ipsum dolor sit amet consectetur, adipisicing elit. Optio necessitatibus facere voluptatum.</p>
+        <a name="activity" id="activity" class="btn btn-primary" href="/activity" role="button">Plus d'information</a>
+    </div>
+</section>
+<section class="spotlight">
+    <div class="image"><img src="/assets/public/images/pic01.jpg" alt="" /></div>
+    <div class="content">
+        <h2>Activité complémentaire</h2>
+        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Consequatur, delectus sint voluptates ullam quis animi atque natus asperiores exercitationem accusamus architecto vero sunt, totam iste minima, quaerat distinctio repudiandae. Lorem ipsum dolor sit amet consectetur, adipisicing elit. Optio necessitatibus facere voluptatum.</p>
+        <a name="activity" id="activity" class="btn btn-primary" href="/activity" role="button">Plus d'information</a>
+    </div>
+</section>
+<section class="spotlight">
+    <div class="image"><img src="/assets/public/images/pic01.jpg" alt="" /></div>
+    <div class="content">
+        <h2>Activité complémentaire</h2>
+        <p>Lorem ipsum dolor, sit amet consectetur adipisicing elit. Consequatur, delectus sint voluptates ullam quis animi atque natus asperiores exercitationem accusamus architecto vero sunt, totam iste minima, quaerat distinctio repudiandae. Lorem ipsum dolor sit amet consectetur, adipisicing elit. Optio necessitatibus facere voluptatum.</p>
+        <a name="activity" id="activity" class="btn btn-primary" href="/activity" role="button">Plus d'information</a>
+    </div>
+</section>
\ No newline at end of file
diff --git a/resources/views/layouts/public/banner.blade.php b/resources/views/layouts/public/banner.blade.php
new file mode 100644
index 00000000..45088180
--- /dev/null
+++ b/resources/views/layouts/public/banner.blade.php
@@ -0,0 +1,13 @@
+<div class="inner">
+    <h2>{{App\Config::getData('escadron_name_full')}}</h2><a class="badge badge-primary edit-btn" href="/admin/public/edit/escadron_name_full" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
+    <p>
+        {{App\Config::getData('element_title')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/element_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
+    </p>
+    <div class="m-5">
+        <p class="m-5">
+            {{ App\Config::getData('text_public_banner_cadet_desc') }}
+            <a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_cadet_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
+        </p>
+    </div>
+</div>
+<div><a href="#one" class="more scrolly">{{ App\Config::getData('text_public_banner_apprendre_plus') }}</a><a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_banner_apprendre_plus" style="top: 30vh;left: 8vw;display:none"><i class="fa fa-pencil" aria-hidden="true"></i></a></div>
\ No newline at end of file
diff --git a/resources/views/layouts/public/footer.blade.php b/resources/views/layouts/public/footer.blade.php
new file mode 100644
index 00000000..a5ab70e2
--- /dev/null
+++ b/resources/views/layouts/public/footer.blade.php
@@ -0,0 +1,10 @@
+<ul class="icons">
+    <li><a href="{{ App\Config::getData('media_twitter')}}" class="icon fa-twitter"><span class="label">Twitter</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_twitter" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+    <li><a href="{{ App\Config::getData('media_facebook')}}" class="icon fa-facebook"><span class="label">Facebook</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_facebook" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+    <li><a href="{{ App\Config::getData('media_instagram')}}" class="icon fa-instagram"><span class="label">Instagram</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_instagram" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+    <li><a href="mailto:{{ App\Config::getData('media_email')}}" class="icon fa-envelope-o"><span class="label">Email</span></a><a class="badge badge-primary edit-btn" href="/admin/public/edit/media_email" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></li>
+</ul>
+<ul class="copyright">
+    <li>&copy; <a href="https://gitlab.com/TheGamecraft/c-cms">C-CMS</a></li>
+    <li>Design: <a href="http://html5up.net">HTML5 UP</a></li>
+</ul>
\ No newline at end of file
diff --git a/resources/views/layouts/public/head.blade.php b/resources/views/layouts/public/head.blade.php
new file mode 100644
index 00000000..90beeab7
--- /dev/null
+++ b/resources/views/layouts/public/head.blade.php
@@ -0,0 +1,6 @@
+<title>{{ App\Config::getData('escadron_name_full')}}</title>
+<meta charset="utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+<link rel="stylesheet" href="/assets/public/assets/css/main.css" />
+<noscript><link rel="stylesheet" href="/assets/public/assets/css/noscript.css" /></noscript>
\ No newline at end of file
diff --git a/resources/views/layouts/public/header.blade.php b/resources/views/layouts/public/header.blade.php
new file mode 100644
index 00000000..3b4859c1
--- /dev/null
+++ b/resources/views/layouts/public/header.blade.php
@@ -0,0 +1,26 @@
+<h1><a href="/">{{ App\Config::getData('escadron_name_full')}}</a></h1>
+<nav id="nav">
+	<ul>
+		<li class="special">
+			<a href="#menu" class="menuToggle"><span>Menu</span></a>
+			<div id="menu">
+				<ul>
+					<li><a href="/">Accueil</a></li>
+					<li><a href="#news">Nouvelles</a></li>
+					<li><a href="#activity">Nos Activitées</a></li>
+					<li><a href="#picture">Photos</a></li>
+					<li><a href="#">Calendrier</a></li>
+					<li><a href="#cta">Nous rejoindre</a></li>
+					<li><a href="/login">Connexion</a></li>
+
+				</ul>
+				<hr>
+				<div>
+					<h5>Option</h5>
+					<input type="checkbox" id="edit-switch" name="edit-switch" onclick="toggleEdit()">
+					<label for="edit-switch">Activer la modification de la page</label>
+				</div>
+			</div>
+		</li>
+	</ul>
+</nav>
\ No newline at end of file
diff --git a/resources/views/layouts/public/introduction.blade.php b/resources/views/layouts/public/introduction.blade.php
new file mode 100644
index 00000000..6edf18f2
--- /dev/null
+++ b/resources/views/layouts/public/introduction.blade.php
@@ -0,0 +1,8 @@
+<div class="inner">
+    <header class="major">
+        <h2>
+            {{ App\Config::getData('text_public_intro_title')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_intro_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
+        </h2>
+        <p>{{ App\Config::getData('text_public_intro_desc')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_intro_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></p>
+    </header>
+</div>
\ No newline at end of file
diff --git a/resources/views/layouts/public/main.blade.php b/resources/views/layouts/public/main.blade.php
new file mode 100644
index 00000000..b0778a80
--- /dev/null
+++ b/resources/views/layouts/public/main.blade.php
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<!--
+	Spectral by HTML5 UP
+	html5up.net | @ajlkn
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<html>
+
+<head>
+
+	<!-- Include Head -->
+	@include('layouts.public.head')
+
+</head>
+
+<body class="landing is-preload">
+
+	<!-- Page Wrapper -->
+	<div id="page-wrapper">
+
+	<header id="header" class="">
+
+			<!-- Include Header -->
+			@include('layouts.public.header')
+		
+		</header>
+
+		@yield('content')
+
+		<!-- Footer -->
+		<footer id="footer">
+
+			<!-- Include Footer -->
+			@include('layouts.public.footer')
+
+		</footer>
+
+	</div>
+
+	<!-- Scripts -->
+	<script src="/assets/public/assets/js/jquery.min.js"></script>
+	<script src="/assets/public/assets/js/jquery.scrollex.min.js"></script>
+	<script src="/assets/public/assets/js/jquery.scrolly.min.js"></script>
+	<script src="/assets/public/assets/js/browser.min.js"></script>
+	<script src="/assets/public/assets/js/breakpoints.min.js"></script>
+	<script src="/assets/public/assets/js/util.js"></script>
+	<script src="/assets/public/assets/js/main.js"></script>
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
+	<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+	<script>
+		function toggleEdit() {
+			if($('#edit-switch').prop( "checked" )) {
+				$('.edit-btn').css({"display":"inline-block"});
+			} else {
+				$('.edit-btn').css({"display":"none"});
+			}
+		}
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/layouts/public/news.blade.php b/resources/views/layouts/public/news.blade.php
new file mode 100644
index 00000000..e6ba4990
--- /dev/null
+++ b/resources/views/layouts/public/news.blade.php
@@ -0,0 +1,20 @@
+<div class="inner">
+    <div class="align-center">
+        <h2>Nouvelles</h2>
+        <small>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Corrupti perferendis</small>
+    </div>
+    <hr class="mx-5">
+    <div class="row">
+        @foreach ($news as $new)
+            <div class="col-md-4">
+                <h3>{{ new.title }}</h3>
+                <p class=""> {{ new.body }}</p>
+                <span class="news-small">{{ \App\User::find()}}, 19/07/2019 - 18:25</span>
+                <a name="news" id="news" class="btn btn-block btn-secondary mt-2" href="/news" role="button">Voir plus!</a>    
+            </div>
+        @endforeach
+    </div>
+    <div class="align-center m-5">
+       <a name="news-all" id="news-all" class="btn btn-primary btn-block p-2 text-uppercase" href="/news" role="button">Voir toutes les nouvelles!</a>
+    </div>
+</div>
\ No newline at end of file
diff --git a/resources/views/layouts/public/picture.blade.php b/resources/views/layouts/public/picture.blade.php
new file mode 100644
index 00000000..1f37316c
--- /dev/null
+++ b/resources/views/layouts/public/picture.blade.php
@@ -0,0 +1,12 @@
+<div class="inner">
+	<header class="major">
+		<h2>{{ App\Config::getData('text_public_picture_title')}}</h2><a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_picture_title" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a>
+		<p>{{ App\Config::getData('text_public_picture_desc')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_picture_desc" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></p>
+	</header>
+	<ul class="features">
+		<li>
+			<h3><img src="/assets/public/images/pic01.jpg" alt="Picture" width="100%"></h3>
+			<p>Lorem ipsum dolor sit amet consectetur adipisicing elit. Quibusdam iusto ex corrupti accusantium harum iure aut obcaecati doloremque omnis commodi officiis ut rem cumque sequi tenetur, debitis asperiores esse! Esse.</p>
+		</li>
+	</ul>
+</div>
\ No newline at end of file
diff --git a/resources/views/public/activity.blade.php b/resources/views/public/activity.blade.php
new file mode 100644
index 00000000..dea53056
--- /dev/null
+++ b/resources/views/public/activity.blade.php
@@ -0,0 +1,33 @@
+@extends('layouts.public.main')
+
+@section('content')
+<article id="main">
+        <section class="wrapper style5">
+            <div class="inner">
+
+                <h2>Activité complémentaire</h2>
+                <p>Aliquam ut ex ut interdum donec amet imperdiet eleifend</p>
+
+                <div class="row gtr-50 gtr-uniform">
+                    <div class="col-12"><span class="image fit"><img src="/assets/public/images/banner.jpg" alt=""></span></div>
+                    <div class="col-4"><span class="image fit"><img src="/assets/public/images/pic01.jpg" alt=""></span></div>
+                    <div class="col-4"><span class="image fit"><img src="/assets/public/images/pic02.jpg" alt=""></span></div>
+                    <div class="col-4"><span class="image fit"><img src="/assets/public/images/pic03.jpg" alt=""></span></div>
+                </div>
+
+                <h3>Lorem ipsum dolor</h3>
+                <p>Morbi mattis mi consectetur tortor elementum, varius pellentesque velit convallis. Aenean tincidunt lectus auctor mauris maximus, ac scelerisque ipsum tempor. Duis vulputate ex et ex tincidunt, quis lacinia velit aliquet. Duis non efficitur nisi, id malesuada justo. Maecenas sagittis felis ac sagittis semper. Curabitur purus leo, tempus sed finibus eget, fringilla quis risus. Maecenas et lorem quis sem varius sagittis et a est. Maecenas iaculis iaculis sem. Donec vel dolor at arcu tincidunt bibendum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Fusce ut aliquet justo. Donec id neque ipsum. Integer eget ultricies odio. Nam vel ex a orci fringilla tincidunt. Aliquam eleifend ligula non velit accumsan cursus. Etiam ut gravida sapien.</p>
+
+                <p>Vestibulum ultrices risus velit, sit amet blandit massa auctor sit amet. Sed eu lectus sem. Phasellus in odio at ipsum porttitor mollis id vel diam. Praesent sit amet posuere risus, eu faucibus lectus. Vivamus ex ligula, tempus pulvinar ipsum in, auctor porta quam. Proin nec dui cursus, posuere dui eget interdum. Fusce lectus magna, sagittis at facilisis vitae, pellentesque at etiam. Quisque posuere leo quis sem commodo, vel scelerisque nisi scelerisque. Suspendisse id quam vel tortor tincidunt suscipit. Nullam auctor orci eu dolor consectetur, interdum ullamcorper ante tincidunt. Mauris felis nec felis elementum varius.</p>
+
+                <hr>
+
+                <h4>Feugiat aliquam</h4>
+                <p>Nam sapien ante, varius in pulvinar vitae, rhoncus id massa. Donec varius ex in mauris ornare, eget euismod urna egestas. Etiam lacinia tempor ipsum, sodales porttitor justo. Aliquam dolor quam, semper in tortor eu, volutpat efficitur quam. Fusce nec fermentum nisl. Aenean erat diam, tempus aliquet erat.</p>
+
+                <p>Etiam iaculis nulla ipsum, et pharetra libero rhoncus ut. Phasellus rutrum cursus velit, eget condimentum nunc blandit vel. In at pulvinar lectus. Morbi diam ante, vulputate et imperdiet eget, fermentum non dolor. Ut eleifend sagittis tincidunt. Sed viverra commodo mi, ac rhoncus justo. Duis neque ligula, elementum ut enim vel, posuere finibus justo. Vivamus facilisis maximus nibh quis pulvinar. Quisque hendrerit in ipsum id tellus facilisis fermentum. Proin mauris dui, at vestibulum sit amet, auctor bibendum neque.</p>
+
+            </div>
+        </section>
+    </article>
+@endsection
\ No newline at end of file
diff --git a/resources/views/public/allnews.blade.php b/resources/views/public/allnews.blade.php
new file mode 100644
index 00000000..8a993604
--- /dev/null
+++ b/resources/views/public/allnews.blade.php
@@ -0,0 +1,24 @@
+@extends('layouts.public.main')
+
+@section('content')
+<article id="main">
+    <section class="wrapper style5">
+            <div class="inner">
+                <h2>Nouvelles</h2>
+                <p>Aliquam ut ex ut interdum donec amet imperdiet eleifend</p>
+                <div class="row">
+                    @foreach ($news as $new)
+                        <div class="col-md-4">
+                            <h3>{{ $new->title }}</h3>
+                            <p class="news-body-full">
+                                {{ $new->body }}
+                            </p>
+                            <span class="news-small">{{ \App\User::find($new->user_id)->fullname()}}, {{ $new->created_at }}</span>
+                            <a name="news" id="news" class="btn btn-block btn-secondary mt-2" href="/news/{{ $new->id }}" role="button">Voir plus!</a>    
+                        </div>
+                    @endforeach
+                </div>
+            </div>
+    </section>
+</article>
+@endsection
\ No newline at end of file
diff --git a/resources/views/public/index.blade.php b/resources/views/public/index.blade.php
new file mode 100644
index 00000000..12d74d78
--- /dev/null
+++ b/resources/views/public/index.blade.php
@@ -0,0 +1,51 @@
+@extends('layouts.public.main')
+
+@section('content')
+    <!-- Header -->
+    
+            <!-- Banner -->
+            <section id="banner">
+    
+                <!-- Include Banner -->
+                @include('layouts.public.banner')
+    
+            </section>
+    
+            <!-- News -->
+            <section class="wrapper style2" id="news">
+                @include('layouts.public.news')
+            </section>
+    
+            <!-- Introduction -->
+            <section class="wrapper style1 special" id="activity">
+    
+                <!-- Include Introduction -->
+                @include('layouts.public.introduction')
+    
+            </section>
+    
+            <!-- Activités -->
+            <section class="wrapper alt style6">
+    
+                <!-- Include Activity -->
+                @include('layouts.public.activity')
+    
+            </section>
+    
+            <!-- Photos -->
+            <section class="wrapper style3 special" id="picture">
+    
+                <!-- Include Picture -->
+                @include('layouts.public.picture')
+    
+            </section>
+    
+            <!-- CTA -->
+            <section id="cta" class="wrapper">
+                <div class="inner">
+                    <h2>{{ App\Config::getData('text_public_cta')}}<a class="badge badge-primary edit-btn" href="/admin/public/edit/text_public_cta" style="display: none;"><i class="fa fa-pencil" aria-hidden="true"></i></a></h2>
+                    <a href="{{ App\Config::getData('escadron_direct_googlemap_link')}}" class="button fit primary">{{ App\Config::getData('escadron_address')}} - {{ App\Config::getData('escadron_phone')}}</a>
+                </div>
+            </section>
+    
+@endsection
\ No newline at end of file
diff --git a/resources/views/public/news.blade.php b/resources/views/public/news.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/views/public/picture.blade.php b/resources/views/public/picture.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/views/william.blade.php b/resources/views/william.blade.php
deleted file mode 100644
index 66cd407d..00000000
--- a/resources/views/william.blade.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html lang="fr">
-<head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-
-    <!-- CSRF Token -->
-    <meta name="csrf-token" content="lPHUGUCSLvaSRcwApSQAmNdRXiT2rEmbX8GjweRf">
-
-    <title>C-CMS</title>
-
-    <!-- Scripts -->
-    <script src="https://dev.c-cms.cf/js/app.js" defer></script>
-
-    <!-- Fonts -->
-    <link rel="dns-prefetch" href="https://fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css?family=Raleway:300,400,600" rel="stylesheet" type="text/css">
-
-    <!-- Styles -->
-    <link href="https://dev.c-cms.cf/css/app.css" rel="stylesheet">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.2.0/css/all.css" integrity="sha384-hWVjflwFxL6sNzntih27bfxkr27PmbbK/iSvJ+a4+0owXq79v+lsFkW54bOGbiDQ" crossorigin="anonymous">
-</head>
-<body style="background-color: #343a40 !important">
-    <div id="app">
-        <nav class="navbar navbar-expand-md navbar-light navbar-laravel" style="background:#272c33;">
-            <div class="container">
-                <a class="navbar-brand">
-                    <img src="/assets/admin/images/C-CMS_s.png" alt="Logo">
-                </a>
-                <div class="float-right" style="color:white;">Status <i class="fas fa-circle" style="color:green;"></i>
-                </div>
-            </div>
-        </nav>
-
-        <main class="py-4" style="margin-top: 11%">
-            <div class="container">
-                <div class="row justify-content-center">
-                    <div class="col-md-6">
-                        <div class="card">
-                            <div class="card-header">Escadron 697</div>
-
-                            <div class="card-body">
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <img src="/images/leaf_of_canada.png" alt="logo" style="width:8rem">
-                                    </div>
-                                    <div class="col-md-9" style="margin:auto;">
-                                        <a class="btn btn-primary btn-block" style="color:white;"><strong><i class="fas fa-sign-in-alt"></i> Connexion ...</strong></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-6">
-                        <div class="card">
-                            <div class="card-header">Escadron 736</div>
-
-                            <div class="card-body">
-                                <div class="row">
-                                    <div class="col-md-3">
-                                        <img src="/images/leaf_of_canada.png" alt="logo" style="width:8rem">
-                                    </div>
-                                    <div class="col-md-9" style="margin:auto;">
-                                        <a class="btn btn-primary btn-block" style="color:white;"><strong><i class="fas fa-sign-in-alt"></i> Connexion ...</strong></a>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </main>
-    </div>
-</body>
-</html>
diff --git a/routes/web.php b/routes/web.php
index fbb65bc0..25878984 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,16 +16,13 @@ use Illuminate\Support\Facades\Storage;
 Auth::routes();
 Route::get('logout', 'Auth\LoginController@logout')->name('logout');
 
-/* Index Route */
-if (env('APP_DEBUG')) {
-    Route::get('/', function () {
-        return view('default');
-    });
-} else {
-    Route::get('/', function () {
-        return view('public');
-    });
-}
+
+
+/** Public Route */
+Route::get('/', 'PublicController@index');
+Route::get('/news', 'NewsController@index');
+Route::get('/news/{id}', 'NewsController@show');
+Route::get('/activity', 'ComplementaryActivityController@index');
 
 Route::middleware(['auth','admin'])->group(function () {
 
@@ -65,6 +62,9 @@ Route::middleware(['auth','admin'])->group(function () {
         Route::get('/admin/config/job/edit/{id}' , 'JobController@edit');
         Route::get('/admin/config' , 'ConfigController@index');
 
+        /** Public page */
+        Route::get('/admin/public/edit/{config}', 'PublicController@edit');
+        Route::post('/admin/public/edit/{config}', 'PublicController@update');
 
         /** Inventory */
         Route::get('/admin/inventory' , 'InventoryController@index');
@@ -89,11 +89,16 @@ Route::middleware(['auth','admin'])->group(function () {
 
         /** Profil */
         Route::get('/admin/profil/avatar' , 'UserController@UserAvatar');
+        Route::get('/admin/profil/password' , 'UserController@UserPassword');
+        Route::get('/admin/profil/adress' , 'UserController@UserAdress');
+        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');
 
         /** Files */
         Route::get('/admin/files','FilesController@index');
+        Route::get('/admin/guide','FilesController@guide');
 });
 
 Route::middleware(['auth','staff'])->group(function () {
@@ -112,20 +117,15 @@ Route::middleware(['auth','staff'])->group(function () {
         Route::post('/ecc/inventory/remove/{id}/{periode}/{niveau}' , 'ECCController@booking_remove');
         Route::get('/ecc/list','ECCController@list');
         Route::get('/ecc/files','ECCController@files');
+        Route::get('/ecc/settings','ECCController@settings');
+        Route::get('/ecc/settings/password' , 'ECCController@UserPassword');
+        Route::post('/ecc/settings/edit/password' , 'UserController@editUserPassword');
+        Route::get('/ecc/settings/avatar', 'ECCController@UserAvatar');
+        Route::get('/ecc/settings/edit/avatar/{id}' , 'UserController@editUserAvatar');
+        Route::get('/ecc/settings/adress', 'ECCController@UserAdress');
+        Route::post('/ecc/settings/edit/adress', 'UserController@editUserAdress');
 
-});
-/* Other Route */
-Route::get('/test', function () {
-    
-    $fileContents = "1234";
-
-    Storage::put('avatars/1', $fileContents);
-    return view('test');
 
 });
 
-Route::get('/william', function() {
-    return view('william');
-});
-
 
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index d37260f7..3038cc4f 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -6,6 +6,7 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'App\\ComplementaryActivity' => $baseDir . '/app/ComplementaryActivity.php',
     'App\\Config' => $baseDir . '/app/Config.php',
     'App\\Console\\Kernel' => $baseDir . '/app/Console/Kernel.php',
     'App\\Exceptions\\Handler' => $baseDir . '/app/Exceptions/Handler.php',
@@ -16,15 +17,19 @@ return array(
     'App\\Http\\Controllers\\Auth\\RegisterController' => $baseDir . '/app/Http/Controllers/Auth/RegisterController.php',
     'App\\Http\\Controllers\\Auth\\ResetPasswordController' => $baseDir . '/app/Http/Controllers/Auth/ResetPasswordController.php',
     'App\\Http\\Controllers\\CalendarController' => $baseDir . '/app/Http/Controllers/CalendarController.php',
+    'App\\Http\\Controllers\\ComplementaryActivityController' => $baseDir . '/app/Http/Controllers/ComplementaryActivityController.php',
     'App\\Http\\Controllers\\ConfigController' => $baseDir . '/app/Http/Controllers/ConfigController.php',
     'App\\Http\\Controllers\\Controller' => $baseDir . '/app/Http/Controllers/Controller.php',
     'App\\Http\\Controllers\\ECCController' => $baseDir . '/app/Http/Controllers/ECCController.php',
+    'App\\Http\\Controllers\\FilesController' => $baseDir . '/app/Http/Controllers/FilesController.php',
     'App\\Http\\Controllers\\InventoryController' => $baseDir . '/app/Http/Controllers/InventoryController.php',
     'App\\Http\\Controllers\\ItemController' => $baseDir . '/app/Http/Controllers/ItemController.php',
     'App\\Http\\Controllers\\JobController' => $baseDir . '/app/Http/Controllers/JobController.php',
     'App\\Http\\Controllers\\LocalController' => $baseDir . '/app/Http/Controllers/LocalController.php',
     'App\\Http\\Controllers\\LogController' => $baseDir . '/app/Http/Controllers/LogController.php',
     'App\\Http\\Controllers\\MessageController' => $baseDir . '/app/Http/Controllers/MessageController.php',
+    'App\\Http\\Controllers\\NewsController' => $baseDir . '/app/Http/Controllers/NewsController.php',
+    'App\\Http\\Controllers\\PublicController' => $baseDir . '/app/Http/Controllers/PublicController.php',
     'App\\Http\\Controllers\\RankController' => $baseDir . '/app/Http/Controllers/RankController.php',
     'App\\Http\\Controllers\\ScheduleController' => $baseDir . '/app/Http/Controllers/ScheduleController.php',
     'App\\Http\\Controllers\\TaskController' => $baseDir . '/app/Http/Controllers/TaskController.php',
@@ -42,9 +47,11 @@ return array(
     'App\\Local' => $baseDir . '/app/Local.php',
     'App\\Log' => $baseDir . '/app/Log.php',
     'App\\Message' => $baseDir . '/app/Message.php',
+    'App\\News' => $baseDir . '/app/News.php',
     'App\\Notifications\\Alert' => $baseDir . '/app/Notifications/Alert.php',
     'App\\Notifications\\mail' => $baseDir . '/app/Notifications/mail.php',
     'App\\Notifications\\sms' => $baseDir . '/app/Notifications/sms.php',
+    'App\\Picture' => $baseDir . '/app/Picture.php',
     'App\\Providers\\AppServiceProvider' => $baseDir . '/app/Providers/AppServiceProvider.php',
     'App\\Providers\\AuthServiceProvider' => $baseDir . '/app/Providers/AuthServiceProvider.php',
     'App\\Providers\\BroadcastServiceProvider' => $baseDir . '/app/Providers/BroadcastServiceProvider.php',
@@ -3548,9 +3555,10 @@ return array(
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
     'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
     'Tests\\CreatesApplication' => $baseDir . '/tests/CreatesApplication.php',
-    'Tests\\Feature\\ExampleTest' => $baseDir . '/tests/Feature/ExampleTest.php',
+    'Tests\\Feature\\AdminTest' => $baseDir . '/tests/Feature/AdminTest.php',
+    'Tests\\Feature\\ECCTest' => $baseDir . '/tests/Feature/ECCTest.php',
+    'Tests\\Feature\\PublicTest' => $baseDir . '/tests/Feature/PublicTest.php',
     'Tests\\TestCase' => $baseDir . '/tests/TestCase.php',
-    'Tests\\Unit\\ExampleTest' => $baseDir . '/tests/Unit/ExampleTest.php',
     'Text_Template' => $vendorDir . '/phpunit/php-text-template/src/Template.php',
     'TheSeer\\Tokenizer\\Exception' => $vendorDir . '/theseer/tokenizer/src/Exception.php',
     'TheSeer\\Tokenizer\\NamespaceUri' => $vendorDir . '/theseer/tokenizer/src/NamespaceUri.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index e826fde6..382743b6 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -390,6 +390,7 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15
     );
 
     public static $classMap = array (
+        'App\\ComplementaryActivity' => __DIR__ . '/../..' . '/app/ComplementaryActivity.php',
         'App\\Config' => __DIR__ . '/../..' . '/app/Config.php',
         'App\\Console\\Kernel' => __DIR__ . '/../..' . '/app/Console/Kernel.php',
         'App\\Exceptions\\Handler' => __DIR__ . '/../..' . '/app/Exceptions/Handler.php',
@@ -400,15 +401,19 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15
         'App\\Http\\Controllers\\Auth\\RegisterController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/RegisterController.php',
         'App\\Http\\Controllers\\Auth\\ResetPasswordController' => __DIR__ . '/../..' . '/app/Http/Controllers/Auth/ResetPasswordController.php',
         'App\\Http\\Controllers\\CalendarController' => __DIR__ . '/../..' . '/app/Http/Controllers/CalendarController.php',
+        'App\\Http\\Controllers\\ComplementaryActivityController' => __DIR__ . '/../..' . '/app/Http/Controllers/ComplementaryActivityController.php',
         'App\\Http\\Controllers\\ConfigController' => __DIR__ . '/../..' . '/app/Http/Controllers/ConfigController.php',
         'App\\Http\\Controllers\\Controller' => __DIR__ . '/../..' . '/app/Http/Controllers/Controller.php',
         'App\\Http\\Controllers\\ECCController' => __DIR__ . '/../..' . '/app/Http/Controllers/ECCController.php',
+        'App\\Http\\Controllers\\FilesController' => __DIR__ . '/../..' . '/app/Http/Controllers/FilesController.php',
         'App\\Http\\Controllers\\InventoryController' => __DIR__ . '/../..' . '/app/Http/Controllers/InventoryController.php',
         'App\\Http\\Controllers\\ItemController' => __DIR__ . '/../..' . '/app/Http/Controllers/ItemController.php',
         'App\\Http\\Controllers\\JobController' => __DIR__ . '/../..' . '/app/Http/Controllers/JobController.php',
         'App\\Http\\Controllers\\LocalController' => __DIR__ . '/../..' . '/app/Http/Controllers/LocalController.php',
         'App\\Http\\Controllers\\LogController' => __DIR__ . '/../..' . '/app/Http/Controllers/LogController.php',
         'App\\Http\\Controllers\\MessageController' => __DIR__ . '/../..' . '/app/Http/Controllers/MessageController.php',
+        'App\\Http\\Controllers\\NewsController' => __DIR__ . '/../..' . '/app/Http/Controllers/NewsController.php',
+        'App\\Http\\Controllers\\PublicController' => __DIR__ . '/../..' . '/app/Http/Controllers/PublicController.php',
         'App\\Http\\Controllers\\RankController' => __DIR__ . '/../..' . '/app/Http/Controllers/RankController.php',
         'App\\Http\\Controllers\\ScheduleController' => __DIR__ . '/../..' . '/app/Http/Controllers/ScheduleController.php',
         'App\\Http\\Controllers\\TaskController' => __DIR__ . '/../..' . '/app/Http/Controllers/TaskController.php',
@@ -426,9 +431,11 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15
         'App\\Local' => __DIR__ . '/../..' . '/app/Local.php',
         'App\\Log' => __DIR__ . '/../..' . '/app/Log.php',
         'App\\Message' => __DIR__ . '/../..' . '/app/Message.php',
+        'App\\News' => __DIR__ . '/../..' . '/app/News.php',
         'App\\Notifications\\Alert' => __DIR__ . '/../..' . '/app/Notifications/Alert.php',
         'App\\Notifications\\mail' => __DIR__ . '/../..' . '/app/Notifications/mail.php',
         'App\\Notifications\\sms' => __DIR__ . '/../..' . '/app/Notifications/sms.php',
+        'App\\Picture' => __DIR__ . '/../..' . '/app/Picture.php',
         'App\\Providers\\AppServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AppServiceProvider.php',
         'App\\Providers\\AuthServiceProvider' => __DIR__ . '/../..' . '/app/Providers/AuthServiceProvider.php',
         'App\\Providers\\BroadcastServiceProvider' => __DIR__ . '/../..' . '/app/Providers/BroadcastServiceProvider.php',
@@ -3932,9 +3939,10 @@ class ComposerStaticInit7aa8410dad307922e6e62bcfdfadda15
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
         'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
         'Tests\\CreatesApplication' => __DIR__ . '/../..' . '/tests/CreatesApplication.php',
-        'Tests\\Feature\\ExampleTest' => __DIR__ . '/../..' . '/tests/Feature/ExampleTest.php',
+        'Tests\\Feature\\AdminTest' => __DIR__ . '/../..' . '/tests/Feature/AdminTest.php',
+        'Tests\\Feature\\ECCTest' => __DIR__ . '/../..' . '/tests/Feature/ECCTest.php',
+        'Tests\\Feature\\PublicTest' => __DIR__ . '/../..' . '/tests/Feature/PublicTest.php',
         'Tests\\TestCase' => __DIR__ . '/../..' . '/tests/TestCase.php',
-        'Tests\\Unit\\ExampleTest' => __DIR__ . '/../..' . '/tests/Unit/ExampleTest.php',
         'Text_Template' => __DIR__ . '/..' . '/phpunit/php-text-template/src/Template.php',
         'TheSeer\\Tokenizer\\Exception' => __DIR__ . '/..' . '/theseer/tokenizer/src/Exception.php',
         'TheSeer\\Tokenizer\\NamespaceUri' => __DIR__ . '/..' . '/theseer/tokenizer/src/NamespaceUri.php',