From 3296640b9aa4890f99a3524de8c8cc9db06e6425 Mon Sep 17 00:00:00 2001 From: Duhasky Date: Wed, 22 May 2024 14:55:09 -0300 Subject: [PATCH] ACL-1: updated --- .env.example | 6 +- app/Livewire/Forms/UserForm.php | 6 +- app/Livewire/Profile/UpdatePasswordForm.php | 2 +- app/Livewire/User/UserRole.php | 1 + app/Providers/TranslationServiceProvider.php | 24 +++++ bootstrap/providers.php | 1 + composer.json | 1 + composer.lock | 88 +++++++++---------- config/app.php | 4 +- package-lock.json | 76 +++++++++------- phpstan.neon | 10 ++- resources/js/app.js | 2 + {lang => resources/lang}/en/auth.php | 0 {lang => resources/lang}/en/pagination.php | 0 {lang => resources/lang}/en/passwords.php | 0 {lang => resources/lang}/en/validation.php | 0 lang/pt-BR.json => resources/lang/pt_BR.json | 5 ++ {lang/pt-BR => resources/lang/pt_BR}/auth.php | 0 .../lang/pt_BR}/pagination.php | 0 .../lang/pt_BR}/passwords.php | 0 .../lang/pt_BR}/validation.php | 0 .../views/components/icons/moon.blade.php | 4 + .../views/components/icons/sun.blade.php | 4 + .../views/components/layouts/app.blade.php | 58 +++++++++++- resources/views/livewire/navigation.blade.php | 8 +- resources/views/livewire/profile.blade.php | 34 +++---- .../profile/delete-user-form.blade.php | 6 +- .../profile/update-password-form.blade.php | 2 +- .../views/livewire/user/create.blade.php | 2 + tailwind.config.js | 1 + 30 files changed, 227 insertions(+), 118 deletions(-) create mode 100644 app/Providers/TranslationServiceProvider.php rename {lang => resources/lang}/en/auth.php (100%) rename {lang => resources/lang}/en/pagination.php (100%) rename {lang => resources/lang}/en/passwords.php (100%) rename {lang => resources/lang}/en/validation.php (100%) rename lang/pt-BR.json => resources/lang/pt_BR.json (96%) rename {lang/pt-BR => resources/lang/pt_BR}/auth.php (100%) rename {lang/pt-BR => resources/lang/pt_BR}/pagination.php (100%) rename {lang/pt-BR => resources/lang/pt_BR}/passwords.php (100%) rename {lang/pt-BR => resources/lang/pt_BR}/validation.php (100%) create mode 100644 resources/views/components/icons/moon.blade.php create mode 100644 resources/views/components/icons/sun.blade.php diff --git a/.env.example b/.env.example index f8356da..f20d7e9 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,9 @@ -APP_NAME=Base +APP_NAME="Project Base" APP_ENV=local APP_KEY= APP_DEBUG=true APP_TIMEZONE=America/Sao_Paulo -APP_URL=http://sincap.site +APP_URL=http://project_base.site APP_MAINTENANCE_DRIVER=file APP_MAINTENANCE_STORE=database @@ -18,7 +18,7 @@ LOG_LEVEL=debug DB_CONNECTION=mysql DB_HOST=127.0.0.1 DB_PORT=3306 -DB_DATABASE=base +DB_DATABASE=project_base DB_USERNAME=root DB_PASSWORD=root diff --git a/app/Livewire/Forms/UserForm.php b/app/Livewire/Forms/UserForm.php index dfaebd9..bc22e51 100644 --- a/app/Livewire/Forms/UserForm.php +++ b/app/Livewire/Forms/UserForm.php @@ -25,18 +25,20 @@ class UserForm extends Form public ?string $password = null; + public ?string $password_confirmation = null; + /** @return array|string> */ public function rules() { $rules = [ 'name' => ['required', 'min:3', 'max:255'], - 'user_name' => ['required', 'min:3', 'max:30'], + 'user_name' => ['required', 'min:3', 'max:30', Rule::unique(User::class)->ignore($this->id)], 'email' => ['required', 'string', 'lowercase', 'email', 'max:255', Rule::unique(User::class)->ignore($this->id)], 'regist_number' => ['required', 'size:8', Rule::unique(User::class)->ignore($this->id)], ]; if (!$this->id) { - $rules['password'] = ['required', Password::min(4), 'max:12']; + $rules['password'] = ['required', Password::min(4), 'max:12', 'confirmed']; } return $rules; diff --git a/app/Livewire/Profile/UpdatePasswordForm.php b/app/Livewire/Profile/UpdatePasswordForm.php index 8b9c249..ec6aeeb 100644 --- a/app/Livewire/Profile/UpdatePasswordForm.php +++ b/app/Livewire/Profile/UpdatePasswordForm.php @@ -26,7 +26,7 @@ public function updatePassword(): void try { $validated = $this->validate([ 'current_password' => ['required', 'string', 'current_password'], - 'password' => ['required', 'string', Password::defaults(), 'confirmed'], + 'password' => ['required', Password::min(4), 'max:12', 'confirmed'], ]); } catch (ValidationException $e) { $this->reset('current_password', 'password', 'password_confirmation'); diff --git a/app/Livewire/User/UserRole.php b/app/Livewire/User/UserRole.php index d83ad69..2b2758d 100644 --- a/app/Livewire/User/UserRole.php +++ b/app/Livewire/User/UserRole.php @@ -26,4 +26,5 @@ public function toggleRole(int $role_id): void { $this->user->roles()->toggle($role_id); } + } diff --git a/app/Providers/TranslationServiceProvider.php b/app/Providers/TranslationServiceProvider.php new file mode 100644 index 0000000..d9a63ba --- /dev/null +++ b/app/Providers/TranslationServiceProvider.php @@ -0,0 +1,24 @@ +loadJsonTranslationsFrom(resource_path('lang')); + } +} diff --git a/bootstrap/providers.php b/bootstrap/providers.php index b0756ad..4179e46 100644 --- a/bootstrap/providers.php +++ b/bootstrap/providers.php @@ -3,5 +3,6 @@ return [ App\Providers\AppServiceProvider::class, App\Providers\AuthServiceProvider::class, + App\Providers\TranslationServiceProvider::class, App\Providers\VoltServiceProvider::class, ]; diff --git a/composer.json b/composer.json index 88f5606..bf686d0 100644 --- a/composer.json +++ b/composer.json @@ -25,6 +25,7 @@ "pestphp/pest": "^2.34", "pestphp/pest-plugin-laravel": "^2.0", "pestphp/pest-plugin-livewire": "^2.1", + "phpstan/phpstan": "^1.11", "spatie/laravel-ignition": "^2.4" }, "autoload": { diff --git a/composer.lock b/composer.lock index 58fd484..62a31f7 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e682e5c50834e9c5b345adb22c81879b", + "content-hash": "867ccbbbfe31b6de3aa43c9450aae17b", "packages": [ { "name": "brick/math", @@ -1188,16 +1188,16 @@ }, { "name": "laravel/breeze", - "version": "v2.0.3", + "version": "v2.0.4", "source": { "type": "git", "url": "https://github.com/laravel/breeze.git", - "reference": "3ee0211a1bdc1aca6ee7913337735bb879738999" + "reference": "d250dac30275b043ddbc9d5aa6fa10a7c37af9c1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/breeze/zipball/3ee0211a1bdc1aca6ee7913337735bb879738999", - "reference": "3ee0211a1bdc1aca6ee7913337735bb879738999", + "url": "https://api.github.com/repos/laravel/breeze/zipball/d250dac30275b043ddbc9d5aa6fa10a7c37af9c1", + "reference": "d250dac30275b043ddbc9d5aa6fa10a7c37af9c1", "shasum": "" }, "require": { @@ -1244,20 +1244,20 @@ "issues": "https://github.com/laravel/breeze/issues", "source": "https://github.com/laravel/breeze" }, - "time": "2024-04-24T07:22:37+00:00" + "time": "2024-05-20T14:33:16+00:00" }, { "name": "laravel/framework", - "version": "v11.7.0", + "version": "v11.8.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "e5ac72f513f635f208024aa76b8a04efc1b47f93" + "reference": "ceb892a25817c888ef3df4d1a2af9cac53978300" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/e5ac72f513f635f208024aa76b8a04efc1b47f93", - "reference": "e5ac72f513f635f208024aa76b8a04efc1b47f93", + "url": "https://api.github.com/repos/laravel/framework/zipball/ceb892a25817c888ef3df4d1a2af9cac53978300", + "reference": "ceb892a25817c888ef3df4d1a2af9cac53978300", "shasum": "" }, "require": { @@ -1382,7 +1382,7 @@ "ext-pcntl": "Required to use all features of the queue worker and console signal trapping.", "ext-pdo": "Required to use all database features.", "ext-posix": "Required to use all features of the queue worker.", - "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0).", + "ext-redis": "Required to use the Redis cache and queue drivers (^4.0|^5.0|^6.0).", "fakerphp/faker": "Required to use the eloquent factory builder (^1.9.1).", "filp/whoops": "Required for friendly error pages in development (^2.14.3).", "laravel/tinker": "Required to use the tinker console command (^2.0).", @@ -1449,20 +1449,20 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2024-05-07T13:41:51+00:00" + "time": "2024-05-21T17:57:45+00:00" }, { "name": "laravel/prompts", - "version": "v0.1.21", + "version": "v0.1.22", "source": { "type": "git", "url": "https://github.com/laravel/prompts.git", - "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920" + "reference": "37f94de71758dbfbccc9d299b0e5eb76e02a40f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/prompts/zipball/23ea808e8a145653e0ab29e30d4385e49f40a920", - "reference": "23ea808e8a145653e0ab29e30d4385e49f40a920", + "url": "https://api.github.com/repos/laravel/prompts/zipball/37f94de71758dbfbccc9d299b0e5eb76e02a40f5", + "reference": "37f94de71758dbfbccc9d299b0e5eb76e02a40f5", "shasum": "" }, "require": { @@ -1505,9 +1505,9 @@ "description": "Add beautiful and user-friendly forms to your command-line applications.", "support": { "issues": "https://github.com/laravel/prompts/issues", - "source": "https://github.com/laravel/prompts/tree/v0.1.21" + "source": "https://github.com/laravel/prompts/tree/v0.1.22" }, - "time": "2024-04-30T12:46:16+00:00" + "time": "2024-05-10T19:22:18+00:00" }, { "name": "laravel/serializable-closure", @@ -6672,16 +6672,16 @@ }, { "name": "laravel/pint", - "version": "v1.15.3", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/laravel/pint.git", - "reference": "3600b5d17aff52f6100ea4921849deacbbeb8656" + "reference": "1b3a3dc5bc6a81ff52828ba7277621f1d49d6d98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/pint/zipball/3600b5d17aff52f6100ea4921849deacbbeb8656", - "reference": "3600b5d17aff52f6100ea4921849deacbbeb8656", + "url": "https://api.github.com/repos/laravel/pint/zipball/1b3a3dc5bc6a81ff52828ba7277621f1d49d6d98", + "reference": "1b3a3dc5bc6a81ff52828ba7277621f1d49d6d98", "shasum": "" }, "require": { @@ -6692,11 +6692,11 @@ "php": "^8.1.0" }, "require-dev": { - "friendsofphp/php-cs-fixer": "^3.54.0", - "illuminate/view": "^10.48.8", - "larastan/larastan": "^2.9.5", - "laravel-zero/framework": "^10.3.0", - "mockery/mockery": "^1.6.11", + "friendsofphp/php-cs-fixer": "^3.57.1", + "illuminate/view": "^10.48.10", + "larastan/larastan": "^2.9.6", + "laravel-zero/framework": "^10.4.0", + "mockery/mockery": "^1.6.12", "nunomaduro/termwind": "^1.15.1", "pestphp/pest": "^2.34.7" }, @@ -6734,20 +6734,20 @@ "issues": "https://github.com/laravel/pint/issues", "source": "https://github.com/laravel/pint" }, - "time": "2024-04-30T15:02:26+00:00" + "time": "2024-05-21T18:08:25+00:00" }, { "name": "laravel/sail", - "version": "v1.29.1", + "version": "v1.29.2", "source": { "type": "git", "url": "https://github.com/laravel/sail.git", - "reference": "8be4a31150eab3b46af11a2e7b2c4632eefaad7e" + "reference": "a8e4e749735ba2f091856eafeb3f99db8cd6b621" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/sail/zipball/8be4a31150eab3b46af11a2e7b2c4632eefaad7e", - "reference": "8be4a31150eab3b46af11a2e7b2c4632eefaad7e", + "url": "https://api.github.com/repos/laravel/sail/zipball/a8e4e749735ba2f091856eafeb3f99db8cd6b621", + "reference": "a8e4e749735ba2f091856eafeb3f99db8cd6b621", "shasum": "" }, "require": { @@ -6797,7 +6797,7 @@ "issues": "https://github.com/laravel/sail/issues", "source": "https://github.com/laravel/sail" }, - "time": "2024-03-20T20:09:31+00:00" + "time": "2024-05-16T21:39:11+00:00" }, { "name": "lucascudo/laravel-pt-br-localization", @@ -6928,16 +6928,16 @@ }, { "name": "mockery/mockery", - "version": "1.6.11", + "version": "1.6.12", "source": { "type": "git", "url": "https://github.com/mockery/mockery.git", - "reference": "81a161d0b135df89951abd52296adf97deb0723d" + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d", - "reference": "81a161d0b135df89951abd52296adf97deb0723d", + "url": "https://api.github.com/repos/mockery/mockery/zipball/1f4efdd7d3beafe9807b08156dfcb176d18f1699", + "reference": "1f4efdd7d3beafe9807b08156dfcb176d18f1699", "shasum": "" }, "require": { @@ -7007,7 +7007,7 @@ "security": "https://github.com/mockery/mockery/security/advisories", "source": "https://github.com/mockery/mockery" }, - "time": "2024-03-21T18:34:15+00:00" + "time": "2024-05-16T03:13:13+00:00" }, { "name": "myclabs/deep-copy", @@ -7727,16 +7727,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "5.4.0", + "version": "5.4.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a" + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a", - "reference": "298d2febfe79d03fe714eb871d5538da55205b1a", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", + "reference": "9d07b3f7fdcf5efec5d1609cba3c19c5ea2bdc9c", "shasum": "" }, "require": { @@ -7785,9 +7785,9 @@ "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", "support": { "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", - "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0" + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.1" }, - "time": "2024-04-09T21:13:58+00:00" + "time": "2024-05-21T05:55:05+00:00" }, { "name": "phpdocumentor/type-resolver", diff --git a/config/app.php b/config/app.php index f69f8f9..383538e 100644 --- a/config/app.php +++ b/config/app.php @@ -78,9 +78,9 @@ | */ - 'locale' => 'pt-br', + 'locale' => 'pt_BR', - 'fallback_locale' => 'pt-br', + 'fallback_locale' => 'pt_BR', 'faker_locale' => 'pt_BR', diff --git a/package-lock.json b/package-lock.json index 7e8fc63..e19cca8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "PROJECT - BASE", + "name": "ACL", "lockfileVersion": 3, "requires": true, "packages": { @@ -836,9 +836,9 @@ } }, "node_modules/axios": { - "version": "1.6.8", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz", - "integrity": "sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==", + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz", + "integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==", "dev": true, "dependencies": { "follow-redirects": "^1.15.6", @@ -874,12 +874,12 @@ } }, "node_modules/braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "dev": true, "dependencies": { - "fill-range": "^7.0.1" + "fill-range": "^7.1.1" }, "engines": { "node": ">=8" @@ -927,9 +927,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001618", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001618.tgz", - "integrity": "sha512-p407+D1tIkDvsEAPS22lJxLQQaG8OTBEqo0KhzfABGk0TU4juBNDSfH0hyAp/HRyx+M8L17z/ltyhxh27FTfQg==", + "version": "1.0.30001620", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001620.tgz", + "integrity": "sha512-WJvYsOjd1/BYUY6SNGUosK9DUidBPDTnOARHp3fSmFO1ekdxaY6nKRttEVrfMmYi80ctS0kz1wiWmm14fVc3ew==", "dev": true, "funding": [ { @@ -1075,9 +1075,9 @@ "dev": true }, "node_modules/electron-to-chromium": { - "version": "1.4.770", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.770.tgz", - "integrity": "sha512-ONwOsDiVvV07CMsyH4+dEaZ9L79HMH/ODHnDS3GkIhgNqdDHJN2C18kFb0fBj0RXpQywsPJl6k2Pqg1IY4r1ig==", + "version": "1.4.777", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.777.tgz", + "integrity": "sha512-n02NCwLJ3wexLfK/yQeqfywCblZqLcXphzmid5e8yVPdtEcida7li0A5WQKghHNG0FeOMCzeFOzEbtAh5riXFw==", "dev": true }, "node_modules/emoji-regex": { @@ -1171,9 +1171,9 @@ } }, "node_modules/fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "dev": true, "dependencies": { "to-regex-range": "^5.0.1" @@ -1278,13 +1278,13 @@ } }, "node_modules/glob": { - "version": "10.3.15", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.15.tgz", - "integrity": "sha512-0c6RlJt1TICLyvJYIApxb8GsXoai0KUP7AxKKAtsYXdgJR1mGEUa7DgwShbdk1nly0PYoZj01xd4hzbq3fsjpw==", + "version": "10.3.16", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.16.tgz", + "integrity": "sha512-JDKXl1DiuuHJ6fVS2FXjownaavciiHNUU4mOvV/B793RLh05vZL1rcPnCSaOgv1hDT6RDlY7AB7ZUvFYAtPgAw==", "dev": true, "dependencies": { "foreground-child": "^3.1.0", - "jackspeak": "^2.3.6", + "jackspeak": "^3.1.2", "minimatch": "^9.0.1", "minipass": "^7.0.4", "path-scurry": "^1.11.0" @@ -1408,9 +1408,9 @@ "dev": true }, "node_modules/jackspeak": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz", - "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", + "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", "dev": true, "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -1435,9 +1435,9 @@ } }, "node_modules/laravel-vite-plugin": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.2.tgz", - "integrity": "sha512-Mcclml10khYzBVxDwJro8wnVDwD4i7XOSEMACQNnarvTnHjrjXLLL+B/Snif2wYAyElsOqagJZ7VAinb/2vF5g==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/laravel-vite-plugin/-/laravel-vite-plugin-1.0.4.tgz", + "integrity": "sha512-dEj8Q/Fsn0kKbOQ55bl/NmyJL+dD6OxnVaM/nNByw5XV4b00ky6FzXKVuHLDr4BvSJKH1y6oaOcEG5wKpCZ5+A==", "dev": true, "dependencies": { "picocolors": "^1.0.0", @@ -1487,18 +1487,30 @@ } }, "node_modules/micromatch": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.6.tgz", + "integrity": "sha512-Y4Ypn3oujJYxJcMacVgcs92wofTHxp9FzfDpQON4msDefoC0lb3ETvQLOdLcbhSwU1bz8HrL/1sygfBIHudrkQ==", "dev": true, "dependencies": { - "braces": "^3.0.2", - "picomatch": "^2.3.1" + "braces": "^3.0.3", + "picomatch": "^4.0.2" }, "engines": { "node": ">=8.6" } }, + "node_modules/micromatch/node_modules/picomatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz", + "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==", + "dev": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, "node_modules/mime-db": { "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", diff --git a/phpstan.neon b/phpstan.neon index 1ed09ca..7112442 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -7,7 +7,7 @@ parameters: - app/ # Level 9 is the highest level - level: 5 + level: 6 ignoreErrors: # - '#PHPDoc tag @var#' @@ -16,4 +16,10 @@ parameters: # - ./*/*/FileToBeExcluded.php # # checkMissingIterableValueType: false -# checkGenericClassInNonGenericObjectType: false + - + identifier: missingType.generics + + parallel: + jobSize: 20 + maximumNumberOfProcesses: 32 + minimumNumberOfJobsPerProcess: 2 diff --git a/resources/js/app.js b/resources/js/app.js index 941f3af..e2aa912 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -1,3 +1,5 @@ import './bootstrap'; import 'flowbite'; + + diff --git a/lang/en/auth.php b/resources/lang/en/auth.php similarity index 100% rename from lang/en/auth.php rename to resources/lang/en/auth.php diff --git a/lang/en/pagination.php b/resources/lang/en/pagination.php similarity index 100% rename from lang/en/pagination.php rename to resources/lang/en/pagination.php diff --git a/lang/en/passwords.php b/resources/lang/en/passwords.php similarity index 100% rename from lang/en/passwords.php rename to resources/lang/en/passwords.php diff --git a/lang/en/validation.php b/resources/lang/en/validation.php similarity index 100% rename from lang/en/validation.php rename to resources/lang/en/validation.php diff --git a/lang/pt-BR.json b/resources/lang/pt_BR.json similarity index 96% rename from lang/pt-BR.json rename to resources/lang/pt_BR.json index e6f5593..b69f788 100644 --- a/lang/pt-BR.json +++ b/resources/lang/pt_BR.json @@ -61,7 +61,10 @@ "Delete API Token": "Deletar o Token de API", "Delete Account": "Deletar Conta", "Disable": "Desabilitar", + "Options": "Opções", + "Select action wished.": "Selecione a ação desejada.", "E-Mail Address": "E-mail", + "Address": "Endereço", "Email Address": "Endereço de e-mail", "Email Password Reset Link": "Enviar link para redefinir senha por e-mail", "Enable": "Habilitar", @@ -95,6 +98,7 @@ "Nevermind": "Deixa pra lá", "New Password": "Nova Senha", "Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.": "Depois que sua conta for excluída, todos os seus recursos e dados serão excluídos permanentemente. Antes de excluir sua conta, baixe todos os dados ou informações que deseja reter.", + "Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.": "Depois que sua conta for excluída, todos os seus recursos e dados serão excluídos permanentemente. Por favor, digite sua senha para confirmar que deseja excluir permanentemente sua conta.", "Password": "Senha", "Permanently delete your account.": "Deleta permanentemente a sua conta.", "Permissions": "Permissões", @@ -111,6 +115,7 @@ "Regenerate Recovery Codes": "Gerar novamente os códigos de recuperação", "Register": "Registre-se", "Register Number": "Matrícula", + "Password updated successfully": "Senha atualizada com sucesso", "Remember me": "Manter conectado", "Remove Photo": "Remover imagem", "Resend Verification Email": "Reenviar o e-mail de verificação", diff --git a/lang/pt-BR/auth.php b/resources/lang/pt_BR/auth.php similarity index 100% rename from lang/pt-BR/auth.php rename to resources/lang/pt_BR/auth.php diff --git a/lang/pt-BR/pagination.php b/resources/lang/pt_BR/pagination.php similarity index 100% rename from lang/pt-BR/pagination.php rename to resources/lang/pt_BR/pagination.php diff --git a/lang/pt-BR/passwords.php b/resources/lang/pt_BR/passwords.php similarity index 100% rename from lang/pt-BR/passwords.php rename to resources/lang/pt_BR/passwords.php diff --git a/lang/pt-BR/validation.php b/resources/lang/pt_BR/validation.php similarity index 100% rename from lang/pt-BR/validation.php rename to resources/lang/pt_BR/validation.php diff --git a/resources/views/components/icons/moon.blade.php b/resources/views/components/icons/moon.blade.php new file mode 100644 index 0000000..1f9c095 --- /dev/null +++ b/resources/views/components/icons/moon.blade.php @@ -0,0 +1,4 @@ +merge([ 'class' => 'hidden w-5 h-5']) }}> + + diff --git a/resources/views/components/icons/sun.blade.php b/resources/views/components/icons/sun.blade.php new file mode 100644 index 0000000..4fb6f95 --- /dev/null +++ b/resources/views/components/icons/sun.blade.php @@ -0,0 +1,4 @@ +merge([ 'class' => 'hidden w-5 h-5']) }}> + + diff --git a/resources/views/components/layouts/app.blade.php b/resources/views/components/layouts/app.blade.php index 6bad9a5..247d251 100644 --- a/resources/views/components/layouts/app.blade.php +++ b/resources/views/components/layouts/app.blade.php @@ -14,6 +14,8 @@ @vite(['resources/css/app.css', 'resources/js/app.js']) + + @@ -23,10 +25,15 @@ @isset($header)
-
+

