wip

app/Filament/Company/Clusters/Settings/Pages/Appearance.php

@@ -49,7 +49,7 @@ class Appearance extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

app/Filament/Company/Clusters/Settings/Pages/CompanyDefault.php

@@ -59,7 +59,7 @@ class CompanyDefault extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

app/Filament/Company/Clusters/Settings/Pages/CompanyProfile.php

@@ -62,7 +62,7 @@ class CompanyProfile extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

app/Filament/Company/Clusters/Settings/Pages/Invoice.php

@@ -63,7 +63,7 @@ class Invoice extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

app/Filament/Company/Clusters/Settings/Pages/Localization.php

@@ -60,7 +60,7 @@ class Localization extends Page
         return translate(static::$title);
     }
 
-    public function getMaxContentWidth(): MaxWidth
+    public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenTwoExtraLarge;
     }

app/Filament/Components/PanelShiftDropdown.php

@@ -193,7 +193,7 @@ class PanelShiftDropdown implements Plugin
             $panels['main']['items'][] = [
                 'panelId' => $companySettingsId,
                 'label' => 'Company Settings',
-                'icon' => 'heroicon-m-building-office-2',
+                'icon' => 'heroicon-s-building-office-2',
             ];
 
             $panels[$companySettingsId] = [

app/Filament/User/Clusters/Account.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Filament\User\Clusters;
+
+use Filament\Clusters\Cluster;
+
+class Account extends Cluster
+{
+    protected static ?string $navigationIcon = 'heroicon-s-user';
+
+    protected static ?string $navigationLabel = 'My Account';
+
+    protected static ?string $clusterBreadcrumb = 'My Account';
+
+    public static function getNavigationUrl(): string
+    {
+        return static::getUrl(panel: 'user');
+    }
+}

app/Filament/User/Clusters/Account/Pages/PersonalAccessTokens.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\User\Clusters\Account\Pages;
+
+use App\Filament\User\Clusters\Account;
+use Filament\Support\Enums\MaxWidth;
+use Wallo\FilamentCompanies\Pages\User\PersonalAccessTokens as BasePersonalAccessTokens;
+
+class PersonalAccessTokens extends BasePersonalAccessTokens
+{
+    protected static ?string $cluster = Account::class;
+
+    protected static bool $shouldRegisterNavigation = true;
+
+    protected static ?int $navigationSort = 20;
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return MaxWidth::ScreenTwoExtraLarge;
+    }
+}

app/Filament/User/Clusters/Account/Pages/Profile.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Filament\User\Clusters\Account\Pages;
+
+use App\Filament\User\Clusters\Account;
+use Filament\Support\Enums\MaxWidth;
+use Wallo\FilamentCompanies\Pages\User\Profile as BaseProfile;
+
+class Profile extends BaseProfile
+{
+    protected static ?string $cluster = Account::class;
+
+    protected static bool $shouldRegisterNavigation = true;
+
+    protected static ?int $navigationSort = 10;
+
+    public function getMaxContentWidth(): MaxWidth | string | null
+    {
+        return MaxWidth::ScreenTwoExtraLarge;
+    }
+}

app/Http/Responses/LoginResponse.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Http\Responses;
+
+use Filament\Facades\Filament;
+use Illuminate\Http\RedirectResponse;
+use Livewire\Features\SupportRedirects\Redirector;
+
+class LoginResponse extends \Filament\Http\Responses\Auth\LoginResponse
+{
+    public function toResponse($request): RedirectResponse | Redirector
+    {
+        return redirect()->to(Filament::getDefaultPanel()->getUrl());
+    }
+}

app/Livewire/UpdateProfileInformation.php

