From db46b07db007dec1af3110e005afbba772b414b7 Mon Sep 17 00:00:00 2001 From: martijnr17 <44368317+martijnr17@users.noreply.github.com> Date: Tue, 21 May 2019 20:16:59 +0200 Subject: [PATCH 01/41] Update UsersManagementController.php for multi roles edit --- src/App/Http/Controllers/UsersManagementController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index b63b399..fd74da8 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -156,13 +156,13 @@ public function edit($id) { $user = config('laravelusers.defaultUserModel')::findOrFail($id); $roles = []; - $currentRole = ''; + $currentRole = []; if ($this->_rolesEnabled) { $roles = config('laravelusers.roleModel')::all(); foreach ($user->roles as $user_role) { - $currentRole = $user_role; + $currentRole[] = $user_role->id; } } From be393d63e4ec568987e2235aa23beb210646f792 Mon Sep 17 00:00:00 2001 From: martijnr17 <44368317+martijnr17@users.noreply.github.com> Date: Tue, 21 May 2019 20:20:41 +0200 Subject: [PATCH 02/41] Update edit-user.blade.php multi roles edit --- src/resources/views/usersmanagement/edit-user.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resources/views/usersmanagement/edit-user.blade.php b/src/resources/views/usersmanagement/edit-user.blade.php index 9afc8fd..3553600 100755 --- a/src/resources/views/usersmanagement/edit-user.blade.php +++ b/src/resources/views/usersmanagement/edit-user.blade.php @@ -104,12 +104,12 @@ @endif
- @if ($roles) @foreach($roles as $role) @if ($currentRole) - + @else @endif From 217d2fc772f04ced549212514c5d47b92b7832a8 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 4 Sep 2019 20:53:19 -0700 Subject: [PATCH 03/41] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0400dd3..bd94c21 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=7.1.3", - "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8" + "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0" }, "autoload": { "psr-4": { From fb269635478e6580cb447cd9d7160055b76000d9 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 4 Sep 2019 20:53:50 -0700 Subject: [PATCH 04/41] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index e5042d5..86153bb 100755 --- a/readme.md +++ b/readme.md @@ -25,7 +25,7 @@ ### About A Users Management CRUD [Package](https://packagist.org/packages/jeremykenedy/laravel-users) that includes all necessary routes, views, models, and controllers for a user management dashboard and associated pages for managing Laravels built in user scaffolding. Easily start creating, updating, editing, and deleting users in minutes with minimal setup required; Easily search all users, helpful for large user bases. -Built for Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, and 5.8. This package is easily configurable and customizable. +Built for Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, and 6.0. This package is easily configurable and customizable. Laravel users can work out the box with or without the following roles packages: * [jeremykenedy/laravel-roles](https://github.com/jeremykenedy/laravel-roles) From d7942000dcaf6afce0c92f2614703f31147b3211 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 4 Sep 2019 20:54:16 -0700 Subject: [PATCH 05/41] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 86153bb..5c69bbd 100755 --- a/readme.md +++ b/readme.md @@ -47,7 +47,7 @@ Laravel users can work out the box with or without the following roles packages: ### Requirements -* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, and 5.8](https://laravel.com/docs/installation) +* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, and 6.0](https://laravel.com/docs/installation) ### Installation Instructions 1. From your projects root folder in terminal run: From 607c701d334511f6e0ccb505df70e811426ea69c Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 4 Sep 2019 21:00:51 -0700 Subject: [PATCH 06/41] Update .travis.yml --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 0520c82..3b431af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,9 +22,11 @@ before_script: - cd laravelusers - composer self-update - composer install --prefer-source --no-interaction + - composer require laravel/ui - composer require jeremykenedy/laravel-users - php artisan key:generate - php artisan vendor:publish --tag=laravelusers + - php artisan ui vue --auth - php artisan make:auth - composer dump-autoload - php artisan clear-compiled From 64ae53f9d2c149bb26a6e91f8217df6a8ac46b93 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 4 Sep 2019 21:04:48 -0700 Subject: [PATCH 07/41] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3b431af..95114a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,6 +27,5 @@ before_script: - php artisan key:generate - php artisan vendor:publish --tag=laravelusers - php artisan ui vue --auth - - php artisan make:auth - composer dump-autoload - php artisan clear-compiled From 871d96704ff9610780fc4f9616e7c2cdb8a2aa73 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 25 Sep 2019 22:56:39 -0700 Subject: [PATCH 08/41] Set theme jekyll-theme-cayman --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..c419263 --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-cayman \ No newline at end of file From 8016412b225bda103e983d778d3dd7034d1f5923 Mon Sep 17 00:00:00 2001 From: Sander Kruger Date: Tue, 7 Jan 2020 13:55:45 +0100 Subject: [PATCH 09/41] Add dutch translations; fix back to user tooltip --- src/resources/lang/en/laravelusers.php | 1 + src/resources/lang/nl/app.php | 19 ++++ src/resources/lang/nl/forms.php | 96 +++++++++++++++++++ src/resources/lang/nl/laravelusers.php | 89 +++++++++++++++++ src/resources/lang/nl/modals.php | 31 ++++++ src/resources/lang/pt-br/laravelusers.php | 1 + .../views/usersmanagement/edit-user.blade.php | 2 +- 7 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 src/resources/lang/nl/app.php create mode 100644 src/resources/lang/nl/forms.php create mode 100644 src/resources/lang/nl/laravelusers.php create mode 100644 src/resources/lang/nl/modals.php diff --git a/src/resources/lang/en/laravelusers.php b/src/resources/lang/en/laravelusers.php index da7b480..1154d11 100644 --- a/src/resources/lang/en/laravelusers.php +++ b/src/resources/lang/en/laravelusers.php @@ -44,6 +44,7 @@ 'show' => 'Show', 'edit' => 'Edit', 'create-new' => 'Create New User', + 'back-user' => 'Back to user', 'back-users' => 'Back to users', 'email-user' => 'Email :user', 'submit-search' => 'Submit Users Search', diff --git a/src/resources/lang/nl/app.php b/src/resources/lang/nl/app.php new file mode 100644 index 0000000..d96d181 --- /dev/null +++ b/src/resources/lang/nl/app.php @@ -0,0 +1,19 @@ + [ + 'toggle-nav-alt' => 'Navigatie Aan/Uit', + 'login' => 'Inloggen', + 'register' => 'Registreren', + 'users' => 'Gebruikers', + 'logout' => 'Uitloggen', + ], + +]; diff --git a/src/resources/lang/nl/forms.php b/src/resources/lang/nl/forms.php new file mode 100644 index 0000000..e1111ec --- /dev/null +++ b/src/resources/lang/nl/forms.php @@ -0,0 +1,96 @@ + 'Email', + 'create_user_ph_email' => 'Email', + 'create_user_icon_email' => 'fa-envelope', + + 'create_user_label_username' => 'Gebruikersnaam', + 'create_user_ph_username' => 'Gebruikersnaam', + 'create_user_icon_username' => 'fa-user', + + 'create_user_label_firstname' => 'Voornaam', + 'create_user_ph_firstname' => 'Voornaam', + 'create_user_icon_firstname' => 'fa-user', + + 'create_user_label_lastname' => 'Achternaam', + 'create_user_ph_lastname' => 'Achternaam', + 'create_user_icon_lastname' => 'fa-user', + + 'create_user_label_password' => 'Wachtwoord', + 'create_user_ph_password' => 'Wachtwoord', + 'create_user_icon_password' => 'fa-lock', + + 'create_user_label_pw_confirmation' => 'Wachtwoord Bevestigen', + 'create_user_ph_pw_confirmation' => 'Wachtwoord Bevestigen', + 'create_user_icon_pw_confirmation' => 'fa-lock', + + 'create_user_label_location' => 'Gebruiker Locatie', + 'create_user_ph_location' => 'Gebruiker Locatie', + 'create_user_icon_location' => 'fa-map-marker', + + 'create_user_label_bio' => 'Gebruikersprofiel', + 'create_user_ph_bio' => 'Gebruikersprofiel', + 'create_user_icon_bio' => 'fa-pencil', + + 'create_user_label_twitter_username' => 'Twitter Gebruikersnaam', + 'create_user_ph_twitter_username' => 'Twitter Gebruikersnaam', + 'create_user_icon_twitter_username' => 'fa-twitter', + + 'create_user_label_github_username' => 'GitHub Gebruikersnaam', + 'create_user_ph_github_username' => 'GitHub Gebruikersnaam', + 'create_user_icon_github_username' => 'fa-github', + + 'create_user_label_career_title' => 'Gebruiker Beroep', + 'create_user_ph_career_title' => 'Gebruiker Beroep', + 'create_user_icon_career_title' => 'fa-briefcase', + + 'create_user_label_education' => 'Gebruiker Opleiding', + 'create_user_ph_education' => 'Gebruiker Opleiding', + 'create_user_icon_education' => 'fa-graduation-cap', + + 'create_user_label_role' => 'Gebruikersrol', + 'create_user_ph_role' => 'Selecteer Gebruikersrol', + 'create_user_icon_role' => 'fas fa-fw fas fa-shield-alt', + + 'create_user_button_text' => ' Nieuwe Gebruiker Aanmaken', + + // EDIT USER AS ADMINISTRATOR FORM + 'edit-user-admin-title' => 'Gebruikersinfo Wijzigen', + + 'label-username' => 'Gebruikersnaam', + 'ph-username' => 'Gebruikersnaam', + + 'label-useremail' => 'Email', + 'ph-useremail' => 'Email', + + 'label-userrole_id' => 'Gebruiker Toegangsniveau', + 'option-label' => 'Selecteer een Niveau', + 'option-user' => 'Gebruiker', + 'option-editor' => 'Schrijver', + 'option-admin' => 'Beheerder', + 'submit-btn-text' => 'Wijzig de Gebruiker!', + + 'submit-btn-icon' => 'fa-save', + 'username-icon' => 'fa-user', + 'useremail-icon' => 'fa-envelope-o', + + 'change-pw' => 'Wachtwoord Wijzigen', + 'cancel' => 'Annuleren', + 'save-changes' => ' Wijzigingen Opslaan', + + // Search Users Form + 'search-users-ph' => 'Gebruikers Zoeken', + +]; diff --git a/src/resources/lang/nl/laravelusers.php b/src/resources/lang/nl/laravelusers.php new file mode 100644 index 0000000..0f2965d --- /dev/null +++ b/src/resources/lang/nl/laravelusers.php @@ -0,0 +1,89 @@ + 'Toon Alle Gebruikers', + 'users-menu-alt' => 'Toon Gebruikersbeheer Menu', + 'create-new-user' => 'Nieuwe Gebruiker Aanmaken', + 'show-deleted-users' => 'Toon Verwijderde Gebuikers', + 'editing-user' => 'Wijzigen Gebruiker :name', + 'showing-user' => 'Tonen Gebruiker :name', + 'showing-user-title' => ':name\'s Informatie', + + 'users-table' => [ + 'caption' => '{1} :userscount gebruiker in totaal|[2,*] :userscount gebruikers in totaal', + 'id' => 'ID', + 'name' => 'Naam', + 'email' => 'Email', + 'role' => 'Rol', + 'created' => 'Aangemaakt', + 'updated' => 'Gewijzigd', + 'actions' => 'Acties', + 'updated' => 'Gewijzigd', + ], + + 'buttons' => [ + 'create-new' => '', + 'delete' => ' ', + 'show' => ' ', + 'edit' => ' ', + 'back-to-users' => '', + 'back-to-user' => 'Terug ', + 'delete-user' => ' ', + 'edit-user' => ' ', + ], + + 'tooltips' => [ + 'delete' => 'Verwijderen', + 'show' => 'Tonen', + 'edit' => 'Wijzigen', + 'create-new' => 'Nieuwe Gebruiker Aanmaken', + 'back-user' => 'Terug naar Gebruiker', + 'back-users' => 'Terug naar Gebruikers', + 'email-user' => 'Email :user', + 'submit-search' => 'Zoekterm Toepassen', + 'clear-search' => 'Zoekresultaten Wissen', + ], + + 'messages' => [ + 'userNameTaken' => 'Gebruikersnaam is in gebruik', + 'userNameRequired' => 'Gebruikersnaam is verplicht', + 'fNameRequired' => 'Voornaam is verplicht', + 'lNameRequired' => 'Achternaam is verplicht', + 'emailRequired' => 'Email is verplicht', + 'emailInvalid' => 'Email is onjuist', + 'passwordRequired' => 'Wachtwoord is verplicht', + 'PasswordMin' => 'Wachtwoord moet uit ten minste 6 tekens bestaan', + 'PasswordMax' => 'Wachtwoord mag niet langer dan 20 tekens zijn', + 'captchaRequire' => 'Captcha is verplicht', + 'CaptchaWrong' => 'Foute captcha, probeer het opnieuw.', + 'roleRequired' => 'Gebruikersrol is verplicht.', + 'user-creation-success' => 'Gebruiker succesvol aangemaakt!', + 'update-user-success' => 'Gebruiker succesvol gewijzigd!', + 'delete-success' => 'Gebruiker succesvol verwijderd!', + 'cannot-delete-yourself' => 'U kunt uw eigen gebruiker niet verwijderen!', + ], + + 'show-user' => [ + 'id' => 'Gebruiker ID', + 'name' => 'Gebruikersnaam', + 'email' => 'Email', + 'role' => 'Gebruikersrol', + 'created' => 'Aangemaakt ', + 'updated' => 'Gewijzigd ', + 'labelRole' => 'Gebruikersrol', + 'labelAccessLevel' => 'Toegangsniveau|Toegangsniveaus', + ], + + 'search' => [ + 'title' => 'Tonen Zoekresultaten', + 'found-footer' => ' Item(s) gevonden', + 'no-results' => 'Geen Resultaten', + ], +]; diff --git a/src/resources/lang/nl/modals.php b/src/resources/lang/nl/modals.php new file mode 100644 index 0000000..f0e145f --- /dev/null +++ b/src/resources/lang/nl/modals.php @@ -0,0 +1,31 @@ + 'Opslaan Bevestigen', + 'confirm_modal_title_std_msg' => 'Bevestig uw aanvraag.', + + // Confirm Save Modal; + 'confirm_modal_button_save_text' => 'Wijzigingen Opslaan', + 'confirm_modal_button_save_icon' => 'fa-save', + 'confirm_modal_button_cancel_text' => 'Annuleren', + 'confirm_modal_button_cancel_icon' => 'fa-times', + 'edit_user__modal_text_confirm_title' => 'Opslaan Bevestigen', + 'edit_user__modal_text_confirm_message' => 'Bevestig uw wijzigingen.', + + // Delete Modal + 'delete_user_title' => 'Gebruiker verwijderen', + 'delete_user_message' => 'Weet u zeker dat u gebruiker :user wilt verwijderen?', + 'delete_user_btn_cancel' => ' Annuleren', + 'delete_user_btn_confirm' => ' Verwijder Gebruiker', +]; diff --git a/src/resources/lang/pt-br/laravelusers.php b/src/resources/lang/pt-br/laravelusers.php index 3be111a..1abd579 100755 --- a/src/resources/lang/pt-br/laravelusers.php +++ b/src/resources/lang/pt-br/laravelusers.php @@ -44,6 +44,7 @@ 'show' => 'Mostrar', 'edit' => 'Editar', 'create-new' => 'Criar Novo Usuário', + 'back-user' => 'Voltar para Usuário', 'back-users' => 'Voltar para Usuários', 'email-user' => 'Email :user', 'submit-search' => 'Buscar Usuários', diff --git a/src/resources/views/usersmanagement/edit-user.blade.php b/src/resources/views/usersmanagement/edit-user.blade.php index 9afc8fd..da59aa5 100755 --- a/src/resources/views/usersmanagement/edit-user.blade.php +++ b/src/resources/views/usersmanagement/edit-user.blade.php @@ -37,7 +37,7 @@ @endif {!! trans('laravelusers::laravelusers.buttons.back-to-users') !!} - + @if(config('laravelusers.fontAwesomeEnabled')) @endif From 0f2cdf608b6db307ce484008ccf69ee0b39db032 Mon Sep 17 00:00:00 2001 From: sascha_schieferdecker Date: Mon, 3 Feb 2020 14:26:23 +0100 Subject: [PATCH 10/41] German translation --- src/resources/lang/de/app.php | 19 +++++ src/resources/lang/de/forms.php | 96 ++++++++++++++++++++++++++ src/resources/lang/de/laravelusers.php | 88 +++++++++++++++++++++++ src/resources/lang/de/modals.php | 31 +++++++++ 4 files changed, 234 insertions(+) create mode 100644 src/resources/lang/de/app.php create mode 100644 src/resources/lang/de/forms.php create mode 100644 src/resources/lang/de/laravelusers.php create mode 100644 src/resources/lang/de/modals.php diff --git a/src/resources/lang/de/app.php b/src/resources/lang/de/app.php new file mode 100644 index 0000000..1d5524d --- /dev/null +++ b/src/resources/lang/de/app.php @@ -0,0 +1,19 @@ + [ + 'toggle-nav-alt' => 'Navigation anzeigen/ausblenden', + 'login' => 'Login', + 'register' => 'Registrieren', + 'users' => 'Benutzer', + 'logout' => 'Logout', + ], + +]; diff --git a/src/resources/lang/de/forms.php b/src/resources/lang/de/forms.php new file mode 100644 index 0000000..aeb8df5 --- /dev/null +++ b/src/resources/lang/de/forms.php @@ -0,0 +1,96 @@ + 'E-Mail', + 'create_user_ph_email' => 'E-Mail', + 'create_user_icon_email' => 'fa-envelope', + + 'create_user_label_username' => 'Benutzername', + 'create_user_ph_username' => 'Benutzername', + 'create_user_icon_username' => 'fa-user', + + 'create_user_label_firstname' => 'Vorname', + 'create_user_ph_firstname' => 'Vorname', + 'create_user_icon_firstname' => 'fa-user', + + 'create_user_label_lastname' => 'Last Name', + 'create_user_ph_lastname' => 'Last Name', + 'create_user_icon_lastname' => 'fa-user', + + 'create_user_label_password' => 'Passwort', + 'create_user_ph_password' => 'Passwort', + 'create_user_icon_password' => 'fa-lock', + + 'create_user_label_pw_confirmation' => 'Passwort bestätigen', + 'create_user_ph_pw_confirmation' => 'Passwort bestätigen', + 'create_user_icon_pw_confirmation' => 'fa-lock', + + 'create_user_label_location' => 'Ort', + 'create_user_ph_location' => 'Ort', + 'create_user_icon_location' => 'fa-map-marker', + + 'create_user_label_bio' => 'Biographie', + 'create_user_ph_bio' => 'Biographie', + 'create_user_icon_bio' => 'fa-pencil', + + 'create_user_label_twitter_username' => 'Twitter Benutzername', + 'create_user_ph_twitter_username' => 'Twitter Benutzername', + 'create_user_icon_twitter_username' => 'fa-twitter', + + 'create_user_label_github_username' => 'GitHub Benutzername', + 'create_user_ph_github_username' => 'GitHub Benutzername', + 'create_user_icon_github_username' => 'fa-github', + + 'create_user_label_career_title' => 'Beruf', + 'create_user_ph_career_title' => 'Beruf', + 'create_user_icon_career_title' => 'fa-briefcase', + + 'create_user_label_education' => 'Schulabschluß', + 'create_user_ph_education' => 'Schulabschluß', + 'create_user_icon_education' => 'fa-graduation-cap', + + 'create_user_label_role' => 'Benutzerrolle', + 'create_user_ph_role' => 'Benutzerrolle auswählen', + 'create_user_icon_role' => 'fas fa-fw fas fa-shield-alt', + + 'create_user_button_text' => ' Neuen Benutzer anlegen', + + // EDIT USER AS ADMINISTRATOR FORM + 'edit-user-admin-title' => 'Benutzer bearbeiten', + + 'label-username' => 'Benutzername', + 'ph-username' => 'Benutzername', + + 'label-useremail' => 'E-Mail', + 'ph-useremail' => 'E-Mail', + + 'label-userrole_id' => 'Zugriffstufe', + 'option-label' => 'Stufe auswählen', + 'option-user' => 'User', + 'option-editor' => 'Editor', + 'option-admin' => 'Administrator', + 'submit-btn-text' => 'Benutzer bearbeiten!', + + 'submit-btn-icon' => 'fa-save', + 'username-icon' => 'fa-user', + 'useremail-icon' => 'fa-envelope-o', + + 'change-pw' => 'Passwort ändern', + 'cancel' => 'Abbruch', + 'save-changes' => ' Änderungen speichern', + + // Search Users Form + 'search-users-ph' => 'Benutzer durchsuchen', + +]; diff --git a/src/resources/lang/de/laravelusers.php b/src/resources/lang/de/laravelusers.php new file mode 100644 index 0000000..da72e0e --- /dev/null +++ b/src/resources/lang/de/laravelusers.php @@ -0,0 +1,88 @@ + 'Alle Benutzer', + 'users-menu-alt' => 'Benutzerverwaltung anzeigen', + 'create-new-user' => 'Neuen Benutzer anlegen', + 'show-deleted-users' => 'Gelöschte Benutzer anzeigen', + 'editing-user' => 'Bearbeite Benutzer :name', + 'showing-user' => 'Zeige Nutzer :name', + 'showing-user-title' => ':name\'s Information', + + 'users-table' => [ + 'caption' => '{1} :userscount Benutzer insgesamt|[2,*] :userscount Benutzer insgesamt', + 'id' => 'ID', + 'name' => 'Name', + 'email' => 'E-Mail', + 'role' => 'Rolle', + 'created' => 'Erstellt', + 'updated' => 'Aktualisiert', + 'actions' => 'Aktionen', + ], + + 'buttons' => [ + 'create-new' => '', + 'delete' => ' ', + 'show' => ' ', + 'edit' => ' ', + 'back-to-users' => '', + 'back-to-user' => 'Zurück zum ', + 'delete-user' => ' ', + 'edit-user' => ' ', + ], + + 'tooltips' => [ + 'delete' => 'Löschen', + 'show' => 'Anzeigen', + 'edit' => 'Bearbeiten', + 'create-new' => 'Neuen Benutzer anlegen', + 'back-user' => 'Zurück zum Benutzer', + 'back-users' => 'Zurück zur Benutzerliste', + 'email-user' => 'E-Mail :user', + 'submit-search' => 'Suchen', + 'clear-search' => 'Suche zurücksetzen', + ], + + 'messages' => [ + 'userNameTaken' => 'Benutzername ist bereits vergeben', + 'userNameRequired' => 'Benutzername ist ein Pflichtfeld', + 'fNameRequired' => 'Vorname ist ein Pflichtfeld', + 'lNameRequired' => 'Nachname ist ein Pflichtfeld', + 'emailRequired' => 'E-Mail ist ein Pflichtfeld', + 'emailInvalid' => 'E-Mail is invalid', + 'passwordRequired' => 'Passwort ist ein Pflichtfeld', + 'PasswordMin' => 'Das Passwort muss mindestens 6 Zeichen lang sein', + 'PasswordMax' => 'Das Passwort darf maximal 20 Zeichen lang sein', + 'captchaRequire' => 'Captcha ist ein Pflichtfeld', + 'CaptchaWrong' => 'Captcha falsch, bitte noch einmal versuchen', + 'roleRequired' => 'Benutzerrolle ist ein Pflichtfeld', + 'user-creation-success' => 'Benutzer erfolgreich angelegt!', + 'update-user-success' => 'Benutzer erfolgreich aktualisiert!', + 'delete-success' => 'Benutzer erfolgreich gelöscht!', + 'cannot-delete-yourself' => 'Du kannst dich nicht selbst löschen.', + ], + + 'show-user' => [ + 'id' => 'Benutzer ID', + 'name' => 'Benutzername', + 'email' => 'Email', + 'role' => 'Benutzerrolle', + 'created' => 'Angelegt ', + 'updated' => 'Aktualisiert ', + 'labelRole' => 'Benutzerrolle', + 'labelAccessLevel' => ' Stufe| Stufe', + ], + + 'search' => [ + 'title' => 'Zeige Suchergebnisse', + 'found-footer' => ' Treffer gefunden', + 'no-results' => 'Keine Treffer', + ], +]; diff --git a/src/resources/lang/de/modals.php b/src/resources/lang/de/modals.php new file mode 100644 index 0000000..03583d4 --- /dev/null +++ b/src/resources/lang/de/modals.php @@ -0,0 +1,31 @@ + 'Speichern bestätigen', + 'confirm_modal_title_std_msg' => 'Please confirm your request.', + + // Confirm Save Modal; + 'confirm_modal_button_save_text' => 'Änderungen speichern', + 'confirm_modal_button_save_icon' => 'fa-save', + 'confirm_modal_button_cancel_text' => 'Abbruch', + 'confirm_modal_button_cancel_icon' => 'fa-times', + 'edit_user__modal_text_confirm_title' => 'Änderungen speichern', + 'edit_user__modal_text_confirm_message' => 'Bitte bestätigen Sie die Änderungen.', + + // Delete Modal + 'delete_user_title' => 'Benutzer löschen', + 'delete_user_message' => 'Möchten Sie den Benutzer wirklich löschen?', + 'delete_user_btn_cancel' => ' Abbruch', + 'delete_user_btn_confirm' => ' Diesen Benutzer löschen', +]; From 8116c399a24e87bac75bbb975194b5b347edbb71 Mon Sep 17 00:00:00 2001 From: Ahmed Fathy Date: Sat, 25 Apr 2020 06:24:08 +0200 Subject: [PATCH 11/41] Arabic Translation --- src/resources/lang/ar/app.php | 19 +++++ src/resources/lang/ar/forms.php | 96 ++++++++++++++++++++++++++ src/resources/lang/ar/laravelusers.php | 88 +++++++++++++++++++++++ src/resources/lang/ar/modals.php | 31 +++++++++ 4 files changed, 234 insertions(+) create mode 100644 src/resources/lang/ar/app.php create mode 100644 src/resources/lang/ar/forms.php create mode 100644 src/resources/lang/ar/laravelusers.php create mode 100644 src/resources/lang/ar/modals.php diff --git a/src/resources/lang/ar/app.php b/src/resources/lang/ar/app.php new file mode 100644 index 0000000..d04b08a --- /dev/null +++ b/src/resources/lang/ar/app.php @@ -0,0 +1,19 @@ + [ + 'toggle-nav-alt' => 'تبديل العرض', + 'login' => 'تسجيل الدخول', + 'register' => 'تسجيل حساب جديد', + 'users' => 'المستخدمين', + 'logout' => 'تسجيل الخروج', + ], + +]; diff --git a/src/resources/lang/ar/forms.php b/src/resources/lang/ar/forms.php new file mode 100644 index 0000000..0467524 --- /dev/null +++ b/src/resources/lang/ar/forms.php @@ -0,0 +1,96 @@ + 'البريد الإليكتروني', + 'create_user_ph_email' => 'البريد الإليكتروني', + 'create_user_icon_email' => 'fa-envelope', + + 'create_user_label_username' => 'اسم المستخدم', + 'create_user_ph_username' => 'اسم المستخدم', + 'create_user_icon_username' => 'fa-user', + + 'create_user_label_firstname' => 'الاسم الأول', + 'create_user_ph_firstname' => 'الاسم الأول', + 'create_user_icon_firstname' => 'fa-user', + + 'create_user_label_lastname' => 'الاسم الأخير', + 'create_user_ph_lastname' => 'الاسم الأخير', + 'create_user_icon_lastname' => 'fa-user', + + 'create_user_label_password' => 'كلمة المرور', + 'create_user_ph_password' => 'كلمة المرور', + 'create_user_icon_password' => 'fa-lock', + + 'create_user_label_pw_confirmation' => 'تأكيد كلمة المرور', + 'create_user_ph_pw_confirmation' => 'تأكيد كلمة المرور', + 'create_user_icon_pw_confirmation' => 'fa-lock', + + 'create_user_label_location' => 'مكان المستخدم', + 'create_user_ph_location' => 'مكان المستخدم', + 'create_user_icon_location' => 'fa-map-marker', + + 'create_user_label_bio' => 'نبذة عن المستخدم', + 'create_user_ph_bio' => 'نبذة عن المستخدم', + 'create_user_icon_bio' => 'fa-pencil', + + 'create_user_label_twitter_username' => 'حساب Twitter', + 'create_user_ph_twitter_username' => 'حساب Twitter', + 'create_user_icon_twitter_username' => 'fa-twitter', + + 'create_user_label_github_username' => 'حساب GitHub', + 'create_user_ph_github_username' => 'حساب GitHub', + 'create_user_icon_github_username' => 'fa-github', + + 'create_user_label_career_title' => 'يعمل لدي', + 'create_user_ph_career_title' => 'يعمل لدي', + 'create_user_icon_career_title' => 'fa-briefcase', + + 'create_user_label_education' => 'المؤهل الدراسي', + 'create_user_ph_education' => 'المؤهل الدراسي', + 'create_user_icon_education' => 'fa-graduation-cap', + + 'create_user_label_role' => 'دور المستخدم', + 'create_user_ph_role' => 'اختر دور المستخدم', + 'create_user_icon_role' => 'fas fa-fw fas fa-shield-alt', + + 'create_user_button_text' => ' اضافة مستخدم جديد', + + // EDIT USER AS ADMINISTRATOR FORM + 'edit-user-admin-title' => 'تعديل بيانات المستخدم', + + 'label-username' => 'اسم المستخدم', + 'ph-username' => 'اسم المستخدم', + + 'label-useremail' => 'البريد الإليكتروني', + 'ph-useremail' => 'البريد الإليكتروني', + + 'label-userrole_id' => 'مستوي صلاحيات المستخدم', + 'option-label' => 'اختر مستوي', + 'option-user' => 'مستخدم', + 'option-editor' => 'محرر', + 'option-admin' => 'مدير', + 'submit-btn-text' => 'تعديل المستخدم', + + 'submit-btn-icon' => 'fa-save', + 'username-icon' => 'fa-user', + 'useremail-icon' => 'fa-envelope-o', + + 'change-pw' => 'تغيير كلمة المرور', + 'cancel' => 'الغاء', + 'save-changes' => ' حفظ التغييرات', + + // Search Users Form + 'search-users-ph' => 'البحث عن المستخدمين', + +]; diff --git a/src/resources/lang/ar/laravelusers.php b/src/resources/lang/ar/laravelusers.php new file mode 100644 index 0000000..1d36154 --- /dev/null +++ b/src/resources/lang/ar/laravelusers.php @@ -0,0 +1,88 @@ + 'عرض جميع المستخدمين', + 'users-menu-alt' => 'عرض قائمة ادارة المستخدمين', + 'create-new-user' => 'اضافة مستخدم جديد', + 'show-deleted-users' => 'عرض المستخدمين المحذوفين', + 'editing-user' => 'تعديل المستخدم :name', + 'showing-user' => 'عرض المستخدم :name', + 'showing-user-title' => 'بيانات المستخدم :name', + + 'users-table' => [ + 'caption' => '{1} :userscount اجمالي المستخدمين|[2,*] :userscount total users', + 'id' => 'الكود', + 'name' => 'الاسم', + 'email' => 'البريد الإليكتروني', + 'role' => 'الدور', + 'created' => 'تاريخ الاضافة', + 'updated' => 'تاريخ التعديل', + 'actions' => 'اجراءات', + 'updated' => 'تاريخ التعديل', + ], + + 'buttons' => [ + 'create-new' => '', + 'delete' => ' ', + 'show' => ' ', + 'edit' => ' ', + 'back-to-users' => '', + 'back-to-user' => 'المستخدم', + 'delete-user' => ' ', + 'edit-user' => ' ', + ], + + 'tooltips' => [ + 'delete' => 'حذف', + 'show' => 'عرض', + 'edit' => 'تعديل', + 'create-new' => 'اضافة مستخدم جديد', + 'back-users' => 'العودة', + 'email-user' => 'مراسلة :user', + 'submit-search' => 'القيام بالبحث', + 'clear-search' => 'حذف نتائج البحث', + ], + + 'messages' => [ + 'userNameTaken' => 'اسم المستخدم غير متاح', + 'userNameRequired' => 'اسم المستخدم مطلوب', + 'fNameRequired' => 'الاسم الأول مطلوب', + 'lNameRequired' => 'الاسم الأخير مطلوب', + 'emailRequired' => 'البريد الإليكتروني مطلوب', + 'emailInvalid' => 'البريد الإليكتروني غير صحيح', + 'passwordRequired' => 'كلمة المرور مطلوبة', + 'PasswordMin' => 'كلمة المرور لابد ان تكون 6 حروف علي الأقل', + 'PasswordMax' => 'أقصي طول لكلمة المرور هو 20 حرف', + 'captchaRequire' => 'كلمة التحقق مطلوبة', + 'CaptchaWrong' => 'كلمة التحقق غير صحيحة، يرجي اعادة المحاولة.', + 'roleRequired' => 'برجاء اختيار دور المستخدم', + 'user-creation-success' => 'تمت اضافة المستخدم بنجاح!', + 'update-user-success' => 'تم تعديل المستخدم بنجاح!', + 'delete-success' => 'تم حذف المستخدم بنجاح!', + 'cannot-delete-yourself' => 'لا يمكن حذف حسابك الشخصي بنفسك!', + ], + + 'show-user' => [ + 'id' => 'كود المستخدم', + 'name' => 'اسم المستخدم', + 'email' => 'البريد', + 'role' => 'الدور', + 'created' => 'اضيف ', + 'updated' => 'عُدل ', + 'labelRole' => 'الدور', + 'labelAccessLevel' => 'صلاحيات|صلاحيات', + ], + + 'search' => [ + 'title' => 'عرض نتائج البحث', + 'found-footer' => ' سجل وُجد', + 'no-results' => 'لا يوجد سجلات مطابقة', + ], +]; diff --git a/src/resources/lang/ar/modals.php b/src/resources/lang/ar/modals.php new file mode 100644 index 0000000..3dc31bd --- /dev/null +++ b/src/resources/lang/ar/modals.php @@ -0,0 +1,31 @@ + 'تأكيد الحفظ', + 'confirm_modal_title_std_msg' => 'يرجي تأكيد طلبك.', + + // Confirm Save Modal; + 'confirm_modal_button_save_text' => 'حفظ التغييرات', + 'confirm_modal_button_save_icon' => 'fa-save', + 'confirm_modal_button_cancel_text' => 'الغاء', + 'confirm_modal_button_cancel_icon' => 'fa-times', + 'edit_user__modal_text_confirm_title' => 'تأكيد الحفظ', + 'edit_user__modal_text_confirm_message' => 'يرجي تأكيد التغييرات المطلوبة', + + // Delete Modal + 'delete_user_title' => 'حذف المستخدم', + 'delete_user_message' => 'هل ترغب فعلا في حذف المستخدم :user?', + 'delete_user_btn_cancel' => ' الغاء', + 'delete_user_btn_confirm' => ' حذف المستخدم', +]; From 4c8b49d3f86fb2f60a0e418cbfc0304ebb08d4d1 Mon Sep 17 00:00:00 2001 From: Ahmed Fathy Date: Sat, 25 Apr 2020 06:33:50 +0200 Subject: [PATCH 12/41] Fix back to user/s tooltip --- src/resources/lang/ar/laravelusers.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/resources/lang/ar/laravelusers.php b/src/resources/lang/ar/laravelusers.php index 1d36154..7a1c4c2 100644 --- a/src/resources/lang/ar/laravelusers.php +++ b/src/resources/lang/ar/laravelusers.php @@ -17,7 +17,7 @@ 'showing-user-title' => 'بيانات المستخدم :name', 'users-table' => [ - 'caption' => '{1} :userscount اجمالي المستخدمين|[2,*] :userscount total users', + 'caption' => '{1} :userscount مستخدم وجد|[2,*] :userscount اجمالي المستخدمين', 'id' => 'الكود', 'name' => 'الاسم', 'email' => 'البريد الإليكتروني', @@ -44,7 +44,8 @@ 'show' => 'عرض', 'edit' => 'تعديل', 'create-new' => 'اضافة مستخدم جديد', - 'back-users' => 'العودة', + 'back-user' => 'عرض المستخدم', + 'back-users' => 'عرض المستخدمين', 'email-user' => 'مراسلة :user', 'submit-search' => 'القيام بالبحث', 'clear-search' => 'حذف نتائج البحث', From 91afc021359a25b1a068e2eb274d503bf5adb3ac Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Sat, 25 Apr 2020 23:53:24 -0700 Subject: [PATCH 13/41] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 5c69bbd..6e110e8 100755 --- a/readme.md +++ b/readme.md @@ -25,7 +25,7 @@ ### About A Users Management CRUD [Package](https://packagist.org/packages/jeremykenedy/laravel-users) that includes all necessary routes, views, models, and controllers for a user management dashboard and associated pages for managing Laravels built in user scaffolding. Easily start creating, updating, editing, and deleting users in minutes with minimal setup required; Easily search all users, helpful for large user bases. -Built for Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, and 6.0. This package is easily configurable and customizable. +Built for Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6.0, and 7.0. This package is easily configurable and customizable. Laravel users can work out the box with or without the following roles packages: * [jeremykenedy/laravel-roles](https://github.com/jeremykenedy/laravel-roles) From 2c23f7bf498bf4722558765da8904a38a783524a Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Sat, 25 Apr 2020 23:58:10 -0700 Subject: [PATCH 14/41] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index bd94c21..6a19634 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=7.1.3", - "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0" + "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0" }, "autoload": { "psr-4": { From f354f4750988d0ae55b27050fc0c8b7e49b5eabc Mon Sep 17 00:00:00 2001 From: Joost de Bruijn Date: Mon, 11 May 2020 10:29:19 +0200 Subject: [PATCH 15/41] feat: use hash for password hashing --- src/App/Http/Controllers/UsersManagementController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index fd74da8..aa48a52 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -6,6 +6,7 @@ use Illuminate\Http\Request; use Illuminate\Http\Response; use Illuminate\Routing\Controller; +use Illuminate\Support\Facades\Hash; use Validator; class UsersManagementController extends Controller @@ -120,7 +121,7 @@ public function store(Request $request) $user = config('laravelusers.defaultUserModel')::create([ 'name' => $request->input('name'), 'email' => $request->input('email'), - 'password' => bcrypt($request->input('password')), + 'password' => Hash::make($request->input('password')), ]); if ($this->_rolesEnabled) { @@ -223,7 +224,7 @@ public function update(Request $request, $id) } if ($passwordCheck) { - $user->password = bcrypt($request->input('password')); + $user->password = Hash::make($request->input('password')); } if ($this->_rolesEnabled) { From b0966bac1d3a07f438dbf2496328d7a59ac94f57 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Tue, 12 May 2020 22:24:39 -0700 Subject: [PATCH 16/41] Update .travis.yml --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 95114a2..225b9e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,8 @@ dist: trusty group: edge php: - - 7.1 - - 7.2 - 7.3 + - 7.4 sudo: false From 536c48322bf532d140813547bbfd792b0053b94a Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Thu, 14 May 2020 18:10:21 -0700 Subject: [PATCH 17/41] Update readme.md --- readme.md | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/readme.md b/readme.md index 6e110e8..428dd4b 100755 --- a/readme.md +++ b/readme.md @@ -1,4 +1,8 @@ -# Laravel-Users | A Laravel Users CRUD Management [Package](https://packagist.org/packages/jeremykenedy/laravel-users) +![Laravel Users](https://github-project-images.s3-us-west-2.amazonaws.com/laravel-blocker/laravel-users-logo.png) + +# Laravel Users | A Laravel Users CRUD Management [Package](https://packagist.org/packages/jeremykenedy/laravel-users) +A Users Management CRUD [Package](https://packagist.org/packages/jeremykenedy/laravel-users) that includes all necessary routes, views, models, and controllers for a user management dashboard and associated pages for managing Laravels built in user scaffolding. +Easily start creating, updating, editing, and deleting users in minutes with minimal setup required; Easily search all users, helpful for large user bases. [![Latest Stable Version](https://poser.pugx.org/jeremykenedy/laravel-users/v/stable.svg)](https://packagist.org/packages/jeremykenedy/laravel-users) [![Total Downloads](https://poser.pugx.org/jeremykenedy/laravel-users/d/total.svg)](https://packagist.org/packages/jeremykenedy/laravel-users) @@ -14,6 +18,7 @@ - [About](#about) - [Features](#features) - [Requirements](#requirements) +- [Integrations](#integrations) - [Installation Instructions](#installation-instructions) - [Configuration](#configuration) - [Routes](#routes) @@ -22,17 +27,6 @@ - [Opening an Issue](#opening-an-issue) - [License](#license) -### About -A Users Management CRUD [Package](https://packagist.org/packages/jeremykenedy/laravel-users) that includes all necessary routes, views, models, and controllers for a user management dashboard and associated pages for managing Laravels built in user scaffolding. -Easily start creating, updating, editing, and deleting users in minutes with minimal setup required; Easily search all users, helpful for large user bases. -Built for Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6.0, and 7.0. This package is easily configurable and customizable. - -Laravel users can work out the box with or without the following roles packages: -* [jeremykenedy/laravel-roles](https://github.com/jeremykenedy/laravel-roles) -* [Zizaco/entrust](https://github.com/Zizaco/entrust) -* [romanbican/roles](https://github.com/romanbican/roles) -* [ultraware/roles](https://github.com/ultraware/roles) - ### Features | Laravel Users Features | | :------------ | @@ -47,7 +41,14 @@ Laravel users can work out the box with or without the following roles packages: ### Requirements -* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, and 6.0](https://laravel.com/docs/installation) +* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6, or 7+](https://laravel.com/docs/installation) + +### Integrations +Laravel users can work out the box with or without the following roles packages: +* [jeremykenedy/laravel-roles](https://github.com/jeremykenedy/laravel-roles) +* [Zizaco/entrust](https://github.com/Zizaco/entrust) +* [romanbican/roles](https://github.com/romanbican/roles) +* [ultraware/roles](https://github.com/ultraware/roles) ### Installation Instructions 1. From your projects root folder in terminal run: @@ -310,4 +311,4 @@ Before opening an issue there are a couple of considerations: * Please be considerate that this is an open source project that I provide to the community for FREE when opening an issue. ### License -Laravel-Users | A Laravel Users Management Package is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT). Enjoy! +Laravel Users | A Laravel Users Management Package is open-sourced software licensed under the [MIT license](http://opensource.org/licenses/MIT). Enjoy! From 0d2770f67d0662014dbe062ddac2848f2a24ff56 Mon Sep 17 00:00:00 2001 From: Pete Simmons Date: Fri, 22 May 2020 17:24:29 +0100 Subject: [PATCH 18/41] Update UsersManagementController.php --- src/App/Http/Controllers/UsersManagementController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index aa48a52..74abe0b 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -91,7 +91,7 @@ public function create() public function store(Request $request) { $rules = [ - 'name' => 'required|string|max:255|unique:users', + 'name' => 'required|string|max:255|unique:users|alphanum', 'email' => 'required|email|max:255|unique:users', 'password' => 'required|string|confirmed|min:6', 'password_confirmation' => 'required|string|same:password', @@ -104,6 +104,7 @@ public function store(Request $request) $messages = [ 'name.unique' => trans('laravelusers::laravelusers.messages.userNameTaken'), 'name.required' => trans('laravelusers::laravelusers.messages.userNameRequired'), + 'name.name' => trans('laravelusers::laravelusers.messages.userNameInvalid'), 'email.required' => trans('laravelusers::laravelusers.messages.emailRequired'), 'email.email' => trans('laravelusers::laravelusers.messages.emailInvalid'), 'password.required' => trans('laravelusers::laravelusers.messages.passwordRequired'), @@ -199,7 +200,7 @@ public function update(Request $request, $id) ]; if ($emailCheck) { - $rules['email'] = 'required|email|max:255|unique:users'; + $rules['email'] = 'required|email|max:255|unique:users|alphanum'; } if ($passwordCheck) { From 57309e03cea562c502e41ec139522befab2aae53 Mon Sep 17 00:00:00 2001 From: Pete Simmons Date: Fri, 22 May 2020 17:26:35 +0100 Subject: [PATCH 19/41] Update UsersManagementController.php --- src/App/Http/Controllers/UsersManagementController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index 74abe0b..ac13f01 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -91,7 +91,7 @@ public function create() public function store(Request $request) { $rules = [ - 'name' => 'required|string|max:255|unique:users|alphanum', + 'name' => 'required|string|max:255|unique:users|alpha_num', 'email' => 'required|email|max:255|unique:users', 'password' => 'required|string|confirmed|min:6', 'password_confirmation' => 'required|string|same:password', @@ -200,7 +200,7 @@ public function update(Request $request, $id) ]; if ($emailCheck) { - $rules['email'] = 'required|email|max:255|unique:users|alphanum'; + $rules['email'] = 'required|email|max:255|unique:users|alpha_num'; } if ($passwordCheck) { From 942aed520b8f6dad327f926884d67ff2e4ce1007 Mon Sep 17 00:00:00 2001 From: Pete Simmons Date: Fri, 22 May 2020 17:28:11 +0100 Subject: [PATCH 20/41] Update laravelusers.php --- src/resources/lang/en/laravelusers.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/resources/lang/en/laravelusers.php b/src/resources/lang/en/laravelusers.php index 1154d11..f4ae4e6 100644 --- a/src/resources/lang/en/laravelusers.php +++ b/src/resources/lang/en/laravelusers.php @@ -54,6 +54,7 @@ 'messages' => [ 'userNameTaken' => 'Username is taken', 'userNameRequired' => 'Username is required', + 'userNameInvalid' => 'Username is invalid', 'fNameRequired' => 'First Name is required', 'lNameRequired' => 'Last Name is required', 'emailRequired' => 'Email is required', From 711318c855db1334605936db4694357b0af3dd0d Mon Sep 17 00:00:00 2001 From: Pete Simmons Date: Fri, 22 May 2020 17:30:30 +0100 Subject: [PATCH 21/41] Update UsersManagementController.php --- src/App/Http/Controllers/UsersManagementController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index ac13f01..211e13f 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -104,7 +104,7 @@ public function store(Request $request) $messages = [ 'name.unique' => trans('laravelusers::laravelusers.messages.userNameTaken'), 'name.required' => trans('laravelusers::laravelusers.messages.userNameRequired'), - 'name.name' => trans('laravelusers::laravelusers.messages.userNameInvalid'), + 'name' => trans('laravelusers::laravelusers.messages.userNameInvalid'), 'email.required' => trans('laravelusers::laravelusers.messages.emailRequired'), 'email.email' => trans('laravelusers::laravelusers.messages.emailInvalid'), 'password.required' => trans('laravelusers::laravelusers.messages.passwordRequired'), From 2acbbdebaf9205b940ceedca23c6534ec5479665 Mon Sep 17 00:00:00 2001 From: Pete Simmons Date: Fri, 22 May 2020 17:35:28 +0100 Subject: [PATCH 22/41] Changed to allow dashes in validator --- src/App/Http/Controllers/UsersManagementController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index 211e13f..0e6bb2a 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -91,7 +91,7 @@ public function create() public function store(Request $request) { $rules = [ - 'name' => 'required|string|max:255|unique:users|alpha_num', + 'name' => 'required|string|max:255|unique:users|alpha_dash', 'email' => 'required|email|max:255|unique:users', 'password' => 'required|string|confirmed|min:6', 'password_confirmation' => 'required|string|same:password', @@ -200,7 +200,7 @@ public function update(Request $request, $id) ]; if ($emailCheck) { - $rules['email'] = 'required|email|max:255|unique:users|alpha_num'; + $rules['email'] = 'required|email|max:255|unique:users|alpha_dash'; } if ($passwordCheck) { From 44bee8aecf6074c5aa90192d66b9d35ca24cf339 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 22 May 2020 10:56:44 -0700 Subject: [PATCH 23/41] harden security for input --- src/App/Http/Controllers/UsersManagementController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index 0e6bb2a..e275160 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -120,7 +120,7 @@ public function store(Request $request) } $user = config('laravelusers.defaultUserModel')::create([ - 'name' => $request->input('name'), + 'name' => strip_tags($request->input('name')), 'email' => $request->input('email'), 'password' => Hash::make($request->input('password')), ]); @@ -218,7 +218,7 @@ public function update(Request $request, $id) return back()->withErrors($validator)->withInput(); } - $user->name = $request->input('name'); + $user->name = strip_tags($request->input('name')); if ($emailCheck) { $user->email = $request->input('email'); From 92410124ef547c04f62d80fd763dbccaeef69754 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 22 May 2020 11:15:11 -0700 Subject: [PATCH 24/41] update testing suite --- composer.json | 8 ++++---- tests/TestCase.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 6a19634..0d928d2 100755 --- a/composer.json +++ b/composer.json @@ -25,10 +25,10 @@ } }, "require-dev": { - "illuminate/support": "^5.7", - "orchestra/testbench": "~3.0", - "phpunit/phpunit": "^7.0", - "laravel/laravel": "5.7.*" + "orchestra/testbench": "^5.2", + "laravel/tinker": "^2.4", + "illuminate/support": "^7.12", + "laravel/laravel": "^7.12" }, "extra": { "laravel": { diff --git a/tests/TestCase.php b/tests/TestCase.php index 97fe8d5..71f7534 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -15,7 +15,7 @@ class TestCase extends OrchestraTestCase * * @return jeremykenedy\laravelusers\LaravelUsersServiceProvider */ - protected function getPackageProviders($app) + protected function getPackageProviders($app) : void { return [LaravelUsersServiceProvider::class]; } @@ -27,7 +27,7 @@ protected function getPackageProviders($app) * * @return array */ - protected function getPackageAliases($app) + protected function getPackageAliases($app) : void { return [ 'UsersManagementController' => LaravelUsersFacade::class, From e9b610b8eb98ed1b8c79de631cdbe479913fc9c5 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Fri, 22 May 2020 18:16:16 +0000 Subject: [PATCH 25/41] Apply fixes from StyleCI --- tests/TestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 71f7534..ae313e5 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -15,7 +15,7 @@ class TestCase extends OrchestraTestCase * * @return jeremykenedy\laravelusers\LaravelUsersServiceProvider */ - protected function getPackageProviders($app) : void + protected function getPackageProviders($app): void { return [LaravelUsersServiceProvider::class]; } @@ -27,7 +27,7 @@ protected function getPackageProviders($app) : void * * @return array */ - protected function getPackageAliases($app) : void + protected function getPackageAliases($app): void { return [ 'UsersManagementController' => LaravelUsersFacade::class, From f4928dbed2dc101aba4c8f149c9b347f5a0c0950 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Fri, 22 May 2020 11:21:17 -0700 Subject: [PATCH 26/41] udpate test --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 225b9e8..e378666 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,3 +28,5 @@ before_script: - php artisan ui vue --auth - composer dump-autoload - php artisan clear-compiled + +script: vendor/bin/phpunit From 8be3b897b52aa60f6feb84983addc875a805ee96 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Fri, 22 May 2020 11:26:42 -0700 Subject: [PATCH 27/41] Update LICENSE --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index d818c73..a97280d 100755 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2017-2018 +Copyright (c) 2017-2020 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 85238bd89c65a09170769805326c7575a2e75339 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Fri, 22 May 2020 11:33:10 -0700 Subject: [PATCH 28/41] Create FUNDING.yml --- .github/FUNDING.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..a83887f --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,4 @@ +# These are supported funding model platforms + +github: [jeremykenedy] +patreon: jeremykenedy From 72024e8cdfe658180a0c2a621df196a2beafa521 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 24 May 2020 04:07:02 -0700 Subject: [PATCH 29/41] update styleci --- .styleci.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .styleci.yml diff --git a/.styleci.yml b/.styleci.yml new file mode 100644 index 0000000..0cd6905 --- /dev/null +++ b/.styleci.yml @@ -0,0 +1,15 @@ +preset: laravel + +enabled: + - strict + - align_double_arrow + +disabled: + - unused_use + +finder: + not-name: + - index.php + - server.php + - CheckIsUserActivated.php + - SocialController.php From 097c30fb185655b2f78803b8ec4c67c072950cf7 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 24 May 2020 04:11:29 -0700 Subject: [PATCH 30/41] update styleci --- .styleci.yml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 .styleci.yml diff --git a/.styleci.yml b/.styleci.yml deleted file mode 100644 index 0cd6905..0000000 --- a/.styleci.yml +++ /dev/null @@ -1,15 +0,0 @@ -preset: laravel - -enabled: - - strict - - align_double_arrow - -disabled: - - unused_use - -finder: - not-name: - - index.php - - server.php - - CheckIsUserActivated.php - - SocialController.php From 393d21e2187f6cb055248686918980c8b6311e70 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Wed, 8 Jul 2020 22:44:11 -0700 Subject: [PATCH 31/41] Update UsersManagementController.php --- src/App/Http/Controllers/UsersManagementController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App/Http/Controllers/UsersManagementController.php b/src/App/Http/Controllers/UsersManagementController.php index e275160..645da34 100755 --- a/src/App/Http/Controllers/UsersManagementController.php +++ b/src/App/Http/Controllers/UsersManagementController.php @@ -200,7 +200,7 @@ public function update(Request $request, $id) ]; if ($emailCheck) { - $rules['email'] = 'required|email|max:255|unique:users|alpha_dash'; + $rules['email'] = 'required|email|max:255|unique:users'; } if ($passwordCheck) { From f2373f5f3d962c0042a80fdaf1933b54afbaeccb Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Mon, 21 Sep 2020 13:14:58 -0700 Subject: [PATCH 32/41] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0d928d2..2a4ed08 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=7.1.3", - "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0" + "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0|^8.0" }, "autoload": { "psr-4": { From f3f8a3e774ea545d2ae4bf834e6087b05bf3b6d8 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Sun, 3 Jan 2021 12:38:00 -0800 Subject: [PATCH 33/41] PHP8 Support --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2a4ed08..ccf7996 100755 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ } ], "require": { - "php": ">=7.1.3", + "php": ">=7.1.3|^8.0", "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0|^8.0" }, "autoload": { From 0e68d2ca37b6ee0a77793866d87955ecec308699 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Mon, 4 Jan 2021 23:41:01 -0800 Subject: [PATCH 34/41] Update readme.md --- readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/readme.md b/readme.md index 428dd4b..6895f4b 100755 --- a/readme.md +++ b/readme.md @@ -41,7 +41,7 @@ Easily start creating, updating, editing, and deleting users in minutes with min ### Requirements -* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6, or 7+](https://laravel.com/docs/installation) +* [Laravel 5.2, 5.3, 5.4, 5.5, 5.6, 5.7, 5.8, 6, 7, or 8+](https://laravel.com/docs/installation) ### Integrations Laravel users can work out the box with or without the following roles packages: @@ -53,7 +53,7 @@ Laravel users can work out the box with or without the following roles packages: ### Installation Instructions 1. From your projects root folder in terminal run: - Laravel 5.6, 5.7, and 5.8+ use: + Laravel 5.6, 5.7, 5.8, 6, 7, and 8+ use: ``` composer require jeremykenedy/laravel-users @@ -83,7 +83,7 @@ Laravel users can work out the box with or without the following roles packages: ``` 2. Register Package -* Laravel 5.5, 5.6, and 5.7+ +* Laravel 5.5, 5.6, 5.7, 5.8, 6, 7, 8+ Uses package auto discovery feature, no need to edit the `config/app.php` file. * Laravel 5.4 and below From f6aa513caf24ddcf785bdf85e22af9c43ff78b5e Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Mon, 4 Jan 2021 23:41:23 -0800 Subject: [PATCH 35/41] Update readme.md --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 6895f4b..d978434 100755 --- a/readme.md +++ b/readme.md @@ -298,7 +298,6 @@ laravel-users/ ### Opening an Issue Before opening an issue there are a couple of considerations: -* A **star** on this project shows support and is way to say thank you to all the contributors. If you open an issue without a star, *your issue may be closed without consideration.* Thank you for understanding and the support. You are all awesome! * **Read the instructions** and make sure all steps were *followed correctly*. * **Check** that the issue is not *specific to your development environment* setup. * **Provide** *duplication steps*. From 54a1ccea516e06fd7ba9a0639018778272240146 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Tue, 5 Jan 2021 17:02:55 -0800 Subject: [PATCH 36/41] Update readme.md --- readme.md | 1 + 1 file changed, 1 insertion(+) diff --git a/readme.md b/readme.md index d978434..0d3af5b 100755 --- a/readme.md +++ b/readme.md @@ -298,6 +298,7 @@ laravel-users/ ### Opening an Issue Before opening an issue there are a couple of considerations: +* You are all awesome! * **Read the instructions** and make sure all steps were *followed correctly*. * **Check** that the issue is not *specific to your development environment* setup. * **Provide** *duplication steps*. From 6847e680a9782bcb6af86f178723e817ba0d6f6d Mon Sep 17 00:00:00 2001 From: Gus deMayo Date: Wed, 25 May 2022 09:55:03 -0500 Subject: [PATCH 37/41] composer update --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ccf7996..0087beb 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=7.1.3|^8.0", - "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0|^8.0" + "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0|^8.0|^9.0" }, "autoload": { "psr-4": { From 841dced746303ca525f96a1eb4a732ec10f420bc Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Thu, 17 Oct 2024 02:28:16 -0700 Subject: [PATCH 38/41] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0087beb..0d60cbd 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=7.1.3|^8.0", - "laravelcollective/html": "^5.4|^5.5|^5.6|^5.7|^5.8|^6.0|^7.0|^8.0|^9.0" + "laravellux/html": ^6.0|^7.0" }, "autoload": { "psr-4": { From f704d944055376ac67440be091572fc81068365c Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Thu, 17 Oct 2024 02:28:47 -0700 Subject: [PATCH 39/41] Update composer.json --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0d60cbd..1137d15 100755 --- a/composer.json +++ b/composer.json @@ -12,7 +12,7 @@ ], "require": { "php": ">=7.1.3|^8.0", - "laravellux/html": ^6.0|^7.0" + "laravellux/html": "^6.0|^7.0" }, "autoload": { "psr-4": { From 53357122eb9a886d125aae47d82bf40b7b418eb3 Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy <158513116+jeremy-at-evosus@users.noreply.github.com> Date: Mon, 28 Oct 2024 17:51:00 -0700 Subject: [PATCH 40/41] update package dep --- composer.json | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 1137d15..8e2cdd4 100755 --- a/composer.json +++ b/composer.json @@ -1,7 +1,12 @@ { "name": "jeremykenedy/laravel-users", "description": "Laravel Users Management CRUD Package", - "keywords": ["laravel", "users", "management", "CRUD"], + "keywords": [ + "laravel", + "users", + "management", + "CRUD" + ], "license": "MIT", "type": "package", "authors": [ @@ -11,8 +16,8 @@ } ], "require": { - "php": ">=7.1.3|^8.0", - "laravellux/html": "^6.0|^7.0" + "php": "^7.2|^8.0|^8.1|^8.2|^8.3", + "laravellux/html": "^7.1" }, "autoload": { "psr-4": { @@ -24,12 +29,6 @@ "jeremykenedy\\laravelusers\\Test\\": "tests/" } }, - "require-dev": { - "orchestra/testbench": "^5.2", - "laravel/tinker": "^2.4", - "illuminate/support": "^7.12", - "laravel/laravel": "^7.12" - }, "extra": { "laravel": { "providers": [ From 1fafbc2c392f4f722f0ebb7eda03800a47b5f9cd Mon Sep 17 00:00:00 2001 From: Jeremy Kenedy Date: Fri, 22 Nov 2024 00:11:49 -0800 Subject: [PATCH 41/41] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..5990d9c --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file + +version: 2 +updates: + - package-ecosystem: "" # See documentation for possible values + directory: "/" # Location of package manifests + schedule: + interval: "weekly"