From 6b85576c4e4f5adee77521e2c580ade6e68b37bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?=
 =?UTF-8?q?=D0=91=D0=B0=D0=B1=D0=BA=D0=B8=D0=BD?= <babkin@dinamika-avia.ru>
Date: Wed, 29 Jun 2022 16:11:14 +0300
Subject: [PATCH] Project continue

---
 app/Http/Controllers/ProjectController.php | 29 +++++++--
 app/Http/Controllers/UserController.php    |  3 +-
 public/css/app.css                         | 10 ---
 resources/views/admin/users/show.blade.php |  4 --
 resources/views/projects/create.blade.php  | 11 +++-
 resources/views/projects/edit.blade.php    | 75 +++++++++++-----------
 resources/views/projects/list.blade.php    | 21 +++---
 resources/views/projects/show.blade.php    | 68 ++++++++++----------
 8 files changed, 118 insertions(+), 103 deletions(-)

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 @@
             <div class="bg-white overflow-hidden shadow-sm sm:rounded-lg">
                 <div class="p-6 bg-white border-b border-gray-200">
                     <div class="w-96 mx-auto">
-                        <!-- <form method="POST" action="{{ route('users.store') }}"> -->
-                        <!-- @csrf -->
-                        <!-- User name -->
                         <div>
                             <x-label for="username" :value="__('User name')" />
 
@@ -44,7 +41,6 @@
                                     <i class="fa fa-cancel pr-2"></i>{{__('Cancel')}}
                                 </a>
                             </div>
-
                         </div>
                         <!-- </form> -->
                     </div>
diff --git a/resources/views/projects/create.blade.php b/resources/views/projects/create.blade.php
index 426fc66..2560339 100644
--- a/resources/views/projects/create.blade.php
+++ b/resources/views/projects/create.blade.php
@@ -43,9 +43,14 @@
                             </div>
 
                             <div class="flex items-center justify-end mt-4">
-                                <x-button class="ml-4">
-                                    {{ __('Create project') }}
-                                </x-button>
+                                <button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
+                                    <i class="fa fa-add pr-2"></i>{{ __('Create project') }}
+                                </button>
+                                <div class="pl-2">
+                                    <a href="{{ route('projects.index') }}" class="btn bg-gray-500 hover:bg-gray-700 text-white font-bold py-2 px-4 rounded-full">
+                                        <i class="fa fa-cancel pr-2"></i>{{__('Cancel')}}
+                                    </a>
+                                </div>
                             </div>
                         </form>
                     </div>
diff --git a/resources/views/projects/edit.blade.php b/resources/views/projects/edit.blade.php
index 06f4f7d..1f84695 100644
--- a/resources/views/projects/edit.blade.php
+++ b/resources/views/projects/edit.blade.php
@@ -1,54 +1,57 @@
 <x-app-layout>
     <x-slot name="header">
         <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Edit user') }}
+            {{ __('Edit project') }}
         </h2>
     </x-slot>
 
-    <div class="py-12">
+    <!-- <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 bg-white border-b border-gray-200">
-                    <x-auth-validation-errors class="mb-4" :errors="$errors" />
-                    <form method="POST" action="{{ route('users.update', $user->id) }}">
-                        @csrf
-                        @method('PUT')
-                        <!-- User name -->
-                        <!-- <input type="hidden" name="id" id="id" value="{{ $user->id}}"> -->
-                        <div>
-                            <x-label for="username" :value="__('User name')" />
-
-                            <x-input id="username" class="block mt-1 w-full" type="text" name="username" value="{{ $user->username }}" required autofocus />
+                    <div class="w-96 mx-auto">
+                        @if ($errors->any())
+                        <div class="alert alert-danger text-red-500 p-2">
+                            <ul class="list-unstyled alert alert-danger">
+                                @foreach ($errors->all() as $error)
+                                <li>{{ $error }}</li>
+                                @endforeach
+                            </ul>
                         </div>
