From 646543cfee7efd367ec3876bb62cf3c3de1ef5af Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Tue, 15 Mar 2022 15:01:28 +0100 Subject: [PATCH 1/9] #75 - fix data leak to ui-avatars --- app/Eloquent/Models/User.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php index baf733b..f0686d2 100644 --- a/app/Eloquent/Models/User.php +++ b/app/Eloquent/Models/User.php @@ -13,6 +13,7 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Carbon; use Illuminate\Support\Collection; +use Illuminate\Support\Str; use Rackbeat\UIAvatars\HasAvatar; use Toby\Domain\Enums\EmploymentForm; use Toby\Domain\Enums\Role; @@ -101,9 +102,9 @@ class User extends Authenticatable return $this->role === $role; } - protected function getAvatarNameKey(): string + protected function getAvatarName(): string { - return "fullName"; + return mb_substr($this->first_name, 0, 1) . mb_substr($this->last_name, 0, 1); } protected static function newFactory(): UserFactory -- 2.52.0 From 894a1468b2a0893f7a535485a6ca5fe06265e90f Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Tue, 15 Mar 2022 15:29:19 +0100 Subject: [PATCH 2/9] #75 - ecs fix --- app/Eloquent/Models/User.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Eloquent/Models/User.php b/app/Eloquent/Models/User.php index f0686d2..5ee6230 100644 --- a/app/Eloquent/Models/User.php +++ b/app/Eloquent/Models/User.php @@ -13,7 +13,6 @@ use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; use Illuminate\Support\Carbon; use Illuminate\Support\Collection; -use Illuminate\Support\Str; use Rackbeat\UIAvatars\HasAvatar; use Toby\Domain\Enums\EmploymentForm; use Toby\Domain\Enums\Role; -- 2.52.0 From 7261c82c572331310568a540b236292fa131da57 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 16 Mar 2022 09:42:17 +0100 Subject: [PATCH 3/9] #75 - new colors --- app/Eloquent/Helpers/ColorGenerator.php | 33 +++++++++++++ app/Eloquent/Models/User.php | 5 +- config/colors.php | 62 +++++++++++++++++++------ 3 files changed, 82 insertions(+), 18 deletions(-) create mode 100644 app/Eloquent/Helpers/ColorGenerator.php diff --git a/app/Eloquent/Helpers/ColorGenerator.php b/app/Eloquent/Helpers/ColorGenerator.php new file mode 100644 index 0000000..0f05be7 --- /dev/null +++ b/app/Eloquent/Helpers/ColorGenerator.php @@ -0,0 +1,33 @@ +getAvatarGenerator() - ->backgroundColor($colors[strlen($this->fullname) % count($colors)]) + ->backgroundColor(ColorGenerator::generate($this->fullName)) ->image(); } diff --git a/config/colors.php b/config/colors.php index 0b8a3ad..ca120b3 100644 --- a/config/colors.php +++ b/config/colors.php @@ -3,19 +3,51 @@ declare(strict_types=1); return [ - "#475569", - "#EA580C", - "#EAB308", - "#CA8A04", - "#84CC16", - "#4D7C0F", - "#10B981", - "#06B6D4", - "#4338CA", - "#A855F7", - "#86198F", - "#FB7185", - "#EC4899", - "#9D174D", - "#F43F5E", + '#fda4af', + '#f43f5e', + '#e11d48', + '#f9a8d4', + '#ec4899', + '#db2777', + '#f0abfc', + '#d946ef', + '#c026d3', + '#d8b4fe', + '#a855f7', + '#9333ea', + '#c4b5fd', + '#8b5cf6', + '#7c3aed', + '#a5b4fc', + '#6366f1', + '#4f46e5', + '#93c5fd', + '#3b82f6', + '#2563eb', + '#7dd3fc', + '#0ea5e9', + '#0284c7', + '#67e8f9', + '#06b6d4', + '#0891b2', + '#5eead4', + '#14b8a6', + '#0d9488', + '#86efac', + '#22c55e', + '#16a34a', + '#bef264', + '#84cc16', + '#65a30d', + '#fde047', + '#eab308', + '#ca8a04', + '#fdba74', + '#f97316', + '#ea580c', + '#fca5a5', + '#ef4444', + '#dc2626', + '#4b5563', + '#64748b', ]; -- 2.52.0 From 97cd37519cacd933c7139f4f887145e718a459ef Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 16 Mar 2022 09:47:48 +0100 Subject: [PATCH 4/9] #75 - change font color --- config/ui-avatars.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/ui-avatars.php b/config/ui-avatars.php index 68cbd82..7a4c76d 100644 --- a/config/ui-avatars.php +++ b/config/ui-avatars.php @@ -11,8 +11,8 @@ return [ "rounded" => true, "smooth_rounding" => true, "uppercase" => true, - "background_color" => "#a0a0a0", - "font_color" => "#F4F8FD", + "background_color" => "#A0A0A0", + "font_color" => "#FFFFFF", "font_bold" => true, "providers" => [ "api" => Rackbeat\UIAvatars\Generators\ApiGenerator::class, -- 2.52.0 From 63b5ee051b004dbf060ebd9ba471f40b417d0650 Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 16 Mar 2022 09:49:25 +0100 Subject: [PATCH 5/9] #75 - ecs fix --- app/Eloquent/Helpers/ColorGenerator.php | 2 +- config/colors.php | 94 ++++++++++++------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/app/Eloquent/Helpers/ColorGenerator.php b/app/Eloquent/Helpers/ColorGenerator.php index 0f05be7..323eef0 100644 --- a/app/Eloquent/Helpers/ColorGenerator.php +++ b/app/Eloquent/Helpers/ColorGenerator.php @@ -30,4 +30,4 @@ class ColorGenerator return $hash; } -} \ No newline at end of file +} diff --git a/config/colors.php b/config/colors.php index ca120b3..8c0d932 100644 --- a/config/colors.php +++ b/config/colors.php @@ -3,51 +3,51 @@ declare(strict_types=1); return [ - '#fda4af', - '#f43f5e', - '#e11d48', - '#f9a8d4', - '#ec4899', - '#db2777', - '#f0abfc', - '#d946ef', - '#c026d3', - '#d8b4fe', - '#a855f7', - '#9333ea', - '#c4b5fd', - '#8b5cf6', - '#7c3aed', - '#a5b4fc', - '#6366f1', - '#4f46e5', - '#93c5fd', - '#3b82f6', - '#2563eb', - '#7dd3fc', - '#0ea5e9', - '#0284c7', - '#67e8f9', - '#06b6d4', - '#0891b2', - '#5eead4', - '#14b8a6', - '#0d9488', - '#86efac', - '#22c55e', - '#16a34a', - '#bef264', - '#84cc16', - '#65a30d', - '#fde047', - '#eab308', - '#ca8a04', - '#fdba74', - '#f97316', - '#ea580c', - '#fca5a5', - '#ef4444', - '#dc2626', - '#4b5563', - '#64748b', + "#fda4af", + "#f43f5e", + "#e11d48", + "#f9a8d4", + "#ec4899", + "#db2777", + "#f0abfc", + "#d946ef", + "#c026d3", + "#d8b4fe", + "#a855f7", + "#9333ea", + "#c4b5fd", + "#8b5cf6", + "#7c3aed", + "#a5b4fc", + "#6366f1", + "#4f46e5", + "#93c5fd", + "#3b82f6", + "#2563eb", + "#7dd3fc", + "#0ea5e9", + "#0284c7", + "#67e8f9", + "#06b6d4", + "#0891b2", + "#5eead4", + "#14b8a6", + "#0d9488", + "#86efac", + "#22c55e", + "#16a34a", + "#bef264", + "#84cc16", + "#65a30d", + "#fde047", + "#eab308", + "#ca8a04", + "#fdba74", + "#f97316", + "#ea580c", + "#fca5a5", + "#ef4444", + "#dc2626", + "#4b5563", + "#64748b", ]; -- 2.52.0 From f1dfb124c1c7f714d91f3120d891e82f3f49f891 Mon Sep 17 00:00:00 2001 From: EwelinaLasowy Date: Wed, 16 Mar 2022 10:21:22 +0100 Subject: [PATCH 6/9] #75 - change colors order --- config/colors.php | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/config/colors.php b/config/colors.php index 8c0d932..bd4dc04 100644 --- a/config/colors.php +++ b/config/colors.php @@ -3,51 +3,35 @@ declare(strict_types=1); return [ - "#fda4af", "#f43f5e", "#e11d48", - "#f9a8d4", "#ec4899", "#db2777", - "#f0abfc", "#d946ef", "#c026d3", - "#d8b4fe", "#a855f7", "#9333ea", - "#c4b5fd", - "#8b5cf6", - "#7c3aed", - "#a5b4fc", + "#527aba", + "#3c5f97", "#6366f1", "#4f46e5", - "#93c5fd", "#3b82f6", "#2563eb", - "#7dd3fc", "#0ea5e9", "#0284c7", - "#67e8f9", "#06b6d4", "#0891b2", - "#5eead4", "#14b8a6", "#0d9488", - "#86efac", "#22c55e", "#16a34a", - "#bef264", "#84cc16", "#65a30d", - "#fde047", "#eab308", "#ca8a04", - "#fdba74", "#f97316", "#ea580c", - "#fca5a5", "#ef4444", "#dc2626", "#4b5563", - "#64748b", ]; -- 2.52.0 From 354f9e97471a1f3d96886030680db6def6a981cc Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 16 Mar 2022 11:26:51 +0100 Subject: [PATCH 7/9] #75 - fix --- app/Eloquent/Helpers/ColorGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Eloquent/Helpers/ColorGenerator.php b/app/Eloquent/Helpers/ColorGenerator.php index 323eef0..864ff88 100644 --- a/app/Eloquent/Helpers/ColorGenerator.php +++ b/app/Eloquent/Helpers/ColorGenerator.php @@ -16,7 +16,7 @@ class ColorGenerator return $colors[$index]; } - protected static function calculateHash(string $text): int + protected static function calculateHash(string $text): float { $hash = 0; -- 2.52.0 From 89722eb9ebf38d0b743e73f254d5580f18c03f5a Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 16 Mar 2022 11:50:18 +0100 Subject: [PATCH 8/9] #75 - fix --- app/Eloquent/Helpers/ColorGenerator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Eloquent/Helpers/ColorGenerator.php b/app/Eloquent/Helpers/ColorGenerator.php index 864ff88..ac90f74 100644 --- a/app/Eloquent/Helpers/ColorGenerator.php +++ b/app/Eloquent/Helpers/ColorGenerator.php @@ -16,7 +16,7 @@ class ColorGenerator return $colors[$index]; } - protected static function calculateHash(string $text): float + protected static function calculateHash(string $text): int { $hash = 0; @@ -25,7 +25,7 @@ class ColorGenerator } for ($i = 0; $i < mb_strlen($text); $i++) { - $hash = abs(($hash << 2) - $hash) + mb_ord($text[$i]); + $hash = abs((int) (($hash << 2) - $hash) + mb_ord($text[$i])); } return $hash; -- 2.52.0 From 5fd20eba280fad9d45161aa21786c6093ba04ffc Mon Sep 17 00:00:00 2001 From: Adrian Hopek Date: Wed, 16 Mar 2022 11:52:01 +0100 Subject: [PATCH 9/9] #75 - ecs fix --- app/Eloquent/Helpers/ColorGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Eloquent/Helpers/ColorGenerator.php b/app/Eloquent/Helpers/ColorGenerator.php index ac90f74..b8930f3 100644 --- a/app/Eloquent/Helpers/ColorGenerator.php +++ b/app/Eloquent/Helpers/ColorGenerator.php @@ -25,7 +25,7 @@ class ColorGenerator } for ($i = 0; $i < mb_strlen($text); $i++) { - $hash = abs((int) (($hash << 2) - $hash) + mb_ord($text[$i])); + $hash = abs((int)(($hash << 2) - $hash) + mb_ord($text[$i])); } return $hash; -- 2.52.0