Skip to content

Commit 0fba91f

Browse files
authored
Merge pull request #270 from thedevdojo/v31-updates
Adding a few more style improvements and more updates for the filamen…
2 parents 829589e + f2be09d commit 0fba91f

39 files changed

+283
-48688
lines changed
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?php
2+
3+
namespace App\Filament\Widgets;
4+
5+
use Filament\Widgets\Widget;
6+
7+
class DashboardWidget extends Widget
8+
{
9+
protected static ?int $sort = 10;
10+
11+
protected int|string|array $columnSpan = 'full';
12+
13+
protected static bool $isLazy = false;
14+
15+
/**
16+
* @var view-string
17+
*/
18+
protected string $view = 'filament.widgets.dashboard-widget';
19+
}

app/Providers/Filament/AdminPanelProvider.php

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22

33
namespace App\Providers\Filament;
44

5-
use Wave\Widgets\WaveInfoWidget;
6-
use Wave\Widgets\WelcomeWidget;
7-
use Wave\Widgets\UsersWidget;
8-
use Wave\Widgets\PostsPagesWidget;
9-
use Wave\Widgets\AnalyticsPlaceholderWidget;
5+
use App\Filament\Widgets\DashboardWidget;
106
use Filament\Facades\Filament;
117
use Filament\Http\Middleware\Authenticate;
128
use Filament\Http\Middleware\DisableBladeIconComponents;
@@ -36,11 +32,8 @@ public static function getNavigationIcon(): ?string
3632
return 'heroicon-o-presentation-chart-line';
3733
}
3834

39-
private $dynamicWidgets = [];
40-
4135
public function panel(Panel $panel): Panel
4236
{
43-
$this->renderAnalyticsIfCredentialsExist();
4437

4538
Blade::component('wave::admin.components.label', 'label');
4639

@@ -59,13 +52,7 @@ public function panel(Panel $panel): Panel
5952
->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
6053
// ->discoverWidgets(in: app_path('BezhanSalleh\FilamentGoogleAnalytics\Widgets'), for: 'BezhanSalleh\\FilamentGoogleAnalytics\\Widgets')
6154
->widgets([
62-
WaveInfoWidget::class,
63-
WelcomeWidget::class,
64-
UsersWidget::class,
65-
PostsPagesWidget::class,
66-
...$this->dynamicWidgets,
67-
68-
// Google Analytics widgets removed
55+
DashboardWidget::class,
6956
])
7057
->middleware([
7158
EncryptCookies::class,
@@ -85,22 +72,4 @@ public function panel(Panel $panel): Panel
8572
->brandLogo(fn () => view('wave::admin.logo'))
8673
->darkModeBrandLogo(fn () => view('wave::admin.logo-dark'));
8774
}
88-
89-
// This function will render if user has account crenditals file
90-
// located at storage/app/analytics/service-account-credentials.json
91-
// Find More details here: https://github.com/spatie/laravel-analytics
92-
private function renderAnalyticsIfCredentialsExist()
93-
{
94-
if (is_array(config('analytics.service_account_credentials_json')) ||
95-
file_exists(config('analytics.service_account_credentials_json'))) {
96-
Config::set('filament-google-analytics.page_views.filament_dashboard', true);
97-
Config::set('filament-google-analytics.active_users_one_day.filament_dashboard', true);
98-
Config::set('filament-google-analytics.active_users_seven_day.filament_dashboard', true);
99-
Config::set('filament-google-analytics.active_users_twenty_eight_day.filament_dashboard', true);
100-
Config::set('filament-google-analytics.most_visited_pages.filament_dashboard', true);
101-
Config::set('filament-google-analytics.top_referrers_list.filament_dashboard', true);
102-
} else {
103-
$this->dynamicWidgets = [AnalyticsPlaceholderWidget::class];
104-
}
105-
}
10675
}

config/features.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
'image' => '/themes/tailwind/images/api.png',
5353
],
5454
(object) [
55-
'title' => 'Voyager Admin',
56-
'description' => 'Wave has been crafted using Laravel & Voyager, which makes administering your app a breeze!',
55+
'title' => 'Filament Admin',
56+
'description' => 'Wave utilizes Filament to provide a beautiful admin panel.',
5757
'image' => '/themes/tailwind/images/admin.png',
5858
],
5959
(object) [

package-lock.json

Lines changed: 5 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"build": "vite build"
77
},
88
"devDependencies": {
9-
"@tailwindcss/forms": "^0.5.7",
10-
"@tailwindcss/typography": "^0.5.12",
9+
"@tailwindcss/forms": "^0.5.10",
10+
"@tailwindcss/typography": "^0.5.16",
1111
"@tailwindcss/vite": "^4.1.12",
1212
"alpinejs": "^3.4.2",
1313
"autoprefixer": "^10.4.19",

public/build/assets/app-CtNeIsDo.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/app-wtvMdoFz.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/build/assets/theme-CHhKjvB9.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/build/assets/theme-DQ4Ao_DX.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

public/build/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
22
"resources/css/filament/admin/theme.css": {
3-
"file": "assets/theme-DQ4Ao_DX.css",
3+
"file": "assets/theme-CHhKjvB9.css",
44
"src": "resources/css/filament/admin/theme.css",
55
"isEntry": true
66
},
77
"resources/themes/anchor/assets/css/app.css": {
8-
"file": "assets/app-wtvMdoFz.css",
8+
"file": "assets/app-CtNeIsDo.css",
99
"src": "resources/themes/anchor/assets/css/app.css",
1010
"isEntry": true
1111
},

0 commit comments

Comments
 (0)