Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #621

Merged
merged 3 commits into from
Dec 2, 2024
Merged

Dev #621

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions app/Http/Controllers/Frontend/UserController.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,27 +255,26 @@ public function changePassword()
*/
public function changePasswordUpdate(Request $request)
{
$id = auth()->user()->id;
$module_title = $this->module_title;
$module_name = $this->module_name;
$module_path = $this->module_path;
$module_icon = $this->module_icon;
$module_model = $this->module_model;
$module_name_singular = Str::singular($module_name);

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

$request->validate($request, [
$validated = $request->validate([
'password' => 'required|confirmed|min:6',
]);

$module_name = $this->module_name;
$module_name_singular = Str::singular($this->module_name);

$$module_name_singular = auth()->user();

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

$$module_name_singular->update($request_data);
$$module_name_singular->update($validated);

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

/**
Expand Down
822 changes: 416 additions & 406 deletions composer.lock

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions public/build/assets/app-backend-C8Uv4KGJ.css

Large diffs are not rendered by default.

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions public/build/assets/app-backend-oLx_0Cqr.css

This file was deleted.

1 change: 0 additions & 1 deletion public/build/assets/app-frontend-Cv5wTdwu.css

This file was deleted.

32 changes: 0 additions & 32 deletions public/build/assets/app-frontend-D6wa9n6Z.js

This file was deleted.

1 change: 1 addition & 0 deletions public/build/assets/app-frontend-E18xEr2Z.css

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions public/build/assets/app-frontend-JA2AfOE5.js

Large diffs are not rendered by default.

Binary file added public/build/assets/fa-brands-400-BU4mH_I_.woff2
Binary file not shown.
Binary file not shown.
Binary file removed public/build/assets/fa-brands-400-O7nZalfM.woff2
Binary file not shown.
Binary file added public/build/assets/fa-regular-400-Cy4iLbxs.woff2
Binary file not shown.
Binary file not shown.
Binary file removed public/build/assets/fa-regular-400-DgEfZSYE.woff2
Binary file not shown.
Binary file not shown.
Binary file added public/build/assets/fa-solid-900-CcrrL0x0.woff2
Binary file not shown.
Binary file removed public/build/assets/fa-solid-900-DOQJEhcS.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 12 additions & 12 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,44 +4,44 @@
"name": "popper"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf": {
"file": "assets/fa-brands-400-Dur5g48u.ttf",
"file": "assets/fa-brands-400-CArp7j8S.ttf",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.ttf"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2": {
"file": "assets/fa-brands-400-O7nZalfM.woff2",
"file": "assets/fa-brands-400-BU4mH_I_.woff2",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-brands-400.woff2"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf": {
"file": "assets/fa-regular-400-Bf3rG5Nx.ttf",
"file": "assets/fa-regular-400-D4OwLFL7.ttf",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.ttf"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2": {
"file": "assets/fa-regular-400-DgEfZSYE.woff2",
"file": "assets/fa-regular-400-Cy4iLbxs.woff2",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-regular-400.woff2"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf": {
"file": "assets/fa-solid-900-BV3CbEM2.ttf",
"file": "assets/fa-solid-900-BAw_JAW6.ttf",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.ttf"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2": {
"file": "assets/fa-solid-900-DOQJEhcS.woff2",
"file": "assets/fa-solid-900-CcrrL0x0.woff2",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-solid-900.woff2"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.ttf": {
"file": "assets/fa-v4compatibility-B9MWI-E6.ttf",
"file": "assets/fa-v4compatibility-ch80hpM0.ttf",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.ttf"
},
"node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2": {
"file": "assets/fa-v4compatibility-BX8XWJtE.woff2",
"file": "assets/fa-v4compatibility-B9t6EWrS.woff2",
"src": "node_modules/@fortawesome/fontawesome-free/webfonts/fa-v4compatibility.woff2"
},
"resources/css/app-frontend.css": {
"file": "assets/app-frontend-Cv5wTdwu.css",
"file": "assets/app-frontend-E18xEr2Z.css",
"src": "resources/css/app-frontend.css",
"isEntry": true
},
"resources/js/app-backend.js": {
"file": "assets/app-backend-Bm_BK1wQ.js",
"file": "assets/app-backend-CBef8dsT.js",
"name": "app-backend",
"src": "resources/js/app-backend.js",
"isEntry": true,
Expand All @@ -50,7 +50,7 @@
]
},
"resources/js/app-frontend.js": {
"file": "assets/app-frontend-D6wa9n6Z.js",
"file": "assets/app-frontend-JA2AfOE5.js",
"name": "app-frontend",
"src": "resources/js/app-frontend.js",
"isEntry": true,
Expand All @@ -59,7 +59,7 @@
]
},
"resources/sass/app-backend.scss": {
"file": "assets/app-backend-oLx_0Cqr.css",
"file": "assets/app-backend-C8Uv4KGJ.css",
"src": "resources/sass/app-backend.scss",
"isEntry": true
}
Expand Down
Loading