diff --git a/app/Filament/Resources/Kontos/Tables/KontosTable.php b/app/Filament/Resources/Kontos/Tables/KontosTable.php index c7cc066..5e5d10e 100644 --- a/app/Filament/Resources/Kontos/Tables/KontosTable.php +++ b/app/Filament/Resources/Kontos/Tables/KontosTable.php @@ -14,6 +14,7 @@ class KontosTable { return $table ->columns([ + TextColumn::make('id'), TextColumn::make('gender')->label('Geschlecht'), TextColumn::make('title')->label('Title'), TextColumn::make('first_name')->label('Vorname'), diff --git a/app/Livewire/KontoSwitch.php b/app/Livewire/KontoSwitch.php new file mode 100644 index 0000000..bb4883e --- /dev/null +++ b/app/Livewire/KontoSwitch.php @@ -0,0 +1,29 @@ +kontos = Konto::pluck('company', 'id')->all(); + } + + public function render() + { + return view('livewire.konto-switch'); + } + + public function swop($konto_id) + { + User::find(auth()->user()->id)->update(['konto_id' => $konto_id]); + + $this->js('window.location.reload()'); + } +} diff --git a/app/Livewire/TenancySwitch.php b/app/Livewire/TenancySwitch.php deleted file mode 100644 index 9a3b363..0000000 --- a/app/Livewire/TenancySwitch.php +++ /dev/null @@ -1,21 +0,0 @@ -user()->id)->update(['kammer_id' => $kammer_id]); - - $this->js('window.location.reload()'); - } -} diff --git a/app/Models/Gutachter.php b/app/Models/Gutachter.php index 37f6563..1745591 100644 --- a/app/Models/Gutachter.php +++ b/app/Models/Gutachter.php @@ -2,7 +2,7 @@ namespace App\Models; -// use App\Models\Scopes\KontoScope; +use App\Models\Scopes\KontoScope; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\SoftDeletes; @@ -10,9 +10,9 @@ class Gutachter extends Model { use SoftDeletes; - // protected static function booted(): void - // { - // static::addGlobalScope(new KontoScope); + protected static function booted(): void + { + static::addGlobalScope(new KontoScope); - // } + } } diff --git a/app/Models/Scopes/KontoScope.php b/app/Models/Scopes/KontoScope.php index e8ae8ee..582648b 100644 --- a/app/Models/Scopes/KontoScope.php +++ b/app/Models/Scopes/KontoScope.php @@ -13,6 +13,8 @@ class KontoScope implements Scope */ public function apply(Builder $builder, Model $model): void { - $builder->where('konto_id', auth()->user()->konto_id); + if (auth()->hasUser()) { + $builder->where('konto_id', auth()->user()->konto_id); + } } } diff --git a/app/Models/User.php b/app/Models/User.php index 8467a59..8b4c40a 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -72,11 +72,11 @@ class User extends Authenticatable implements FilamentUser, HasAppAuthentication ]; } - // protected static function booted(): void - // { - // static::addGlobalScope(new KontoScope); + protected static function booted(): void + { + static::addGlobalScope(new KontoScope); - // } + } public function getAppAuthenticationSecret(): ?string { diff --git a/app/Providers/Filament/AdminPanelProvider.php b/app/Providers/Filament/AdminPanelProvider.php index d8ebc33..ab61f22 100644 --- a/app/Providers/Filament/AdminPanelProvider.php +++ b/app/Providers/Filament/AdminPanelProvider.php @@ -46,11 +46,11 @@ class AdminPanelProvider extends PanelProvider ->profile() ->default() ->colors([ - 'primary' => Color::Blue, + 'primary' => Color::Gray, ]) ->renderHook( PanelsRenderHook::GLOBAL_SEARCH_BEFORE, - fn (): string => auth()->user()->hasRole('gutachter_switch') ? Blade::render('@livewire(\'tenancy-switch\')') : false + fn (): string => auth()->user()->hasRole('konto_switch') ? Blade::render('@livewire(\'konto-switch\')') : false ) ->multiFactorAuthentication([ EmailAuthentication::make(), @@ -63,6 +63,7 @@ class AdminPanelProvider extends PanelProvider // ->font('Open Sans') ->favicon(asset('images/favicon.svg')) ->brandLogo(fn () => view('filament.admin.logo')) + ->brandLogoHeight('2.6rem') ->unsavedChangesAlerts() ->databaseTransactions() ->discoverResources(in: app_path('Filament/Resources'), for: 'App\Filament\Resources') diff --git a/database/seeders/KontoSeeder.php b/database/seeders/KontoSeeder.php index fe0f66f..2c9d14a 100644 --- a/database/seeders/KontoSeeder.php +++ b/database/seeders/KontoSeeder.php @@ -14,7 +14,8 @@ class KontoSeeder extends Seeder { $sql = "INSERT INTO `kontos` (`id`, `title`, `gender`, `first_name`, `last_name`, `company`, `address`, `place`, `code`, `phone`, `uid_number`) VALUES - ('1', 'Architekt', 'Herr','Bruno','Kunz','Architekt Kunz','Pradlerstraße 11','Innbsruck', '6020', '0512 457328', 'ATU 234578'); + ('1', 'Architekt', 'Herr','Bruno','Kunz','Architekt Kunz','Pradlerstraße 11','Innbsruck', '6020', '0512 457328', 'ATU 234578'), + ('2', 'Architekt', 'Herr','Sepp','Unterlugauer','Architekt KunzUnterlugauer','Seestraße 1','Innbsruck', '6020', '0512 457328', 'ATU 234578'); "; DB::unprepared($sql); } diff --git a/database/seeders/RolesAndPermissionsSeeder.php b/database/seeders/RolesAndPermissionsSeeder.php index 355a221..9da7f7a 100644 --- a/database/seeders/RolesAndPermissionsSeeder.php +++ b/database/seeders/RolesAndPermissionsSeeder.php @@ -15,7 +15,7 @@ class RolesAndPermissionsSeeder extends Seeder [ ['name' => 'gutachter', 'guard_name' => 'web'], ['name' => 'super_admin', 'guard_name' => 'web'], - ['name' => 'gutachter_switch', 'guard_name' => 'web'], + ['name' => 'konto_switch', 'guard_name' => 'web'], ], ['name'] ); @@ -30,7 +30,7 @@ class RolesAndPermissionsSeeder extends Seeder 'email_verified_at' => now(), ]); $user->assignRole('super_admin'); - $user->assignRole('gutachter_switch'); + $user->assignRole('konto_switch'); $user = User::factory()->create([ 'konto_id' => '1', @@ -42,5 +42,16 @@ class RolesAndPermissionsSeeder extends Seeder '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'), + 'app_verified_at' => now(), + 'email_verified_at' => now(), + ]); + $user->assignRole('gutachter'); } } diff --git a/public/images/backgrounds/b1.jpg b/public/images/backgrounds/b1.jpg deleted file mode 100644 index 5856443..0000000 Binary files a/public/images/backgrounds/b1.jpg and /dev/null differ diff --git a/public/images/backgrounds/b2.jpg b/public/images/backgrounds/b2.jpg deleted file mode 100644 index 5b4ed98..0000000 Binary files a/public/images/backgrounds/b2.jpg and /dev/null differ diff --git a/public/images/backgrounds/b3.jpg b/public/images/backgrounds/b3.jpg deleted file mode 100644 index d6d67f7..0000000 Binary files a/public/images/backgrounds/b3.jpg and /dev/null differ diff --git a/public/images/backgrounds/b4.jpg b/public/images/backgrounds/b4.jpg deleted file mode 100644 index 56929b7..0000000 Binary files a/public/images/backgrounds/b4.jpg and /dev/null differ diff --git a/public/images/backgrounds/b5.jpg b/public/images/backgrounds/b5.jpg deleted file mode 100644 index 2987505..0000000 Binary files a/public/images/backgrounds/b5.jpg and /dev/null differ diff --git a/public/images/backgrounds/bg1.jpg b/public/images/backgrounds/bg1.jpg new file mode 100644 index 0000000..1e41a29 Binary files /dev/null and b/public/images/backgrounds/bg1.jpg differ diff --git a/public/images/bg.svg b/public/images/bg.svg new file mode 100644 index 0000000..7d07fac --- /dev/null +++ b/public/images/bg.svg @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/views/filament/admin/logo.blade.php b/resources/views/filament/admin/logo.blade.php index 0d46d07..a3471b8 100644 --- a/resources/views/filament/admin/logo.blade.php +++ b/resources/views/filament/admin/logo.blade.php @@ -15,5 +15,4 @@ nutzwerte.at
Software für Architekten
- diff --git a/resources/views/footer.blade.php b/resources/views/footer.blade.php index 577e8bc..b3c68fd 100644 --- a/resources/views/footer.blade.php +++ b/resources/views/footer.blade.php @@ -3,7 +3,7 @@ class="mx-auto cursor-pointer text-xs bg-white dark:bg-black px-2 rounded-sm opacity-70 flex"> © 2007-{{ date('Y') }} · - WebWerkstatt.tirol + WebWerkstatt.tirol
diff --git a/resources/views/livewire/konto-switch.blade.php b/resources/views/livewire/konto-switch.blade.php new file mode 100644 index 0000000..301f958 --- /dev/null +++ b/resources/views/livewire/konto-switch.blade.php @@ -0,0 +1,15 @@ + + + + Kontos + + + + + @foreach ($kontos as $id => $company) + + {{ $company }} + + @endforeach + + diff --git a/resources/views/livewire/tenancy-switch.blade.php b/resources/views/livewire/tenancy-switch.blade.php deleted file mode 100644 index 9796a7e..0000000 --- a/resources/views/livewire/tenancy-switch.blade.php +++ /dev/null @@ -1,25 +0,0 @@ - - - - Gutachter - - - - - - Tirol Vorarlberg - - - - Steiermark Kärnten - - - - Burgenland Nierderösterreich Wien - - - - Salzburg Oberösterreich - - - diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php index 7f3caa8..50aedfa 100644 --- a/resources/views/welcome.blade.php +++ b/resources/views/welcome.blade.php @@ -20,9 +20,7 @@ {{-- --}} - +
@if (Route::has('login')) @endif
+
+
+ +
+ +
+ + + + + + + + + +
+
+ nutzwerte.at +
Software für Architekten
+
+ +
+ +
+ + Vorteile diese Programmes + + Entdecken + + + + + +
+ + + +
+

+ Nutzwertgutachten +

+
+ + +
+ Die Nutzwertberechnung ist ein Gutachten im österreichischen Wohnungseigentumsrecht, das das + Verhältnis der einzelnen Eigentumsanteile innerhalb eines Gebäudes bestimmt. +
+ + +
+ + + + + + + Anmelden + + + + + + + + + Registrieren + +
+ +
+
+
+
+ + {{--
@@ -80,9 +170,6 @@

- - Diese Programm bietet Unterstützung bei der Erstellung von Nutzwertberechnungen an und hier - können sie mehr darüber erfahren..

@@ -99,13 +186,13 @@
-
-