Merge branch 'master' of http://172.28.1.20/marcos.albano/sisage

app/Http/Controllers/Admin/UserController.php

@@ -9,8 +9,8 @@ use App\Models\User;
 use App\Repositories\Contracts\UserRepositoryInterface;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
-use Illuminate\Support\Facades\Validator as FacadesValidator;
 use Illuminate\Validation\Rule;
+use Validator;
 
 class UserController extends Controller
 {
@@ -91,7 +91,7 @@ class UserController extends Controller
         $data = $request->all();
         $data['password'] = Hash::make($data['password']);
 
-        FacadesValidator::make($data, [
+        Validator::make($data, [
             'nome' => 'required|string|max:255',
             'sobrenome' => 'required|string',
             'email' => 'required|string|email|max:255|unique:users',
@@ -105,9 +105,9 @@ class UserController extends Controller
 
         if ($documentosPessoa) {
             $this->model->create($data);
-            session()->flash('msg', trans('agendamento.record_added_successfully'));
-            session()->flash('status', 'success'); // success error notification
-            return redirect()->view('home');
+            // session()->flash('msg', trans('agendamento.record_added_successfully'));
+            // session()->flash('status', 'success'); // success error notification
+            return redirect('cadastroConfirmacao');
         } elseif ($documentosPessoa == null) {
             session()->flash('msg', trans('agendamento.error_adding_registry'));
             session()->flash('status', 'error'); // success error notification
@@ -191,7 +191,7 @@ class UserController extends Controller
             unset($data['password']);
         }
 
-        FacadesValidator::make($data, [
+        Validator::make($data, [
             'nome' => 'required|string|max:255',
             'sobrenome' => 'required|string',
             'email' => ['required', 'string', 'email', 'max:255', Rule::unique('users')->ignore($id)],

resources/views/admin/users/cadastroConfirmacao.blade.php

+@extends('layouts.app')
+
+@section('content')
+
+    @page(['col'=>12, 'page'=>__('agendamento.create_crud', ['page'=>$page_create])])
+
+    @alert(['msg' => session('msg'), 'status' => session('status')])
+    @endalert
+
+    @breadcrumb(['page'=>$page,'items'=>$breadcrumb ?? []])
+    @endbreadcrumb
+
+    <!-- <p id="pargTitulo">Selecione o nome da sua mãe.</p> -->
+
+    <fieldset class="fielAgendamentoTitulo">
+        
+        <fieldset class="fieldCadastroRealizado">
+
+            <div class="imaEsclamacaoCadastro">
+                <img src="{!! asset('img/imagem_tudo_certo.png') !!}">
+            </div>
+                <p id="cadastroCertoParag">Tudo certo!</p>
+                    <p id="CadastroRealizadoParag">Cadastro realizado com sucesso.</p>
+
+            </fieldset>
+        
+        <div class="imaLogosAgendaRecebeTitulo">
+        <input type="submit" id="inicioButtonCadastro" name="inicio" value="INÍCIO" onclick="window.location = '{{route('home')}}'">
+    </div>
+    
+    <div class="imaLogosCadastroConfismacao">
+        <img src="{!! asset('img/logo-idace.png') !!}">
+    </div>
+  
+    </fieldset>
+
+    @endpage
+
+@endsection

resources/views/welcome.blade.php

@@ -3,23 +3,6 @@
 @section('title', 'Agendamento')
 
 @section('content')
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">Dashboard</div>
 
-                <div class="card-body">
-                    @if (session('status'))
-                        <div class="alert alert-success" role="alert">
-                            {{ session('status') }}
-                        </div>
-                    @endif
 
-                    You are logged in!
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
 @endsection
\ No newline at end of file

routes/web.php

@@ -174,21 +174,24 @@ Route::any('/agendamentoContato', function () {
     
 })->name('agendamentoContato');
 
+Route::any('/cadastroConfirmacao', function () {
+    $routeName = 'users';
+    $page = trans('agendamento.agendamento_list');
+    $page_create = trans('agendamento.agendamento');
+
+    $breadcrumb = [
+        (object) ['url' => route('home'), 'title' => trans('agendamento.home')],
+        (object) ['url' => route($routeName . '.index'), 'title' => trans('agendamento.list', ['page' => $page])],
+        (object) ['url' => '', 'title' => trans('agendamento.create_crud', ['page' => $page_create])],
+    ];
+
+    return view('admin.' . $routeName . '.cadastroConfirmacao', ['page' => $page, 'page_create' => $page_create, 'routeName' => $routeName, 'breadcrumb' => $breadcrumb]);
+    
+})->name('cadastroConfirmacao');
+
 
 
-// Route::any('/pesquisaTitulo', function() {
-//     $routeName = 'agendamentos';
-//     $page = trans('agendamento.agendamento_list');
-//     $page_create = trans('agendamento.agendamento');
 
-//     $breadcrumb = [
-//         (object) ['url' => route('home'), 'title' => trans('agendamento.home')],
-//         (object) ['url' => route($routeName . '.index'), 'title' => trans('agendamento.list', ['page' => $page])],
-//         (object) ['url' => '', 'title' => trans('agendamento.create_crud', ['page' => $page_create])],
-//     ];
 
-//     return view('admin.agendamentos.pesquisaTitulo', ['page' => $page, 'page_create' => $page_create, 'routeName' => $routeName, 'breadcrumb' => $breadcrumb]);
-    
-// })->name('pesquisaTitulo');
 
 //->middleware('auth')