From eab7280d43255e0dd74169b53db6d99a7e61de50 Mon Sep 17 00:00:00 2001 From: johnnyhall Date: Fri, 9 Dec 2022 14:53:33 -0300 Subject: [PATCH] v5.1.0 - 'secretaria' update --- .env | 2 +- README.md | 2 +- composer.lock | 2 +- database/factories/UserFactory.php | 2 +- database/seeders/PermissionSeeder.php | 2 +- resources/views/exams/index.blade.php | 2 +- resources/views/home.blade.php | 4 ++-- resources/views/layouts/left-menu.blade.php | 12 +++++------ resources/views/promotions/promote.blade.php | 2 +- vendor/composer/installed.json | 2 +- vendor/ezyang/htmlpurifier/composer.json | 2 +- .../ignition/resources/compiled/ignition.js | 2 +- .../src/Faker/Provider/de_AT/Address.php | 2 +- .../faker/src/Faker/Provider/de_CH/Person.php | 4 ++-- .../faker/src/Faker/Provider/el_GR/Text.php | 2 +- .../faker/src/Faker/Provider/en_IN/Person.php | 2 +- .../src/Faker/Provider/en_US/Company.php | 16 +++++++-------- .../src/Faker/Provider/es_AR/Company.php | 2 +- .../src/Faker/Provider/es_ES/Company.php | 2 +- .../src/Faker/Provider/es_PE/Company.php | 2 +- .../faker/src/Faker/Provider/fr_CH/Person.php | 6 +++--- .../faker/src/Faker/Provider/fr_FR/Text.php | 10 +++++----- .../src/Faker/Provider/id_ID/Address.php | 6 +++--- .../faker/src/Faker/Provider/it_CH/Person.php | 4 ++-- .../faker/src/Faker/Provider/kk_KZ/Text.php | 2 +- .../src/Faker/Provider/nb_NO/Company.php | 6 +++--- .../src/Faker/Provider/nl_NL/Company.php | 12 +++++------ .../faker/src/Faker/Provider/ro_MD/Text.php | 2 +- .../faker/src/Faker/Provider/ru_RU/Text.php | 2 +- .../faker/src/Faker/Provider/uk_UA/Text.php | 2 +- .../tests/Hamcrest/Xml/HasXPathTest.php | 4 ++-- .../Database/Eloquent/Collection.php | 2 +- .../Illuminate/Database/Eloquent/Model.php | 2 +- vendor/laravel/sail/stubs/mariadb.stub | 2 +- vendor/laravel/sail/stubs/mysql.stub | 2 +- .../nesbot/carbon/src/Carbon/Lang/ff_SN.php | 2 +- vendor/nette/schema/readme.md | 8 ++++---- .../docs/advanced-usage/cache.md | 2 +- .../docs/advanced-usage/extending.md | 2 +- .../docs/advanced-usage/seeding.md | 6 +++--- .../docs/basic-usage/blade-directives.md | 14 ++++++------- .../docs/basic-usage/middleware.md | 14 ++++++------- .../docs/basic-usage/multiple-guards.md | 16 +++++++-------- .../docs/basic-usage/new-app.md | 20 +++++++++---------- .../docs/basic-usage/role-permissions.md | 6 +++--- .../docs/basic-usage/super-admin.md | 18 ++++++++--------- .../docs/best-practices/using-policies.md | 2 +- 47 files changed, 121 insertions(+), 121 deletions(-) diff --git a/.env b/.env index 1935208b..8558c048 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ APP_NAME=schoolary APP_ENV=local -APP_KEY=base64:7IvVZVZNlhJFLk6CxOj8ves1PASonAvrZdZIERyzGEM= +APP_KEY=base64:Ueaq44igk8UUHzHekptVp+o3l/hON2xpXAsHY/xidjM= APP_DEBUG=true APP_URL=http://localhost diff --git a/README.md b/README.md index 703aa420..8c90d153 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ docker exec -it app sh ↳php artisan migrate:fresh --seed -login: admin@puccampinas.edu.br +login: secretaria@puccampinas.edu.br senha: password Utilizar: http://localhost:8080/ diff --git a/composer.lock b/composer.lock index c07e5d1a..8de6f412 100644 --- a/composer.lock +++ b/composer.lock @@ -536,7 +536,7 @@ "authors": [ { "name": "Edward Z. Yang", - "email": "admin@htmlpurifier.org", + "email": "secretaria@htmlpurifier.org", "homepage": "http://ezyang.com" } ], diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index 137ea24b..3006460d 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -36,7 +36,7 @@ public function definition() 'city' => 'Dhaka', 'zip' => '32545', 'Foto' => null, - 'role' => 'admin', + 'role' => 'secretaria', ]; } diff --git a/database/seeders/PermissionSeeder.php b/database/seeders/PermissionSeeder.php index 18b164ab..9d1239a8 100644 --- a/database/seeders/PermissionSeeder.php +++ b/database/seeders/PermissionSeeder.php @@ -102,7 +102,7 @@ public function run() // Permission::create(['name' => 'delete sections']); $user = \App\Models\User::factory()->create([ - 'email' => 'admin@puccampinas.edu.br', + 'email' => 'secretaria@puccampinas.edu.br', 'primeiro_nome' => 'Leandro', 'sobrenome' => 'Xastre' ]); diff --git a/resources/views/exams/index.blade.php b/resources/views/exams/index.blade.php index 86439071..ef9851de 100644 --- a/resources/views/exams/index.blade.php +++ b/resources/views/exams/index.blade.php @@ -55,7 +55,7 @@ @foreach ($exams as $exam) - @if (Auth::user()->role == "admin") + @if (Auth::user()->role == "secretaria") {{$exam->exam_name}} {{$exam->course->course_name}} diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index 45b8f9f5..850d4c49 100644 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -47,12 +47,12 @@ - @if(Auth::user()->role == "admin") + @if(Auth::user()->role == "secretaria")
-

Seja bem vindo a area logada da admin!

+

Seja bem vindo a area logada da secretaria!

diff --git a/resources/views/layouts/left-menu.blade.php b/resources/views/layouts/left-menu.blade.php index 2a59654d..36ba7076 100644 --- a/resources/views/layouts/left-menu.blade.php +++ b/resources/views/layouts/left-menu.blade.php @@ -45,7 +45,7 @@ class="ms-2 d-inline d-sm-none d-md-none d-xl-inline">Alunos style="{{ request()->routeIs('aluno.list.show')? 'font-weight:bold;' : '' }}">Vizualizar Alunos - @if (!session()->has('browse_session_id') && Auth::user()->role == "admin") + @if (!session()->has('browse_session_id') && Auth::user()->role == "secretaria") - @if (!session()->has('browse_session_id') && Auth::user()->role == "admin") + @if (!session()->has('browse_session_id') && Auth::user()->role == "secretaria") - @if (Auth::user()->role == "admin" || Auth::user()->role == "teacher") + @if (Auth::user()->role == "secretaria" || Auth::user()->role == "teacher") @endif - @if (Auth::user()->role == "admin") + @if (Auth::user()->role == "secretaria") @endif - @if (Auth::user()->role == "admin") + @if (Auth::user()->role == "secretaria") @endif - @if (Auth::user()->role == "admin") + @if (Auth::user()->role == "secretaria")