Der stod ikke det samme i `Password` & `Confirm Password`!
'); + return redirect()->route('users.create')->with('error#notsamepass', 'Der stod ikke det samme i `Password` & `Confirm Password`!
'); } $roles = $request->input("roles", [ "User" ]); @@ -138,7 +138,7 @@ class UserController extends Controller /** @var User $user */ $user->update($data); } else // Else go back with an error message - return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', 'Der stod ikke det samme i `Password` & `Confirm Password`!
'); + return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', 'Der stod ikke det samme i `Password` & `Confirm Password`!
'); } else { // If you haven't touched the password, then update everything else but password $data = $request->only(['name_first', 'name_last', 'email', 'phone', 'roles']); @@ -257,21 +257,21 @@ class UserController extends Controller if ($request->input('password') != null) { // If you're editing the password $data = $request->only(['name_first', 'name_last', 'email', 'phone', 'password']); if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message. - return redirect()->route("users.accounteditpass")->with('error#notsamepass', 'Der stod ikke det samme i `Nyt Password` & `Confirm Password`!
'); + return redirect()->route("users.accounteditpass")->with('error#notsamepass', 'Der stod ikke det samme i `Nyt Password` & `Confirm Password`!
'); } elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message. - return redirect()->route("users.accounteditpass")->with('error#oldpass', 'Det indtastede password i `Nuværende Password` er ikke dit nuværende password!
'); + return redirect()->route("users.accounteditpass")->with('error#oldpass', 'Det indtastede password i `Nuværende Password` er ikke dit nuværende password!
'); } else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout. /** @var User $user */ $user->update($data); Auth::logout(); - return redirect()->route("users.login")->with('success#passwordchange', 'Dit password er hermed ændret!
'); + return redirect()->route("users.login")->with('success#passwordchange', 'Dit password er hermed ændret!
'); } } else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user. $data = $request->only(['email', 'phone']); $user->update($data); - return redirect()->route("users.account")->with('success#credentialschanged', 'Dine oplysninger er hermed ændret!
'); + return redirect()->route("users.account")->with('success#credentialschanged', 'Dine oplysninger er hermed ændret!
'); } $users = User::query()->paginate(20); diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index 8633848..4303acb 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -44,14 +44,14 @@ class UserEventController extends Controller // If the row has both, then go back and show an error - Cause you're not allowed to be on the same event twice. if (count($getTableInfo) > 0) - return redirect()->route("events.index")->with('error#' . $request->event_id, 'Du har allerede tilmeldt dig denne Aktivitet!
'); + return redirect()->route("events.index")->with('error#' . $request->event_id, 'Du har allerede tilmeldt dig denne Aktivitet!
'); // If not, then it keeps going and saves and shows a success message $UserEvent = new UserEvent($data); $UserEvent->user_id = auth()->user()->id; $UserEvent->save(); - return redirect()->route("events.index")->with('signup#' . $request->event_id, 'Du er hermed tilmeldt denne aktivitet!
'); + return redirect()->route("events.index")->with('signup#' . $request->event_id, 'Du er hermed tilmeldt denne aktivitet!
'); } /** @@ -71,7 +71,7 @@ class UserEventController extends Controller $JoinedEvents = UserEvent::query()->join('events', 'events.id', '=', 'user_events.event_id')->where('user_id', "=", auth()->user()->id)->get(); - return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', 'Du er hermed afmeldt aktiviteten!
'); + return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', 'Du er hermed afmeldt aktiviteten!
'); } public function show() diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index ca5fb46..fa80589 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -5,7 +5,7 @@ @section("content")