Skip to content

GitLab

Unverified Commit ebe89efe authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #77 from carlos1270/master 

Layout
parents b8e96d8a e5084be3
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/EventoController.php
View file @ ebe89efe
......@@ -199,7 +199,7 @@ class EventoController extends Controller
// Mail::to($user->email)
// ->send(new EventoCriado($user, $subject));
return redirect()->route('coord.home');
return redirect()->route('admin.editais')->with(['mensagem' => 'Edital criado com sucesso!']);
}
public function armazenarAnexosTemp(Request $request){
......@@ -403,7 +403,8 @@ class EventoController extends Controller
$evento->update();
$eventos = Evento::orderBy('nome')->get();
return view('administrador.editais',['eventos'=>$eventos]);
return redirect( route('admin.editais') )->with(['mensagem' => 'Edital salvo com sucesso!', 'eventos'=>$eventos]);
}
/**
......
app/Http/Controllers/HomeController.php
View file @ ebe89efe
......@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use Auth;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Storage;
use App\Evento;
class HomeController extends Controller
{
......@@ -28,8 +29,10 @@ class HomeController extends Controller
{
$eventos = \App\Evento::all();
if(Auth::user()->administradors != null){
return view('administrador.index');
if(Auth::user()->administradors != null){
$eventos = Evento::orderBy('nome')->get();
return view('administrador.editais')->with(['eventos' => $eventos]);
}
else if (Auth::user()->AdministradorResponsavel != null) {
return view('administradorResponsavel.index');
......
public/css/layout.css
View file @ ebe89efe
......@@ -152,12 +152,17 @@ body{
font-weight: bolder;
}
.botao-entrar {
.btn-login {
background-color: rgb(0, 140, 255);
text-align: center;
border-radius: 3px;
padding-left: 42%;
padding-right: 42%;
width: 100%;
font-weight: 700;
color: white;
}
.btn-login:hover {
color: black;
}
.position-image {
......@@ -472,4 +477,18 @@ button.close {
.background-red {
background-color: rgb(235, 0, 0);
}
.btn-cadastro {
color: white;
background-color: rgb(172, 79, 235);
text-align: center;
border-radius: 3px;
width: 100%;
font-weight: 700;
margin-bottom: 0px;
}
.btn-cadastro:hover {
color: black;
}
\ No newline at end of file
resources/views/administrador/editais.blade.php
View file @ ebe89efe
......@@ -26,90 +26,103 @@
<div class="col-sm-2">
<a href="{{route('evento.criar')}}" class="btn btn-info" style="float: right;">Criar Edital</a>
</div>
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome do Edital</th>
<th scope="col">Data de Criação</th>
<th scope="col">Opção</th>
</tr>
</thead>
<tbody id="eventos">
@foreach ($eventos as $evento)
@if(session('mensagem'))
<div class="row">
<div class="col-md-12" style="margin-top: 30px;">
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
</div>
@endif
<div class="row">
<div class="col-md-12">
<table class="table table-bordered">
<thead>
<tr>
<td>
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="visualizarEvento">
{{ $evento->nome }}
</a>
</td>
<td>{{ date('d/m/Y', strtotime($evento->created_at)) }}</td>
<td>
@if(auth()->user()->id == $evento->criador_id)
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{ route('evento.editar', ['id' => $evento->id]) }}" class="dropdown-item text-center">
Editar Edital
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.atribuir', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Atribuir Avaliadores
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.pareceres', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Visualizar Pareceres
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.analisar', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Analisar projetos
</a>
<hr class="dropdown-hr">
<!-- Button trigger modal -->
<button type="button" class="dropdown-item dropdown-item-delete text-center" data-toggle="modal" data-target="#exampleModal{{ $evento->id }}">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button>
</div>
</div>
@endif
</td>
<th scope="col">Nome do Edital</th>
<th scope="col">Data de Criação</th>
<th scope="col">Opção</th>
</tr>
<!-- Modal -->
<div class="modal fade" id="exampleModal{{ $evento->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Deletar edital</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja deletar o edital:{{ $evento->nome }}?</p>
</thead>
<tbody id="eventos">
@foreach ($eventos as $evento)
<tr>
<td>
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="visualizarEvento">
{{ $evento->nome }}
</a>
</td>
<td>{{ date('d/m/Y', strtotime($evento->created_at)) }}</td>
<td>
@if(auth()->user()->id == $evento->criador_id)
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<img src="{{asset('img/icons/ellipsis-v-solid.svg')}}" style="width:8px">
</a>
<div class="dropdown-menu">
<a href="{{ route('evento.editar', ['id' => $evento->id]) }}" class="dropdown-item text-center">
Editar Edital
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.atribuir', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Atribuir Avaliadores
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.pareceres', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Visualizar Pareceres
</a>
<hr class="dropdown-hr">
<a href="{{route('admin.analisar', ['evento_id' => $evento->id])}}" class="dropdown-item text-center">
Analisar projetos
</a>
<hr class="dropdown-hr">
<!-- Button trigger modal -->
<button type="button" class="dropdown-item dropdown-item-delete text-center" data-toggle="modal" data-target="#exampleModal{{ $evento->id }}">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<form method="POST" action="{{route('evento.deletar',$evento->id)}}" class="text-center">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit" class="btn btn-primary">
Deletar
@endif
</td>
</tr>
<!-- Modal -->
<div class="modal fade" id="exampleModal{{ $evento->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="exampleModalLabel">Deletar edital</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</form>
</div>
<div class="modal-body">
<p>Você tem certeza que deseja deletar o edital:{{ $evento->nome }}?</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Cancelar</button>
<form method="POST" action="{{route('evento.deletar',$evento->id)}}" class="text-center">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit" class="btn btn-primary">
Deletar
</button>
</form>
</div>
</div>
</div>
</div>
</div>
@endforeach
</tbody>
</table>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
......
resources/views/administrador/index.blade.php
View file @ ebe89efe
......@@ -5,7 +5,7 @@
<div class="container">
<div class="row justify-content-center titulo-menu">
<h4>Página Principal - Administrador</h4>
<h4>Perfil de Administrador</h4>
</div>
<div class="row justify-content-center d-flex align-items-center">
......
resources/views/layouts/app.blade.php
View file @ ebe89efe
......@@ -99,55 +99,72 @@
@guest
<a href="{{ route('coord.home') }}" class="btn navbar-text negrito" style="color: rgb(0, 140, 255);">Editais</a>
<a href="#" class="btn dropdown-toggle negrito" role="button" id="dropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="color: rgb(0, 140, 255);">Login</a>
<div class="dropdown-menu dropdown-menu-right negrito" aria-labelledby="dropdownMenuLink" style="right: 15%; width: 300px; height: 380px;">
<form method="POST" action="{{ route('login') }}">
@csrf
<div style="padding: 20px;">
<div style="color: rgb(0, 140, 255); position: relative; top: 5px; text-align: center; font-size: 20px;">
Entrar
</div>
<div style="position: relative; top: 30px; left: 1px;">
<label for="email" class="col-form-label negrito" style="color: rgb(0, 140, 255);">{{ __('Endereço de E-mail') }}</label>
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="password" class="col-form-label negrito" style="color: rgb(0, 140, 255);">{{ __('Senha') }}</label>
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@error('password')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div style="position: relative; top: 40px;">
<div class="form-check">
<input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
<label class="form-check-label" for="remember">
{{ __('Lembrar Senha') }}
</label>
<div id="dropdown-login" class="dropdown-menu dropdown-menu-right negrito" aria-labelledby="dropdownMenuLink" style="right: 15%; width: 300px; height: auto;">
<div class="">
<form method="POST" action="{{ route('login') }}">
@csrf
<div style="padding: 20px;">
<div style="color: rgb(0, 140, 255); margin: 5px; text-align: center; font-size: 20px;">
Entrar
</div>
<div style="margin-top: 30px;">
<label for="email" class="col-form-label negrito" style="color: rgb(0, 140, 255);">{{ __('Endereço de E-mail') }}</label>
<input id="email" type="email" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ old('email') }}" required autocomplete="email" autofocus>
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="password" class="col-form-label negrito" style="color: rgb(0, 140, 255);">{{ __('Senha') }}</label>
<input id="password" type="password" class="form-control @error('password') is-invalid @enderror" name="password" required autocomplete="current-password">
@error('password')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
<div>
<div class="form-check">
<input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}>
<label class="form-check-label" for="remember">
{{ __('Lembrar Senha') }}
</label>
</div>
</div>
<div style="margin-top: 10px; margin-bottom: 10px;">
<button class="btn btn-login">
{{__('Entrar')}}
</button>
<br>
<a href="{{ route('password.request') }}" style="font-weight: normal; color: rgb(44, 96, 209);">{{ __('Esqueceu sua senha?')}}</a>
</div>
<div style="margin-top: 10px; margin-bottom: 10px;">
<label for="password" class="col-form-label negrito" style="color: rgb(0, 140, 255);">{{ __('Crie sua conta!') }}</label>
<br>
<a href="{{ route('register') }}">
<button type="button" class="btn btn-cadastro">
{{__('Cadastre-se')}}
</button>
</a>
</div>
</div>
<div style="position: relative; top: 50px;">
<button class="btn botao-entrar" style="color: white;">
{{__('Entrar')}}
</button>
<a href="{{ route('password.request') }}" style="font-weight: normal; color: rgb(44, 96, 209);">{{ __('Esqueceu sua senha?')}}</a>
</div>
</div>
</form>
</form>
</div>
</div>
<a href="{{ route('register') }}" class="btn navbar-text btn-azul-destaque negrito" style="color: rgb(0, 140, 255);">{{ __('Cadastre-se') }}</a>
@else
<a href="{{route('coord.home')}}" class="btn navbar-text negrito " style="color: rgb(0, 140, 255);">Home</a>
@if(Auth::user()->administradors != null)
<a href="{{route('admin.editais')}}" class="btn navbar-text negrito " style="color: rgb(0, 140, 255);">Home</a>
@else
<a href="{{route('coord.home')}}" class="btn navbar-text negrito " style="color: rgb(0, 140, 255);">Home</a>
@endif
<a id="navbarDropdown" class="btn navbar-text negrito dropdown-toggle" style="color: rgb(0, 140, 255);" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
{{ Auth::user()->name }} <span class="caret"></span>
</a>
......@@ -310,4 +327,16 @@
</div>
</div>
</body>
<script>
$(document).ready(function() {
$("#dropdown-login").on('click', function(event){
event.stopPropagation();
});
});
@if(old('email') != null)
$(document).ready(function() {
$('#dropdownMenuLink').click();
});
@endif
</script>
</html>
\ No newline at end of file
resources/views/projeto/index.blade.php
View file @ ebe89efe
......@@ -65,14 +65,14 @@
</a>
<div class="dropdown-menu">
<a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
Editar projeto
Editar
</a>
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar projeto
</a>
<!-- Button trigger modal -->
<button type="button" class="dropdown-item" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
Excluir projeto
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button>
</div>
</div>
......
resources/views/proponente/editais.blade.php
View file @ ebe89efe
......@@ -6,10 +6,30 @@
<div class="container" >
<div class="row" >
<div class="col-sm-12">
<h3>Editais</h3>
<div class="col-sm-1" style="text-align: left; flaot:left;">
<a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
</div>
<div class="col-sm-7" style="text-align: center;">
<div class="row">
<div class="col-md-4">
</div>
<div class="col-md-8">
<h4 class="titulo-table">Editais</h4>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="row">
<div class="col-sm-2">
<button class="btn" onclick="buscarEdital(this.parentElement.parentElement.children[1].children[0])">
<img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</button>
</div>
<div class="col-sm-10">
<input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)">
</div>
</div>
</div>
</div>
</div>
<hr>
......@@ -24,7 +44,7 @@
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
<tbody id="eventos">
@foreach ($eventos as $evento)
<tr>
<td>
......@@ -50,6 +70,7 @@
Projetos submetidos
</a>
@if($evento->inicioSubmissao <= $hoje && $hoje <= $evento->fimSubmissao)
<hr class="dropdown-hr">
<a href="{{ route('trabalho.index', ['id' => $evento->id] )}}" class="dropdown-item" style="text-align: center">
Criar projeto
</a>
......@@ -80,6 +101,22 @@
@section('javascript')
<script>
function buscarEdital(input) {
var editais = document.getElementById('eventos').children;
if(input.value.length > 2) {
for(var i = 0; i < editais.length; i++) {
var nomeEvento = editais[i].children[0].children[0].textContent;
if(nomeEvento.substr(0).indexOf(input.value) >= 0) {
editais[i].style.display = "";
} else {
editais[i].style.display = "none";
}
}
} else {
for(var i = 0; i < editais.length; i++) {
editais[i].style.display = "";
}
}
}
</script>
@endsection
resources/views/proponente/projetos.blade.php
View file @ ebe89efe
......@@ -13,8 +13,29 @@
@endif
<div class="container" >
<div class="row" >
<div class="col-sm-12">
<h3>Meus Projetos</h3>
<div class="col-sm-1">
<a href="{{ route('proponente.index') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
</div>
<div class="col-sm-7" style="text-align: center">
<div class="row">
<div class="col-md-4">
</div>
<div class="col-md-8">
<h4 class="titulo-table">Meus Projetos</h4>
</div>
</div>
</div>
<div class="col-sm-4">
<div class="row">
<div class="col-sm-2">
<button class="btn" onclick="buscarEdital(this.parentElement.parentElement.children[1].children[0])">
<img src="{{asset('img/icons/logo_lupa.png')}}" alt="">
</button>
</div>
<div class="col-sm-10">
<input type="text" class="form-control form-control-edit" placeholder="Digite o nome do edital" onkeyup="buscarEdital(this)">
</div>
</div>
</div>
</div>
</div>
......@@ -51,12 +72,13 @@
<div class="dropdown-menu">
@if($projeto->evento->inicioSubmissao <= $hoje && $hoje <= $projeto->evento->fimSubmissao)
<a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
Editar projeto
Editar
</a>
<hr class="dropdown-hr">
@else
@endif
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar projeto
Visualizar
</a>
{{-- <a href="" class="dropdown-item" style="text-align: center">
Recorrer
......@@ -65,9 +87,10 @@
Resultado
</a> --}}
@if($projeto->status == 'Submetido')
<hr class="dropdown-hr">
<!-- Button trigger modal -->
<button type="button" class="dropdown-item" style="text-align: center" data-toggle="modal" data-target="#modal{{$projeto->id}}">
Excluir projeto
<button type="button" class="dropdown-item dropdown-item-delete" style="text-align: center" data-toggle="modal" data-target="#modal{{$projeto->id}}">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button>
@endif
......
resources/views/proponente/projetosEdital.blade.php
View file @ ebe89efe
......@@ -21,17 +21,15 @@
@endif
<div class="container" >
<div class="row" >
<div class="col-sm-9">
<h3>Projetos do edital {{ $edital->nome }}</h3>
<h6 style="color: rgb(4, 78, 4);">Submissão irá até o dia {{ date('d-m-Y', strtotime($edital->fimSubmissao)) }}</h6>
</div>
<div class="col-sm-1">
<a href="{{ route('proponente.editais') }}" class="btn btn-primary" style="position:relative; float: right;">Voltar</a>
<a href="{{ route('proponente.editais') }}" class="btn btn-secondary" style="position:relative; float: right;">Voltar</a>
</div>
<div class="col-sm-9" style="text-align: center">
<h4 class="titulo-table">Projetos do edital {{ $edital->nome }}</h4>
<h6 class="titulo-table">Submissão irá até o dia <span style="color: rgb(0, 0, 0);">{{ date('d/m/Y', strtotime($edital->fimSubmissao)) }}</span></h6>
</div>
<div class="col-sm-2">
<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>
</div>
</div>
......@@ -45,7 +43,7 @@
<th scope="col">Opção</th>
</tr>
</thead>
<tbody>
<tbody id="projetos">
@foreach ($projetos as $projeto)
@if ($projeto->proponente_id === Auth()->user()->proponentes->id)
<tr>
......@@ -68,13 +66,15 @@
<div class="dropdown-menu">
@if($edital->inicioSubmissao <= $hoje && $hoje <= $edital->fimSubmissao)
<a href="{{ route('trabalho.editar', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center;">
Editar projeto
Editar
</a>
<hr class="dropdown-hr">
@else
@endif
<a href="{{ route('trabalho.show', ['id' => $projeto->id]) }}" class="dropdown-item" style="text-align: center">
Visualizar projeto
Visualizar
</a>
<hr class="dropdown-hr">
{{-- <a href="" class="dropdown-item" style="text-align: center">
Recorrer
</a>
......@@ -82,8 +82,8 @@
Resultado
</a> --}}
<!-- Button trigger modal -->
<button type="button" class="dropdown-item" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
Excluir projeto
<button type="button" class="dropdown-item dropdown-item-delete" data-toggle="modal" data-target="#modal{{$projeto->id}}" style="text-align: center">
<img src="{{asset('img/icons/logo_lixeira.png')}}" alt=""> Deletar
</button>
</div>
</div>
......@@ -120,7 +120,22 @@
@section('javascript')
<script>
function buscarEdital(input) {
var editais = document.getElementById('projetos').children;
if(input.value.length > 2) {
for(var i = 0; i < editais.length; i++) {
var nomeEvento = editais[i].children[0].textContent;
if(nomeEvento.substr(0).indexOf(input.value) >= 0) {
editais[i].style.display = "";
} else {
editais[i].style.display = "none";
}
}
} else {
for(var i = 0; i < editais.length; i++) {
editais[i].style.display = "";
}
}
}
</script>
@endsection
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment