From 738ddd4bfc2698b82d0f9a15f85cbd363621f689 Mon Sep 17 00:00:00 2001 From: alissonalbuquerque Date: Sun, 20 Mar 2022 13:38:32 -0300 Subject: [PATCH] =?UTF-8?q?add=20atualiza=C3=A7=C3=B5es=20parciais=20de=20?= =?UTF-8?q?layout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/CampusController.php | 8 + app/Http/Controllers/UnidadeController.php | 9 + app/Models/User.php | 29 ++++ app/Queries/CampusQuery.php | 19 +++ app/Queries/UnidadeQuery.php | 9 + app/Queries/UserQuery.php | 11 ++ .../components/buttons/btn-create.blade.php | 10 +- .../views/components/tables/table.blade.php | 13 ++ resources/views/dashboard.blade.php | 156 +++--------------- resources/views/layouts/app.blade.php | 30 +++- resources/views/layouts/navigation.blade.php | 87 ++++------ .../user-dashboard/dashboard_admin.blade.php | 149 +++++++++++++++++ .../dashboard_coordinator.blade.php | 0 .../dashboard_menager.blade.php | 0 .../dashboard_teacher.blade.php | 143 ++++++++++++++++ .../user-dashboard/update_perfil.blade.php | 8 + .../user-jquery/jquery_admin.blade.php | 71 ++++++++ .../user-jquery/jquery_coordinator.blade.php | 0 .../user-jquery/jquery_menager.blade.php | 0 .../user-jquery/jquery_teacher.blade.php | 0 .../navigation_admin.blade.php | 60 +++++++ .../navigation_coordinator.blade.php | 9 + .../navigation_menager.blade.php | 9 + .../navigation_teacher.blade.php | 61 +++++++ routes/web.php | 6 +- 25 files changed, 690 insertions(+), 207 deletions(-) create mode 100644 app/Queries/CampusQuery.php create mode 100644 app/Queries/UnidadeQuery.php create mode 100644 app/Queries/UserQuery.php create mode 100644 resources/views/components/tables/table.blade.php create mode 100644 resources/views/layouts/user-dashboard/dashboard_admin.blade.php create mode 100644 resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php create mode 100644 resources/views/layouts/user-dashboard/dashboard_menager.blade.php create mode 100644 resources/views/layouts/user-dashboard/dashboard_teacher.blade.php create mode 100644 resources/views/layouts/user-dashboard/update_perfil.blade.php create mode 100644 resources/views/layouts/user-jquery/jquery_admin.blade.php create mode 100644 resources/views/layouts/user-jquery/jquery_coordinator.blade.php create mode 100644 resources/views/layouts/user-jquery/jquery_menager.blade.php create mode 100644 resources/views/layouts/user-jquery/jquery_teacher.blade.php create mode 100644 resources/views/layouts/user-navigation/navigation_admin.blade.php create mode 100644 resources/views/layouts/user-navigation/navigation_coordinator.blade.php create mode 100644 resources/views/layouts/user-navigation/navigation_menager.blade.php create mode 100644 resources/views/layouts/user-navigation/navigation_teacher.blade.php diff --git a/app/Http/Controllers/CampusController.php b/app/Http/Controllers/CampusController.php index 849ff42..7096cfb 100644 --- a/app/Http/Controllers/CampusController.php +++ b/app/Http/Controllers/CampusController.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Models\Campus; use App\Models\Unidade; +use App\Queries\CampusQuery; use Illuminate\Http\Request; class CampusController extends Controller @@ -86,4 +87,11 @@ class CampusController extends Controller { // } + + + public function findByUnidade(int $unidade_id) + { + return CampusQuery::whereUnidadeId($unidade_id)->orderBy('name')->get(); + } + } diff --git a/app/Http/Controllers/UnidadeController.php b/app/Http/Controllers/UnidadeController.php index 9a9fe99..dd818af 100644 --- a/app/Http/Controllers/UnidadeController.php +++ b/app/Http/Controllers/UnidadeController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Unidade; +use App\Queries\UnidadeQuery; use Illuminate\Http\Request; class UnidadeController extends Controller @@ -91,4 +92,12 @@ class UnidadeController extends Controller return redirect('/unidade/index'); } + + /** + * @return array + */ + public function getAll() + { + return UnidadeQuery::all(); + } } diff --git a/app/Models/User.php b/app/Models/User.php index 14d9969..653e5b3 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -66,6 +66,35 @@ class User extends Authenticatable return $this->belongsTo(Unidade::class); } + + /** + * @return bool + */ + public function isTypeAdmin() { + return $this->type === self::TYPE_ADMIN; + } + + /** + * @return bool + */ + public function isTypeTeacher() { + return $this->type === self::TYPE_TEACHER; + } + + /** + * @return bool + */ + public function isTypeMenager() { + return $this->type === self::TYPE_MANAGER; + } + + /** + * @return bool + */ + public function isTypeCoordinator() { + return $this->type === self::TYPE_COORDINATOR; + } + /** * @return string */ diff --git a/app/Queries/CampusQuery.php b/app/Queries/CampusQuery.php new file mode 100644 index 0000000..177b1a5 --- /dev/null +++ b/app/Queries/CampusQuery.php @@ -0,0 +1,19 @@ + Create + + + + + + + {{$text}} + + diff --git a/resources/views/components/tables/table.blade.php b/resources/views/components/tables/table.blade.php new file mode 100644 index 0000000..8cc8eb1 --- /dev/null +++ b/resources/views/components/tables/table.blade.php @@ -0,0 +1,13 @@ + + + + + + + + + + + + +
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index 6afada7..2d31c83 100644 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -1,146 +1,28 @@ +
-
-
-

Bem Vindo ao PAD

-
-
-

- - - - Atividades a serem realizdas -

-
-
- -
-
-
-
-

Gestão de Coordenador

-
+ + @if(Auth::check()) + @include('layouts.user-dashboard.update_perfil', ['user' => Auth::user()]) + @endif + + @if(Auth::user()->isTypeAdmin()) + @include('layouts.user-dashboard.dashboard_admin') + @endif + + @if(Auth::user()->isTypeTeacher()) + @include('layouts.user-dashboard.dashboard_teacher') + @endif - - - - - - Cadastrar Novo Coordenador - - - - - - Listar Coordenador - -
-
-
-

Gestão de Campus

-
+ @if(Auth::user()->isTypeMenager()) + @include('layouts.user-dashboard.dashboard_menager') + @endif - - - - - - Cadastrar Novo Campus - - - - - - - - Listar Campus - -
- -
-
-

Gestão de Professor

-
+ @if(Auth::user()->isTypeCoordinator()) + @include('layouts.user-dashboard.dashboard_coordinator') + @endif - - - - - - Cadastrar Novo Professor - - - - - - Listar Professor - -
-
-
-

Listagem PAD

-
-
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 4564cb1..7f58853 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -11,6 +11,9 @@ + + + @@ -37,23 +40,32 @@ - - + - + + + @if(Auth::user()->isTypeAdmin()) + @include('layouts.user-jquery.jquery_admin') + @endif + + @if(Auth::user()->isTypeTeacher()) + @include('layouts.user-jquery.jquery_teacher') + @endif + + @if(Auth::user()->isTypeMenager()) + @include('layouts.user-jquery.jquery_menager') + @endif + + @if(Auth::user()->isTypeCoordinator()) + @include('layouts.user-jquery.jquery_coordinator') + @endif diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php index 7994d9e..dc6f5d5 100644 --- a/resources/views/layouts/navigation.blade.php +++ b/resources/views/layouts/navigation.blade.php @@ -1,5 +1,7 @@ \ No newline at end of file + @endif + + + @if(Auth::user()->isTypeAdmin()) + @include('layouts.user-navigation.navigation_admin') + @endif + + + @if(Auth::user()->isTypeTeacher()) + @include('layouts.user-navigation.navigation_teacher') + @endif + + + @if(Auth::user()->isTypeMenager()) + @include('layouts.user-navigation.navigation_menager') + @endif + + + @if(Auth::user()->isTypeCoordinator()) + @include('layouts.user-navigation.navigation_coordinator') + @endif + + diff --git a/resources/views/layouts/user-dashboard/dashboard_admin.blade.php b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php new file mode 100644 index 0000000..b446ce3 --- /dev/null +++ b/resources/views/layouts/user-dashboard/dashboard_admin.blade.php @@ -0,0 +1,149 @@ +
+
+

Bem Vindo ao PAD

+
+
+

+ + + + Atividades a serem realizdas +

+
+
+ +
+
+
+
+

Gestão de Campus

+
+ + + + + + + Cadastrar Novo Campus + + + + + + + + Listar Campus + + + @include('components.tables.table', ['id' => 'list_campus', 'css' => 'table']) + +
+
+
+

Gestão de Cursos

+
+ + + + + + Cadastrar Novo Curso + + + + + + + + Listar Cursos + +
+
+
+

Gestão de Unidades

+
+ + @include('components.buttons.btn-create', ['route' => '', 'css' => 'btn btn-primary', 'text' => 'Cadastrar Nova Unidade']) + +
+ @include('components.tables.table', ['id' => 'table_unidades', 'css' => 'table']) +
+
+
+
+

Gestão de Diretoria

+
+ + + + + + + Cadastrar Novo Diretor + + + + + + Listar Diretores + +
+
+
+

Gestão de Coordenador

+
+ + + + + + + Cadastrar Novo Coordenador + + + + + + Listar Coordenador + +
\ No newline at end of file diff --git a/resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php b/resources/views/layouts/user-dashboard/dashboard_coordinator.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/layouts/user-dashboard/dashboard_menager.blade.php b/resources/views/layouts/user-dashboard/dashboard_menager.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/layouts/user-dashboard/dashboard_teacher.blade.php b/resources/views/layouts/user-dashboard/dashboard_teacher.blade.php new file mode 100644 index 0000000..c9cf382 --- /dev/null +++ b/resources/views/layouts/user-dashboard/dashboard_teacher.blade.php @@ -0,0 +1,143 @@ +
+
+

Bem Vindo ao PAD

+
+
+

+ + + + Atividades a serem realizdas +

+
+
+ +
+
+
+
+

Gestão de Coordenador

+
+ + + + + + + Cadastrar Novo Coordenador + + + + + + Listar Coordenador + +
+
+
+

Gestão de Campus

+
+ + + + + + + Cadastrar Novo Campus + + + + + + + + Listar Campus + + + @include('components.tables.table', ['id' => 'list_campus', 'css' => 'table']) + +
+
+
+

Gestão de Cursos

+
+ + + + + + Cadastrar Novo Curso + + + + + + + + Listar Cursos + +
+
+
+

Gestão de Professor

+
+ + + + + + + Cadastrar Novo Professor + + + + + + Listar Professor + +
+
+
+

Listagem PAD

+
+
\ No newline at end of file diff --git a/resources/views/layouts/user-dashboard/update_perfil.blade.php b/resources/views/layouts/user-dashboard/update_perfil.blade.php new file mode 100644 index 0000000..726af50 --- /dev/null +++ b/resources/views/layouts/user-dashboard/update_perfil.blade.php @@ -0,0 +1,8 @@ + +
+ +
+

Atualizar Perfil

+
+ +
\ No newline at end of file diff --git a/resources/views/layouts/user-jquery/jquery_admin.blade.php b/resources/views/layouts/user-jquery/jquery_admin.blade.php new file mode 100644 index 0000000..684e9c3 --- /dev/null +++ b/resources/views/layouts/user-jquery/jquery_admin.blade.php @@ -0,0 +1,71 @@ + diff --git a/resources/views/layouts/user-jquery/jquery_coordinator.blade.php b/resources/views/layouts/user-jquery/jquery_coordinator.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/layouts/user-jquery/jquery_menager.blade.php b/resources/views/layouts/user-jquery/jquery_menager.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/layouts/user-jquery/jquery_teacher.blade.php b/resources/views/layouts/user-jquery/jquery_teacher.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/layouts/user-navigation/navigation_admin.blade.php b/resources/views/layouts/user-navigation/navigation_admin.blade.php new file mode 100644 index 0000000..b91e4b4 --- /dev/null +++ b/resources/views/layouts/user-navigation/navigation_admin.blade.php @@ -0,0 +1,60 @@ + + diff --git a/resources/views/layouts/user-navigation/navigation_coordinator.blade.php b/resources/views/layouts/user-navigation/navigation_coordinator.blade.php new file mode 100644 index 0000000..622c00d --- /dev/null +++ b/resources/views/layouts/user-navigation/navigation_coordinator.blade.php @@ -0,0 +1,9 @@ + + diff --git a/resources/views/layouts/user-navigation/navigation_menager.blade.php b/resources/views/layouts/user-navigation/navigation_menager.blade.php new file mode 100644 index 0000000..622c00d --- /dev/null +++ b/resources/views/layouts/user-navigation/navigation_menager.blade.php @@ -0,0 +1,9 @@ + + diff --git a/resources/views/layouts/user-navigation/navigation_teacher.blade.php b/resources/views/layouts/user-navigation/navigation_teacher.blade.php new file mode 100644 index 0000000..f13026b --- /dev/null +++ b/resources/views/layouts/user-navigation/navigation_teacher.blade.php @@ -0,0 +1,61 @@ + + \ No newline at end of file diff --git a/routes/web.php b/routes/web.php index bf145a3..c3848ad 100644 --- a/routes/web.php +++ b/routes/web.php @@ -40,4 +40,8 @@ Route::delete('/unidade/delete/{id}', [UnidadeController::class, 'destroy'])->na Route::get('/curso/index', [CursoController::class, 'index'])->name('curso_index'); Route::get('/curso/create', [CursoController::class, 'create'])->name('curso_create'); -Route::post('/curso/store', [CursoController::class, 'store'])->name('curso_store'); \ No newline at end of file +Route::post('/curso/store', [CursoController::class, 'store'])->name('curso_store'); + +// return json +Route::get('/listar/unidade', [UnidadeController::class, 'getAll'])->name('listar_unidades'); +Route::get('/list/campus/{unidade_id}', [CampusController::class, 'findByUnidade'])->name('list_campus_by_unidade'); \ No newline at end of file -- GitLab