From b9bf18a32f2cdfeb8c86d46470f08aecd1ecec33 Mon Sep 17 00:00:00 2001
From: Gabriel-31415 <gabriel.uag.ufrpe@gmail.com>
Date: Thu, 25 Jun 2020 18:01:23 +0000
Subject: [PATCH] ajuaste no index dos usuarios e mensagem de retorno

---
 app/Http/Controllers/ProponenteController.php |  2 +-
 app/Http/Controllers/TrabalhoController.php   |  8 ++++++--
 database/seeds/DatabaseSeeder.php             |  6 +++---
 database/seeds/UsuarioSeeder.php              | 16 +++++++--------
 resources/views/administrador/index.blade.php |  2 +-
 .../administradorResponsavel/index.blade.php  |  2 +-
 resources/views/avaliador/index.blade.php     |  2 +-
 .../views/coordenadorComissao/index.blade.php |  2 +-
 resources/views/participante/index.blade.php  |  2 +-
 resources/views/proponente/cadastro.blade.php |  2 +-
 resources/views/proponente/index.blade.php    |  2 +-
 resources/views/user/perfilUser.blade.php     |  2 +-
 routes/web.php                                | 20 ++++++++++---------
 13 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/app/Http/Controllers/ProponenteController.php b/app/Http/Controllers/ProponenteController.php
index 84b2f5f..4bde2ac 100644
--- a/app/Http/Controllers/ProponenteController.php
+++ b/app/Http/Controllers/ProponenteController.php
@@ -19,7 +19,7 @@ class ProponenteController extends Controller
     }
 
     public function create(){
-        return view('proponente.cadastro');
+        return view('proponente.cadastro')->with(['mensagem' => 'Preencha o seguinte formulário para poder submeter algum projeto.']);;
     }
     public function editais(){
 
diff --git a/app/Http/Controllers/TrabalhoController.php b/app/Http/Controllers/TrabalhoController.php
index c09ad74..f16e67d 100644
--- a/app/Http/Controllers/TrabalhoController.php
+++ b/app/Http/Controllers/TrabalhoController.php
@@ -255,6 +255,8 @@ class TrabalhoController extends Controller
             $file = $request->anexoPlanoTrabalho[$key];
             Storage::putFileAs($path, $file, $nome);
 
+            $mytime = Carbon::now('America/Recife');
+            $mytime = $mytime->toDateString();
             $arquivo = new Arquivo();
             $arquivo->titulo = $request->nomePlanoTrabalho[$key];
             $arquivo->nome = $path . $nome;
@@ -470,8 +472,8 @@ class TrabalhoController extends Controller
 
             $subject = "Participante de Projeto";            
             $email = $value;
-            Mail::to($email)
-                  ->send(new SubmissaoTrabalho($userParticipante, $subject, $evento, $trabalho));
+            // Mail::to($email)
+            //       ->send(new SubmissaoTrabalho($userParticipante, $subject, $evento, $trabalho));
           }
 
           if($request->nomePlanoTrabalho[$key] != null){
@@ -482,6 +484,8 @@ class TrabalhoController extends Controller
             $file = $request->anexoPlanoTrabalho[$key];
             Storage::putFileAs($path, $file, $nome);
 
+            $mytime = Carbon::now('America/Recife');
+            $mytime = $mytime->toDateString();
             $arquivo = new Arquivo();
             $arquivo->titulo = $request->nomePlanoTrabalho[$key];
             $arquivo->nome = $path . $nome;
diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php
index d637bdc..a23a96e 100644
--- a/database/seeds/DatabaseSeeder.php
+++ b/database/seeds/DatabaseSeeder.php
@@ -15,7 +15,7 @@ class DatabaseSeeder extends Seeder
         $this->call(UsuarioSeeder::class);
         $this->call(AdministradorSeeder::class);
         $this->call(AdministradorResponsavelSeeder::class);
-        //$this->call(ProponenteSeeder::class);
+        // $this->call(ProponenteSeeder::class);
         $this->call(GrandeAreaSeeder::class);
         $this->call(AreaSeeder::class);
         $this->call(SubAreaSeeder::class);
@@ -80,8 +80,8 @@ class DatabaseSeeder extends Seeder
         //   'inicioSubmissao'=>'2020-03-30',
         //   'fimSubmissao'=>'2020-09-20',
         //   'inicioRevisao'=>'2020-04-21',
-        //   'fimRevisao'=>'2020-05-21',
-        //   'resultado'=>'2020-05-22',
+        //   'fimRevisao'=>'2020-07-21',
+        //   'resultado'=>'2020-07-22',
         //   'numMaxTrabalhos' => 2,
         //   'numMaxCoautores' => 5,
         //   'coordenadorId'=>1,
diff --git a/database/seeds/UsuarioSeeder.php b/database/seeds/UsuarioSeeder.php
index 71450a7..f2fa825 100644
--- a/database/seeds/UsuarioSeeder.php
+++ b/database/seeds/UsuarioSeeder.php
@@ -48,14 +48,14 @@ class UsuarioSeeder extends Seeder
           'email_verified_at'=>'2020-01-01'
         ]);
 
