Skip to content

GitLab

"app/git@sites.upe.br:walter.felipe/submeta.git" did not exist on "eac66d03265f3e5fc423802c75270fce340d2dfa"
Unverified Commit 96ffb16f authored by Gabriel Antônio da Silva's avatar Gabriel Antônio da Silva Committed by GitHub
Browse files

Merge pull request #4 from lmts-ufape/carlos 

Carlos
parents 4fa4a498 d8705b95
Hide whitespace changes
Inline Side-by-side
app/Http/Controllers/AdministradorController.php
View file @ 96ffb16f
...@@ -4,6 +4,13 @@ namespace App\Http\Controllers; ...@@ -4,6 +4,13 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Administrador; use App\Administrador;
use App\User;
use App\GrandeArea;
use App\Avaliador;
use App\AdministradorResponsavel;
use App\Participante;
use App\Proponente;
use Illuminate\Support\Facades\Hash;
use App\Evento; use App\Evento;
class AdministradorController extends Controller class AdministradorController extends Controller
...@@ -17,8 +24,8 @@ class AdministradorController extends Controller ...@@ -17,8 +24,8 @@ class AdministradorController extends Controller
return view('naturezas.index'); return view('naturezas.index');
} }
public function usuarios(){ public function usuarios(){
$users = User::orderBy('name')->get();
return view('administrador.usuarios'); return view('administrador.usersAdmin')->with(['users' => $users]);
} }
public function editais(){ public function editais(){
...@@ -28,4 +35,207 @@ class AdministradorController extends Controller ...@@ -28,4 +35,207 @@ class AdministradorController extends Controller
return view('administrador.editais', ['eventos'=> $eventos]); return view('administrador.editais', ['eventos'=> $eventos]);
} }
public function create() {
$grandesAreas = GrandeArea::orderBy('nome')->get();
return view('administrador.novo_user')->with(['grandeAreas' => $grandesAreas]);
}
public function salvar(Request $request) {
if ($request->tipo != "proponente") {
$validated = $request->validate([
'nome' => 'required',
'tipo' => 'required',
'email' => 'required|unique:users',
'senha' => 'required',
'confirmar_senha' => 'required',
'cpf' => 'required|cpf|unique:users',
]);
} else {
$validated = $request->validate([
'nome' => 'required',
'tipo' => 'required',
'email' => 'required|unique:users',
'senha' => 'required',
'confirmar_senha' => 'required',
'cpf' => 'required|cpf|unique:users',
'cargo' => 'required',
'titulacaoMaxima' => 'required',
'anoTitulacao' => 'required',
'area' => 'required',
'bolsistaProdutividade' => 'required',
'nivel' => 'required',
'linkLattes' => 'required',
]);
}
if (!($request->senha === $request->confirmar_senha)) {
return redirect()->back()->withErrors(['senha' => 'Senhas diferentes']);
}
$user = new User();
$user->name = $request->nome;
$user->tipo = $request->tipo;
$user->cpf = $request->cpf;
$user->email = $request->email;
$user->password = bcrypt($request->senha);
$user->save();
switch ($request->tipo) {
case "administradorResponsavel":
$adminResp = new AdministradorResponsavel();
$adminResp->user_id = $user->id;
$adminResp->save();
break;
case "avaliador":
$avaliador = new Avaliador();
$avaliador->user_id = $user->id;
$avaliador->save();
break;
case "proponente":
$proponente = new Proponente();
$proponente->SIAPE = $request->SIAPE;
$proponente->cargo = $request->cargo;
$proponente->vinculo = $request->vinculo;
$proponente->titulacaoMaxima = $request->titulacaoMaxima;
$proponente->anoTitulacao = $request->anoTitulacao;
$proponente->grandeArea = $request->area;
$proponente->area = "teste";
$proponente->subArea = "teste";
$proponente->bolsistaProdutividade = $request->bolsistaProdutividade;
$proponente->nivel = $request->nivel;
$proponente->linkLattes = $request->linkLattes;
$proponente->user_id = $user->id;
$proponente->save();
break;
case "participante":
$participante = new Participante();
$participante->user_id = $user->id;
$participante->save();
break;
}
return redirect( route('admin.usuarios') )->with(['mensagem' => 'Usuário cadastrado com sucesso']);
}
public function edit($id) {
$user = User::find($id);
$adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first();
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$proponente = Proponente::where('user_id', '=', $id)->first();
$participante = Participante::where('user_id', '=', $id)->first();
return view ('administrador.editar_user')->with(['user' => $user,
'adminResp' => $adminResp,
'proponente' => $proponente,
'participante' => $participante,]);
}
public function update(Request $request, $id) {
$user = User::find($id);
if ($request->tipo != "proponente") {
$validated = $request->validate([
'nome' => 'required',
'tipo' => 'required',
'email' => 'required',
// 'senha' => 'required',
// 'confirmar_senha' => 'required',
'cpf' => 'required|cpf',
]);
} else {
$validated = $request->validate([
'nome' => 'required',
'tipo' => 'required',
'email' => 'required',
// 'senha' => 'required',
// 'confirmar_senha' => 'required',
'cpf' => 'required|cpf',
'cargo' => 'required',
'titulacaoMaxima' => 'required',
'anoTitulacao' => 'required',
'grandeArea' => 'required',
'bolsistaProdutividade' => 'required',
'nivel' => 'required',
'linkLattes' => 'required',
]);
}
// if (!(Hash::check($request->senha_atual, $user->password))) {
// return redirect()->back()->withErrors(['senha_atual' => 'Senha atual não correspondente']);
// }
// if (!($request->nova_senha === $request->confirmar_senha)) {
// return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']);
// }
switch ($request->tipo) {
case "administradorResponsavel":
$adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first();
$adminResp->user_id = $user->id;
$adminResp->update();
break;
case "avaliador":
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$avaliador->user_id = $user->id;
$avaliador->update();
break;
case "proponente":
$proponente = Proponente::where('user_id', '=', $id)->first();
$proponente->SIAPE = $request->SIAPE;
$proponente->cargo = $request->cargo;
$proponente->vinculo = $request->vinculo;
$proponente->titulacaoMaxima = $request->titulacaoMaxima;
$proponente->anoTitulacao = $request->anoTitulacao;
$proponente->grandeArea = $request->grandeArea;
$proponente->area = "teste";
$proponente->subArea = "teste";
$proponente->bolsistaProdutividade = $request->bolsistaProdutividade;
$proponente->nivel = $request->nivel;
$proponente->linkLattes = $request->linkLattes;
$proponente->user_id = $user->id;
$proponente->update();
break;
case "participante":
$participante = Participante::where('user_id', '=', $id)->first();
$participante->user_id = $user->id;
$participante->update();
break;
}
$user->name = $request->nome;
$user->tipo = $request->tipo;
$user->email = $request->email;
$user->cpf = $request->cpf;
// $user->password = bcrypt($request->nova_senha);
$user->update();
return redirect( route('admin.usuarios') )->with(['mensagem' => 'Usuário atualizado com sucesso']);
}
public function destroy($id) {
$user = User::find($id);
$adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first();
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$proponente = Proponente::where('user_id', '=', $id)->first();
$participante = Participante::where('user_id', '=', $id)->first();
if (!(is_null($adminResp))) {
$adminResp->delete();
} else if (!(is_null($avaliador))) {
$avaliador->delete();
} else if (!(is_null($proponente))) {
$proponente->delete();
} else if (!(is_null($participante))) {
$participante->delete();
}
$user->delete();
return redirect( route('admin.usuarios') )->with(['mensagem' => 'Usuário deletado com sucesso']);
}
} }
app/Http/Controllers/UserController.php
View file @ 96ffb16f
...@@ -6,11 +6,14 @@ use Illuminate\Http\Request; ...@@ -6,11 +6,14 @@ use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
use App\User; use App\User;
use App\AdministradorResponsavel;
use App\Avaliador;
use App\Proponente;
use App\Participante;
use App\Endereco; use App\Endereco;
use App\Trabalho; use App\Trabalho;
use App\Coautor; use App\Coautor;
use App\Evento; use App\Evento;
use App\Proponente;
use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Log;
class UserController extends Controller class UserController extends Controller
...@@ -118,4 +121,20 @@ class UserController extends Controller ...@@ -118,4 +121,20 @@ class UserController extends Controller
'trabalhos' => $trabalhos, 'trabalhos' => $trabalhos,
]); ]);
} }
public function minhaConta() {
$id = Auth::user()->id;
$user = User::find($id);
$adminResp = AdministradorResponsavel::where('user_id', '=', $id)->first();
$avaliador = Avaliador::where('user_id', '=', $id)->first();
$proponente = Proponente::where('user_id', '=', $id)->first();
$participante = Participante::where('user_id', '=', $id)->first();
return view('user.perfilUser')->with(['user' => $user,
'adminResp' => $adminResp,
'avaliador' => $avaliador,
'proponente' => $proponente,
'participante' => $participante]);
}
} }
app/Http/Kernel.php
View file @ 96ffb16f
...@@ -64,6 +64,7 @@ class Kernel extends HttpKernel ...@@ -64,6 +64,7 @@ class Kernel extends HttpKernel
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
'isTemp' => \App\Http\Middleware\IsTemp::class, 'isTemp' => \App\Http\Middleware\IsTemp::class,
'checkAdministrador' => \App\Http\Middleware\checkAdministrador::class, 'checkAdministrador' => \App\Http\Middleware\checkAdministrador::class,
'checkAdminResp' => \App\Http\Middleware\checkAdminResp::class,
]; ];
/** /**
......
app/Http/Middleware/checkAdminResp.php 0 → 100644
View file @ 96ffb16f
<?php
namespace App\Http\Middleware;
use Closure;
use Auth;
use Illuminate\Support\Facades\Log;
class checkAdminResp
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed
*/
public function handle($request, Closure $next)
{
if(!Auth::check()){
Log::debug('checkAdminResp');
return redirect('/');
}
if(Auth::user()->tipo=='administradorResponsavel' || Auth::user()->tipo=='administrador'){
return $next($request);
}
else{
return redirect('home')->with('error', 'Você não possui privilégios para acessa esta funcionalidade');
}
}
}
app/Policies/AdminPolicy.php 0 → 100644
View file @ 96ffb16f
<?php
namespace App\Policies;
use App\User;
use Illuminate\Auth\Access\HandlesAuthorization;
class AdminPolicy
{
use HandlesAuthorization;
/**
* Create a new policy instance.
*
* @return void
*/
public function __construct()
{
//
}
public function isAdministrador(User $user) {
return $user->tipo === "administrador";
}
public function isAdminResp(User $user) {
return $user->tipo === "administradorResponsavel";
}
}
app/Providers/AppServiceProvider.php
View file @ 96ffb16f
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Facades\Validator;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
{ {
...@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider ...@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
*/ */
public function boot() public function boot()
{ {
// Validator::extend('cpf', '\App\Utils\CpfValidation@validate');
} }
} }
app/Utils/CpfValidation.php 0 → 100644
View file @ 96ffb16f
<?php namespace App\Utils;
class CpfValidation
{
public function validate($attribute, $value, $parameters, $validator)
{
return $this->isValidate($attribute, $value);
}
protected function isValidate($attribute, $value)
{
$c = preg_replace('/\D/', '', $value);
if (strlen($c) != 11 || preg_match("/^{$c[0]}{11}$/", $c)) {
return false;
}
for ($s = 10, $n = 0, $i = 0; $s >= 2; $n += $c[$i++] * $s--);
if ($c[9] != ((($n %= 11) < 2) ? 0 : 11 - $n)) {
return false;
}
for ($s = 11, $n = 0, $i = 0; $s >= 2; $n += $c[$i++] * $s--);
if ($c[10] != ((($n %= 11) < 2) ? 0 : 11 - $n)) {
return false;
}
return true;
}
}
\ No newline at end of file
bootstrap/cache/.gitignore 100644 → 100755
View file @ 96ffb16f
File mode changed from 100644 to 100755
composer.lock
View file @ 96ffb16f
...@@ -41,33 +41,37 @@ ...@@ -41,33 +41,37 @@
}, },
{ {
"name": "doctrine/inflector", "name": "doctrine/inflector",
"version": "1.3.1", "version": "2.0.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/inflector.git", "url": "https://github.com/doctrine/inflector.git",
"reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1" "reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/ec3a55242203ffa6a4b27c58176da97ff0a7aec1", "url": "https://api.github.com/repos/doctrine/inflector/zipball/3fc171224a316569faad2df6b18a1fd8cce5a56d",
"reference": "ec3a55242203ffa6a4b27c58176da97ff0a7aec1", "reference": "3fc171224a316569faad2df6b18a1fd8cce5a56d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.1" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^6.2" "doctrine/coding-standard": "^7.0",
"phpstan/phpstan": "^0.11",
"phpstan/phpstan-phpunit": "^0.11",
"phpstan/phpstan-strict-rules": "^0.11",
"phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "2.0.x-dev"
} }
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector" "Doctrine\\Inflector\\": "lib/Doctrine/Inflector"
} }
}, },
"notification-url": "https://packagist.org/downloads/", "notification-url": "https://packagist.org/downloads/",
...@@ -96,32 +100,38 @@ ...@@ -96,32 +100,38 @@
"email": "schmittjoh@gmail.com" "email": "schmittjoh@gmail.com"
} }
], ],
"description": "Common String Manipulations with regard to casing and singular/plural rules.", "description": "PHP Doctrine Inflector is a small library that can perform string manipulations with regard to upper/lowercase and singular/plural forms of words.",
"homepage": "http://www.doctrine-project.org", "homepage": "https://www.doctrine-project.org/projects/inflector.html",
"keywords": [ "keywords": [
"inflection", "inflection",
"pluralize", "inflector",
"singularize", "lowercase",
"string" "manipulation",
"php",
"plural",
"singular",
"strings",
"uppercase",
"words"
], ],
"time": "2019-10-30T19:59:35+00:00" "time": "2020-05-25T20:08:47+00:00"
}, },
{ {
"name": "doctrine/lexer", "name": "doctrine/lexer",
"version": "1.2.0", "version": "1.2.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/doctrine/lexer.git", "url": "https://github.com/doctrine/lexer.git",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6" "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/doctrine/lexer/zipball/5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
"reference": "5242d66dbeb21a30dd8a3e66bf7a73b66e05e1f6", "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2" "php": "^7.2 || ^8.0"
}, },
"require-dev": { "require-dev": {
"doctrine/coding-standard": "^6.0", "doctrine/coding-standard": "^6.0",
...@@ -166,7 +176,7 @@ ...@@ -166,7 +176,7 @@
"parser", "parser",
"php" "php"
], ],
"time": "2019-10-30T14:39:59+00:00" "time": "2020-05-25T17:44:05+00:00"
}, },
{ {
"name": "dragonmantank/cron-expression", "name": "dragonmantank/cron-expression",
...@@ -387,16 +397,16 @@ ...@@ -387,16 +397,16 @@
}, },
{ {
"name": "guzzlehttp/guzzle", "name": "guzzlehttp/guzzle",
"version": "6.5.3", "version": "6.5.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/guzzle.git", "url": "https://github.com/guzzle/guzzle.git",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e" "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/aab4ebd862aa7d04f01a4b51849d657db56d882e", "url": "https://api.github.com/repos/guzzle/guzzle/zipball/a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"reference": "aab4ebd862aa7d04f01a4b51849d657db56d882e", "reference": "a4a1b6930528a8f7ee03518e6442ec7a44155d9d",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -404,7 +414,7 @@ ...@@ -404,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.11" "symfony/polyfill-intl-idn": "1.17.0"
}, },
"require-dev": { "require-dev": {
"ext-curl": "*", "ext-curl": "*",
...@@ -450,7 +460,7 @@ ...@@ -450,7 +460,7 @@
"rest", "rest",
"web service" "web service"
], ],
"time": "2020-04-18T10:38:46+00:00" "time": "2020-05-25T19:35:05+00:00"
}, },
{ {
"name": "guzzlehttp/promises", "name": "guzzlehttp/promises",
...@@ -576,20 +586,20 @@ ...@@ -576,20 +586,20 @@
}, },
{ {
"name": "laravel/framework", "name": "laravel/framework",
"version": "v6.18.11", "version": "v6.18.16",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/laravel/framework.git", "url": "https://github.com/laravel/framework.git",
"reference": "73bc10bb23aab7539c8ffae6d5dc3c4b277de557" "reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/73bc10bb23aab7539c8ffae6d5dc3c4b277de557", "url": "https://api.github.com/repos/laravel/framework/zipball/73f18a6bc58fb91aa83925161db25aa3674b73e9",
"reference": "73bc10bb23aab7539c8ffae6d5dc3c4b277de557", "reference": "73f18a6bc58fb91aa83925161db25aa3674b73e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"doctrine/inflector": "^1.1", "doctrine/inflector": "^1.4|^2.0",
"dragonmantank/cron-expression": "^2.0", "dragonmantank/cron-expression": "^2.0",
"egulias/email-validator": "^2.1.10", "egulias/email-validator": "^2.1.10",
"ext-json": "*", "ext-json": "*",
...@@ -610,6 +620,7 @@ ...@@ -610,6 +620,7 @@
"symfony/finder": "^4.3.4", "symfony/finder": "^4.3.4",
"symfony/http-foundation": "^4.3.4", "symfony/http-foundation": "^4.3.4",
"symfony/http-kernel": "^4.3.4", "symfony/http-kernel": "^4.3.4",
"symfony/polyfill-php73": "^1.17",
"symfony/process": "^4.3.4", "symfony/process": "^4.3.4",
"symfony/routing": "^4.3.4", "symfony/routing": "^4.3.4",
"symfony/var-dumper": "^4.3.4", "symfony/var-dumper": "^4.3.4",
...@@ -718,7 +729,7 @@ ...@@ -718,7 +729,7 @@
"framework", "framework",
"laravel" "laravel"
], ],
"time": "2020-04-28T15:18:58+00:00" "time": "2020-05-26T14:31:44+00:00"
}, },
{ {
"name": "laravel/tinker", "name": "laravel/tinker",
...@@ -840,16 +851,16 @@ ...@@ -840,16 +851,16 @@
}, },
{ {
"name": "league/commonmark", "name": "league/commonmark",
"version": "1.4.2", "version": "1.4.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/commonmark.git", "url": "https://github.com/thephpleague/commonmark.git",
"reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31" "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/commonmark/zipball/9e780d972185e4f737a03bade0fd34a9e67bbf31", "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/412639f7cfbc0b31ad2455b2fe965095f66ae505",
"reference": "9e780d972185e4f737a03bade0fd34a9e67bbf31", "reference": "412639f7cfbc0b31ad2455b2fe965095f66ae505",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -910,46 +921,20 @@ ...@@ -910,46 +921,20 @@
"md", "md",
"parser" "parser"
], ],
"funding": [ "time": "2020-05-04T22:15:21+00:00"
{
"url": "https://enjoy.gitstore.app/repositories/thephpleague/commonmark",
"type": "custom"
},
{
"url": "https://www.colinodell.com/sponsor",
"type": "custom"
},
{
"url": "https://www.paypal.me/colinpodell/10.00",
"type": "custom"
},
{
"url": "https://github.com/colinodell",
"type": "github"
},
{
"url": "https://www.patreon.com/colinodell",
"type": "patreon"
},
{
"url": "https://tidelift.com/funding/github/packagist/league/commonmark",
"type": "tidelift"
}
],
"time": "2020-04-24T13:39:56+00:00"
}, },
{ {
"name": "league/flysystem", "name": "league/flysystem",
"version": "1.0.67", "version": "1.0.69",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/thephpleague/flysystem.git", "url": "https://github.com/thephpleague/flysystem.git",
"reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e" "reference": "7106f78428a344bc4f643c233a94e48795f10967"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/thephpleague/flysystem/zipball/5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/7106f78428a344bc4f643c233a94e48795f10967",
"reference": "5b1f36c75c4bdde981294c2a0ebdb437ee6f275e", "reference": "7106f78428a344bc4f643c233a94e48795f10967",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1020,30 +1005,24 @@ ...@@ -1020,30 +1005,24 @@
"sftp", "sftp",
"storage" "storage"
], ],
"funding": [ "time": "2020-05-18T15:13:39+00:00"
{
"url": "https://offset.earth/frankdejonge",
"type": "other"
}
],
"time": "2020-04-16T13:21:26+00:00"
}, },
{ {
"name": "monolog/monolog", "name": "monolog/monolog",
"version": "2.0.2", "version": "2.1.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/Seldaek/monolog.git", "url": "https://github.com/Seldaek/monolog.git",
"reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8" "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/c861fcba2ca29404dc9e617eedd9eff4616986b8", "url": "https://api.github.com/repos/Seldaek/monolog/zipball/38914429aac460e8e4616c8cb486ecb40ec90bb1",
"reference": "c861fcba2ca29404dc9e617eedd9eff4616986b8", "reference": "38914429aac460e8e4616c8cb486ecb40ec90bb1",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^7.2", "php": ">=7.2",
"psr/log": "^1.0.1" "psr/log": "^1.0.1"
}, },
"provide": { "provide": {
...@@ -1054,11 +1033,11 @@ ...@@ -1054,11 +1033,11 @@
"doctrine/couchdb": "~1.0@dev", "doctrine/couchdb": "~1.0@dev",
"elasticsearch/elasticsearch": "^6.0", "elasticsearch/elasticsearch": "^6.0",
"graylog2/gelf-php": "^1.4.2", "graylog2/gelf-php": "^1.4.2",
"jakub-onderka/php-parallel-lint": "^0.9",
"php-amqplib/php-amqplib": "~2.4", "php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3", "php-console/php-console": "^3.1.3",
"php-parallel-lint/php-parallel-lint": "^1.0",
"phpspec/prophecy": "^1.6.1", "phpspec/prophecy": "^1.6.1",
"phpunit/phpunit": "^8.3", "phpunit/phpunit": "^8.5",
"predis/predis": "^1.1", "predis/predis": "^1.1",
"rollbar/rollbar": "^1.3", "rollbar/rollbar": "^1.3",
"ruflin/elastica": ">=0.90 <3.0", "ruflin/elastica": ">=0.90 <3.0",
...@@ -1107,20 +1086,20 @@ ...@@ -1107,20 +1086,20 @@
"logging", "logging",
"psr-3" "psr-3"
], ],
"time": "2019-12-20T14:22:59+00:00" "time": "2020-05-22T08:12:19+00:00"
}, },
{ {
"name": "nesbot/carbon", "name": "nesbot/carbon",
"version": "2.33.0", "version": "2.34.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/briannesbitt/Carbon.git", "url": "https://github.com/briannesbitt/Carbon.git",
"reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b" "reference": "3e87404329b8072295ea11d548b47a1eefe5a162"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/3e87404329b8072295ea11d548b47a1eefe5a162",
"reference": "4d93cb95a80d9ffbff4018fe58ae3b7dd7f4b99b", "reference": "3e87404329b8072295ea11d548b47a1eefe5a162",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1144,7 +1123,8 @@ ...@@ -1144,7 +1123,8 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "2.x-dev" "dev-master": "2.x-dev",
"dev-3.x": "3.x-dev"
}, },
"laravel": { "laravel": {
"providers": [ "providers": [
...@@ -1179,17 +1159,7 @@ ...@@ -1179,17 +1159,7 @@
"datetime", "datetime",
"time" "time"
], ],
"funding": [ "time": "2020-05-19T22:14:16+00:00"
{
"url": "https://opencollective.com/Carbon",
"type": "open_collective"
},
{
"url": "https://tidelift.com/funding/github/packagist/nesbot/carbon",
"type": "tidelift"
}
],
"time": "2020-04-20T15:05:43+00:00"
}, },
{ {
"name": "nikic/php-parser", "name": "nikic/php-parser",
...@@ -1245,16 +1215,16 @@ ...@@ -1245,16 +1215,16 @@
}, },
{ {
"name": "opis/closure", "name": "opis/closure",
"version": "3.5.1", "version": "3.5.3",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/opis/closure.git", "url": "https://github.com/opis/closure.git",
"reference": "93ebc5712cdad8d5f489b500c59d122df2e53969" "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969", "url": "https://api.github.com/repos/opis/closure/zipball/cac47092144043d5d676e2e7cf8d0d2f83fc89ca",
"reference": "93ebc5712cdad8d5f489b500c59d122df2e53969", "reference": "cac47092144043d5d676e2e7cf8d0d2f83fc89ca",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1302,7 +1272,7 @@ ...@@ -1302,7 +1272,7 @@
"serialization", "serialization",
"serialize" "serialize"
], ],
"time": "2019-11-29T22:36:02+00:00" "time": "2020-05-25T09:32:45+00:00"
}, },
{ {
"name": "paragonie/random_compat", "name": "paragonie/random_compat",
...@@ -1600,16 +1570,16 @@ ...@@ -1600,16 +1570,16 @@
}, },
{ {
"name": "psy/psysh", "name": "psy/psysh",
"version": "v0.10.3", "version": "v0.10.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/bobthecow/psysh.git", "url": "https://github.com/bobthecow/psysh.git",
"reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02" "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/2bde2fa03e05dff0aee834598b951d6fc7c6fe02", "url": "https://api.github.com/repos/bobthecow/psysh/zipball/a8aec1b2981ab66882a01cce36a49b6317dc3560",
"reference": "2bde2fa03e05dff0aee834598b951d6fc7c6fe02", "reference": "a8aec1b2981ab66882a01cce36a49b6317dc3560",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -1668,7 +1638,7 @@ ...@@ -1668,7 +1638,7 @@
"interactive", "interactive",
"shell" "shell"
], ],
"time": "2020-04-07T06:44:48+00:00" "time": "2020-05-03T19:32:03+00:00"
}, },
{ {
"name": "ralouphie/getallheaders", "name": "ralouphie/getallheaders",
...@@ -1933,20 +1903,6 @@ ...@@ -1933,20 +1903,6 @@
], ],
"description": "Symfony Console Component", "description": "Symfony Console Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T11:41:10+00:00" "time": "2020-03-30T11:41:10+00:00"
}, },
{ {
...@@ -2000,20 +1956,6 @@ ...@@ -2000,20 +1956,6 @@
], ],
"description": "Symfony CssSelector Component", "description": "Symfony CssSelector Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:56:45+00:00" "time": "2020-03-27T16:56:45+00:00"
}, },
{ {
...@@ -2070,20 +2012,6 @@ ...@@ -2070,20 +2012,6 @@
], ],
"description": "Symfony Debug Component", "description": "Symfony Debug Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-03-27T16:54:36+00:00"
}, },
{ {
...@@ -2140,20 +2068,6 @@ ...@@ -2140,20 +2068,6 @@
], ],
"description": "Symfony ErrorHandler Component", "description": "Symfony ErrorHandler Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-30T14:07:33+00:00" "time": "2020-03-30T14:07:33+00:00"
}, },
{ {
...@@ -2224,20 +2138,6 @@ ...@@ -2224,20 +2138,6 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-03-27T16:54:36+00:00"
}, },
{ {
...@@ -2345,25 +2245,10 @@ ...@@ -2345,25 +2245,10 @@
], ],
"description": "Symfony Finder Component", "description": "Symfony Finder Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-27T16:54:36+00:00" "time": "2020-03-27T16:54:36+00:00"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v4.4.8", "version": "v4.4.8",
"source": { "source": {
"type": "git", "type": "git",
...@@ -2415,20 +2300,6 @@ ...@@ -2415,20 +2300,6 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-18T20:40:08+00:00" "time": "2020-04-18T20:40:08+00:00"
}, },
{ {
...@@ -2519,20 +2390,6 @@ ...@@ -2519,20 +2390,6 @@
], ],
"description": "Symfony HttpKernel Component", "description": "Symfony HttpKernel Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-28T18:47:42+00:00" "time": "2020-04-28T18:47:42+00:00"
}, },
{ {
...@@ -2595,34 +2452,20 @@ ...@@ -2595,34 +2452,20 @@
"mime", "mime",
"mime-type" "mime-type"
], ],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-17T03:29:44+00:00" "time": "2020-04-17T03:29:44+00:00"
}, },
{ {
"name": "symfony/polyfill-ctype", "name": "symfony/polyfill-ctype",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-ctype.git", "url": "https://github.com/symfony/polyfill-ctype.git",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14" "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"reference": "4719fa9c18b0464d399f1a63bf624b42b6fa8d14", "reference": "e94c8b1bbe2bc77507a1056cdb06451c75b427f9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2634,7 +2477,7 @@ ...@@ -2634,7 +2477,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2667,34 +2510,20 @@ ...@@ -2667,34 +2510,20 @@
"polyfill", "polyfill",
"portable" "portable"
], ],
"funding": [ "time": "2020-05-12T16:14:59+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/polyfill-iconv", "name": "symfony/polyfill-iconv",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-iconv.git", "url": "https://github.com/symfony/polyfill-iconv.git",
"reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8" "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/ad6d62792bfbcfc385dd34b424d4fcf9712a32c8", "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/c4de7601eefbf25f9d47190abe07f79fe0a27424",
"reference": "ad6d62792bfbcfc385dd34b424d4fcf9712a32c8", "reference": "c4de7601eefbf25f9d47190abe07f79fe0a27424",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2706,7 +2535,7 @@ ...@@ -2706,7 +2535,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2740,34 +2569,20 @@ ...@@ -2740,34 +2569,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-intl-idn", "name": "symfony/polyfill-intl-idn",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-intl-idn.git", "url": "https://github.com/symfony/polyfill-intl-idn.git",
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf" "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"reference": "47bd6aa45beb1cd7c6a16b7d1810133b728bdfcf", "reference": "3bff59ea7047e925be6b7f2059d60af31bb46d6a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2781,7 +2596,7 @@ ...@@ -2781,7 +2596,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2816,34 +2631,20 @@ ...@@ -2816,34 +2631,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-mbstring", "name": "symfony/polyfill-mbstring",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-mbstring.git", "url": "https://github.com/symfony/polyfill-mbstring.git",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac" "reference": "fa79b11539418b02fc5e1897267673ba2c19419c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fa79b11539418b02fc5e1897267673ba2c19419c",
"reference": "81ffd3a9c6d707be22e3012b827de1c9775fc5ac", "reference": "fa79b11539418b02fc5e1897267673ba2c19419c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2855,7 +2656,7 @@ ...@@ -2855,7 +2656,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2889,34 +2690,20 @@ ...@@ -2889,34 +2690,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-03-09T19:04:49+00:00"
}, },
{ {
"name": "symfony/polyfill-php72", "name": "symfony/polyfill-php72",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php72.git", "url": "https://github.com/symfony/polyfill-php72.git",
"reference": "37b0976c78b94856543260ce09b460a7bc852747" "reference": "f048e612a3905f34931127360bdd2def19a5e582"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/37b0976c78b94856543260ce09b460a7bc852747", "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/f048e612a3905f34931127360bdd2def19a5e582",
"reference": "37b0976c78b94856543260ce09b460a7bc852747", "reference": "f048e612a3905f34931127360bdd2def19a5e582",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2925,7 +2712,7 @@ ...@@ -2925,7 +2712,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -2958,34 +2745,20 @@ ...@@ -2958,34 +2745,20 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/polyfill-php73", "name": "symfony/polyfill-php73",
"version": "v1.15.0", "version": "v1.17.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/polyfill-php73.git", "url": "https://github.com/symfony/polyfill-php73.git",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7" "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a760d8964ff79ab9bf057613a5808284ec852ccc",
"reference": "0f27e9f464ea3da33cbe7ca3bdf4eb66def9d0f7", "reference": "a760d8964ff79ab9bf057613a5808284ec852ccc",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2994,7 +2767,7 @@ ...@@ -2994,7 +2767,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.15-dev" "dev-master": "1.17-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -3030,21 +2803,7 @@ ...@@ -3030,21 +2803,7 @@
"portable", "portable",
"shim" "shim"
], ],
"funding": [ "time": "2020-05-12T16:47:27+00:00"
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-02-27T09:26:54+00:00"
}, },
{ {
"name": "symfony/process", "name": "symfony/process",
...@@ -3093,20 +2852,6 @@ ...@@ -3093,20 +2852,6 @@
], ],
"description": "Symfony Process Component", "description": "Symfony Process Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-15T15:56:18+00:00" "time": "2020-04-15T15:56:18+00:00"
}, },
{ {
...@@ -3183,20 +2928,6 @@ ...@@ -3183,20 +2928,6 @@
"uri", "uri",
"url" "url"
], ],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-21T19:59:53+00:00" "time": "2020-04-21T19:59:53+00:00"
}, },
{ {
...@@ -3331,20 +3062,6 @@ ...@@ -3331,20 +3062,6 @@
], ],
"description": "Symfony Translation Component", "description": "Symfony Translation Component",
"homepage": "https://symfony.com", "homepage": "https://symfony.com",
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-12T16:45:36+00:00" "time": "2020-04-12T16:45:36+00:00"
}, },
{ {
...@@ -3478,20 +3195,6 @@ ...@@ -3478,20 +3195,6 @@
"debug", "debug",
"dump" "dump"
], ],
"funding": [
{
"url": "https://symfony.com/sponsor",
"type": "custom"
},
{
"url": "https://github.com/fabpot",
"type": "github"
},
{
"url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
"type": "tidelift"
}
],
"time": "2020-04-12T16:14:02+00:00" "time": "2020-04-12T16:14:02+00:00"
}, },
{ {
...@@ -3545,20 +3248,20 @@ ...@@ -3545,20 +3248,20 @@
}, },
{ {
"name": "vlucas/phpdotenv", "name": "vlucas/phpdotenv",
"version": "v3.6.3", "version": "v3.6.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/vlucas/phpdotenv.git", "url": "https://github.com/vlucas/phpdotenv.git",
"reference": "1b3103013797f04521c6cae5560f604649484066" "reference": "8b64814b356b96a90d2bc942b152c80d8888b8d4"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1b3103013797f04521c6cae5560f604649484066", "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/8b64814b356b96a90d2bc942b152c80d8888b8d4",
"reference": "1b3103013797f04521c6cae5560f604649484066", "reference": "8b64814b356b96a90d2bc942b152c80d8888b8d4",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.4 || ^7.0", "php": "^5.4 || ^7.0 || ^8.0",
"phpoption/phpoption": "^1.5", "phpoption/phpoption": "^1.5",
"symfony/polyfill-ctype": "^1.9" "symfony/polyfill-ctype": "^1.9"
}, },
...@@ -3604,13 +3307,7 @@ ...@@ -3604,13 +3307,7 @@
"env", "env",
"environment" "environment"
], ],
"funding": [ "time": "2020-05-23T09:42:03+00:00"
{
"url": "https://tidelift.com/funding/github/packagist/vlucas/phpdotenv",
"type": "tidelift"
}
],
"time": "2020-04-12T15:18:03+00:00"
} }
], ],
"packages-dev": [ "packages-dev": [
...@@ -3841,16 +3538,16 @@ ...@@ -3841,16 +3538,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.7.1", "version": "2.7.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130" "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", "url": "https://api.github.com/repos/filp/whoops/zipball/17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
"reference": "fff6f1e4f36be0e0d0b84d66b413d9dcb0c49130", "reference": "17d0d3f266c8f925ebd035cd36f83cf802b47d4a",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3898,7 +3595,7 @@ ...@@ -3898,7 +3595,7 @@
"throwable", "throwable",
"whoops" "whoops"
], ],
"time": "2020-01-15T10:00:00+00:00" "time": "2020-05-05T12:28:07+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",
...@@ -4090,30 +3787,33 @@ ...@@ -4090,30 +3787,33 @@
}, },
{ {
"name": "mockery/mockery", "name": "mockery/mockery",
"version": "1.3.1", "version": "1.4.0",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/mockery/mockery.git", "url": "https://github.com/mockery/mockery.git",
"reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be" "reference": "6c6a7c533469873deacf998237e7649fc6b36223"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/mockery/mockery/zipball/f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "url": "https://api.github.com/repos/mockery/mockery/zipball/6c6a7c533469873deacf998237e7649fc6b36223",
"reference": "f69bbde7d7a75d6b2862d9ca8fab1cd28014b4be", "reference": "6c6a7c533469873deacf998237e7649fc6b36223",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"hamcrest/hamcrest-php": "~2.0", "hamcrest/hamcrest-php": "~2.0",
"lib-pcre": ">=7.0", "lib-pcre": ">=7.0",
"php": ">=5.6.0" "php": "^7.3.0"
},
"conflict": {
"phpunit/phpunit": "<8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0" "phpunit/phpunit": "^8.0.0 || ^9.0.0"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.3.x-dev" "dev-master": "1.4.x-dev"
} }
}, },
"autoload": { "autoload": {
...@@ -4151,7 +3851,7 @@ ...@@ -4151,7 +3851,7 @@
"test double", "test double",
"testing" "testing"
], ],
"time": "2019-12-26T09:49:15+00:00" "time": "2020-05-19T14:25:16+00:00"
}, },
{ {
"name": "myclabs/deep-copy", "name": "myclabs/deep-copy",
...@@ -4832,16 +4532,16 @@ ...@@ -4832,16 +4532,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "8.5.4", "version": "8.5.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "8474e22d7d642f665084ba5ec780626cbd1efd23" "reference": "63dda3b212a0025d380a745f91bdb4d8c985adb7"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8474e22d7d642f665084ba5ec780626cbd1efd23", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/63dda3b212a0025d380a745f91bdb4d8c985adb7",
"reference": "8474e22d7d642f665084ba5ec780626cbd1efd23", "reference": "63dda3b212a0025d380a745f91bdb4d8c985adb7",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4911,17 +4611,7 @@ ...@@ -4911,17 +4611,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"funding": [ "time": "2020-05-22T13:51:52+00:00"
{
"url": "https://phpunit.de/donate.html",
"type": "custom"
},
{
"url": "https://github.com/sebastianbergmann",
"type": "github"
}
],
"time": "2020-04-23T04:39:42+00:00"
}, },
{ {
"name": "scrivo/highlight.php", "name": "scrivo/highlight.php",
...@@ -5704,6 +5394,5 @@ ...@@ -5704,6 +5394,5 @@
"platform": { "platform": {
"php": "^7.2" "php": "^7.2"
}, },
"platform-dev": [], "platform-dev": []
"plugin-api-version": "1.1.0"
} }
resources/lang/pt-BR/validation.php
View file @ 96ffb16f
...@@ -27,6 +27,7 @@ return [ ...@@ -27,6 +27,7 @@ return [
], ],
'boolean' => ':Attribute deve ser verdadeiro ou falso.', 'boolean' => ':Attribute deve ser verdadeiro ou falso.',
'confirmed' => 'A confirmação de :attribute não confere.', 'confirmed' => 'A confirmação de :attribute não confere.',
'cpf' => 'CPF invlálido',
'date' => ':Attribute não é uma data válida.', 'date' => ':Attribute não é uma data válida.',
'date_format' => ':Attribute não confere com o formato :format.', 'date_format' => ':Attribute não confere com o formato :format.',
'different' => ':Attribute e :other devem ser diferentes.', 'different' => ':Attribute e :other devem ser diferentes.',
......
resources/views/administrador/editar_user.blade.php 0 → 100644
View file @ 96ffb16f
@extends('layouts.app')
@section('content')
<div class="container" >
<div class="row" >
<div class="col-sm-12">
<h2 style="margin-top: 100px; ">{{ __('Editar um usuário') }}</h2>
</div>
</div>
<div class="row">
<form method="POST" action="{{ route('admin.user.update', ['id' => $user->id])}}">
@csrf
<div class="col-sm-12">
<label for="nome" class="col-form-label">{{ __('Nome') }}</label>
<input id="nome" type="text" class="form-control @error('nome') is-invalid @enderror" name="nome" value="{{ $user->name }}" required autocomplete="nome" autofocus>
@error('nome')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="email" class="col-form-label">{{ __('Email') }}</label>
<input id="email" type="text" class="form-control @error('email') is-invalid @enderror" name="email" value="{{ $user->email }}" required autocomplete="email" autofocus>
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="cpf" class="col-form-label">{{ __('CPF') }}</label>
<input id="cpf" type="text" class="form-control @error('cpf') is-invalid @enderror" name="cpf" value="{{ $user->cpf }}" required autocomplete="cpf" autofocus>
@error('cpf')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="tipo" class="col-form-label">{{ __('Tipo') }}</label>
<div>
<select name="tipo" id="tipo" onchange="mudar()">
@if(auth()->user()->tipo == 'administrador')
@if ($user->tipo == 'administrador')
<option value="administrador" selected>Administrador</option>
@else
<option value="administrador">Administrador</option>
@endif
@if ($user->tipo == 'administradorResponsavel')
<option value="administradorResponsavel" selected>Administrador Responsavel</option>
@else
<option value="administradorResponsavel">Administrador Responsavel</option>
@endif
@endif
@if ($user->tipo == 'avaliador')
<option value="coordenador" selected>Coordenador</option>
@else
<option value="coordenador">Coordenador</option>
@endif
@if ($user->tipo == 'proponente')
<option value="proponente" selected>Proponente</option>
@else
<option value="proponente">Proponente</option>
@endif
@if ($user->tipo == 'participante')
<option value="participante" selected>Participante</option>
@else
<option value="participante">Participante</option>
@endif
</select>
</div>
{{-- <label for="passworld" class="col-form-label">{{ __('Senha atual') }}</label>
<input id="passworld" type="text" class="form-control @error('senha_atual') is-invalid @enderror" name="senha_atual" value="" required autocomplete="senha_atual" autofocus>
@error('senha_atual')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="new_passworld" class="col-form-label">{{ __('Nova senha') }}</label>
<input id="new_passworld" type="text" class="form-control @error('nova_senha') is-invalid @enderror" name="nova_senha" value="" required autocomplete="nova_senha" autofocus>
@error('nova_senha')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="confirm_passworld" class="col-form-label">{{ __('Confirmar nova senha') }}</label>
<input id="confirmar_passworld" type="text" class="form-control @error('confirmar_senha') is-invalid @enderror" name="confirmar_senha" value="" required autocomplete="confirmar_senha" autofocus>
@error('confirmar_senha')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror --}}
@if ($user->tipo == "proponente")
<div id="proponente" style="display: none;">
<label class="col-form-label">{{ __('SIAPE') }}</label>
<input value="{{$proponente->SIAPE}}" id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" autocomplete="SIAPE">
<label class="col-form-label">{{ __('Cargo') }}</label>
<input value="{{$proponente->cargo}}" id="cargo" type="text" class="form-control @error('cargo') is-invalid @enderror" name="cargo" autocomplete="cargo">
<label class="col-form-label">{{ __('Vinculo') }}</label>
<input value="{{$proponente->vinculo}}" id="vinculo" type="text" class="form-control @error('vinculo') is-invalid @enderror" name="vinculo" autocomplete="vinculo">
<label class="col-form-label">{{ __('Titulação Maxima') }}</label>
<input value="{{$proponente->titulacaoMaxima}}" id="titulacaoMaxima" type="text" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" autocomplete="titulacaoMaxima">
<label class="col-form-label">{{ __('Ano Titulação') }}</label>
<input value="{{$proponente->anoTitulacao}}" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao">
<label class="col-form-label">{{ __('Área') }}</label>
<input value="{{$proponente->grandeArea}}" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea">
<label class="col-form-label">{{ __('Bolsista Produtividade') }}</label>
<input value="{{$proponente->bolsistaProdutividade}}" id="bolsistaProdutividade" type="text" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" name="bolsistaProdutividade" autocomplete="bolsistaProdutividade">
<label class="col-form-label">{{ __('Nivel') }}</label>
<input value="{{$proponente->nivel}}" id="nivel" type="text" class="form-control @error('nivel') is-invalid @enderror" name="nivel" autocomplete="nivel">
<label class="col-form-label">{{ __('Link do Lattes') }}</label>
<input value="{{$proponente->linkLattes}}" id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" autocomplete="linkLattes">
</div>
@else
<div id="proponente" style="display: none;">
<label class="col-form-label">{{ __('SIAPE') }}</label>
<input value="" id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" autocomplete="SIAPE">
<label class="col-form-label">{{ __('Cargo') }}</label>
<input value="" id="cargo" type="text" class="form-control @error('cargo') is-invalid @enderror" name="cargo" autocomplete="cargo">
<label class="col-form-label">{{ __('Vinculo') }}</label>
<input value="" id="vinculo" type="text" class="form-control @error('vinculo') is-invalid @enderror" name="vinculo" autocomplete="vinculo">
<label class="col-form-label">{{ __('Titulação Maxima') }}</label>
<input value="" id="titulacaoMaxima" type="text" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" autocomplete="titulacaoMaxima">
<label class="col-form-label">{{ __('Ano Titulação') }}</label>
<input value="" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao">
<label class="col-form-label">{{ __('Área') }}</label>
<input value="" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea">
<label class="col-form-label">{{ __('Bolsista Produtividade') }}</label>
<input value="" id="bolsistaProdutividade" type="text" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" name="bolsistaProdutividade" autocomplete="bolsistaProdutividade">
<label class="col-form-label">{{ __('Nivel') }}</label>
<input value="" id="nivel" type="text" class="form-control @error('nivel') is-invalid @enderror" name="nivel" autocomplete="nivel">
<label class="col-form-label">{{ __('Link do Lattes') }}</label>
<input value="" id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" autocomplete="linkLattes">
</div>
@endif
<br>
<button type="submit" class="btn btn-primary" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
</div>
</form>
</div>
</div>
@endsection
@section('javascript')
<script>
var divProponente = document.getElementById('proponente');
var comboBoxTipo = document.getElementById('tipo');
if (comboBoxTipo.value == "proponente") {
divProponente.style.display = "inline";
} else {
divProponente.style.display = "none";
}
function mudar() {
var divProponente = document.getElementById('proponente');
var comboBoxTipo = document.getElementById('tipo');
if (comboBoxTipo.value == "proponente") {
divProponente.style.display = "inline";
} else {
divProponente.style.display = "none";
}
}
</script>
@endsection
\ No newline at end of file
resources/views/administrador/index.blade.php
View file @ 96ffb16f
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
</div> </div>
<div class="col-sm-4 d-flex justify-content-center"> <div class="col-sm-4 d-flex justify-content-center">
<a href="{{ route('admin.naturezas') }}" style="text-decoration:none; color: inherit;"> <a href="{{ route('grandearea.index') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 18rem;"> <div class="card text-center " style="border-radius: 30px; width: 18rem;">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Natureza</h2> <h2 style="padding-top:15px">Natureza</h2>
......
resources/views/administrador/novo_user.blade.php 0 → 100644
View file @ 96ffb16f
@extends('layouts.app')
@section('content')
<div class="container" >
<div class="row" >
<div class="col-sm-12">
<h2 style="margin-top: 100px; ">{{ __('Criar um usuário') }}</h2>
</div>
</div>
<br>
<form method="POST" action="{{ route('admin.user.store') }}">
@csrf
<div class="col-sm-11">
<div>
<div>
<h4>Dados do usuário</h4>
</div>
<div>
<label for="nome" class="col-form-label">{{ __('Nome') }}</label>
<input id="nome" type="text" class="form-control @error('nome') is-invalid @enderror" name="nome" value="" autocomplete="nome" autofocus>
@error('nome')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="email" class="col-form-label">{{ __('Email') }}</label>
<input id="email" type="text" class="form-control @error('email') is-invalid @enderror" name="email" value="" autocomplete="nome">
@error('email')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="cpf" class="col-form-label">{{ __('CPF') }}</label>
<input id="cpf" type="text" class="form-control @error('cpf') is-invalid @enderror" name="cpf" value="" autocomplete="nome">
@error('cpf')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<div>
<label for="tipo" class="col-form-label">{{ __('Tipo') }}</label>
<select name="tipo" id="tipo" onchange="mudar()">
@if(auth()->user()->tipo == 'administrador')
<option value="administrador">Administrador</option>
<option value="administradorResponsavel">Administrador responsavel</option>
@endif
<option value="avaliador">Avaliador</option>
<option value="proponente">Proponente</option>
<option value="participante">Participante</option>
</select>
</div>
<label for="passworld" class="col-form-label">{{ __('Senha') }}</label>
<input id="passworld" type="text" class="form-control @error('senha') is-invalid @enderror" name="senha" value="" autocomplete="nome">
@error('senha')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="passworld" class="col-form-label">{{ __('Confirmar senha') }}</label>
<input id="passworld" type="text" class="form-control @error('confirmar_senha') is-invalid @enderror" name="confirmar_senha" value="" autocomplete="nome">
</div>
</div>
<br>
<div id="proponente" style="display: none;">
<div>
<h4>Dados do proponente</h4>
</div>
<div>
<label for="SIAPE" class="col-form-label">{{ __('SIAPE') }}</label>
<input id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" value="" autocomplete="nome">
@error('SIAPE')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="cargo" class="col-form-label">{{ __('Cargo') }}</label>
<input id="cargo" type="text" class="form-control @error('cargo') is-invalid @enderror" name="cargo" value="" autocomplete="nome">
@error('cargo')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<div>
<label for="vinculo" class="col-form-label">{{ __('Vinculo') }}</label>
<select name="vinculo" id="">
<option value="Servidor na ativa">Servidor na ativa</option>
<option value="Servidor aposentado">Servidor aposentado</option>
<option value="Professor visitante">Professor visitante</option>
<option value="Pós-doutorando">Pós-doutorando</option>
</select>
</div>
<label for="titulacaoMaxima" class="col-form-label">{{ __('Titulação Maxima') }}</label>
<input id="titulacaoMaxima" type="text" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" value="" autocomplete="nome">
@error('titulacaoMaxima')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<label for="anoTitulacao" class="col-form-label">{{ __('Ano da Titulação') }}</label>
<input id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" value="" autocomplete="nome">
@error('anoTitulacao')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
<div>
<label for="area" class="col-form-label">{{ __('Área') }}</label>
<select name="area" id="">
@foreach ($grandeAreas as $area)
<option value="{{$area->nome}}">{{$area->nome}}</option>
@endforeach
</select>
</div>
<div>
<label for="bolsistaProdutividade" class="col-form-label">{{ __('Bolsista de Produtividade') }}</label><br>
<select name="bolsistaProdutividade" id="">
<option value="sim">Sim</option>
<option value="nao">Não</option>
</select>
</div>
<div>
<label for="nivel" class="col-form-label">{{ __('Nivel') }}</label>
<select name="nivel" id="">
<option value="2">2</option>
<option value="1D">1D</option>
<option value="1D">1B</option>
<option value="1D">1C</option>
<option value="1D">1A</option>
</select>
</div>
<label for="linkLattes" class="col-form-label">{{ __('Link do curriculum lattes') }}</label>
<input id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" value="" autocomplete="nome">
@error('linkLattes')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<button type="submit" class="btn btn-primary" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
</div>
</form>
</div>
@endsection
@section('javascript')
<script>
function mudar() {
var divProponente = document.getElementById('proponente');
var comboBoxTipo = document.getElementById('tipo');
if (comboBoxTipo.value == "proponente") {
divProponente.style.display = "inline";
} else {
divProponente.style.display = "none";
}
}
</script>
@endsection
\ No newline at end of file
resources/views/administrador/usersAdmin.blade.php 0 → 100644
View file @ 96ffb16f
@extends('layouts.app')
@section('content')
<div class="container" style="margin-top: 100px;">
<div class="container" >
<div class="row" >
<div class="col-sm-10">
<h3>Editais</h3>
</div>
<div class="col-sm-2">
<a href="{{route('admin.user.create')}}" class="btn btn-primary">{{ __('Criar usuário') }}</a>
</div>
</div>
<div class="row">
@if(session('mensagem'))
<div class="col-md-12" style="margin-top: 100px;">
<div class="alert alert-success">
<p>{{session('mensagem')}}</p>
</div>
</div>
@endif
</div>
</div>
<hr>
<table class="table table-bordered">
<thead>
<tr>
<th scope="col">Nome</th>
<th scope="col">Tipo</th>
<th scope="col">Data de Criação</th>
<th scope="col">Opções</th>
</tr>
</thead>
<tbody>
@foreach ($users as $user)
@if (auth()->user()->id != $user->id)
@can('isAdministrador', auth()->user())
<tr>
<td>
{{ $user->name }}
</td>
<td>{{ $user->tipo }}</td>
<td>{{ $user->creaet_at }}</td>
<td>
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</a>
<div class="dropdown-menu">
<a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
Editar
</a>
<form method="POST" action="{{route('admin.user.destroy', $user->id)}}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item">
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
Deletar
</button>
</form>
</div>
</div>
</td>
</tr>
@else
@if ($user->tipo != "administrador" && $user->tipo != "administradorResponsavel")
<tr>
<td>
{{ $user->name }}
</td>
<td>{{ $user->tipo }}</td>
<td>{{ $user->creaet_at }}</td>
<td>
<div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</a>
<div class="dropdown-menu">
<a href="{{route('admin.user.edit', $user->id)}}" class="dropdown-item">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
Editar
</a>
<form method="POST" action="{{route('admin.user.destroy', $user->id)}}">
{{ csrf_field() }}
<button type="submit" class="dropdown-item">
<img src="{{asset('img/icons/trash-alt-regular.svg')}}" class="icon-card" alt="">
Deletar
</button>
</form>
</div>
</div>
</td>
</tr>
@endif
@endcan
@endif
@endforeach
</tbody>
</table>
</div>
@endsection
@section('javascript')
<script>
</script>
@endsection
resources/views/administradorResponsavel/index.blade.php
View file @ 96ffb16f
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</div> </div>
<div class="col-sm-4 d-flex justify-content-center"> <div class="col-sm-4 d-flex justify-content-center">
<a href="{{ route('adminResp.usuarios') }}" style="text-decoration:none; color: inherit;"> <a href="{{ route('admin.usuarios') }}" style="text-decoration:none; color: inherit;">
<div class="card text-center " style="border-radius: 30px; width: 18rem;"> <div class="card text-center " style="border-radius: 30px; width: 18rem;">
<div class="card-body d-flex justify-content-center"> <div class="card-body d-flex justify-content-center">
<h2 style="padding-top:15px">Usuários</h2> <h2 style="padding-top:15px">Usuários</h2>
......
resources/views/layouts/app.blade.php
View file @ 96ffb16f
...@@ -83,14 +83,14 @@ ...@@ -83,14 +83,14 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('admin.index') }}"> <a class="dropdown-item" href="{{ route('user.perfil') }}">
<img src="{{asset('img/icons/perfil.svg')}}" alt=""> <img src="{{asset('img/icons/perfil.svg')}}" alt="">
{{ __('Minha Conta') }} {{ __('Minha Conta') }}
</a> </a>
<a class="dropdown-item" href="{{ route('user.meusTrabalhos') }}"> {{-- <a class="dropdown-item" href="{{ route('user.meusTrabalhos') }}">
<img src="{{asset('img/icons/file-alt-regular-black.svg')}}" alt=""> <img src="{{asset('img/icons/file-alt-regular-black.svg')}}" alt="">
{{ __('Participante') }} {{ __('Participante') }}
</a> </a> --}}
<a class="dropdown-item" href="{{ route('logout') }}" <a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault(); onclick="event.preventDefault();
document.getElementById('logout-form').submit();"> document.getElementById('logout-form').submit();">
...@@ -121,7 +121,6 @@ ...@@ -121,7 +121,6 @@
</li> </li>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="{{ route('admin.usuarios') }}">Usuários</a> <a class="nav-link" href="{{ route('admin.usuarios') }}">Usuários</a>
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre> <a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
...@@ -129,14 +128,14 @@ ...@@ -129,14 +128,14 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('admin.index') }}"> <a class="dropdown-item" href="{{ route('user.perfil') }}">
<img src="{{asset('img/icons/perfil.svg')}}" alt=""> <img src="{{asset('img/icons/perfil.svg')}}" alt="">
{{ __('Minha Conta') }} {{ __('Minha Conta') }}
</a> {{-- </a>
<a class="dropdown-item" href="{{ route('user.meusTrabalhos') }}"> <a class="dropdown-item" href="{{ route('user.meusTrabalhos') }}">
<img src="{{asset('img/icons/file-alt-regular-black.svg')}}" alt=""> <img src="{{asset('img/icons/file-alt-regular-black.svg')}}" alt="">
{{ __('Participante') }} {{ __('Participante') }}
</a> </a> --}}
<a class="dropdown-item" href="{{ route('logout') }}" <a class="dropdown-item" href="{{ route('logout') }}"
onclick="event.preventDefault(); onclick="event.preventDefault();
document.getElementById('logout-form').submit();"> document.getElementById('logout-form').submit();">
...@@ -171,7 +170,7 @@ ...@@ -171,7 +170,7 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('admin.index') }}"> <a class="dropdown-item" href="{{ route('user.perfil') }}">
<img src="{{asset('img/icons/perfil.svg')}}" alt=""> <img src="{{asset('img/icons/perfil.svg')}}" alt="">
{{ __('Minha Conta') }} {{ __('Minha Conta') }}
</a> </a>
...@@ -207,7 +206,7 @@ ...@@ -207,7 +206,7 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('admin.index') }}"> <a class="dropdown-item" href="{{ route('user.perfil') }}">
<img src="{{asset('img/icons/perfil.svg')}}" alt=""> <img src="{{asset('img/icons/perfil.svg')}}" alt="">
{{ __('Minha Conta') }} {{ __('Minha Conta') }}
</a> </a>
...@@ -239,7 +238,7 @@ ...@@ -239,7 +238,7 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown"> <div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
<a class="dropdown-item" href="{{ route('admin.index') }}"> <a class="dropdown-item" href="{{ route('user.perfil') }}">
<img src="{{asset('img/icons/perfil.svg')}}" alt=""> <img src="{{asset('img/icons/perfil.svg')}}" alt="">
{{ __('Minha Conta') }} {{ __('Minha Conta') }}
</a> </a>
......
resources/views/naturezas/grandeArea/index.blade.php
View file @ 96ffb16f
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
</div> </div>
@endif @endif
<div class="col-sm-9"> <div class="col-sm-9">
<h2 style="margin-top: 100px; ">{{ __('Áreas') }}</h2> <h2 style="margin-top: 100px; ">{{ __('Grandes áreas') }}</h2>
</div> </div>
<div class="col-sm-3"> <div class="col-sm-3">
<a href="{{route('grandearea.criar')}}" class="btn btn-primary" style="position:relative;top:100px;">{{ __('Criar área') }}</a> <a href="{{route('grandearea.criar')}}" class="btn btn-primary" style="position:relative;top:100px;">{{ __('Criar grande área') }}</a>
</div> </div>
</div> </div>
...@@ -31,20 +31,19 @@ ...@@ -31,20 +31,19 @@
@foreach ($grandesAreas as $grandeArea) @foreach ($grandesAreas as $grandeArea)
<tr> <tr>
<td> <td>
{{-- <a href="{{ route('grandearea.show', ['id' => $grandeArea->id ]) }}" class="visualizarEvento"> <a href="{{ route('grandearea.show', ['id' => $grandeArea->id ]) }}" class="visualizarEvento">
{{ $grandeArea->nome }} {{ $grandeArea->nome }}
</a> --}} </a>
{{ $grandeArea->nome }}
</td> </td>
<td> <td>
<div class="btn-group dropright dropdown-options"> <div class="btn-group dropright dropdown-options">
<a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <a id="options" class="dropdown-toggle " data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
</a> </a>
<div class="dropdown-menu"> <div class="dropdown-menu">
{{-- <a href="{{ route('grandearea.show', ['id' => $grandeArea->id ]) }}" class="dropdown-item"> <a href="{{ route('grandearea.show', ['id' => $grandeArea->id ]) }}" class="dropdown-item">
<img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt=""> <img src="{{asset('img/icons/eye-regular.svg')}}" class="icon-card" alt="">
Detalhes Detalhes
</a> --}} </a>
<a href="{{ route('grandearea.editar', ['id' => $grandeArea->id]) }}" class="dropdown-item"> <a href="{{ route('grandearea.editar', ['id' => $grandeArea->id]) }}" class="dropdown-item">
<img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt=""> <img src="{{asset('img/icons/edit-regular.svg')}}" class="icon-card" alt="">
Editar Editar
......
resources/views/user/perfilUser.blade.php
View file @ 96ffb16f
...@@ -67,14 +67,123 @@ ...@@ -67,14 +67,123 @@
</div> </div>
<div class="row justify-content-center">
<div class="col-md-12">
<label for="instituicao" class="col-form-label">{{ __('E-mail') }}</label>
<input value="{{$user->email}}" id="email" type="text" class="form-control @error('email') is-invalid @enderror" name="instituicao" value="{{ old('email') }}" autocomplete="email" autofocus>
@error('instituicao')
<span class="invalid-feedback" role="alert">
<strong>{{ $message }}</strong>
</span>
@enderror
</div>
</div>
<div class="row subtitulo" style="margin-top:20px"> <div class="row subtitulo" style="margin-top:20px">
<div class="col-sm-12"> <div class="col-sm-12">
<p>Endereço</p> <p>Permissões</p>
</div> </div>
</div> </div>
{{-- Endereço --}} @if (!(is_null($adminResp)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de Administrador Responsável
</div>
</div>
@else
<div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de Administrador Responsável
</div>
</div>
@endif
@if (!(is_null($avaliador)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de Aváliador
</div>
</div>
@else
<div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de Aváliador
</div>
</div>
@endif
@if (!(is_null($proponente)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de proponente
</div>
</div>
<div class="row subtitulo" style="margin-top:20px">
<div class="col-sm-12">
<p>Dados de proponente</p>
</div>
</div>
<label class="col-form-label">{{ __('SIAPE') }}</label>
<input value="{{$proponente->SIAPE}}" id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" autocomplete="SIAPE">
<label class="col-form-label">{{ __('Cargo') }}</label>
<input value="{{$proponente->cargo}}" id="cargo" type="text" class="form-control @error('cargo') is-invalid @enderror" name="cargo" autocomplete="cargo">
<label class="col-form-label">{{ __('Vinculo') }}</label>
<input value="{{$proponente->vinculo}}" id="vinculo" type="text" class="form-control @error('vinculo') is-invalid @enderror" name="vinculo" autocomplete="vinculo">
<label class="col-form-label">{{ __('Titulação Maxima') }}</label>
<input value="{{$proponente->titulacaoMaxima}}" id="titulacaoMaxima" type="text" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" autocomplete="titulacaoMaxima">
<label class="col-form-label">{{ __('Ano Titulação') }}</label>
<input value="{{$proponente->anoTitulacao}}" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao">
<label class="col-form-label">{{ __('Área') }}</label>
<input value="{{$proponente->grandeArea}}" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea">
<label class="col-form-label">{{ __('Bolsista Produtividade') }}</label>
<input value="{{$proponente->bolsistaProdutividade}}" id="bolsistaProdutividade" type="text" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" name="bolsistaProdutividade" autocomplete="bolsistaProdutividade">
<label class="col-form-label">{{ __('Nivel') }}</label>
<input value="{{$proponente->nivel}}" id="nivel" type="text" class="form-control @error('nivel') is-invalid @enderror" name="nivel" autocomplete="nivel">
<label class="col-form-label">{{ __('Link do Lattes') }}</label>
<input value="{{$proponente->linkLattes}}" id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" autocomplete="linkLattes">
<br>
@else
<div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de proponente
</div>
</div>
@endif
@if (!(is_null($participante)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de participante
</div>
</div>
@else
<div class="form-group row justify-content-center"> <div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de participante
</div>
</div>
@endif
{{-- <div class="row subtitulo" style="margin-top:20px">
<div class="col-sm-12">
<p>Endereço</p>
</div>
</div> --}}
{{-- Endereço --}}
{{-- <div class="form-group row justify-content-center">
<div class="col-md-2"> <div class="col-md-2">
<label for="cep" class="col-form-label">{{ __('CEP') }}</label> <label for="cep" class="col-form-label">{{ __('CEP') }}</label>
<input onblur="pesquisacep(this.value);" value="{{$end->cep}}" id="cep" type="text" class="form-control @error('cep') is-invalid @enderror" name="cep" required autocomplete="cep"> <input onblur="pesquisacep(this.value);" value="{{$end->cep}}" id="cep" type="text" class="form-control @error('cep') is-invalid @enderror" name="cep" required autocomplete="cep">
...@@ -133,7 +242,7 @@ ...@@ -133,7 +242,7 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label for="uf" class="col-form-label">{{ __('UF') }}</label> <label for="uf" class="col-form-label">{{ __('UF') }}</label>
{{-- <input id="uf" type="text" class="form-control @error('uf') is-invalid @enderror" name="uf" value="{{ old('uf') }}" required autocomplete="uf" autofocus> --}}
<select class="form-control @error('uf') is-invalid @enderror" id="uf" name="uf"> <select class="form-control @error('uf') is-invalid @enderror" id="uf" name="uf">
<option value="" disabled selected hidden>-- UF --</option> <option value="" disabled selected hidden>-- UF --</option>
<option @if($end->uf == 'AC') selected @endif value="AC">Acre</option> <option @if($end->uf == 'AC') selected @endif value="AC">Acre</option>
...@@ -183,7 +292,7 @@ ...@@ -183,7 +292,7 @@
{{ __('Concluir') }} {{ __('Concluir') }}
</button> </button>
</div> </div>
</div> </div> --}}
</form> </form>
</div> </div>
...@@ -256,12 +365,108 @@ ...@@ -256,12 +365,108 @@
<div class="row subtitulo" style="margin-top:20px"> <div class="row subtitulo" style="margin-top:20px">
<div class="col-sm-12"> <div class="col-sm-12">
<p>Endereço</p> <p>Permissões</p>
</div> </div>
</div> </div>
{{-- Endereço --}} @if (!(is_null($adminResp)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de Administrador Responsável
</div>
</div>
@else
<div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de Administrador Responsável
</div>
</div>
@endif
@if (!(is_null($avaliador)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de Aváliador
</div>
</div>
@else
<div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de Aváliador
</div>
</div>
@endif
@if (!(is_null($proponente)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de proponente
</div>
</div>
<div class="row subtitulo" style="margin-top:20px">
<div class="col-sm-12">
<p>Dados de proponente</p>
</div>
</div>
<label class="col-form-label">{{ __('SIAPE') }}</label>
<input value="{{$proponente->SIAPE}}" id="SIAPE" type="text" class="form-control @error('SIAPE') is-invalid @enderror" name="SIAPE" autocomplete="SIAPE">
<label class="col-form-label">{{ __('Cargo') }}</label>
<input value="{{$proponente->cargo}}" id="cargo" type="text" class="form-control @error('cargo') is-invalid @enderror" name="cargo" autocomplete="cargo">
<label class="col-form-label">{{ __('Vinculo') }}</label>
<input value="{{$proponente->vinculo}}" id="vinculo" type="text" class="form-control @error('vinculo') is-invalid @enderror" name="vinculo" autocomplete="vinculo">
<label class="col-form-label">{{ __('Titulação Maxima') }}</label>
<input value="{{$proponente->titulacaoMaxima}}" id="titulacaoMaxima" type="text" class="form-control @error('titulacaoMaxima') is-invalid @enderror" name="titulacaoMaxima" autocomplete="titulacaoMaxima">
<label class="col-form-label">{{ __('Ano Titulação') }}</label>
<input value="{{$proponente->anoTitulacao}}" id="anoTitulacao" type="text" class="form-control @error('anoTitulacao') is-invalid @enderror" name="anoTitulacao" autocomplete="anoTitulacao">
<label class="col-form-label">{{ __('Área') }}</label>
<input value="{{$proponente->grandeArea}}" id="grandeArea" type="text" class="form-control @error('grandeArea') is-invalid @enderror" name="grandeArea" autocomplete="grandeArea">
<label class="col-form-label">{{ __('Bolsista Produtividade') }}</label>
<input value="{{$proponente->bolsistaProdutividade}}" id="bolsistaProdutividade" type="text" class="form-control @error('bolsistaProdutividade') is-invalid @enderror" name="bolsistaProdutividade" autocomplete="bolsistaProdutividade">
<label class="col-form-label">{{ __('Nivel') }}</label>
<input value="{{$proponente->nivel}}" id="nivel" type="text" class="form-control @error('nivel') is-invalid @enderror" name="nivel" autocomplete="nivel">
<label class="col-form-label">{{ __('Link do Lattes') }}</label>
<input value="{{$proponente->linkLattes}}" id="linkLattes" type="text" class="form-control @error('linkLattes') is-invalid @enderror" name="linkLattes" autocomplete="linkLattes">
<br>
@else
<div class="form-group row justify-content-center"> <div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de proponente
</div>
</div>
@endif
@if (!(is_null($participante)))
<div class="form-group row justify-content-center">
<div class="col-md-12">
Tem pemissão de participante
</div>
</div>
@else
<div class="form-group row justify-content-center">
<div class="col-md-12">
Não tem pemissão de participante
</div>
</div>
@endif
{{-- <div class="row subtitulo" style="margin-top:20px">
<div class="col-sm-12">
<p>Endereço</p>
</div>
</div> --}}
{{-- Endereço --}}
{{-- <div class="form-group row justify-content-center">
<div class="col-md-2"> <div class="col-md-2">
<label for="cep" class="col-form-label">{{ __('CEP') }}</label> <label for="cep" class="col-form-label">{{ __('CEP') }}</label>
<input onblur="pesquisacep(this.value);" value="{{old('cep')}}" id="cep" type="text" class="form-control @error('cep') is-invalid @enderror" name="cep" required autocomplete="cep"> <input onblur="pesquisacep(this.value);" value="{{old('cep')}}" id="cep" type="text" class="form-control @error('cep') is-invalid @enderror" name="cep" required autocomplete="cep">
...@@ -320,7 +525,6 @@ ...@@ -320,7 +525,6 @@
</div> </div>
<div class="col-sm-4"> <div class="col-sm-4">
<label for="uf" class="col-form-label">{{ __('UF') }}</label> <label for="uf" class="col-form-label">{{ __('UF') }}</label>
{{-- <input id="uf" type="text" class="form-control @error('uf') is-invalid @enderror" name="uf" value="{{ old('uf') }}" required autocomplete="uf" autofocus> --}}
<select class="form-control @error('uf') is-invalid @enderror" id="uf" name="uf"> <select class="form-control @error('uf') is-invalid @enderror" id="uf" name="uf">
<option value="" disabled selected hidden>-- UF --</option> <option value="" disabled selected hidden>-- UF --</option>
<option value="AC">Acre</option> <option value="AC">Acre</option>
...@@ -370,7 +574,7 @@ ...@@ -370,7 +574,7 @@
{{ __('Concluir') }} {{ __('Concluir') }}
</button> </button>
</div> </div>
</div> </div> --}}
</form> </form>
</div> </div>
......
routes/web.php
View file @ 96ffb16f
...@@ -42,7 +42,14 @@ Route::post('/perfil','UserController@editarPerfil')->name('perfil')->middleware ...@@ -42,7 +42,14 @@ Route::post('/perfil','UserController@editarPerfil')->name('perfil')->middleware
// Rotas Administrador // Rotas Administrador
Route::get('/home-admin', 'AdministradorController@index')->middleware('checkAdministrador')->name('admin.index'); Route::get('/home-admin', 'AdministradorController@index')->middleware('checkAdministrador')->name('admin.index');
Route::get('/usuarios', 'AdministradorController@usuarios')->middleware('checkAdministrador')->name('admin.usuarios'); Route::get('/usuarios', 'AdministradorController@usuarios')->middleware('checkAdminResp')->name('admin.usuarios');
Route::get('/perfil-usuario', 'UserController@minhaConta')->middleware('auth')->name('user.perfil');
//Rotas da administração dos usuários
Route::get('/usuarios/novo', 'AdministradorController@create')->middleware('checkAdminResp')->name('admin.user.create');
Route::post('/usuarios/salvar-novo', 'AdministradorController@salvar')->middleware('checkAdminResp')->name('admin.user.store');
Route::get('/usuarios/editar/{id}', 'AdministradorController@edit')->middleware('checkAdminResp')->name('admin.user.edit');
Route::post('/usuarios/editar/atualizar/{id}', 'AdministradorController@update')->middleware('checkAdminResp')->name('admin.user.update');
Route::post('/usuarios/editar/deletar/{id}', 'AdministradorController@destroy')->middleware('checkAdminResp')->name('admin.user.destroy');
Route::get('admin/editais', 'AdministradorController@editais')->middleware('checkAdministrador')->name('admin.editais'); Route::get('admin/editais', 'AdministradorController@editais')->middleware('checkAdministrador')->name('admin.editais');
// Rotas de administrador responsavel (Reitor ou pro-reitor) // Rotas de administrador responsavel (Reitor ou pro-reitor)
......
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