Merge pull request #139 from andrewdwallo/development-3.x

Development 3.x

app/Filament/Company/Pages/Service/ConnectedAccount.php

@@ -2,7 +2,9 @@
 
 namespace App\Filament\Company\Pages\Service;
 
+use App\Services\PlaidService;
 use Filament\Actions\Action;
+use Filament\Navigation\NavigationItem;
 use Filament\Pages\Page;
 use Filament\Support\Enums\MaxWidth;
 use Illuminate\Contracts\Support\Htmlable;
@@ -15,6 +17,11 @@ class ConnectedAccount extends Page
 
     protected static string $view = 'filament.company.pages.service.connected-account';
 
+    public static function canAccess(): bool
+    {
+        return app(PlaidService::class)->isEnabled();
+    }
+
     public function getTitle(): string | Htmlable
     {
         return translate(static::$title);
@@ -34,6 +41,26 @@ class ConnectedAccount extends Page
         ];
     }
 
+    /**
+     * @return array<NavigationItem>
+     */
+    public static function getNavigationItems(): array
+    {
+        return [
+            NavigationItem::make(static::getNavigationLabel())
+                ->visible(static::canAccess())
+                ->group(static::getNavigationGroup())
+                ->parentItem(static::getNavigationParentItem())
+                ->icon(static::getNavigationIcon())
+                ->activeIcon(static::getActiveNavigationIcon())
+                ->isActiveWhen(fn (): bool => request()->routeIs(static::getNavigationItemActiveRoutePattern()))
+                ->sort(static::getNavigationSort())
+                ->badge(static::getNavigationBadge(), color: static::getNavigationBadgeColor())
+                ->badgeTooltip(static::getNavigationBadgeTooltip())
+                ->url(static::getNavigationUrl()),
+        ];
+    }
+
     public function getMaxContentWidth(): MaxWidth | string | null
     {
         return MaxWidth::ScreenLarge;

app/Filament/Company/Pages/Service/LiveCurrency.php

@@ -5,6 +5,7 @@ namespace App\Filament\Company\Pages\Service;
 use App\Facades\Forex;
 use App\Models\Service\CurrencyList;
 use App\Models\Setting\Currency;
+use Filament\Navigation\NavigationItem;
 use Filament\Pages\Page;
 use Illuminate\Contracts\Support\Htmlable;
 use Livewire\Attributes\Url;
@@ -20,25 +21,24 @@ class LiveCurrency extends Page
     #[Url]
     public ?string $activeTab = null;
 
-    public function getTitle(): string | Htmlable
+    public static function canAccess(): bool
     {
-        return translate(static::$title);
+        return Forex::isEnabled();
     }
 
-    public static function getNavigationLabel(): string
+    public function getTitle(): string | Htmlable
     {
         return translate(static::$title);
     }
 
-    public static function shouldRegisterNavigation(): bool
+    public static function getNavigationLabel(): string
     {
-        return Forex::isEnabled();
+        return translate(static::$title);
     }
 
     public function mount(): void
     {
         $this->loadDefaultActiveTab();
-        abort_unless(Forex::isEnabled(), 403);
     }
 
     protected function loadDefaultActiveTab(): void
@@ -62,4 +62,24 @@ class LiveCurrency extends Page
             'companyCurrenciesQuery' => Currency::query()->count(),
         ];
     }
+
+    /**
+     * @return array<NavigationItem>
+     */
+    public static function getNavigationItems(): array
+    {
+        return [
+            NavigationItem::make(static::getNavigationLabel())
+                ->visible(static::canAccess())
+                ->group(static::getNavigationGroup())
+                ->parentItem(static::getNavigationParentItem())
+                ->icon(static::getNavigationIcon())
+                ->activeIcon(static::getActiveNavigationIcon())
+                ->isActiveWhen(fn (): bool => request()->routeIs(static::getNavigationItemActiveRoutePattern()))
+                ->sort(static::getNavigationSort())
+                ->badge(static::getNavigationBadge(), color: static::getNavigationBadgeColor())
+                ->badgeTooltip(static::getNavigationBadgeTooltip())
+                ->url(static::getNavigationUrl()),
+        ];
+    }
 }

