Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"aws/aws-sdk-php": "^3.356",
"bezhansalleh/filament-language-switch": "^3.1",
"bezhansalleh/filament-shield": "^3.3",
"coolsam/modules": "^4.2",
"filament/filament": "^3.3",
"guzzlehttp/guzzle": "^7.10",
"honeystone/laravel-seo": "^2.0",
Expand Down Expand Up @@ -123,4 +124,4 @@
},
"minimum-stability": "stable",
"prefer-stable": true
}
}
80 changes: 79 additions & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/filament-activitylog.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
'default_sort_column' => 'id',
'default_sort_direction' => 'desc',
'navigation_count_badge' => false,
'resource' => App\Filament\Pages\ActivityLog::class,
'resource' => Modules\Admin\Filament\Pages\ActivityLog::class,
],
'date_format' => 'd/m/Y',
'datetime_format' => 'd/m/Y H:i:s',
Expand Down
10 changes: 10 additions & 0 deletions config/filament-modules.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?php

// config for Coolsam/Modules
return [
'auto-register-plugins' => true, // whether to auto-register plugins from various modules in the Panel
'clusters' => [
'enabled' => true, // whether to enable the clusters feature which allows you to group each module's filament resources and pages into a cluster
'use-top-navigation' => true, // display the main cluster menu in the top navigation and the sub-navigation in the side menu, which improves the UI
],
];
27 changes: 27 additions & 0 deletions modules/Admin/app/Filament/AdminPlugin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<?php

namespace Modules\Admin\Filament;

use Coolsam\Modules\Concerns\ModuleFilamentPlugin;
use Filament\Contracts\Plugin;
use Filament\Panel;

class AdminPlugin implements Plugin
{
use ModuleFilamentPlugin;

public function getModuleName(): string
{
return 'Admin';
}

public function getId(): string
{
return 'admin';
}

public function boot(Panel $panel): void
{
// Implement boot() method.
}
}
29 changes: 29 additions & 0 deletions modules/Admin/app/Filament/Clusters/Admin.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?php

namespace Modules\Admin\Filament\Clusters;

use Filament\Clusters\Cluster;
use Nwidart\Modules\Facades\Module;

