Skip to content

Commit 959161a

Browse files
authored
Merge pull request #621 from nasirkhan/dev
Dev
2 parents 9a7f210 + 21304f3 commit 959161a

23 files changed

+810
-679
lines changed

app/Http/Controllers/Frontend/UserController.php

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -255,27 +255,26 @@ public function changePassword()
255255
*/
256256
public function changePasswordUpdate(Request $request)
257257
{
258-
$id = auth()->user()->id;
258+
$module_title = $this->module_title;
259+
$module_name = $this->module_name;
260+
$module_path = $this->module_path;
261+
$module_icon = $this->module_icon;
262+
$module_model = $this->module_model;
263+
$module_name_singular = Str::singular($module_name);
259264

260-
if ($id !== auth()->user()->id) {
261-
return redirect()->route('frontend.users.profile', encode_id(auth()->user()->id));
262-
}
265+
$module_action = 'change Password Update';
263266

264-
$request->validate($request, [
267+
$validated = $request->validate([
265268
'password' => 'required|confirmed|min:6',
266269
]);
267270

268-
$module_name = $this->module_name;
269-
$module_name_singular = Str::singular($this->module_name);
270-
271271
$$module_name_singular = auth()->user();
272272

273-
$request_data = $request->only('password');
274-
$request_data['password'] = Hash::make($request_data['password']);
273+
$validated['password'] = Hash::make($validated['password']);
275274

276-
$$module_name_singular->update($request_data);
275+
$$module_name_singular->update($validated);
277276

278-
return redirect()->route('frontend.users.profile', encode_id(auth()->user()->id))->with('flash_success', 'Update successful!');
277+
return redirect()->route('frontend.users.profile')->with('flash_success', 'Update successful!');
279278
}
280279

281280
/**

composer.lock

Lines changed: 416 additions & 406 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app-backend-C8Uv4KGJ.css

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app-backend-Bm_BK1wQ.js renamed to public/build/assets/app-backend-CBef8dsT.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app-backend-oLx_0Cqr.css

Lines changed: 0 additions & 9 deletions
This file was deleted.

public/build/assets/app-frontend-Cv5wTdwu.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/build/assets/app-frontend-D6wa9n6Z.js

Lines changed: 0 additions & 32 deletions
This file was deleted.

public/build/assets/app-frontend-E18xEr2Z.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app-frontend-JA2AfOE5.js

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Binary file not shown.
-115 KB
Binary file not shown.
Binary file not shown.
-24.9 KB
Binary file not shown.
Binary file not shown.
-154 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.

public/build/manifest.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,44 +4,44 @@
44
"name": "popper"
55
},
66
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf": {
7-
"file": "assets/fa-brands-400-Dur5g48u.ttf",
7+
"file": "assets/fa-brands-400-CArp7j8S.ttf",
88
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf"
99
},
1010
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2": {
11-
"file": "assets/fa-brands-400-O7nZalfM.woff2",
11+
"file": "assets/fa-brands-400-BU4mH_I_.woff2",
1212
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2"
1313
},
1414
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf": {
15-
"file": "assets/fa-regular-400-Bf3rG5Nx.ttf",
15+
"file": "assets/fa-regular-400-D4OwLFL7.ttf",
1616
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf"
1717
},
1818
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2": {
19-
"file": "assets/fa-regular-400-DgEfZSYE.woff2",
19+
"file": "assets/fa-regular-400-Cy4iLbxs.woff2",
2020
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2"
2121
},
2222
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf": {
23-
"file": "assets/fa-solid-900-BV3CbEM2.ttf",
23+
"file": "assets/fa-solid-900-BAw_JAW6.ttf",
2424
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf"
2525
},
2626
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2": {
27-
"file": "assets/fa-solid-900-DOQJEhcS.woff2",
27+
"file": "assets/fa-solid-900-CcrrL0x0.woff2",
2828
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2"
2929
},
3030
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.ttf": {
31-
"file": "assets/fa-v4compatibility-B9MWI-E6.ttf",
31+
"file": "assets/fa-v4compatibility-ch80hpM0.ttf",
3232
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.ttf"
3333
},
3434
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2": {
35-
"file": "assets/fa-v4compatibility-BX8XWJtE.woff2",
35+
"file": "assets/fa-v4compatibility-B9t6EWrS.woff2",
3636
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2"
3737
},
3838
"resources/css/app-frontend.css": {
39-
"file": "assets/app-frontend-Cv5wTdwu.css",
39+
"file": "assets/app-frontend-E18xEr2Z.css",
4040
"src": "resources/css/app-frontend.css",
4141
"isEntry": true
4242
},
4343
"resources/js/app-backend.js": {
44-
"file": "assets/app-backend-Bm_BK1wQ.js",
44+
"file": "assets/app-backend-CBef8dsT.js",
4545
"name": "app-backend",
4646
"src": "resources/js/app-backend.js",
4747
"isEntry": true,
@@ -50,7 +50,7 @@
5050
]
5151
},
5252
"resources/js/app-frontend.js": {
53-
"file": "assets/app-frontend-D6wa9n6Z.js",
53+
"file": "assets/app-frontend-JA2AfOE5.js",
5454
"name": "app-frontend",
5555
"src": "resources/js/app-frontend.js",
5656
"isEntry": true,
@@ -59,7 +59,7 @@
5959
]
6060
},
6161
"resources/sass/app-backend.scss": {
62-
"file": "assets/app-backend-oLx_0Cqr.css",
62+
"file": "assets/app-backend-C8Uv4KGJ.css",
6363
"src": "resources/sass/app-backend.scss",
6464
"isEntry": true
6565
}

0 commit comments

Comments
 (0)