iszuddin/git-course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#4-merge-with-master-conflict-resolve

Browse Source
This commit is contained in:
amarulsamsudin
2026-05-12 11:00:22 +08:00
parent b6c9557f83 d50da17b66
commit 7f32713204
19 changed files with 819 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
routes/web.php
View File

@@ -1,13 +1,14 @@
<?php
use App\Http\Controllers\AuthorController;
use App\Http\Controllers\CategoryController;
use App\Http\Controllers\ProfileController;
use App\Http\Controllers\RoleController;
use App\Http\Controllers\UserController;
use Illuminate\Support\Facades\Route;
Route::get('/', function () {
return view('welcome');
return view('home');
});
Route::get('/dashboard', function () {
@@ -23,6 +24,7 @@ Route::middleware('auth')->group(function () {
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::resource('category', CategoryController::class)->except('show');
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');