class Admin extends Cluster
{
public static function getModuleName(): string
{
return 'Admin';
}

public static function getModule(): \Nwidart\Modules\Module
{
return Module::findOrFail(static::getModuleName());
}

public static function getNavigationLabel(): string
{
return __('Admin');
}

public static function getNavigationIcon(): ?string
{
return 'heroicon-o-squares-2x2';
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Forms\Components;
namespace Modules\Admin\Filament\Components;

use Filament\Forms\Components\FileUpload;
use Filament\Notifications\Notification;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Forms\Components;
namespace Modules\Admin\Filament\Components;

use Filament\Forms\Components\MarkdownEditor;
use Filament\Notifications\Notification;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages;
namespace Modules\Admin\Filament\Pages;

use BezhanSalleh\FilamentShield\Traits\HasPanelShield;
use Rmsramos\Activitylog\Resources\ActivitylogResource as BaseActivityLogPage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Auth;
namespace Modules\Admin\Filament\Pages\Auth;

use App\Services\SettingsService;
use DanHarrin\LivewireRateLimiting\Exceptions\TooManyRequestsException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Auth;
namespace Modules\Admin\Filament\Pages\Auth;

use App\Services\SettingsService;
use App\Settings\SecuritySettings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Auth;
namespace Modules\Admin\Filament\Pages\Auth;

use App\Services\SettingsService;
use App\Settings\SecuritySettings;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Auth;
namespace Modules\Admin\Filament\Pages\Auth;

use App\Models\User;
use App\Services\SettingsService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages;
namespace Modules\Admin\Filament\Pages;

use Filament\Pages\Dashboard as BaseDashboard;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages;
namespace Modules\Admin\Filament\Pages;

use BezhanSalleh\FilamentShield\Traits\HasPageShield;
use Jeffgreco13\FilamentBreezy\Pages\MyProfilePage as BaseMyProfilePage;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
<?php

namespace App\Filament\Pages;
namespace Modules\Admin\Filament\Pages;

use App\Filament\Pages\Settings as PartSettings;
use App\Jobs\GenerateSitemapJob;
use App\Services\SettingsService;
use App\Settings as BaseSettings;
Expand All @@ -15,8 +14,8 @@
use Illuminate\Http\UploadedFile;
use Illuminate\Support\Facades\Artisan;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Storage;
use Modules\Admin\Filament\Pages\Settings as PartSettings;

/**
* @property Forms\Form $form
Expand Down Expand Up @@ -136,11 +135,6 @@ public function clearCache(): void
{
Artisan::call('optimize:clear');
Artisan::call('filament:optimize-clear');
Cache::forget('widget-image-models');
Cache::forget('chat-settings');
Cache::forget('image-settings');
Cache::forget('file-manager-settings');
Cache::forget('chat-models');

Notification::make()
->title(__('Cache successfully cleared'))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Settings;
namespace Modules\Admin\Filament\Pages\Settings;

use Filament\Forms;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Settings;
namespace Modules\Admin\Filament\Pages\Settings;

use Filament\Forms;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

namespace App\Filament\Pages\Settings;
namespace Modules\Admin\Filament\Pages\Settings;

use Filament\Forms;
use Modules\Page\Models\Page;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,14 @@
<?php

namespace App\Providers\Filament;
namespace Modules\Admin\Providers;

use App\Filament\Pages\Auth\EmailVerification;
use App\Filament\Pages\Auth\Login;
use App\Filament\Pages\Auth\Register;
use App\Filament\Pages\Auth\ResetPassword;
use App\Filament\Pages\MyProfile;
use App\Filament\Resources\ArticleResource\Widgets\ArticleStatsOverview;
use App\Filament\Resources\ArticleResource\Widgets\RecentArticles;
use App\Filament\Resources\CommentResource\Widgets\CommentStatsOverview;
use App\Filament\Resources\EntryResource\Widgets\EntryStatsOverview;
use App\Filament\Resources\EntryResource\Widgets\RecentEntries;
use App\Forms\Components\SpatieMediaLibraryFileUpload;
use App\Services\SettingsService;
use App\Settings\SecuritySettings;
use App\Settings\SeoSettings;
use App\Settings\SiteSettings;
use BezhanSalleh\FilamentLanguageSwitch\LanguageSwitch;
use BezhanSalleh\FilamentShield\FilamentShieldPlugin;
use Coolsam\Modules\ModulesPlugin;
use Filament\Contracts\Plugin;
use Filament\Enums\ThemeMode;
use Filament\Http\Middleware\Authenticate;
Expand All @@ -37,6 +27,12 @@
use Illuminate\View\Middleware\ShareErrorsFromSession;
use Jeffgreco13\FilamentBreezy\BreezyCore;
use MarcoGermani87\FilamentCookieConsent\FilamentCookieConsent;
use Modules\Admin\Filament\Components\SpatieMediaLibraryFileUpload;
use Modules\Admin\Filament\Pages\Auth\EmailVerification;
use Modules\Admin\Filament\Pages\Auth\Login;
use Modules\Admin\Filament\Pages\Auth\Register;
use Modules\Admin\Filament\Pages\Auth\ResetPassword;
use Modules\Admin\Filament\Pages\MyProfile;
use Rmsramos\Activitylog\ActivitylogPlugin;

class AdminPanelProvider extends PanelProvider
Expand Down Expand Up @@ -97,17 +93,6 @@ public function panel(Panel $panel): Panel
($this->siteSettings->theme_mode ?? $this->siteSettings->theme_mode === 'light' ? ThemeMode::Light : ThemeMode::System))
->darkMode($this->siteSettings->dark_mode_enabled ?? true)

->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
->pages([])
->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
->widgets([
ArticleStatsOverview::class,
EntryStatsOverview::class,
CommentStatsOverview::class,
RecentArticles::class,
RecentEntries::class,
])
->middleware([
EncryptCookies::class,
AddQueuedCookiesToResponse::class,
Expand Down Expand Up @@ -148,6 +133,7 @@ protected function getPlugins(): array
FilamentCookieConsent::make(),
FilamentShieldPlugin::make(),
ActivitylogPlugin::make(),
ModulesPlugin::make(),
];
}
}
Loading
Loading