Commit f89178f8 authored by Gabriel-31415's avatar Gabriel-31415
Browse files

conflito resolvido

parents d110b15d aba86714
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
@guest @guest
<a href="{{ route('coord.home') }}" class="btn navbar-text negrito" style="color: rgb(0, 140, 255);">Editais</a> <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> <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;"> <div id="login-dropdown-menu" class="dropdown-menu dropdown-menu-right negrito" aria-labelledby="dropdownMenuLink" style="right: 15%; width: 300px; height: 380px;">
<form method="POST" action="{{ route('login') }}"> <form method="POST" action="{{ route('login') }}">
@csrf @csrf
<div style="padding: 20px;"> <div style="padding: 20px;">
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</div> </div>
<div style="position: relative; top: 40px;"> <div style="position: relative; top: 40px;">
<div class="form-check"> <div class="form-check">
<input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }}> <input class="form-check-input" type="checkbox" name="remember" id="remember" {{ old('remember') ? 'checked' : '' }} >
<label class="form-check-label" for="remember"> <label class="form-check-label" for="remember">
{{ __('Lembrar Senha') }} {{ __('Lembrar Senha') }}
...@@ -309,5 +309,10 @@ ...@@ -309,5 +309,10 @@
</div> </div>
</div> </div>
</div> </div>
<script>
$('#login-dropdown-menu').click(function(event){
event.stopPropagation();
});
</script>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -195,10 +195,12 @@ ...@@ -195,10 +195,12 @@
<div class="col-md-12"> <div class="col-md-12">
@if (Auth()->user()->administradors != null) @if (Auth()->user()->administradors != null)
<a href="{{ route('admin.editais') }}" class="btn btn-secondary" style="width:100%">Voltar</a> <a href="{{ route('admin.editais') }}" class="btn btn-secondary" style="width:100%">Voltar</a>
@elseif ($participantes->contains('user_id', Auth()->user()->id))
<a href="{{route('participante.edital',['id'=>$edital->id])}}" class="btn btn-secondary" style="width:100%">Voltar</a>
@else @else
<a href="{{ route('projetos.edital', ['id' => $edital->id]) }}" class="btn btn-secondary" style="width:100%">Voltar</a> <a href="{{ route('projetos.edital', ['id' => $edital->id]) }}" class="btn btn-secondary" style="width:100%">Voltar</a>
@endif @endif
<a href="{{route('participante.edital',['id'=>$edital->id])}}" class="btn btn-secondary" style="width:100%">Voltar</a>
</div> </div>
</div> </div>
......
...@@ -461,6 +461,20 @@ ...@@ -461,6 +461,20 @@
form.submit(); form.submit();
} }
$(document).ready(function($) {
$('#cpf').mask('000.000.000-00');
var SPMaskBehavior = function(val) {
return val.replace(/\D/g, '').length === 11 ? '(00) 00000-0000' : '(00) 0000-00009';
},
spOptions = {
onKeyPress: function(val, e, field, options) {
field.mask(SPMaskBehavior.apply({}, arguments), options);
}
};
$('#celular').mask(SPMaskBehavior, spOptions);
});
window.onload = showInstituicao(); window.onload = showInstituicao();
</script> </script>
@endsection @endsection
...@@ -40,7 +40,7 @@ Route::post('/perfil-usuario', 'UserController@editarPerfil' ...@@ -40,7 +40,7 @@ Route::post('/perfil-usuario', 'UserController@editarPerfil'
Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
//######## Rotas Avaliador #################################### //######## Rotas Avaliador ####################################
Route::prefix('avaliador')->name('avaliador.')->group(function(){ Route::prefix('avaliador')->name('avaliador.')->group(function(){
Route::get('/index', 'AvaliadorController@index' )->name('index')->middleware('auth'); Route::get('/index', 'AvaliadorController@index' )->name('index')->middleware('auth');
Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho')->middleware('auth'); Route::get('/trabalhos', 'AvaliadorController@visualizarTrabalhos' )->name('visualizarTrabalho')->middleware('auth');
Route::post('/parecer', 'AvaliadorController@parecer' )->name('parecer')->middleware('auth'); Route::post('/parecer', 'AvaliadorController@parecer' )->name('parecer')->middleware('auth');
......
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