criando usuario como adm

app/Http/Controllers/AdministradorController.php

@@ -4,6 +4,13 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 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;
 
 class AdministradorController extends Controller
@@ -17,8 +24,8 @@ class AdministradorController extends Controller
     	return view('naturezas.index');
     }
     public function usuarios(){
-
-    	return view('administrador.usuarios');
+        $users = User::orderBy('name')->get();
+    	return view('administrador.usersAdmin')->with(['users' => $users]);
     }
 
     public function editais(){
@@ -28,4 +35,143 @@ class AdministradorController extends Controller
 
     	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);
+        return view ('administrador.editar_user')->with(['user' => $user]);
+    }
+
+    public function update(Request $request, $id) {
+        $user = User::find($id);
+
+        $validated = $request->validate([
+            'nome' => 'required',
+            'tipo' => 'required',
+            'email' => 'required',
+            'nova_senha' => 'required',
+            'senha_atual' => 'required',
+            'confirmar_senha' => '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']);
+        }
+
+        $user->name = $request->nome;
+        $user->tipo = $request->tipo;
+        $user->email = $request->email;
+        $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/Providers/AppServiceProvider.php

@@ -3,6 +3,7 @@
 namespace App\Providers;
 
 use Illuminate\Support\ServiceProvider;
+use Illuminate\Support\Facades\Validator;
 
 class AppServiceProvider extends ServiceProvider
 {
@@ -23,6 +24,6 @@ class AppServiceProvider extends ServiceProvider
      */
     public function boot()
     {
-        //
+        Validator::extend('cpf', '\App\Utils\CpfValidation@validate');
     }
 }

app/Utils/CpfValidation.php

+<?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

resources/lang/pt-BR/validation.php

@@ -27,6 +27,7 @@ return [
     ],
     'boolean'              => ':Attribute deve ser verdadeiro ou falso.',
     'confirmed'            => 'A confirmação de :attribute não confere.',
+    'cpf'                  => 'CPF invlálido',
     'date'                 => ':Attribute não é uma data válida.',
     'date_format'          => ':Attribute não confere com o formato :format.',
     'different'            => ':Attribute e :other devem ser diferentes.',

resources/views/administrador/editar_user.blade.php

+@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="nome" autofocus>
+
+                @error('email')
+                <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="">
+                        <option value="{{$user->tipo}}">{{$user->tipo}}<option>
+                        <option value="administrador">administrador</option>
+                        <option value="administradorResponsavel">administradorResponsavel</option>
+                        <option value="coordenador">coordenador</option>
+                        <option value="proponente">proponente</option>
+                        <option value="participante">participante</option>
+                    </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="nome" 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="nome" 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="nome" autofocus>
+
+                @error('confirmar_senha')
+                <span class="invalid-feedback" role="alert">
+                    <strong>{{ $message }}</strong>
+                </span>
+                @enderror
+
+                <button type="submit" class="btn btn-primary" style="position:relative;top:10px;">{{ __('Salvar') }}</button>
+            </div>
+        </form>
+    </div>
+</div>
+
+@endsection
\ No newline at end of file

resources/views/administrador/index.blade.php

@@ -19,7 +19,7 @@
 	      </div>
 
 	      <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-body d-flex justify-content-center">
 	                  <h2 style="padding-top:15px">Natureza</h2>

resources/views/administrador/novo_user.blade.php

+@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()">
+                            <option value="administrador">Administrador</option>
+                            <option value="administradorResponsavel">Administrador responsavel</option>
+                            <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

+@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)
+        <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
+      @endforeach
+    </tbody>
+  </table>
+</div>
+
+@endsection
+
+@section('javascript')
+<script>
+  
+</script>
+@endsection

routes/web.php

@@ -43,6 +43,12 @@ Route::post('/perfil','UserController@editarPerfil')->name('perfil')->middleware
 // Rotas Administrador
 Route::get('/home-admin', 'AdministradorController@index')->middleware('checkAdministrador')->name('admin.index');
 Route::get('/usuarios', 'AdministradorController@usuarios')->middleware('checkAdministrador')->name('admin.usuarios');
+  //Rotas da administração dos usuários
+Route::get('/usuarios/novo', 'AdministradorController@create')->middleware('checkAdministrador')->name('admin.user.create');
+Route::post('/usuarios/salvar-novo', 'AdministradorController@salvar')->middleware('checkAdministrador')->name('admin.user.store');
+Route::get('/usuarios/editar/{id}', 'AdministradorController@edit')->middleware('checkAdministrador')->name('admin.user.edit');
+Route::post('/usuarios/editar/atualizar/{id}', 'AdministradorController@update')->middleware('checkAdministrador')->name('admin.user.update');
+Route::post('/usuarios/editar/deletar/{id}', 'AdministradorController@destroy')->middleware('checkAdministrador')->name('admin.user.destroy');
 Route::get('admin/editais', 'AdministradorController@editais')->middleware('checkAdministrador')->name('admin.editais');
 
 // Rotas de administrador responsavel (Reitor ou pro-reitor)