add correções de estilização

app/Http/Controllers/CampusController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Campus;
 use App\Models\Unidade;
+use App\Models\Util\Menu;
 use App\Queries\CampusQuery;
 use Illuminate\Http\Request;
 use App\Models\Util\MenuItemsAdmin;
@@ -22,7 +23,7 @@ class CampusController extends Controller
         $campus = Campus::all();
         
         return view('campus.index', [
-            'index_menu' => MenuItemsAdmin::CAMPUS,
+            'menu' => Menu::CAMPUS,
             'campus' =>  $campus
         ]);
     }
@@ -36,7 +37,7 @@ class CampusController extends Controller
     {
         return view('campus.create', [
             'unidades' => Unidade::all(),
-            'index_menu' => MenuItemsAdmin::CAMPUS,
+            'menu' => Menu::CAMPUS,
         ]);
     }
 
@@ -82,7 +83,7 @@ class CampusController extends Controller
         $campus = Campus::findOrFail($id);
         return view('campus.update', [
             'unidades' => Unidade::all(),
-            'index_menu' => MenuItemsAdmin::CAMPUS,
+            'menu' => Menu::CAMPUS,
             'campus' => $campus,
         ]);
     }

app/Http/Controllers/CursoController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\Campus;
 use App\Models\Curso;
 use App\Models\Unidade;
+use App\Models\Util\Menu;
 use App\Models\Util\MenuItemsAdmin;
 use Illuminate\Http\Request;
 
@@ -26,7 +27,7 @@ class CursoController extends Controller
 
         return view('curso.index', [
             'campusWithCursos' => $campusWithCursos,
-            'index_menu' => MenuItemsAdmin::CURSOS
+            'menu' => Menu::CURSOS
         ]);
     }
 
@@ -41,7 +42,7 @@ class CursoController extends Controller
 
         return view('curso.create', [
             'allCampus' => $allCampus,
-            'index_menu' => MenuItemsAdmin::CURSOS
+            'menu' => Menu::CURSOS
         ]);
     }
 
@@ -87,7 +88,7 @@ class CursoController extends Controller
         $curso = Curso::findOrFail($id);
         return view('curso.update', [
             'allCampus' => Campus::all(),
-            'index_menu' => MenuItemsAdmin::CURSOS,
+            'menu' => Menu::CURSOS,
             'curso' => $curso,
         ]);
     }

app/Http/Controllers/DashboardController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Models\PAD;
 use App\Models\Tabelas\Constants;
 use App\Models\UserPad;
+use App\Models\Util\Menu;
 use App\Models\Util\MenuItemsAdmin;
 use App\Models\Util\MenuItemsTeacher;
 use App\Models\Util\Status;
@@ -21,7 +22,7 @@ class DashboardController extends Controller
 
         if($user->isTypeAdmin())
         {
-            return view('dashboard',['menu_index' => MenuItemsAdmin::HOME]);
+            return view('dashboard',['menu' => Menu::HOME]);
         }
 
         if($user->isTypeTeacher())
@@ -32,17 +33,17 @@ class DashboardController extends Controller
                     ->wherePadStatus(Status::ATIVO)
                     ->get();
 
-            return view('dashboard', ['userPads' => $userPads, 'menu_index'=> MenuItemsTeacher::HOME]);
+            return view('dashboard', ['userPads' => $userPads, 'menu'=> Menu::HOME]);
         }
         
         if($user->isTypeDirector())
         {
-            return view('dashboard', ['PADs' => PAD::all(), 'menu_index'=> 0]);
+            return view('dashboard', ['PADs' => PAD::all(), 'menu'=> Menu::HOME]);
         }
 
         if($user->isTypeCoordinator())
         {
-            return view('dashboard', ['PADs' => PAD::all(), 'menu_index'=> 0]);
+            return view('dashboard', ['PADs' => PAD::all(), 'menu'=> Menu::HOME]);
         } 
 
         if($user->isTypeEvaluator())
@@ -53,7 +54,7 @@ class DashboardController extends Controller
                     ->wherePadStatus(Status::ATIVO)
                     ->get();
 
-            return view('dashboard', ['userPads' => $userPads, 'menu_index'=> MenuItemsTeacher::HOME]);
+            return view('dashboard', ['userPads' => $userPads, 'menu'=> Menu::HOME]);
         }
 
         //return redirect()->route('login');

app/Http/Controllers/PadController.php

@@ -9,6 +9,7 @@ use App\Models\Tabelas\Constants;
 use App\Models\User;
 use App\Models\UserPad;
 use App\Models\UserType;
