10 Commits

Author SHA1 Message Date
0fd0a6201c application logo updated 2026-05-11 14:19:08 +08:00
8661d57544 Merge branch 'user-module' 2026-05-11 12:39:30 +08:00
000bb48e15 homepage title 2026-05-11 12:29:54 +08:00
8c909adf62 user role edit 2026-05-11 12:28:38 +08:00
b0eef8fca1 fixed missed conflict 2026-05-11 12:04:56 +08:00
3b1f50b96d role & user module merged. conflicts resolved 2026-05-11 12:01:13 +08:00
f110790e09 edit user functionality 2026-05-11 11:54:18 +08:00
6739a5e169 new role functionality 2026-05-11 11:46:40 +08:00
909c767e01 role listing 2026-05-11 11:41:27 +08:00
27c2869109 user listing with pagination 2026-05-11 11:18:23 +08:00
19 changed files with 613 additions and 3 deletions

View File

@@ -0,0 +1,45 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\StoreRoleRequest;
use App\Models\Role;
use Illuminate\Http\RedirectResponse;
use Illuminate\View\View;
class RoleController extends Controller
{
/**
* Display a listing of roles.
*/
public function index(): View
{
$roles = Role::query()
->orderBy('name')
->get(['id', 'name', 'created_at']);
return view('role.index', [
'roles' => $roles,
]);
}
/**
* Show the form for creating a new role.
*/
public function create(): View
{
return view('role.create');
}
/**
* Store a newly created role.
*/
public function store(StoreRoleRequest $request): RedirectResponse
{
Role::create($request->validated());
return redirect()
->route('role.index')
->with('status', 'role-created');
}
}

View File

@@ -0,0 +1,66 @@
<?php
namespace App\Http\Controllers;
use App\Http\Requests\UpdateUserRequest;
use App\Models\Role;
use App\Models\User;
use Illuminate\Http\RedirectResponse;
use Illuminate\View\View;
class UserController extends Controller
{
/**
* Display a listing of users.
*/
public function index(): View
{
$users = User::query()
->orderBy('name')
->paginate(10, ['id', 'name', 'email', 'created_at']);
return view('user.index', [
'users' => $users,
]);
}
/**
* Show the form for editing the specified user.
*/
public function edit(User $user): View
{
$user->load('roles:id');
$roles = Role::query()
->orderBy('name')
->get(['id', 'name']);
return view('user.edit', [
'user' => $user,
'roles' => $roles,
]);
}
/**
* Update the specified user.
*/
public function update(UpdateUserRequest $request, User $user): RedirectResponse
{
$validated = $request->validated();
$roleIds = $validated['roles'] ?? [];
unset($validated['roles']);
$user->fill($validated);
if ($user->isDirty('email')) {
$user->email_verified_at = null;
}
$user->save();
$user->roles()->sync($roleIds);
return redirect()
->route('user.edit', $user)
->with('status', 'user-updated');
}
}

View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Requests;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
class StoreRoleRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'name' => ['required', 'string', 'max:255', 'unique:roles,name'],
];
}
}

View File

@@ -0,0 +1,39 @@
<?php
namespace App\Http\Requests;
use Illuminate\Contracts\Validation\ValidationRule;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Validation\Rule;
class UpdateUserRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
return true;
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
'name' => ['required', 'string', 'max:255'],
'email' => [
'required',
'string',
'email',
'max:255',
Rule::unique('users', 'email')->ignore($this->route('user')),
],
'roles' => ['nullable', 'array'],
'roles.*' => ['integer', 'exists:roles,id'],
];
}
}

19
app/Models/Role.php Normal file
View File

@@ -0,0 +1,19 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
#[Fillable(['name'])]
class Role extends Model
{
/**
* The users that belong to the role.
*/
public function users(): BelongsToMany
{
return $this->belongsToMany(User::class);
}
}

View File

@@ -7,6 +7,7 @@ use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Attributes\Hidden;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable;
@@ -29,4 +30,12 @@ class User extends Authenticatable
'password' => 'hashed',
];
}
/**
* The roles that belong to the user.
*/
public function roles(): BelongsToMany
{
return $this->belongsToMany(Role::class);
}
}

View File

