diff --git a/app/Http/Controllers/ComplementaryActivityController.php b/app/Http/Controllers/ComplementaryActivityController.php
index 33e83a51..0213338c 100644
--- a/app/Http/Controllers/ComplementaryActivityController.php
+++ b/app/Http/Controllers/ComplementaryActivityController.php
@@ -45,6 +45,10 @@ class ComplementaryActivityController extends Controller
         $activity->begin_time = request('begin_time');
         $activity->end_time = request('end_time');
         $activity->location = request('location');
+        $activity->public_slogan = "Veuillez modifier le slogan publique par défaut";
+        $activity->public_header_picture = "./assets/img/bg2.jpg";
+        $activity->location = request('location');
+        $activity->location = request('location');
         if(request('is_mandatory') == 'on')
         {
             $activity->is_mandatory = true;
@@ -64,7 +68,7 @@ class ComplementaryActivityController extends Controller
         
         $activity->save();
 
-        return redirect('/admin/config/activity')->with('status','Activité ajouté avec succes');
+        return redirect('/admin/config/activity')->with('success','Activité ajouté avec succes');
     }
 
     /**
@@ -73,9 +77,9 @@ class ComplementaryActivityController extends Controller
      * @param  \App\ComplementaryActivity  $complementaryActivity
      * @return \Illuminate\Http\Response
      */