+                        @endif
+                        <form method="POST" action="{{ route('projects.update,$project->id') }}">
+                            @csrf
+                            @method('PUT')
+                            <div>
+                                <x-label for="name" :value="__('Title')" />
 
-                        <!-- Name -->
-                        <div>
-                            <x-label for="name" :value="__('Name')" />
+                                <x-input id="name" class="block mt-1 w-full" type="text" name="name" value="{{ $project->name }}" required autofocus />
+                            </div>
+                            <div class="mt-4">
+                                <x-label for="description" :value="__('Description')" />
 
-                            <x-input id="name" class="block mt-1 w-full" type="text" name="name" value="{{ $user->name }}" required />
-                        </div>
+                                <x-input id="description" class="block mt-1 w-full" type="text" name="description" value="{{ $project->description }}" required />
+                            </div>
+                            <div class="mt-4">
+                                <x-label for="mmc_path" :value="__('MMC Path')" />
 
-                        <!-- Email Address -->
-                        <div class="mt-4">
-                            <x-label for="email" :value="__('Email')" />
+                                <x-input id="mmc_path" class="block mt-1 w-full" type="text" name="mmc_path" value="{{ $project->mmc_path }}" required />
+                            </div>
 
-                            <x-input id="email" class="block mt-1 w-full" type="email" name="email" value="{{ $user->email }}" required />
-                        </div>
-
-                        <div class="flex items-center justify-end mt-4">
-                            <!-- <button type="submit" class="btn">{{ __('Save') }}</button> -->
-                            <x-button class="ml-4">
-                                {{ __('Save') }}
-                            </x-button>
-                            <!-- <a href="{{ route('users.index') }}">
-                                <x-button class="ml-4">
-                                    {{ __('Cancel') }}
-                                </x-button>
-                            </a> -->
-                        </div>
-                    </form>
+                            <div class="flex items-center justify-end mt-4">
+                                <button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
+                                    <i class="fa fa-add pr-2"></i>{{ __('Save') }}
+                                </button>
+                                <div class="pl-2">
+                                    <a href="{{ route('projects.index') }}" class="btn bg-gray-500 hover:bg-gray-700 text-white font-bold py-2 px-4 rounded-full">
+                                        <i class="fa fa-cancel pr-2"></i>{{__('Cancel')}}
+                                    </a>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
                 </div>
             </div>
         </div>
-    </div>
+    </div> -->
 </x-app-layout>
\ No newline at end of file
diff --git a/resources/views/projects/list.blade.php b/resources/views/projects/list.blade.php
index 2344423..e8f2d01 100644
--- a/resources/views/projects/list.blade.php
+++ b/resources/views/projects/list.blade.php
@@ -9,12 +9,13 @@
         <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 bg-white border-b border-gray-200">
-
                     <a href="{{ route('projects.create')}}">
-                        <x-button class="m-2">{{__('Create project')}}</x-button>
+                        <button class="bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
+                            <i class="fa fa-add pr-2"></i>{{__('Create project')}}
+                        </button>
                     </a>
 
-                    <div align="center">
+                    <div align="center" class="pt-4">
                         <table class="table table-sm border-b border-gray-200">
                             <tr class="border border-gray-200">
                                 <th class="p-2 border border-gray-200">
@@ -38,14 +39,18 @@
                                 <td class="p-2 border border-gray-200">
                                     <div class="text-center">
                                         <a href="{{ route('projects.show',$project->id) }}">
-                                            <i class="fa fa-eye text-green-500 px-2 text-lg"></i>
+                                            <i class="fa fa-eye text-green-500 hover:text-green-700 px-2 text-lg"></i>
                                         </a>
                                         <a href="{{ route('projects.edit',$project->id) }}">
-                                            <i class="fa fa-edit text-blue-500 px-2 text-lg"></i>
-                                        </a>
-                                        <a href="{{ route('projects.destroy',$project->id) }}">
-                                            <i class="fa fa-trash text-red-500 px-2 text-lg"></i>
+                                            <i class="fa fa-edit text-blue-500 hover:text-blue-700 px-2 text-lg"></i>
                                         </a>
