Merge branch '3.x' of https://github.com/thedevdojo/wave into 3.x

thedevdojo · Oct 26, 2024 · c688067 · c688067
2 parents e32c80e + ef52fd4
commit c688067
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 199 deletions.
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,8 @@ resources/themes/.gitignore
 /resources/plugins/*
 !/resources/plugins/installed.json
 /storage/app/public/livewire-tmp
+/storage/app/public/*
+!/storage/app/public/demo
 
 # Ignore everything inside the resources/plugins folder
 resources/plugins/*

diff --git a/app/Livewire/Form.php b/app/Livewire/Form.php
diff --git a/app/Livewire/Wave/DeployToDo.php b/app/Livewire/Wave/DeployToDo.php
diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php
@@ -36,30 +36,6 @@ class AdminPanelProvider extends PanelProvider
 {
     protected static ?string $navigationIcon = 'heroicon-o-document-text';
 
-    public function boot(): void
-    {
-        // Filament::serving(function () {
-        //     Filament::registerNavigationGroups([
-        //         NavigationGroup::make()
-        //             ->label('Roles & Permissions')
-        //             ->icon('phosphor-shield-star-duotone')
-        //             ->collapsed(),
-        //     ]);
-        // });
-
-        // Filament::navigation(function (NavigationBuilder $builder): NavigationBuilder {
-        //     return $builder
-        //         ->groups([
-        //             NavigationGroup::make('Website')
-        //                 ->items([
-        //                     ...UserResource::getNavigationItems(),
-        //                     ...RoleResource::getNavigationItems(),
-        //                     ...PlanResource::getNavigationItems(),
-        //                 ]),
-        //         ]);
-        // });
-    }
-
     public static function getNavigationIcon(): ?string
     {
         return 'heroicon-o-presentation-chart-line';
@@ -76,20 +52,6 @@ public function panel(Panel $panel): Panel
             ->default()
             ->id('admin')
             ->path('admin')
-            // ->navigation(function (NavigationBuilder $builder){
-            //     return $builder
-            //     ->items([
-            //         ...UserResource::getNavigationItems(),
-            //     ])
-            //     ->groups([
-            //         NavigationGroup::make('Roles & Permissions')
-            //             ->icon('phosphor-shield-star-duotone')
-            //             ->items([
-            //                 ...RoleResource::getNavigationItems(),
-            //                 ...PlanResource::getNavigationItems(),
-            //             ])->collapsed(),
-            //     ]);
-            // })
             ->colors([
                 'primary' => Color::Blue,
             ])

diff --git a/resources/themes/anchor/components/app/user-menu.blade.php b/resources/themes/anchor/components/app/user-menu.blade.php
@@ -4,7 +4,7 @@
 <div x-data="{ dropdownOpen: false }" :class="{ 'block z-50 w-auto lg:w-full dark:bg-zinc-900 dark:border-zinc-800' : open, 'hidden': ! open }" class="relative flex-shrink-0 sm:p-0 dark:text-zinc-200 sm:flex sm:w-auto sm:bg-transparent sm:items-center" x-cloak>
     <button @click="dropdownOpen=!dropdownOpen" class="flex p-2.5 lg:p-2 w-full space-x-1 text-[13px] hover:bg-zinc-200/70 rounded-lg justify-between items-center w-full hover:text-black dark:hover:text-zinc-100 dark:hover:bg-zinc-700/60 space-x-1.5 overflow-hidden group-hover:autoflow-auto items">
         <span class="relative flex items-center space-x-2">
-            <img x-data="{ src: '', refreshAvatarSrc(){ this.src='{{ auth()->user()->avatar() }}' + '?' + new Date().getTime() } }" x-init="refreshAvatarSrc()" @refresh-avatar.window="refreshAvatarSrc()" :src="src" class="w-5 h-5 rounded-full" alt="{{ auth()->user()->name }}" x-cloak />
+            <x-avatar src="{{ auth()->user()->avatar() }}" alt="{{ auth()->user()->name }} photo" size="2xs" />
             <span @class([
                 'flex-shrink-0 ease-out duration-50',
                 'hidden' => ($position != 'bottom')

diff --git a/resources/themes/anchor/components/marketing/sections/hero.blade.php b/resources/themes/anchor/components/marketing/sections/hero.blade.php
@@ -14,7 +14,7 @@
                 </div>
             </div>
             <div class="flex items-center justify-center w-full mt-12 lg:w-1/2 lg:mt-0">
-                <img alt="Wave Character" class="relative w-full lg:scale-125 xl:scale-[1.4] xl:translate-x-6" src="/wave/img/character.png" style="max-width:450px;">
+                <img alt="Wave Character" class="relative w-full lg:scale-125 xl:translate-x-6" src="/wave/img/character.png" style="max-width:450px;">
             </div>
         </div>
         <div class="flex-shrink-0 lg:h-[150px] flex border-t border-zinc-200 items-center w-full bg-white">