-        // DB::table('users')->insert([
-
-        //   'name'=>'Gabriel',
-        //   'email'=>'gabriel.uag.ufrpe@gmail.com',
-        //   'password'=>Hash::make('12345678'),
-        //   'tipo'=>'proponente',
-        //   'email_verified_at'=>'2020-01-01'
-        // ]);
+        DB::table('users')->insert([
+
+          'name'=>'Gabriel',
+          'email'=>'gabriel.uag.ufrpe@gmail.com',
+          'password'=>Hash::make('12345678'),
+          'tipo'=>'proponente',
+          'email_verified_at'=>'2020-01-01'
+        ]);
 
         DB::table('users')->insert([
 
diff --git a/resources/views/administrador/index.blade.php b/resources/views/administrador/index.blade.php
index a995b09..34d387e 100644
--- a/resources/views/administrador/index.blade.php
+++ b/resources/views/administrador/index.blade.php
@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
+    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Administrador</h2>
 
        <div class="row justify-content-center d-flex align-items-center">
 	      <div class="col-sm-3 d-flex justify-content-center ">
diff --git a/resources/views/administradorResponsavel/index.blade.php b/resources/views/administradorResponsavel/index.blade.php
index 63a9170..98da221 100644
--- a/resources/views/administradorResponsavel/index.blade.php
+++ b/resources/views/administradorResponsavel/index.blade.php
@@ -4,7 +4,7 @@
 
 <div class="container">
 
-  	<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
+  	<h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Administrador Responsável</h2>
 	<div class="row justify-content-center d-flex align-items-center">
 	      <div class="col-sm-4 d-flex justify-content-center ">
 	         <a href="{{route('adminResp.editais')}}" style="text-decoration:none; color: inherit;">
diff --git a/resources/views/avaliador/index.blade.php b/resources/views/avaliador/index.blade.php
index 3acccdd..0ce333c 100644
--- a/resources/views/avaliador/index.blade.php
+++ b/resources/views/avaliador/index.blade.php
@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
+    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Avaliador</h2>
 
        <div class="row justify-content-center d-flex align-items-center">
 	      <div class="col-sm-4 d-flex justify-content-center ">
diff --git a/resources/views/coordenadorComissao/index.blade.php b/resources/views/coordenadorComissao/index.blade.php
index 5251517..98af27c 100644
--- a/resources/views/coordenadorComissao/index.blade.php
+++ b/resources/views/coordenadorComissao/index.blade.php
@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
+    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Coordenador</h2>
 
        <div class="row justify-content-center d-flex align-items-center">
 	      <div class="col-sm-4 d-flex justify-content-center ">
diff --git a/resources/views/participante/index.blade.php b/resources/views/participante/index.blade.php
index a686856..b09db13 100644
--- a/resources/views/participante/index.blade.php
+++ b/resources/views/participante/index.blade.php
@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }}</h2>
+    <h2 style="margin-top: 100px; ">{{ Auth()->user()->name }} - Perfil: Participante</h2>
 
        <div class="row justify-content-center d-flex align-items-center">
 	      <div class="col-sm-4 d-flex justify-content-center ">
diff --git a/resources/views/proponente/cadastro.blade.php b/resources/views/proponente/cadastro.blade.php
index b4ae383..43e0438 100644
--- a/resources/views/proponente/cadastro.blade.php
+++ b/resources/views/proponente/cadastro.blade.php
@@ -179,7 +179,7 @@
             <div class="row justify-content-center" style="margin: 20px 0 20px 0">
 
                 <div class="col-md-6" style="padding-left:0">
