From a57af0d118b6d0c0bf4664ce3f75602ae7df5a30 Mon Sep 17 00:00:00 2001 From: ygbanzato Date: Thu, 4 May 2023 15:30:42 +0100 Subject: [PATCH] update the crud model for users and create the pending_users table (To wait for the creation of these users the user table, as soon as Super_Admin, changes it) --- .../Controllers/Pending_UserController.php | 47 ++++++ app/Http/Controllers/userController.php | 2 +- app/Models/pending_user.php | 23 +++ .../views/Admin/CrudUsers/editUsers.blade.php | 8 +- .../views/Admin/CrudUsers/listUsers.blade.php | 65 +------- .../views/Admin/CrudUsers/showUsers.blade.php | 8 +- resources/views/Admin/index.blade.php | 6 +- resources/views/Admin/profile.blade.php | 6 +- .../views/Templates/templateAdmin.blade.php | 46 ++++-- .../views/Templates/templatePosto.blade.php | 12 -- resources/views/email/CreateUsers.blade.php | 62 ++++++++ ...eateUser.blade.php => FormAdmin.blade.php} | 113 +++++++------- resources/views/email/formAdmin.blade.php | 16 -- resources/views/welcome.blade.php | 140 ------------------ routes/web.php | 65 ++++---- 15 files changed, 279 insertions(+), 340 deletions(-) create mode 100644 app/Http/Controllers/Pending_UserController.php delete mode 100644 resources/views/Templates/templatePosto.blade.php create mode 100644 resources/views/email/CreateUsers.blade.php rename resources/views/email/{createUser.blade.php => FormAdmin.blade.php} (66%) delete mode 100644 resources/views/email/formAdmin.blade.php delete mode 100644 resources/views/welcome.blade.php diff --git a/app/Http/Controllers/Pending_UserController.php b/app/Http/Controllers/Pending_UserController.php new file mode 100644 index 00000000..69ed63bb --- /dev/null +++ b/app/Http/Controllers/Pending_UserController.php @@ -0,0 +1,47 @@ +validate([ + 'name' => 'required', + 'lastName' => 'required', + 'pending_email' => 'required|email|unique:pending_users,pending_email', + 'pending_phone' => 'required', + 'pending_nif' => 'required', + 'pending_password' => 'required|min:8|confirmed', + ]); + + $joinName = $request->get('name') . ' ' . $request->get('lastName'); + + $pendingUser = new pending_user([ + 'pending_name' => $joinName, + 'pending_email' => $request->get('pending_email'), + 'pending_phone' => $request->get('pending_phone'), + 'pending_nif' => $request->get('pending_nif'), + 'pending_password' => Hash::make($request->get('pending_password')), + ]); + + $pendingUser->save(); + + return redirect('/formulario')->with('success', 'O seu registro foi enviado e aguarda aprovação.'); +} + +} diff --git a/app/Http/Controllers/userController.php b/app/Http/Controllers/userController.php index 65e2b0c3..33ee45e6 100644 --- a/app/Http/Controllers/userController.php +++ b/app/Http/Controllers/userController.php @@ -18,7 +18,7 @@ class userController extends Controller { public function UserProfile (){ - + return view('Admin.profile'); } diff --git a/app/Models/pending_user.php b/app/Models/pending_user.php index 510f465e..83e59923 100644 --- a/app/Models/pending_user.php +++ b/app/Models/pending_user.php @@ -8,4 +8,27 @@ class pending_user extends Model { use HasFactory; + + /** + * The attributes that are mass assignable. + * + * @var array + */ + protected $fillable = [ + 'pending_name', + 'pending_email', + 'pending_phone', + 'pending_nif', + 'pending_password', + + ]; + + /** + * The attributes that should be hidden for serialization. + * + * @var array + */ + protected $hidden = [ + 'password', + ]; } diff --git a/resources/views/Admin/CrudUsers/editUsers.blade.php b/resources/views/Admin/CrudUsers/editUsers.blade.php index 5a2dc7a9..3f3610c8 100644 --- a/resources/views/Admin/CrudUsers/editUsers.blade.php +++ b/resources/views/Admin/CrudUsers/editUsers.blade.php @@ -1,9 +1,6 @@ @extends('Templates/templateAdmin') -@section('content-wrapper') - -
- +@section('Main-content')
@@ -109,8 +106,7 @@
{{-- /.content --}} -
-{{-- ./content-wrapper --}} + @endsection diff --git a/resources/views/Admin/CrudUsers/listUsers.blade.php b/resources/views/Admin/CrudUsers/listUsers.blade.php index 828139aa..4c1b3b7d 100644 --- a/resources/views/Admin/CrudUsers/listUsers.blade.php +++ b/resources/views/Admin/CrudUsers/listUsers.blade.php @@ -1,7 +1,7 @@ @extends('Templates/templateAdmin') -@section('content-wrapper') -
+@section('Main-content') +
@@ -76,65 +76,8 @@
-
-
-

Pendentes Utilizadores

-
-
- - -
- -
-
-
-
- -
- - - - - - - - - - @foreach ($users as $user) - - - - - - @endforeach - -
NomeEmailAções
{{ $user->name }}{{ $user->email }} - - - - - - - {{-- - - --}} -
- @csrf - @method('DELETE') - -
-
-
- -
+ @@ -142,5 +85,5 @@ - + @endsection diff --git a/resources/views/Admin/CrudUsers/showUsers.blade.php b/resources/views/Admin/CrudUsers/showUsers.blade.php index a0d24143..de6d2e6e 100644 --- a/resources/views/Admin/CrudUsers/showUsers.blade.php +++ b/resources/views/Admin/CrudUsers/showUsers.blade.php @@ -1,8 +1,6 @@ @extends('Templates/templateAdmin') -@section('content-wrapper') - -
+@section('Main-content')
@@ -56,6 +54,6 @@
{{-- /.content --}} -
- {{-- /.content-wrapper --}} + + @endsection diff --git a/resources/views/Admin/index.blade.php b/resources/views/Admin/index.blade.php index d33383e1..1d5bb3c6 100644 --- a/resources/views/Admin/index.blade.php +++ b/resources/views/Admin/index.blade.php @@ -1,9 +1,9 @@ @extends('Templates/templateAdmin') -@section('content-wrapper') +@section('Main-content') -
+
@@ -250,8 +250,6 @@ {{-- /.container-fluid --}} -
- diff --git a/resources/views/Admin/profile.blade.php b/resources/views/Admin/profile.blade.php index 72cea828..8d6ff1f7 100644 --- a/resources/views/Admin/profile.blade.php +++ b/resources/views/Admin/profile.blade.php @@ -1,8 +1,7 @@ @extends('Templates/templateAdmin') -@section('content-wrapper') -
- +@section('Main-content') +
@@ -17,6 +16,7 @@
+
-

Insira Seus Dados :

+

Insira Seus Dados :

-
+ @if (session('success')) +
+ {{ session('success') }} +
+ @endif + + @csrf
- +
@@ -50,8 +56,43 @@
- + +
+
+ +
+
+
+
+
+
+
+ +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+
+
+
+
@@ -64,8 +105,8 @@
- +
@@ -73,59 +114,35 @@
-
+
- +
-
+
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
- -
-
-
-
-
- @if ($errors->any())
{{ implode('', $errors->all('

:message

')) }}
@endif -
-
+
+
-
-
- -
- - +
+ +
+
+ + + @@ -136,12 +153,6 @@
- - - - - - diff --git a/resources/views/email/formAdmin.blade.php b/resources/views/email/formAdmin.blade.php deleted file mode 100644 index 07cee4da..00000000 --- a/resources/views/email/formAdmin.blade.php +++ /dev/null @@ -1,16 +0,0 @@ -@extends('Templates/templateAdmin') - -@section('content-wrapper') - -
-

Enviar Formulario :

-
- @csrf - Email : - - -
-
- - -@endsection \ No newline at end of file diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index 0406510b..00000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,140 +0,0 @@ - - - - - - - Laravel - - - - - - - - - -
- @if (Route::has('login')) -
- @auth - Home - @else - Log in - - @if (Route::has('register')) - Register - @endif - @endauth -
- @endif - -
-
- - - -
- -
-
- -
-
- - - -
- -

Documentation

- -

- Laravel has wonderful documentation covering every aspect of the framework. Whether you are a newcomer or have prior experience with Laravel, we recommend reading our documentation from beginning to end. -

-
- - - - - - - -
-
- - - -
- -

Laracasts

- -

- Laracasts offers thousands of video tutorials on Laravel, PHP, and JavaScript development. Check them out, see for yourself, and massively level up your development skills in the process. -

-
- - - - - - - -
-
- - - -
- -

Laravel News

- -

- Laravel News is a community driven portal and newsletter aggregating all of the latest and most important news in the Laravel ecosystem, including new package releases and tutorials. -

-
- - - - - - -
-
-
- - - -
- -

Vibrant Ecosystem

- -

- Laravel's robust library of first-party tools and libraries, such as Forge, Vapor, Nova, and Envoyer help you take your projects to the next level. Pair them with powerful open source libraries like Cashier, Dusk, Echo, Horizon, Sanctum, Telescope, and more. -

-
-
-
-
- -
-
-
- - - - - Sponsor - -
-
- -
- Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) -
-
-
-
- - diff --git a/routes/web.php b/routes/web.php index ed055452..980c8b2a 100644 --- a/routes/web.php +++ b/routes/web.php @@ -17,6 +17,7 @@ use App\Http\Controllers\Auth\PasswordResetLinkController; use App\Http\Controllers\userController; +use App\Http\Controllers\Pending_UserController; @@ -41,11 +42,33 @@ return view('Admin/index'); })->name('home'); - Route::get('formulario', function () { - return view('email/formAdmin'); - })->name('formulario'); + // Route::get('formulario', function () { + // return view('email/formAdmin'); + // })->name('formulario'); + + + /* +|-------------------------------------------------------------------------- +| Create Users with Super Admin +|-------------------------------------------------------------------------- +| +| Here is where you can register web routes for your application. These +| routes are loaded by the RouteServiceProvider and all of them will +| be assigned to the "web" middleware group. Make something great! +| +*/ + Route::get('/CreateUsers', [Pending_UserController::class, 'mostrar'])->name('CreateUsers'); }); +Route::get('formulario', function () { + return view('email/FormAdmin'); +})->name('formulario'); + + +Route::post('formulario/receive', [Pending_UserController::class, 'store'])->name('criarUser'); + + + /* |-------------------------------------------------------------------------- @@ -61,19 +84,13 @@ ->name('register'); Route::post('/register', [RegisteredUserController::class, 'store']); - Route::get('formulario', function () { - return view('email/formAdmin'); - })->name('formulario'); + Route::get('usersProfiles', [userController::class, 'UserProfile'] )-> name('usersProfiles'); // Rota responsavel por enviar o formulario Route::post('enviar-formulario', [FormController::class, 'enviarEmail'])->name('enviar.formulario'); - Route::get('/CreateUser', function () { - return view('Admin/createUser'); - }); - /* |-------------------------------------------------------------------------- | CRUD - users @@ -97,25 +114,21 @@ -Route::get('userProfile', function (){ - return view('Admin/profile'); -}); +// Route::get('/test-email', function () { +// $to = 'ygbanzato@isptgroup.com'; +// $subject = 'Test Email from Laravel'; -Route::get('/test-email', function () { - $to = 'ygbanzato@isptgroup.com'; - $subject = 'Test Email from Laravel'; +// $message = Mail::raw('This is a test email from Laravel.', function ($message) use ($to, $subject) { +// $message->to($to)->subject($subject); +// }); - $message = Mail::raw('This is a test email from Laravel.', function ($message) use ($to, $subject) { - $message->to($to)->subject($subject); - }); - - if ($message) { - return 'Email sent successfully'; - } else { - return 'Failed to send email'; - } -}); +// if ($message) { +// return 'Email sent successfully'; +// } else { +// return 'Failed to send email'; +// } +// }); // Route::get('/forgot-password', [ForgotPasswordController::class, 'showLinkRequestForm'])->name('password.request');