Changeset e6c1f87 for app/Http/Controllers/Dashboard/SettingsController.php

Timestamp:

10/18/21 19:54:18 (3 years ago)

Author:

beratkjufliju <kufliju@…>

Branches:

develop, master

Children:

b9c4a92

Parents:

bd9e8e3

Message:

added pagination, is_important

File:

• app/Http/Controllers/Dashboard/SettingsController.php (modified) (5 diffs)

app/Http/Controllers/Dashboard/SettingsController.php

@@ -3 +3 @@
 namespace App\Http\Controllers\Dashboard;
 
+use App\Helpers\Alert;
 use App\Http\Requests\Dashboard\EmailSettingsRequest;
 use App\Http\Requests\Dashboard\PasswordSettingsRequest;
@@ -10 +11 @@
 use App\Notifications\VerifyNewEmail;
 use Carbon\Carbon;
+use Illuminate\Contracts\Validation\Validator;
+use Illuminate\Http\Request;
+use Illuminate\Validation\ValidationException;
 
 class SettingsController extends Controller
@@ -17 +21 @@
         return view("dashboard.settings.index")->with([
             "user" => auth()->user(),
-            "adminAndEditors" => User::where("role_id", 1)->orWhere("role_id", 2)->get(),
+            "adminAndReferents" => User::where("role_id", 1)->orWhere("role_id", 2)->get(),
             "active_tab" => "account"
         ]);
@@ -24 +28 @@
     public function updateUsername(UsernameSettingsRequest $request)
     {
-        if ($request->validated()) {
             $user = auth()->user();
             $user->username = $request->username;
@@ -33 +36 @@
 
             return redirect()->route("auth.loginShow");
-        } else {
-            return back()->with(['active_tab' => 'security']);
-        }
-
-        dd('no');
     }
 
-    public function updatePassword(PasswordSettingsRequest $request)
+    public function updatePassword(UsernameSettingsRequest $request)
     {
-        $user = auth()->user();
-        $user->password = bcrypt($request->password);
-        $user->save();
+            $user = auth()->user();
+            $user->password = bcrypt($request->password);
+            $user->save();
 
-        auth()->logout();
-        session()->flush();
+            auth()->logout();
+            session()->flush();
 
-        return redirect()->route("auth.loginShow");
+            return redirect()->route("auth.loginShow");
     }