Skip to content

GitLab

Unverified Commit 31dfd106 authored by carlos1270's avatar carlos1270 Committed by GitHub
Browse files

Merge pull request #111 from lmts-ufape/modificacoes_layout_minha_conta 

Modificacoes layout minha conta
parents 05144b8d 7b7d1a9b
Expand all Show whitespace changes
Inline Side-by-side
Showing
with 404 additions and 17 deletions
+404 -17
app/Http/Controllers/UserController.php
View file @ 31dfd106
...@@ -67,7 +67,7 @@ class UserController extends Controller ...@@ -67,7 +67,7 @@ class UserController extends Controller
} else { } else {
$validated = $request->validate([ $validated = $request->validate([
'name' => ['required', 'string', 'max:255'], 'name' => ['required', 'string', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255'], //'email' => ['required', 'string', 'email', 'max:255'],
'cpf' => ['required', 'cpf'], 'cpf' => ['required', 'cpf'],
'celular' => ['required', 'string'], 'celular' => ['required', 'string'],
'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'], 'instituicao' => ['required_if:instituicaoSelect,Outra', 'max:255'],
...@@ -84,10 +84,11 @@ class UserController extends Controller ...@@ -84,10 +84,11 @@ class UserController extends Controller
'bolsistaProdutividade' => ['required_with:titulacaoMaxima,anoTitulacao,areaFormacao,linkLattes'], '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')), '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' => ['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' => ['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') ? 'required':''],
'linkLattes' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'link_lattes':''], 'linkLattes' => [(isset($request['cargo']) && $request['cargo'] !== 'Estudante') || (isset($request['cargo']) && $request['cargo'] === 'Estudante' && isset($request['vinculo']) && $request['vinculo'] === 'Pós-doutorando') ? 'link_lattes':''],
]); ]);
} }
...@@ -99,6 +100,7 @@ class UserController extends Controller ...@@ -99,6 +100,7 @@ class UserController extends Controller
if (!($request->nova_senha === $request->confirmar_senha)) { if (!($request->nova_senha === $request->confirmar_senha)) {
return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']); return redirect()->back()->withErrors(['nova_senha' => 'Senhas diferentes']);
} }
} }
if(Auth()->user()->avaliadors != null && $request->area != null && Auth()->user()->tipo != "avaliador"){ if(Auth()->user()->avaliadors != null && $request->area != null && Auth()->user()->tipo != "avaliador"){
$avaliador = Avaliador::where('user_id', '=', $id)->first(); $avaliador = Avaliador::where('user_id', '=', $id)->first();
...@@ -160,7 +162,7 @@ class UserController extends Controller ...@@ -160,7 +162,7 @@ class UserController extends Controller
$user->name = $request->name; $user->name = $request->name;
$user->tipo = $request->tipo; $user->tipo = $request->tipo;
$user->email = $request->email; // $user->email = $request->email;
$user->cpf = $request->cpf; $user->cpf = $request->cpf;
$user->celular = $request->celular; $user->celular = $request->celular;
if ($request->instituicao != null) { if ($request->instituicao != null) {
...@@ -173,6 +175,7 @@ class UserController extends Controller ...@@ -173,6 +175,7 @@ class UserController extends Controller
$user->password = bcrypt($request->nova_senha); $user->password = bcrypt($request->nova_senha);
} }
$user->update(); $user->update();
return redirect( route('user.perfil') )->with(['mensagem' => 'Dados atualizados com sucesso.']); return redirect( route('user.perfil') )->with(['mensagem' => 'Dados atualizados com sucesso.']);
......
app/Proponente.php
View file @ 31dfd106
...@@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model; ...@@ -6,6 +6,8 @@ use Illuminate\Database\Eloquent\Model;
class Proponente extends Model class Proponente extends Model
{ {
protected $fillable = ['SIAPE', 'cargo','vinculo','titulacaoMaxima','anoTitulacao','areaFormacao','bolsistaProdutividade','nivel','linkLattes'];
public function user(){ public function user(){
return $this->belongsTo('App\User'); return $this->belongsTo('App\User');
} }
......
public/css/layout.css
View file @ 31dfd106
...@@ -498,3 +498,10 @@ button.close { ...@@ -498,3 +498,10 @@ button.close {
margin-right:10px; 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
public/img/icons/icon_editais.png 0 → 100644
View file @ 31dfd106
public/img/icons/icon_editais.png

4.73 KB

public/img/icons/icon_pasta_cheia.png 0 → 100644
View file @ 31dfd106
public/img/icons/icon_pasta_cheia.png

6.43 KB

public/img/icons/icon_pasta_vazia.png 0 → 100644
View file @ 31dfd106
public/img/icons/icon_pasta_vazia.png

5.94 KB

resources/views/evento/formulario/participantes.blade.php
View file @ 31dfd106
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-1"> <div class="col-1" style="margin-top:4.3px">
<button type="button" class="btn btn-danger" id="buttonRemover" onclick="removerPart(this)" >X</button> <button type="button" class="btn btn-danger shadow-sm" id="buttonRemover" onclick="removerPart(this)" >X</button>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="collapse" id="collapseParticipante"> <div class="collapse" id="collapseParticipante">
......
resources/views/evento/submeterTrabalho.blade.php
View file @ 31dfd106
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
</div> </div>
</a> </a>
</div> </div>
<div class="col-1"> <div class="col-1" style="margin-top:4.3px">
<button type="button" class="btn btn-danger" id="buttonRemover" onclick="removerPart(this)" >X</button> <button type="button" class="btn btn-danger shadow-sm" id="buttonRemover" onclick="removerPart(this)" >X</button>
</div> </div>
<div class="col-md-12"> <div class="col-md-12">
<div class="collapse" id="collapseParticipante"> <div class="collapse" id="collapseParticipante">
......
resources/views/layouts/app.blade.php
View file @ 31dfd106
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
<div><a href="https://www.facebook.com/LMTSUFAPE/" target="_blank"><img src="{{ asset('img/icons/icon_facebook.svg') }}" alt="Logo" width="40px;" style="margin:5px"></a></div> <div><a href="https://www.facebook.com/LMTSUFAPE/" target="_blank"><img src="{{ asset('img/icons/icon_facebook.svg') }}" alt="Logo" width="40px;" style="margin:5px"></a></div>
<div><a href="https://www.instagram.com/lmts_ufape/" target="_blank"><img src="{{ asset('img/icons/icon_instagram.svg') }}" alt="Logo" width="40px;" style="margin:5px"></a></div> <div><a href="https://www.instagram.com/lmts_ufape/" target="_blank"><img src="{{ asset('img/icons/icon_instagram.svg') }}" alt="Logo" width="40px;" style="margin:5px"></a></div>
</div> </div>
<div><img src="{{ asset('img/icons/icon_email.svg') }}" alt="Logo" width="20px;" style="margin:5px;"> <span>lmts@ufrpe.br</span></div> <div><img src="{{ asset('img/icons/icon_email.svg') }}" alt="Logo" width="20px;" style="margin:5px;"> <span>lmts@ufape.br</span></div>
</div> </div>
</div> </div>
</div> </div>
......
resources/views/proponente/index.blade.php
View file @ 31dfd106
...@@ -2,8 +2,36 @@ ...@@ -2,8 +2,36 @@
@section('content') @section('content')
<div class="container"> <div class="container" style="margin-bottom:8rem">
<div class="row justify-content-center" style="margin-top: 2rem;">
<div class="col-md-12 form-group" style="text-align: center">
<h5 style="color: #1492E6; margin-top:0.5rem; font-size:25px">Página inicial</h5>
<h5 style="color: #909090; margin-top:0.7rem; font-size:22px; font-weight:normal">Proponente</h5>
</div>
<div class="" style="text-align: center">
<div class="form-group imagem_shadow" style="border-radius: 12px; padding:14px; height:200px; width:190px; margin:15px">
<a href="{{route('coord.home')}}" style="text-decoration:none; color: inherit;">
<img src="{{asset('img/icons/icon_editais.png')}}" alt="" width="120px">
<h5 style="color: #073763; margin-top:0.5rem; font-size:25px;">Editais</h5>
</a>
</div>
</div>
<div class="" style="text-align: center">
<div class="form-group imagem_shadow" style="border-radius: 12px; padding:14px; height:200px; width:250px; margin:15px">
<a href="{{ route('proponente.projetos')}}" style="text-decoration:none; color: inherit;">
@if(\App\Trabalho::where('proponente_id', auth()->user()->proponentes->id)->count() > 0)
<img src="{{asset('img/icons/icon_pasta_cheia.png')}}" alt="" width="140px" style="margin-top: 45px; -webkit-filter: drop-shadow(5px 5px 5px rgb(206, 206, 206)); filter: drop-shadow(5px 5px 5px rgb(206, 206, 206));">
@else
<img src="{{asset('img/icons/icon_pasta_vazia.png')}}" alt="" width="140px" style="margin-top: 45px; -webkit-filter: drop-shadow(5px 5px 5px rgb(206, 206, 206)); filter: drop-shadow(5px 5px 5px rgb(206, 206, 206));">
@endif
<h5 style="color: #073763; margin-top:0.5rem; font-size:25px">Minhas propostas</h5>
</a>
</div>
</div>
</div>
</div>
<!--
<div class="row justify-content-center titulo-menu"> <div class="row justify-content-center titulo-menu">
<h4>Página Principal - Proponente</h4> <h4>Página Principal - Proponente</h4>
</div> </div>
...@@ -95,5 +123,5 @@ ...@@ -95,5 +123,5 @@
</div> --}} </div> --}}
</div> </div>
</div> </div>
-->
@endsection @endsection
resources/views/proponente/projetos.blade.php
View file @ 31dfd106
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<form action="{{route('proponente.projetos')}}" method="get"> <form action="{{route('proponente.projetos')}}" method="get">
@csrf @csrf
<div class="btn-group"> <div class="btn-group">
<input type="text" class="form-control" name="buscar" placeholder="Digite o nome do edital" value="{{$busca}}" style="margin-right: 5px;border-radius:8px; border-color:#dcdcdc;"> <input type="text" class="form-control" name="buscar" placeholder="Pesquisar propostas" value="{{$busca}}" style="margin-right: 5px;border-radius:8px; border-color:#dcdcdc;">
<button type="submit" class="btn btn-light shadow-sm" style="border-radius: 8px; margin-right:3px"><img src="{{asset('img/icons/logo_lupa.png')}}" alt="" width="20px"></button> <button type="submit" class="btn btn-light shadow-sm" style="border-radius: 8px; margin-right:3px"><img src="{{asset('img/icons/logo_lupa.png')}}" alt="" width="20px"></button>
</div> </div>
</form> </form>
......
resources/views/user/perfilUser.blade.php
View file @ 31dfd106
This diff is collapsed.
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