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": { diff --git a/resources/views/components/app-logo.blade.php b/resources/views/components/app-logo.blade.php index 2ccc0810..26e8f686 100644 --- a/resources/views/components/app-logo.blade.php +++ b/resources/views/components/app-logo.blade.php @@ -1,6 +1,17 @@ -
- -
-
- Laravel Starter Kit -
+@props([ + 'sidebar' => false, +]) + +@if($sidebar) + + + + + +@else + + + + + +@endif 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..c6ac2e3c --- /dev/null +++ b/resources/views/components/desktop-user-menu.blade.php @@ -0,0 +1,33 @@ + + only('name') }} + :initials="auth()->user()->initials()" + icon:trailing="chevrons-up-down" + data-test="sidebar-menu-button" + /> + + +
+ +
+ {{ 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 fde99436..8698db3f 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 }}