{{ $header }}

+
@endisset @@ -42,6 +49,55 @@ + + diff --git a/resources/views/livewire/navigation.blade.php b/resources/views/livewire/navigation.blade.php index 5652599..8b32706 100644 --- a/resources/views/livewire/navigation.blade.php +++ b/resources/views/livewire/navigation.blade.php @@ -35,10 +35,10 @@ class="inline-flex items-center px-3 py-2 border border-transparent text-sm lead - @if (session('localization') == 'pt-br' || !session('localization')) + @if (session('localization') == 'pt_BR' || !session('localization')) English @else - Português + Português @endif {{ __('Profile') }} @@ -80,10 +80,10 @@ class="inline-flex items-center justify-center p-2 rounded-md text-gray-400 dark
- @if (session('localization') == 'pt-br' || !session('localization')) + @if (session('localization') == 'pt_BR' || !session('localization')) English @else - Português + Português @endif {{ __('Profile') }} diff --git a/resources/views/livewire/profile.blade.php b/resources/views/livewire/profile.blade.php index 000d7a8..e5c35b0 100644 --- a/resources/views/livewire/profile.blade.php +++ b/resources/views/livewire/profile.blade.php @@ -1,29 +1,19 @@
- -

- {{ __('Profile') }} -

- + {{ __('Profile') }}
-
-
-
- -
-
+
+
+ +
-
-
- -
-
+
+ +
-
-
- -
-
-
+
+ +
+
diff --git a/resources/views/livewire/profile/delete-user-form.blade.php b/resources/views/livewire/profile/delete-user-form.blade.php index d79587f..1ac4645 100644 --- a/resources/views/livewire/profile/delete-user-form.blade.php +++ b/resources/views/livewire/profile/delete-user-form.blade.php @@ -5,8 +5,7 @@

