From 734fc3395ac7a5bb553a539f0dc24a0c7a08041a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anna-Sara=20S=C3=A9lea?= Date: Sun, 17 May 2026 09:54:41 +0200 Subject: [PATCH] Fixes and changes --- .../PhotoGeoData/Pages/CreatePhotoGeoData.php | 2 ++ .../PhotoGeoData/Pages/EditPhotoGeoData.php | 1 + .../PhotoGeoData/Pages/ListPhotoGeoData.php | 1 + .../PhotoGeoData/Schemas/PhotoGeoDataForm.php | 31 ++++++++++++++----- app/Models/User.php | 9 +++++- app/Providers/Filament/AdminPanelProvider.php | 3 ++ lang/vendor/filament-actions/sv/create.php | 4 +-- .../sv/resources/pages/create-record.php | 2 +- .../sv/resources/pages/edit-record.php | 2 +- .../sv/resources/pages/view-record.php | 2 +- 10 files changed, 44 insertions(+), 13 deletions(-) diff --git a/app/Filament/Resources/PhotoGeoData/Pages/CreatePhotoGeoData.php b/app/Filament/Resources/PhotoGeoData/Pages/CreatePhotoGeoData.php index 6bb5676..bd3bfaf 100644 --- a/app/Filament/Resources/PhotoGeoData/Pages/CreatePhotoGeoData.php +++ b/app/Filament/Resources/PhotoGeoData/Pages/CreatePhotoGeoData.php @@ -11,6 +11,8 @@ class CreatePhotoGeoData extends CreateRecord use HandlesImageMetadata; protected static string $resource = PhotoGeoDataResource::class; + protected ?string $heading = 'Lägg till bild'; + protected function getRedirectUrl(): string { diff --git a/app/Filament/Resources/PhotoGeoData/Pages/EditPhotoGeoData.php b/app/Filament/Resources/PhotoGeoData/Pages/EditPhotoGeoData.php index 42bc94a..4801938 100644 --- a/app/Filament/Resources/PhotoGeoData/Pages/EditPhotoGeoData.php +++ b/app/Filament/Resources/PhotoGeoData/Pages/EditPhotoGeoData.php @@ -12,6 +12,7 @@ class EditPhotoGeoData extends EditRecord use HandlesImageMetadata; protected static string $resource = PhotoGeoDataResource::class; + protected ?string $heading = 'Redigera bild'; protected function getHeaderActions(): array { diff --git a/app/Filament/Resources/PhotoGeoData/Pages/ListPhotoGeoData.php b/app/Filament/Resources/PhotoGeoData/Pages/ListPhotoGeoData.php index 56a64c5..1b4681b 100644 --- a/app/Filament/Resources/PhotoGeoData/Pages/ListPhotoGeoData.php +++ b/app/Filament/Resources/PhotoGeoData/Pages/ListPhotoGeoData.php @@ -9,6 +9,7 @@ use Filament\Resources\Pages\ListRecords; class ListPhotoGeoData extends ListRecords { protected static string $resource = PhotoGeoDataResource::class; + protected ?string $heading = ''; protected function getHeaderActions(): array { diff --git a/app/Filament/Resources/PhotoGeoData/Schemas/PhotoGeoDataForm.php b/app/Filament/Resources/PhotoGeoData/Schemas/PhotoGeoDataForm.php index 397a6f7..4e3793a 100644 --- a/app/Filament/Resources/PhotoGeoData/Schemas/PhotoGeoDataForm.php +++ b/app/Filament/Resources/PhotoGeoData/Schemas/PhotoGeoDataForm.php @@ -10,8 +10,10 @@ use Filament\Schemas\Schema; use EduardoRibeiroDev\FilamentLeaflet\Fields\MapPicker; use EduardoRibeiroDev\FilamentLeaflet\Enums\TileLayer; + class PhotoGeoDataForm { + public static function configure(Schema $schema): Schema { return $schema @@ -22,24 +24,30 @@ class PhotoGeoDataForm ->columnSpan('full') ->disk('public') ->directory('photos') - ->image(), + ->image() + ->helperText('Förklaring...'), TextInput::make('title') ->label('Rubrik') ->columnSpan('full') - ->required(), + ->required() + ->helperText('Förklaring...'), TextInput::make('uploaded_by') ->label('Uppladdat av') ->columnSpan('full') - ->required(), + ->required() + ->helperText('Förklaring...'), DatePicker::make('captured_at') ->label('Datum då foto togs') - ->columnSpan('full'), + ->columnSpan('full') + ->helperText('Förklaring...'), TextInput::make('desc') ->label('Kort beskrivning') - ->columnSpan('full'), + ->columnSpan('full') + ->helperText('Förklaring...'), Textarea::make('story') ->label('Berättelse') - ->columnSpanFull(), + ->columnSpanFull() + ->helperText('Förklaring...'), MapPicker::make('location') ->label('Plats') ->height(400) @@ -49,7 +57,16 @@ class PhotoGeoDataForm ->tileLayersUrl(TileLayer::OpenStreetMap) ->columnSpanFull() ->latitudeFieldName('lat') - ->longitudeFieldName('lng'), + ->longitudeFieldName('lng') + ->helperText('Förklaring...'), + Textarea::make('metadata') + ->label('Metadata (EXIF)') + ->columnSpanFull() + ->rows(10) + ->disabled() + ->dehydrated(false) + ->formatStateUsing(fn ($state) => $state ? json_encode($state, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE) : null) + ->visible(fn ($record) => $record && filled($record->metadata)), ]); } } diff --git a/app/Models/User.php b/app/Models/User.php index 3fcef08..f2acd15 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -9,14 +9,21 @@ use Illuminate\Database\Eloquent\Attributes\Hidden; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; +use Filament\Models\Contracts\FilamentUser; +use Filament\Panel; #[Fillable(['name', 'email', 'password','role'])] #[Hidden(['password', 'remember_token'])] -class User extends Authenticatable +class User extends Authenticatable implements FilamentUser { /** @use HasFactory */ use HasFactory, Notifiable; + public function canAccessPanel(Panel $panel): bool + { + return true; + } + /** * Get the attributes that should be cast. * diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index b9e5a93..5c97554 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -21,6 +21,8 @@ use App\Filament\Resources\PhotoGeoData\PhotoGeoDataResource; use Filament\Support\Facades\FilamentView; use Illuminate\Support\Facades\Blade; use Filament\View\PanelsRenderHook; +use Illuminate\Support\Facades\Request; + class AdminPanelProvider extends PanelProvider { @@ -57,6 +59,7 @@ class AdminPanelProvider extends PanelProvider ->widgets([ ]) + ->brandName(fn () => Request::routeIs('filament.*.auth.login') ? '' : '') ->middleware([ EncryptCookies::class, AddQueuedCookiesToResponse::class, diff --git a/lang/vendor/filament-actions/sv/create.php b/lang/vendor/filament-actions/sv/create.php index 023940c..b56739a 100644 --- a/lang/vendor/filament-actions/sv/create.php +++ b/lang/vendor/filament-actions/sv/create.php @@ -4,11 +4,11 @@ return [ 'single' => [ - 'label' => 'Ny :label', + 'label' => 'Ny bild', 'modal' => [ - 'heading' => 'Skapa :label', + 'heading' => 'Lägg till bild', 'actions' => [ diff --git a/lang/vendor/filament-panels/sv/resources/pages/create-record.php b/lang/vendor/filament-panels/sv/resources/pages/create-record.php index af85a56..095e084 100644 --- a/lang/vendor/filament-panels/sv/resources/pages/create-record.php +++ b/lang/vendor/filament-panels/sv/resources/pages/create-record.php @@ -2,7 +2,7 @@ return [ - 'title' => 'Skapa :label', + 'title' => 'Lägg till bild', 'breadcrumb' => 'Skapa', diff --git a/lang/vendor/filament-panels/sv/resources/pages/edit-record.php b/lang/vendor/filament-panels/sv/resources/pages/edit-record.php index c624cb8..7d2238e 100644 --- a/lang/vendor/filament-panels/sv/resources/pages/edit-record.php +++ b/lang/vendor/filament-panels/sv/resources/pages/edit-record.php @@ -2,7 +2,7 @@ return [ - 'title' => 'Redigera :label', + 'title' => 'Redigera bild', 'breadcrumb' => 'Redigera', diff --git a/lang/vendor/filament-panels/sv/resources/pages/view-record.php b/lang/vendor/filament-panels/sv/resources/pages/view-record.php index 0aae546..09e923e 100644 --- a/lang/vendor/filament-panels/sv/resources/pages/view-record.php +++ b/lang/vendor/filament-panels/sv/resources/pages/view-record.php @@ -2,7 +2,7 @@ return [ - 'title' => 'Visa :label', + 'title' => 'Visa bild', 'breadcrumb' => 'Visa',