+use App\Models\Util\Menu;
 use App\Models\Util\MenuItemsAdmin;
 use App\Models\Util\MenuItemsTeacher;
 use App\Models\Util\Status;
@@ -27,19 +28,19 @@ class PadController extends Controller
      * @return \Illuminate\View\View
      */
     public function index()
-    {
+    {   
         if(Auth::user()->isTypeAdmin()) {
             $pads = Pad::all();
-            $index_menu = MenuItemsAdmin::PADS;
-            return view('pad.admin.index', ['index_menu' => $index_menu, 'pads' => $pads]);
+            $menu = Menu::PADS;
+            return view('pad.admin.index', ['menu' => $menu, 'pads' => $pads]);
         }
         
-        if(Auth::user()->isTypeTeacher()) {
-
-            $index_menu = MenuItemsTeacher::PAD;
+        if(Auth::user()->isTypeTeacher())
+        {
+            $menu = Menu::PADS;
             $userPads = UserPad::initQuery()->whereUser(Auth::user()->id)->get();
 
-            return view('pad.teacher.index', ['index_menu' => $index_menu, 'userPads' => $userPads]);
+            return view('pad.teacher.index', ['menu' => $menu, 'userPads' => $userPads]);
         }
     }
 
@@ -48,8 +49,8 @@ class PadController extends Controller
      * @return \Illuminate\Http\Response
      */
     public function view($id) {
-        $index_menu = 1;
-        return view('pad.teacher.view', ['user_pad_id' => $id, 'index_menu' => $index_menu]);
+        $menu = Menu::PADS;
+        return view('pad.teacher.view', ['user_pad_id' => $id, 'menu' => $menu]);
     }
     
     /**

app/Http/Controllers/ProfessorController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\User;
 use App\Models\Curso;
+use App\Models\Util\Menu;
 use App\Models\Util\MenuItemsAdmin;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
@@ -15,7 +16,7 @@ class ProfessorController extends Controller
     {
         $professores = User::where('type', '=', User::TYPE_TEACHER)->get();
         return view('professor.index', [
-            'index_menu' => MenuItemsAdmin::PROFESSORES,
+            'menu' => Menu::PADS,
             'professores' =>  $professores
         ]);
     }

app/Http/Controllers/UnidadeController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Models\Unidade;
+use App\Models\Util\Menu;
 use App\Models\Util\MenuItemsAdmin;
 use App\Queries\UnidadeQuery;
 use Illuminate\Http\Request;
@@ -18,7 +19,7 @@ class UnidadeController extends Controller
     {
         return view('unidade.index', [
             'unidades' => Unidade::all(),
-            'index_menu' => MenuItemsAdmin::UNIDADES
+            'menu' => Menu::UNIDADES,
         ]);
     }
 
@@ -31,7 +32,7 @@ class UnidadeController extends Controller
     {
         return view('unidade.create', [
             'unidades' => Unidade::all(),
-            'index_menu' => MenuItemsAdmin::UNIDADES
+            'menu' => Menu::UNIDADES,
         ]);
     }
 
@@ -77,7 +78,7 @@ class UnidadeController extends Controller
         $model = Unidade::find($id);
         return view('unidade.update', [
             'unidade' => $model,
-            'index_menu' => MenuItemsAdmin::UNIDADES
+            'menu' => Menu::UNIDADES,
         ]);
     }
 

app/Http/Controllers/UserController.php

@@ -3,16 +3,16 @@
 namespace App\Http\Controllers;
 
 use App\Models\User;
+use App\Models\Util\Menu;
+use App\Models\Util\Status;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use NunoMaduro\Collision\Adapters\Phpunit\State;
 
 class UserController extends Controller
 {   
-
-    const MENU_UPDATE_PERFIL = 0;
-
     public function editPerfil() {
-        return view('user.update_perfil', ['index_menu' => self::MENU_UPDATE_PERFIL]);
+        return view('user.update_perfil', ['menu' => Menu::USER]);
     }
 
     public function updatePerfil(Request $request) {
@@ -46,4 +46,42 @@ class UserController extends Controller
         // return redirect()->route('edit_perfil')->with('success', 'Salvo com sucesso!');
 
     }
+
+    public function actionIndex(Request $request)
+    {   
+        $users = 
+            User::initQuery();
+
+        $users = $users->get();
+        return view('users.index', [
+            'users' => $users,
+            'menu' => Menu::USERS,
+        ]);
+    }
+
+    public function actionCreate(Request $request)
+    {
+        return view('users.create', [
+            'menu' => Menu::USERS,
+        ]);
+    }
+
+    public function actionStore(Request $request)
+    {
+        dd($request->all());
+    }
+
+    public function actionEdit($id, Request $request)
+    {
+
+    }
+
+    public function actionUpdate($id, Request $request)
+    {
+
+    }
+
+    public function actionDelete($id) {
+
+    }
 }

app/Models/User.php

@@ -22,7 +22,7 @@ class User extends Authenticatable
      *
      * @var array<int, string>
      */
-    protected $fillable = ['name', 'email', 'password', 'document', 'status', 'curso_id', 'campus_id'];
+    protected $fillable = ['name', 'email', 'password', 'status', 'curso_id', 'campus_id'];
 
     /**
      * The attributes that should be hidden for serialization.

app/Models/UserType.php

@@ -2,9 +2,9 @@
 
 namespace App\Models;
 
+use App\Models\Pad;
 use App\Models\Util\Status;
 use App\Queries\UserTypeQuery;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 
 class UserType extends Model
@@ -17,13 +17,18 @@ class UserType extends Model
 
     protected $table = 'user_type';
 
-    protected $fillable = ['user_id', 'type', 'status', 'selected'];
+    protected $fillable = ['user_id', 'pad_id', 'type', 'status', 'selected'];
 
     public function user()
     {
         return $this->belongsTo(User::class);
     }
 
+    public function pad()
+    {
+        return $this->belongsTo(Pad::class);
+    }
+
     public function typeAsString()
     {
         return self::listType($this->type);

app/Models/Util/Form.php

+<?php
+
+namespace App\Models\Util;
+
+class Form
+{   
+    const TYPE_CREATE = 'create';
+    const TYPE_UPDATE = 'update';
+}
\ No newline at end of file

app/Models/Util/Menu.php

+<?php
+
+namespace App\Models\Util;
+
+class Menu
+{   
+    const USER = 1;
+    const HOME = 2;
+    const USERS = 3;
+    const CAMPUS = 4;
+    const CURSOS = 5;
+    const UNIDADES = 6;
+    const PADS = 7;
+    
+    //Deletar depois
+    const DIRETORES = 4;
+    const COORDENADORES = 5;
+    const PROFESSORES = 7;
+}
\ No newline at end of file

app/Queries/UserQuery.php

@@ -24,6 +24,16 @@ class UserQuery extends CustomQuery
         return self::$instance;
     }
 
+    /**
+     * @param integer $name
+     * @return UserQuery|Builder
+     */
+    public function whereName($name, $operator = 'LIKE')
+    {
+        $this->query = $this->query->where('name', $operator, $name);
+        return self::$instance;
+    }
+
     /**
      * @param integer $email
      * @return UserQuery|Builder
@@ -34,6 +44,36 @@ class UserQuery extends CustomQuery
         return self::$instance;
     }
 
+    /**
+     * @param integer $status
+     * @return UserQuery|Builder
+     */
+    public function whereStatus($status, $operator = '=')
+    {
+        $this->query = $this->query->where('status', $operator, $status);
+        return self::$instance;
+    }
+
+    /**
+     * @param integer $curso_id
+     * @return UserQuery|Builder
+     */
+    public function whereCurso($curso_id, $operator = '=')
+    {
+        $this->query = $this->query->where('curso_id', $operator, $curso_id);
+        return self::$instance;
+    }
+
+    /**
+     * @param integer $campus_id
+     * @return UserQuery|Builder
+     */
+    public function whereCampus($campus_id, $operator = '=')
+    {
+        $this->query = $this->query->where('campus_id', $operator, $campus_id);
+        return self::$instance;
+    }
+
     /**
      * @param integer $type
      * @return UserQuery|Builder

database/migrations/2014_10_12_000000_create_users_table.php

@@ -19,7 +19,6 @@ class CreateUsersTable extends Migration
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();
             $table->string('password');
-            $table->string('document');
             $table->tinyInteger('status');
             $table->foreignId('curso_id')->nullable();
             $table->foreignId('campus_id')->nullable();

database/migrations/2022_07_22_024613_create_user_type_table.php

@@ -16,6 +16,7 @@ class CreateUserTypeTable extends Migration
         Schema::create('user_type', function (Blueprint $table) {
             $table->id();
             $table->foreignId('user_id');
+            $table->foreignId('pad_id');
             $table->tinyInteger('type');
             $table->tinyInteger('status');
             $table->boolean('selected');

database/seeders/PadSeeder.php

@@ -15,21 +15,6 @@ class PadSeeder extends Seeder
      * @return void
      */
     public function run()
-    {   
-        PAD::create([
-            'id' => 1,
-            'nome' => "2022.1",
-            'data_inicio' => "2022-02-01",
-            'data_fim' => "2022-06-01",
-            'status' => Status::ATIVO,
-        ]);
-
-        PAD::create([
-            'id' => 2,
-            'nome' => "2022.2",
-            'data_inicio' => "2022-07-01",
-            'data_fim' => "2022-12-01",
-            'status' => Status::ATIVO,
-        ]);
+    {
     }
 }

database/seeders/UserSeeder.php

@@ -28,7 +28,6 @@ class UserSeeder extends Seeder
                 'email' => "professor{$id}@upe.br",
                 'email_verified_at' => null,
                 'password' => Hash::make('@professor'),
-                'document' => "00000000{$id}",
                 'status' => Status::ATIVO,
                 'campus_id' => 3,
                 'curso_id' => 1,
@@ -41,7 +40,6 @@ class UserSeeder extends Seeder
             'email' => "admin@upe.br",
             'email_verified_at' => null,
             'password' => Hash::make('@admin'),
-            'document' => "100000000",
             'status' => Status::ATIVO,
             'campus_id' => NULL,
             'curso_id' => NULL,
@@ -53,7 +51,6 @@ class UserSeeder extends Seeder
             'email' => "director@upe.br",
             'email_verified_at' => null,
             'password' => Hash::make('@director'),
-            'document' => "100000000",
             'status' => Status::ATIVO,
             'campus_id' => 1,
             'curso_id' => 1,
@@ -65,7 +62,6 @@ class UserSeeder extends Seeder
             'email' => "coordinator@upe.br",
             'email_verified_at' => null,
             'password' => Hash::make('@coordinator'),
-            'document' => "100000000",
             'status' => Status::ATIVO,
             'campus_id' => 1,
             'curso_id' => 1,

resources/views/campus/index.blade.php

@@ -8,50 +8,63 @@
 @endsection
 @section('nav')
     @include('layouts.navigation', [
-        'index_menu' => $index_menu,
+        'menu' => $menu,
     ])
 @endsection
 @section('body')
-    @include('components.alerts')
-    <div class="d-flex justify-content-between align-items-center border-bottom">
-        <h2 class="">TODOS OS CAMPUS</h2>
-        @include('components.buttons.btn-create', [
-            'route' => route('campus_create'),
-            'class' => 'btn btn-success',
-            'content' => 'Novo Campus',
-            'id' => 'campus_create',
-        ])
-    </div>
 
-    <!-- Tabela -->
-    <div class="table-responsive mt-5">
-        <table class="table table-hover table-striped">
-            <thead class="thead-dark">
-                <tr>
-                    <th scope="col">Nome</th>
-                    <th scope="col">Unidade</th>
-                    <th scope="col">Ações</th>
-                </tr>
-            </thead>
-
-            <tbody>
-                @foreach ($campus as $camp)
+<div>
+    
+    <h3 class="h3"> Campus </h3>
+
+    <div>
+
+        @include('components.alerts')
+
+        <div class="d-flex justify-content-end mb-2">
+            @include('components.buttons.btn-create', [
+                'id' => 'campus_create',
+                'route' => route('campus_create'),
+                'content' => 'Cadastrar',
+            ])
+        </div>
+
+        <div class="border rounded px-4">
+            <table class="table table-hover mt-4">
+                <thead class="thead-dark">
                     <tr>
-                        <td>{{ $camp->name }}</td>
-                        <td>{{ $camp->unidade }}</td>
-                        <td>
-                            @include('components.buttons.btn-edit', [
-                                'route' => route('campus_edit', ['id' => $camp->id]),
-                            ])
-
-                            @include('components.buttons.btn-delete', [
-                                'id' => $camp->id,
-                                'route' => route('campus_delete', ['id' => $camp->id])
-                            ])
-                        </td>
+                        <th scope="col">Nome</th>
+                        <th scope="col">Unidade</th>
+                        <th scope="col">Ações</th>
                     </tr>
-                @endforeach
-            </tbody>
-        </table>
+                </thead>
+
+                <tbody>
+                    @foreach ($campus as $camp)
+                        <tr>
+                            <td>{{ $camp->name }}</td>
+                            <td>{{ $camp->unidade }}</td>
+                            <td>
+                                <div class="btn-group" role="group">
+                                    <div class="me-1">
+                                        @include('components.buttons.btn-edit', [
+                                            'route' => route('campus_edit', ['id' => $camp->id]),
+                                        ])
+                                    </div>
+                                    <div class="me-1">
+                                        @include('components.buttons.btn-delete', [
+                                            'id' => $camp->id,
+                                            'route' => route('campus_delete', ['id' => $camp->id])
+                                        ])
+                                    </div>
+                                </div>
+                            </td>
+                        </tr>
+                    @endforeach
+                </tbody>
+            </table>
+        </div>
+
     </div>
+</div>
 @endsection

resources/views/components/buttons/btn-delete.blade.php

@@ -8,7 +8,7 @@
 --}}
 
 <!-- Button trigger modal -->
