Skip to content
Draft
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
40 changes: 0 additions & 40 deletions app/Concerns/Enums/Arrayable.php

This file was deleted.

43 changes: 0 additions & 43 deletions app/Concerns/Enums/Comparable.php

This file was deleted.

3 changes: 2 additions & 1 deletion app/Console/Commands/Import/ImportNewsFeedCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use App\Models\Article;
use App\Models\Election;
use App\Models\User;
use Exception;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Schema;
Expand Down Expand Up @@ -118,7 +119,7 @@ private function importArticles(): void
try {
$article->addMediaFromUrl(Str::replace(' ', '%20', $pics->Url))
->toMediaCollection();
} catch (\Exception $e) {
} catch (Exception $e) {
logger()->error("Failed to import media for article {$row->Id}: {$e->getMessage()}");
}
}
Expand Down
1 change: 0 additions & 1 deletion app/Console/Commands/Import/ImportTurnoutsCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

use App\Concerns\Import\HasPlace;
use App\Enums\Part;
use App\Models\Country;
use App\Models\Election;
use App\Models\Locality;
use App\Models\Record;
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/Area.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Colors\Color;
use Filament\Support\Contracts\HasColor;
use Filament\Support\Contracts\HasLabel;
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/Cron.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Contracts\HasLabel;

enum Cron: string implements HasLabel
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/DataLevel.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Contracts\HasLabel;

enum DataLevel: string implements HasLabel
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/DefaultElectionPage.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Contracts\HasLabel;

enum DefaultElectionPage: string implements HasLabel
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/ElectionType.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Contracts\HasLabel;

enum ElectionType: int implements HasLabel
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/Part.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Contracts\HasLabel;

enum Part: int implements HasLabel
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/User/Role.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums\User;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Contracts\HasLabel;

enum Role: string implements HasLabel
Expand Down
4 changes: 2 additions & 2 deletions app/Enums/VoteMonitorStatKey.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

namespace App\Enums;

use App\Concerns\Enums\Arrayable;
use App\Concerns\Enums\Comparable;
use CommitGlobal\Enums\Concerns\Arrayable;
use CommitGlobal\Enums\Concerns\Comparable;
use Filament\Support\Colors\Color;
use Filament\Support\Contracts\HasColor;
use Filament\Support\Contracts\HasIcon;
Expand Down
2 changes: 1 addition & 1 deletion app/Filament/Admin/Pages/Auth/Login.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

namespace App\Filament\Admin\Pages\Auth;

use Filament\Pages\Auth\Login as BaseLogin;
use Filament\Auth\Pages\Login as BaseLogin;

