diff --git a/app/Http/Controllers/EventoController.php b/app/Http/Controllers/EventoController.php index 1fca8a75342b57eeef53a845a051fb9e47c1d9f3..3e6dedb1143b50d3e6bf1adcb56ecbb35da55847 100644 --- a/app/Http/Controllers/EventoController.php +++ b/app/Http/Controllers/EventoController.php @@ -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]); } /** diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php index 7e103052565369e23d28f55290ca77baece22487..019716833fd82b45e7fdfac21de3de53a3c4b1a6 100644 --- a/app/Http/Controllers/HomeController.php +++ b/app/Http/Controllers/HomeController.php @@ -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'); diff --git a/resources/views/administrador/editais.blade.php b/resources/views/administrador/editais.blade.php index 81a97da861c4bfa9dd3b0b5d5d41ef1dd8faf449..fc8358c1cff21c60a91d7e5c0761cfb9ebf4c035 100644 --- a/resources/views/administrador/editais.blade.php +++ b/resources/views/administrador/editais.blade.php @@ -28,88 +28,101 @@
- - - - - - - - - - @foreach ($eventos as $evento) + @if(session('mensagem')) +
+
+
+

{{session('mensagem')}}

+
+
+
+ @endif +
+
+
Nome do EditalData de CriaçãoOpção
+ - - - + + + - - + + @foreach ($eventos as $evento) + + + + + + + - - @endforeach - -
- - {{ $evento->nome }} - - {{ date('d/m/Y', strtotime($evento->created_at)) }} - @if(auth()->user()->id == $evento->criador_id) - - @endif - Nome do EditalData de CriaçãoOpção
+ + {{ $evento->nome }} + + {{ date('d/m/Y', strtotime($evento->created_at)) }} + @if(auth()->user()->id == $evento->criador_id) + -
+ @endforeach + + + + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index d252c82a8637f58e87ac657a4ffb98bf7aef3ad1..04964a057b7d8367521c47edc698fcbdf0df6a5e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -146,8 +146,11 @@ {{ __('Cadastre-se') }} @else - Home - + @if(Auth::user()->administradors != null) + Home + @else + Home + @endif