app/Filament/User/Clusters/Account.php

@@ -3,6 +3,7 @@
 namespace App\Filament\User\Clusters;
 
 use Filament\Clusters\Cluster;
+use Filament\Navigation\NavigationItem;
 
 class Account extends Cluster
 {
@@ -16,4 +17,29 @@ class Account extends Cluster
     {
         return static::getUrl(panel: 'user');
     }
+
+    public static function canAccess(): bool
+    {
+        return ! app()->environment('demo');
+    }
+
+    /**
+     * @return array<NavigationItem>
+     */
+    public static function getNavigationItems(): array
+    {
+        return [
+            NavigationItem::make(static::getNavigationLabel())
+                ->visible(static::canAccess())
+                ->group(static::getNavigationGroup())
+                ->parentItem(static::getNavigationParentItem())
+                ->icon(static::getNavigationIcon())
+                ->activeIcon(static::getActiveNavigationIcon())
+                ->isActiveWhen(fn (): bool => request()->routeIs(static::getNavigationItemActiveRoutePattern()))
+                ->sort(static::getNavigationSort())
+                ->badge(static::getNavigationBadge(), color: static::getNavigationBadgeColor())
+                ->badgeTooltip(static::getNavigationBadgeTooltip())
+                ->url(static::getNavigationUrl()),
+        ];
+    }
 }

app/Models/User.php

@@ -71,6 +71,10 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
 
     public function canAccessPanel(Panel $panel): bool
     {
+        if ($panel->getId() === 'user' && app()->environment('demo')) {
+            return false;
+        }
+
         return true;
     }
 

app/Policies/CompanyPolicy.php

@@ -31,6 +31,10 @@ class CompanyPolicy
      */
     public function create(User $user): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return true;
     }
 
@@ -39,6 +43,10 @@ class CompanyPolicy
      */
     public function update(User $user, Company $company): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return $user->ownsCompany($company);
     }
 
@@ -47,6 +55,10 @@ class CompanyPolicy
      */
     public function addCompanyEmployee(User $user, Company $company): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return $user->ownsCompany($company);
     }
 
@@ -55,6 +67,10 @@ class CompanyPolicy
      */
     public function updateCompanyEmployee(User $user, Company $company): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return $user->ownsCompany($company);
     }
 
@@ -63,6 +79,10 @@ class CompanyPolicy
      */
     public function removeCompanyEmployee(User $user, Company $company): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return $user->ownsCompany($company);
     }
 
@@ -71,6 +91,10 @@ class CompanyPolicy
      */
     public function delete(User $user, Company $company): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return $user->ownsCompany($company);
     }
 }

app/Providers/Filament/AdminPanelProvider.php

@@ -1,60 +0,0 @@
-<?php
-
-namespace App\Providers\Filament;
-
-use App\Http\Middleware\Authenticate;
-use Exception;
-use Filament\Http\Middleware\DisableBladeIconComponents;
-use Filament\Http\Middleware\DispatchServingFilamentEvent;
-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;
-use Illuminate\Routing\Middleware\SubstituteBindings;
-use Illuminate\Session\Middleware\AuthenticateSession;
-use Illuminate\Session\Middleware\StartSession;
-use Illuminate\View\Middleware\ShareErrorsFromSession;
-
-class AdminPanelProvider extends PanelProvider
-{
-    /**
-     * @throws Exception
-     */
-    public function panel(Panel $panel): Panel
-    {
-        return $panel
-            ->id('admin')
-            ->path('admin')
-            ->colors([
-                'primary' => Color::Amber,
-            ])
-            ->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
-            ->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
-            ->pages([
-                Pages\Dashboard::class,
-            ])
-            ->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
-            ->widgets([
-                Widgets\AccountWidget::class,
-                Widgets\FilamentInfoWidget::class,
-            ])
-            ->middleware([
-                EncryptCookies::class,
-                AddQueuedCookiesToResponse::class,
-                StartSession::class,
-                AuthenticateSession::class,
-                ShareErrorsFromSession::class,
-                VerifyCsrfToken::class,
-                SubstituteBindings::class,
-                DisableBladeIconComponents::class,
-                DispatchServingFilamentEvent::class,
-            ])
-            ->authMiddleware([
-                Authenticate::class,
-            ]);
-    }
-}