class Login extends BaseLogin
{
Expand Down
8 changes: 4 additions & 4 deletions app/Filament/Admin/Pages/ElectionSettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

namespace App\Filament\Admin\Pages;

use App\Filament\Admin\Resources\ElectionResource;
use Filament\Forms\Form;
use App\Filament\Admin\Resources\Elections\ElectionResource;
use Filament\Pages\Tenancy\EditTenantProfile;
use Filament\Schemas\Schema;

class ElectionSettings extends EditTenantProfile
{
Expand All @@ -17,8 +17,8 @@ public static function getLabel(): string
return __('app.election.settings');
}

public function form(Form $form): Form
public function form(Schema $schema): Schema
{
return ElectionResource::form($form);
return ElectionResource::form($schema);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,30 +2,35 @@

declare(strict_types=1);

namespace App\Filament\Admin\Resources;
namespace App\Filament\Admin\Resources\Articles;

use App\Filament\Admin\Resources\ArticleResource\Pages;
use App\Filament\Admin\Resources\Articles\Pages\CreateArticle;
use App\Filament\Admin\Resources\Articles\Pages\EditArticle;
use App\Filament\Admin\Resources\Articles\Pages\ListArticles;
use App\Models\Article;
use Carbon\Carbon;
use Filament\Actions\BulkActionGroup;
use Filament\Actions\DeleteAction;
use Filament\Actions\DeleteBulkAction;
use Filament\Actions\EditAction;
use Filament\Forms\Components\DateTimePicker;
use Filament\Forms\Components\Repeater;
use Filament\Forms\Components\Section;
use Filament\Forms\Components\RichEditor;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\SpatieMediaLibraryFileUpload;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Form;
use Filament\Resources\Resource;
use Filament\Tables;
use Filament\Schemas\Components\Section;
use Filament\Schemas\Schema;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Filters\SelectFilter;
use Filament\Tables\Table;
use FilamentTiptapEditor\TiptapEditor;

class ArticleResource extends Resource
{
protected static ?string $model = Article::class;

protected static ?string $navigationIcon = 'heroicon-o-chat-bubble-bottom-center-text';
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-chat-bubble-bottom-center-text';

protected static ?int $navigationSort = 10;

Expand All @@ -39,10 +44,10 @@ public static function getPluralLabel(): string
return __('app.article.plural');
}

public static function form(Form $form): Form
public static function form(Schema $schema): Schema
{
return $form
->schema([
return $schema
->components([
Section::make()
->columns(2)
->schema([
Expand All @@ -61,7 +66,7 @@ public static function form(Form $form): Form
->label(__('app.article.published_at'))
->nullable(),

TiptapEditor::make('content')
RichEditor::make('content')
->required()
->label(__('app.article.content'))
->columnSpanFull(),
Expand Down Expand Up @@ -118,13 +123,13 @@ public static function table(Table $table): Table
->multiple()
->preload(),
])
->actions([
Tables\Actions\EditAction::make(),
Tables\Actions\DeleteAction::make(),
->recordActions([
EditAction::make(),
DeleteAction::make(),
])
->bulkActions([
Tables\Actions\BulkActionGroup::make([
Tables\Actions\DeleteBulkAction::make(),
->toolbarActions([
BulkActionGroup::make([
DeleteBulkAction::make(),
]),
])
->defaultSort('id', 'desc');
Expand All @@ -140,9 +145,9 @@ public static function getRelations(): array
public static function getPages(): array
{
return [
'index' => Pages\ListArticles::route('/'),
'create' => Pages\CreateArticle::route('/create'),
'edit' => Pages\EditArticle::route('/{record}/edit'),
'index' => ListArticles::route('/'),
'create' => CreateArticle::route('/create'),
'edit' => EditArticle::route('/{record}/edit'),
];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

declare(strict_types=1);

namespace App\Filament\Admin\Resources\ArticleResource\Pages;
namespace App\Filament\Admin\Resources\Articles\Pages;

use App\Filament\Admin\Resources\ArticleResource;
use App\Filament\Admin\Resources\Articles\ArticleResource;
use Filament\Resources\Pages\CreateRecord;

class CreateArticle extends CreateRecord
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

declare(strict_types=1);

namespace App\Filament\Admin\Resources\ArticleResource\Pages;
namespace App\Filament\Admin\Resources\Articles\Pages;

use App\Filament\Admin\Resources\ArticleResource;
use Filament\Actions;
use App\Filament\Admin\Resources\Articles\ArticleResource;
use Filament\Actions\DeleteAction;
use Filament\Resources\Pages\EditRecord;

class EditArticle extends EditRecord
Expand All @@ -15,7 +15,7 @@ class EditArticle extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make(),
DeleteAction::make(),
];
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

declare(strict_types=1);

namespace App\Filament\Admin\Resources\ArticleResource\Pages;
namespace App\Filament\Admin\Resources\Articles\Pages;

use App\Filament\Admin\Resources\ArticleResource;
use Filament\Actions;
use App\Filament\Admin\Resources\Articles\ArticleResource;
use Filament\Actions\CreateAction;
use Filament\Resources\Pages\ListRecords;

class ListArticles extends ListRecords
Expand All @@ -15,7 +15,7 @@ class ListArticles extends ListRecords
protected function getHeaderActions(): array
{
return [
Actions\CreateAction::make(),
CreateAction::make(),
];
}
}
Loading