Merge pull request #1 from carlos1270/alteracoes

Alterações

resources/views/projeto/editar.blade.php

@@ -341,7 +341,7 @@
         <div class="card" style="border-radius: 12px; padding:15px; margin-bottom:2rem">
           <div class="card-body" style="margin-bottom: -2rem">
             <div class="d-flex justify-content-between align-items-center">
-              <div><h5 style="color: #1492E6; margin-top:0.5rem">Participante(s)</h5></div>
+              <div><h5 style="color: #1492E6; margin-top:0.5rem">Discente(s)</h5></div>
               <div><div class="dropdown">
                 <button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenuButtonAlterar" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="display: none">
                   Selecionar

resources/views/projeto/visualizar.blade.php

@@ -341,7 +341,7 @@
         <div class="card" style="border-radius: 12px; padding:15px">
           <div class="card-body" style="margin-bottom: -2rem">
             <div class="d-flex justify-content-between align-items-center">
-              <div><h5 style="color: #1492E6; margin-top:0.5rem">Participante(s)</h5></div>
+              <div><h5 style="color: #1492E6; margin-top:0.5rem">Discente(s)</h5></div>
               {{-- <div><div class="dropdown">
                 <button class="btn btn-light dropdown-toggle" type="button" id="dropdownMenuButtonAlterar" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="display: none">
                   Selecionar

resources/views/proponente/index.blade.php

@@ -2,8 +2,36 @@
 
 @section('content')
 
-<div class="container">
+<div class="container" style="margin-bottom:8rem">
+	<div class="row justify-content-center" style="margin-top: 2rem;">
+		<div class="col-md-12 form-group" style="text-align: center">
+			<h5 style="color: #1492E6; margin-top:0.5rem; font-size:25px">Página inicial</h5>
+			<h5 style="color: #909090; margin-top:0.7rem; font-size:22px; font-weight:normal">Proponente</h5>
+		</div>
+	  <div class="" style="text-align: center">
+		<div class="form-group imagem_shadow" style="border-radius: 12px; padding:14px; height:200px; width:190px; margin:15px">
+			<a href="{{route('coord.home')}}" style="text-decoration:none; color: inherit;">
+				<img src="{{asset('img/icons/icon_editais.png')}}" alt="" width="120px">
+				<h5 style="color: #073763; margin-top:0.5rem; font-size:25px;">Editais</h5>
+			</a>
+		</div>
+	  </div>
+	  <div class="" style="text-align: center">
+		<div class="form-group imagem_shadow" style="border-radius: 12px; padding:14px; height:200px; width:250px; margin:15px">
+			<a href="{{ route('proponente.projetos')}}" style="text-decoration:none; color: inherit;">
+				@if(\App\Trabalho::where('proponente_id', auth()->user()->proponentes->id)->count() > 0)
+					<img src="{{asset('img/icons/icon_pasta_cheia.png')}}" alt="" width="140px" style="margin-top: 45px; -webkit-filter: drop-shadow(5px 5px 5px rgb(206, 206, 206)); filter: drop-shadow(5px 5px 5px rgb(206, 206, 206));">
+				@else
+					<img src="{{asset('img/icons/icon_pasta_vazia.png')}}" alt="" width="140px" style="margin-top: 45px; -webkit-filter: drop-shadow(5px 5px 5px rgb(206, 206, 206)); filter: drop-shadow(5px 5px 5px rgb(206, 206, 206));">
+				@endif
+				<h5 style="color: #073763; margin-top:0.5rem; font-size:25px">Minhas propostas</h5>
+			</a>
+		</div>
+	  </div>
+	</div>
+</div>
 
+<!--
    <div class="row justify-content-center titulo-menu">
 		<h4>Página Principal - Proponente</h4>
 	</div>
@@ -95,5 +123,5 @@
         </div> --}}
     </div>
 </div>
-
+-->
 @endsection

resources/views/proponente/projetos.blade.php

@@ -43,7 +43,7 @@
                   <form action="{{route('proponente.projetos')}}" method="get">
                     @csrf
                     <div class="btn-group">
-                        <input type="text" class="form-control" name="buscar" placeholder="Digite o nome do edital" value="{{$busca}}" style="margin-right: 5px;border-radius:8px; border-color:#dcdcdc;">
+                        <input type="text" class="form-control" name="buscar" placeholder="Pesquisar propostas" value="{{$busca}}" style="margin-right: 5px;border-radius:8px; border-color:#dcdcdc;">
                         <button type="submit" class="btn btn-light shadow-sm" style="border-radius: 8px; margin-right:3px"><img src="{{asset('img/icons/logo_lupa.png')}}" alt="" width="20px"></button>
                     </div>
                   </form>

resources/views/proponente/projetosEdital.blade.php

@@ -50,7 +50,7 @@
               </thead>
               <tbody id="projetos">
                 @foreach ($projetos as $projeto)
-                  @if ($projeto->proponente_id === Auth()->user()->proponentes->id)
+                  @if (Auth()->user()->proponentes != null && $projeto->proponente_id === Auth()->user()->proponentes->id)
                     <tr>
                       <td>
                         {{ $projeto->titulo }}

resources/views/vendor/notifications/email.blade.php

@@ -44,7 +44,7 @@
 {{ $salutation }}
 @else
 @lang('Atenciosamente'),<br>
-{{ config('app.name') }} - Eventos Acadêmicos
+{{ config('app.name') }}<br><br>
 Laboratório Multidisciplinar de Tecnologias Sociais
 Universidade Federal do Agreste de Pernambuco
 @endif

routes/web.php

 <?php
 
+use App\Trabalho;
+use Illuminate\Support\Facades\Auth;
+use App\Notifications\SubmissaoNotification;
+use Illuminate\Support\Facades\Notification;
 /*
 |--------------------------------------------------------------------------
 | Web Routes
@@ -10,7 +14,12 @@
 | contains the "web" middleware group. Now create something great!
 |
 */
-
+Route::get('/email', function (Request $request) {
+  $id = Trabalho::find(9)->id;
+  Notification::send(Auth::user(), new SubmissaoNotification($id));
+  return 'Ok';
+  // Auth::user()->notify(new SubmissaoTrabalho('teste'));
+});
 
 Route::get('/', 'UserController@index'                                            )->name('home-user');
 Route::get('/', 'UserController@inicial'                                          )->name('inicial');
@@ -111,7 +120,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
   Route::post(  '/trabalho/criar',          'TrabalhoController@salvar'                      )->name('trabalho.store');
   Route::post(  '/trabalho/criarRascunho',  'TrabalhoController@storeParcial'               )->name('trabalho.storeParcial');
   Route::get(   '/edital/{id}/projetos',    'TrabalhoController@projetosDoEdital'           )->name('projetos.edital');
-  Route::get(   '/projeto/{id}/visualizar', 'TrabalhoController@show'                       )->name('trabalho.show');
+  Route::get(   '/projeto/visualizar/{id}', 'TrabalhoController@show'                       )->name('trabalho.show');
   Route::get(   '/projeto/{id}/editar',     'TrabalhoController@edit'                       )->name('trabalho.editar');
   Route::post(   '/projeto/{id}/atualizar', 'TrabalhoController@atualizar'                  )->name('trabalho.update');
   Route::get(   '/projeto/{id}/excluir',    'TrabalhoController@destroy'                    )->name('trabalho.destroy');