From a2f47d1ba746d39fcaa4ba36bc9a6faa89f927d2 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 12:47:49 +0300
Subject: [PATCH] Create user ready

---
 app/Http/Controllers/UserController.php      | 27 +++++++-
 public/css/app.css                           |  6 ++
 resources/lang/ru.json                       |  5 +-
 resources/views/admin/users/create.blade.php | 67 ++++++++++++++++++++
 resources/views/admin/users/list.blade.php   | 33 +++++++++-
 resources/views/layouts/navigation.blade.php |  2 +
 6 files changed, 133 insertions(+), 7 deletions(-)
 create mode 100644 resources/views/admin/users/create.blade.php

diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php
index d843b1d..c35127c 100644
--- a/app/Http/Controllers/UserController.php
+++ b/app/Http/Controllers/UserController.php
@@ -3,6 +3,10 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
+use App\Models\User;
+use Illuminate\Support\Facades\Hash;
+use Illuminate\Validation\Rules;
+
 
 class UserController extends Controller
 {
@@ -13,7 +17,8 @@ class UserController extends Controller
      */
     public function index()
     {
-        return view('admin.users.list');
+        $users = User::all();
+        return view('admin.users.list',['users'=>$users]);
         //
     }
 
@@ -24,7 +29,7 @@ class UserController extends Controller
      */
     public function create()
     {
-        //
+        return view('admin.users.create');
     }
 
     /**
@@ -35,7 +40,23 @@ class UserController extends Controller
      */
     public function store(Request $request)
     {
-        //
+        $request->validate([
+            'username' => ['required', 'string', 'max:255'],
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'confirmed', Rules\Password::defaults()],
+        ]);
+
+        $user = User::create([
+            'username' => $request->username,
+            'name' => $request->name,
+            'email' => $request->email,
+            'is_admin' => false,
+            'password' => Hash::make($request->password),
+        ]);
+
+        return redirect(route('users.index'));
+
     }
 
     /**
diff --git a/public/css/app.css b/public/css/app.css
index cf83d8a..c1b94bd 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -697,6 +697,9 @@ select {
 .z-50 {
   z-index: 50;
 }
+.m-2 {
+  margin: 0.5rem;
+}
 .mx-auto {
   margin-left: auto;
   margin-right: auto;
@@ -758,6 +761,9 @@ select {
 .inline-flex {
   display: inline-flex;
 }
+.table {
+  display: table;
+}
 .grid {
   display: grid;
 }
diff --git a/resources/lang/ru.json b/resources/lang/ru.json
index 1442c6c..a035805 100644
--- a/resources/lang/ru.json
+++ b/resources/lang/ru.json
@@ -748,5 +748,8 @@
     "Zimbabwe": "Зимбабве",
     "Zip / Postal Code": "Индекс",
     "Åland Islands": "Аландские острова",
-    "User name": "Имя пользователя"
+    "User name": "Имя пользователя",
+    "Users": "Пользователи",
+    "User list": "Список пользователей",
+    "Create user": "Создать пользователя"
 }
\ No newline at end of file
diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php
new file mode 100644
index 0000000..0f008a7
--- /dev/null
+++ b/resources/views/admin/users/create.blade.php
@@ -0,0 +1,67 @@
+<x-app-layout>
+    <x-slot name="header">
+        <h2 class="font-semibold text-xl text-gray-800 leading-tight">
+            {{ __('Create 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="old('username')" required autofocus />
+                            </div>
+
+                            <!-- Name -->
+                            <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 />
+                            </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 />
+                            </div>
+
+                            <!-- Password -->
+                            <div class="mt-4">
+                                <x-label for="password" :value="__('Password')" />
+
+                                <x-input id="password" class="block mt-1 w-full" type="password" name="password" required autocomplete="new-password" />
+                            </div>
+
+                            <!-- Confirm Password -->
+                            <div class="mt-4">
+                                <x-label for="password_confirmation" :value="__('Confirm Password')" />
+
+                                <x-input id="password_confirmation" class="block mt-1 w-full" type="password" name="password_confirmation" required />
+                            </div>
+
+                            <div class="flex items-center justify-end mt-4">
+                                <x-button class="ml-4">
+                                    {{ __('Register') }}
+                                </x-button>
+                            </div>
+                        </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</x-app-layout>
\ No newline at end of file
diff --git a/resources/views/admin/users/list.blade.php b/resources/views/admin/users/list.blade.php
index be67eb4..fb80f12 100644
--- a/resources/views/admin/users/list.blade.php
+++ b/resources/views/admin/users/list.blade.php
@@ -1,7 +1,7 @@
 <x-app-layout>
     <x-slot name="header">
         <h2 class="font-semibold text-xl text-gray-800 leading-tight">
-            {{ __('Users') }}
+            {{ __('User list') }}
         </h2>
     </x-slot>
 
@@ -9,9 +9,36 @@
         <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">
-                    User list must be here!!!
+
+                    <a href="{{ route('users.create')}}">
+                        <x-button class="m-2">{{__('Create user')}}</x-button>
+                    </a>
+
+                    <div align="center">
+                        <table class="table table-sm border-b border-gray-200">
+                            <tr class="border border-gray-200">
+                                <th class="p-2 border border-gray-200">
+                                    {{ __('User name')}}
+                                </th>
+                                <th class="p-2 border border-gray-200">
+                                    {{ __('Email')}}
+                                </th>
+                                <th class="p-2 border border-gray-200">
+                                    {{ __('Actions')}}
+                                </th>
+                            </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">{{ $user->email }}</td>
+                                <td class="p-2 border border-gray-200">&nbsp;</td>
+                            </tr>
+
+                            @endforeach
+                        </table>
+                    </div>
                 </div>
             </div>
         </div>
     </div>
-</x-app-layout>
+</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 6669d52..3805c99 100644
--- a/resources/views/layouts/navigation.blade.php
+++ b/resources/views/layouts/navigation.blade.php
@@ -17,9 +17,11 @@
                     </x-nav-link>
                 </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')">
                         {{ __('Users') }}
                     </x-nav-link>
+                    @endif
                 </div>
             </div>