-<button type="button" class="btn btn-danger" data-bs-toggle="modal" data-bs-target="#modal-delete-{{ $id }}">
+<button type="button" class="btn btn-danger btn-sm" data-bs-toggle="modal" data-bs-target="#modal-delete-{{ $id }}">
     <i class="bi bi-trash"></i>
 </button>
 

resources/views/components/buttons/btn-edit.blade.php

@@ -3,6 +3,6 @@
         'route' => ''
     ])
 --}}
-<a class="btn btn-warning" href="{{$route}}">
+<a class="btn btn-primary btn-sm" href="{{$route}}">
     <i class="bi bi-pencil-square"></i>
 </a>
\ No newline at end of file

resources/views/curso/index.blade.php

 @extends('layouts.main')
 
 @section('title', 'Cursos')
+
 @section('header')
     @include('layouts.header', [
         'user' => Auth::user(),
     ])
 @endsection
+
 @section('nav')
     @include('layouts.navigation', [
-        'index_menu' => $index_menu,
+        'menu' => $menu,
     ])
 @endsection
+
 @section('body')
-    @include('components.alerts')
-    <div class="d-flex justify-content-between align-items-center border-bottom">
-        <h2 class="">TODOS OS CURSO</h2>
-        @include('components.buttons.btn-create', [
-            'route' => route('curso_create'),
-            'class' => '',
-            'content' => 'Novo Curso',
-            'id' => '',
-        ])
-    </div>
-    <!-- Tabela -->
-    <div class="table-responsive mt-5">
-        <table class="table table-hover table-striped">
-            <thead class="thead-dark">
-                <tr>
-                    <th scope="col">Nome</th>
-                    <th scope="col">Campus</th>
-                    <th scope="col">Ações</th>
-                </tr>
-            </thead>
-            <tbody>
-                @foreach ($campusWithCursos as $campusWithCurso)
-                    @foreach ($campusWithCurso->cursos as $curso)
-                        <tr>
-                            <td>{{ $curso->name }}</td>
-                            <td>{{ $curso->campus }}</td>
-                            <td>
-                                @include('components.buttons.btn-edit', [
-                                    'route' => route('curso_edit', ['id' => $curso->id]),
-                                ])
-
-                                @include('components.buttons.btn-delete', [
-                                    'id' => $curso->id,
-                                    'route' => route('curso_delete', ['id' => $curso->id]),
-                                ])
-                            </td>
-                        </tr>
+
+<div>
+    <h3 class="h3"> Cursos </h3>
+
+    <div>   
+        @include('components.alerts')
+
+        <div class="d-flex justify-content-end mb-2">
+            @include('components.buttons.btn-create', [
+                'route' => route('curso_create'),
+                'content' => 'Cadastrar',
+                'id' => '',
+                'class' => '',
+            ])
+        </div>
+
+        <div class="border rounded px-4">
+            <table class="table table-hover mt-4">
+                <thead class="thead-dark">
+                    <tr>
+                        <th scope="col">Nome</th>
+                        <th scope="col">Campus</th>
+                        <th scope="col">Ações</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach ($campusWithCursos as $campusWithCurso)
+                        @foreach ($campusWithCurso->cursos as $curso)
+                            <tr>
+                                <td>{{ $curso->name }}</td>
+                                <td>{{ $curso->campus }}</td>
+                                <td>
+                                    <div class="btn-group" role="group">
+                                        <div class="me-1">
+                                            @include('components.buttons.btn-edit', [
+                                                'route' => route('curso_edit', ['id' => $curso->id]),
+                                            ])
+                                        </div>
+                                        <div class="me-1">
+                                            @include('components.buttons.btn-delete', [
+                                                'id' => $curso->id,
+                                                'route' => route('curso_delete', ['id' => $curso->id]),
+                                            ])
+                                        </div>
+                                    </div>
+                                </td>
+                            </tr>
+                        @endforeach
                     @endforeach
-                @endforeach
-            </tbody>
-        </table>
+                </tbody>
+            </table>
+        </div>
     </div>
+</div>
 @endsection