Skip to content

GitLab

Commit 9fedf7dc authored by carlos's avatar carlos
Browse files

correcao da home

parent 72241b3c
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/UserController.php
View file @ 9fedf7dc
...@@ -14,6 +14,7 @@ use App\Endereco; ...@@ -14,6 +14,7 @@ use App\Endereco;
use App\Trabalho; use App\Trabalho;
use App\Coautor; use App\Coautor;
use App\Evento; use App\Evento;
use Carbon\Carbon;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class UserController extends Controller class UserController extends Controller
...@@ -27,7 +28,9 @@ class UserController extends Controller ...@@ -27,7 +28,9 @@ class UserController extends Controller
return redirect()->route('home'); return redirect()->route('home');
} }
Log::debug('UserController index'); Log::debug('UserController index');
return view('index', ['eventos' => $eventos]); $hoje = Carbon::today('America/Recife');
$hoje = $hoje->toDateString();
return view('index', ['eventos' => $eventos, 'hoje' => $hoje]);
//return view('auth.login'); //return view('auth.login');
} }
......
composer.lock
View file @ 9fedf7dc
...@@ -234,16 +234,16 @@ ...@@ -234,16 +234,16 @@
}, },
{ {
"name": "egulias/email-validator", "name": "egulias/email-validator",
"version": "2.1.17", "version": "2.1.18",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/egulias/EmailValidator.git", "url": "https://github.com/egulias/EmailValidator.git",
"reference": "ade6887fd9bd74177769645ab5c474824f8a418a" "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/ade6887fd9bd74177769645ab5c474824f8a418a", "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/cfa3d44471c7f5bfb684ac2b0da7114283d78441",
"reference": "ade6887fd9bd74177769645ab5c474824f8a418a", "reference": "cfa3d44471c7f5bfb684ac2b0da7114283d78441",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Egulias\\EmailValidator\\": "EmailValidator" "Egulias\\EmailValidator\\": "src"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
"validation", "validation",
"validator" "validator"
], ],
"time": "2020-02-13T22:36:52+00:00" "time": "2020-06-16T20:11:17+00:00"
}, },
{ {
"name": "fideloper/proxy", "name": "fideloper/proxy",
...@@ -397,16 +397,16 @@ ...@@ -397,16 +397,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.5.4", "version": "6.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d" "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d", "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
"guzzlehttp/promises": "^1.0", "guzzlehttp/promises": "^1.0",
"guzzlehttp/psr7": "^1.6.1", "guzzlehttp/psr7": "^1.6.1",
"php": ">=5.5", "php": ">=5.5",
"symfony/polyfill-intl-idn": "1.17.0" "symfony/polyfill-intl-idn": "^1.17.0"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
...@@ -460,7 +460,7 @@ ...@@ -460,7 +460,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2020-05-25T19:35:05+00:00" "time": "2020-06-16T21:01:06+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
...@@ -586,16 +586,16 @@ ...@@ -586,16 +586,16 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.18.19", "version": "v6.18.20",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "69321afec31f4a908112e5dc8995fc91024fd971" "reference": "2862a9857533853bb2851bac39d65e3bfb8ba6cd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/69321afec31f4a908112e5dc8995fc91024fd971", "url": "https://api.github.com/repos/laravel/framework/zipball/2862a9857533853bb2851bac39d65e3bfb8ba6cd",
"reference": "69321afec31f4a908112e5dc8995fc91024fd971", "reference": "2862a9857533853bb2851bac39d65e3bfb8ba6cd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -677,6 +677,7 @@ ...@@ -677,6 +677,7 @@
"suggest": { "suggest": {
"aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).", "aws/aws-sdk-php": "Required to use the SQS queue driver, DynamoDb failed job storage and SES mail driver (^3.0).",
"doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).", "doctrine/dbal": "Required to rename columns and drop SQLite columns (^2.6).",
"ext-ftp": "Required to use the Flysystem FTP driver.",
"ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().", "ext-gd": "Required to use Illuminate\\Http\\Testing\\FileFactory::image().",
"ext-memcached": "Required to use the memcache cache driver.", "ext-memcached": "Required to use the memcache cache driver.",
"ext-pcntl": "Required to use all features of the queue worker.", "ext-pcntl": "Required to use all features of the queue worker.",
...@@ -729,7 +730,7 @@ ...@@ -729,7 +730,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2020-06-09T13:59:34+00:00" "time": "2020-06-16T13:21:33+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -1215,16 +1216,16 @@ ...@@ -1215,16 +1216,16 @@
}, },
{ {
"name": "opis/closure", "name": "opis/closure",
"version": "3.5.4", "version": "3.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/opis/closure.git", "url": "https://github.com/opis/closure.git",
"reference": "1d0deef692f66dae5d70663caee2867d0971306b" "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/1d0deef692f66dae5d70663caee2867d0971306b", "url": "https://api.github.com/repos/opis/closure/zipball/dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
"reference": "1d0deef692f66dae5d70663caee2867d0971306b", "reference": "dec9fc5ecfca93f45cd6121f8e6f14457dff372c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1272,7 +1273,7 @@ ...@@ -1272,7 +1273,7 @@
"serialization", "serialization",
"serialize" "serialize"
], ],
"time": "2020-06-07T11:41:29+00:00" "time": "2020-06-17T14:59:55+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
...@@ -5407,16 +5408,16 @@ ...@@ -5407,16 +5408,16 @@
}, },
{ {
"name": "webmozart/assert", "name": "webmozart/assert",
"version": "1.8.0", "version": "1.9.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/webmozart/assert.git", "url": "https://github.com/webmozart/assert.git",
"reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6" "reference": "9dc4f203e36f2b486149058bade43c851dd97451"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/webmozart/assert/zipball/ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "url": "https://api.github.com/repos/webmozart/assert/zipball/9dc4f203e36f2b486149058bade43c851dd97451",
"reference": "ab2cb0b3b559010b75981b1bdce728da3ee90ad6", "reference": "9dc4f203e36f2b486149058bade43c851dd97451",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -5424,6 +5425,7 @@ ...@@ -5424,6 +5425,7 @@
"symfony/polyfill-ctype": "^1.8" "symfony/polyfill-ctype": "^1.8"
}, },
"conflict": { "conflict": {
"phpstan/phpstan": "<0.12.20",
"vimeo/psalm": "<3.9.1" "vimeo/psalm": "<3.9.1"
}, },
"require-dev": { "require-dev": {
...@@ -5451,7 +5453,7 @@ ...@@ -5451,7 +5453,7 @@
"check", "check",
"validate" "validate"
], ],
"time": "2020-04-18T12:12:48+00:00" "time": "2020-06-16T10:16:42+00:00"
} }
], ],
"aliases": [], "aliases": [],
......
resources/views/coordenador/home.blade.php
View file @ 9fedf7dc
...@@ -75,7 +75,11 @@ ...@@ -75,7 +75,11 @@
</p> </p>
<p> <p>
<a href="{{ route('evento.visualizar',['id'=>$evento->id]) }}" class="visualizarEvento">Visualizar edital</a> @if (Auth::check())
<a href="{{ route('evento.visualizar',['id'=> $evento->id]) }}" class="visualizarEvento">Visualizar edital</a>
@else
<a href="{{ route('evento.visualizarNaoLogado', ['id'=>$evento->id]) }}" class="visualizarEvento">Visualizar edital</a>
@endif
</p> </p>
</div> </div>
......
resources/views/index.blade.php
View file @ 9fedf7dc
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
</p> </p>
</div> </div>
<div class="row position-text"> <div class="row position-text">
<button class="btn btn-opcoes-edital" style="margin-bottom: 20px;"> {{-- <button class="btn btn-opcoes-edital" style="margin-bottom: 20px;">
Leia mais Leia mais
</button> </button> --}}
</div> </div>
</div> </div>
<br> <br>
...@@ -27,24 +27,28 @@ ...@@ -27,24 +27,28 @@
<div id="editais"> <div id="editais">
<ul class="list-editais flexcroll" style="list-style-type: none;"> <ul class="list-editais flexcroll" style="list-style-type: none;">
@foreach ($eventos as $evento) @foreach ($eventos as $evento)
<li class="li-editais"> @if (\Carbon\Carbon::create($evento->fimSubmissao) > \Carbon\Carbon::create($hoje))
<div class="container"> <li class="li-editais">
<div class="row"> <div class="container">
<div class="col-sm-1"> <div class="row">
<img class="img-arquivo" src="{{ asset('img/icons/logo_arquivo.png') }}" alt=""> <div class="col-sm-1">
</div> <img class="img-arquivo" src="{{ asset('img/icons/logo_arquivo.png') }}" alt="">
<div class="col-sm-8"> </div>
<div>{{$evento->nome}}</div> <div class="col-sm-8">
<div class="color-subtitle-edital">Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</div> <div>{{$evento->nome}}</div>
</div> <div class="color-subtitle-edital">Submissão até o dia {{ date('d/m/Y', strtotime($evento->fimSubmissao)) }}</div>
<div class="col-sm-3"> </div>
<button class="btn btn-opcoes-edital" style="margin-left: 15px;"> <div class="col-sm-3">
Opções <a href="{{ route('evento.visualizarNaoLogado', ['id' => $evento->id]) }}">
</button> <button class="btn btn-opcoes-edital" style="float: right;">
Visualizar
</button>
</a>
</div>
</div> </div>
</div> </div>
</div> </li>
</li> @endif
@endforeach @endforeach
</div> </div>
</div> </div>
......
resources/views/layouts/app.blade.php
View file @ 9fedf7dc
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</div> </div>
<div class="navbar-text"> <div class="navbar-text">
@guest @guest
<a href="#" 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 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') }}">
......
routes/web.php
View file @ 9fedf7dc
...@@ -16,6 +16,7 @@ Route::get('/', 'UserController@index' ...@@ -16,6 +16,7 @@ Route::get('/', 'UserController@index'
Route::get('/home', 'HomeController@index' )->name('home')->middleware('verified'); Route::get('/home', 'HomeController@index' )->name('home')->middleware('verified');
Route::get('/evento/visualizar/naologado/{id}','EventoController@showNaoLogado' )->name('evento.visualizarNaoLogado'); Route::get('/evento/visualizar/naologado/{id}','EventoController@showNaoLogado' )->name('evento.visualizarNaoLogado');
Route::get('/editais/home' ,'EventoController@index' )->name('coord.home');
Auth::routes(['verify' => true]); Auth::routes(['verify' => true]);
...@@ -49,7 +50,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){ ...@@ -49,7 +50,7 @@ Route::group(['middleware' => ['isTemp', 'auth', 'verified']], function(){
Route::get('/home/edital', 'EventoController@index' )->name('visualizarEvento'); Route::get('/home/edital', 'EventoController@index' )->name('visualizarEvento');
// ######## rotas de teste ##################################### // ######## rotas de teste #####################################
Route::get('/editais/home', 'EventoController@index' )->name('coord.home');
Route::get('/coordenador/evento/detalhes', 'EventoController@detalhes' )->name('coord.detalhesEvento'); Route::get('/coordenador/evento/detalhes', 'EventoController@detalhes' )->name('coord.detalhesEvento');
//####### Visualizar trabalhos do usuário ###################### //####### Visualizar trabalhos do usuário ######################
......
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