@@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('roles', function (Blueprint $table) {
$table->id();
$table->string('name')->unique();
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('roles');
}
};

View File

@@ -0,0 +1,29 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::create('role_user', function (Blueprint $table) {
$table->foreignId('role_id')->constrained()->cascadeOnDelete();
$table->foreignId('user_id')->constrained()->cascadeOnDelete();
$table->primary(['role_id', 'user_id']);
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('role_user');
}
};

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@@ -1,3 +1,5 @@
<svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {{ $attributes }}>
<!-- <svg viewBox="0 0 316 316" xmlns="http://www.w3.org/2000/svg" {{ $attributes }}>
<path d="M305.8 81.125C305.77 80.995 305.69 80.885 305.65 80.755C305.56 80.525 305.49 80.285 305.37 80.075C305.29 79.935 305.17 79.815 305.07 79.685C304.94 79.515 304.83 79.325 304.68 79.175C304.55 79.045 304.39 78.955 304.25 78.845C304.09 78.715 303.95 78.575 303.77 78.475L251.32 48.275C249.97 47.495 248.31 47.495 246.96 48.275L194.51 78.475C194.33 78.575 194.19 78.725 194.03 78.845C193.89 78.955 193.73 79.045 193.6 79.175C193.45 79.325 193.34 79.515 193.21 79.685C193.11 79.815 192.99 79.935 192.91 80.075C192.79 80.285 192.71 80.525 192.63 80.755C192.58 80.875 192.51 80.995 192.48 81.125C192.38 81.495 192.33 81.875 192.33 82.265V139.625L148.62 164.795V52.575C148.62 52.185 148.57 51.805 148.47 51.435C148.44 51.305 148.36 51.195 148.32 51.065C148.23 50.835 148.16 50.595 148.04 50.385C147.96 50.245 147.84 50.125 147.74 49.995C147.61 49.825 147.5 49.635 147.35 49.485C147.22 49.355 147.06 49.265 146.92 49.155C146.76 49.025 146.62 48.885 146.44 48.785L93.99 18.585C92.64 17.805 90.98 17.805 89.63 18.585L37.18 48.785C37 48.885 36.86 49.035 36.7 49.155C36.56 49.265 36.4 49.355 36.27 49.485C36.12 49.635 36.01 49.825 35.88 49.995C35.78 50.125 35.66 50.245 35.58 50.385C35.46 50.595 35.38 50.835 35.3 51.065C35.25 51.185 35.18 51.305 35.15 51.435C35.05 51.805 35 52.185 35 52.575V232.235C35 233.795 35.84 235.245 37.19 236.025L142.1 296.425C142.33 296.555 142.58 296.635 142.82 296.725C142.93 296.765 143.04 296.835 143.16 296.865C143.53 296.965 143.9 297.015 144.28 297.015C144.66 297.015 145.03 296.965 145.4 296.865C145.5 296.835 145.59 296.775 145.69 296.745C145.95 296.655 146.21 296.565 146.45 296.435L251.36 236.035C252.72 235.255 253.55 233.815 253.55 232.245V174.885L303.81 145.945C305.17 145.165 306 143.725 306 142.155V82.265C305.95 81.875 305.89 81.495 305.8 81.125ZM144.2 227.205L100.57 202.515L146.39 176.135L196.66 147.195L240.33 172.335L208.29 190.625L144.2 227.205ZM244.75 114.995V164.795L226.39 154.225L201.03 139.625V89.825L219.39 100.395L244.75 114.995ZM249.12 57.105L292.81 82.265L249.12 107.425L205.43 82.265L249.12 57.105ZM114.49 184.425L96.13 194.995V85.305L121.49 70.705L139.85 60.135V169.815L114.49 184.425ZM91.76 27.425L135.45 52.585L91.76 77.745L48.07 52.585L91.76 27.425ZM43.67 60.135L62.03 70.705L87.39 85.305V202.545V202.555V202.565C87.39 202.735 87.44 202.895 87.46 203.055C87.49 203.265 87.49 203.485 87.55 203.695V203.705C87.6 203.875 87.69 204.035 87.76 204.195C87.84 204.375 87.89 204.575 87.99 204.745C87.99 204.745 87.99 204.755 88 204.755C88.09 204.905 88.22 205.035 88.33 205.175C88.45 205.335 88.55 205.495 88.69 205.635L88.7 205.645C88.82 205.765 88.98 205.855 89.12 205.965C89.28 206.085 89.42 206.225 89.59 206.325C89.6 206.325 89.6 206.325 89.61 206.335C89.62 206.335 89.62 206.345 89.63 206.345L139.87 234.775V285.065L43.67 229.705V60.135ZM244.75 229.705L148.58 285.075V234.775L219.8 194.115L244.75 179.875V229.705ZM297.2 139.625L253.49 164.795V114.995L278.85 100.395L297.21 89.825V139.625H297.2Z"/>
</svg>
</svg> -->
<img src="/images/kelasprogramming-logo-small.png" {{ $attributes }}>

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@@ -15,6 +15,12 @@
<x-nav-link :href="route('dashboard')" :active="request()->routeIs('dashboard')">
{{ __('Dashboard') }}
</x-nav-link>
<x-nav-link :href="route('user.index')" :active="request()->routeIs('user.index')">
{{ __('Users') }}
</x-nav-link>
<x-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }}
</x-nav-link>
</div>
</div>
@@ -70,6 +76,12 @@
<x-responsive-nav-link :href="route('dashboard')" :active="request()->routeIs('dashboard')">
{{ __('Dashboard') }}
</x-responsive-nav-link>
<x-responsive-nav-link :href="route('user.index')" :active="request()->routeIs('user.index')">
{{ __('Users') }}
</x-responsive-nav-link>
<x-responsive-nav-link :href="route('role.index')" :active="request()->routeIs('role.index')">
{{ __('Roles') }}
</x-responsive-nav-link>
</div>
<!-- Responsive Settings Options -->

