diff --git a/app/Actions/Fortify/CreateNewUser.php b/app/Actions/Fortify/CreateNewUser.php index 1c3d4ede..f39acb92 100644 --- a/app/Actions/Fortify/CreateNewUser.php +++ b/app/Actions/Fortify/CreateNewUser.php @@ -16,28 +16,27 @@ class CreateNewUser implements CreatesNewUsers public function create(array $input) { + + if( $input['plantels'] == 0){ + throw ValidationException::withMessages([ + 'plantels' => ['Debes elegir un plantel'] + ]); + } + Validator::make($input, [ 'name' => ['required', 'string', 'max:255'], + 'apellidoPaterno' => ['required', 'string', 'max:255'], + 'apellidoMaterno' => ['required', 'string', 'max:255'], 'email' => ['required', 'string', 'email', 'max:255', 'unique:users'], 'telefono' => ['required', 'digits:10', 'unique:users,telefono'], 'password' => $this->passwordRules(), 'terms' => Jetstream::hasTermsAndPrivacyPolicyFeature() ? ['accepted', 'required'] : '', ])->validate(); - - - if (User::where('email', $input['email']) - ->orWhere('telefono', $input['telefono']) - ->exists()) { - - throw ValidationException::withMessages([ - 'email' => ['El correo o teléfono ya están registrados.'] - ]); - - } - $user = User::create([ 'name' => $input['name'], + 'apellidoPaterno' => $input['apellidoPaterno'], + 'apellidoMaterno' => $input['apellidoMaterno'], 'email' => $input['email'], 'telefono' => $input['telefono'], 'direccion' => "", @@ -59,8 +58,6 @@ class CreateNewUser implements CreatesNewUsers $prospecto->prospectos()->sync([$user->id]); - - return $user; } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 3edda282..9b863339 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -44,6 +44,8 @@ class UserController extends Controller $user = User::create([ 'name' => $request->name, + 'apellidoPaterno' => $request-> apellidoPaterno, + 'apellidoMaterno' => $request-> apellidoMaterno, 'email' => $request->email, 'telefono' => $request->telefono ?? null, 'direccion' => $request->direccion ?? null, diff --git a/app/Models/User.php b/app/Models/User.php index 3537c645..09163668 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -26,6 +26,8 @@ class User extends Authenticatable protected $fillable = [ 'name', + 'apellidoPaterno', + 'apellidoMaterno', 'email', 'telefono', 'direccion', diff --git a/database/migrations/0001_01_01_000000_create_users_table.php b/database/migrations/0001_01_01_000000_create_users_table.php index 565f12b4..e0c382ec 100644 --- a/database/migrations/0001_01_01_000000_create_users_table.php +++ b/database/migrations/0001_01_01_000000_create_users_table.php @@ -14,6 +14,8 @@ return new class extends Migration Schema::create('users', function (Blueprint $table) { $table->id(); $table->string('name'); + $table->string('apellidoPaterno'); + $table->string('apellidoMaterno'); $table->string('email')->unique(); $table->timestamp('email_verified_at')->nullable(); $table->string('telefono',20)->nullable()->unique(); diff --git a/database/seeders/UserSeeder.php b/database/seeders/UserSeeder.php index cbec70e3..f496ce91 100644 --- a/database/seeders/UserSeeder.php +++ b/database/seeders/UserSeeder.php @@ -14,7 +14,9 @@ class UserSeeder extends Seeder public function run(): void { $user1= User::create([ - 'name'=>'Luis Fernando Pérez', + 'name'=>'Luis Fernando', + 'apellidoPaterno'=>'Pérez', + 'apellidoMaterno'=>'Luna', 'email'=>'fernandoestrp@outlook.es', 'direccion'=>'Zacatenco mz 21 lt 2 san francisco cuautliquixca', 'telefono'=>'5636287759', @@ -26,7 +28,9 @@ class UserSeeder extends Seeder $user1->plantelUsuarios()->sync(1); $user2= User::create([ - 'name'=>'Antonio Azulito Real Luna', + 'name'=>'Antonio Azulito', + 'apellidoPaterno'=>'Real', + 'apellidoMaterno'=>'Luna', 'email'=>'reydelfin@gmail.com', 'direccion'=>'Zacatenco mz 21 lt 2 san francisco cuautliquixca', 'telefono'=>'5636287758', diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php index f33aca65..66d2a5c3 100644 --- a/resources/views/auth/register.blade.php +++ b/resources/views/auth/register.blade.php @@ -37,14 +37,24 @@
- - + + +
+ +
+ + +
+ +
+ +
@@ -54,7 +64,7 @@
- +
diff --git a/resources/views/layouts/landing.blade.php b/resources/views/layouts/landing.blade.php index c1793f4f..f63d96c1 100644 --- a/resources/views/layouts/landing.blade.php +++ b/resources/views/layouts/landing.blade.php @@ -4,8 +4,7 @@ @include('layouts._partials.head') - @vite([ 'resources/js/app.js']) - + {{-- @vite([ 'resources/js/app.js']) --}} {{-- Livewire styles --}} @livewireStyles diff --git a/resources/views/user/create.blade.php b/resources/views/user/create.blade.php index 7935d829..8b3a87df 100644 --- a/resources/views/user/create.blade.php +++ b/resources/views/user/create.blade.php @@ -21,6 +21,16 @@
+
+ + +
+ +
+ + +
+
diff --git a/resources/views/user/edit.blade.php b/resources/views/user/edit.blade.php index 2bc03ed5..45327ab3 100644 --- a/resources/views/user/edit.blade.php +++ b/resources/views/user/edit.blade.php @@ -27,6 +27,16 @@
+
+ + +
+ +
+ + +
+
diff --git a/routes/channels.php b/routes/channels.php index a93e74c7..fc30e968 100644 --- a/routes/channels.php +++ b/routes/channels.php @@ -1,7 +1,6 @@ id === (int) $id; @@ -10,12 +9,9 @@ Broadcast::channel('App.Models.User.{id}', function ($user, $id) { Broadcast::channel('chat.{conversationId}', function ($user, $conversationId) { return Conversation::where('id', $conversationId) - ->whereHas('users', fn ($q) => - $q->where('user_id', $user->id) - )->exists(); + ->whereHas('users', function ($q) use ($user) { + $q->where('user_id', $user->id); + }) + ->exists(); + }); - - - - -Broadcast::channel('chat.{conversationId}', function ($user, $conversationId) {return Conversation::where('id', $conversationId)->whereHas('users', function ($q) use ($user) {$q->where('user_id', $user->id);})->exists();});