split controller to Profile* and Account*, sort tables by last change

This commit is contained in:
2018-07-26 22:32:05 +02:00
parent a71fed254a
commit 72011feea9
4 changed files with 87 additions and 73 deletions
+1 -67
View File
@@ -3,12 +3,8 @@
namespace App\Http\Controllers;
use App\Models\EmailConfirmation;
use App\Models\User;
use Hash;
use Illuminate\Http\Request;
use Illuminate\Validation\Rule;
use MightyPork\Utils\Str;
class ProfileController extends Controller
{
@@ -21,6 +17,7 @@ class ProfileController extends Controller
{
$tables = $user->tables()
->with('revision:id,row_count')
->orderByDesc('updated_at')
->paginate(10);
return view('profile.view')->with(compact('tables', 'user'));
@@ -37,11 +34,6 @@ class ProfileController extends Controller
return view('profile.edit-profile')->with('user', \user());
}
public function editAccount()
{
return view('profile.edit-account', ['user' => user()]);
}
/**
* Store changed profile
*/
@@ -60,62 +52,4 @@ class ProfileController extends Controller
flash()->success('Settings saved');
return back();
}
public function storeAccount(Request $request)
{
$input = $this->validate($request, [
'name' => [
'required',
VALI_NAME,
Rule::unique('users')->ignoreModel(\user()),
],
'email' => [
'required',
VALI_EMAIL,
Rule::unique('users')->ignoreModel(\user()),
],
'new_password' => ['nullable', 'confirmed', VALI_PASSWORD],
]);
$user = user();
if ($input->email != $user->email) {
$confirmation = EmailConfirmation::create([
'user_id' => $user->id,
'email' => $input->email,
'token' => Str::random(60),
]);
flash()->warning("New e-mail confirmation sent to $input->email.")->important();
// TODO send the e-mail
unset($input->email);
}
$user->fill($input->all());
if ($input->has('new_password')) {
$user->password = Hash::make($input->new_password);
flash()->warning('Password changed');
}
$user->save();
flash()->success('Settings saved');
return back();
}
public function forgetSocialLogin($id)
{
$identity = user()->socialIdentities()->where('id', $id)->first();
if (null === $identity) {
abort(404, "No such identity");
}
$identity->delete();
return redirect(route('profile.manage-oauth'));
}
}