- {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting - your account, please download any data or information that you wish to retain.') }} + {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Before deleting your account, please download any data or information that you wish to retain.') }}

@@ -18,8 +17,7 @@

- {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your - password to confirm you would like to permanently delete your account.') }} + {{ __('Once your account is deleted, all of its resources and data will be permanently deleted. Please enter your password to confirm you would like to permanently delete your account.') }}

diff --git a/resources/views/livewire/profile/update-password-form.blade.php b/resources/views/livewire/profile/update-password-form.blade.php index 556e01a..08ae395 100644 --- a/resources/views/livewire/profile/update-password-form.blade.php +++ b/resources/views/livewire/profile/update-password-form.blade.php @@ -35,7 +35,7 @@ class="mt-1 block w-full" autocomplete="new-password" /> {{ __('Save') }} - {{ __('Saved.') }} + {{ __('Password updated successfully') }}
diff --git a/resources/views/livewire/user/create.blade.php b/resources/views/livewire/user/create.blade.php index cf4c08d..52848d1 100644 --- a/resources/views/livewire/user/create.blade.php +++ b/resources/views/livewire/user/create.blade.php @@ -11,6 +11,8 @@ :messages="$errors->get('form.regist_number')" wire:model="form.regist_number" class="w-full" /> +
diff --git a/tailwind.config.js b/tailwind.config.js index c29eb1a..be52677 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -18,4 +18,5 @@ export default { }, plugins: [forms], + darkMode: 'class', };