From 4c498bb1e3a3c319844f521923814457e40b8945 Mon Sep 17 00:00:00 2001 From: Joel Butcher Date: Fri, 19 Nov 2021 14:48:04 +0000 Subject: [PATCH 1/8] added new default avatar --- resources/views/components/avatar.blade.php | 24 +++++++++++++++------ 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/resources/views/components/avatar.blade.php b/resources/views/components/avatar.blade.php index 4fa880e9f..22d1d903d 100644 --- a/resources/views/components/avatar.blade.php +++ b/resources/views/components/avatar.blade.php @@ -7,13 +7,23 @@ @endunless -merge(['class' => 'rounded-full text-gray-500']) }} -/> +@if ($user->githubUsername()) + merge(['class' => 'rounded-full text-gray-500']) }} + /> +@else +
merge(['class' => 'bg-gray-100 rounded-full text-gray-500 relative flex items-center justify-center']) }}> + {{ $user->name() }} +
+@endif @unless ($unlinked)
From e0541384d5d92f9269cf7e34a786cdad5532d174 Mon Sep 17 00:00:00 2001 From: Joel Butcher Date: Fri, 19 Nov 2021 14:55:35 +0000 Subject: [PATCH 2/8] added tests --- tests/Feature/SettingsTest.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/Feature/SettingsTest.php b/tests/Feature/SettingsTest.php index d689380a6..f284b07ee 100644 --- a/tests/Feature/SettingsTest.php +++ b/tests/Feature/SettingsTest.php @@ -81,6 +81,22 @@ assertPasswordWasHashedAndSaved(); }); +test('users see the their avatar', function () { + $this->login(); + + $this->visit('/settings') + ->see('John Doe'); +}); + +test('users see the default Laravel avatar', function () { + $this->login([ + 'github_username' => null, + ]); + + $this->visit('/settings') + ->see('John Doe'); +}); + test('users cannot update their password when it has been compromised in data leaks', function () { $this->login(); From c356ed1984a20bd3f581bd905afefa1e12ec94d5 Mon Sep 17 00:00:00 2001 From: Joel Butcher Date: Mon, 22 Nov 2021 09:41:39 +0000 Subject: [PATCH 3/8] use laravelio logo --- resources/views/components/avatar.blade.php | 2 +- resources/views/users/settings/profile.blade.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/components/avatar.blade.php b/resources/views/components/avatar.blade.php index 22d1d903d..a92b52dd8 100644 --- a/resources/views/components/avatar.blade.php +++ b/resources/views/components/avatar.blade.php @@ -18,7 +18,7 @@ @else
merge(['class' => 'bg-gray-100 rounded-full text-gray-500 relative flex items-center justify-center']) }}> {{ $user->name() }} diff --git a/resources/views/users/settings/profile.blade.php b/resources/views/users/settings/profile.blade.php index 4c5a3b537..6c5c9f1fe 100644 --- a/resources/views/users/settings/profile.blade.php +++ b/resources/views/users/settings/profile.blade.php @@ -41,7 +41,7 @@