diff --git a/app/Http/Controllers/ProjectController.php b/app/Http/Controllers/ProjectController.php index 6b84fd1..7c48ab5 100644 --- a/app/Http/Controllers/ProjectController.php +++ b/app/Http/Controllers/ProjectController.php @@ -14,7 +14,7 @@ class ProjectController extends Controller */ public function index() { - $projects = Project::all(); + $projects = Project::all()->sortBy('id'); return view('projects.list', ['projects' => $projects]); } @@ -42,7 +42,8 @@ class ProjectController extends Controller 'mmc_path' => ['required', 'string', 'max:255'], ]); - $user = Project::create([ + // $project = + Project::create([ 'name' => $request->name, 'description' => $request->description, 'mmc_path' => $request->mmc_path, @@ -59,7 +60,8 @@ class ProjectController extends Controller */ public function show($id) { - // + $project = Project::find($id); + return view('projects.show',['project'=>$project]); } /** @@ -70,7 +72,8 @@ class ProjectController extends Controller */ public function edit($id) { - // + $project = Project::find($id); + return view('projects.edit',['project'=>$project]); } /** @@ -82,7 +85,20 @@ class ProjectController extends Controller */ public function update(Request $request, $id) { - // + $request->validate([ + 'name' => 'required|string|max:255|unique:projects,name,'.$id, + 'description' => 'required|string|max:255', + 'mmc_path' => 'required|string|max:255', + ]); + + $project = Project::find($id); + + $project->name = $request->name; + $project->description = $request->description; + $project->mmc_path = $request->mmc_path; + $project->save(); + + return redirect(route('projects.index')); } /** @@ -93,6 +109,7 @@ class ProjectController extends Controller */ public function destroy($id) { - // + Project::findOrFail($id)->delete(); + return redirect()->route('projects.index'); } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 18c0bd8..2358336 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -47,7 +47,8 @@ class UserController extends Controller 'password' => ['required', 'confirmed', Rules\Password::defaults()], ]); - $user = User::create([ + // $user = + User::create([ 'username' => $request->username, 'name' => $request->name, 'email' => $request->email, diff --git a/public/css/app.css b/public/css/app.css index c579444..bc8a3d1 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -697,9 +697,6 @@ select { .z-50 { z-index: 50; } -.m-2 { - margin: 0.5rem; -} .mx-auto { margin-left: auto; margin-right: auto; @@ -752,9 +749,6 @@ select { .mt-6 { margin-top: 1.5rem; } -.mb-2 { - margin-bottom: 0.5rem; -} .block { display: block; } @@ -9120,10 +9114,6 @@ readers do not read off random characters that represent icons */ --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); } -.hover\:text-red-900:hover { - --tw-text-opacity: 1; - color: rgb(127 29 29 / var(--tw-text-opacity)); -} .focus\:z-10:focus { z-index: 10; } diff --git a/resources/views/admin/users/show.blade.php b/resources/views/admin/users/show.blade.php index aa0ee3f..d07d8de 100644 --- a/resources/views/admin/users/show.blade.php +++ b/resources/views/admin/users/show.blade.php @@ -10,9 +10,6 @@
| @@ -38,14 +39,18 @@ |
|---|