Refactor UserController to ProfileController.
This commit is contained in:
parent
5117907a4d
commit
b76a997948
9 changed files with 23 additions and 23 deletions
|
|
@ -7,18 +7,18 @@ use Illuminate\Support\Facades\Hash;
|
|||
use Illuminate\Http\Request;
|
||||
use App\Http\Requests\UserRequest;
|
||||
|
||||
class UserController extends Controller
|
||||
class ProfileController extends Controller
|
||||
{
|
||||
public function index(Request $request)
|
||||
{
|
||||
return view('user.index', [
|
||||
return view('profile.index', [
|
||||
'user' => Auth::user(),
|
||||
]);
|
||||
}
|
||||
|
||||
public function edit(Request $request)
|
||||
{
|
||||
return view('user.edit', [
|
||||
return view('profile.edit', [
|
||||
'user' => Auth::user(),
|
||||
]);
|
||||
}
|
||||
|
|
@ -32,7 +32,7 @@ class UserController extends Controller
|
|||
$user->password = Hash::make($data['password']);
|
||||
$user->save();
|
||||
|
||||
return redirect()->route('user.index')
|
||||
return redirect()->route('profile.index')
|
||||
->with('success', 'Your account was updated!');
|
||||
}
|
||||
}
|
||||
|
|
@ -109,7 +109,7 @@ class CharacterForm extends Component
|
|||
// Livewire redirect() does not have "with" method.
|
||||
// so we call session()->flash() directly instead.
|
||||
session()->flash('success', "<strong>{$this->character->name}</strong> was {$action}!");
|
||||
return redirect()->route('user.index');
|
||||
return redirect()->route('profile.index');
|
||||
}
|
||||
|
||||
public function render()
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
<div class="flex justify-end text-white space-x-4">
|
||||
@auth
|
||||
<a href="{{ route('user.index') }}"><strong>{{ auth()->user()->username }}</strong></a>
|
||||
<a href="{{ route('profile.index') }}"><strong>{{ auth()->user()->username }}</strong></a>
|
||||
<x-form method="DELETE" action="{{ route('auth.logout') }}">
|
||||
<a href="/" onclick="this.closest('form').submit();return false;">{{ __('Logout') }}</a>
|
||||
</x-form>
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<div class="mx-auto max-w-sm p-4">
|
||||
|
||||
<x-form action="{{ route('user.update') }}">
|
||||
<x-form action="{{ route('profile.update') }}">
|
||||
|
||||
<div class="mb-2">
|
||||
<x-form.label for="username">{{ __('Username') }}</x-form.label>
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
</x-slot>
|
||||
|
||||
<x-slot name="page_links">
|
||||
<x-button element="a" class="flex items-center" href="{{ route('user.edit') }}">
|
||||
<x-button element="a" class="flex items-center" href="{{ route('profile.edit') }}">
|
||||
<x-icon name="pencil" class="h-6 w-6 mr-1" /> {{ __('Edit') }}
|
||||
</x-button>
|
||||
</x-slot>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
use App\Http\Controllers\UserController;
|
||||
use App\Http\Controllers\ProfileController;
|
||||
use App\Http\Controllers\CharacterController;
|
||||
use App\Http\Controllers\CharacterProfessionController;
|
||||
use App\Http\Controllers\ProfessionController;
|
||||
|
|
@ -67,10 +67,10 @@ Route::prefix('recipes')->name('recipe.')->group(function () {
|
|||
// ----------------------------
|
||||
Route::middleware(['auth'])->group(function() {
|
||||
|
||||
Route::prefix('profile')->name('user.')->group(function () {
|
||||
Route::get('/', [UserController::class, 'index'])->name('index');
|
||||
Route::get('/edit', [UserController::class, 'edit'])->name('edit');
|
||||
Route::post('/', [UserController::class, 'update'])->name('update');
|
||||
Route::prefix('profile')->name('profile.')->group(function () {
|
||||
Route::get('/', [ProfileController::class, 'index'])->name('index');
|
||||
Route::get('/edit', [ProfileController::class, 'edit'])->name('edit');
|
||||
Route::post('/', [ProfileController::class, 'update'])->name('update');
|
||||
});
|
||||
|
||||
// Admin
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class CharacterCreateTest extends TestCase
|
|||
->set('character.race', 'human')
|
||||
->set('character.gender', 'F')
|
||||
->call('save')
|
||||
->assertRedirect(route('user.index'));
|
||||
->assertRedirect(route('profile.index'));
|
||||
|
||||
// Find character and check the data.
|
||||
$character = Character::where('name', 'Elise')->first();
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ class CharacterUpdateTest extends TestCase
|
|||
->set('character.race', 'dwarf')
|
||||
->set('character.gender', 'F')
|
||||
->call('save')
|
||||
->assertRedirect(route('user.index'));
|
||||
->assertRedirect(route('profile.index'));
|
||||
|
||||
// Check database that character was updated.
|
||||
$this->assertDatabaseHas('characters', [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ use Tests\TestCase;
|
|||
|
||||
use App\Models\User;
|
||||
|
||||
class UserTest extends TestCase
|
||||
class ProfileTest extends TestCase
|
||||
{
|
||||
use RefreshDatabase;
|
||||
|
||||
|
|
@ -17,14 +17,14 @@ class UserTest extends TestCase
|
|||
{
|
||||
$user = User::factory()->create();
|
||||
|
||||
$response = $this->actingAs($user)->get(route('user.index'));
|
||||
$response = $this->actingAs($user)->get(route('profile.index'));
|
||||
|
||||
$response->assertStatus(200);
|
||||
}
|
||||
|
||||
public function test_guest_can_not_view_profile()
|
||||
{
|
||||
$response = $this->get(route('user.index'));
|
||||
$response = $this->get(route('profile.index'));
|
||||
|
||||
$response->assertRedirect(route('auth.login'));
|
||||
}
|
||||
|
|
@ -34,14 +34,14 @@ class UserTest extends TestCase
|
|||
$user = User::factory()->create();
|
||||
|
||||
$response = $this->actingAs($user)
|
||||
->post(route('user.update'), [
|
||||
->post(route('profile.update'), [
|
||||
'username' => 'AnotherUsername',
|
||||
'current_password' => null,
|
||||
'password' => null,
|
||||
'password_confirmation' => null
|
||||
]);
|
||||
|
||||
$response->assertRedirect(route('user.index'));
|
||||
$response->assertRedirect(route('profile.index'));
|
||||
|
||||
$this->assertDatabaseHas('users', [
|
||||
'id' => $user->id,
|
||||
|
|
@ -69,14 +69,14 @@ class UserTest extends TestCase
|
|||
->andReturn(true);
|
||||
|
||||
$response = $this->actingAs($user)
|
||||
->post(route('user.update'), [
|
||||
->post(route('profile.update'), [
|
||||
'username' => $user->username,
|
||||
'current_password' => 'password',
|
||||
'password' => 'newpassword',
|
||||
'password_confirmation' => 'newpassword'
|
||||
]);
|
||||
|
||||
$response->assertRedirect(route('user.index'));
|
||||
$response->assertRedirect(route('profile.index'));
|
||||
|
||||
$this->assertDatabaseHas('users', [
|
||||
'id' => $user->id,
|
||||
|
|
@ -87,7 +87,7 @@ class UserTest extends TestCase
|
|||
|
||||
public function test_guest_can_not_update()
|
||||
{
|
||||
$response = $this->post(route('user.update'), [
|
||||
$response = $this->post(route('profile.update'), [
|
||||
'current_password' => 'password',
|
||||
'password' => 'newpassword',
|
||||
'password_confirmation' => 'newpassword'
|
||||
Reference in a new issue