From 77473622fd50783c76f7901a63f1234f9fd54887 Mon Sep 17 00:00:00 2001 From: Marty Friedel Date: Wed, 27 Aug 2025 10:40:25 +0930 Subject: [PATCH 01/14] Update Avatar for 6.x appearance style --- resources/js/components/Avatar.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/js/components/Avatar.vue b/resources/js/components/Avatar.vue index 6ce462c33e6..829c41ac5a9 100644 --- a/resources/js/components/Avatar.vue +++ b/resources/js/components/Avatar.vue @@ -1,10 +1,10 @@ - - From 3c4920979944eaeebb383d87b088a8e1ddeceec9 Mon Sep 17 00:00:00 2001 From: Marty Friedel Date: Wed, 27 Aug 2025 10:59:36 +0930 Subject: [PATCH 03/14] Clean up User Listing size and styles --- resources/js/components/users/Listing.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/components/users/Listing.vue b/resources/js/components/users/Listing.vue index 5afac7ac998..69baa1d5a25 100644 --- a/resources/js/components/users/Listing.vue +++ b/resources/js/components/users/Listing.vue @@ -14,7 +14,7 @@ > From 4d333b21c3dbdf3fcd884c6f3cd00aa7fbc5a8a4 Mon Sep 17 00:00:00 2001 From: Marty Friedel Date: Wed, 27 Aug 2025 11:08:14 +0930 Subject: [PATCH 04/14] Use Vue component throughout the CP --- resources/views/components/avatar.blade.php | 7 ------- resources/views/components/user-dropdown.blade.php | 6 ++++-- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 resources/views/components/avatar.blade.php diff --git a/resources/views/components/avatar.blade.php b/resources/views/components/avatar.blade.php deleted file mode 100644 index babc910c8d6..00000000000 --- a/resources/views/components/avatar.blade.php +++ /dev/null @@ -1,7 +0,0 @@ -@props(['user', 'class' => '']) - -@if ($user->avatar()) - {{ $user->name() }} -@else -
{{ $user->initials() }}
-@endif diff --git a/resources/views/components/user-dropdown.blade.php b/resources/views/components/user-dropdown.blade.php index 3e0225eb4e2..8c48e573e7c 100644 --- a/resources/views/components/user-dropdown.blade.php +++ b/resources/views/components/user-dropdown.blade.php @@ -1,13 +1,15 @@
- +
+ +
{{ $user->email() }}
@if ($user->isSuper()) From e9ab06dee3a32884056207209a906e3dc4d75994 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 24 Sep 2025 10:46:33 -0400 Subject: [PATCH 05/14] Move avatar to ui components --- resources/js/bootstrap/components.js | 2 -- resources/js/components/{ => ui}/Avatar.vue | 0 resources/js/components/ui/index.js | 1 + resources/views/components/user-dropdown.blade.php | 6 +++--- 4 files changed, 4 insertions(+), 5 deletions(-) rename resources/js/components/{ => ui}/Avatar.vue (100%) diff --git a/resources/js/bootstrap/components.js b/resources/js/bootstrap/components.js index eded87fdb21..4b82c9d5cce 100644 --- a/resources/js/bootstrap/components.js +++ b/resources/js/bootstrap/components.js @@ -17,7 +17,6 @@ import FileIcon from '../components/FileIcon.vue'; import Slugify from '../components/slugs/Slugify.vue'; import ElementContainer from '../components/ElementContainer.vue'; -import Avatar from '../components/Avatar.vue'; import CreateEntryButton from '../components/entries/CreateEntryButton.vue'; import Portal from '../components/portals/Portal.vue'; import ConfirmationModal from '../components/modals/ConfirmationModal.vue'; @@ -62,7 +61,6 @@ export default function registerGlobalComponents(app) { app.component('slugify', Slugify); app.component('element-container', ElementContainer); - app.component('avatar', Avatar); app.component('create-entry-button', CreateEntryButton); app.component('portal', Portal); app.component('date-time', DateTime); diff --git a/resources/js/components/Avatar.vue b/resources/js/components/ui/Avatar.vue similarity index 100% rename from resources/js/components/Avatar.vue rename to resources/js/components/ui/Avatar.vue diff --git a/resources/js/components/ui/index.js b/resources/js/components/ui/index.js index b07211b6a75..bed939ed8b4 100644 --- a/resources/js/components/ui/index.js +++ b/resources/js/components/ui/index.js @@ -1,5 +1,6 @@ export * from '../../../../packages/ui/src/index.js'; +export { default as Avatar } from "./Avatar.vue"; export { default as CreateForm } from "./CreateForm.vue"; export { default as LivePreview } from "./LivePreview/LivePreview.vue"; import { default as LivePreviewPopout } from "./LivePreview/Popout.vue"; diff --git a/resources/views/components/user-dropdown.blade.php b/resources/views/components/user-dropdown.blade.php index 13f4eb862ba..9ef1ebab75e 100644 --- a/resources/views/components/user-dropdown.blade.php +++ b/resources/views/components/user-dropdown.blade.php @@ -1,18 +1,18 @@
- +
- +
{{ $user->email() }}
From 6e435ae48d9cb2af107f1771fe692ee4d615a476 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 24 Sep 2025 10:48:11 -0400 Subject: [PATCH 06/14] require user prop but default to empty object so it doesnt completely break --- resources/js/components/ui/Avatar.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/js/components/ui/Avatar.vue b/resources/js/components/ui/Avatar.vue index 12a4451533c..dfec14412d1 100644 --- a/resources/js/components/ui/Avatar.vue +++ b/resources/js/components/ui/Avatar.vue @@ -4,7 +4,11 @@ import { twMerge } from 'tailwind-merge'; import {computed, ref} from "vue"; const props = defineProps({ - user: Object, + user: { + type: Object, + required: true, + default: () => ({}) + }, class: { type: String, default: '' From fa15a43aab5e6042b90431cd84956bc34cf40114 Mon Sep 17 00:00:00 2001 From: Jason Varga Date: Wed, 24 Sep 2025 11:01:34 -0400 Subject: [PATCH 07/14] typescript --- resources/js/components/ui/Avatar.vue | 29 +++++++++++++++++---------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/resources/js/components/ui/Avatar.vue b/resources/js/components/ui/Avatar.vue index dfec14412d1..fff1f8924d2 100644 --- a/resources/js/components/ui/Avatar.vue +++ b/resources/js/components/ui/Avatar.vue @@ -1,18 +1,25 @@ -