View File

@@ -0,0 +1,33 @@
<x-app-layout>
<x-slot name="header">
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
{{ __('Create Role') }}
</h2>
</x-slot>
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
<div class="p-6 text-gray-900">
<form method="POST" action="{{ route('role.store') }}" class="space-y-6 max-w-xl">
@csrf
<div>
<x-input-label for="name" :value="__('Name')" />
<x-text-input id="name" class="mt-1 block w-full" type="text" name="name" :value="old('name')" required autofocus autocomplete="off" />
<x-input-error class="mt-2" :messages="$errors->get('name')" />
</div>
<div class="flex items-center gap-4">
<x-primary-button>{{ __('Save') }}</x-primary-button>
<a href="{{ route('role.index') }}" class="text-sm text-gray-600 underline hover:text-gray-900">
{{ __('Cancel') }}
</a>
</div>
</form>
</div>
</div>
</div>
</div>
</x-app-layout>

View File

@@ -0,0 +1,54 @@
<x-app-layout>
<x-slot name="header">
<div class="flex items-center justify-between gap-4">
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
{{ __('Roles') }}
</h2>
<a href="{{ route('role.create') }}" class="inline-flex items-center rounded-md border border-transparent bg-gray-800 px-4 py-2 text-xs font-semibold uppercase tracking-widest text-white transition hover:bg-gray-700 focus:outline-none focus:ring-2 focus:ring-indigo-500 focus:ring-offset-2">
{{ __('New Role') }}
</a>
</div>
</x-slot>
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
<div class="p-6 text-gray-900">
@if (session('status') === 'role-created')
<div class="mb-4 rounded-md bg-green-50 px-4 py-3 text-sm text-green-700">
{{ __('Role created successfully.') }}
</div>
@endif
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">ID</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Name</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Created</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-200">
@forelse ($roles as $role)
<tr class="odd:bg-white even:bg-gray-50">
<td class="px-4 py-3 text-sm text-gray-700">{{ $role->id }}</td>
<td class="px-4 py-3 text-sm text-gray-900">{{ $role->name }}</td>
<td class="px-4 py-3 text-sm text-gray-700">{{ $role->created_at?->format('Y-m-d H:i') }}</td>
</tr>
@empty
<tr>
<td colspan="3" class="px-4 py-6 text-center text-sm text-gray-500">
No roles found.
</td>
</tr>
@endforelse
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</x-app-layout>

View File

