diff --git a/app/Providers/BaseServiceProvider.php b/app/Providers/BaseServiceProvider.php index 153355fd..b96f546e 100644 --- a/app/Providers/BaseServiceProvider.php +++ b/app/Providers/BaseServiceProvider.php @@ -6,13 +6,6 @@ use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Blade; use Illuminate\View\ComponentAttributeBag; use Livewire\Livewire; -use Modules\Base\Components\Page\Sidebar; -use Modules\Dashboard\DashboardFactory; -use Modules\Invoice\MemberPaymentBlock; -use Modules\Member\AgeGroupCountBlock; -use Modules\Member\TestersBlock; -use Modules\Prevention\EfzPendingBlock; -use Modules\Prevention\PsPendingBlock; class BaseServiceProvider extends ServiceProvider { @@ -25,12 +18,6 @@ class BaseServiceProvider extends ServiceProvider Blade::componentNamespace('App\\View\\Page', 'page'); Blade::componentNamespace('App\\View\\Form', 'form'); - app(DashboardFactory::class)->register(AgeGroupCountBlock::class); - app(DashboardFactory::class)->register(MemberPaymentBlock::class); - app(DashboardFactory::class)->register(TestersBlock::class); - app(DashboardFactory::class)->register(EfzPendingBlock::class); - app(DashboardFactory::class)->register(PsPendingBlock::class); - ComponentAttributeBag::macro('mergeWhen', function ($condition, $key, $attributes) { /** @var ComponentAttributeBag */ $self = $this; diff --git a/modules/Dashboard/DashboardServiceProvider.php b/modules/Dashboard/DashboardServiceProvider.php index 25613e67..729afbcf 100644 --- a/modules/Dashboard/DashboardServiceProvider.php +++ b/modules/Dashboard/DashboardServiceProvider.php @@ -5,6 +5,11 @@ namespace Modules\Dashboard; use Illuminate\Routing\Router; use Illuminate\Support\ServiceProvider; use Modules\Dashboard\Components\DashboardComponent; +use Modules\Invoice\MemberPaymentBlock; +use Modules\Member\AgeGroupCountBlock; +use Modules\Member\TestersBlock; +use Modules\Prevention\EfzPendingBlock; +use Modules\Prevention\PsPendingBlock; class DashboardServiceProvider extends ServiceProvider { @@ -28,5 +33,11 @@ class DashboardServiceProvider extends ServiceProvider app(Router::class)->middleware(['web', 'auth:web'])->group(function ($router) { $router->get('/', DashboardComponent::class)->name('home'); }); + + app(DashboardFactory::class)->register(AgeGroupCountBlock::class); + app(DashboardFactory::class)->register(MemberPaymentBlock::class); + app(DashboardFactory::class)->register(TestersBlock::class); + app(DashboardFactory::class)->register(EfzPendingBlock::class); + app(DashboardFactory::class)->register(PsPendingBlock::class); } }