fixed the config forms not working (controler needed update)
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App\Exceptions;
|
||||
use Exception;
|
||||
use Illuminate\Auth\AuthenticationException;
|
||||
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
|
||||
use Illuminate\Validation\ValidationException;
|
||||
|
||||
class Handler extends ExceptionHandler
|
||||
{
|
||||
@@ -63,4 +64,20 @@ class Handler extends ExceptionHandler
|
||||
? response()->json(['message' => $exception->getMessage()], 401)
|
||||
: redirect()->guest(route('login'));
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert a validation exception into a response.
|
||||
*
|
||||
* @param \Illuminate\Http\Request $request
|
||||
* @param \Illuminate\Validation\ValidationException $exception
|
||||
* @return \Illuminate\Http\Response
|
||||
*/
|
||||
protected function invalid($request, ValidationException $exception)
|
||||
{
|
||||
flash()->error("Some form fields were not filled correctly.");
|
||||
|
||||
return redirect($exception->redirectTo ?? url()->previous())
|
||||
->withInput($request->except($this->dontFlash))
|
||||
->withErrors($exception->errors(), $exception->errorBag);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,20 +27,41 @@ class ProfileController extends Controller
|
||||
}
|
||||
|
||||
/**
|
||||
* Edit own profile
|
||||
* Edit own profile (this does not include auth settings etc)
|
||||
*
|
||||
* @param User $user
|
||||
* @return \Illuminate\View\View
|
||||
*/
|
||||
public function edit()
|
||||
public function editProfile()
|
||||
{
|
||||
return view('profile.edit')->with('user', \user());
|
||||
return view('profile.edit-profile')->with('user', \user());
|
||||
}
|
||||
|
||||
public function editAccount()
|
||||
{
|
||||
return view('profile.edit-account', ['user' => user()]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Store changed profile
|
||||
*/
|
||||
public function store(Request $request)
|
||||
public function storeProfile(Request $request)
|
||||
{
|
||||
$input = $this->validate($request, [
|
||||
'bio' => ['nullable', VALI_TEXT],
|
||||
'title' => ['required', VALI_LINE],
|
||||
'website' => ['required', VALI_LINE],
|
||||
]);
|
||||
|
||||
$user = user();
|
||||
$user->fill($input->all());
|
||||
$user->save();
|
||||
|
||||
flash()->success('Settings saved');
|
||||
return back();
|
||||
}
|
||||
|
||||
public function storeAccount(Request $request)
|
||||
{
|
||||
$input = $this->validate($request, [
|
||||
'name' => [
|
||||
@@ -53,9 +74,6 @@ class ProfileController extends Controller
|
||||
VALI_EMAIL,
|
||||
Rule::unique('users')->ignoreModel(\user()),
|
||||
],
|
||||
'bio' => ['nullable', VALI_TEXT],
|
||||
'title' => ['required', VALI_LINE],
|
||||
'website' => ['required', VALI_LINE],
|
||||
'new_password' => ['nullable', 'confirmed', VALI_PASSWORD],
|
||||
]);
|
||||
|
||||
@@ -90,11 +108,6 @@ class ProfileController extends Controller
|
||||
return back();
|
||||
}
|
||||
|
||||
public function manageOauth()
|
||||
{
|
||||
return view('profile.logins', ['user' => user()]);
|
||||
}
|
||||
|
||||
public function forgetSocialLogin($id)
|
||||
{
|
||||
$identity = user()->socialIdentities()->where('id', $id)->first();
|
||||
|
||||
@@ -21,11 +21,13 @@ class WidgetFactory
|
||||
"</div>";
|
||||
}
|
||||
|
||||
public function par($text, $extraClasses='')
|
||||
public function par($text, $extraClasses='', $escape=true)
|
||||
{
|
||||
return
|
||||
"<div class=\"row\">".
|
||||
"<p class=\"col-md-$this->fieldCols offset-md-$this->labelCols mb-2 ".e($extraClasses)."\">".e($text)."</o>".
|
||||
"<p class=\"col-md-$this->fieldCols offset-md-$this->labelCols mb-2 ".e($extraClasses)."\">".
|
||||
($escape ? e($text) : $text) .
|
||||
"</p>".
|
||||
"</div>";
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user