diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 96576498766a0a084f7530c103213ac775b1799d..405378f9895609dd8b7c3189f72c50bc0aec92d8 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -67,7 +67,7 @@ class UserController extends Controller } else { $validated = $request->validate([ 'name' => ['required', 'string', 'max:255'], - 'email' => ['required', 'string', 'email', 'max:255'], + //'email' => ['required', 'string', 'email', 'max:255'], 'cpf' => ['required', 'cpf'], 'celular' => ['required', 'string'], 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], @@ -84,11 +84,12 @@ class UserController extends Controller 'bolsistaProdutividade' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,linkLattes'], 'bolsistaProdutividade' => Rule::requiredIf((isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando')), 'nivel' => ['required_if:bolsistaProdutividade,sim'], - //'nivel' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'required':''], + // 'nivel' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'required':''], 'linkLattes' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,bolsistaProdutividade'], 'linkLattes' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'required':''], 'linkLattes' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'link_lattes':''], - ]); + + ]); } if ($request->alterarSenhaCheckBox != null) { @@ -99,6 +100,7 @@ class UserController extends Controller if (!($request->nova_senha === $request->confirmar_senha)) { return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']); } + } if(Auth()->user()->avaliadors != null && $request->area != null && Auth()->user()->tipo != "avaliador"){ $avaliador = Avaliador::where('user_id', '=', $id)->first(); @@ -160,7 +162,7 @@ class UserController extends Controller $user->name = $request->name; $user->tipo = $request->tipo; - $user->email = $request->email; + // $user->email = $request->email; $user->cpf = $request->cpf; $user->celular = $request->celular; if ($request->instituicao != null) { @@ -173,6 +175,7 @@ class UserController extends Controller $user->password = bcrypt($request->nova_senha); } + $user->update(); return redirect( route('user.perfil') )->with(['mensagem' => 'Dados atualizados com sucesso.']); diff --git a/app/Proponente.php b/app/Proponente.php index 9007c88dec94163eddf41181c82b7f79dedbaf3e..3a4f9de5bb7566bcde8386237a961b8b2cd5d230 100644 --- a/app/Proponente.php +++ b/app/Proponente.php @@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model; class Proponente extends Model { + protected $fillable = ['SIAPE', 'cargo','vinculo','titulacaoMaxima','anoTitulacao','areaFormacao','bolsistaProdutividade','nivel','linkLattes']; + public function user(){ return $this->belongsTo('App\User'); } diff --git a/public/css/layout.css b/public/css/layout.css index 0af735b4d6810740fdbce972797974389d95398c..d7946c40a0da4e50c95ab8ea4fcdf40e943d7fd2 100644 --- a/public/css/layout.css +++ b/public/css/layout.css @@ -497,4 +497,11 @@ button.close { display: block; margin-right:10px; } +} +.imagem_shadow{ + transition: -webkit-filter 0.5s; +} +.imagem_shadow:hover{ + -webkit-filter: drop-shadow(5px 5px 5px rgb(206, 206, 206)); filter: drop-shadow(5px 5px 5px rgb(206, 206, 206)); + } \ No newline at end of file diff --git a/public/img/icons/icon_editais.png b/public/img/icons/icon_editais.png new file mode 100644 index 0000000000000000000000000000000000000000..27258d860bcf9f83381d02180753d6546732f55f Binary files /dev/null and b/public/img/icons/icon_editais.png differ diff --git a/public/img/icons/icon_pasta_cheia.png b/public/img/icons/icon_pasta_cheia.png new file mode 100644 index 0000000000000000000000000000000000000000..e1a0b51187e18180fe6864fd7ec1b3bfeeb21871 Binary files /dev/null and b/public/img/icons/icon_pasta_cheia.png differ diff --git a/public/img/icons/icon_pasta_vazia.png b/public/img/icons/icon_pasta_vazia.png new file mode 100644 index 0000000000000000000000000000000000000000..00ad69189a39ead862b39193966c56c70669cebb Binary files /dev/null and b/public/img/icons/icon_pasta_vazia.png differ diff --git a/resources/views/evento/formulario/participantes.blade.php b/resources/views/evento/formulario/participantes.blade.php index 1ab8b3df26a3e2e81034ec5ab776a62df0de100a..25953a0dbf699304af99dbb02d265a3e4ceae292 100644 --- a/resources/views/evento/formulario/participantes.blade.php +++ b/resources/views/evento/formulario/participantes.blade.php @@ -26,8 +26,8 @@ -
- +
+
diff --git a/resources/views/evento/submeterTrabalho.blade.php b/resources/views/evento/submeterTrabalho.blade.php index 392e3a4ed78dbe027467ea0e5f6802630176e871..1b2029b83b16eef89e5b5c15db2ea0c9639577ce 100644 --- a/resources/views/evento/submeterTrabalho.blade.php +++ b/resources/views/evento/submeterTrabalho.blade.php @@ -38,8 +38,8 @@
-
- +
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 710385c2f37626446c72edf43d25d1d6d4e8fc01..7aa09e876e6ab6eb654c93b08e333188cd1f77ea 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -273,7 +273,7 @@
Logo
Logo
-
Logo lmts@ufrpe.br
+
Logo lmts@ufape.br
diff --git a/resources/views/proponente/index.blade.php b/resources/views/proponente/index.blade.php index c87137418ba072da072168be8b74e0cd625430b1..9557013d8363d6cc58306e0b94db536c23124057 100644 --- a/resources/views/proponente/index.blade.php +++ b/resources/views/proponente/index.blade.php @@ -2,8 +2,36 @@ @section('content') -
+
+
+
+
Página inicial
+
Proponente
+
+
+
+ + +
Editais
+ +
+
+
+
+ + @if(\App\Trabalho::where('proponente_id', auth()->user()->proponentes->id)->count() > 0) + + @else + + @endif +
Minhas propostas
+ +
+
+
+
+ @endsection diff --git a/resources/views/proponente/projetos.blade.php b/resources/views/proponente/projetos.blade.php index ca84f1dde1a23125fe6ff0df9d830bd9d21d04e6..93309d93993bff7a3826f14b0d45e00c58ee40be 100644 --- a/resources/views/proponente/projetos.blade.php +++ b/resources/views/proponente/projetos.blade.php @@ -43,7 +43,7 @@
@csrf
- +
diff --git a/resources/views/user/perfilUser.blade.php b/resources/views/user/perfilUser.blade.php index 7a7fac94e40394a48a700d8cf1bc333439fc5fd3..bf78eda3fcd5fecc6b9e1bbf6b26b34403353ea5 100644 --- a/resources/views/user/perfilUser.blade.php +++ b/resources/views/user/perfilUser.blade.php @@ -2,6 +2,353 @@ @section('content') +
+
+ @csrf + + + + @if(session('mensagem')) +
+
+

{{session('mensagem')}}

+
+
+ @endif + +
+
+
+
+
+
Meus dados
+
* Campos obrigatórios
+
+
+
+
+
+
+
Informações pessoais
+
+
+
+
+ + + + @error('name') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('cpf') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('celular') + + {{ $message }} + + @enderror +
+
+
+
+
Instituição
+
+
+
+
+ + + + @error('instituicaoSelect') + + {{ $message }} + + @enderror +
+
+ +
+
+ + + + @error('cargo') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('vinculo') + + {{ $message }} + + @enderror +
+
+ +
+
+
+
+ + + + @error('titulacaoMaxima') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('anoTitulacao') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('areaFormacao') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('SIAPE') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('linkLattes') + + {{ $message }} + + @enderror +
+
+
+
+
+ + @error('bolsistaProdutividade') + + {{ $message }} + + @enderror +
+
+
+ @if ($proponente->bolsistaProdutividade =='sim') +
+ + + @error('nivel') + + {{ $message }} + + @enderror +
+ @else + + @endif +
+
+
+
+
+
Acesso ao sistema
+
+ + +
+
+
+
+
+ + +
+
+
+
+ + + + @error('senha_atual') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('nova_senha') + + {{ $message }} + + @enderror +
+
+
+
+ + + + @error('confirmar_senha') + + {{ $message }} + + @enderror +
+
+
+
+
+
+ Cancelar +
+
+ +
+
+
+
+
+
+
+
+
+
+ @endsection @section('javascript')