From 7a46864d33147544c0cba69503bf31a16df4adeb 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: Fri, 24 Jun 2022 13:50:02 +0300
Subject: [PATCH] continue users

---
 app/Http/Controllers/UserController.php      |  3 +-
 resources/views/admin/users/create.blade.php |  9 +---
 resources/views/admin/users/list.blade.php   |  2 +-
 resources/views/admin/users/show.blade.php   | 53 ++++++++++++++++++++
 resources/views/layouts/navigation.blade.php |  2 +-
 5 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 resources/views/admin/users/show.blade.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index c35127c..25c9791 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -67,7 +67,8 @@ class UserController extends Controller
      */
     public function show($id)
     {
-        //
+        $user = User::find($id);
+        return view('admin.users.show',['user'=>$user]);
     }
 
     /**
diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php
index 0f008a7..c3f1234 100644
--- a/resources/views/admin/users/create.blade.php
+++ b/resources/views/admin/users/create.blade.php
@@ -23,14 +23,7 @@
                             <div>
                                 <x-label for="name" :value="__('Name')" />
 
-                                <x-input id="name" class="block mt-1 w-full" type="text" name="name" :value="old('name')" required autofocus />
-                            </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="old('email')" required />
+                                <x-input id="name" class="block mt-1 w-full" type="text" name="name" :value="old('name')" required />
                             </div>
 
                             <!-- Email Address -->
diff --git a/resources/views/admin/users/list.blade.php b/resources/views/admin/users/list.blade.php
index fb80f12..4805a61 100644
--- a/resources/views/admin/users/list.blade.php
+++ b/resources/views/admin/users/list.blade.php
@@ -29,7 +29,7 @@
                             </tr>
                             @foreach ( $users as $user)
                             <tr class="border border-gray-200">
-                                <td class="p-2 border border-gray-200">{{ $user->username }}</td>
+                                <td class="p-2 border border-gray-200"><a href="{{ route('users.show',$user->id)}}" class="underline">{{ $user->username }}</a></td>
                                 <td class="p-2 border border-gray-200">{{ $user->email }}</td>
                                 <td class="p-2 border border-gray-200">&nbsp;</td>
                             </tr>
diff --git a/resources/views/admin/users/show.blade.php b/resources/views/admin/users/show.blade.php
new file mode 100644
index 0000000..3f6eb00
--- /dev/null
+++ b/resources/views/admin/users/show.blade.php
@@ -0,0 +1,53 @@
+<x-app-layout>
+    <x-slot name="header">
+        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
+            {{ __('Show 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 bg-white border-b border-gray-200">
+
+                    <!-- <form method="POST" action="{{ route('users.store') }}"> -->
+                    <!-- @csrf -->
+                    <!-- User name -->
+                    <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 }}" readonly />
+                    </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>
+    </div>
+</x-app-layout>
\ No newline at end of file
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php
index 3805c99..fc67673 100644
--- a/resources/views/layouts/navigation.blade.php
+++ b/resources/views/layouts/navigation.blade.php
@@ -18,7 +18,7 @@
                 </div>
                 <div class="hidden space-x-8 sm:-my-px sm:ml-10 sm:flex">
                     @if (Auth::user()->is_admin)
-                    <x-nav-link :href="route('users.index')" :active="request()->routeIs('users.index')">
+                    <x-nav-link :href="route('users.index')" :active="request()->routeIs('users.index')|request()->routeIs('users.create')|request()->routeIs('users.show')|request()->routeIs('users.edit')">
                         {{ __('Users') }}
                     </x-nav-link>
                     @endif