-    public function show(ComplementaryActivity $complementaryActivity)
+    public function show($id)
     {
-        return view('public.activity');
+        return view('public.activity',['activity' => ComplementaryActivity::find($id)]);
     }
 
     /**
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 c862dc88..6f8f739b 100644
--- a/database/migrations/2014_10_12_000000_create_users_table.php
+++ b/database/migrations/2014_10_12_000000_create_users_table.php
@@ -42,7 +42,7 @@ class CreateUsersTable extends Migration
             $table->string('user_see')->default('unknown');       
             $table->string('user_edit')->default('unknown');        
             $table->string('user_notify')->default('unknown');
-            $table->string('api_token', 60)->unique()->default(str_random(60));
+            $table->string('api_token', 60)->unique()->default(str_shuffle(str_random(60)));
             $table->rememberToken();
             $table->timestamps();
         });
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
index f721af3c..239cac4d 100644
--- a/database/migrations/2019_07_19_183610_create_complementary_activities_table.php
+++ b/database/migrations/2019_07_19_183610_create_complementary_activities_table.php
@@ -17,6 +17,8 @@ class CreateComplementaryActivitiesTable extends Migration
             $table->increments('id');
             $table->string('name');
             $table->text('public_body');
+            $table->text('public_slogan');
+            $table->string('public_header_picture');
             $table->text('admin_desc');
             $table->string('calendar_color')->default('blue');
             $table->string('calendar_icon')->default('<i class="fa fa-question-circle"></i>');
diff --git a/database/seeds/ComplementaryActivitiesSeeder.php b/database/seeds/ComplementaryActivitiesSeeder.php
index 0fa3cf0d..65d63b04 100644
--- a/database/seeds/ComplementaryActivitiesSeeder.php
+++ b/database/seeds/ComplementaryActivitiesSeeder.php
@@ -20,6 +20,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '21:45',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -30,6 +32,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '23:59',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -40,6 +44,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '23:59',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -50,6 +56,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '23:59',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -60,6 +68,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '23:59',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -70,6 +80,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '21:00',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -80,6 +92,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '21:00',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ],
             [
@@ -90,6 +104,8 @@ class ComplementaryActivitiesSeeder extends Seeder
                 'end_time' => '21:00',
                 'Location' => 'Escadron',
                 'public_body' => 'Veuillez modifier le text de description publique par défaut',
+                'public_slogan' => 'Veuillez modifier le slogan publique par défaut',
+                'public_header_picture' => './assets/img/bg2.jpg',
                 'admin_desc' => 'Veuillez modifier la description admin par défaut',
             ]
         ]);
diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php
index 31fbca50..e5f20ab1 100644
--- a/database/seeds/UsersTableSeeder.php
+++ b/database/seeds/UsersTableSeeder.php
@@ -23,6 +23,7 @@ class UsersTableSeeder extends Seeder
                 'avatar' => '3',
                 'sexe' => 'm',
                 'job' => '1',
+                'api_token' => str_shuffle(str_random(60)),
             ],
             [
                 'firstname' => 'Administrateur',
@@ -35,6 +36,7 @@ class UsersTableSeeder extends Seeder
                 'avatar' => '3',
                 'sexe' => 'm',
                 'job' => '1',
+                'api_token' => str_shuffle(str_random(60)),
             ]
         ]);
     }
diff --git a/resources/views/admin/configs/activity-add.blade.php b/resources/views/admin/configs/activity-add.blade.php
index dcfef617..a57b5262 100644
--- a/resources/views/admin/configs/activity-add.blade.php
+++ b/resources/views/admin/configs/activity-add.blade.php
@@ -7,105 +7,105 @@
             Ajouter une acitivité
         </div>
         <div class="card-body">
-            <div class="row form-group">
-                <form class="w-100" method="POST" action="/admin/config/activity/add">
+                <form method="POST" action="/admin/config/activity/add">
                     @csrf
-                    <div class="col col-md-6" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="name">Nom de l'activite</label>
-                            <input type="text"
-                            class="form-control" name="name" id="name" aria-describedby="helpName" placeholder="Soirée d'instruction réguliere">
-                            <small id="helpName" class="form-text text-muted">Veuillez entrer le nom de l'activité</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-3" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="calendar_color">Couleur dans le calendrier</label>
-                            <input type="text"
-                            class="form-control" name="calendar_color" id="calendar_color" aria-describedby="helpcalendar_color" placeholder="#000000 ou red">
-                            <small id="helpcalendar_color" class="form-text text-muted">Nom de la couleur en anglais ou valeur HTML</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-3" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="calendar_icon">Icone dans le calendrier</label>
-                            <input type="text"
-                            class="form-control" name="calendar_icon" id="calendar_icon" aria-describedby="helpcalendar_icon" placeholder='<i class="fa fa-book" aria-hidden="true"></i>
-                            '>
-                            <small id="helpcalendar_icon" class="form-text text-muted">Balise complete de l'icon Font-Awesome</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-3" style="margin: auto;">
-                        <div class="form-group">
-                            <div class="col col-md-8">
-                                <label for="text-input" class=" form-control-label">Obligatoire par défaut</label>
-                                <small class="form-text text-muted">L'activitée est t-elle obligatoire par défaut lors de la création d'activité dans l'horaire</small>
+                    <div class="row">
+                        <div class="col-md-6">
+                            <div class="form-group">
+                                <label for="name">Nom de l'activite</label>
+                                <input type="text"
+                                       class="form-control" name="name" id="name" aria-describedby="helpName" placeholder="Soirée d'instruction réguliere" required>
+                                <small id="helpName" class="form-text text-muted">Veuillez entrer le nom de l'activité</small>
                             </div>
-                            <div class="col col-md-4" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;">
-                                    <input id="is_mandatory" name="is_mandatory" class="switch-input" type="checkbox">
-                                    <span class="switch-label"></span><span class="switch-handle"></span>
-                                </label>
+                        </div>
+                        <div class=" col-md-3">
+                            <div class="form-group">
+                                <label for="calendar_color">Couleur dans le calendrier</label>
+                                <input type="text"
+                                       class="form-control" name="calendar_color" id="calendar_color" aria-describedby="helpcalendar_color" placeholder="#000000 ou red" required>
+                                <small id="helpcalendar_color" class="form-text text-muted">Nom de la couleur en anglais ou valeur HTML</small>
                             </div>
-                        </div>    
-                    </div>
-                    <div class="col col-md-3" style="margin: auto;">
-                        <div class="form-group">
-                            <div class="col col-md-8">
-                                <label for="text-input" class=" form-control-label">Promu sur la page d'accueil</label>
-                                <small class="form-text text-muted">L'activitée doit-elle être visible sur la page d'accueil</small>
+                        </div>
+                        <div class=" col-md-3">
+                            <div class="form-group">
+                                <label for="calendar_icon">Icone dans le calendrier</label>
+                                <input type="text"
+                                       class="form-control" name="calendar_icon" id="calendar_icon" aria-describedby="helpcalendar_icon" placeholder='<i class="fa fa-book" aria-hidden="true"></i>' required>
+                                <small id="helpcalendar_icon" class="form-text text-muted">Balise complete de l'icon Font-Awesome</small>
                             </div>
-                            <div class="col col-md-4" style="margin: auto;">
-                                <label for="disabled-input" class=" form-control-label"></label>
-                                <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;">
-                                    <input id="is_promoted" name="is_promoted" class="switch-input" type="checkbox">
-                                    <span class="switch-label"></span><span class="switch-handle"></span>
-                                </label>
+                        </div>
+                        <div class=" col-md-3">
+                            <div class="form-group">
+                                <div class="col col-md-8">
+                                    <label for="text-input" class=" form-control-label">Obligatoire par défaut</label>
+                                    <small class="form-text text-muted">L'activitée est t-elle obligatoire par défaut lors de la création d'activité dans l'horaire</small>
+                                </div>
+                                <div class=" col-md-4">
+                                    <label for="disabled-input" class=" form-control-label"></label>
+                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;">
+                                        <input id="is_mandatory" name="is_mandatory" class="switch-input" type="checkbox">
+                                        <span class="switch-label"></span><span class="switch-handle"></span>
+                                    </label>
+                                </div>
                             </div>
-                        </div>    
-                    </div>
-                    <div class="col col-md-3" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="begin_time">Heure de début par défaut</label>
-                            <input type="time"
-                            class="form-control" name="begin_time" id="begin_time" aria-describedby="helpName">
-                            <small id="helpName" class="form-text text-muted">Heure de début par défaut lors de la création d'activité dans l'horaire</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-3" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="end_time">Heure de fin par défaut</label>
-                            <input type="time"
-                            class="form-control" name="end_time" id="end_time" aria-describedby="helpName">
-                            <small id="helpName" class="form-text text-muted">Heure de fin par défaut lors de la création d'activité dans l'horaire</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-6" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="location">Emplacement par défaut</label>
-                            <input type="text"
-                            class="form-control" name="location" id="location" aria-describedby="helpName" placeholder="Soirée d'instruction réguliere">
-                            <small id="helpName" class="form-text text-muted">Emplacement par défaut de l'activité</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-6" style="margin: auto;">
-                        <div class="form-group">
-                            <label for="admin_desc">Description par défaut sur le calendrier</label>
-                            <textarea type="text"
-                            class="form-control" name="admin_desc" id="admin_desc" aria-describedby="helpName" placeholder='Veuillez modifier la description admin par défaut'></textarea>
-                            <small id="helpName" class="form-text text-muted">Description par défaut lors de la création d'activité dans l'horaire</small>
-                        </div>    
-                    </div>
-                    <div class="col col-md-6" style="margin: auto;">
-                        <div class="form-group">
-                            <a href="/admin/config/activity" class="btn btn-secondary">Annuler</a>
-                            <button type="submit" class="btn btn-primary">Sauvegarder</button>
-                        </div>    
+                        </div>
+                        <div class=" col-md-3">
+                            <div class="form-group">
+                                <div class="col col-md-8">
+                                    <label for="text-input" class=" form-control-label">Promu sur la page d'accueil</label>
+                                    <small class="form-text text-muted">L'activitée doit-elle être visible sur la page d'accueil</small>
+                                </div>
+                                <div class="col col-md-4">
+                                    <label for="disabled-input" class=" form-control-label"></label>
+                                    <label class="switch switch-3d switch-primary mr-3" style="margin-left: 3rem;">
+                                        <input id="is_promoted" name="is_promoted" class="switch-input" type="checkbox">
+                                        <span class="switch-label"></span><span class="switch-handle"></span>
+                                    </label>
+                                </div>
+                            </div>
+                        </div>
+                        <div class=" col-md-3">
+                            <div class="form-group">
+                                <label for="begin_time">Heure de début par défaut</label>
+                                <input type="time"
+                                       class="form-control" name="begin_time" id="begin_time" aria-describedby="helpName" required>
+                                <small id="helpName" class="form-text text-muted">Heure de début par défaut lors de la création d'activité dans l'horaire</small>
+                            </div>
+                        </div>
+                        <div class=" col-md-3">
+                            <div class="form-group">
+                                <label for="end_time">Heure de fin par défaut</label>
+                                <input type="time"
+                                       class="form-control" name="end_time" id="end_time" aria-describedby="helpName" required>
+                                <small id="helpName" class="form-text text-muted">Heure de fin par défaut lors de la création d'activité dans l'horaire</small>
+                            </div>
+                        </div>
+                        <div class=" col-md-6">
+                            <div class="form-group">
+                                <label for="location">Emplacement par défaut</label>
+                                <input type="text"
+                                       class="form-control" name="location" id="location" aria-describedby="helpName" placeholder="Soirée d'instruction réguliere" required>
+                                <small id="helpName" class="form-text text-muted">Emplacement par défaut de l'activité</small>
+                            </div>
+                        </div>
+                        <div class=" col-md-6">
+                            <div class="form-group">
+                                <label for="admin_desc">Description par défaut sur le calendrier</label>
+                                <textarea type="text"
+                                          class="form-control" name="admin_desc" id="admin_desc" aria-describedby="helpName" placeholder='Veuillez modifier la description admin par défaut' required></textarea>
+                                <small id="helpName" class="form-text text-muted">Description par défaut lors de la création d'activité dans l'horaire</small>
+                            </div>
+                        </div>
+                        <div class=" col-md-6">
+                            <div class="form-group">
+                                <a href="/admin/config/activity" class="btn btn-secondary">Annuler</a>
+                                <button type="submit" class="btn btn-primary">Sauvegarder</button>
+                            </div>
+                        </div>
                     </div>
+
                 </form>
             </div>
-        </div>
     </div>
 </div>
 @endsection
diff --git a/resources/views/admin/configs/activity.blade.php b/resources/views/admin/configs/activity.blade.php
index 88e9ab23..a9297b14 100644
--- a/resources/views/admin/configs/activity.blade.php
+++ b/resources/views/admin/configs/activity.blade.php
@@ -81,7 +81,7 @@
 
                     swal(
                     'Supprimé!',
-                    "L'évenement a été supprimé",
+                    "L'activité a été supprimé",
                     'success'
                     ).then((result) => {
                     if (result.value) {
diff --git a/resources/views/admin/schedule/modal/show.blade.php b/resources/views/admin/schedule/modal/show.blade.php
index 667b45d5..040cdc4f 100644
--- a/resources/views/admin/schedule/modal/show.blade.php
+++ b/resources/views/admin/schedule/modal/show.blade.php
@@ -51,7 +51,11 @@
                                                 {{$course->name}}
                                             </div>
                                             <div class="col-sm-6 my-2 text-sm-right">
-                                                {{\App\User::find($course->user_id)->fullname()}}
+                                                @if(\App\User::find($course->user_id))
+                                                 {{\App\User::find($course->user_id)->fullname()}}
+                                                @else
+                                                    Utilisateur Inconnu
+                                                @endif
                                             </div>
                                             <div class="col-sm-6 my-2">
                                                 {{$course->ocom}}
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 9fd12a7b..152fe0d1 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,69 +1,348 @@
-@extends('layouts.app')
+<!--
+ =========================================================
+ Material Dashboard PRO - v2.1.0
+ =========================================================
 
-@section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Login') }}</div>
+ Product Page: https://www.creative-tim.com/product/material-dashboard-pro
+ Copyright 2019 Creative Tim (https://www.creative-tim.com)
 
-                <div class="card-body">
-                    <form method="POST" action="{{ route('login') }}" aria-label="{{ __('Login') }}">
-                        @csrf
+ Coded by Creative Tim
 
-                        <div class="form-group row">
-                            <label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
+ =========================================================
 
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" required autofocus>
+ The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+-->
 
-                                @if ($errors->has('email'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('email') }}</strong>
-                                    </span>
-                                @endif
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="utf-8"/>
+    <link rel="apple-touch-icon" sizes="76x76" href="../../assets/img/apple-icon.png">
+    <link rel="icon" type="image/png" href="../../assets/img/favicon.png">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <title>
+        Material Dashboard PRO by Creative Tim
+    </title>
+    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+          name='viewport'/>
+    <!--     Fonts and icons     -->
+    <link rel="stylesheet" type="text/css"
+          href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Roboto+Slab:400,700|Material+Icons"/>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css">
+    <!-- CSS Files -->
+    <link href="css/material-dashboard.css?v=2.1.0" rel="stylesheet"/>
+</head>
+
+<body class="off-canvas-sidebar">
+<!-- Navbar -->
+<nav class="navbar navbar-expand-lg navbar-transparent navbar-absolute fixed-top text-white">
+    <div class="container">
+        <div class="navbar-wrapper">
+            <a class="navbar-brand" href="#pablo">Connexion - C-CMS</a>
+        </div>
+        <button class="navbar-toggler" type="button" data-toggle="collapse" aria-controls="navigation-index"
+                aria-expanded="false" aria-label="Toggle navigation">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="navbar-toggler-icon icon-bar"></span>
+            <span class="navbar-toggler-icon icon-bar"></span>
+            <span class="navbar-toggler-icon icon-bar"></span>
+        </button>
+        <div class="collapse navbar-collapse justify-content-end">
+            <ul class="navbar-nav">
+                <li class="nav-item ">
+                    <a href="/" class="nav-link">
+                        <i class="material-icons">keyboard_backspace</i> Retour
+                    </a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+<!-- End Navbar -->
+<div class="wrapper wrapper-full-page">
+    <div class="page-header login-page header-filter" filter-color="black"
+         style="background-image: url('/assets/public/images/banner.jpg'); background-size: cover; background-position: top center;">
+        <!--   you can change the color of the filter page using: data-color="blue | purple | green | orange | red | rose " -->
+        <div class="container">
+            <div class="row">
+                <div class="col-lg-5 col-md-7 col-sm-9 ml-auto mr-auto">
+                        <div class="card card-login card-hidden">
+                            <div class="card-header card-header-primary text-center">
+                                <h4 class="card-title">Connexion</h4>
+                            </div>
+                            <div class="card-body m-2">
+                                <span class="bmd-form-group">
+                                <form method="POST" action="{{ route('login') }}" aria-label="{{ __('Login') }}">
+                                    @csrf
+
+                                    <div class="form-group row">
+                                        <label for="email" class="col-sm-4 col-form-label text-md-right">{{ __('E-Mail Address') }}</label>
+
+                                        <div class="col-md-8">
+                                            <input id="email" type="email"
+                                                   class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email"
+                                                   value="{{ old('email') }}" required autofocus>
+
+                                            @if ($errors->has('email'))
+                                                <span class="invalid-feedback" role="alert">
+                                                    <strong>{{ $errors->first('email') }}</strong>
+                                                </span>
+                                            @endif
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group row">
+                                        <label for="password"
+                                               class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
+
+                                        <div class="col-md-8">
+                                            <input id="password" type="password"
+                                                   class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}"
+                                                   name="password" required>
+
+                                            @if ($errors->has('password'))
+                                                <span class="invalid-feedback" role="alert">
+                                                    <strong>{{ $errors->first('password') }}</strong>
+                                                </span>
+                                            @endif
+                                        </div>
+                                    </div>
+                                    <div class="form-group row">
+                                        <div class="col-md-12">
+                                            <button type="submit" class="btn btn-primary btn-block">
+                                                Connexion
+                                            </button>
+                                        </div>
+                                    </div>
+                                </form>
+                              </span>
                             </div>
                         </div>
-
-                        <div class="form-group row">
-                            <label for="password" class="col-md-4 col-form-label text-md-right">{{ __('Password') }}</label>
-
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" required>
-
-                                @if ($errors->has('password'))
-                                    <span class="invalid-feedback" role="alert">
-                                        <strong>{{ $errors->first('password') }}</strong>
-                                    </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group row">
-                            <div class="col-md-6 offset-md-4">
-                                <div class="checkbox">
-                                    <label>
-                                        <input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}> {{ __('Remember Me') }}
-                                    </label>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="form-group row mb-0">
-                            <div class="col-md-8 offset-md-4">
-                                <button type="submit" class="btn btn-primary">
-                                    {{ __('Login') }}
-                                </button>
-
-                                <a class="btn btn-link" href="{{ route('password.request') }}">
-                                    {{ __('Forgot Your Password?') }}
-                                </a>
-                            </div>
-                        </div>
-                    </form>
                 </div>
             </div>
         </div>
+        <footer class="footer">
+            <div class="container-fluid">
+                <nav class="float-left">
+                    <ul>
+                        <li>
+                            <a href="https://gitlab.com/TheGamecraft/c-cms/wikis/home">
+                                Documentation
+                            </a>
+                        </li>
+                        <li>
+                            <a href="https://gitlab.com/TheGamecraft/c-cms/blob/master/LICENSE">
+                                Licenses
+                            </a>
+                        </li>
+                    </ul>
+                </nav>
+                <div class="copyright float-right">
+                    &copy;
+                    <script>
+                        document.write(new Date().getFullYear())
+                    </script>, fait avec <i class="material-icons">favorite</i> par
+                    <a href="https://gitlab.com/c-cms" target="_blank">L'équipe de C-CMS</a>
+                </div>
+            </div>
+        </footer>
     </div>
 </div>
-@endsection
+<!--   Core JS Files   -->
+<script src="/js/core/jquery.min.js"></script>
+<script src="/js/core/popper.min.js"></script>
+<script src="/js/core/bootstrap-material-design.min.js"></script>
+<script src="/js/plugins/perfect-scrollbar.jquery.min.js"></script>
+<!--  Google Maps Plugin    -->
+<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
+<!-- Chartist JS -->
+<script src="/js/plugins/chartist.min.js"></script>
+<!--  Notifications Plugin    -->
+<script src="/js/plugins/bootstrap-notify.js"></script>
+<!-- Control Center for Material Dashboard: parallax effects, scripts for the example pages etc -->
+<script src="/js/material-dashboard.js?v=2.1.0" type="text/javascript"></script>
+<!-- Material Dashboard DEMO methods, don't include it in your project! -->
+<script>
+    $(document).ready(function () {
+        $().ready(function () {
+            $sidebar = $('.sidebar');
+
+            $sidebar_img_container = $sidebar.find('.sidebar-background');
+
+            $full_page = $('.full-page');
+
+            $sidebar_responsive = $('body > .navbar-collapse');
+
+            window_width = $(window).width();
+
+            fixed_plugin_open = $('.sidebar .sidebar-wrapper .nav li.active a p').html();
+
+            if (window_width > 767 && fixed_plugin_open == 'Dashboard') {
+                if ($('.fixed-plugin .dropdown').hasClass('show-dropdown')) {
+                    $('.fixed-plugin .dropdown').addClass('open');
+                }
+
+            }
+
+            $('.fixed-plugin a').click(function (event) {
+                // Alex if we click on switch, stop propagation of the event, so the dropdown will not be hide, otherwise we set the  section active
+                if ($(this).hasClass('switch-trigger')) {
+                    if (event.stopPropagation) {
+                        event.stopPropagation();
+                    } else if (window.event) {
+                        window.event.cancelBubble = true;
+                    }
+                }
+            });
+
+            $('.fixed-plugin .active-color span').click(function () {
+                $full_page_background = $('.full-page-background');
+
+                $(this).siblings().removeClass('active');
+                $(this).addClass('active');
+
+                var new_color = $(this).data('color');
+
+                if ($sidebar.length != 0) {
+                    $sidebar.attr('data-color', new_color);
+                }
+
+                if ($full_page.length != 0) {
+                    $full_page.attr('filter-color', new_color);
+                }
+
+                if ($sidebar_responsive.length != 0) {
+                    $sidebar_responsive.attr('data-color', new_color);
+                }
+            });
+
+            $('.fixed-plugin .background-color .badge').click(function () {
+                $(this).siblings().removeClass('active');
+                $(this).addClass('active');
+
+                var new_color = $(this).data('background-color');
+
+                if ($sidebar.length != 0) {
+                    $sidebar.attr('data-background-color', new_color);
+                }
+            });
+
+            $('.fixed-plugin .img-holder').click(function () {
+                $full_page_background = $('.full-page-background');
+
+                $(this).parent('li').siblings().removeClass('active');
+                $(this).parent('li').addClass('active');
+
+
+                var new_image = $(this).find("img").attr('src');
+
+                if ($sidebar_img_container.length != 0 && $('.switch-sidebar-image input:checked').length != 0) {
+                    $sidebar_img_container.fadeOut('fast', function () {
+                        $sidebar_img_container.css('background-image', 'url("' + new_image + '")');
+                        $sidebar_img_container.fadeIn('fast');
+                    });
+                }
+
+                if ($full_page_background.length != 0 && $('.switch-sidebar-image input:checked').length != 0) {
+                    var new_image_full_page = $('.fixed-plugin li.active .img-holder').find('img').data('src');
+
+                    $full_page_background.fadeOut('fast', function () {
+                        $full_page_background.css('background-image', 'url("' + new_image_full_page + '")');
+                        $full_page_background.fadeIn('fast');
+                    });
+                }
+
+                if ($('.switch-sidebar-image input:checked').length == 0) {
+                    var new_image = $('.fixed-plugin li.active .img-holder').find("img").attr('src');
+                    var new_image_full_page = $('.fixed-plugin li.active .img-holder').find('img').data('src');
+
+                    $sidebar_img_container.css('background-image', 'url("' + new_image + '")');
+                    $full_page_background.css('background-image', 'url("' + new_image_full_page + '")');
+                }
+
+                if ($sidebar_responsive.length != 0) {
+                    $sidebar_responsive.css('background-image', 'url("' + new_image + '")');
+                }
+            });
+
+            $('.switch-sidebar-image input').change(function () {
+                $full_page_background = $('.full-page-background');
+
+                $input = $(this);
+
+                if ($input.is(':checked')) {
+                    if ($sidebar_img_container.length != 0) {
+                        $sidebar_img_container.fadeIn('fast');
+                        $sidebar.attr('data-image', '#');
+                    }
+
+                    if ($full_page_background.length != 0) {
+                        $full_page_background.fadeIn('fast');
+                        $full_page.attr('data-image', '#');
+                    }
+
+                    background_image = true;
+                } else {
+                    if ($sidebar_img_container.length != 0) {
+                        $sidebar.removeAttr('data-image');
+                        $sidebar_img_container.fadeOut('fast');
+                    }
+
+                    if ($full_page_background.length != 0) {
+                        $full_page.removeAttr('data-image', '#');
+                        $full_page_background.fadeOut('fast');
+                    }
+
+                    background_image = false;
+                }
+            });
+
+            $('.switch-sidebar-mini input').change(function () {
+                $body = $('body');
+
+                $input = $(this);
+
+                if (md.misc.sidebar_mini_active == true) {
+                    $('body').removeClass('sidebar-mini');
+                    md.misc.sidebar_mini_active = false;
+
+                    $('.sidebar .sidebar-wrapper, .main-panel').perfectScrollbar();
+
+                } else {
+
+                    $('.sidebar .sidebar-wrapper, .main-panel').perfectScrollbar('destroy');
+
+                    setTimeout(function () {
+                        $('body').addClass('sidebar-mini');
+
+                        md.misc.sidebar_mini_active = true;
+                    }, 300);
+                }
+
+                // we simulate the window Resize so the charts will get updated in realtime.
+                var simulateWindowResize = setInterval(function () {
+                    window.dispatchEvent(new Event('resize'));
+                }, 180);
+
+                // we stop the simulation of Window Resize after the animations are completed
+                setTimeout(function () {
+                    clearInterval(simulateWindowResize);
+                }, 1000);
+
+            });
+        });
+    });
+</script>
+<script>
+    $(document).ready(function () {
+        md.checkFullPageBackgroundImage();
+        setTimeout(function () {
+            // after 1000 ms we add the class animated to the login/register card
+            $('.card').removeClass('card-hidden');
+        }, 700);
+    });
+</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/resources/views/public/activity.blade.php b/resources/views/public/activity.blade.php
index dea53056..ce2a6234 100644
--- a/resources/views/public/activity.blade.php
+++ b/resources/views/public/activity.blade.php
@@ -1,33 +1,49 @@
 @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 class="page-header header-filter clear-filter purple-filter" data-parallax="true" style="background-image: url({{$activity->public_header_picture}});">
+        <div class="container">
+            <div class="row">
+                <div class="col-md-8 ml-auto mr-auto">
+                    <div class="brand">
+                        <h1 class="title">{{$activity->name}}</h1>
+                        <h3>{{$activity->public_slogan}}</h3>
+                    </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>
+        </div>
+    </div>
+    <div class="main main-raised">
+        <div class="container">
+            <div class="section">
+                {{$activity->public_body}}
+            </div>
+            @if(!$activity->pictures->isEmpty())
+                <div class="section">
+                    <div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel">
+                        <ol class="carousel-indicators">
+                            <li data-target="#carouselExampleIndicators" data-slide-to="0" class="active"></li>
+                            <li data-target="#carouselExampleIndicators" data-slide-to="1"></li>
+                            <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
+                        </ol>
+                        <div class="carousel-inner">
+                            @foreach($activity->pictures as $pic)
+                            <div class="carousel-item active">
+                                <img class="d-block w-100" src="{{$pic->url}}" alt="{{$pic->title}}">
+                            </div>
+                            @endforeach
+                        </div>
+                        <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
+                            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+                            <span class="sr-only">Suivant</span>
+                        </a>
+                        <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
+                            <span class="carousel-control-next-icon" aria-hidden="true"></span>
+                            <span class="sr-only">Précédant</span>
+                        </a>
+                    </div>
+                </div>
+            @endif
+        </div>
+    </div>
 @endsection
\ No newline at end of file