Merge branch 'dev' into 'schedule-table'

# Conflicts:
#   config/version.yml
This commit is contained in:
Mathieu Lagace
2020-10-02 17:02:03 +00:00
8 changed files with 65 additions and 19 deletions

View File

@@ -275,6 +275,12 @@ Breadcrumbs::for('admin.profil.adress', function ($trail) {
$trail->push('Adresse', route('admin.profil.adress'));
});
// Admin > Profil > Telephone
Breadcrumbs::for('admin.profil.telephone', function ($trail) {
$trail->parent('admin.profil');
$trail->push('Téléphone', route('admin.profil.telephone'));
});
// Admin > Profil > Password
Breadcrumbs::for('admin.profil.psw', function ($trail) {
$trail->parent('admin.profil');
@@ -287,7 +293,7 @@ Breadcrumbs::for('admin.profil.courses', function ($trail) {
$trail->push('Mes cours', route('admin.profil.courses'));
});
// Admin > Profil > Adress
// Admin > Profil > Notification
Breadcrumbs::for('admin.profil.notifications', function ($trail) {
$trail->parent('admin.profil');
$trail->push('Mes notifications', route('admin.profil.notifications'));

View File

@@ -166,8 +166,10 @@ Route::middleware(['auth', 'firstlogin'])->name('admin.')->group(function () {
Route::get('/admin/profil/avatar', 'UserController@UserAvatar')->name('profil.avatar');
Route::get('/admin/profil/password', 'UserController@UserPassword')->name('profil.psw');
Route::get('/admin/profil/adress', 'UserController@UserAdress')->name('profil.adress');
Route::get('/admin/profil/telephone', 'UserController@UserTelephone')->name('profil.telephone');
Route::get('/admin/profil/notifications', 'UserController@userNotification')->name('profil.notifications');
Route::post('/admin/profil/edit/adress', 'UserController@editUserAdress');
Route::post('/admin/profil/edit/telephone', 'UserController@editUserTelephone');
Route::post('/admin/profil/edit/password', 'UserController@editUserPassword');
Route::get('/admin/profil/edit/avatar/{id}', 'UserController@editUserAvatar');
Route::get('/admin/profil/{id?}', 'UserController@showUserProfil')->name('profil');