From f5ca57fdf2ab0a38ef3efd5db70a4d7430bcab9e Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludo@huma.net>
Date: Sun, 11 Apr 2021 00:36:41 +0200
Subject: [PATCH] Add preview from father, add new features

---
 app/Http/Controllers/Admin/HomeController.php |  26 +-
 .../Botanic/Admin/FamilyController.php        |  72 +++---
 .../Controllers/Shop/Admin/HomeController.php |  36 +--
 app/Http/Controllers/Shop/HomeController.php  |  44 ++--
 app/Repositories/Botanic/Varieties.php        |  50 +---
 app/Repositories/Core/DateRange.php           | 241 +++++++++++-------
 app/Repositories/Core/DateTime.php            | 168 +++++++++---
 app/Repositories/Core/Mailer.php              |  33 +++
 app/Repositories/Core/Media.php               |  56 ++++
 app/Repositories/Core/Tag.php                 |  25 ++
 app/Repositories/Core/Tags.php                |  55 ----
 app/Repositories/Core/Upload.php              | 217 ++++++++++------
 app/Repositories/Core/User/Basket.php         |  63 +++++
 .../Core/User/Notifications/NewUser.php       |  66 +++++
 .../Core/User/Notifications/ResetPassword.php |  31 +++
 app/Repositories/Core/User/PasswordResets.php |  19 ++
 app/Repositories/Shop/Articles.php            |  70 +----
 composer.json                                 |   5 +-
 package.json                                  |   1 +
 .../views/Shop/Admin/Articles/edit.blade.php  |   2 +-
 .../partials/characteristics.blade.php        |  23 +-
 .../Admin/Articles/partials/prices.blade.php  |   4 +-
 .../datatables/buttons/exports.blade.php      |   9 -
 .../datatables/js/datatable.blade.php         |   6 +-
 .../components/form/autocomplete.blade.php    |   2 +-
 .../components/form/datepicker.blade.php      |   2 +-
 .../views/components/form/editor.blade.php    |   2 +-
 .../views/components/form/percent.blade.php   |   2 +-
 .../views/components/form/tags.blade.php      |   2 +-
 .../views/components/form/toggle.blade.php    |   5 +-
 .../components/layout/box-collapse.blade.php  |   2 +-
 .../uploader/block_image_new.blade.php        |   8 +-
 .../uploader/mini-gallery-items.blade.php     |  28 +-
 .../uploader/mini-gallery.blade.php           |  20 +-
 .../components/uploader/widget.blade.php      |  44 ++--
 resources/views/home.blade.php                |   5 +-
 .../layouts/partials/site/topbar.blade.php    |   1 -
 resources/views/load/form/appender.blade.php  |  77 ++++++
 .../load/{ => form}/autocomplete.blade.php    |   0
 .../load/form/builder/formbuilder.blade.php   |   6 +
 .../views/load/form/builder/formio.blade.php  |   9 +
 .../views/load/form/check_fields.blade.php    |  39 +++
 resources/views/load/form/color.blade.php     |  22 ++
 .../load/{ => form}/datepicker.blade.php      |   0
 resources/views/load/form/duallist.blade.php  |  25 ++
 .../views/load/form/editor/editor.blade.php   |  15 ++
 .../views/load/form/editor/tinymce.blade.php  |  41 +++
 resources/views/load/form/select2.blade.php   |  18 ++
 .../views/load/form/set_options.blade.php     |  25 ++
 resources/views/load/form/toggle.blade.php    |  34 +++
 .../load/form/upload/fileinput.blade.php      |  25 ++
 .../views/load/form/upload/upload.blade.php   |  29 +++
 resources/views/load/form/url.blade.php       |  16 ++
 .../views/load/{ => layout}/chevron.blade.php |   0
 resources/views/load/layout/modal.blade.php   | 114 +++++++++
 .../views/load/layout/nicescroll.blade.php    |  29 +++
 .../views/load/layout/slimscroll.blade.php    |   6 +
 resources/views/load/layout/tabs.blade.php    |  39 +++
 58 files changed, 1482 insertions(+), 532 deletions(-)
 create mode 100644 app/Repositories/Core/Mailer.php
 create mode 100644 app/Repositories/Core/Media.php
 create mode 100644 app/Repositories/Core/Tag.php
 delete mode 100644 app/Repositories/Core/Tags.php
 create mode 100644 app/Repositories/Core/User/Basket.php
 create mode 100644 app/Repositories/Core/User/Notifications/NewUser.php
 create mode 100644 app/Repositories/Core/User/Notifications/ResetPassword.php
 create mode 100644 app/Repositories/Core/User/PasswordResets.php
 delete mode 100644 resources/views/components/datatables/buttons/exports.blade.php
 create mode 100644 resources/views/load/form/appender.blade.php
 rename resources/views/load/{ => form}/autocomplete.blade.php (100%)
 create mode 100644 resources/views/load/form/builder/formbuilder.blade.php
 create mode 100644 resources/views/load/form/builder/formio.blade.php
 create mode 100644 resources/views/load/form/check_fields.blade.php
 create mode 100644 resources/views/load/form/color.blade.php
 rename resources/views/load/{ => form}/datepicker.blade.php (100%)
 create mode 100644 resources/views/load/form/duallist.blade.php
 create mode 100644 resources/views/load/form/editor/editor.blade.php
 create mode 100644 resources/views/load/form/editor/tinymce.blade.php
 create mode 100644 resources/views/load/form/select2.blade.php
 create mode 100644 resources/views/load/form/set_options.blade.php
 create mode 100644 resources/views/load/form/toggle.blade.php
 create mode 100644 resources/views/load/form/upload/fileinput.blade.php
 create mode 100644 resources/views/load/form/upload/upload.blade.php
 create mode 100644 resources/views/load/form/url.blade.php
 rename resources/views/load/{ => layout}/chevron.blade.php (100%)
 create mode 100644 resources/views/load/layout/modal.blade.php
 create mode 100644 resources/views/load/layout/nicescroll.blade.php
 create mode 100644 resources/views/load/layout/slimscroll.blade.php
 create mode 100644 resources/views/load/layout/tabs.blade.php

diff --git a/app/Http/Controllers/Admin/HomeController.php b/app/Http/Controllers/Admin/HomeController.php
index 8586dcb7..cdf19022 100644
--- a/app/Http/Controllers/Admin/HomeController.php
+++ b/app/Http/Controllers/Admin/HomeController.php
@@ -7,23 +7,13 @@ use App\Http\Controllers\Controller;
 
 class HomeController extends Controller
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
 
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function index()
-    {
-        // return redirect('dashboard');
-    }
+	public function index()
+	{
+		return view('home'); 
+	}
 }
diff --git a/app/Http/Controllers/Botanic/Admin/FamilyController.php b/app/Http/Controllers/Botanic/Admin/FamilyController.php
index 20d3bb7d..d0e21465 100644
--- a/app/Http/Controllers/Botanic/Admin/FamilyController.php
+++ b/app/Http/Controllers/Botanic/Admin/FamilyController.php
@@ -11,48 +11,48 @@ use App\Datatables\Botanic\FamiliesDataTable;
 class FamilyController extends Controller
 {
 
-    public function index(FamiliesDataTable $dataTable)
-    {
-        return $dataTable->render('Botanic.Admin.Families.list');
-    }
+	public function index(FamiliesDataTable $dataTable)
+	{
+		return $dataTable->render('Botanic.Admin.Families.list');
+	}
 
-    public function getDatatable(Request $request)
-    {
-        return Families::getTables($request->all());
-    }
+	public function getDatatable(Request $request)
+	{
+		return Families::getTables($request->all());
+	}
 
-    public function create()
-    {
-        $data = [];
-        return view('Botanic.Admin.Families.create', $data);
-    }
+	public function create()
+	{
+		$data = [];
+		return view('Botanic.Admin.Families.create', $data);
+	}
 
-    public function store(Request $request)
-    {
-        $ret = Families::store($request);
-        return redirect()->route('Botanic.Admin.Families.index');
-    }
+	public function store(Request $request)
+	{
+		$ret = Families::store($request);
+		return redirect()->route('Botanic.Admin.Families.index');
+	}
 
-    public function show($id)
-    {
-        $data = Families::get($id);
-        return view('Botanic.Admin.Families.view', $data);
-    }
+	public function show($id)
+	{
+		$data = Families::get($id);
+		return view('Botanic.Admin.Families.view', $data);
+	}
 
-    public function edit($id)
-    {
-        $data['family'] = Families::get($id)->toArray();
-        return view('Botanic.Admin.Families.edit', $data);
-    }
+	public function edit($id)
+	{
+		$data['family'] = Families::get($id)->toArray();
+		return view('Botanic.Admin.Families.edit', $data);
+	}
 
-    public function destroy($id)
-    {
-        return Families::destroy($id);
-    }
+	public function destroy($id)
+	{
+		return Families::destroy($id);
+	}
 
-    public function exportExcel() 
-    {
-        return Families::exportExcel();
-    }
+	public function exportExcel() 
+	{
+		return Families::exportExcel();
+	}
 
 }
diff --git a/app/Http/Controllers/Shop/Admin/HomeController.php b/app/Http/Controllers/Shop/Admin/HomeController.php
index 9507f89b..48675fad 100644
--- a/app/Http/Controllers/Shop/Admin/HomeController.php
+++ b/app/Http/Controllers/Shop/Admin/HomeController.php
@@ -7,23 +7,23 @@ use App\Http\Controllers\Controller;
 
 class HomeController extends Controller
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        $this->middleware('auth');
-    }
+	/**
+	 * Create a new controller instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		$this->middleware('auth');
+	}
 
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function index()
-    {
-        return redirect('dashboard');
-    }
+	/**
+	 * Show the application dashboard.
+	 *
+	 * @return \Illuminate\Contracts\Support\Renderable
+	 */
+	public function index()
+	{ 
+		return redirect('dashboard');
+	}
 }
diff --git a/app/Http/Controllers/Shop/HomeController.php b/app/Http/Controllers/Shop/HomeController.php
index 8836a637..a042d567 100644
--- a/app/Http/Controllers/Shop/HomeController.php
+++ b/app/Http/Controllers/Shop/HomeController.php
@@ -10,27 +10,27 @@ use App\Repositories\Shop\Categories;
 
 class HomeController extends Controller
 {
-    /**
-     * Create a new controller instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        // $this->middleware('auth');
-    }
+	/**
+	 * Create a new controller instance.
+	 *
+	 * @return void
+	 */
+	public function __construct()
+	{
+		// $this->middleware('auth');
+	}
 
-    /**
-     * Show the application dashboard.
-     *
-     * @return \Illuminate\Contracts\Support\Renderable
-     */
-    public function index()
-    {
-        $data['categories'] = Categories::getTree();
-        $data['category'] = Categories::get(15)->toArray();
-        $data['articles'] = Articles::getByCategory(0)->toArray();
-        // dump($data);
-        return view('Shop.home', $data);
-    }
+	/**
+	 * Show the application dashboard.
+	 *
+	 * @return \Illuminate\Contracts\Support\Renderable
+	 */
+	public function index()
+	{
+		$data['categories'] = Categories::getTree();
+		$data['category'] = Categories::get(15)->toArray();
+		$data['articles'] = Articles::getByCategory(0)->toArray();
+		// dump($data);
+		return view('Shop.home', $data);
+	}
 }
diff --git a/app/Repositories/Botanic/Varieties.php b/app/Repositories/Botanic/Varieties.php
index 7f0d8113..f9d708f5 100644
--- a/app/Repositories/Botanic/Varieties.php
+++ b/app/Repositories/Botanic/Varieties.php
@@ -2,25 +2,18 @@
 
 namespace App\Repositories\Botanic;
 
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
-use Yajra\DataTables\DataTables;
 use Maatwebsite\Excel\Facades\Excel;
 
