From b08d32074aad630a15cae033e30a60d272f71ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9?= <carlos.andre1270@gmail.com>
Date: Fri, 28 May 2021 11:59:04 -0300
Subject: [PATCH] ajustes
---
resources/views/auth/register.blade.php | 1 +
resources/views/coordenador/home.blade.php | 4 ++--
.../views/evento/visualizarEvento.blade.php | 19 +++++++++----------
resources/views/proponente/index.blade.php | 2 +-
.../views/proponente/projetosEdital.blade.php | 10 +++++-----
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index a279c64..fdafd69 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -268,6 +268,7 @@
<strong>{{ $message }}</strong>
</span>
@enderror
+ <small>Deve ter no mÃnimo 8 caracteres</small>
</div>
</div>
<div class="col-md-6">
diff --git a/resources/views/coordenador/home.blade.php b/resources/views/coordenador/home.blade.php
index 3e72d46..b574f0e 100644
--- a/resources/views/coordenador/home.blade.php
+++ b/resources/views/coordenador/home.blade.php
@@ -26,9 +26,9 @@
@foreach ($eventos as $evento)
@if (Auth::check())
- <a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none">
+ <a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" style="text-decoration: none">
@else
- <a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none">
+ <a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" style="text-decoration: none">
@endif
<div class="card" style="width: 18rem; border-radius:12px; border-width:0px; margin:10px">
@if(isset($evento->fotoEvento))
diff --git a/resources/views/evento/visualizarEvento.blade.php b/resources/views/evento/visualizarEvento.blade.php
index c61006f..a7d4aaa 100644
--- a/resources/views/evento/visualizarEvento.blade.php
+++ b/resources/views/evento/visualizarEvento.blade.php
@@ -40,7 +40,7 @@
</div>
</div>
</div>
- @if($hasFile == true)
+ {{-- @if($hasFile == true)
@if($hasTrabalho)
<div class="col-md-12" style="margin-top:8px; margin-bottom:20px">
<div class="card shadow bg-white" style="border-radius:12px; border-width:0px;">
@@ -95,7 +95,7 @@
</div>
</div>
@endif
- @endif
+ @endif --}}
</div>
</div>
<div class="col-md-4">
@@ -115,12 +115,11 @@
<div class="col-md-12" style="margin-bottom:18px">
<a class="btn btn-success " href="{{route('trabalho.index',['id'=>$evento->id])}}" style="width:100%; height:50px; padding-top:7px; font-size:20px"><img src="{{asset('img/icons/icon_enviar_proposta.png')}}" class="card-img-top" alt="..." style="width:30px; margin-right:5px"> Submeter proposta</a>
</div>
- <div class="col-md-12">
- <a class="btn btn-primary" href="{{ route('proponente.projetosEdital', ['id' => $evento->id]) }}" style="width:100%; height:50px; padding-top:5px; font-size:20px"><img src="{{asset('img/icons/icon_minhas_propostas.png')}}" class="card-img-top" alt="..." style="width:20px; margin-right:10px; margin-top:-5px"> Minhas propostas</a>
- </div>
@endif
@endif
-
+ <div class="col-md-12">
+ <a class="btn btn-primary" href="{{ route('proponente.projetosEdital', ['id' => $evento->id]) }}" style="width:100%; height:50px; padding-top:5px; font-size:20px"><img src="{{asset('img/icons/icon_minhas_propostas.png')}}" class="card-img-top" alt="..." style="width:20px; margin-right:10px; margin-top:-5px"> Minhas propostas</a>
+ </div>
</div>
</div>
</div>
@@ -216,9 +215,9 @@
</div>
<div class="form-group" style="width: 100%">
<div class="d-flex justify-content-between" style="width: 100%">
- <div><h5 style=" font-size:19px; margin-top:9px">Edital</h5></div>
+ <div><h5 style=" font-size:19px; margin-top:18px">Edital</h5></div>
<div style="float: right"><a class="btn btn-light" href="{{route('baixar.edital', ['id' => $evento->id])}}" target="_new" style="" >
- <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
+ <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"><br>
Baixar</a></div>
</div>
</div>
@@ -234,10 +233,10 @@
</div>
<div class="form-group" style="width: 100%">
<div class="d-flex justify-content-between" style="width: 100%">
- <div><h5 style=" font-size:19px; margin-top:9px">Modelo</h5></div>
+ <div><h5 style=" font-size:19px; margin-top:9px">Outros documentos</h5></div>
<div>
<a class="btn btn-light" href="{{route('baixar.modelos', ['id' => $evento->id])}}" target="_new" style="" >
- <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px">
+ <img class="" src="{{asset('img/icons/file-download-solid.svg')}}" style="width:20px"><br>
Baixar</a>
</div>
</div>
diff --git a/resources/views/proponente/index.blade.php b/resources/views/proponente/index.blade.php
index 4e7d5b0..c871374 100644
--- a/resources/views/proponente/index.blade.php
+++ b/resources/views/proponente/index.blade.php
@@ -10,7 +10,7 @@
<div class="row justify-content-center d-flex align-items-center">
<div class="col-sm-3 d-flex justify-content-center ">
- <a href="{{route('proponente.editais')}}" style="text-decoration:none; color: inherit;">
+ <a href="{{route('coord.home')}}" style="text-decoration:none; color: inherit;">
<div class="card text-center card-menu">
<div class="card-body d-flex justify-content-center">
<div class="container">
diff --git a/resources/views/proponente/projetosEdital.blade.php b/resources/views/proponente/projetosEdital.blade.php
index 75145e0..58d02bd 100644
--- a/resources/views/proponente/projetosEdital.blade.php
+++ b/resources/views/proponente/projetosEdital.blade.php
@@ -26,15 +26,15 @@
<div class="card-body" style="margin-bottom: -2rem">
<div class="d-flex justify-content-between align-items-center">
<div class="bottomVoltar">
- <a href="{{ route('proponente.editais') }}" class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
+ <a href="{{ route('evento.visualizar',['id'=> $edital->id]) }}" class="btn btn-secondary" style="position:relative; float: right;"><img src="{{asset('img/icons/logo_esquerda.png')}}" alt="" width="15px"></a>
</div>
<div>
- <h5 style="color: #1492E6; margin-top:0.5rem">Projetos submetidos - {{ $edital->nome }}</h5>
- <h6 class="titulo-table" style="color: red">Submissão irá até o dia <span style="color: red">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
+ <h5 style="color: #1492E6; margin-top:0.5rem">Propostas submetidas - {{ $edital->nome }}</h5>
+ <h6 class="titulo-table" style="color: red;padding-left: 10px;">Submissão irá até o dia <span style="color: red">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
</div>
<div>
- <a @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao) href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-info" @else href="#" data-toggle="tooltip" data-placement="top" title="O periodo de submissão foi encerrado." @endif style="position:relative; float: right;">Criar projeto</a>
- </div>
+ <a @if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao) href="{{ route('trabalho.index', ['id' => $edital->id] )}}" class="btn btn-info" @else href="#" data-toggle="tooltip" data-placement="top" title="O periodo de submissão foi encerrado." @endif style="position:relative; float: right;">Criar proposta</a>
+ </div>
</div>
<div style="margin-top:-10px"><hr style="border-top: 1px solid#1492E6"></div>
</div>
--
GitLab