@@ -0,0 +1,70 @@
<x-app-layout>
<x-slot name="header">
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
{{ __('Edit User') }}
</h2>
</x-slot>
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
<div class="p-6 text-gray-900">
@if (session('status') === 'user-updated')
<div class="mb-4 rounded-md bg-green-50 px-4 py-3 text-sm text-green-700">
{{ __('User updated successfully.') }}
</div>
@endif
<form method="POST" action="{{ route('user.update', $user) }}" class="space-y-6 max-w-xl">
@csrf
@method('patch')
<div>
<x-input-label for="name" :value="__('Name')" />
<x-text-input id="name" class="mt-1 block w-full" type="text" name="name" :value="old('name', $user->name)" required autofocus autocomplete="name" />
<x-input-error class="mt-2" :messages="$errors->get('name')" />
</div>
<div>
<x-input-label for="email" :value="__('Email')" />
<x-text-input id="email" class="mt-1 block w-full" type="email" name="email" :value="old('email', $user->email)" required autocomplete="username" />
<x-input-error class="mt-2" :messages="$errors->get('email')" />
</div>
<div>
<x-input-label :value="__('Roles')" />
<div class="mt-2 space-y-2 rounded-md border border-gray-200 p-4">
@forelse ($roles as $role)
<label class="flex items-center gap-2">
<input
type="checkbox"
name="roles[]"
value="{{ $role->id }}"
@checked(in_array($role->id, old('roles', $user->roles->pluck('id')->all()), true))
class="rounded border-gray-300 text-indigo-600 shadow-sm focus:ring-indigo-500"
>
<span class="text-sm text-gray-700">{{ $role->name }}</span>
</label>
@empty
<p class="text-sm text-gray-500">{{ __('No roles available.') }}</p>
@endforelse
</div>
<x-input-error class="mt-2" :messages="$errors->get('roles')" />
<x-input-error class="mt-2" :messages="$errors->get('roles.*')" />
</div>
<div class="flex items-center gap-4">
<x-primary-button>{{ __('Save') }}</x-primary-button>
<a href="{{ route('user.index') }}" class="text-sm text-gray-600 underline hover:text-gray-900">
{{ __('Back') }}
</a>
</div>
</form>
</div>
</div>
</div>
</div>
</x-app-layout>

View File

@@ -0,0 +1,54 @@
<x-app-layout>
<x-slot name="header">
<h2 class="font-semibold text-xl text-gray-800 leading-tight">
{{ __('Users') }}
</h2>
</x-slot>
<div class="py-12">
<div class="max-w-7xl mx-auto sm:px-6 lg:px-8">
<div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
<div class="p-6 text-gray-900">
<div class="overflow-x-auto">
<table class="min-w-full divide-y divide-gray-200">
<thead class="bg-gray-50">
<tr>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">ID</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Name</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Email</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Created</th>
<th scope="col" class="px-4 py-3 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Actions</th>
</tr>
</thead>
<tbody class="divide-y divide-gray-200">
@forelse ($users as $user)
<tr class="odd:bg-white even:bg-gray-50">
<td class="px-4 py-3 text-sm text-gray-700">{{ $user->id }}</td>
<td class="px-4 py-3 text-sm text-gray-900">{{ $user->name }}</td>
<td class="px-4 py-3 text-sm text-gray-700">{{ $user->email }}</td>
<td class="px-4 py-3 text-sm text-gray-700">{{ $user->created_at?->format('Y-m-d H:i') }}</td>
<td class="px-4 py-3 text-sm text-gray-700">
<a href="{{ route('user.edit', $user) }}" class="font-medium text-indigo-600 hover:text-indigo-500">
{{ __('Edit') }}
</a>
</td>
</tr>
@empty
<tr>
<td colspan="5" class="px-4 py-6 text-sm text-center text-gray-500">
No users found.
</td>
</tr>
@endforelse
</tbody>
</table>
</div>
<div class="mt-6">
{{ $users->links() }}
</div>
</div>
</div>
</div>
</div>
</x-app-layout>

View File

@@ -48,7 +48,8 @@
@endif
</header>
<h1 class="text-5xl text-center">GIT COURSE</h1>
<h1 class="text-5xl text-center">COMPANY SYSTEM</h1>
<h2>Mempelajari Git & Gitea</h2>
<div class="flex items-center justify-center w-full transition-opacity opacity-100 duration-750 lg:grow starting:opacity-0">
<main class="flex max-w-[335px] w-full flex-col-reverse lg:max-w-4xl lg:flex-row">

