From 6d50d2c57ad3f3deaa5c1f208a5cd2491f79472e Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 3 Aug 2020 11:44:07 -0400 Subject: [PATCH 1/3] update profil --- app/Http/Controllers/UserController.php | 16 +++++++++++ config/version.yml | 2 +- .../views/admin/configs/ranks/add.blade.php | 4 +-- resources/views/admin/job/edit.blade.php | 4 +-- resources/views/admin/user/profil.blade.php | 15 ++-------- .../admin/user/profil/telephone.blade.php | 28 +++++++++++++++++++ routes/breadcrumbs.php | 8 +++++- routes/web.php | 2 ++ 8 files changed, 60 insertions(+), 19 deletions(-) create mode 100644 resources/views/admin/user/profil/telephone.blade.php diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index d020936b..81e62479 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -250,6 +250,22 @@ class UserController extends Controller return redirect('/admin/profil')->with('success', 'Modification enregistré'); } + public function UserTelephone() + { + return view('admin.user.profil.telephone'); + } + + public function editUserTelephone() + { + $user = \Auth::user(); + + $user->telephone = request('telephone'); + + $user->save(); + + return redirect('/admin/profil')->with('success', 'Modification enregistré'); + } + public function apiList() { $users = \App\User::all(); diff --git a/config/version.yml b/config/version.yml index 48ffa03a..65fd21ce 100644 --- a/config/version.yml +++ b/config/version.yml @@ -5,7 +5,7 @@ current: major: 3 minor: 2 patch: 5 - prerelease: 14-g039b09b6 + prerelease: 15-g8158f8a8 buildmetadata: '' commit: 41845 timestamp: diff --git a/resources/views/admin/configs/ranks/add.blade.php b/resources/views/admin/configs/ranks/add.blade.php index d4b4bd93..fd262bde 100644 --- a/resources/views/admin/configs/ranks/add.blade.php +++ b/resources/views/admin/configs/ranks/add.blade.php @@ -14,14 +14,14 @@
- + Nom du grade
- + Description du grade
diff --git a/resources/views/admin/job/edit.blade.php b/resources/views/admin/job/edit.blade.php index 811abfe0..e628e8fa 100644 --- a/resources/views/admin/job/edit.blade.php +++ b/resources/views/admin/job/edit.blade.php @@ -14,14 +14,14 @@
- + Nom du poste
- + Description du poste
diff --git a/resources/views/admin/user/profil.blade.php b/resources/views/admin/user/profil.blade.php index 6dd3b0c4..40d43ec1 100644 --- a/resources/views/admin/user/profil.blade.php +++ b/resources/views/admin/user/profil.blade.php @@ -43,18 +43,7 @@

Téléphone
- @if ($user->telephone != "Inconnu") - @php - $data = '+'.$user->telephone; - if(preg_match( '/^\+\d(\d{3})(\d{3})(\d{4})$/',$data,$matches)) - { - $result = $matches[1] . '-' .$matches[2] . '-' . $matches[3]; - echo $result; - } - @endphp - @else - Inconnu - @endif + {{ $user->telephone }}

@@ -96,7 +85,7 @@
Modifier mon mot de passe Modifier ma photo de profil - + Modifier mon numéro de téléphone Modifier mon adresse Déconnexion diff --git a/resources/views/admin/user/profil/telephone.blade.php b/resources/views/admin/user/profil/telephone.blade.php new file mode 100644 index 00000000..df7dc5e4 --- /dev/null +++ b/resources/views/admin/user/profil/telephone.blade.php @@ -0,0 +1,28 @@ +@extends('layouts.admin.main') + +@section('content') +
+
+
+ Modification de mon numéro de téléphone +
+
+
+ @csrf +
+ + +
+ +
+
+
+
+@endsection + +@section('custom_scripts') + +@endsection diff --git a/routes/breadcrumbs.php b/routes/breadcrumbs.php index a97a4334..e5cae71d 100644 --- a/routes/breadcrumbs.php +++ b/routes/breadcrumbs.php @@ -269,6 +269,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'); @@ -281,7 +287,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')); diff --git a/routes/web.php b/routes/web.php index 9e19820b..f6067bfd 100644 --- a/routes/web.php +++ b/routes/web.php @@ -165,8 +165,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'); From d730f358fe8e7aa05d67939cfb775e1592f7c5a3 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 3 Aug 2020 15:49:18 +0000 Subject: [PATCH 2/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef3a80fb..20a60abf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,7 @@ deploy_697: environment: name: escadron697 url: http://escadron697.ca + when: manual only: - master @@ -60,6 +61,7 @@ deploy_736: environment: name: escadron736 url: http://736.exvps.ca + when: manual only: - master @@ -76,6 +78,7 @@ deploy_227: environment: name: CCMRC227 url: http://227.exvps.ca + when: manual only: - master @@ -92,6 +95,7 @@ deploy_117: environment: name: CCMRC117 url: http://117.exvps.ca + when: manual only: - master @@ -109,4 +113,4 @@ deploy_dev: name: dev url: http://dev.exvps.ca only: - - dev \ No newline at end of file + - dev From ae00c9e7e098e492d7cd11f1a9927d8ec2680443 Mon Sep 17 00:00:00 2001 From: Mathieu Lagace Date: Mon, 3 Aug 2020 15:50:53 +0000 Subject: [PATCH 3/3] Update .gitlab-ci.yml --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20a60abf..f903d505 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,5 +112,6 @@ deploy_dev: environment: name: dev url: http://dev.exvps.ca + when: manual only: - dev