login as email

app/Http/Controllers/UserController.php

@@ -17,7 +17,7 @@ class UserController extends Controller
         'id'        => 'users',
         'header'    => [
             'id'            => 'ID',
-            'email'         => 'E-mail',
+            'email'         => 'Логин/email',
             'name'          => 'ФИО',
             'phone'         => 'Телефон',
             'role'          => 'Роль',

app/Http/Requests/User/StoreUser.php

@@ -24,7 +24,7 @@ class StoreUser extends FormRequest
     {
         return [
             'id'        => 'nullable|exists:users',
-            'email'     => 'required_if:id,null|email|unique:users,email,'.$this->id,
+            'email'     => 'required_if:id,null|unique:users,email,'.$this->id,
             'name'      => 'required|string|min:2',
             'phone'     => 'nullable|string',
             'password'  => 'required_without:id|nullable|string|min:4',
@@ -38,7 +38,7 @@ class StoreUser extends FormRequest
             'name'      => 'Поле обязательно для заполнения и должно быть не менее 2 символов!',
             'password'  => 'Пароль должен быть не менее 8 символов!',
             'role'      => 'Неправильная роль!',
-            'email'     => 'Нужно указать правильный адрес почты, который не зарегистрирован в системе!',
+            'email'     => 'Нужно указать адрес почты или логин, который не зарегистрирован в системе!',
         ];
     }
 }

resources/views/auth/login.blade.php

@@ -11,10 +11,10 @@
                         @csrf
 
                         <div class="row mb-3">
-                            <label for="email" class="col-md-4 col-form-label text-md-end">Email</label>
+                            <label for="email" class="col-md-4 col-form-label text-md-end">Логин/email</label>
 
                             <div class="col-md-6">
-                                <input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
+                                <input id="email" type="text" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
 
                                 @error('email')
                                     <span class="invalid-feedback" role="alert">

resources/views/users/edit.blade.php

@@ -11,8 +11,8 @@
                 @endif
 
                 @include('partials.input', ['name' => 'email',
-                                            'type' => 'email',
-                                            'title' => ($user && $user->email_verified_at) ? 'Email подтверждён' : 'Email',
+                                            'type' => 'text',
+                                            'title' => 'Логин/email',
                                             'required' => true,
                                             'value' => $user->email ?? '',
                                             'disabled' => ($user && $user->email_verified_at),

resources/views/users/index.blade.php

@@ -40,7 +40,7 @@
                     <form action="{{ route('user.store') }}" method="post">
                         @csrf
 
-                        @include('partials.input', ['name' => 'email', 'type' => 'email', 'title' => 'Email', 'required' => true])
+                        @include('partials.input', ['name' => 'Логин/email', 'type' => 'text', 'title' => 'Email', 'required' => true])
                         @include('partials.input', ['name' => 'name', 'title' => 'Имя', 'required' => true])
                         @include('partials.input', ['name' => 'phone', 'title' => 'Телефон'])
                         @include('partials.input', ['name' => 'password', 'type' => 'password', 'title' => 'Пароль', 'required' => true])