View File

@@ -1,6 +1,8 @@
<?php
use App\Http\Controllers\ProfileController;
use App\Http\Controllers\UserController;
use App\Http\Controllers\RoleController;
use Illuminate\Support\Facades\Route;
Route::get('/', function () {
@@ -12,6 +14,12 @@ Route::get('/dashboard', function () {
})->middleware(['auth', 'verified'])->name('dashboard');
Route::middleware('auth')->group(function () {
Route::get('/user', [UserController::class, 'index'])->name('user.index');
Route::get('/user/{user}/edit', [UserController::class, 'edit'])->name('user.edit');
Route::patch('/user/{user}', [UserController::class, 'update'])->name('user.update');
Route::get('/role', [RoleController::class, 'index'])->name('role.index');
Route::get('/role/create', [RoleController::class, 'create'])->name('role.create');
Route::post('/role', [RoleController::class, 'store'])->name('role.store');
Route::get('/profile', [ProfileController::class, 'edit'])->name('profile.edit');
Route::patch('/profile', [ProfileController::class, 'update'])->name('profile.update');
Route::delete('/profile', [ProfileController::class, 'destroy'])->name('profile.destroy');

View File

@@ -0,0 +1,38 @@
<?php
use App\Models\Role;
use App\Models\User;
test('role index requires authentication', function () {
$this->get('/role')->assertRedirect('/login');
});
test('authenticated users can view the role index', function () {
Role::query()->create(['name' => 'Admin']);
Role::query()->create(['name' => 'Editor']);
$response = $this
->actingAs(User::factory()->create())
->get('/role');
$response
->assertSuccessful()
->assertSee('Roles')
->assertSee('Admin')
->assertSee('Editor');
});
test('authenticated users can create a role', function () {
$response = $this
->actingAs(User::factory()->create())
->post('/role', [
'name' => 'Manager',
]);
$response
->assertRedirect('/role');
$this->assertDatabaseHas('roles', [
'name' => 'Manager',
]);
});

View File

@@ -0,0 +1,74 @@
<?php
use App\Models\Role;
use App\Models\User;
test('user edit page requires authentication', function () {
$user = User::factory()->create();
$this->get("/user/{$user->id}/edit")->assertRedirect('/login');
});
test('authenticated users can view the user edit page', function () {
$actingUser = User::factory()->create();
$user = User::factory()->create();
$role = Role::query()->create(['name' => 'Admin']);
$user->roles()->attach($role->id);
$response = $this
->actingAs($actingUser)
->get("/user/{$user->id}/edit");
$response
->assertSuccessful()
->assertSee('Edit User')
->assertSee($user->name)
->assertSee($user->email)
->assertSee('Roles')
->assertSee('Admin')
->assertSee('checked', false);
});
test('authenticated users can update a user', function () {
$actingUser = User::factory()->create();
$user = User::factory()->create();
$adminRole = Role::query()->create(['name' => 'Admin']);
$editorRole = Role::query()->create(['name' => 'Editor']);
$response = $this
->actingAs($actingUser)
->patch("/user/{$user->id}", [
'name' => 'Updated User',
'email' => 'updated@example.com',
'roles' => [$adminRole->id, $editorRole->id],
]);
$response
->assertRedirect("/user/{$user->id}/edit");
$user->refresh();
$this->assertSame('Updated User', $user->name);
$this->assertSame('updated@example.com', $user->email);
expect($user->roles()->pluck('roles.id')->all())
->toMatchArray([$adminRole->id, $editorRole->id]);
});
test('user roles can be cleared by submitting no roles', function () {
$actingUser = User::factory()->create();
$user = User::factory()->create();
$role = Role::query()->create(['name' => 'Admin']);
$user->roles()->attach($role->id);
$response = $this
->actingAs($actingUser)
->patch("/user/{$user->id}", [
'name' => $user->name,
'email' => $user->email,
]);
$response->assertRedirect("/user/{$user->id}/edit");
expect($user->refresh()->roles()->count())->toBe(0);
});