app/Providers/Filament/CompanyPanelProvider.php

@@ -85,27 +85,28 @@ class CompanyPanelProvider extends PanelProvider
             ->id('company')
             ->path('company')
             ->login(Login::class)
-            ->registration(Register::class)
-            ->passwordReset()
+            ->registration(action: app()->environment('demo') ? null : Register::class)
+            ->passwordReset(requestAction: app()->environment('demo') ? null : Pages\Auth\PasswordReset\RequestPasswordReset::class)
             ->tenantMenu(false)
             ->plugin(
                 FilamentCompanies::make()
                     ->userPanel('user')
                     ->switchCurrentCompany()
-                    ->updateProfileInformation(component: UpdateProfileInformation::class)
-                    ->updatePasswords(component: UpdatePassword::class)
-                    ->setPasswords()
-                    ->connectedAccounts()
-                    ->manageBrowserSessions()
-                    ->accountDeletion()
-                    ->profilePhotos()
-                    ->api()
+                    ->updateProfileInformation(condition: ! app()->environment('demo'), component: UpdateProfileInformation::class)
+                    ->updatePasswords(condition: ! app()->environment('demo'), component: UpdatePassword::class)
+                    ->setPasswords(condition: ! app()->environment('demo'))
+                    ->connectedAccounts(condition: ! app()->environment('demo'))
+                    ->manageBrowserSessions(condition: ! app()->environment('demo'))
+                    ->accountDeletion(condition: ! app()->environment('demo'))
+                    ->profilePhotos(condition: ! app()->environment('demo'))
+                    ->api(condition: ! app()->environment('demo'))
                     ->companies(invitations: true)
                     ->autoAcceptInvitations()
                     ->termsAndPrivacyPolicy()
                     ->notifications()
                     ->modals()
                     ->socialite(
+                        condition: ! app()->environment('demo'),
                         providers: [Provider::Github],
                         features: [Feature::RememberSession, Feature::ProviderAvatars],
                     ),

app/Services/CurrencyService.php

@@ -21,6 +21,10 @@ class CurrencyService implements CurrencyHandler
      */
     public function isEnabled(): bool
     {
+        if (app()->environment('demo')) {
+            return false;
+        }
+
         return filled($this->apiKey) && filled($this->baseUrl);
     }
 

app/Services/PlaidService.php

@@ -58,6 +58,18 @@ class PlaidService
         $this->setBaseUrl($this->environment);
     }
 
+    /**
+     * Determine if the Plaid service is enabled and properly configured.
+     */
+    public function isEnabled(): bool
+    {
+        if (app()->environment('demo') || empty($this->clientId) || empty($this->clientSecret)) {
+            return false;
+        }
+
+        return true;
+    }
+
     public function setClientCredentials(?string $clientId, ?string $clientSecret): self
     {
         $this->clientId = $clientId ?? $this->clientId;

bootstrap/app.php

@@ -9,7 +9,6 @@ return Application::configure(basePath: dirname(__DIR__))
         web: __DIR__ . '/../routes/web.php',
         api: __DIR__ . '/../routes/api.php',
         commands: __DIR__ . '/../routes/console.php',
-        health: '/up',
     )
     ->withMiddleware(function (Middleware $middleware) {
         //