Skip to content

Commit 625805b

Browse files
curtisdelicatacurtisdelicata
committed
Fix
1 parent a16b034 commit 625805b

13 files changed

+104
-231
lines changed

‎app/Filament/Admin/Pages/ManageGeneralSettings.php‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,86 @@
22

33
namespace App\Filament\Admin\Pages;
44

5+
use Filament\Schemas\Schema;
6+
use Filament\Schemas\Components\Section;
7+
use Filament\Forms\Components\TextInput;
8+
use Filament\Forms\Components\Textarea;
59
use App\Settings\GeneralSettings;
610
use Filament\Forms;
7-
use Filament\Forms\Form;
811
use Filament\Pages\SettingsPage;
912

1013
class ManageGeneralSettings extends SettingsPage
1114
{
12-
protected static ?string $navigationIcon = 'heroicon-o-cog-6-tooth';
15+
protected static string | \BackedEnum | null $navigationIcon = 'heroicon-o-cog-6-tooth';
1316

1417
protected static string $settings = GeneralSettings::class;
1518

16-
protected static ?string $navigationGroup = 'Settings';
19+
protected static string | \UnitEnum | null $navigationGroup = 'Settings';
1720

1821
protected static ?string $title = 'General Settings';
1922

2023
protected static ?string $navigationLabel = 'General Settings';
2124

22-
public function form(Form $form): Form
25+
public function form(Schema $schema): Schema
2326
{
24-
return $form
25-
->schema([
26-
Forms\Components\Section::make('Site Information')
27+
return $schema
28+
->components([
29+
Section::make('Site Information')
2730
->schema([
28-
Forms\Components\TextInput::make('site_name')
31+
TextInput::make('site_name')
2932
->label('Site Name')
3033
->required()
3134
->maxLength(255),
32-
Forms\Components\TextInput::make('site_email')
35+
TextInput::make('site_email')
3336
->label('Site Email')
3437
->email()
3538
->required()
3639
->maxLength(255),
37-
Forms\Components\TextInput::make('site_phone')
40+
TextInput::make('site_phone')
3841
->label('Site Phone')
3942
->tel()
4043
->maxLength(255),
41-
Forms\Components\TextInput::make('site_address')
44+
TextInput::make('site_address')
4245
->label('Site Address')
4346
->maxLength(255),
44-
Forms\Components\TextInput::make('site_country')
47+
TextInput::make('site_country')
4548
->label('Country')
4649
->maxLength(255),
47-
Forms\Components\TextInput::make('site_currency')
50+
TextInput::make('site_currency')
4851
->label('Currency Symbol')
4952
->maxLength(10),
50-
Forms\Components\TextInput::make('site_default_language')
53+
TextInput::make('site_default_language')
5154
->label('Default Language')
5255
->maxLength(10)
5356
->default('en'),
5457
])
5558
->columns(2),
5659

57-
Forms\Components\Section::make('Social Media Links')
60+
Section::make('Social Media Links')
5861
->description('Add your social media profile URLs')
5962
->schema([
60-
Forms\Components\TextInput::make('facebook_url')
63+
TextInput::make('facebook_url')
6164
->label('Facebook URL')
6265
->url()
6366
->maxLength(255),
64-
Forms\Components\TextInput::make('twitter_url')
67+
TextInput::make('twitter_url')
6568
->label('Twitter URL')
6669
->url()
6770
->maxLength(255),
68-
Forms\Components\TextInput::make('github_url')
71+
TextInput::make('github_url')
6972
->label('GitHub URL')
7073
->url()
7174
->maxLength(255),
72-
Forms\Components\TextInput::make('youtube_url')
75+
TextInput::make('youtube_url')
7376
->label('YouTube URL')
7477
->url()
7578
->maxLength(255),
7679
])
7780
->columns(2),
7881

79-
Forms\Components\Section::make('Footer')
82+
Section::make('Footer')
8083
->schema([
81-
Forms\Components\Textarea::make('footer_copyright')
84+
Textarea::make('footer_copyright')
8285
->label('Copyright Text')
8386
->required()
8487
->maxLength(500)

‎app/Filament/App/Pages/UpdatePasswordPage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function mount(): void
3636
public function form(Schema $schema): Schema
3737
{
3838
return $schema
39-
->schema([
39+
->components([
4040
TextInput::make('current_password')
4141
->label('Current Password')
4242
->password()

‎app/Filament/App/Pages/UpdateProfileInformationPage.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public function mount(): void
3838
public function form(Schema $schema): Schema
3939
{
4040
return $schema
41-
->schema([
41+
->components([
4242
TextInput::make('name')
4343
->label('Name')
4444
->required(),

‎app/Jobs/ImportGedcom.php‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
namespace App\Jobs;
44

5+
use Artisan;
6+
use Throwable;
57
use Exception;
68
use App\Models\ImportJob;
79
use App\Models\User;
@@ -59,10 +61,10 @@ public function handle(): int
5961

6062
// Clear application caches so new records are visible immediately
6163
try {
62-
\Artisan::call('cache:clear');
63-
\Artisan::call('view:clear');
64-
\Artisan::call('config:clear');
65-
} catch (\Throwable $e) {
64+
Artisan::call('cache:clear');
65+
Artisan::call('view:clear');
66+
Artisan::call('config:clear');
67+
} catch (Throwable $e) {
6668
// swallow cache clear errors
6769
}
6870

‎app/Livewire/DabovilleReport.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ public function mount(): void
2626
$this->form->fill();
2727
}
2828

29-
public function form(Schema $form): Schema
29+
public function form(Schema $schema): Schema
3030
{
31-
return $form
32-
->schema([
31+
return $schema
32+
->components([
3333
Select::make('person')
3434
->hiddenLabel()
3535
->options(Person::all()->pluck('name', 'id'))

‎app/Livewire/DevillierReport.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ public function mount(): void
2525
$this->form->fill();
2626
}
2727

28-
public function form(Schema $form): Schema
28+
public function form(Schema $schema): Schema
2929
{
30-
return $form
31-
->schema([
30+
return $schema
31+
->components([
3232
Select::make('person')
3333
->hiddenLabel()
3434
->options(Person::all()->pluck('name', 'id'))

‎app/Livewire/PedigreeChart.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Livewire;
44

5+
use Throwable;
56
use App\Models\Person;
67
use Illuminate\Contracts\View\View;
78
use Livewire\Component;
@@ -172,7 +173,7 @@ protected function personEditUrl(int $id): string
172173
{
173174
try {
174175
return PersonResource::getUrl('edit', ['record' => $id]);
175-
} catch (\Throwable $e) {
176+
} catch (Throwable $e) {
176177
return url('/');
177178
}
178179
}

‎app/Settings/GeneralSettings.php‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"require-dev": {
2929
"driftingly/rector-laravel": "^2.0",
3030
"fakerphp/faker": "^1.23",
31-
"filament/upgrade": "^4.0",
31+
"filament/upgrade": "^4.1",
3232
"laravel/pail": "^1.2.2",
3333
"laravel/pint": "^1.13",
3434
"laravel/sail": "^1.41",

0 commit comments

Comments
 (0)