-                    <a class="btn btn-secondary botao-form" href="{{route('admin.editais')}}" style="width:100%">Cancelar Cadastro</a>
+                    <a class="btn btn-secondary botao-form" href="{{ route('home') }}" style="width:100%">Cancelar Cadastro</a>
                 </div>
                 <div class="col-md-6" style="padding-right:0">
                     <button type="submit" class="btn btn-primary botao-form" style="width:100%">
diff --git a/resources/views/proponente/index.blade.php b/resources/views/proponente/index.blade.php
index db4f72e..f561d08 100644
--- a/resources/views/proponente/index.blade.php
+++ b/resources/views/proponente/index.blade.php
@@ -4,7 +4,7 @@
 
 <div class="container">
 
-    <h2 style="margin-top: 100px;">{{ Auth()->user()->name }}</h2>
+    <h2 style="margin-top: 100px;">{{ Auth()->user()->name }} - Perfil: Proponente</h2>
 
     <div class="row justify-content-center d-flex align-items-center">
         <div class="col-sm-3 d-flex justify-content-center ">
diff --git a/resources/views/user/perfilUser.blade.php b/resources/views/user/perfilUser.blade.php
index 74a797c..4f94171 100644
--- a/resources/views/user/perfilUser.blade.php
+++ b/resources/views/user/perfilUser.blade.php
@@ -315,7 +315,7 @@
         <div class="row justify-content-center" style="margin: 20px 0 20px 0">
     
             <div class="col-md-6" style="padding-left:0">
-                <a class="btn btn-secondary botao-form" href="/" style="width:100%">Cancelar</a>
+                <a class="btn btn-secondary botao-form" href="{{ route('home') }}" style="width:100%">Cancelar</a>
             </div>
             <div class="col-md-6" style="padding-right:0">
                 <button type="submit" class="btn btn-primary botao-form" style="width:100%" onclick="submeterForm()">
diff --git a/routes/web.php b/routes/web.php
index c6427ab..2475f52 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -20,15 +20,7 @@ Route::get('/editais/home'                    ,'EventoController@index'
 Route::get('/perfil','UserController@perfil')->name('perfil');
 Auth::routes(['verify' => true]);
 
-//######## Rotas Avaliador  ####################################
-Route::prefix('avaliador')->name('avaliador.')->group(function(){
-  Route::get('/index',          'AvaliadorController@index'                      )->name('index')->middleware('auth');
-  Route::get('/trabalhos',     'AvaliadorController@visualizarTrabalhos'         )->name('visualizarTrabalho')->middleware('auth');
-  Route::post('/parecer',       'AvaliadorController@parecer'                    )->name('parecer')->middleware('auth');
-  Route::get('/editais',        'AvaliadorController@editais'                    )->name('editais')->middleware('auth');
-  Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer'              )->name('enviarParecer')->middleware('auth');
-  Route::get('/Resposta', 'AvaliadorController@conviteResposta'              )->name('conviteResposta')->middleware('auth');
-});
+
 
 //######### Proponente  ########################################
 Route::get('/proponente/index', 'ProponenteController@index'                      )->name('proponente.index');
@@ -43,6 +35,16 @@ Route::post('/perfil-usuario',                 'UserController@editarPerfil'
 
 
 Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
+
+  //######## Rotas Avaliador  ####################################
+Route::prefix('avaliador')->name('avaliador.')->group(function(){
+  Route::get('/index',          'AvaliadorController@index'                      )->name('index')->middleware('auth');
+  Route::get('/trabalhos',     'AvaliadorController@visualizarTrabalhos'         )->name('visualizarTrabalho')->middleware('auth');
+  Route::post('/parecer',       'AvaliadorController@parecer'                    )->name('parecer')->middleware('auth');
+  Route::get('/editais',        'AvaliadorController@editais'                    )->name('editais')->middleware('auth');
+  Route::post('/Enviarparecer', 'AvaliadorController@enviarParecer'              )->name('enviarParecer')->middleware('auth');
+  Route::get('/Resposta', 'AvaliadorController@conviteResposta'              )->name('conviteResposta')->middleware('auth');
+});
   
 
   Route::get('/home/edital',                        'EventoController@index'              )->name('visualizarEvento');
-- 
GitLab