diff --git a/app/Console/Commands/CreateUserCommand.php b/app/Console/Commands/CreateUserCommand.php index 062e3ea..34c6dec 100644 --- a/app/Console/Commands/CreateUserCommand.php +++ b/app/Console/Commands/CreateUserCommand.php @@ -11,14 +11,16 @@ class CreateUserCommand extends Command { protected $signature = "user:create {email : an email for the user}"; - protected $description = "Creates user"; + protected $description = "Creates a user"; public function handle(): void { $email = $this->argument("email"); - User::factory(["email" => $email])->create(); + User::factory([ + "email" => $email, + ])->create(); - $this->info("User has been created"); + $this->info("The user has been created"); } } diff --git a/app/Enums/FormOfEmployment.php b/app/Enums/FormOfEmployment.php index 900b20d..c8c3e5d 100644 --- a/app/Enums/FormOfEmployment.php +++ b/app/Enums/FormOfEmployment.php @@ -20,9 +20,11 @@ enum FormOfEmployment: string { $cases = collect(FormOfEmployment::cases()); - return $cases->map(fn(FormOfEmployment $enum) => [ - "label" => $enum->label(), - "value" => $enum->value] + return $cases->map( + fn(FormOfEmployment $enum) => [ + "label" => $enum->label(), + "value" => $enum->value, + ], )->toArray(); } -} \ No newline at end of file +} diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 1954f96..a5e169b 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -49,7 +49,7 @@ class UserController extends Controller { return inertia("Users/Edit", [ "user" => new UserFormDataResource($user), - "employmentForms" => FormOfEmployment::casesToSelect() + "employmentForms" => FormOfEmployment::casesToSelect(), ]); } diff --git a/app/Models/User.php b/app/Models/User.php index c4bc971..7f7269c 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -18,7 +18,7 @@ use Toby\Enums\FormOfEmployment; * @property string $email * @property string $avatar * @property FormOfEmployment $employment_form - * @property Carbon $empoyment_date + * @property Carbon $employment_date */ class User extends Authenticatable { @@ -26,8 +26,6 @@ class User extends Authenticatable use Notifiable; use SoftDeletes; - protected $perPage = 10; - protected $fillable = [ "name", "email", @@ -47,7 +45,7 @@ class User extends Authenticatable public function scopeSearch(Builder $query, ?string $text): Builder { - if ($text == null) { + if ($text === null) { return $query; } diff --git a/app/Observers/UserObserver.php b/app/Observers/UserObserver.php index 60058d3..c26e6bf 100644 --- a/app/Observers/UserObserver.php +++ b/app/Observers/UserObserver.php @@ -6,13 +6,14 @@ namespace Toby\Observers; use Illuminate\Support\Arr; use Illuminate\Support\Facades\Storage; -use Toby\Models\User; use LasseRafn\InitialAvatarGenerator\InitialAvatar; +use Toby\Models\User; class UserObserver { - public function __construct(protected InitialAvatar $generator) - { + public function __construct( + protected InitialAvatar $generator, + ) { } public function created(User $user): void @@ -38,7 +39,7 @@ class UserObserver { $path = "avatars/{$user->id}.svg"; - Storage::put($path, $this->generator->rounded()->background($this->getRandomColor())->generateSvg($user->name)); + Storage::put($path, $this->generator->rounded()->background($this->getRandomColor())->color("#F4F8FD")->smooth()->generateSvg($user->name)); return $path; } diff --git a/config/colors.php b/config/colors.php index cc26b55..0b8a3ad 100644 --- a/config/colors.php +++ b/config/colors.php @@ -3,5 +3,19 @@ declare(strict_types=1); return [ - "#F0E9E9", -]; \ No newline at end of file + "#475569", + "#EA580C", + "#EAB308", + "#CA8A04", + "#84CC16", + "#4D7C0F", + "#10B981", + "#06B6D4", + "#4338CA", + "#A855F7", + "#86198F", + "#FB7185", + "#EC4899", + "#9D174D", + "#F43F5E", +]; diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index ed034d2..6a896fc 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -12,6 +12,8 @@ class DatabaseSeeder extends Seeder public function run(): void { User::factory(35)->create(); - User::factory(["email" => env("USER_EMAIL")])->create(); + User::factory([ + "email" => env("USER_EMAIL"), + ])->create(); } } diff --git a/resources/js/Pages/Users/Create.vue b/resources/js/Pages/Users/Create.vue index 45b231b..c2acf74 100644 --- a/resources/js/Pages/Users/Create.vue +++ b/resources/js/Pages/Users/Create.vue @@ -10,7 +10,7 @@

diff --git a/resources/js/Pages/Users/Edit.vue b/resources/js/Pages/Users/Edit.vue index aea3270..5431ce9 100644 --- a/resources/js/Pages/Users/Edit.vue +++ b/resources/js/Pages/Users/Edit.vue @@ -10,7 +10,7 @@

diff --git a/resources/js/Pages/Users/Index.vue b/resources/js/Pages/Users/Index.vue index 8d381ea..ac6493f 100644 --- a/resources/js/Pages/Users/Index.vue +++ b/resources/js/Pages/Users/Index.vue @@ -76,7 +76,7 @@
Open user menu "Błędny login lub hasło.", "password" => "Podane hasło jest nieprawidłowe.", "throttle" => "Za dużo nieudanych prób logowania. Proszę spróbować za :seconds sekund.", -]; \ No newline at end of file +]; diff --git a/resources/lang/pl/pagination.php b/resources/lang/pl/pagination.php index 3d3e2db..49e8df0 100644 --- a/resources/lang/pl/pagination.php +++ b/resources/lang/pl/pagination.php @@ -5,4 +5,4 @@ declare(strict_types=1); return [ "next" => "Następna", "previous" => "Poprzednia", -]; \ No newline at end of file +]; diff --git a/resources/lang/pl/passwords.php b/resources/lang/pl/passwords.php index 01396c9..2a4dd05 100644 --- a/resources/lang/pl/passwords.php +++ b/resources/lang/pl/passwords.php @@ -8,4 +8,4 @@ return [ "throttled" => "Proszę zaczekać zanim spróbujesz ponownie.", "token" => "Token resetowania hasła jest nieprawidłowy.", "user" => "Nie znaleziono użytkownika z takim adresem e-mail.", -]; \ No newline at end of file +]; diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php index 07f05f1..09fdc6d 100644 --- a/resources/lang/pl/validation.php +++ b/resources/lang/pl/validation.php @@ -114,4 +114,4 @@ return [ "uploaded" => "Nie udało się wgrać pliku :attribute.", "url" => "Format pola :attribute jest nieprawidłowy.", "uuid" => "Pole :attribute musi być poprawnym identyfikatorem UUID.", -]; \ No newline at end of file +]; diff --git a/routes/web.php b/routes/web.php index ca1ec45..5479b3e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -21,4 +21,4 @@ Route::middleware("guest")->group(function (): void { ->name("login.google.start"); Route::get("login/google/end", [GoogleController::class, "callback"]) ->name("login.google.end"); -}); \ No newline at end of file +}); diff --git a/tests/Feature/UserTest.php b/tests/Feature/UserTest.php new file mode 100644 index 0000000..595d5b6 --- /dev/null +++ b/tests/Feature/UserTest.php @@ -0,0 +1,23 @@ +create(); + + $this->actingAs($user) + ->get("/users") + ->assertOk(); + } +}