+                                        <form class="inline-block" action="{{ route('projects.destroy', $project->id) }}" method="POST" onsubmit="return confirm('{{ __('Are you sure remove project ').$project->name.'?' }}');">
+                                            <input type="hidden" name="_method" value="DELETE">
+                                            <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                                            <button type="submit">
+                                                <i class="fa fa-trash text-red-500 hover:text-red-700 px-2 text-lg"></i>
+                                            </button>
+                                        </form>
                                     </div>
                                 </td>
                             </tr>
diff --git a/resources/views/projects/show.blade.php b/resources/views/projects/show.blade.php
index 3f6eb00..70d0807 100644
--- a/resources/views/projects/show.blade.php
+++ b/resources/views/projects/show.blade.php
@@ -1,7 +1,7 @@
 <x-app-layout>
     <x-slot name="header">
         <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Show user') }}
+            {{ __('Show project') }}
         </h2>
     </x-slot>
 
@@ -9,43 +9,41 @@
         <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 bg-white border-b border-gray-200">
+                    <div class="w-96 mx-auto">
+                            <div>
+                                <x-label for="name" :value="__('Title')" />
 
-                    <!-- <form method="POST" action="{{ route('users.store') }}"> -->
-                    <!-- @csrf -->
-                    <!-- User name -->
-                    <div>
-                        <x-label for="username" :value="__('User name')" />
+                                <x-input id="name" class="block mt-1 w-full" type="text" name="name" value="{{ $project->name }}" readonly />
+                            </div>
 
-                        <x-input id="username" class="block mt-1 w-full" type="text" name="username" value="{{ $user->username }}" readonly />
+                            <!-- Description -->
+                            <div class="mt-4">
+                                <x-label for="description" :value="__('Description')" />
+
+                                <x-input id="description" class="block mt-1 w-full" type="text" name="description" value="{{ $project->description }}" readonly />
+                            </div>
+
+                            <!-- MMC Path -->
+                            <div class="mt-4">
+                                <x-label for="mmc_path" :value="__('MMC Path')" />
+
+                                <x-input id="mmc_path" class="block mt-1 w-full" type="text" name="mmc_path" value="{{ $project->mmc_path }}" readonly />
+                            </div>
+
+                            <div class="flex items-center justify-end mt-4">
+                            <div class="pl-2">
+                                    <a href="{{ route('projects.edit',$project->id) }}" class="btn bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded-full">
+                                        <i class="fa fa-edit pr-2"></i>{{__('Edit project')}}
+                                    </a>
+                                </div>
+                                <div class="pl-2">
+                                    <a href="{{ route('projects.index') }}" class="btn bg-gray-500 hover:bg-gray-700 text-white font-bold py-2 px-4 rounded-full">
+                                        <i class="fa fa-cancel pr-2"></i>{{__('Cancel')}}
+                                    </a>
+                                </div>
+                            </div>
+                        </form>
                     </div>
-
-                    <!-- Name -->
-                    <div>
-                        <x-label for="name" :value="__('Name')" />
-
-                        <x-input id="name" class="block mt-1 w-full" type="text" name="name" value="{{ $user->name }}" readonly />
-                    </div>
-
-                    <!-- Email Address -->
-                    <div class="mt-4">
-                        <x-label for="email" :value="__('Email')" />
-
-                        <x-input id="email" class="block mt-1 w-full" type="email" name="email" value="{{ $user->email }}" readonly />
-                    </div>
-
-                    <div class="flex items-center justify-end mt-4">
-                        <a href="{{ route('users.edit',$user->id) }}">
-                            <x-button class="ml-4">
-                                {{ __('Edit user') }}
-                            </x-button>
-                        </a>
-                        <a href="{{ route('users.index') }}">
-                        <x-button class="ml-4">
-                            {{ __('Cancel') }}
-                        </x-button>
-                        </a>
-                    </div>
-                    <!-- </form> -->
                 </div>
             </div>
         </div>