diff --git a/Erweiterungen.md b/Erweiterungen.md index e07ce61..cfebac7 100644 --- a/Erweiterungen.md +++ b/Erweiterungen.md @@ -6,7 +6,13 @@ LARVEL 2. https://tenancy-v4.pages.dev/introduction/ 3. -FILAMENT 7. https://filamentphp.com/plugins/ysfkaya-phone-input 2. https://github.com/awcodes/light-switch 3. https://github.com/bezhanSalleh/filament-shield 4. https://github.com/mallardduck/blade-lucide-icons 5. https://github.com/spatie/laravel-login-link 6. https://packagist.org/packages/swisnl/filament-backgrounds +FILAMENT +7. https://filamentphp.com/plugins/ysfkaya-phone-input +2. https://github.com/awcodes/light-switch +3. https://github.com/bezhanSalleh/filament-shield +4. https://github.com/mallardduck/blade-lucide-icons +5. https://github.com/spatie/laravel-login-link +6. https://packagist.org/packages/swisnl/filament-backgrounds 1. https://filamentphp.com/plugins/maartenpaauw-cashier-billing-provider diff --git a/app/Actions/Generate/Utilities/Platzhalter.php b/app/Actions/Generate/Utilities/Platzhalter.php index d12da86..ec76b0e 100644 --- a/app/Actions/Generate/Utilities/Platzhalter.php +++ b/app/Actions/Generate/Utilities/Platzhalter.php @@ -14,6 +14,8 @@ class Platzhalter $platzhalter['###OFFIZIELLER_NAME###'] = PdfGenerator::$projekt->offizieller_name; $platzhalter['###ORT###'] = PdfGenerator::$projekt->ort; $platzhalter['###DATUM###'] = PdfGenerator::$projekt->erstellung; + $platzhalter['###GUTACHTER###'] = PdfGenerator::$gutachter->company; + $platzhalter['###AUFTRAGGEBER###'] = PdfGenerator::$auftraggeber->company; return $platzhalter; } diff --git a/app/Filament/Resources/Auftraggebers/Schemas/AuftraggeberForm.php b/app/Filament/Resources/Auftraggebers/Schemas/AuftraggeberForm.php index cf1d33d..9938d4f 100644 --- a/app/Filament/Resources/Auftraggebers/Schemas/AuftraggeberForm.php +++ b/app/Filament/Resources/Auftraggebers/Schemas/AuftraggeberForm.php @@ -27,6 +27,9 @@ class AuftraggeberForm ->schema([ TextInput::make('company') ->label('Firma') + ->belowContent([ + 'Kann als Platzhalter "###AUFTRAGGEBER###" im Gutachten verwendet werden.', + ]) ->required(), TextInput::make('title') ->label('Titel'), diff --git a/app/Filament/Resources/Gutachters/Schemas/GutachterForm.php b/app/Filament/Resources/Gutachters/Schemas/GutachterForm.php index cf626ab..876ba52 100644 --- a/app/Filament/Resources/Gutachters/Schemas/GutachterForm.php +++ b/app/Filament/Resources/Gutachters/Schemas/GutachterForm.php @@ -30,7 +30,7 @@ class GutachterForm ->schema([ TextInput::make('company') ->belowContent([ - 'Kann mit "###FIRMA###" im Gutachten verwendet werden.', + 'Kann als Platzhalter "###GUTACHTER###" im Gutachten verwendet werden.', ]) ->label('Firma') ->required(), @@ -118,10 +118,8 @@ class GutachterForm '#e12afb' => 'Fuchisa', '#f6339a' => 'Rosa', '#ff2056' => 'Rose', - '#a6a09b' => 'Steingrau Hell', - '#44403b' => 'Steingrau Dunkel', - '#cad5e2' => 'Schiefer Hell', - '#314158' => 'Schiefer Dunkel', + '#a6a09b' => 'Hellgrau', + '#314158' => 'Dunkelgrau', ]) ->label('Gutachter am Deckblatt') ->afterLabel([ShowHelp::show('gutachter_am_deckblatt')]) diff --git a/app/Filament/Resources/Helps/HelpResource.php b/app/Filament/Resources/Helps/HelpResource.php index 5947415..a7a4ec6 100644 --- a/app/Filament/Resources/Helps/HelpResource.php +++ b/app/Filament/Resources/Helps/HelpResource.php @@ -23,11 +23,11 @@ class HelpResource extends Resource protected static string|BackedEnum|null $navigationIcon = 'phosphor-question'; - protected static ?string $navigationLabel = 'Allgemein'; + protected static ?string $navigationLabel = 'Hilfe'; - protected static ?string $modelLabel = 'Allgemein'; + protected static ?string $modelLabel = 'Hilfe'; - protected static ?string $pluralModelLabel = 'Allgemein'; + protected static ?string $pluralModelLabel = 'Hilfen'; protected static ?int $navigationSort = 5; diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index add8e80..861f0ef 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,8 @@ namespace App\Providers; +use BezhanSalleh\FilamentShield\Commands; +use BezhanSalleh\FilamentShield\Facades\FilamentShield; use Carbon\Carbon; use Filament\Support\Colors\Color; use Filament\Support\Facades\FilamentColor; @@ -27,6 +29,16 @@ class AppServiceProvider extends ServiceProvider { Carbon::setLocale(app()->getLocale()); + // individually prohibit commands + // Commands\GenerateCommand::prohibit($this->app->isProduction()); + // Commands\InstallCommand::prohibit($this->app->isProduction()); + // Commands\PublishCommand::prohibit($this->app->isProduction()); + // Commands\SetupCommand::prohibit($this->app->isProduction()); + // Commands\SeederCommand::prohibit($this->app->isProduction()); + // Commands\SuperAdminCommand::prohibit($this->app->isProduction()); + // or prohibit the above commands all at once + FilamentShield::prohibitDestructiveCommands($this->app->isProduction()); + FilamentColor::register([ 'danger' => Color::Red, 'gray' => Color::Zinc, diff --git a/database/seeders/DatabaseSeeder.php b/database/seeders/DatabaseSeeder.php index 364712b..a965ffb 100644 --- a/database/seeders/DatabaseSeeder.php +++ b/database/seeders/DatabaseSeeder.php @@ -2,17 +2,10 @@ namespace Database\Seeders; -use App\Models\Auftraggeber; -use App\Models\Gutachter; -use App\Models\Konto; -use App\Models\User; use Illuminate\Database\Seeder; class DatabaseSeeder extends Seeder { - /** - * Seed the application's database. - */ public function run(): void { $this->call([ @@ -25,22 +18,14 @@ class DatabaseSeeder extends Seeder KontoSeeder::class, GutachterSeeder::class, AuftraggeberSeeder::class, - RolesAndPermissionsSeeder::class, HelperSeeder::class, - TestProjektSeeder::class, + RolesAndPermissionsSeeder::class, ]); - // if (app()->isLocal()) { - // Konto::factory()->count(10)->create(); - // Gutachter::factory()->count(30)->create(); - // Auftraggeber::factory()->count(30)->create(); - // } - - // if (app()->isLocal()) { - // $this->call([ - // TestProjektSeeder::class, - // ]); - // User::factory()->count(40)->create(); - // } + if (app()->isLocal()) { + $this->call([ + TestProjektSeeder::class, + ]); + } } } diff --git a/database/seeders/RolesAndPermissionsSeeder.php b/database/seeders/RolesAndPermissionsSeeder.php index 253ef7e..fda30f7 100644 --- a/database/seeders/RolesAndPermissionsSeeder.php +++ b/database/seeders/RolesAndPermissionsSeeder.php @@ -16,6 +16,7 @@ class RolesAndPermissionsSeeder extends Seeder ['name' => 'gutachter', 'guard_name' => 'web'], ['name' => 'super_admin', 'guard_name' => 'web'], ['name' => 'konto_switch', 'guard_name' => 'web'], + ['name' => 'admin', 'guard_name' => 'web'], ], ['name'] ); @@ -33,30 +34,5 @@ class RolesAndPermissionsSeeder extends Seeder $user->assignRole('super_admin'); $user->assignRole('konto_switch'); - if (app()->isLocal()) { - $user = User::factory()->create([ - 'konto_id' => '1', - 'gender' => 'Frau', - 'name' => 'Yvonne Bormes', - 'email' => 'yvonne.bormes@ztkammer.at', - 'password' => Hash::make('yvonne'), - 'agb_akzeptiert' => true, - 'app_verified_at' => now(), - 'email_verified_at' => now(), - ]); - $user->assignRole('gutachter'); - - $user = User::factory()->create([ - 'konto_id' => '2', - 'gender' => 'Frau', - 'name' => 'Daniela Mandlez', - 'email' => 'daniela.mandkez@kammerwest.at', - 'password' => Hash::make('daniela'), - 'agb_akzeptiert' => true, - 'app_verified_at' => now(), - 'email_verified_at' => now(), - ]); - $user->assignRole('gutachter'); - } } } diff --git a/resources/css/filament/admin/theme.css b/resources/css/filament/admin/theme.css index 0915180..638cb6e 100644 --- a/resources/css/filament/admin/theme.css +++ b/resources/css/filament/admin/theme.css @@ -61,16 +61,13 @@ .tiptap { white-space: pre-wrap; white-space: -moz-pre-wrap; - /* For Firefox compatibility */ } .tiptap p { - padding: 0.5mm 1mm; margin: 1em 0; font-family: Verdana, Tahoma, sans-serif; font-size: 10pt; font-weight: normal; - line-height: 17pt !important; } .tiptap a {