diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index cb060b6f1134048313eb82c2e7118025b909fdcc..33214224088d0a69d625cfff8d3bec039bdee710 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 dea0a38aa6d3406c2c79663512b7d8b79bb3f394..02773a891da2835cf8310350dc2542cf84e97f9b 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 eb3fa1f2bc8348b1e112335f73da1263e41154c5..e75d7ecf5c24ec785713868d9e27484f396f0a1d 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 105f19d3683f7f7716f4c351ad7cd8c14a94f5cf..37a46bc3fbb2a136b455259e402ba831664e8298 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>