From a10b787488ffbca503d67e12d4cd384fa066dfc5 Mon Sep 17 00:00:00 2001 From: Vytor Calixto <vytorcalixto@gmail.com> Date: Thu, 14 Apr 2016 10:54:39 -0300 Subject: [PATCH] =?UTF-8?q?Alterada=20p=C3=A1gina=20inicial=20para=20mostr?= =?UTF-8?q?ar=20os=20eventos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/HomeController.php | 10 ++++++-- app/Http/routes.php | 4 +-- resources/views/layouts/app.blade.php | 4 ++- resources/views/welcome.blade.php | 33 ++++++++++++++++++++++--- 4 files changed, 42 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index cb060b6..3321422 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use App\Event; use App\Http\Requests; use Illuminate\Http\Request; @@ -14,7 +15,7 @@ class HomeController extends Controller */ public function __construct() { - $this->middleware('auth'); + // $this->middleware('auth'); } /** @@ -24,6 +25,11 @@ class HomeController extends Controller */ public function index() { - return view('home'); + $eventosFuturos = Event::where('date', '>=', date('Y-m-d').' 00:00:00')->get(); + $eventosPassados = Event::where('date', '<', date('Y-m-d').' 00:00:00')->get(); + return view('welcome', [ + 'eventosFuturos' => $eventosFuturos, + 'eventosPassados' => $eventosPassados + ]); } } diff --git a/app/Http/routes.php b/app/Http/routes.php index dea0a38..02773a8 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -11,9 +11,7 @@ | */ -Route::get('/', function () { - return view('welcome'); -}); +Route::get('/', 'HomeController@index'); /* ----------- Rotas de Eventos ----------- */ Route::get('/eventos', 'EventController@index'); //lista todos os eventos diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index eb3fa1f..e75d7ec 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -47,9 +47,11 @@ <div class="collapse navbar-collapse" id="app-navbar-collapse"> <!-- Left Side Of Navbar --> + @unless (Auth::guest()) <ul class="nav navbar-nav"> - <li><a href="{{ url('/home') }}">Início</a></li> + <li><a href="{{ url('/home') }}">Gerenciar Eventos</a></li> </ul> + @endunless <!-- Right Side Of Navbar --> <ul class="nav navbar-nav navbar-right"> diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 105f19d..37a46bc 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -8,9 +8,36 @@ <div class="panel-heading">Próximos eventos</div> <div class="panel-body"> <ul class="list-group"> - <li class="list-group-item"> - Crazy Thursday - </li> + @if (count($eventosFuturos) > 0) + @foreach ($eventosFuturos as $evt) + <li class="list-group-item"> + {{ $evt->name }} + </li> + @endforeach + @else + <li class="list-group-item"> + Não há eventos futuros :( + </li> + @endif + </ul> + </div> + </div> + + <div class="panel panel-default"> + <div class="panel-heading">Eventos anteriores</div> + <div class="panel-body"> + <ul class="list-group"> + @if (count($eventosPassados) > 0) + @foreach ($eventosPassados as $evt) + <li class="list-group-item"> + {{ $evt->name }} + </li> + @endforeach + @else + <li class="list-group-item"> + Não há eventos anteriores. + </li> + @endif </ul> </div> </div> -- GitLab