Skip to content

feat: Update admin panel and upgrade filament mail #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
- name: 🐘 Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: "8.2"
php-version: "8.3"
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, pdo_mysql, bcmath, soap, intl, gd, exif, iconv, imagick
tools: composer:v2
coverage: none
Expand All @@ -21,7 +21,7 @@ runs:
shell: sh
run: echo "::set-output name=dir::$(composer config cache-files-dir)"
- name: Cache dependencies
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ steps.composer-cache.outputs.dir }}
key: ${{ runner.os }}-composer-${{ hashFiles('composer.lock') }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/update-changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ on:
jobs:
update:
runs-on: ubuntu-latest
permissions:
contents: write

steps:
- name: Checkout code
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ composer.phar
/public/hot
/public/storage
/public/media
public/css/
public/js/
/public/**/*.xml
/storage/*.key
/storage/framework/cache
Expand Down
19 changes: 2 additions & 17 deletions app/Actions/Article/CreateArticleAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

use App\Data\ArticleData;
use App\Models\Article;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Support\Facades\Auth;

Expand All @@ -27,25 +28,9 @@ public function execute(ArticleData $articleData): Article
);
}

/** @var User $user */
$user = Auth::user();

if ($user->isAdmin() || $user->isModerator()) {
$articleData->published_at = new Carbon(
time: today(),
timezone: config('app.timezone')
);

$articleData->submitted_at = new Carbon(
time: $articleData->submitted_at,
timezone: config('app.timezone')
);

$articleData->approved_at = new Carbon(
time: today(),
timezone: config('app.timezone')
);
}

// @phpstan-ignore-next-line
return Article::query()->create([
'title' => $articleData->title,
Expand Down
16 changes: 7 additions & 9 deletions app/Livewire/Components/Slideovers/ArticleForm.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
use App\Exceptions\UnverifiedUserException;
use App\Livewire\Traits\WithAuthenticatedUser;
use App\Models\Article;
use Carbon\Carbon;
use Filament\Forms;
use Filament\Forms\Concerns\InteractsWithForms;
use Filament\Forms\Contracts\HasForms;
use Filament\Forms\Form;
use Filament\Notifications\Notification;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Blade;
use Illuminate\Support\HtmlString;
Expand All @@ -43,8 +43,8 @@ public function mount(?int $articleId = null): void
: new Article;

$this->form->fill(array_merge($this->article->toArray(), [
'is_draft' => ! $this->article->published_at, // @phpstan-ignore-line
'published_at' => $this->article->published_at, // @phpstan-ignore-line
'is_draft' => ! $this->article->published_at,
'published_at' => $this->article->published_at,
'locale' => $this->article->locale ?? app()->getLocale(),
]));
}
Expand Down Expand Up @@ -91,7 +91,7 @@ public function form(Form $form): Form
->helperText(__('pages/article.draft_help')),
Forms\Components\DatePicker::make('published_at')
->label(__('pages/article.form.published_at'))
->minDate(now())
->closeOnDateSelection()
->prefixIcon('untitledui-calendar-date')
->native(false)
->visible(fn (Forms\Get $get): bool => $get('is_draft') === false)
Expand All @@ -110,7 +110,7 @@ public function form(Form $form): Form
->relationship(
name: 'tags',
titleAttribute: 'name',
modifyQueryUsing: fn ($query) => $query->whereJsonContains('concerns', 'post')
modifyQueryUsing: fn (Builder $query): Builder => $query->whereJsonContains('concerns', 'post')
)
->preload()
->required()
Expand Down Expand Up @@ -173,10 +173,8 @@ public function save(): void
$state = $this->form->getState();

$publishedFields = [
'published_at' => data_get($state, 'published_at')
? new Carbon(data_get($state, 'published_at'))
: null,
'submitted_at' => data_get($state, 'is_draft') ? null : now(),
'published_at' => data_get($state, 'published_at') ?? null,
'submitted_at' => data_get($state, 'is_draft') ?? null,
];

if ($this->article?->id) {
Expand Down
26 changes: 13 additions & 13 deletions app/Models/Article.php
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@
* @property bool $show_toc
* @property bool $is_pinned
* @property int $is_sponsored
* @property string | null $canonical_url
* @property string | null $reason
* @property int | null $tweet_id
* @property string|null $canonical_url
* @property string|null $reason
* @property int|null $tweet_id
* @property int $user_id
* @property string | null $locale
* @property string|null $locale
* @property-read User $user
* @property Carbon | null $published_at
* @property Carbon | null $submitted_at
* @property Carbon | null $approved_at
* @property Carbon | null $shared_at
* @property Carbon | null $declined_at
* @property Carbon | null $sponsored_at
* @property Carbon $created_at
* @property Carbon $updated_at
* @property \Illuminate\Database\Eloquent\Collection | Tag[] $tags
* @property-read \Illuminate\Support\Carbon|null $published_at
* @property-read \Illuminate\Support\Carbon|null $submitted_at
* @property-read \Illuminate\Support\Carbon|null $approved_at
* @property-read \Illuminate\Support\Carbon|null $shared_at
* @property-read \Illuminate\Support\Carbon|null $declined_at
* @property-read \Illuminate\Support\Carbon|null $sponsored_at
* @property-read \Illuminate\Support\Carbon $created_at
* @property-read \Illuminate\Support\Carbon $updated_at
* @property \Illuminate\Database\Eloquent\Collection<int, Tag> $tags
*/
final class Article extends Model implements HasMedia, ReactableInterface, Sitemapable, Viewable
{
Expand Down
35 changes: 13 additions & 22 deletions app/Providers/Filament/AdminPanelProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,23 @@

namespace App\Providers\Filament;

use App\Filament\Resources\ArticleResource\Widgets\ArticleStatsOverview;
use App\Filament\Resources\ArticleResource\Widgets\MostLikedPostsChart;
use App\Filament\Resources\ArticleResource\Widgets\MostViewedPostsChart;
use App\Filament\Resources\UserResource\Widgets\UserActivityWidget;
use App\Filament\Resources\UserResource\Widgets\UserChartWidget;
use App\Filament\Resources\UserResource\Widgets\UserStatsOverview;
use App\Filament\Resources\ArticleResource\Widgets as ArticleWidgets;
use App\Filament\Resources\UserResource\Widgets;
use Filament\Http\Middleware\Authenticate;
use Filament\Http\Middleware\DisableBladeIconComponents;
use Filament\Http\Middleware\DispatchServingFilamentEvent;
use Filament\Pages;
use Filament\Panel;
use Filament\PanelProvider;
use Filament\SpatieLaravelTranslatablePlugin;
use Filament\Support\Colors\Color;
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\Support\Facades\Blade;
use Illuminate\View\Middleware\ShareErrorsFromSession;
use Vormkracht10\FilamentMails\Facades\FilamentMails;
use Vormkracht10\FilamentMails\FilamentMailsPlugin;

final class AdminPanelProvider extends PanelProvider
Expand All @@ -38,38 +33,34 @@ public function panel(Panel $panel): Panel
->path('cp')
->login()
->colors([
'primary' => Color::Green,
'primary' => '#099170',
])
->sidebarWidth('18.75rem')
->sidebarCollapsibleOnDesktop()
->viteTheme('resources/css/filament/admin/theme.css')
->brandLogo(fn () => view('filament.brand'))
->favicon(asset('images/favicons/favicon-32x32.png'))
->spa()
->discoverResources(in: app_path('Filament/Resources'), for: 'App\\Filament\\Resources')
->discoverPages(in: app_path('Filament/Pages'), for: 'App\\Filament\\Pages')
->discoverWidgets(in: app_path('Filament/Widgets'), for: 'App\\Filament\\Widgets')
->pages([
Pages\Dashboard::class,
])
->widgets([
UserStatsOverview::class,
UserChartWidget::class,
UserActivityWidget::class,
ArticleStatsOverview::class,
MostLikedPostsChart::class,
MostViewedPostsChart::class,
Widgets\UserStatsOverview::class,
Widgets\UserChartWidget::class,
Widgets\UserActivityWidget::class,
ArticleWidgets\ArticleStatsOverview::class,
ArticleWidgets\MostLikedPostsChart::class,
ArticleWidgets\MostViewedPostsChart::class,
])
->plugins([
SpatieLaravelTranslatablePlugin::make()
->defaultLocales(['fr', 'en']),
FilamentMailsPlugin::make(),
])
->renderHook(
'body.start',
fn (): string => Blade::render('@livewire(\'livewire-ui-modal\')'),
)
->databaseNotifications()
->databaseNotificationsPolling('3600s')
->spa()
->routes(fn () => FilamentMails::routes())
->middleware([
EncryptCookies::class,
AddQueuedCookiesToResponse::class,
Expand Down
19 changes: 9 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"keywords": ["framework", "laravel"],
"license": "MIT",
"require": {
"php": "^8.2",
"php": "^8.3",
"ext-fileinfo": "*",
"ext-json": "*",
"archtechx/laravel-seo": "^0.10",
Expand Down Expand Up @@ -33,9 +33,8 @@
"laravel/tinker": "^2.8.1",
"laravelcm/laravel-subscriptions": "^1.3",
"laravelcm/livewire-slide-overs": "^1.0",
"livewire/livewire": "^3.5",
"livewire/volt": "^1.6",
"mckenziearts/blade-untitledui-icons": "^1.3",
"mckenziearts/blade-untitledui-icons": "^1.4",
"notchpay/notchpay-php": "^1.6",
"qcod/laravel-gamify": "1.0.8",
"ramsey/uuid": "^4.7.4",
Expand All @@ -62,10 +61,10 @@
"laravel/pint": "^1.18",
"mockery/mockery": "^1.6.2",
"nunomaduro/collision": "^8.1",
"pestphp/pest": "^2.32",
"pestphp/pest-plugin-laravel": "^2.1",
"pestphp/pest-plugin-livewire": "^2.1",
"phpunit/phpunit": "^10.0",
"pestphp/pest": "^3.8",
"pestphp/pest-plugin-laravel": "^3.0",
"pestphp/pest-plugin-livewire": "^3.0",
"phpunit/phpunit": "^11.0",
"spatie/laravel-ignition": "^2.0",
"spatie/test-time": "^1.3.2"
},
Expand All @@ -87,11 +86,11 @@
"scripts": {
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"
"@php artisan package:discover --ansi",
"@php artisan filament:upgrade"
],
"post-update-cmd": [
"Illuminate\\Foundation\\ComposerScripts::postUpdate",
"@php artisan filament:upgrade"
"Illuminate\\Foundation\\ComposerScripts::postUpdate"
],
"post-root-package-install": [
"@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
Expand Down
Loading
Loading