+use App\Repositories\Core\Tag;
+use App\Repositories\Core\Media;
 use App\Models\Botanic\Variety;
 use App\Exports\Botanic\VarietiesExport;
 
 class Varieties
 {
 
-	public static function getDatatable()
-	{
-		$model = Variety::with('specie');
-		return Datatables::of($model)->make(true);
-	}
-
 	public static function getOptions()
 	{
 		return Variety::orderBy('name')->get()->pluck('name','id')->toArray();
@@ -30,8 +23,7 @@ class Varieties
 	{
 		$varieties = Variety::with('specie')->get();
 		$data = [];
-		foreach ($varieties as $variety)
-		{
+		foreach ($varieties as $variety) {
 			$data[$variety->id] = (isset($variety->specie->name) ? $variety->specie->name . ' ' : '') . $variety->name;
 		}
 		asort($data, SORT_NATURAL | SORT_FLAG_CASE);
@@ -45,7 +37,7 @@ class Varieties
 
 	public static function get($id)
 	{
-		return Variety::find($id);
+		return Variety::findOrFail($id);
 	}
 
 	public static function getFull($id)
@@ -58,8 +50,7 @@ class Varieties
 
 	public static function getTagsByVariety($variety)
 	{
-		$tags = $variety->tags; 
-		return $tags ? $tags->pluck('id')->toArray() : null;
+		return Tag::getTagsByModel($variety);
 	}
 
 
@@ -89,7 +80,7 @@ class Varieties
 	public static function update($data, $id = false)
 	{
 		$id = $id ? $id : $data['id'];
-		$variety = Variety::find($id);
+		$variety = self::get($id);
 		$ret = $variety->update($data);
 		return $variety;
 	}
@@ -101,43 +92,22 @@ class Varieties
 
 	public static function storeTags($variety, $tags)
 	{
-		if ($tags) {
-			$tags = collect($tags)->transform(function ($item, $key) {
-				return (int) $item;
-			})->toArray();
-			return $variety->syncTags($tags, true);
-		} else return false;
+		return Tag::storeTags($variety, $tags);
 	}
 
 	public static function storeImages($variety, $files)
 	{
-		if ($files) {
-			foreach ($files as $file) { 
-				$variety->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
-			}
-		}
+		return Media::storeImages($variety, $files);
 	}
 
 	public static function getImages($id)
 	{
-		$variety = self::get($id);
-		if ($variety) {
-			$variety->getMedia();
-			foreach ($variety->media as $key => $media) {
-				$variety->media[$key]['url'] = $media->getUrl();
-			}
-			return $variety->media;
-		} else {
-			return false;
-		}
+		return Media::getImages(self::get($id));
 	}
 
 	public static function deleteImage($id, $index)
 	{
-		$variety = self::get($id);
-		$variety->getMedia();
-		$ret = $variety->media[$index]->delete();
-		return "1";
+		return Media::deleteImage(self::get($id), $index);
 	}
 
 	public static function exportExcel()
diff --git a/app/Repositories/Core/DateRange.php b/app/Repositories/Core/DateRange.php
index db01073e..0321aaa3 100644
--- a/app/Repositories/Core/DateRange.php
+++ b/app/Repositories/Core/DateRange.php
@@ -2,113 +2,172 @@
 
 namespace App\Repositories\Core;
 
-use \Carbon\Carbon;
-use \League\Period\Period;
+use Carbon\Carbon;
+use League\Period\Period;
+use League\Period\Duration;
+use League\Period\Sequence;
+use League\Period\Chart\Dataset;
+use function League\Period\duration;
+use function League\Period\interval_after;
 
 class DateRange
 {
-    public static function getPeriodsLastMonth($nb)
-    {
-        $end = static::lastMonth();
-        $begin = $end->copy()->subMonth($nb);
-        return static::getPeriodsbyMonth($begin, $end);
-    }
 
-    public static function getPeriodsLastWeek($nb)
-    {
-        $end = static::lastWeek();
-        $begin = $end->copy()->subWeek($nb);
-        return static::getPeriodsbyWeek($begin, $end);
-    }
+	public static function getPeriodsLastMonthWithLabels($nb, $with_actual = true)
+	{
+		$periods = DateRange::PeriodsToCarbon(DateRange::getPeriodsLastMonth($nb, $with_actual));
+		$labels = DateRange::getMonthNames($periods);
+		foreach ($labels as $label) {
+			$data[$label] = $periods;
+		}
+		return $data;
+	}
 
-    public static function getPeriodsLastDay($nb)
-    {
-        $end = static::lastDay();
-        $begin = $end->copy()->subDay($nb);
-        return static::getPeriodsbyDay($begin, $end);
-    }
+	public static function getAllMonthNames()
+	{
+		return self::getMonthNames(self::PeriodsToCarbon(self::getPeriodsLastMonth(12)));
+	}
 
-    public static function byDay()
-    {
-        return [Carbon::now()->startOfDay(), Carbon::now()->endOfDay()];
-    }
+	public static function getPeriodsLastMonth($nb = 1, $with_actual = true)
+	{
+		$end = $with_actual ? Carbon::now()->endOfMonth() : self::lastMonth();
+		$begin = ($nb == 1) ? $end->copy()->startOfMonth() : $end->copy()->startOfMonth()->subMonth($nb-1);
+		$t = self::getPeriodsbyMonth($begin, $end);
+		return self::getPeriodsbyMonth($begin, $end);
+	}
 
-    public static function byWeek()
-    {
-        return [Carbon::now()->startOfWeek(), Carbon::now()->endOfWeek()];
-    }
+	public static function getMonthNamesByPeriods($periods)
+	{
+		$months = [];
+		foreach ($periods as $period) {
+			$date = self::DatePointToCarbon($period->getStartDate());
+			$months[] = DateTime::getMonthName($date);
+		}
+		return $months;
+	}
 
-    public static function byMonth()
-    {
-        return [Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth()];
-    }
+	public static function getMonthNames($periods)
+	{
+		$months = [];
+		foreach ($periods as $period) {
+			$months[] = DateTime::getMonthName($period['start']);
+		}
+		return $months;
+	}
 
-    public static function byQuarter()
-    {
-        return [Carbon::now()->startOfQuarter(), Carbon::now()->endOfQuarter()];
-    }
+	public static function getPeriodsLastWeek($nb = 1, $with_actual = true)
+	{
+		$end = $with_actual ? Carbon::now()->endOfWeek() : self::lastWeek();
+		$begin = $end->copy()->subWeek($nb);
+		return static::getPeriodsbyWeek($begin, $end);
+	}
 
-    public static function bySemester()
-    {
-        $quarter = Carbon::now()->quarter;
-        switch ($quarter) {
-            case 1:
-            case 2:
-                $date = Carbon::now()->startOfYear();
-                break;
-            case 3:
-                $date = Carbon::now()->startOfQuarter();
-                break;
-            case 4:
-                $date = Carbon::now()->subMonth(3)->startOfQuarter();
-                break;
-        }
-        return [$date, $date->addMonth(6)];
-    }
+	public static function getPeriodsLastDay($nb = 1, $with_actual = true)
+	{
+		$end = $with_actual ? Carbon::now()->endOfDay() : static::lastDay();
+		$begin = $end->copy()->subDay($nb);
+		return static::getPeriodsbyDay($begin, $end);
+	}
 
-    public static function byYear()
-    {
-        return [Carbon::now()->startOfYear(), Carbon::now()->endOfYear()];
-    }
+	public static function byDay()
+	{
+		return [Carbon::now()->startOfDay(), Carbon::now()->endOfDay()];
+	}
 
-    public static function lastMonth()
-    {
-        $start = Carbon::parse('first day of last month');
-        $start->addMonth()->startOfDay();
-        return $start;
-    }
+	public static function byWeek()
+	{
+		return [Carbon::now()->startOfWeek(), Carbon::now()->endOfWeek()];
+	}
 
-    public static function lastWeek()
-    {
-        return Carbon::parse('last monday');
-    }
+	public static function byMonth()
+	{
+		return [Carbon::now()->startOfMonth(), Carbon::now()->endOfMonth()];
+	}
 
-    public static function lastDay()
-    {
-        return Carbon::parse('yesterday');
-    }
+	public static function byQuarter()
+	{
+		return [Carbon::now()->startOfQuarter(), Carbon::now()->endOfQuarter()];
+	}
 
-    public static function getPeriodsbyMonth($begin, $end)
-    {
-        return (static::getPeriods($begin, $end, 'MONTH'));
-    }
+	public static function bySemester()
+	{
+		$quarter = Carbon::now()->quarter;
+		switch ($quarter) {
+			case 1:
+			case 2:
+				$date = Carbon::now()->startOfYear();
+				break;
+			case 3:
+				$date = Carbon::now()->startOfQuarter();
+				break;
+			case 4:
+				$date = Carbon::now()->subMonth(3)->startOfQuarter();
+				break;
+		}
+		return [$date, $date->addMonth(6)];
+	}
 
-    public static function getPeriodsbyWeek($begin, $end)
-    {
-        return (static::getPeriods($begin, $end, 'WEEK'));
-    }
+	public static function byYear()
+	{
+		return [Carbon::now()->startOfYear(), Carbon::now()->endOfYear()];
+	}
 
-    public static function getPeriodsbyDay($begin, $end)
-    {
-        return (static::getPeriods($begin, $end, 'DAY'));
-    }
+	public static function lastMonth()
+	{
+		return Carbon::now()->subMonth()->startOfMonth();
+	}
+
+	public static function lastWeek()
+	{
+		return Carbon::now()->subWeek()->startOfWeek();
+	}
+
+	public static function lastDay()
+	{
+		return Carbon::now()->subDay()->startOfDay();
+	}
+
+	public static function getPeriodsbyMonth($begin, $end, $interval = 1)
+	{
+		return self::getPeriods($begin, $end, "$interval MONTH");
+	}
+
+	public static function getPeriodsbyWeek($begin, $end, $interval = 1)
+	{
+		return self::getPeriods($begin, $end, "$interval WEEK");
+	}
+
+	public static function getPeriodsbyDay($begin, $end, $interval = 1)
+	{
+		return self::getPeriods($begin, $end, "$interval DAY");
+	}
+
+	public static function getPeriods($begin, $end, $duration, $interval = 1)
+	{
+		$period = new Period($begin, $end);
+		foreach ($period->getDatePeriod($duration) as $day) {
+			$daterange[] = interval_after($day, $duration);
+		}
+		return $daterange;
+	}
+
+	public static function PeriodsToCarbon($periods)
+	{
+		$data = [];
+		foreach ($periods as $period) {
+			$data[] = self::PeriodToCarbon($period);
+		}
+		return $data;
+	}
+
+	public static function PeriodToCarbon($period)
+	{
+		return ['start' => self::DatePointToCarbon($period->getStartDate()), 'end' => self::DatePointToCarbon($period->getEndDate())];
+	}
+
+	public static function DatePointToCarbon($date)
+	{
+		return Carbon::createFromFormat('Y-m-d H:i:s', $date->format('Y-m-d H:i:s'));
+	}
 
-    public static function getPeriods($begin, $end, $interval)
-    {
-        $period = new Period($begin, new \DateTime($end));
-        foreach ($period->getDatePeriod("1 $interval") as $day) {
-            $daterange[] = Period::createFromDuration($day->format('Y-m-d H:i:s'), "1 $interval");
-        }
-        return ($daterange);
-    }
 }
diff --git a/app/Repositories/Core/DateTime.php b/app/Repositories/Core/DateTime.php
index b5a72822..b34fe2a6 100644
--- a/app/Repositories/Core/DateTime.php
+++ b/app/Repositories/Core/DateTime.php
@@ -2,58 +2,146 @@
 
 namespace App\Repositories\Core;
 
+use Illuminate\Support\Str;
 use Carbon\Carbon;
 use Jenssegers\Date\Date;
 
+use App\Repositories\Languages;
+
 class DateTime
 {
-    public static function getLang()
-    {
-        return session('locale') ? session('locale') : 'fr';
-    }
+	public static function getMonthName($date, $short = true)
+	{
+		return $short ? self::getUltraShortMonthName($date) : $date->monthName;
+	}
 
-    public static function convert($date)
-    {
-        return $date ? Carbon::createFromFormat('d/m/Y', $date)->isoFormat('Y-MM-DD') : null;
-    }
+	public static function getShortMonthName($date)
+	{
+		return $date->shortMonthName;
+	}
 
-    public static function convertTime($date)
-    {
-        return $date ? Carbon::createFromFormat('d/m/Y H:i', $date)->isoFormat('Y-MM-DD HH:mm:ss') : null;
-    }
+	public static function getUltraShortMonthName($date)
+	{
+		return strtoupper(Str::ascii(mb_substr($date->shortMonthName,0,3)));   
+	}
 
-    public static function toFr($date)
-    {
-        return $date ? Carbon::parse($date)->isoFormat('DD/MM/Y') : null;
-    }
+	public static function getDayName($date, $short = true)
+	{
+		return $short ? $date->shortDayName : $date->dayName;
+	}
 
-    public static function toFrTime($date)
-    {
-        return $date ? Carbon::parse($date)->isoFormat('DD/MM/Y HH:mm:ss') : null;
-    }
+	public static function DatetoLocale($date = null)
+	{
+		$format = self::getLocaleFormatDate();
+		if (!is_null($date) && !empty($date)) {
+			$date = Carbon::parse($date)->format($format);
+		} elseif ($date == 'now') {
+			$date = Carbon::now()->format($format);
+		}
+		return $date;
+	}
 
-    public static function FromDatetimeFr($date)
-    {
-        return $date ? Carbon::createFromFormat('d/m/Y H:i:s', $date) : null;
-    }
+	public static function DatetimeToLocale($date = null)
+	{
+		$format = self::getLocaleFormatDatetime();
+		if (!is_null($date) && !empty($date)) {
+			$date = Carbon::parse($date)->format($format);
+		} elseif ($date == 'now') {
+			$date = Carbon::now()->format($format);
+		}
+		return $date;
+	}
 
-    public static function DatetimeToStamp($date)
-    {
-        return $date ? self::FromDatetimeFr($date)->isoFormat('Y-MM-DD HH:mm:ss') : null;
-    }
+	public static function getDateTime()
+	{
+		return self::DatetimeToLocale(date('Y-m-d H:i:s'));
+	}
 
-    public static function DatetimeToDate($date)
-    {
-        return $date ? self::FromDatetimeFr($date)->isoFormat('DD/MM/Y') : null;
-    }
+	public static function getDate()
+	{
+		return self::DateToLocale(date('Y-m-d'));
+	}
 
-    public static function DatetimeToTime($date)
-    {
-        return $date ? self::FromDatetimeFr($date)->isoFormat('HH:mm') : null;
-    }
+	public static function getLang()
+	{
+		return session('locale') ? session('locale') : 'fr';
+	}
 
-    public static function isPast($date)
-    {
-        return self::FromDatetimeFr($date)->isPast();
-    }
+	public static function convert($date)
+	{
+		$format = self::getLocaleFormatDate();
+		return !empty($date) ? Carbon::createFromFormat($format, $date)->isoFormat('Y-MM-DD') : null;
+	}
+
+	public static function convertTime($date)
+	{
+		$format = self::getLocaleFormatDatetime();
+		return !empty($date) ? Carbon::createFromFormat($format, $date)->isoFormat('Y-MM-DD HH:mm:ss') : null;
+	}
+
+	public static function toFr($date)
+	{
+		return !empty($date) ? Carbon::parse($date)->isoFormat('DD/MM/Y') : null;
+	}
+
+	public static function toFrTime($date)
+	{
+		return !empty($date) ? Carbon::parse($date)->isoFormat('DD/MM/Y HH:mm:ss') : null;
+	}
+
+	public static function getYearFromDate($date)
+	{
+		// return date_format(DateTime::convert($signature_date), 'Y');
+		$date = DateTime::convert($date);
+		$date = date_create($date);
+		return date_format($date, 'Y');
+	}
+
+
+	public static function getLocaleFormatDate()
+	{
+		$locale = self::getLang();
+		switch ($locale) {
+			case 'fr':
+			case 'en':
+				$format = 'd/m/Y';
+				break;
+			default:
+				$format = 'Y-m-d';
+		}
+		return $format;
+	}
+
+	public static function getLocaleFormatDatetime()
+	{
+		$locale = self::getLang();
+		switch ($locale) {
+			case 'fr':
+			case 'en':
+				$format = 'd/m/Y H:i:s';
+				break;
+			default:
+				$format = 'Y-m-d H:i:s';
+		}
+		return $format;
+	}
+
+	public static function getLocaleDateFull($date)
+	{
+		return Carbon::parse($date)->isoFormat('LLLL');
+	}
+
+	public static function getLocaleDateFullShort($date)
+	{
+		return Carbon::parse($date)->isoFormat('lll');
+	}
+
+	public static function getLocaleHour($date)
+	{
+		return Carbon::parse($date)->isoFormat('');
+	}
+
+	public static function relativeTime()
+	{
+	}
 }
diff --git a/app/Repositories/Core/Mailer.php b/app/Repositories/Core/Mailer.php
new file mode 100644
index 00000000..2ff68bb7
--- /dev/null
+++ b/app/Repositories/Core/Mailer.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Repositories\Core;
+
+use Qoraiche\MailEclipse\MailEclipse;
+use Illuminate\Support\Facades\DB;
+
+class Mailer
+{
+
+    public static function getTemplates()
+    {
+        // $mailables = MailEclipse::getMailables();
+        // DB::rollBack();
+        // dump($mailables);
+/*
+        $mailables = (null !== $mailables) ? $mailables->sortBy('name') : collect([]);
+        foreach ($mailables as $mailable)
+        {
+            $templates[] = $mailable['name'];
+        }
+
+*/
+        $templates = ['EventInscription','EventSaveTheDate','MatinalesBadge','MatinalesThanks','MatinalesReplays'];
+        return $templates;
+    }
+
+    public static function getTemplate($template_id)
+    {
+        $templates = self::getTemplates();
+        return $templates[$template_id];
+    }
+}
diff --git a/app/Repositories/Core/Media.php b/app/Repositories/Core/Media.php
new file mode 100644
index 00000000..f729afc0
--- /dev/null
+++ b/app/Repositories/Core/Media.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace App\Repositories\Core;
+
+class Media
+{
+
+	public static function getImages($model) {
+		if ($model) {
+			$model->getMedia();
+			foreach ($model->media as $key => $media) {
+				$model->media[$key]['url'] = $media->getUrl();
+			}
+			return $model->media;
+		} else {
+			return false;
+		}
+	}
+
+	public static function storeImages($model, $files)
+	{
+		if ($files) {
+			foreach ($files as $file) {
+				self::storeImage($model, $file); 
+			}
+		}
+	}
+
+	public static function storeImage($model, $file)
+	{
+		return $model->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
+	}
+
+	public static function deleteImage($model, $index)
+	{
+		$model->getMedia();
+		$ret = $model->media[$index]->delete();
+		return "1";
+	}
+
+	public static function getThumbSrc($image)
+	{
+		if (!$image) {
+			return null;
+		}
+		$id = $image['id'];
+		$images = json_decode($image['responsive_images'], true);
+		$urls = $images['medialibrary_original']['urls'];
+
+		$img = $urls[count($urls)-1];
+		$src = "storage/$id/responsive-images/$img";
+		return $src;
+	}
+
+
+}
diff --git a/app/Repositories/Core/Tag.php b/app/Repositories/Core/Tag.php
new file mode 100644
index 00000000..6c4c1457
--- /dev/null
+++ b/app/Repositories/Core/Tag.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Repositories\Core;
+
+class Tag
+{
+
+	public static function getTagsByModel($model)
+	{
+		$tags = $model->tags; 
+		return $tags ? $tags->pluck('id')->toArray() : null;
+	}
+
+	public static function storeTags($model, $tags)
+	{
+		if ($tags) {
+			$tags = collect($tags)->transform(function ($item, $key) {
+				return (int) $item;
+			})->toArray();
+			return $model->syncTags($tags, true);
+		} else return false;
+	}
+
+
+}
diff --git a/app/Repositories/Core/Tags.php b/app/Repositories/Core/Tags.php
deleted file mode 100644
index 8d8f5042..00000000
--- a/app/Repositories/Core/Tags.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-namespace App\Repositories\Core;
-
-use Yajra\DataTables\DataTables;
-
-use App\Models\Botanic\Family;
-
-class Tags
-{
-
-    public static function getDatatable()
-    {
-        $model = Family::orderBy('name');
-        return Datatables::of($model)->make(true);
-    }
-
-    public static function getOptions()
-    {
-        return Family::get()->SortBy('name')->pluck('name','id')->toArray();
-    }
-
-    public static function getAll()
-    {
-        return Family::orderBy('name','asc')->get();
-    }
-
-    public static function get($id)
-    {
-        return Family::find($id);
-    }
-
-    public static function store($data)
-    {
-        $id = isset($data['id']) ? $data['id'] : false;
-        $item = $id ? self::update($data) : self::create($data); 
-        return $item->id;
-    }
-
-    public static function create($data)
-    {
-        return Family::create($data);
-    }
-
-    public static function update($data)
-    {
-        return Family::find($id)->update($data);
-    }
-
-    public static function destroy($id)
-    {
-        return Family::destroy($id);
-    }
-
-}
diff --git a/app/Repositories/Core/Upload.php b/app/Repositories/Core/Upload.php
index cf6fdde6..57653781 100644
--- a/app/Repositories/Core/Upload.php
+++ b/app/Repositories/Core/Upload.php
@@ -8,94 +8,157 @@ use Intervention\Image\Facades\Image as Image;
 
 class Upload
 {
-    public static function getData($file)
-    {
-        $data['filename'] = $file->getClientOriginalName();
-        $data['filetype'] = $file->extension();
-        $data['filesize'] = $file->getSize();
-        return $data;
-    }
+	public static function getData($file)
+	{
+		$data['filename'] = $file->getClientOriginalName();
+		$data['filetype'] = $file->getClientOriginalExtension();
+		$data['filesize'] = $file->getSize();
+		$data['mime'] = $file->getMimeType();
+		return $data;
+	}
 
-    public static function getUuid($file, $data)
-    {
-        $data = (is_array($data)) ? (object) $data : $data;
-        $pos = strrpos($file, '/');
-        $uuid = substr($file, $pos+1);
-        $uuid = str_replace('.' . $data->filetype, '', $uuid);
-        return $uuid;
-    }
+	public static function getUuid($file, $data)
+	{
+		$data = (is_array($data)) ? (object) $data : $data;
+		$pos = strrpos($file, '/');
+		$uuid = substr($file, $pos+1);
+		$uuid = pathinfo($uuid, PATHINFO_FILENAME);
+		// $uuid = str_replace('.' . strtolower($data->filetype), '', $uuid);
+		// $uuid = str_replace('.' . $data->filetype, '', $uuid);
+		return $uuid;
+	}
 
-    public static function store($file, $filepath)
-    {
-        return $file->store($filepath);
-    }
+	public static function storeByVar($var, $path, $public = false)
+	{
+		// check if filename exists
+		// store
+		// Storage::disk('local')->put('file.txt', 'Contents');
+		// $path = Storage::putFile('avatars', $request->file('avatar'));
+		// $path = $request->file('avatar')->storeAs('avatars',$request->user()->id,'s3');
+		// $path = $request->file('avatar')->storePublicly('avatars', 's3');
+		return $request->has($var) ? basename($request->file($var)->store($path)) : false;
+	}
 
-    public static function storePublic($file, $filepath)
-    {
-        // exit;
-        $filepath = 'public/' . $filepath;
-        return $file->store($filepath);
-    }
+	public static function store($file, $path)
+	{
+		return Storage::putFile($path, $file);
+		// return $file->store($filepath);
+	}
 
-    public static function delete($file)
-    {
-        return Storage::delete($file);
-    }
+	public static function storePublic($file, $filepath)
+	{
+		return Storage::putFile($filepath, $file, 'public');
+		// $filepath = 'public/' . $filepath;
+		// return $file->store($filepath);
+	}
 
-    public static function createThumb($file, $size, $sub = false)
-    {
-        $thumb = self::getThumbPath($file, $sub);
-        $filename = self::getPublicPath($file);
-        return Image::make($filename)->orientate()->widen($size)->save($thumb);
-    }
+	public static function createThumb($file, $size, $sub = false)
+	{
+		$thumb = self::getThumbPath($file, $sub);
+		$filename = self::getPublicPath($file);
+		return Image::make($filename)->orientate()->widen($size)->save($thumb);
+	}
 
-    /*
-        public static function getPath($file) {
-            return 'public/' . self::getFilename($file);
-        }
-    */
-    
-    public static function getPublicPath($file)
-    {
-        return storage_path('app/public/' . self::getFilename($file));
-    }
+	/*
+		public static function getPath($file) {
+			return 'public/' . self::getFilename($file);
+		}
+	*/
+	
+	public static function getPublicPath($file)
+	{
+		return storage_path('app/public/' . self::getFilename($file));
+	}
 
-    public static function getPrivatePath($file)
-    {
-        return storage_path('app/' . self::getFilename($file));
-    }
+	public static function getPrivatePath($file)
+	{
+		return storage_path('app/' . self::getFilename($file));
+	}
 
-    public static function getSrc($file)
-    {
-        return '/storage/' . self::getFilename($file);
-    }
+	public static function getSrc($file)
+	{
+		return '/storage/' . self::getFilename($file);
+	}
 
-    public static function getThumbPath($file)
-    {
-        return storage_path('app/public/' . self::getThumbFilename($file));
-    }
+	public static function getThumbPath($file)
+	{
+		return storage_path('app/public/' . self::getThumbFilename($file));
+	}
 
-    public static function getThumbSrc($file)
-    {
-        return '/storage/' . self::getThumbFilename($file);
-    }
+	public static function getThumbSrc($file)
+	{
+		return '/storage/' . self::getThumbFilename($file);
+	}
 
-    public static function getFilename($file)
-    {
-        $file = (is_array($file)) ? (object) $file : $file;
-        return $file->filepath . '/' . self::getName($file);
-    }
+	public static function getFilename($file)
+	{
+		$file = (is_array($file)) ? (object) $file : $file;
+		return $file->filepath . '/' . self::getName($file);
+	}
 
-    public static function getThumbFilename($file, $sub = false)
-    {
-        $sub = $sub ? $sub : 'thumbs/';
-        $file = (is_array($file)) ? (object) $file : $file;
-        return $file->filepath . '/' . $sub . self::getName($file);
-    }
+	public static function getThumbFilename($file, $sub = false)
+	{
+		$sub = $sub ? $sub : 'thumbs/';
+		$file = (is_array($file)) ? (object) $file : $file;
+		return $file->filepath . '/' . $sub . self::getName($file);
+	}
 
-    public static function getName($file)
-    {
-        $file = (is_array($file)) ? (object) $file : $file;
-        return $file->uuid . '.' .$file->filetype;
-    }
+	public static function getName($file)
+	{
+		$file = (is_array($file)) ? (object) $file : $file;
+		return $file->uuid . '.' . strtolower($file->filetype);
+	}
+
+	/**
+	 * [fix problem path with Storage on Windows]
+	 * @param  [type] $path [description]
+	 * @return [type]       [description]
+	 */
+	public static function fix($path)
+	{
+		if (self::isWindows()) {
+			return str_replace('/', '\\', $path);
+		} else {
+			return $path;
+		}
+	}
+
+	public static function move($source, $dest)
+	{
+		if (Storage::exists($dest)) {
+			self::delete($dest);
+		}
+		return Storage::move($source, $dest);      // transfère et renomme le fichier du dossier temporaire au dossier du client
+	}
+
+	public static function delete($file)
+	{
+		// Storage::delete($file);
+		// return unlink($file);
+		return Storage::delete($file);
+	}
+
+	public static function deleteFile($path)
+	{
+		if (Storage::exists($path)) {
+			return Storage::delete($path);
+		} else {
+			return false;
+		}
+	}
+
+	public static function deleteRecursive($path)
+	{
+		rmdir_recursive($targetDir);
+	}
+
+	public function make_dir($path, $permissions = 0777)
+	{
+		return is_dir($path) || mkdir($path, $permissions, true);
+	}
+	
+	public static function isWindows()
+	{
+		return (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN');
+	}
 }
diff --git a/app/Repositories/Core/User/Basket.php b/app/Repositories/Core/User/Basket.php
new file mode 100644
index 00000000..359f6986
--- /dev/null
+++ b/app/Repositories/Core/User/Basket.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Repositories\Core\User;
+
+class Basket
+{
+
+	public static function first($key)
+	{
+		$data = self::get($key);
+		return array_shift($data);
+	}
+
+	public static function last($key)
+	{
+		$data = self::get($key);
+		return $data ? array_pop($data) : false;
+	}
+
+	public static function set($key, $data)
+	{
+		return session([$key => $data]);
+	}
+
+	public static function get($key)
+	{
+		return session($key);
+	}
+
+	public static function add($key, $value)
+	{
+		$data = self::isExist($key) ? self::get($key) : [];
+		if (array_search($value, $data) === false) {
+			array_push($data, $value);
+			self::set($key, $data);
+		}
+		return count($data);
+	}
+
+	public static function remove($key, $value)
+	{
+		$data = self::get($key);
+		if (($index = array_search($value, $data)) !== false) {
+    		unset($data[$index]);
+		}
+		return self::set($key, $data);
+	}
+
+	public static function isExist($key)
+	{
+		return session()->has($key);
+	}
+
+	public static function reset($key)
+	{
+		return session()->forget($key);
+	}
+
+	public static function resetAll()
+	{
+		return session()->flush();
+	}
+}
diff --git a/app/Repositories/Core/User/Notifications/NewUser.php b/app/Repositories/Core/User/Notifications/NewUser.php
new file mode 100644
index 00000000..7dc1bc73
--- /dev/null
+++ b/app/Repositories/Core/User/Notifications/NewUser.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Repositories\Core\User\Notifications;
+
+use Illuminate\Bus\Queueable;
+use Illuminate\Notifications\Messages\MailMessage;
+use Illuminate\Notifications\Notification;
+
+class NewUser extends Notification
+{
+    use Queueable;
+
+    /**
+     * Get the notification's delivery channels.
+     *
+     * @param mixed $notifiable
+     *
+     * @return string[]
+     */
+    public function via($notifiable)
+    {
+        return ['mail'];
+    }
+
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param mixed $notifiable
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+    public function toMail($notifiable)
+    {
+        $currentUser = \Auth::user();
+
+        return (new MailMessage())
+            ->markdown('notifications.email')
+            ->greeting(__('notifications.greeting', ['firstname' => $notifiable->first_name]))
+            ->subject(__('notifications.newuser.subject', ['name' => config('app.name')]))
+            ->line(__('notifications.newuser.intro', [
+                'name' => $currentUser->first_name.' '.$currentUser->last_name,
+            ]))
+            ->action(
+                __('notifications.newuser.button'),
+                route('users.firstlogin', $notifiable->remember_token)
+            )
+            ->salutation(__('notifications.salutation', [
+                'name' => $currentUser->first_name.' '.$currentUser->last_name,
+            ]))
+            ->line(__('notifications.newuser.outro'));
+    }
+
+    /**
+     * Get the array representation of the notification.
+     *
+     * @param mixed $notifiable
+     *
+     * @return array
+     */
+    public function toArray($notifiable)
+    {
+        return [
+            //
+        ];
+    }
+}
diff --git a/app/Repositories/Core/User/Notifications/ResetPassword.php b/app/Repositories/Core/User/Notifications/ResetPassword.php
new file mode 100644
index 00000000..763d1691
--- /dev/null
+++ b/app/Repositories/Core/User/Notifications/ResetPassword.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Repositories\Core\User\Notifications;
+
+use Illuminate\Notifications\Messages\MailMessage;
+
+class ResetPassword extends \Illuminate\Auth\Notifications\ResetPassword
+{
+    /**
+     * Get the mail representation of the notification.
+     *
+     * @param mixed $notifiable
+     *
+     * @return \Illuminate\Notifications\Messages\MailMessage
+     */
+/*
+    public function toMail($notifiable)
+    {
+        return (new MailMessage())
+            ->markdown('notifications.email')
+            ->greeting(__('notifications.greeting', ['firstname' => $notifiable->first_name]))
+            ->subject(__('notifications.resetpassword.subject'))
+            ->line(__('notifications.resetpassword.intro'))
+            ->action(
+                __('notifications.resetpassword.button'),
+                route('password.reset', $this->token)
+            )
+            ->line(__('notifications.resetpassword.outro'));
+    }
+*/
+}
diff --git a/app/Repositories/Core/User/PasswordResets.php b/app/Repositories/Core/User/PasswordResets.php
new file mode 100644
index 00000000..9c397b1f
--- /dev/null
+++ b/app/Repositories/Core/User/PasswordResets.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Repositories\Core\User;
+
+use App\Models\Core\Auth\PasswordReset;
+
+class PasswordResets
+{
+
+    public static function getTokenByEmail($email)
+    {
+        return PasswordReset::byEmail($email)->first();
+    }
+
+    public static function getEmailByToken($token)
+    {
+        return PasswordReset::byToken($token)->first();
+    }
+}
diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php
index 77a27f78..f13a840b 100644
--- a/app/Repositories/Shop/Articles.php
+++ b/app/Repositories/Shop/Articles.php
@@ -2,12 +2,10 @@
 
 namespace App\Repositories\Shop;
 
-use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
-use Yajra\DataTables\DataTables;
-
+use App\Repositories\Core\Tag;
+use App\Repositories\Core\Media;
 use App\Repositories\Botanic\Species;
 use App\Repositories\Botanic\Varieties;
 use App\Models\Shop\Article;
@@ -15,12 +13,6 @@ use App\Models\Shop\Article;
 class Articles
 {
 
-	public static function getDatatable()
-	{
-		$model = Article::orderBy('name');
-		return Datatables::of($model)->make(true);
-	}
-
 	public static function getAll()
 	{
 		return Article::orderBy('name','asc')->get();
@@ -28,11 +20,11 @@ class Articles
 
 	public static function getFull($id)
 	{
-		$article = Article::with('product')->findOrFail($id);
-		$data = $article->toArray();
-		$data['categories'] = self::getCategoriesByArticle($article);
-		$data['tags'] = self::getTagsByArticle($article);
-		$data['prices'] = self::getPricesByArticle($article);
+		$article = Article::with('product.tags')->findOrFail($id);
+		$data['article'] = $article->toArray();
+		$data['article']['categories'] = self::getCategoriesByArticle($article);
+		$data['article']['tags'] = self::getTagsByArticle($article);
+		$data['article']['prices'] = self::getPricesByArticle($article);
 		self::getMeta($data);
 		return $data;
 	}
@@ -53,7 +45,6 @@ class Articles
 
 	public static function getByCategory($category_id)
 	{
-		// TODO add category
 		return Article::with(['prices','product','image'])->get();
 	}
 
@@ -109,7 +100,7 @@ class Articles
 	public static function update($data, $id = false)
 	{
 		$id = $id ? $id : $data['id'];
-		$article = Article::find($id);
+		$article = self::get($id);
 		$ret = $article->update($data);
 		return $article;
 	}
@@ -133,12 +124,7 @@ class Articles
 
 	public static function storeTags($article, $tags)
 	{
-		if ($tags) {
-			$tags = collect($tags)->transform(function ($item, $key) {
-				return (int) $item;
-			})->toArray();
-			return $article->syncTags($tags, true);
-		} else return false;
+		return Tag::storeTags($article, $tags);
 	}
 
 	public static function storePrices($article, $prices)
@@ -148,55 +134,27 @@ class Articles
 
 	public static function storeImages($article, $files)
 	{
-		if ($files) {
-			foreach ($files as $file) { 
-				self::storeImage($article, $file);
-			}
-		}
+		return Media::storeImages($article, $files);
 	}
 
 	public static function storeImage($article, $file)
 	{
-		return $article->addMedia($file)->withResponsiveImages()->toMediaCollection('images');
+		return Media::storeImage($article, $file);
 	}
 
 	public static function getImages($id)
 	{
-		$article = self::get($id);
-		if ($article)
-		{
-			$article->getMedia();
-			foreach ($article->media as $key => $media) {
-				$article->media[$key]['url'] = $media->getUrl();
-			}
-			return $article->media;
-		} else {
-			return false;
-		}
+		return Media::getImages(self::get($id));
 	}
 
 	public static function getThumbSrc($image)
 	{
-		if (!$image) {
-			return null;
-		}
-		$id = $image['id'];
-		$images = json_decode($image['responsive_images'], true);
-		$urls = $images['medialibrary_original']['urls'];
-
-		$img = $urls[count($urls)-1];
-		$src = "storage/$id/responsive-images/$img";
-		return $src;
+		return Media::getThumbSrc($image);
 	}
 
-
 	public static function deleteImage($id, $index)
 	{
-		$article = self::get($id);
-		$article->getMedia();
-		$ret = $article->media[$index]->delete();
-		return "1";
+		return Media::deleteImage(self::get($id), $index);
 	}
 
-
 }
diff --git a/composer.json b/composer.json
index 30084f34..05cfc26c 100644
--- a/composer.json
+++ b/composer.json
@@ -18,6 +18,7 @@
         "beyondcode/laravel-comments": "^1.2",
         "box/spout": "^3.1",
         "browner12/helpers": "^3.0",
+        "cesargb/laravel-cascade-delete": "^1.2",
         "coduo/php-humanizer": "^3.0",
         "consoletvs/charts": "^6.5",
         "cornford/googlmapper": "^2.3",
@@ -67,8 +68,8 @@
         "rinvex/laravel-categories": "^3.0",
         "rinvex/laravel-tags": "^3.0",
         "rutorika/sortable": "^6.0",
-        "santigarcor/laratrust": "^5.2",
-        "sebastienheyd/boilerplate": "^7.1",
+        "santigarcor/laratrust": "^6.0",
+        "sebastienheyd/boilerplate": "^7.3",
         "sebastienheyd/boilerplate-email-editor": "^8.0",
         "sebastienheyd/boilerplate-media-manager": "^7.0",
         "sensiolabs/security-checker": "^6.0",
diff --git a/package.json b/package.json
index 2e5cbbcc..afe84933 100644
--- a/package.json
+++ b/package.json
@@ -96,6 +96,7 @@
         "izimodal": "^1.5.1",
         "jQuery-QueryBuilder": "^2.5.2",
         "jqtree": "^1.4.12",
+        "jquery": "^3.5.1",
         "jquery-confirm": "^3.3.4",
         "jquery-form": "^4.2.2",
         "jquery-jeditable": "^2.0.13",
diff --git a/resources/views/Shop/Admin/Articles/edit.blade.php b/resources/views/Shop/Admin/Articles/edit.blade.php
index eced2b7b..362668be 100644
--- a/resources/views/Shop/Admin/Articles/edit.blade.php
+++ b/resources/views/Shop/Admin/Articles/edit.blade.php
@@ -7,7 +7,7 @@
 @section('content')
 
 	{{ Form::open(['route' => 'Shop.Admin.Articles.store', 'id' => 'article-form', 'autocomplete' => 'off', 'files' => true]) }}
-		<input type="hidden" name="id" id="id" value="{{ $id }}">
+		<input type="hidden" name="id" id="id" value="{{ $article['id'] ?? null }}">
 
 		@include('Shop.Admin.Articles.form')
 	</form>
diff --git a/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php b/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php
index b4ba84e3..79ef2709 100644
--- a/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php
+++ b/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php
@@ -4,53 +4,58 @@
 		<div class="row">
 			<div class="col-2">
 				{{ Form::label('ref', 'Référence') }}<br>
-				@include('components.input', ['name' => 'ref', 'value' => isset($ref) ? $ref : null])
+				@include('components.input', ['name' => 'ref', 'value' => $article['ref'] ?? null])
 			</div>
 			<div class="col-4">
 				{{ Form::label('model', 'Familles de produit') }}<br>
-				@include('components.select', ['name' => 'product_type', 'id_name' => 'product_type', 'list' => $models_options, 'value' => isset($product_type) ? $product_type : null, 'class' => 'select2 form-control'])
+				@include('components.select', ['name' => 'product_type', 'id_name' => 'product_type', 'list' => $models_options, 'value' => $article['product_type'] ?? null, 'class' => 'select2 form-control'])
 			</div>
 			<div class="col-6">
 				{{ Form::label('model_id', 'Produit') }}<br>
-				@include('components.select', ['name' => 'product_id', 'id_name' => 'product_id', 'list' => $products ?? [], 'value' => isset($product_id) ? $product_id : null, 'class' => 'select2 form-control'])
+				@include('components.select', ['name' => 'product_id', 'id_name' => 'product_id', 'list' => $products ?? [], 'value' => $article['product_id'] ?? null, 'class' => 'select2 form-control'])
 			</div>
 		</div>
 
 		<div class="row">
 			<div class="col-8">
 				{{ Form::label('name', 'Nom') }}<br>
-				@include('components.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true])
+				@include('components.input', ['name' => 'name', 'value' => $article['name'] ?? null, 'required' => true])
 			</div>
 			<div class="col-4">
 				{{ Form::label('family_id', 'Famille d\'articles') }}<br>
-				@include('components.select', ['name' => 'article_family_id', 'list' => $families_options, 'value' => isset($article_family_id) ? $article_family_id : null, 'class' => 'select2 form-control'])
+				@include('components.select', ['name' => 'article_family_id', 'list' => $families_options, 'value' => $article['article_family_id'] ?? null, 'class' => 'select2 form-control'])
 			</div>
 		</div>
 
 		<div class="row">
 			<div class="col-12">
 				{{ Form::label('categories', 'Rayons') }}<br>
-				@include('components.select', ['name' => 'categories[]', 'list' => $categories_options, 'values' => isset($categories) ? $categories : null, 'class' => 'select2 form-control', 'multiple' => true])
+				@include('components.select', ['name' => 'categories[]', 'list' => $categories_options, 'values' => $article['categories'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
 			</div>
 		</div>
 
 		<div class="row">
 			<div class="col-12">
 				{{ Form::label('tags', 'Tags') }}<br>
-				@include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => isset($tags) ? $tags : null, 'class' => 'select2 form-control', 'multiple' => true])
+				@include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $article['tags'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
 			</div>
 		</div>		
 		
 		<div class="row">
 			<div class="col-12">
 				{{ Form::label('description', 'Description') }}
-				@include('components.textarea', ['name' => 'description', 'value' => isset($description) ? $description : null, 'class' => 'editor', 'required' => true])
+				@if (!empty($article['product']['description']))
+					@component('components.layout.box-collapse', ['id' => 'product_description', 'title' => 'Description produit'])
+						{{ $article['product']['description'] }}
+					@endcomponent
+				@endif
+				@include('components.textarea', ['name' => 'description', 'value' => $article['description'] ?? null, 'class' => 'editor', 'required' => true])
 			</div>
 		</div>
 
 	</div>
 	<div class="col-md-4">
-		@include('components.uploader.widget', ['load_url' => route('Shop.Admin.Articles.getImages', ['id' => (isset($id)) ? $id : false]), 'delete_url' => route('Shop.Admin.Articles.deleteImage') ])
+		@include('components.uploader.widget', ['load_url' => route('Shop.Admin.Articles.getImages', ['id' => $article['id'] ?? false]), 'delete_url' => route('Shop.Admin.Articles.deleteImage'), 'title' => 'Photos' ])
 	</div>
 </div>
 
diff --git a/resources/views/Shop/Admin/Articles/partials/prices.blade.php b/resources/views/Shop/Admin/Articles/partials/prices.blade.php
index 154b37ce..2f5943d9 100644
--- a/resources/views/Shop/Admin/Articles/partials/prices.blade.php
+++ b/resources/views/Shop/Admin/Articles/partials/prices.blade.php
@@ -1,2 +1,2 @@
-@include('Shop.Admin.Articles.partials.prices.prices', ['prices' => $prices['prices'] ?? null])
-@include('Shop.Admin.Articles.partials.generic_prices.generic_prices', ['generics' => $prices['generics'] ?? null])
+@include('Shop.Admin.Articles.partials.prices.prices', ['prices' => $article['prices']['prices'] ?? null])
+@include('Shop.Admin.Articles.partials.generic_prices.generic_prices', ['generics' => $article['prices']['generics'] ?? null])
diff --git a/resources/views/components/datatables/buttons/exports.blade.php b/resources/views/components/datatables/buttons/exports.blade.php
deleted file mode 100644
index 1233bda8..00000000
--- a/resources/views/components/datatables/buttons/exports.blade.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="datatable-export-buttons">
-
-	@include('components.datatables.buttons.print')
-
-	@if (isset($with_exports) && $with_exports)
-		@include('components.datatables.buttons.download')
-	@endif
-	
-</div>
diff --git a/resources/views/components/datatables/js/datatable.blade.php b/resources/views/components/datatables/js/datatable.blade.php
index 502bfd86..40db9644 100644
--- a/resources/views/components/datatables/js/datatable.blade.php
+++ b/resources/views/components/datatables/js/datatable.blade.php
@@ -38,7 +38,11 @@
 					headers: {'X-CSRF-TOKEN': '{{ csrf_token() }}'},
 					success: function(){
 						// line.remove();
-						table.draw();
+						@if (isset($delete_callback))
+							{{ $delete_callback }}
+						@else
+							table.draw();
+						@endif
 						growl("{{ __('admin.deletesuccess') }}", 'success');
 					}
 				});
diff --git a/resources/views/components/form/autocomplete.blade.php b/resources/views/components/form/autocomplete.blade.php
index 0d76a6d5..a79cc318 100644
--- a/resources/views/components/form/autocomplete.blade.php
+++ b/resources/views/components/form/autocomplete.blade.php
@@ -1,4 +1,4 @@
-@include('load.autocomplete')
+@include('load.form.autocomplete')
 
 <input type="hidden" name="{{ $name }}_id" id="{{ $name }}_id" value="{{ $data['id'] ?? null }}">
 <input type="text" name="{{ $name }}_name" class="form-control autocomplete" value="{{ $data['name'] ?? ''}}" data-url="{{ $url ?? ''}}" data-field="{{ $name }}_id" autocomplete="off">
diff --git a/resources/views/components/form/datepicker.blade.php b/resources/views/components/form/datepicker.blade.php
index a32bcbd9..fd4ad378 100644
--- a/resources/views/components/form/datepicker.blade.php
+++ b/resources/views/components/form/datepicker.blade.php
@@ -1,4 +1,4 @@
-@include('load.datepicker')
+@include('load.form.datepicker')
 
 <div class="input-group date" data-target-input="nearest">
 	@include('components.input', ['class' => 'datepicker', 'meta' => 'data-target="#'.str_slug($name).'"', 'placeholder' => App\Repositories\Core\DateTime::getLocaleFormatDate() ])
diff --git a/resources/views/components/form/editor.blade.php b/resources/views/components/form/editor.blade.php
index c5a2b646..c476950f 100644
--- a/resources/views/components/form/editor.blade.php
+++ b/resources/views/components/form/editor.blade.php
@@ -7,7 +7,7 @@
 
 
 @if(!defined('LOAD_EDITOR')) 
-	@include('load.editor')
+	@include('load.form.editor.editor')
 	@push('js')
 		<script>
 			$(function() {
diff --git a/resources/views/components/form/percent.blade.php b/resources/views/components/form/percent.blade.php
index 548f778e..f45ed46c 100644
--- a/resources/views/components/form/percent.blade.php
+++ b/resources/views/components/form/percent.blade.php
@@ -3,7 +3,7 @@
 	@include('components.input', ['type' => 'number', 'meta' => "step = '.01'"])
 	
 	<div class="input-group-append">
-		<button class="btn btn-outline-secondary" type="button" aria-haspopup="true" aria-expanded="false">
+		<button class="btn bg-light" type="button" aria-haspopup="false" aria-expanded="false">
 			%
 		</button>
 	</div>
diff --git a/resources/views/components/form/tags.blade.php b/resources/views/components/form/tags.blade.php
index 4568d417..7a2978f3 100644
--- a/resources/views/components/form/tags.blade.php
+++ b/resources/views/components/form/tags.blade.php
@@ -15,5 +15,5 @@
 </select>
 
 @if(!defined('LOAD_SELECT2')) 
-	@include('load.select2')
+	@include('load.form.select2')
 @endif
diff --git a/resources/views/components/form/toggle.blade.php b/resources/views/components/form/toggle.blade.php
index e5df7967..f4b517c2 100644
--- a/resources/views/components/form/toggle.blade.php
+++ b/resources/views/components/form/toggle.blade.php
@@ -1,3 +1,4 @@
-<input type="checkbox" name="{{ $name ?? ''}}" id="{{ $id_name ?? $name ?? '' }}" class="{{ $class ?? 'toggle'}}" value="{{ $val ?? 1}}" data-toggle="toggle" data-on="{{ $on ?? __('yes') }}" data-off="{{ $off ?? __('no') }}" data-onstyle="{{ $onstyle ?? 'outline-success'}}" data-offstyle="{{ $offstyle ?? 'outline-danger'}}" data-size="{{ $size ?? 'sm' }}" @if ( (isset($value) && isset($val) && ($value == $val)) || (!isset($val) && isset($value) && $value)) checked @endif  {{ $disabled ?? ''}} {{ $meta ?? ''}} >
+<input type="hidden" name="{{ $name ?? ''}}" value="0">
+<input type="checkbox" name="{{ $name ?? ''}}" id="{{ $id_name ?? $name ?? '' }}" class="{{ $class ?? 'toggle'}}" value="{{ $val ?? 1}}" data-toggle="toggle" data-on="{{ $on ?? __('yes') }}" data-off="{{ $off ?? __('no') }}" data-onstyle="{{ $onstyle ?? 'outline-success'}}" data-offstyle="{{ $offstyle ?? 'outline-danger'}}" data-size="{{ $size ?? '' }}" @if ( (isset($value) && isset($val) && ($value == $val)) || (!isset($val) && isset($value) && $value)) checked @endif  {{ $disabled ?? ''}} {{ $meta ?? ''}} >
 
-@include('load.toggle')
\ No newline at end of file
+@include('load.form.toggle')
\ No newline at end of file
diff --git a/resources/views/components/layout/box-collapse.blade.php b/resources/views/components/layout/box-collapse.blade.php
index ad9843d1..1abc518f 100644
--- a/resources/views/components/layout/box-collapse.blade.php
+++ b/resources/views/components/layout/box-collapse.blade.php
@@ -5,7 +5,7 @@
 				<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#{{ $id }}" aria-expanded="false" aria-controls="{{ $id }}">
 					<i class="fa fa-chevron-right"></i>
 				</button>
-				{!! $title !!} 
+				{!! $title ?? null !!} 
 				@if (isset($required) && $required)
 					<sup>*</sup>
 				@endif
diff --git a/resources/views/components/uploader/block_image_new.blade.php b/resources/views/components/uploader/block_image_new.blade.php
index 3fc48153..32e636a3 100644
--- a/resources/views/components/uploader/block_image_new.blade.php
+++ b/resources/views/components/uploader/block_image_new.blade.php
@@ -1,10 +1,10 @@
-<div class="col row-new-image row-image mt-3 mb-2">
+<div class="col {{ $prefix ?? '' }}row-new-image row-image mt-3 mb-2">
 
 	<p>
-	<button type="button" class="btn btn-danger delete-new-image-btn"><i class="fa fa-minus-circle"></i></button>
-	Photo <span class="row-image-number"></span>
+	<button type="button" class="btn btn-danger {{ $prefix ?? '' }}delete-new-image-btn"><i class="fa fa-minus-circle"></i></button>
+	Photo <span class="{{ $prefix ?? '' }}row-image-number"></span>
 	</p>
 	
-	<input name="images[]" type="file" class="file" data-show-upload="false" data-show-caption="true" data-msg-placeholder="Choisissez une photo">
+	<input name="{{ $prefix ?? '' }}images[]" type="file" class="file" data-show-upload="false" data-show-caption="true" data-msg-placeholder="Choisissez une photo">
 
 </div>
diff --git a/resources/views/components/uploader/mini-gallery-items.blade.php b/resources/views/components/uploader/mini-gallery-items.blade.php
index 16dbcdd0..6a52e64e 100644
--- a/resources/views/components/uploader/mini-gallery-items.blade.php
+++ b/resources/views/components/uploader/mini-gallery-items.blade.php
@@ -2,19 +2,23 @@
 	@foreach($images as $key => $image)
 		<figure class="mr-2">
 			<img src="{{ $image['url'] }}" class="img-thumbnail img-caption" style="max-height:92px;">
-			<figcaption class="text-center pt-2">
-				<button type="button" class="btn btn-xs btn-outline-secondary">
-					<i class="fas fa-expand-alt"></i>
-				</button>
-				<button type="button" class="btn btn-xs btn-outline-danger">
-					<i class="fas fa-trash" data-index="{{ $key }}"></i>
-				</button>
-			</figcaption>
+			@if ($can_edit ?? true)
+				<figcaption class="text-center pt-2">
+					<button type="button" class="btn btn-xs btn-outline-secondary">
+						<i class="fas fa-expand-alt"></i>
+					</button>
+					<button type="button" class="btn btn-xs btn-outline-danger">
+						<i class="fas fa-trash" data-index="{{ $key }}"></i>
+					</button>
+				</figcaption>
+			@endif
 		</figure>
 	@endforeach
 @endif
 
-<script>
-	handleDeleteImages();
-	handleEnlargeImages();
-</script>
\ No newline at end of file
+@if ($can_edit ?? true)
+	<script>
+		{{ $prefix ?? '' }}handleDeleteImages();
+		{{ $prefix ?? '' }}handleEnlargeImages();
+	</script>
+@endif
\ No newline at end of file
diff --git a/resources/views/components/uploader/mini-gallery.blade.php b/resources/views/components/uploader/mini-gallery.blade.php
index b4713295..599cfd96 100644
--- a/resources/views/components/uploader/mini-gallery.blade.php
+++ b/resources/views/components/uploader/mini-gallery.blade.php
@@ -1,14 +1,14 @@
-<div class="row" id="uploader-mini-gallery"></div>
+<div class="row" id="{{ $prefix ?? '' }}uploader-mini-gallery"></div>
 
-<div class="modal fade" id="mini-gallery-lightbox" tabindex="-1" role="dialog" aria-labelledby="mini-gallery-lightbox" aria-hidden="true">
+<div class="modal fade" id="{{ $prefix ?? '' }}mini-gallery-lightbox" tabindex="-1" role="dialog" aria-labelledby="mini-gallery-lightbox" aria-hidden="true">
 	<div class="modal-dialog modal-dialog-centered modal-lg" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h5 class="modal-title" id="mini-gallery-title-lightbox"></h5>
+				<h5 class="modal-title"></h5>
 				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
 			</div>
 			<div class="modal-body">
-				<img src="" id="mini-gallery-img-lightbox" class="img-fluid" >
+				<img src="" class="img-fluid lightbox" >
 			</div>
 		</div>
 	</div>
@@ -16,8 +16,8 @@
 
 @push('js')
 	<script>
-		function handleDeleteImages() {
-			$('#uploader-mini-gallery .fa-trash').click(function() {
+		function {{ $prefix ?? '' }}handleDeleteImages() {
+			$('#{{ $prefix ?? '' }}uploader-mini-gallery .fa-trash').click(function() {
 				id = $('#id').val();
 				index = $(this).data('index');
 				console.log(id);
@@ -35,13 +35,13 @@
 			})
 		}
 
-		function handleEnlargeImages() {
-			$('#uploader-mini-gallery .fa-expand-alt').click(function() {
+		function {{ $prefix ?? '' }}handleEnlargeImages() {
+			$('#{{ $prefix ?? '' }}uploader-mini-gallery .fa-expand-alt').click(function() {
 				$img = $(this).parents('figure').find('.img-thumbnail');
 				url = $img.attr('src');
 				console.log(url);
-				$('#mini-gallery-img-lightbox').attr('src', url);
-				$('#mini-gallery-lightbox').modal('show');
+				$('#{{ $prefix ?? '' }}mini-gallery-lightbox .lightbox').attr('src', url);
+				$('#{{ $prefix ?? '' }}mini-gallery-lightbox').modal('show');
 			})
 		}
 	</script>
diff --git a/resources/views/components/uploader/widget.blade.php b/resources/views/components/uploader/widget.blade.php
index ed476173..84c032c9 100644
--- a/resources/views/components/uploader/widget.blade.php
+++ b/resources/views/components/uploader/widget.blade.php
@@ -2,51 +2,57 @@
 
 <div class="card">
 	<div class="card-header">
-		<h3 class="card-title">Photos</h3>
+		<h3 class="card-title">{{ $title }}</h3>
 		<div class="card-tools">
 			
 		</div>
 	</div>
 	<div class="card-body pt-3 pb-0">
-		@if (isset($id))
+		@if (isset($article['id']))
 			@include('components.uploader.mini-gallery')
 		@endif
 
-		<div id="uploader-new-images"></div>
-		@include('components.uploader.block_image_new', ['name' => 'images[]', 'required' => true])
-	</div>
-	<div class="card-footer">
-		<button type="button" class="btn btn-xs btn-primary add-image pull-right">Ajout <i class="fa fa-plus"></i></button>
+		@if ($can_edit ?? true)
+			<div id="{{ $prefix ?? '' }}uploader-new-images"></div>
+			@include('components.uploader.block_image_new', ['name' => 'images[]', 'required' => true])
+		@endif
 	</div>
+	@if ($can_edit ?? true)
+		<div class="card-footer">
+			<button type="button" class="btn btn-xs btn-primary {{ $prefix ?? '' }}add-image pull-right">Ajout <i class="fa fa-plus"></i></button>
+		</div>
+	@endif
 </div>
 
 @push('js')
 	<script>
-		function append_image() {
-			$("#uploader-new-images .file").fileinput();
-			$("#uploader-new-images .file").focus();
+		function {{ $prefix ?? '' }}append_image() {
+			$("#{{ $prefix ?? '' }}uploader-new-images .file").fileinput();
+			$("#{{ $prefix ?? '' }}uploader-new-images .file").focus();
 		}
 
-		$("#uploader-new-images").appender({
-			rowSection: '.row-new-image',
-			type: '.row-image',
-			addBtn: '.add-image',
+		$("#{{ $prefix ?? '' }}uploader-new-images").appender({
+			rowSection: '.{{ $prefix ?? '' }}row-new-image',
+			type: '.{{ $prefix ?? '' }}row-image',
+			addBtn: '.{{ $prefix ?? '' }}add-image',
 			appendEffect: 'fade',
 			addClass: 'animated fadeIn',
-			rowNumber: '.row-image-number',
-			deleteBtn: '.delete-new-image-btn',
-			callback: append_image,
+			rowNumber: '.{{ $prefix ?? '' }}row-image-number',
+			deleteBtn: '.{{ $prefix ?? '' }}delete-new-image-btn',
+			callback: {{ $prefix ?? '' }}append_image,
 			hideSection: true
 		});
 
 		function loadImages()
 		{
-			$gallery = $("#uploader-mini-gallery");
+			$gallery = $("#{{ $prefix ?? '' }}uploader-mini-gallery");
 			if ($gallery) {
 				$gallery.load("{{ $load_url }}");
 			}
 		}
 
-		loadImages();
+		$(function() {
+			loadImages();
+		});
 	</script>
 @endpush
diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php
index c435acbe..ea4c0217 100644
--- a/resources/views/home.blade.php
+++ b/resources/views/home.blade.php
@@ -6,6 +6,9 @@
 
 @section('content')
 
-TEST
+@component('components.layout.box-collapse', ['title' => __('person_in_charge'), 'id' => 'form-contact'])
+	TEST
+@endcomponent
+
 
 @endsection
diff --git a/resources/views/layouts/partials/site/topbar.blade.php b/resources/views/layouts/partials/site/topbar.blade.php
index ce04cc31..37057e54 100644
--- a/resources/views/layouts/partials/site/topbar.blade.php
+++ b/resources/views/layouts/partials/site/topbar.blade.php
@@ -35,7 +35,6 @@
 							</a>
 
 							<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
-								<a class="dropdown-item" href="{{ route('admin') }}"><i class="fa fa-cog"></i> Accès à l'administration</a>
 
 								<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
 									Déconnexion
diff --git a/resources/views/load/form/appender.blade.php b/resources/views/load/form/appender.blade.php
new file mode 100644
index 00000000..e6c48f99
--- /dev/null
+++ b/resources/views/load/form/appender.blade.php
@@ -0,0 +1,77 @@
+@if(!defined('LOAD_APPENDER'))
+	@push('js') 
+		<script>
+
+			(function ($) {
+				$.fn.appender = function (settings) {
+					let appendArea = this;
+					let rowHtml = $(settings.rowSection)[0].outerHTML;
+
+					settings.hideSection ? $(settings.rowSection).remove() : "";
+
+					let rowCounter = 1;
+
+					if (settings.rowNumberStart) {
+						rowCounter = Number(settings.rowNumberStart);
+					}
+
+					$(document).on('click', settings.addBtn, function (event) {
+						$(appendArea).append(rowHtml);
+
+						if (settings.appendEffect === 'fade') {
+							$(settings.rowSection).last().hide().fadeIn();
+						} else if (settings.appendEffect === 'slide') {
+							$(settings.rowSection).last().hide().slideDown(200);
+						}
+
+						$(settings.rowSection).last().addClass(settings.addClass);
+
+						$(settings.rowNumber).last().text(rowCounter);
+
+						type = (settings.type) ? settings.type : settings.rowSection;
+						
+						$(type).each(function(rowIndex) {
+							$(this).find('input[name]').each(function() {
+								var name = $(this).attr('name');
+								name = name.replace(/\[[0-9]?\]/g, '['+rowIndex+']');
+								$(this).attr('name',name);
+							});
+							$(this).find('select[name]').each(function() {
+								var name = $(this).attr('name');
+								name = name.replace(/\[[0-9]?\]/g, '['+rowIndex+']');
+								$(this).attr('name',name);
+							});
+							$(this).find('textarea[name]').each(function() {
+								var name = $(this).attr('name');
+								name = name.replace(/\[[0-9]?\]/g, '['+rowIndex+']');
+								$(this).attr('name',name);
+							});
+							$(this).find('.appender').each(function() {
+								$(this).data('id',rowIndex);
+							});
+						});
+
+						rowCounter++;
+
+						if (settings.callback) {
+							settings.callback();
+						}
+
+					});
+
+
+					if (settings.deleteBtn) {
+						$(document).on('click', settings.deleteBtn, function (e) {
+							$(e.target).closest(settings.rowSection).remove();
+							if (settings.callback) {
+								settings.callback();
+							}
+						})
+					}
+				};
+
+			}(jQuery));
+		</script>
+	@endpush
+	@php(define('LOAD_APPENDER', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/autocomplete.blade.php b/resources/views/load/form/autocomplete.blade.php
similarity index 100%
rename from resources/views/load/autocomplete.blade.php
rename to resources/views/load/form/autocomplete.blade.php
diff --git a/resources/views/load/form/builder/formbuilder.blade.php b/resources/views/load/form/builder/formbuilder.blade.php
new file mode 100644
index 00000000..f2502b77
--- /dev/null
+++ b/resources/views/load/form/builder/formbuilder.blade.php
@@ -0,0 +1,6 @@
+@if(!defined('LOAD_FORMBUILDER'))
+    @push('scripts')
+        <script src="{{ asset('/assets/plugins/formBuilder/form-builder.min.js') }}"></script>
+    @endpush
+    @php(define('LOAD_FORMBUILDER', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/builder/formio.blade.php b/resources/views/load/form/builder/formio.blade.php
new file mode 100644
index 00000000..19898bf4
--- /dev/null
+++ b/resources/views/load/form/builder/formio.blade.php
@@ -0,0 +1,9 @@
+@if(!defined('LOAD_FORMIOJS'))
+    @push('css')
+        <link rel="stylesheet" href="{{ asset('/assets/plugins/formiojs/formio.full.min.css') }}">  
+    @endpush
+    @push('scripts')
+        <script src="{{ asset('/assets/plugins/formiojs/formio.full.min.js') }}"></script>
+    @endpush
+    @php(define('LOAD_FORMIOJS', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/check_fields.blade.php b/resources/views/load/form/check_fields.blade.php
new file mode 100644
index 00000000..0d33d4d0
--- /dev/null
+++ b/resources/views/load/form/check_fields.blade.php
@@ -0,0 +1,39 @@
+function checkCollapsedFields(selector)
+{
+	var fields = selector + ' input,' + selector + ' textarea,' + selector + ' select';
+    console.log(fields);
+
+	var nb_fields = $(fields).length;
+    console.log(nb_fields);
+	var nb_required = $(fields).filter('[required]').length;
+	console.log(nb_required);
+    var nb_filled = 0;
+	var nb_necessary = 0; 
+	
+    $(fields).each(function(i, field){
+        if ($(field).val() != '')
+        {
+            nb_filled++;
+        }
+    });
+	
+    $(fields).filter('[required]').each(function(i, required){
+        if ($(required).val() != '')
+        {
+            nb_necessary++;
+        }
+    });
+
+    var result = nb_filled + " / " + nb_fields;
+    result = result + " | " + nb_necessary + " / " + nb_required;
+
+    console.log(result);
+
+    var check = $(selector).parent().find('.check');
+    console.log(check);
+
+    // $(selector).parent().find('.check').html(result);
+    if (nb_necessary < nb_required) {
+        $(selector).collapse('show');
+    }
+}
diff --git a/resources/views/load/form/color.blade.php b/resources/views/load/form/color.blade.php
new file mode 100644
index 00000000..e21aaebe
--- /dev/null
+++ b/resources/views/load/form/color.blade.php
@@ -0,0 +1,22 @@
+@if(!defined('LOAD_COLOR'))
+    @push('scripts')
+    	<script src="{{ asset('/assets/plugins/jquery-minicolors/jquery.minicolors.min.js') }}"></script>  
+
+    	<script>
+    		function initColor(sel) {
+                var selector = (typeof(sel) == 'undefined') ? '.color' : sel;  
+                var settings = {
+                    position: 'bottom left',
+                    theme: 'bootstrap'
+                };
+    			$(selector).minicolors(settings);
+    		}
+    	</script>
+
+    @endpush
+
+    @push('css')
+    	<link rel="stylesheet" href="{{ asset('/assets/plugins/jquery-minicolors/jquery.minicolors.css') }}">  
+    @endpush
+    @php(define('LOAD_COLOR', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/datepicker.blade.php b/resources/views/load/form/datepicker.blade.php
similarity index 100%
rename from resources/views/load/datepicker.blade.php
rename to resources/views/load/form/datepicker.blade.php
diff --git a/resources/views/load/form/duallist.blade.php b/resources/views/load/form/duallist.blade.php
new file mode 100644
index 00000000..4795750a
--- /dev/null
+++ b/resources/views/load/form/duallist.blade.php
@@ -0,0 +1,25 @@
+@if(!defined('LOAD_DUALLIST'))
+	@push('scripts')
+		<script src="{{ asset('/assets/plugins/bootstrap4-duallistbox/jquery.bootstrap-duallistbox.min.js') }}"></script>  
+
+		<script>
+			function initDualList(sel) {
+				var selector = (typeof(sel) == 'undefined') ? '.duallist' : sel;
+				var settings = {
+					nonSelectedListLabel: 'Non-selected',
+					selectedListLabel: 'Selected',
+					preserveSelectionOnMove: 'moved',
+					moveOnSelect: true,
+					nonSelectedFilter: ''
+				};
+				$(selector).bootstrapDualListbox(settings);
+			}
+		</script>
+
+	@endpush
+
+	@push('css')
+		<link rel="stylesheet" href="{{ asset('/assets/plugins/bootstrap4-duallistbox/bootstrap-duallistbox.min.css') }}">  
+	@endpush
+	@php(define('LOAD_DUALLIST', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/editor/editor.blade.php b/resources/views/load/form/editor/editor.blade.php
new file mode 100644
index 00000000..8168a42d
--- /dev/null
+++ b/resources/views/load/form/editor/editor.blade.php
@@ -0,0 +1,15 @@
+@if(!defined('LOAD_EDITOR'))
+
+	@include('load.form.editor.tinymce')
+
+	@push('js')
+		<script>
+			function initEditor(selector) {
+				var selector = '.editor';
+				$(selector).tinymce({});
+			}
+		</script>
+	@endpush
+
+	@php(define('LOAD_EDITOR', true))
+@endif
diff --git a/resources/views/load/form/editor/tinymce.blade.php b/resources/views/load/form/editor/tinymce.blade.php
new file mode 100644
index 00000000..1f889489
--- /dev/null
+++ b/resources/views/load/form/editor/tinymce.blade.php
@@ -0,0 +1,41 @@
+@if(!defined('LOAD_TINYMCE'))
+    @push('js')
+        <script src="{!! mix('/js/tinymce/tinymce.min.js', '/assets/vendor/boilerplate') !!}"></script>
+        <script>
+            tinymce.defaultSettings = {
+                plugins: "autoresize fullscreen codemirror link lists table media image imagetools paste customalign stickytoolbar",
+                toolbar: "undo redo | styleselect | bold italic underline | customalignleft aligncenter customalignright | link media image | bullist numlist | table | code fullscreen",
+                contextmenu: "link image imagetools table spellchecker bold italic underline",
+                sticky_toolbar_container: '.tox-editor-header',
+                toolbar_drawer: "sliding",
+                sticky_offset: $('nav.main-header').outerHeight(),
+                codemirror: { config: { theme: 'storm' } },
+                menubar: false,
+                removed_menuitems: 'newdocument',
+                remove_linebreaks: false,
+                forced_root_block: false,
+                force_p_newlines: true,
+                relative_urls: false,
+                verify_html: false,
+                branding: false,
+                statusbar: false,
+                browser_spellcheck: true,
+                encoding: 'UTF-8',
+                image_uploadtab: false,
+                paste_preprocess: function(plugin, args) {
+                    args.content = args.content.replace(/<(\/)*(\\?xml:|meta|link|span|font|del|ins|st1:|[ovwxp]:)((.|\s)*?)>/gi, ''); // Unwanted tags
+                    args.content = args.content.replace(/\s(class|style|type|start)=("(.*?)"|(\w*))/gi, ''); // Unwanted attributes
+                    args.content = args.content.replace(/<(p|a|div|span|strike|strong|i|u)[^>]*?>(\s|&nbsp;|<br\/>|\r|\n)*?<\/(p|a|div|span|strike|strong|i|u)>/gi, ''); // Empty tags
+                },
+                skin : "boilerplate",
+                language: '{{ App::getLocale() }}'
+            };
+
+            function initEditor(sel) {
+                var selector = (typeof(sel) == 'undefined') ? '.editor' : sel;  
+                $(selector).tinymce({});
+            }
+        </script>
+    @endpush
+    @php(define('LOAD_TINYMCE', true))
+@endif
diff --git a/resources/views/load/form/select2.blade.php b/resources/views/load/form/select2.blade.php
new file mode 100644
index 00000000..5f6b811c
--- /dev/null
+++ b/resources/views/load/form/select2.blade.php
@@ -0,0 +1,18 @@
+@if(!defined('LOAD_SELECT2'))
+    @push('scripts')
+        <script src="{!! mix('/js/select2/select2.full.min.js', '/assets/vendor/boilerplate') !!}"></script>
+        <script src="{!! asset('/assets/vendor/boilerplate/js/select2/i18n/'.config('boilerplate.app.locale').'.js') !!}"></script>
+        <script>
+        	function initSelect2() {
+				$(".select2").select2({
+					placeholder: "{{ __('select_a_value') }}",
+					allowClear: false,
+					width: {
+						value: '100%'
+					}
+				});
+			}
+		</script>
+    @endpush
+    @php(define('LOAD_SELECT2', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/set_options.blade.php b/resources/views/load/form/set_options.blade.php
new file mode 100644
index 00000000..f375d455
--- /dev/null
+++ b/resources/views/load/form/set_options.blade.php
@@ -0,0 +1,25 @@
+@if(!defined('LOAD_SET_OPTIONS'))
+	@push('js')
+		<script>  
+			function setOptions(selector,data,selected,all) {
+				// console.log(data);
+				console.log(selector);
+				var $el = $(selector);
+				$el.empty(); // remove old options
+				if (all) {
+					$el.append($("<option></option>").attr("value",'').text('{{ __("all") }}'));
+				}
+				$.each(data, function(key, name) {
+					if (key != null) {
+						if (key == selected) {
+							$el.append($("<option selected='selected'></option>").attr("value", key).text(name));
+						} else {
+							$el.append($("<option></option>").attr("value", key).text(name));
+						}
+					}
+				});	
+			}
+		</script>
+	@endpush
+	@php(define('LOAD_SET_OPTIONS', true))
+@endif		
\ No newline at end of file
diff --git a/resources/views/load/form/toggle.blade.php b/resources/views/load/form/toggle.blade.php
new file mode 100644
index 00000000..59bd4f5b
--- /dev/null
+++ b/resources/views/load/form/toggle.blade.php
@@ -0,0 +1,34 @@
+@if(!defined('LOAD_TOGGLE'))
+	@push('scripts')
+		<script src="{{ asset('/assets/plugins/bootstrap4-toggle/js/bootstrap4-toggle.min.js') }}"></script>  
+
+		<script>
+			function initToggle(url, sel, data, callback) {
+				var selector = (typeof(sel) == 'undefined') ? '.toggle' : sel;
+				if (typeof(data) == 'undefined') {
+					var data = {};
+				}
+				$(selector).bootstrapToggle();
+				
+				$('input' + selector).change(function() {
+					console.log($(this));
+					data['id'] = $(this).data('id');
+					data['active'] = $(this).is(':checked');
+					if (data['id'] && (typeof(url) != 'undefined') && (url != '')) {
+						var dataJson = Object.assign({}, data);
+						$.post(url, dataJson);
+					}
+					if (typeof(callback) != 'undefined') {
+						eval(callback);
+					}
+				});
+			}
+		</script>
+
+	@endpush
+
+	@push('css')
+		<link rel="stylesheet" href="{{ asset('/assets/plugins/bootstrap4-toggle/css/bootstrap4-toggle.min.css') }}">  
+	@endpush
+	@php(define('LOAD_TOGGLE', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/upload/fileinput.blade.php b/resources/views/load/form/upload/fileinput.blade.php
new file mode 100644
index 00000000..52e17d84
--- /dev/null
+++ b/resources/views/load/form/upload/fileinput.blade.php
@@ -0,0 +1,25 @@
+@if(!defined('LOAD_FILEINPUT'))
+    @push('css')
+        <link rel="stylesheet" href="{!! mix('/js/fileinput/bootstrap-fileinput.min.css', '/assets/vendor/boilerplate') !!}">
+    @endpush
+    @push('js')
+        <script src="{!! mix('/js/fileinput/bootstrap-fileinput.min.js', '/assets/vendor/boilerplate') !!}"></script>
+        @if(App::getLocale() !== 'en')
+            <script src="{!! asset('/assets/vendor/boilerplate/js/fileinput/locales/'.config('boilerplate.app.locale').'.js') !!}"></script>
+            <script>
+                $.fn.fileinput.defaults.language = '{{ config('boilerplate.app.locale') }}';
+            </script>
+        @endif
+    @endpush
+    <script>
+        function initUpload(selector) {
+            var selector = '.file';
+            $(selector).fileinput({
+                showCaption: false,
+                dropZoneEnabled: false,
+                showUpload: false,
+            });
+        }
+    </script>
+    @php(define('LOAD_FILEINPUT', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/upload/upload.blade.php b/resources/views/load/form/upload/upload.blade.php
new file mode 100644
index 00000000..cd2bb45c
--- /dev/null
+++ b/resources/views/load/form/upload/upload.blade.php
@@ -0,0 +1,29 @@
+@if(!defined('LOAD_FILEINPUT'))
+	@push('css')
+		<link rel="stylesheet" href="{!! mix('/js/fileinput/bootstrap-fileinput.min.css', '/assets/vendor/boilerplate') !!}">
+	@endpush
+
+	@push('js')
+		<script src="{!! mix('/js/fileinput/bootstrap-fileinput.min.js', '/assets/vendor/boilerplate') !!}"></script>
+		@if(App::getLocale() !== 'en')
+			<script src="{!! asset('/assets/vendor/boilerplate/js/fileinput/locales/' . App::getLocale() . '.js') !!}"></script>
+			<script>
+				$.fn.fileinput.defaults.language = '{{ App::getLocale() }}';
+			</script>
+		@endif
+
+		<script>
+			function initUpload(sel) {
+				var selector = (typeof(sel) == 'undefined') ? '.file' : sel;
+				$(selector).fileinput({
+					showCaption: false,
+					dropZoneEnabled: false,
+					showUpload: false,
+				});
+			}
+		</script>
+
+	@endpush
+
+	@php(define('LOAD_FILEINPUT', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/form/url.blade.php b/resources/views/load/form/url.blade.php
new file mode 100644
index 00000000..f7e3a66e
--- /dev/null
+++ b/resources/views/load/form/url.blade.php
@@ -0,0 +1,16 @@
+@if(!defined('LOAD_URL'))
+	@include('load.layout.modal')
+	@push('js')
+		<script>
+			function initLoadUrl(sel) {
+				var selector = (typeof(sel) == 'undefined') ? '.btn-web' : sel;
+			
+				$(selector).off().click(function() {
+					var url = $(this).closest('.input-group').find('.url').val();
+					viewModal(url);
+				});
+			}
+		</script> 
+	@endpush
+	@php(define('LOAD_URL', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/chevron.blade.php b/resources/views/load/layout/chevron.blade.php
similarity index 100%
rename from resources/views/load/chevron.blade.php
rename to resources/views/load/layout/chevron.blade.php
diff --git a/resources/views/load/layout/modal.blade.php b/resources/views/load/layout/modal.blade.php
new file mode 100644
index 00000000..e08fdc2a
--- /dev/null
+++ b/resources/views/load/layout/modal.blade.php
@@ -0,0 +1,114 @@
+@if(!defined('LOAD_MODAL'))
+
+	@push('js')
+
+		<script>
+			function openModal(title, form_id, url_open, url_save, callback, size, no_confirm) {
+				var status = 0;
+				var dialog = bootbox.dialog({
+					title: title,
+					message: '<p><i class="fa fa-spin fa-spinner"></i> {{ __('loading') }} ...</p>',
+					size: size ? size : 'large',
+					scrollable: true,
+					onHide: function(e) {
+						console.log(status);
+					},
+					buttons: buildModalButtons(form_id, no_confirm)
+				});
+
+/*
+				changeModalContent(dialog, url_open);
+				var callback = handlePostModal(form_id,url_save, callback);
+				handlePostModal(form_id,url_save, callback);
+*/				
+									
+				dialog.init(function() {
+					$.get(url_open, function(data) {
+						dialog.find('.bootbox-body').html(data);
+						handlePostModal(form_id,url_save, callback);
+					});
+				});
+
+			}
+
+			function changeModalContent(dialog, url, callback) {
+				dialog.init(function() {
+					$.get(url, function(data) {
+						dialog.find('.bootbox-body').html(data);
+					});
+				});	
+			}
+
+			function viewModal(url, size, title) {
+				var dialog = bootbox.dialog({
+					title: title ? title : 'Web viewer',
+					message: '<iframe style="border:0;" src="' + url + '" height="400" width="100%"></iframe>',
+					size: size ? size : 'xl',
+					scrollable: true,
+				});									
+			}
+
+			function buildModalButtons(form_id, no_confirm) {
+				if (!no_confirm) {
+					var buttons = {
+						cancel: {
+							label: '{{ __('cancel') }}',
+							className: 'btn-secondary'
+						},
+						confirm: {
+							label: '{{ __('save') }}',
+							className: 'btn-success',
+							callback: function() {
+								submitModal(form_id);
+							}
+						},
+					};
+				} else {
+					buttons = '';
+				}
+				return buttons; 
+			}
+
+			function submitModal(form_id) {
+				/*
+				var data = $(form_id).serialize();
+				$.post(url_save, data)
+					.done(function(data) {
+						if (callback) {
+							eval(callback);
+						}
+					});
+				*/
+				if (typeof(tinyMCE) != 'undefined') {
+					tinyMCE.triggerSave();
+				}
+				var oForm = 'form' + form_id;
+				$(oForm).submit();
+				status = 1;
+			}
+
+			function handlePostModal(form_id,url_save, callback) {
+				var oForm = 'form'+form_id;
+				$(oForm).submit(function(e) {
+					e.preventDefault();
+					var formData = new FormData(this);
+					$.ajax({
+						url: url_save,
+						type: 'POST',
+						data: formData,
+						success: function (data) {
+							if (callback) {
+								eval(callback);
+							}
+						},
+						cache: false,
+						contentType: false,
+						processData: false
+					});
+				});
+			}
+		</script>
+	@endpush
+
+	@php(define('LOAD_MODAL', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/layout/nicescroll.blade.php b/resources/views/load/layout/nicescroll.blade.php
new file mode 100644
index 00000000..187ddaf5
--- /dev/null
+++ b/resources/views/load/layout/nicescroll.blade.php
@@ -0,0 +1,29 @@
+@if(!defined('LOAD_NICESCROLL'))
+    @push('scripts')
+        <script type="text/javascript" src="{{ asset('/assets/plugins/jquery.slimscroll.min.js') }}"></script>
+        <script>
+        	function initScroll(selector) {
+        		var selector = (typeof(selector) == 'undefined') ? '.nicescrollable' : selector;
+
+				$(selector).niceScroll({
+					horizrailenabled: false,
+					cursorborder: "0",
+					cursorwidth: "8px",
+					cursorcolor: "#fff",
+					zindex: "5555",
+					autohidemode: true,
+					bouncescroll: true,
+					mousescrollstep: 40,
+					scrollspeed: 100,
+					background: "#cdcdcd",
+					cursoropacitymin: 0.3,
+					cursoropacitymax: 0.7,
+					cursorborderradius: 0,
+					railpadding: {top:0,right:1,left:0,bottom:0}
+				});
+			}
+
+        </script>
+    @endpush
+    @php(define('LOAD_NICESCROLL', true))
+@endif
diff --git a/resources/views/load/layout/slimscroll.blade.php b/resources/views/load/layout/slimscroll.blade.php
new file mode 100644
index 00000000..bbed2dba
--- /dev/null
+++ b/resources/views/load/layout/slimscroll.blade.php
@@ -0,0 +1,6 @@
+@if(!defined('LOAD_SLIMSCROLL'))
+	@push('scripts')
+		<script type="text/javascript" src="{{ asset('/assets/plugins/jquery.slimscroll.min.js') }}"></script>
+	@endpush
+	@php(define('LOAD_SLIMSCROLL', true))
+@endif
\ No newline at end of file
diff --git a/resources/views/load/layout/tabs.blade.php b/resources/views/load/layout/tabs.blade.php
new file mode 100644
index 00000000..e6c864a5
--- /dev/null
+++ b/resources/views/load/layout/tabs.blade.php
@@ -0,0 +1,39 @@
+@if(!defined('LOAD_TABS'))
+	@push('scripts')
+
+		<script>
+			function addTab(name, id, txt, url) {
+				
+				var navContainer = $('#'+name);
+				var tabContainer = $('#'+name + '-tab');
+				var newTab = name + '-' + id;
+				var newTabId = '#' + newTab;
+				// create the tab
+				$('<a href="'+newTabId+'" data-toggle="tab" class="nav-item nav-link" role="tab">'+txt+'</a>').appendTo(navContainer);
+
+				var url_open = url + id;
+
+				$.get(url_open, function(content) {
+					$('<div class="tab-pane fade pt-0 pb-0" id="'+newTab+'"><div class="card mb-0 card-outline card-info"><div class="card-body">'+content+'</div></div></div>').appendTo(tabContainer);
+	
+					// make the new tab active
+					// console.log('#' + tabname + ' .nav-item a:last');
+					// $('#' + tabname + ' .nav-item a:last').tab('show');
+				});
+
+			}
+
+			function removeTab(name, id) {
+				var tabId = '#' + name + '-' + id;
+				// console.log('#' + name + "a[href='" + tabId + "'])");
+				$('#' + name + " a[href='" + tabId + "']").remove();
+				// console.log('remove ' + tabId);
+				$(tabId).remove();
+
+			}
+		</script>
+
+	@endpush
+
+	@php(define('LOAD_TABS', true))
+@endif
\ No newline at end of file