From 14cb378de3dfa5e5612bc385f6ee42b478def2d6 Mon Sep 17 00:00:00 2001 From: Sheldon Corcoran Date: Thu, 30 Oct 2025 21:43:44 -0700 Subject: [PATCH 1/5] Update sidebar layout --- resources/views/components/app-logo.blade.php | 25 ++++- .../components/layouts/app/sidebar.blade.php | 103 +++++------------- 2 files changed, 48 insertions(+), 80 deletions(-) diff --git a/resources/views/components/app-logo.blade.php b/resources/views/components/app-logo.blade.php index 2ccc0810..68236262 100644 --- a/resources/views/components/app-logo.blade.php +++ b/resources/views/components/app-logo.blade.php @@ -1,6 +1,19 @@ -
- -
-
- Laravel Starter Kit -
+@blaze + +@props([ + 'sidebar' => false, +]) + +@if($sidebar) + + + + + +@else + + + + + +@endif diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php index fde99436..c93aa2c1 100644 --- a/resources/views/components/layouts/app/sidebar.blade.php +++ b/resources/views/components/layouts/app/sidebar.blade.php @@ -4,78 +4,36 @@ @include('partials.head') - - - - - - - - - - {{ __('Dashboard') }} - - + + + + + + + + + + {{ __('Dashboard') }} + + + - - - {{ __('Repository') }} - + + + {{ __('Repository') }} + - - {{ __('Documentation') }} - - + + {{ __('Documentation') }} + + - - + + @@ -92,17 +50,14 @@ class="flex h-full w-full items-center justify-center rounded-lg bg-neutral-200
- - - {{ auth()->user()->initials() }} - - +
- {{ auth()->user()->name }} - {{ auth()->user()->email }} + {{ auth()->user()->name }} + {{ auth()->user()->email }}
From 47598901691479b2bfaf08cb5f2dce3bcc7b5d63 Mon Sep 17 00:00:00 2001 From: Sheldon Corcoran Date: Thu, 30 Oct 2025 22:39:25 -0700 Subject: [PATCH 2/5] Update header layout --- .../components/desktop-user-menu.blade.php | 32 +++++++ .../components/layouts/app/header.blade.php | 94 +++++-------------- .../components/layouts/app/sidebar.blade.php | 2 +- 3 files changed, 57 insertions(+), 71 deletions(-) create mode 100644 resources/views/components/desktop-user-menu.blade.php diff --git a/resources/views/components/desktop-user-menu.blade.php b/resources/views/components/desktop-user-menu.blade.php new file mode 100644 index 00000000..b9b59a97 --- /dev/null +++ b/resources/views/components/desktop-user-menu.blade.php @@ -0,0 +1,32 @@ + + + + +
+ +
+ {{ auth()->user()->name }} + {{ auth()->user()->email }} +
+
+ + + + {{ __('Settings') }} + +
+ @csrf + + {{ __('Log Out') }} + +
+ + + diff --git a/resources/views/components/layouts/app/header.blade.php b/resources/views/components/layouts/app/header.blade.php index 4278eccf..877b9f30 100644 --- a/resources/views/components/layouts/app/header.blade.php +++ b/resources/views/components/layouts/app/header.blade.php @@ -5,11 +5,9 @@ - + - - - + @@ -43,78 +41,34 @@ class="h-10 max-lg:hidden [&>div>svg]:size-5" - - - - - - -
-
- - - {{ auth()->user()->initials() }} - - - -
- {{ auth()->user()->name }} - {{ auth()->user()->email }} -
-
-
- - - - - - {{ __('Settings') }} - - - - -
- @csrf - - {{ __('Log Out') }} - -
- - + - - - - - - - - - - - {{ __('Dashboard') }} - - - + + + + + + + + + + {{ __('Dashboard') }} + + + - - - {{ __('Repository') }} - - - - {{ __('Documentation') }} - - + + + {{ __('Repository') }} + + + {{ __('Documentation') }} + + {{ $slot }} diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php index c93aa2c1..b1e76e48 100644 --- a/resources/views/components/layouts/app/sidebar.blade.php +++ b/resources/views/components/layouts/app/sidebar.blade.php @@ -30,7 +30,7 @@ - + From 7a0f938e579e70cc0be74617e289ce28992f912e Mon Sep 17 00:00:00 2001 From: Sheldon Corcoran Date: Fri, 7 Nov 2025 04:37:55 -0800 Subject: [PATCH 3/5] Bump flux version requirement --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1fba8a51..8851df08 100644 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "laravel/fortify": "^1.30", "laravel/framework": "^12.0", "laravel/tinker": "^2.10.1", - "livewire/flux": "^2.1.1", + "livewire/flux": "^2.3.2", "livewire/volt": "^1.7.0" }, "require-dev": { From aa9c819e6086878036fcffe6cedd99eb4b957f50 Mon Sep 17 00:00:00 2001 From: Sheldon Corcoran Date: Fri, 7 Nov 2025 04:38:58 -0800 Subject: [PATCH 4/5] Remove erroneous blaze directive --- resources/views/components/app-logo.blade.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/resources/views/components/app-logo.blade.php b/resources/views/components/app-logo.blade.php index 68236262..26e8f686 100644 --- a/resources/views/components/app-logo.blade.php +++ b/resources/views/components/app-logo.blade.php @@ -1,5 +1,3 @@ -@blaze - @props([ 'sidebar' => false, ]) From bda36606285974b5c702293e597d1f7e8f5c18ec Mon Sep 17 00:00:00 2001 From: Sheldon Corcoran Date: Fri, 7 Nov 2025 04:40:06 -0800 Subject: [PATCH 5/5] Fix missing name in sidebar user menu --- resources/views/components/desktop-user-menu.blade.php | 1 + resources/views/components/layouts/app/sidebar.blade.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/components/desktop-user-menu.blade.php b/resources/views/components/desktop-user-menu.blade.php index b9b59a97..c6ac2e3c 100644 --- a/resources/views/components/desktop-user-menu.blade.php +++ b/resources/views/components/desktop-user-menu.blade.php @@ -1,5 +1,6 @@ only('name') }} :initials="auth()->user()->initials()" icon:trailing="chevrons-up-down" data-test="sidebar-menu-button" diff --git a/resources/views/components/layouts/app/sidebar.blade.php b/resources/views/components/layouts/app/sidebar.blade.php index b1e76e48..8698db3f 100644 --- a/resources/views/components/layouts/app/sidebar.blade.php +++ b/resources/views/components/layouts/app/sidebar.blade.php @@ -30,7 +30,7 @@ -