@@ -132,10 +132,19 @@ class UpdateProfileInformation extends Component implements HasForms
             ->schema([
                 Forms\Components\FileUpload::make('profile_photo_path')
                     ->label('Photo')
-                    ->avatar()
                     ->extraAttributes([
                         'style' => 'width: 6rem; height: 6rem;',
                     ])
+                    ->panelLayout('compact circle')
+                    ->removeUploadedFileButtonPosition('center bottom')
+                    ->uploadButtonPosition('center bottom')
+                    ->imageResizeMode('cover')
+                    ->imageResizeUpscale(false)
+                    ->imageResizeTargetHeight('500')
+                    ->imageResizeTargetWidth('500')
+                    ->imageCropAspectRatio('1:1')
+                    ->uploadProgressIndicatorPosition('center bottom')
+                    ->loadingIndicatorPosition('center bottom')
                     ->placeholder(static function () {
                         return new HtmlString('
                             <div style="display: inline-block; cursor: pointer;">

app/Providers/AppServiceProvider.php

@@ -3,7 +3,7 @@
 namespace App\Providers;
 
 use App\Services\DateRangeService;
-use BezhanSalleh\PanelSwitch\PanelSwitch;
+use Filament\Http\Responses\Auth\Contracts\LoginResponse;
 use Filament\Notifications\Livewire\Notifications;
 use Filament\Support\Assets\Js;
 use Filament\Support\Enums\Alignment;
@@ -18,6 +18,7 @@ class AppServiceProvider extends ServiceProvider
     public function register(): void
     {
         $this->app->singleton(DateRangeService::class);
+        $this->app->singleton(LoginResponse::class, \App\Http\Responses\LoginResponse::class);
     }
 
     /**
@@ -27,38 +28,8 @@ class AppServiceProvider extends ServiceProvider
     {
         Notifications::alignment(Alignment::Center);
 
-        $this->configurePanelSwitch();
-
         FilamentAsset::register([
             Js::make('TopNavigation', __DIR__ . '/../../resources/js/TopNavigation.js'),
         ]);
     }
-
-    /**
-     * Configure the panel switch.
-     */
-    protected function configurePanelSwitch(): void
-    {
-        PanelSwitch::configureUsing(function (PanelSwitch $panelSwitch) {
-            $panelSwitch
-                ->modalHeading('Switch Panel')
-                ->modalWidth('md')
-                ->slideOver()
-                ->excludes(['admin'])
-                ->iconSize(16)
-                ->icons(function () {
-                    if (auth()->user()?->belongsToCompany(auth()->user()?->currentCompany)) {
-                        return [
-                            'user' => 'heroicon-o-user',
-                            'company' => 'heroicon-o-building-office',
-                        ];
-                    }
-
-                    return [
-                        'user' => 'heroicon-o-user',
-                        'company' => 'icon-building-add',
-                    ];
-                });
-        });
-    }
 }

app/Providers/Filament/UserPanelProvider.php

@@ -2,17 +2,18 @@
 
 namespace App\Providers\Filament;
 
+use App\Filament\Components\PanelShiftDropdown;
+use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\Authenticate;
 use Exception;
 use Filament\Http\Middleware\DisableBladeIconComponents;
 use Filament\Http\Middleware\DispatchServingFilamentEvent;
-use Filament\Navigation\MenuItem;
+use Filament\Navigation\NavigationBuilder;
 use Filament\Navigation\NavigationItem;
 use Filament\Pages;
 use Filament\Panel;
 use Filament\PanelProvider;
 use Filament\Support\Colors\Color;
-use Filament\Widgets;
 use Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse;
 use Illuminate\Cookie\Middleware\EncryptCookies;
 use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken;
@@ -33,33 +34,36 @@ class UserPanelProvider extends PanelProvider
         return $panel
             ->id('user')
             ->path('user')
-            ->userMenuItems([
-                'profile' => MenuItem::make()
-                    ->label('Profile')
-                    ->icon('heroicon-o-user-circle')
-                    ->url(static fn () => url(Profile::getUrl())),
-            ])
-            ->navigationItems([
-                NavigationItem::make('Personal Access Tokens')
-                    ->label(static fn (): string => __('filament-companies::default.navigation.links.tokens'))
-                    ->icon('heroicon-o-key')
-                    ->url(static fn () => url(PersonalAccessTokens::getUrl())),
-            ])
+            ->plugin(
+                PanelShiftDropdown::make()
+                    ->logoutItem()
+                    ->companySettings(false)
+                    ->navigation(function (NavigationBuilder $builder): NavigationBuilder {
+                        return $builder
+                            ->items([
+                                ...Account::getNavigationItems(),
+                                NavigationItem::make('company')
+                                    ->label('Company Dashboard')
+                                    ->icon('heroicon-s-building-office-2')
+                                    ->url(static fn (): string => Pages\Dashboard::getUrl(panel: 'company', tenant: auth()->user()->personalCompany())),
+                            ]);
+                    }),
+            )
             ->colors([
                 'primary' => Color::Indigo,
             ])
+            ->navigation(false)
             ->viteTheme('resources/css/filament/user/theme.css')
             ->discoverResources(in: app_path('Filament/User/Resources'), for: 'App\\Filament\\User\\Resources')
             ->discoverPages(in: app_path('Filament/User/Pages'), for: 'App\\Filament\\User\\Pages')
+            ->discoverClusters(in: app_path('Filament/User/Clusters'), for: 'App\\Filament\\User\\Clusters')
+            ->discoverWidgets(in: app_path('Filament/User/Widgets'), for: 'App\\Filament\\User\\Widgets')
             ->pages([
-                Pages\Dashboard::class,
                 Profile::class,
                 PersonalAccessTokens::class,
             ])
-            ->discoverWidgets(in: app_path('Filament/User/Widgets'), for: 'App\\Filament\\User\\Widgets')
             ->widgets([
-                Widgets\AccountWidget::class,
-                Widgets\FilamentInfoWidget::class,
+                //
             ])
             ->middleware([
                 EncryptCookies::class,

app/Providers/FilamentCompaniesServiceProvider.php

@@ -28,6 +28,7 @@ use App\Filament\Company\Pages\Service\LiveCurrency;
 use App\Filament\Company\Resources\Banking\AccountResource;
 use App\Filament\Company\Resources\Core\DepartmentResource;
 use App\Filament\Components\PanelShiftDropdown;
+use App\Filament\User\Clusters\Account;
 use App\Http\Middleware\ConfigureCurrentCompany;
 use App\Livewire\UpdatePassword;
 use App\Livewire\UpdateProfileInformation;
@@ -102,7 +103,11 @@ class FilamentCompaniesServiceProvider extends PanelProvider
             ->plugin(
                 PanelShiftDropdown::make()
                     ->logoutItem()
-                    ->companySettings(),
+                    ->companySettings()
+                    ->navigation(function (NavigationBuilder $builder): NavigationBuilder {
+                        return $builder
+                            ->items(Account::getNavigationItems());
+                    }),
             )
             ->colors([
                 'primary' => Color::Indigo,

composer.json

@@ -17,7 +17,6 @@
         "andrewdwallo/transmatic": "^1.1",
         "awcodes/filament-table-repeater": "^3.0",
         "barryvdh/laravel-snappy": "^1.0",
-        "bezhansalleh/filament-panel-switch": "^1.0",
         "filament/filament": "^3.2.115",
         "guava/filament-clusters": "^1.1",
         "guzzlehttp/guzzle": "^7.8",

composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "a745e09991b771592a6638bed644713c",
+    "content-hash": "16a2f09cb501fed46d806dc5c4cc51f7",
     "packages": [
         {
             "name": "akaunting/laravel-money",
@@ -748,84 +748,6 @@
             ],
             "time": "2024-03-09T19:20:39+00:00"
         },
-        {
-            "name": "bezhansalleh/filament-panel-switch",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/bezhanSalleh/filament-panel-switch.git",
-                "reference": "91f9b2a7149bcc2564d68e3decb5771287105620"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/bezhanSalleh/filament-panel-switch/zipball/91f9b2a7149bcc2564d68e3decb5771287105620",
-                "reference": "91f9b2a7149bcc2564d68e3decb5771287105620",
-                "shasum": ""
-            },
-            "require": {
-                "filament/filament": "^3.0",
-                "php": "^8.1",
-                "spatie/laravel-package-tools": "^1.15.0"
-            },
-            "require-dev": {
-                "laravel/pint": "^1.0",
-                "nunomaduro/collision": "^7.9",
-                "orchestra/testbench": "^8.0",
-                "pestphp/pest": "^2.0",
-                "pestphp/pest-plugin-arch": "^2.0",
-                "pestphp/pest-plugin-laravel": "^2.0",
-                "spatie/laravel-ray": "^1.26"
-            },
-            "type": "library",
-            "extra": {
-                "laravel": {
-                    "providers": [
-                        "BezhanSalleh\\PanelSwitch\\PanelSwitchServiceProvider"
-                    ],
-                    "aliases": {
-                        "PanelSwitch": "BezhanSalleh\\PanelSwitch\\Facades\\PanelSwitch"
-                    }
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "BezhanSalleh\\PanelSwitch\\": "src/",
-                    "BezhanSalleh\\PanelSwitch\\Database\\Factories\\": "database/factories/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bezhan Salleh",
-                    "email": "bezhan_salleh@yahoo.com",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Easily Switch between your Filament Panels",
-            "homepage": "https://github.com/bezhansalleh/filament-panel-switch",
-            "keywords": [
-                "bezhanSalleh",
-                "filament",
-                "filament-panel-switch",
-                "panel-changer",
-                "panel-navigation",
-                "panel-switch"
-            ],
-            "support": {
-                "issues": "https://github.com/bezhansalleh/filament-panel-switch/issues",
-                "source": "https://github.com/bezhansalleh/filament-panel-switch"
-            },
-            "funding": [
-                {
-                    "url": "https://github.com/bezhanSalleh",
-                    "type": "github"
-                }
-            ],
-            "time": "2024-08-07T23:51:12+00:00"
-        },
         {
             "name": "blade-ui-kit/blade-heroicons",
             "version": "2.4.0",

resources/css/filament/user/tailwind.config.js

@@ -5,6 +5,7 @@ export default {
     content: [
         './app/Filament/User/**/*.php',
         './resources/views/filament/user/**/*.blade.php',
+        './resources/views/components/**/*.blade.php',
         './vendor/filament/**/*.blade.php',
         './vendor/andrewdwallo/filament-companies/resources/views/**/*.blade.php',
         './vendor/bezhansalleh/filament-panel-switch/resources/views/panel-switch-menu.blade.php',

resources/views/components/panel-shift-dropdown.blade.php

@@ -1,4 +1,5 @@
 @php
+    $user = filament()->auth()->user();
     $items = filament()->getUserMenuItems();
     $logoutItem = $items['logout'] ?? null;
     $currentTenant = filament()->getTenant();
@@ -15,12 +16,19 @@
     <div x-on:click="toggleDropdown" class="flex cursor-pointer">
         <button
             type="button"
-            class="fi-tenant-menu-trigger group flex w-full items-center justify-center gap-x-3 rounded-lg p-2 text-sm font-medium outline-none transition duration-75 hover:bg-gray-100 focus-visible:bg-gray-100 dark:hover:bg-white/5 dark:focus-visible:bg-white/5"
+            class="flex items-center justify-center gap-x-3 rounded-lg p-2 text-sm font-medium outline-none transition duration-75 hover:bg-gray-100 focus-visible:bg-gray-100 dark:hover:bg-white/5 dark:focus-visible:bg-white/5"
         >
-            <x-filament-panels::avatar.tenant
-                :tenant="$currentTenant"
-                class="shrink-0"
-            />
+            @if($currentTenant)
+                <x-filament-panels::avatar.tenant
+                    :tenant="$currentTenant"
+                    class="shrink-0"
+                />
+            @else
+                <x-filament-panels::avatar.user
+                    :user="$user"
+                    class="shrink-0"
+                />
+            @endif
 
             <span class="grid justify-items-start text-start">
                 @if ($currentTenant instanceof \Filament\Models\Contracts\HasCurrentTenantLabel)
@@ -30,7 +38,7 @@
                 @endif
 
                 <span class="text-gray-950 dark:text-white">
-                    {{ $currentTenantName }}
+                    {{ $currentTenantName ?? filament()->getUserName($user) }}
                 </span>
             </span>
 

resources/views/vendor/filament-panel-switch/panel-switch-menu.blade.php

@@ -1,107 +0,0 @@
-@php
-    $getUrlScheme = (string) app()->environment('production') ? 'https://' : 'http://';
-
-    $getPanelPath = fn (\Filament\Panel $panel): string => filled($domains = $panel->getDomains())
-            ? str(collect($domains)->first())->prepend($getUrlScheme)->toString()
-            : str($panel->getPath())->prepend('/')->toString();
-
-    $getHref = fn (\Filament\Panel $panel): ?string => $canSwitchPanels && $panel->getId() !== $currentPanel->getId()
-            ? $getPanelPath($panel)
-            : null;
-@endphp
-
-@if ($isSimple)
-    <x-filament::dropdown teleport placement="bottom-end">
-        <x-slot name="trigger">
-            <div x-data="{ open: false }" @click.outside="open = false">
-                <button type="button" @click="open = !open" class="flex items-center justify-center gap-x-2 rounded-lg px-3 py-2 text-sm font-semibold outline-none transition duration-75 hover:bg-gray-50 focus-visible:bg-gray-50 dark:hover:bg-white/5 dark:focus-visible:bg-white/5 text-gray-700 dark:text-gray-200">
-                    <span class="ml-4">{{  $labels[$currentPanel->getId()] ?? str($currentPanel->getId())->ucfirst() }}</span>
-                    <x-heroicon-m-chevron-down x-show="!open" class="w-5 h-5 text-gray-400 dark:text-gray-500" />
-                    <x-heroicon-m-chevron-up x-show="open" x-cloak class="w-5 h-5 text-gray-400 dark:text-gray-500" />
-                </button>
-            </div>
-        </x-slot>
-
-        <x-filament::dropdown.list>
-            @foreach ($panels as $panel)
-                <x-filament::dropdown.list.item
-                    :href="$getHref($panel)"
-                    :icon="$icons[$panel->getId()] ?? 'heroicon-s-square-2-stack'"
-                    tag="a"
-                >
-                    {{ $labels[$panel->getId()] ?? str($panel->getId())->ucfirst() }}
-                </x-filament::dropdown.list.item>
-            @endforeach
-        </x-filament::dropdown.list>
-    </x-filament::dropdown>
-@else
-    <style>
-        .panel-switch-modal .fi-modal-content {
-            align-items: center !important;
-            justify-content: center !important;
-        }
-    </style>
-    <x-filament::icon-button
-        x-data="{}"
-        icon="heroicon-o-square-3-stack-3d"
-        icon-alias="panels::panel-switch-modern-icon"
-        icon-size="lg"
-        @click="$dispatch('open-modal', { id: 'panel-switch' })"
-        label="Switch Panels"
-        class="text-gray-700 dark:text-primary-500"
-    />
-
-    <x-filament::modal
-        id="panel-switch"
-        :width="$modalWidth"
-        alignment="center"
-        display-classes="block"
-        :slide-over="$isSlideOver"
-        :sticky-header="$isSlideOver"
-        :heading="$heading"
-        class="panel-switch-modal"
-    >
-        <div
-            class="flex flex-wrap items-center justify-center gap-4 md:gap-6"
-        >
-            @foreach ($panels as $panel)
-                <!-- x-on:click="location.href = '{{ $getHref($panel) }}'" -->
-                <a
-                    href="{{ $getHref($panel) }}"
-                    class="flex flex-col items-center justify-center flex-1 hover:cursor-pointer group panel-switch-card"
-                >
-                    <div
-                        @class([
-                            "p-2 bg-white rounded-lg shadow-md dark:bg-gray-800 panel-switch-card-section",
-                            "group-hover:ring-2 group-hover:ring-primary-600" => $panel->getId() !== $currentPanel->getId(),
-                            "ring-2 ring-primary-600" => $panel->getId() === $currentPanel->getId(),
-                        ])
-                    >
-                        @if ($renderIconAsImage)
-                            <img
-                                class="rounded-lg panel-switch-card-image"
-                                style="width: {{ $iconSize * 4 }}px; height: {{ $iconSize * 4 }}px;"
-                                src="{{ $icons[$panel->getId()] ?? 'https://raw.githubusercontent.com/bezhanSalleh/filament-panel-switch/3.x/art/banner.jpg' }}"
-                                alt="Panel Image"
-                            >
-                        @else
-                            @php
-                                $iconName = $icons[$panel->getId()] ?? 'heroicon-s-square-2-stack' ;
-                            @endphp
-                            @svg($iconName, 'text-primary-600 panel-switch-card-icon', ['style' => 'width: ' . ($iconSize * 4) . 'px; height: ' . ($iconSize * 4). 'px;'])
-                        @endif
-                    </div>
-                    <span
-                        @class([
-                            "mt-2 text-sm font-medium text-center text-gray-400 dark:text-gray-200 break-words panel-switch-card-title",
-                            "text-gray-400 dark:text-gray-200 group-hover:text-primary-600 group-hover:dark:text-primary-400" => $panel->getId() !== $currentPanel->getId(),
-                            "text-primary-600 dark:text-primary-400" => $panel->getId() === $currentPanel->getId(),
-                        ])
-                    >
-                        {{ $labels[$panel->getId()] ?? str($panel->getId())->ucfirst()}}
-                    </span>
-                </a>
-            @endforeach
-        </div>
-    </x-filament::modal>
-@endif

resources/views/vendor/filament-panels/components/user-menu.blade.php

@@ -12,11 +12,10 @@
     $items = \Illuminate\Support\Arr::except($items, ['account', 'logout', 'profile']);
 
     $hasPanelShiftDropdown = filament()->hasPlugin('panel-shift-dropdown');
-    $hasTenant = filament()->getTenant() !== null;
 @endphp
 
 
-@if($hasTenant)
+@if($hasPanelShiftDropdown)
     {{ \Filament\Support\Facades\FilamentView::renderHook(\Filament\View\PanelsRenderHook::USER_MENU_BEFORE) }}
 @endif
 
@@ -35,7 +34,7 @@
                 type="button"
                 class="shrink-0"
             >
-                <x-filament-panels::avatar.user :user="$user" />
+                <x-filament-panels::avatar.user :user="$user"/>
             </button>
         </x-slot>
 
@@ -68,7 +67,7 @@
 
         @if (filament()->hasDarkMode() && (! filament()->hasDarkModeForced()))
             <x-filament::dropdown.list>
-                <x-filament-panels::theme-switcher />
+                <x-filament-panels::theme-switcher/>
             </x-filament::dropdown.list>
         @endif