🛠️ Refactor migrations, models, configs, and Blade files to apply consistent formatting, remove unnecessary lines, and improve readability.

app/Auth/NostrUser.php

@@ -7,6 +7,7 @@ use Illuminate\Contracts\Auth\Authenticatable;
 class NostrUser implements Authenticatable
 {
     protected string $pubkey;
+
     protected ?object $pleb;
 
     public function __construct(string $pubkey)

app/Console/Commands/Einundzwanzig/SyncPlebs.php

@@ -36,7 +36,7 @@ class SyncPlebs extends Command
             $npub = str($pleb)->trim();
             EinundzwanzigPleb::updateOrCreate(
                 ['npub' => $npub],
-                ['pubkey' => (new Key())->convertToHex($npub)]
+                ['pubkey' => (new Key)->convertToHex($npub)]
             );
         }
     }

app/Console/Commands/Nostr/FetchEvents.php

@@ -38,10 +38,10 @@ class FetchEvents extends Command
         $plebs = \App\Models\EinundzwanzigPleb::query()
             ->get();
 
-        $subscription = new Subscription();
+        $subscription = new Subscription;
         $subscriptionId = $subscription->setId();
 
-        $filter1 = new Filter();
+        $filter1 = new Filter;
         $filter1->setKinds([1]); // You can add multiple kind numbers
         $filter1->setAuthors($plebs->pluck('pubkey')->toArray()); // You can add multiple authors
         $filter1->setLimit(25); // Limit to fetch only a maximum of 25 events
@@ -54,7 +54,7 @@ class FetchEvents extends Command
             new Relay('wss://nostr.wine'),
             new Relay('wss://nos.lol'),
         ];
-        $relaySet = new RelaySet();
+        $relaySet = new RelaySet;
         $relaySet->setRelays($relays);
 
         $request = new Request($relaySet, $requestMessage);
@@ -97,6 +97,7 @@ class FetchEvents extends Command
                 }
             }
         }
+
         return null;
     }
 
@@ -109,6 +110,7 @@ class FetchEvents extends Command
                 }
             }
         }
+
         return 'root';
     }
 }

app/Console/Commands/Nostr/FetchProfile.php

@@ -31,6 +31,7 @@ class FetchProfile extends Command
         $pubkey = $this->option('pubkey');
         if (empty($pubkey)) {
             $this->error('Please provide a pubkey');
+
             return;
         }
 

app/Console/Commands/Nostr/SyncProfiles.php

@@ -48,7 +48,7 @@ class SyncProfiles extends Command
             $bar->finish();
             $this->info("\n✅ Successfully synced $count profiles!");
         } else {
-            $this->info("⚡ No profiles to sync!");
+            $this->info('⚡ No profiles to sync!');
         }
     }
 }

app/Enums/AssociationStatus.php

@@ -13,12 +13,12 @@ use ArchTech\Enums\Values;
 #[Meta(Label::class, Color::class)]
 enum AssociationStatus: int
 {
-    use InvokableCases;
-    use Names;
-    use Values;
-    use Options;
-    use Metadata;
     use From;
+    use InvokableCases;
+    use Metadata;
+    use Names;
+    use Options;
+    use Values;
 
     #[Label('kein Mitglied')] #[Color('cyan')]
     case DEFAULT = 1;

app/Enums/Color.php

@@ -6,6 +6,4 @@ use ArchTech\Enums\Meta\MetaProperty;
 use Attribute;
 
 #[Attribute]
-class Color extends MetaProperty
+class Color extends MetaProperty {}
-{
-}

app/Enums/Icon.php

@@ -6,6 +6,4 @@ use ArchTech\Enums\Meta\MetaProperty;
 use Attribute;
 
 #[Attribute]
-class Icon extends MetaProperty
+class Icon extends MetaProperty {}
-{
-}

app/Enums/Label.php

@@ -6,6 +6,4 @@ use ArchTech\Enums\Meta\MetaProperty;
 use Attribute;
 
 #[Attribute]
-class Label extends MetaProperty
+class Label extends MetaProperty {}
-{
-}

app/Enums/NewsCategory.php

@@ -13,12 +13,12 @@ use ArchTech\Enums\Values;
 #[Meta(Label::class, Color::class, Icon::class)]
 enum NewsCategory: int
 {
-    use InvokableCases;
-    use Names;
-    use Values;
-    use Options;
-    use Metadata;
     use From;
+    use InvokableCases;
+    use Metadata;
+    use Names;
+    use Options;
+    use Values;
 
     #[Label('Organisation')] #[Color('cyan')] #[Icon('file-lines')]
     case ORGANISATION = 1;

app/Livewire/Forms/ApplicationForm.php

@@ -9,6 +9,7 @@ class ApplicationForm extends Form
 {
     #[Validate('nullable|string')]
     public $reason = '';
+
     #[Validate('boolean')]
     public $check = false;
 }

app/Livewire/MeetupTable.php

@@ -11,11 +11,9 @@ use PowerComponents\LivewirePowerGrid\Exportable;
 use PowerComponents\LivewirePowerGrid\Facades\Filter;
 use PowerComponents\LivewirePowerGrid\Facades\Rule;
 use PowerComponents\LivewirePowerGrid\Footer;
-use PowerComponents\LivewirePowerGrid\Header;
-use PowerComponents\LivewirePowerGrid\Lazy;
 use PowerComponents\LivewirePowerGrid\PowerGrid;
-use PowerComponents\LivewirePowerGrid\PowerGridFields;
 use PowerComponents\LivewirePowerGrid\PowerGridComponent;
+use PowerComponents\LivewirePowerGrid\PowerGridFields;
 
 final class MeetupTable extends PowerGridComponent
 {
@@ -54,7 +52,7 @@ final class MeetupTable extends PowerGridComponent
                 ->searchable()
                 ->sortable(),
 
-            Column::action('Action')
+            Column::action('Action'),
         ];
     }
 
@@ -79,7 +77,7 @@ final class MeetupTable extends PowerGridComponent
                 ->slot('Edit: '.$row->id)
                 ->id()
                 ->class('pg-btn-white dark:ring-pg-primary-600 dark:border-pg-primary-600 dark:hover:bg-pg-primary-700 dark:ring-offset-pg-primary-800 dark:text-pg-primary-300 dark:bg-pg-primary-700')
-                ->dispatch('edit', ['rowId' => $row->id])
+                ->dispatch('edit', ['rowId' => $row->id]),
         ];
     }
 

app/Livewire/Traits/WithNostrAuth.php

@@ -8,8 +8,11 @@ use Livewire\Attributes\On;
 trait WithNostrAuth
 {
     public ?string $currentPubkey = null;
+
     public ?object $currentPleb = null;
+
     public bool $isAllowed = false;
+
     public bool $canEdit = false;
 
     #[On('nostrLoggedIn')]

app/Models/City.php

@@ -12,8 +12,8 @@ use Spatie\Sluggable\SlugOptions;
 
 class City extends Model
 {
-    use HasSlug;
     use Geoly;
+    use HasSlug;
 
     protected $connection = 'einundzwanzig';
 

app/Models/Course.php

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
 use Spatie\Image\Enums\Fit;
-use Spatie\Image\Manipulations;
 use Spatie\MediaLibrary\HasMedia;
 use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
@@ -15,8 +14,8 @@ use Spatie\Tags\HasTags;
 
 class Course extends Model implements HasMedia
 {
-    use InteractsWithMedia;
     use HasTags;
+    use InteractsWithMedia;
 
     protected $connection = 'einundzwanzig';
 
@@ -46,7 +45,7 @@ class Course extends Model implements HasMedia
         });
     }
 
-    public function registerMediaConversions(Media $media = null): void
+    public function registerMediaConversions(?Media $media = null): void
     {
         $this
             ->addMediaConversion('preview')

app/Models/CourseEvent.php

@@ -4,7 +4,6 @@ namespace App\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class CourseEvent extends Model
 {

app/Models/EinundzwanzigPleb.php

@@ -38,5 +38,4 @@ class EinundzwanzigPleb extends Model implements CipherSweetEncrypted
     {
         return $this->hasMany(PaymentEvent::class);
     }
-
 }

app/Models/Event.php

@@ -6,12 +6,10 @@ use Illuminate\Database\Eloquent\Model;
 
 class Event extends Model
 {
-
     protected $guarded = [];
 
     public function renderedEvent()
     {
         return $this->hasOne(RenderedEvent::class, 'event_id', 'event_id');
     }
-
 }

app/Models/Lecturer.php

@@ -23,12 +23,14 @@ class Lecturer extends Model implements HasMedia
 
     /**
      * The attributes that aren't mass assignable.
+     *
      * @var array
      */
     protected $guarded = [];
 
     /**
      * The attributes that should be cast to native types.
+     *
      * @var array
      */
     protected $casts = [
@@ -45,7 +47,7 @@ class Lecturer extends Model implements HasMedia
         });
     }
 
-    public function registerMediaConversions(Media $media = null): void
+    public function registerMediaConversions(?Media $media = null): void
     {
         $this
             ->addMediaConversion('preview')

app/Models/Meetup.php

@@ -16,8 +16,8 @@ use Spatie\Sluggable\SlugOptions;
 
 class Meetup extends Model implements HasMedia
 {
-    use InteractsWithMedia;
     use HasSlug;
+    use InteractsWithMedia;
 
     protected $connection = 'einundzwanzig';
 
@@ -57,7 +57,7 @@ class Meetup extends Model implements HasMedia
             ->usingLanguage(Cookie::get('lang', config('app.locale')));
     }
 
-    public function registerMediaConversions(Media $media = null): void
+    public function registerMediaConversions(?Media $media = null): void
     {
         $this
             ->addMediaConversion('preview')

app/Models/Profile.php

@@ -6,7 +6,5 @@ use Illuminate\Database\Eloquent\Model;
 
 class Profile extends Model
 {
-
     protected $guarded = [];
-
 }

app/Models/ProjectProposal.php

@@ -15,17 +15,19 @@ use Spatie\Sluggable\SlugOptions;
 
 class ProjectProposal extends Model implements HasMedia
 {
-    use InteractsWithMedia;
     use HasSlug;
+    use InteractsWithMedia;
 
     /**
      * The attributes that aren't mass assignable.
+     *
      * @var array
      */
     protected $guarded = [];
 
     /**
      * The attributes that should be cast to native types.
+     *
      * @var array
      */
     protected $casts = [
@@ -33,10 +35,7 @@ class ProjectProposal extends Model implements HasMedia
         'einundzwanzig_pleb_id' => 'integer',
     ];
 
-    protected static function booted()
+    protected static function booted() {}
-    {
-
-    }
 
     public function getSlugOptions(): SlugOptions
     {
@@ -46,7 +45,7 @@ class ProjectProposal extends Model implements HasMedia
             ->usingLanguage(Cookie::get('lang', config('app.locale')));
     }
 
-    public function registerMediaConversions(Media $media = null): void
+    public function registerMediaConversions(?Media $media = null): void
     {
         $this
             ->addMediaConversion('preview')

app/Models/Venue.php

@@ -16,8 +16,8 @@ use Staudenmeir\EloquentHasManyDeep\HasRelationships;
 
 class Venue extends Model implements HasMedia
 {
-    use HasSlug;
     use HasRelationships;
+    use HasSlug;
     use InteractsWithMedia;
 
     protected $connection = 'einundzwanzig';
@@ -48,7 +48,7 @@ class Venue extends Model implements HasMedia
         });
     }
 
-    public function registerMediaConversions(Media $media = null): void
+    public function registerMediaConversions(?Media $media = null): void
     {
         $this
             ->addMediaConversion('preview')
@@ -89,12 +89,12 @@ class Venue extends Model implements HasMedia
 
     public function lecturers()
     {
-        return $this->hasManyDeepFromRelations($this->courses(), (new Course())->lecturer());
+        return $this->hasManyDeepFromRelations($this->courses(), (new Course)->lecturer());
     }
 
     public function courses()
     {
-        return $this->hasManyDeepFromRelations($this->events(), (new CourseEvent())->course());
+        return $this->hasManyDeepFromRelations($this->events(), (new CourseEvent)->course());
     }
 
     public function courseEvents(): HasMany

app/Models/Vote.php

@@ -7,7 +7,6 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
 class Vote extends Model
 {
-
     /**
      * The attributes that aren't mass assignable.
      *

app/Providers/NostrAuthServiceProvider.php

@@ -13,7 +13,7 @@ class NostrAuthServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Auth::provider('nostr', function (Application $app, array $config) {
-            return new NostrUserProvider();
+            return new NostrUserProvider;
         });
 
         Auth::extend('nostr-session', function (Application $app, string $name, array $config) {

app/Support/NostrAuth.php

@@ -3,8 +3,8 @@
 namespace App\Support;
 
 use App\Auth\NostrUser;
-use Illuminate\Support\Facades\Session;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Session;
 
 class NostrAuth
 {

app/Traits/NostrFetcherTrait.php

@@ -22,6 +22,7 @@ trait NostrFetcherTrait
                     'hex' => $item,
                     'npub' => (new Key)->convertPublicKeyToBech32($item),
                 ]);
+
                 continue;
             }
             $hex->push([
@@ -30,10 +31,10 @@ trait NostrFetcherTrait
             ]);
         }
 
-        $subscription = new Subscription();
+        $subscription = new Subscription;
         $subscriptionId = $subscription->setId();
 
-        $filter1 = new Filter();
+        $filter1 = new Filter;
         $filter1->setKinds([0]); // You can add multiple kind numbers
         $filter1->setAuthors($hex->pluck('hex')->toArray()); // You can add multiple author ids
         $filters = [$filter1];
@@ -65,6 +66,7 @@ trait NostrFetcherTrait
 
         if (empty($data)) {
             \Log::warning('No data found from any relay');
+
             return;
         }
         foreach ($data as $item) {
@@ -94,5 +96,4 @@ trait NostrFetcherTrait
             }
         }
     }
-
 }

config/ciphersweet.php

@@ -50,5 +50,5 @@ return [
      * the field to have a value and alerts the user if it is empty or undefined.
      * Supported: "true", "false"
      */
-    'permit_empty' => env('CIPHERSWEET_PERMIT_EMPTY', FALSE)
+    'permit_empty' => env('CIPHERSWEET_PERMIT_EMPTY', false),
 ];

config/markdown.php

@@ -45,7 +45,6 @@ return [
      */
     'cache_store' => null,
 
-
     /*
      * When cache_store is enabled, this value will be used to determine
      * how long the cache will be valid. If you set this to `null` the

config/services.php

@@ -42,6 +42,6 @@ return [
 
     'btc_pay' => [
         'api_key' => env('BTC_PAY_API_KEY'),
-    ]
+    ],
 
 ];

database/migrations/2023_03_10_190301_create_votes_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_08_29_120928_create_einundzwanzig_plebs_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_08_29_125457_create_profiles_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_08_29_141818_create_events_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_08_29_143915_create_rendered_events_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_09_28_181901_create_elections_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_09_29_143100_add_end_time_field_to_elections_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_09_29_152902_add_application_fields_to_einundzwanzig_plebs_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
@@ -21,7 +22,6 @@ return new class extends Migration {
      */
     public function down(): void
     {
-        Schema::table('einundzwanzig_plebs', function (Blueprint $table) {
+        Schema::table('einundzwanzig_plebs', function (Blueprint $table) {});
-        });
     }
 };

database/migrations/2024_09_30_125722_create_payment_events_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_09_30_171153_add_copy_field_application_text_to_einundzwanzig_plebs_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_22_143729_add_zap_endpoint_field_to_payment_events_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_23_160756_add_accepted_field_to_project_proposals_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_24_132233_alter_payment_events_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_24_153410_add_website_field_to_project_proposals_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_25_121448_create_notifications_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_25_140418_add_email_field_to_einundzwanzig_plebs_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

database/migrations/2024_10_25_171026_add_no_email_field_to_einundzwanzig_plebs_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */

resources/views/components/project-card.blade.php

@@ -21,8 +21,8 @@
 
 <article
     wire:key="project_{{ $project->id }}"
-    class="flex bg-white dark:bg-gray-800 shadow-sm rounded-xl overflow-hidden">
+    wire:key="project_{{ $project->id }}"
-    <!-- Image -->
+    <flux:card class="flex overflow-hidden">
     @if(!$project->sats_paid)
         <a class="relative block w-24 sm:w-56 xl:sidebar-expanded:w-40 2xl:sidebar-expanded:w-56 shrink-0"
            href="{{ route('association.projectSupport.item', ['projectProposal' => $project]) }}">
@@ -124,5 +124,5 @@
             @endif
         </div>
     </div>
-</article>
+    </flux:card>
 @endif

resources/views/layouts/app.blade.php

@@ -1,3 +1,9 @@
+@php
+    $currentRoute = request()->route()->getName();
+    $isCurrentRouteClass = 'bg-gray-200 dark:bg-gray-700 text-gray-800 dark:text-gray-100';
+    $isNotCurrentRouteClass = 'text-gray-600 dark:text-gray-400';
+@endphp
+
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="dark">
 <head>
@@ -32,6 +38,14 @@
                 <flux:navbar.item icon="rss" :href="route('association.news')" :current="request()->routeIs('association.news')">News</flux:navbar.item>
                 <flux:navbar.item icon="identification" :href="route('association.profile')" :current="request()->routeIs('association.profile')">Profil</flux:navbar.item>
                 <flux:navbar.item icon="heart" :href="route('association.projectSupport')" :current="request()->routeIs('association.projectSupport')">Projekt-Unterstützungen</flux:navbar.item>
+
+                <flux:dropdown position="bottom">
+                    <flux:navbar.item icon:trailing="chevron-down">Admin</flux:navbar.item>
+
+                    <flux:navmenu>
+                        <flux:navmenu.item :href="route('association.members.admin')" :current="request()->routeIs('association.members.admin')">Mitglieder</flux:navmenu.item>
+                    </flux:navmenu>
+                </flux:dropdown>
             @endif
         </flux:navbar>
 
@@ -60,7 +74,7 @@
         </flux:navbar>
     </flux:header>
 
-    <flux:sidebar sticky collapsible="mobile" class="bg-zinc-50 dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-700">
+    <flux:sidebar sticky collapsible="mobile" class="lg:hidden bg-zinc-50 dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-700">
         <flux:sidebar.header>
             <flux:sidebar.brand
                 href="/"
@@ -77,9 +91,28 @@
                 <flux:sidebar.item icon="rss" :href="route('association.news')" :current="request()->routeIs('association.news')">News</flux:sidebar.item>
                 <flux:sidebar.item icon="identification" :href="route('association.profile')" :current="request()->routeIs('association.profile')">Meine Mitgliedschaft</flux:sidebar.item>
                 <flux:sidebar.item icon="heart" :href="route('association.projectSupport')" :current="request()->routeIs('association.projectSupport')">Projekt-Unterstützungen</flux:sidebar.item>
+
+                <flux:sidebar.group heading="Admin" class="grid">
+                    <flux:sidebar.item icon="users" :href="route('association.members.admin')" :current="request()->routeIs('association.members.admin')">Mitglieder</flux:sidebar.item>
+                </flux:sidebar.group>
+
+                <flux:sidebar.group heading="Info" class="grid">
+                    <flux:sidebar.item href="https://gitworkshop.dev/r/naddr1qvzqqqrhnypzqzklvar4enzu53t06vpzu3h465nwkzhk9p9ls4y5crwhs3lnu5pnqy88wumn8ghj7mn0wvhxcmmv9uqpxetfde6kuer6wasku7nfvukkummnw3eqdgsn8w/issues" target="_blank">Issues/Feedback</flux:sidebar.item>
+                    <flux:sidebar.item :href="route('changelog')">Changelog</flux:sidebar.item>
+                    <flux:sidebar.item href="https://github.com/HolgerHatGarkeineNode/einundzwanzig-nostr" target="_blank">Github</flux:sidebar.item>
+                    <flux:sidebar.item href="https://einundzwanzig.space/kontakt/" target="_blank">Impressum</flux:sidebar.item>
+                </flux:sidebar.group>
             @endif
 
-            <x-layouts.navigation.admin :currentRoute="request()->route()->getName()"/>
+            @if(\App\Support\NostrAuth::check())
+                <flux:sidebar.spacer />
+                <form method="post" action="{{ route('logout') }}" @submit="$dispatch('nostrLoggedOut')">
+                    @csrf
+                    <flux:sidebar.item icon="arrow-right-start-on-rectangle" type="submit">Logout</flux:sidebar.item>
+                </form>
+            @else
+                <flux:sidebar.item icon="user" @click="openNostrLogin">Mit Nostr verbinden</flux:sidebar.item>
+            @endif
         </flux:sidebar.nav>
     </flux:sidebar>
 

resources/views/livewire/association/election/show.blade.php

@@ -518,8 +518,8 @@ new class extends Component {
                                     </h1>
                                     <div class="grid sm:grid-cols-2 gap-6">
                                         <div
-                                            class="bg-white dark:bg-gray-800 shadow-sm rounded-xl">
+                                        <div class="grid sm:grid-cols-2 gap-6">
-                                            <div class="flex flex-col h-full p-5">
+                                        <flux:card>
 <header>
                                                     <div class="flex items-center justify-between">
                                                         <i class="fa-sharp-duotone fa-solid {{ $positions['presidency']['icon'] }} w-9 h-9 fill-current text-white"></i>
@@ -562,7 +562,7 @@ new class extends Component {
                                                     </div>
                                                 </footer>
                                             </div>
-                                        </div>
+                                        </flux:card>
                                     </div>
 
                                     <h1 class="mt-6 text-xl leading-snug text-gray-800 dark:text-gray-100 font-bold mb-1 sm:mb-0 ml-2">
@@ -571,7 +571,7 @@ new class extends Component {
                                     <div class="grid gap-6">
 
                                         <div
-                                            class="bg-white dark:bg-gray-800 shadow-sm rounded-xl">
+                                        <flux:card>
 <div class="flex flex-col h-full p-5">
                                                 <div class="grow mt-2">
                                                     <div class="text-sm">
@@ -597,7 +597,7 @@ new class extends Component {
                                                         @endforeach
                                                     </div>
                                                 </footer>
-                                            </div>
+                                        </flux:card>
                                         </div>
 
                                     </div>
@@ -607,7 +607,7 @@ new class extends Component {
 
                             <!-- Log events -->
                             <div x-cloak x-show="showLog" class="mt-6 hidden sm:block">
-                                <div class="bg-white dark:bg-gray-800 shadow-sm rounded-xl mb-8">
+                                <flux:card mb-8>
                                     <header class="px-5 py-4">
                                         <h2 class="font-semibold text-gray-800 dark:text-gray-100">Präsidium Log <span
                                                 class="text-gray-400 dark:text-gray-500 font-medium">{{ count($this->loadedEvents) }}</span>
@@ -671,10 +671,10 @@ new class extends Component {
                                             </table>
                                         </div>
                                     </div>
-                                </div>
+                            </flux:card>
                             </div>
                             <div x-cloak x-show="showLog" class="mt-6 hidden sm:block">
-                                <div class="bg-white dark:bg-gray-800 shadow-sm rounded-xl mb-8">
+                                <flux:card mb-8>
                                     <header class="px-5 py-4">
                                         <h2 class="font-semibold text-gray-800 dark:text-gray-100">Board Log <span
                                                 class="text-gray-400 dark:text-gray-500 font-medium">{{ count($this->loadedBoardEvents) }}</span>
@@ -738,7 +738,7 @@ new class extends Component {
                                             </table>
                                         </div>
                                     </div>
-                                </div>
+                            </flux:card>
                             </div>
 
                         </div>
@@ -749,13 +749,13 @@ new class extends Component {
             </div>
         @else
             <div class="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
-                <div class="bg-white dark:bg-[#1B1B1B] shadow overflow-hidden sm:rounded-lg">
+                <flux:card>
                     <div class="px-4 py-5 sm:px-6">
                         <h3 class="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">Wahlen</h3>
                         <p class="mt-1 max-w">
                             Du bist nicht berechtigt, die Wahlen einzusehen.
                         </p>
-                    </div>
+                    </flux:card>
                 </div>
             </div>
         @endif

resources/views/livewire/association/news.blade.php

@@ -4,9 +4,9 @@ use App\Enums\NewsCategory;
 use App\Models\Notification;
 use App\Support\NostrAuth;
 use Illuminate\Support\Collection;
-use Livewire\Component;
 use Livewire\Attributes\Layout;
 use Livewire\Attributes\Title;
+use Livewire\Component;
 use Livewire\WithFileUploads;
 
 new
@@ -35,8 +35,11 @@ class extends Component {
             $currentPubkey = NostrAuth::pubkey();
             $currentPleb = \App\Models\EinundzwanzigPleb::query()->where('pubkey', $currentPubkey)->first();
 
-            if ($currentPleb && $currentPleb->association_status->value > 1 && $currentPleb->paymentEvents()->where('year',
+            if (
-                    date('Y'))->where('paid', true)->exists()) {
+                $currentPleb
+                && $currentPleb->association_status->value > 1
+                && $currentPleb->paymentEvents()->where('year', date('Y'))->where('paid', true)->exists()
+            ) {
                 $this->isAllowed = true;
             }
 
@@ -158,8 +161,8 @@ class extends Component {
                             <div class="space-y-2">
                                 @forelse($news as $post)
                                     <article wire:key="post_{{ $post->id }}"
-                                             class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
+                                    <article wire:key="post_{{ $post->id }}"
-                                        <div class="flex flex-start space-x-4">
+                                    <flux:card>
                                             <!-- Avatar -->
                                             <div class="shrink-0 mt-1.5">
                                                 <img class="w-8 h-8 rounded-full"
@@ -220,11 +223,11 @@ class extends Component {
                                                 </flux:button>
                                             @endif
                                         </div>
-                                    </article>
+                                    </flux:card>
                                 @empty
-                                    <article class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
+                                    <flux:card>
                                         <p>Keine News vorhanden.</p>
-                                    </article>
+                                    </flux:card>
                                 @endforelse
                             </div>
 
@@ -243,7 +246,7 @@ class extends Component {
                             <div class="space-y-4">
 
                                 @if($canEdit)
-                                    <div class="bg-white dark:bg-gray-800 p-4 rounded-xl">
+                                    <flux:card>
                                         <div
                                             class="text-xs font-semibold text-gray-400 dark:text-gray-500 uppercase mb-4">
                                             News anlegen
@@ -283,7 +286,8 @@ class extends Component {
                                                 <flux:field>
                                                     <flux:label>Beschreibung</flux:label>
                                                     <flux:description>optional</flux:description>
-                                                    <flux:textarea wire:model="form.description" rows="4" placeholder="Beschreibung..." />
+                                                    <flux:textarea wire:model="form.description" rows="4"
+                                                                   placeholder="Beschreibung..."/>
                                                     <flux:error name="form.description"/>
                                                 </flux:field>
                                             </div>
@@ -291,7 +295,7 @@ class extends Component {
                                                 Hinzufügen
                                             </flux:button>
                                         </div>
-                                    </div>
+                                    </flux:card>
                                 @endif
 
                             </div>
@@ -304,7 +308,7 @@ class extends Component {
         </div>
     @else
         <div class="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
-            <div class="bg-white dark:bg-[#1B1B1B] shadow overflow-hidden sm:rounded-lg">
+            <flux:card>
                 <div class="px-4 py-5 sm:px-6">
                     <h3 class="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">
                         News
@@ -312,7 +316,7 @@ class extends Component {
                     <p class="mt-1 max-w">
                         Du bist nicht berechtigt, die News einzusehen.
                     </p>
-                </div>
+                </flux:card>
             </div>
         </div>
     @endif

resources/views/livewire/association/profile.blade.php

@@ -319,7 +319,7 @@ new class extends Component {
 
         </div>
 
-        <div class="bg-white dark:bg-[#1B1B1B] shadow-sm rounded-xl mb-8">
+        <flux:card mb-8>
             <div class="flex flex-col md:flex-row md:-mr-px">
 
                 <!-- Sidebar -->
@@ -340,8 +340,7 @@ new class extends Component {
                                 </a>
                             </li>
                         </ul>
-                    </div>
+                                    </flux:card>
-                </div>
 
                 <!-- Panel -->
                 <div class="grow">
@@ -359,7 +358,7 @@ new class extends Component {
                                             Login und Signer-Apps
                                         </div>
                                     </div>
-                                    <div class="bg-white dark:bg-gray-800 shadow-sm rounded-xl px-5 py-4">
+                                    <flux:card>
                                         <div
                                             class="md:flex justify-between items-center space-y-4 md:space-y-0 space-x-2">
                                             <!-- Left side -->
@@ -382,8 +381,8 @@ new class extends Component {
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </flux:card>
-                                    <div class="bg-white dark:bg-gray-800 shadow-sm rounded-xl px-5 py-4">
+                                    <flux:card>
                                         <div
                                             class="md:flex justify-between items-center space-y-4 md:space-y-0 space-x-2">
                                             <!-- Left side -->
@@ -407,8 +406,8 @@ new class extends Component {
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </flux:card>
-                                    <div class="bg-white dark:bg-gray-800 shadow-sm rounded-xl px-5 py-4">
+                                    <flux:card>
                                         <div
                                             class="md:flex justify-between items-center space-y-4 md:space-y-0 space-x-2">
                                             <!-- Left side -->
@@ -431,8 +430,8 @@ new class extends Component {
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </flux:card>
-                                    <div class="bg-white dark:bg-gray-800 shadow-sm rounded-xl px-5 py-4">
+                                    <flux:card>
                                         <div
                                             class="md:flex justify-between items-center space-y-4 md:space-y-0 space-x-2">
                                             <!-- Left side -->
@@ -454,7 +453,7 @@ new class extends Component {
                                                     Browser Firefox
                                                 </div>
                                             </div>
-                                        </div>
+                                    </flux:card>
                                     </div>
                                 </div>
                             @endif
@@ -476,7 +475,7 @@ new class extends Component {
                                 </template>
                                 @if($currentPubkey && $currentPleb->association_status->value < 2)
                                     <div
-                                        class="inline-flex min-w-80 px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-100">
+                                        <flux:card>
 <div class="flex w-full justify-between items-start">
                                             <div class="flex">
                                                 <svg class="shrink-0 fill-current text-green-500 mt-[3px] mr-3"
@@ -486,7 +485,7 @@ new class extends Component {
                                                 </svg>
                                                 <div>Profil in der Datenbank vorhanden.</div>
                                             </div>
-                                        </div>
+                                        </flux:card>
                                     </div>
                                 @endif
                             </div>
@@ -524,7 +523,7 @@ new class extends Component {
                             @endif
                             @if($currentPubkey)
                                 <div
-                                    class="mt-6 inline-flex flex-col w-full px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-400">
+<flux:card class="mt-6">
 <div class="flex w-full justify-between items-start">
                                         <div class="flex w-full">
                                             <svg class="shrink-0 fill-current text-yellow-500 mt-[3px] mr-3"
@@ -578,7 +577,7 @@ new class extends Component {
                                                     </div>
                                                 @endif
                                             </div>
-                                        </div>
+                                        </flux:card>
                                     </div>
                                 </div>
                             @endif
@@ -588,7 +587,7 @@ new class extends Component {
                             @if($currentPleb && $currentPleb->association_status->value > 1)
                                 <div class="flex flex-col space-y-4">
                                     <div
-                                        class="inline-flex flex-col w-full max-w-lg px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-400">
+<flux:card class="max-w-lg">
 <div class="flex w-full justify-between items-start">
                                             <div class="flex">
                                                 <svg class="shrink-0 fill-current text-green-500 mt-[3px] mr-3"
@@ -604,7 +603,7 @@ new class extends Component {
                                                 </div>
                                             </div>
                                         </div>
-                                    </div>
+                                    </flux:card>
                                 </div>
                             @endif
                         </section>
@@ -612,7 +611,7 @@ new class extends Component {
                         <section>
                             @if($currentPleb && $currentPleb->association_status->value > 1)
                                 <div
-                                    class="inline-flex flex-col w-full px-4 py-2 rounded-lg text-sm bg-white dark:bg-gray-800 shadow-sm border border-gray-200 dark:border-gray-700/60 text-gray-600 dark:text-gray-400">
+<flux:card>
 <div class="flex w-full justify-between items-start">
                                         <div class="flex">
                                             <svg class="shrink-0 fill-current text-yellow-500 mt-[3px] mr-3" width="16"
@@ -717,9 +716,12 @@ new class extends Component {
                                                                     </td>
                                                                     <td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2">
                                                                         @if($payment->btc_pay_invoice)
-                                                                            <x-button target="_blank" xs
+                                                                            <flux:button href="https://pay.einundzwanzig.space/i/{{ $payment->btc_pay_invoice }}/receipt"
-                                                                                      label="Quittung"
+                                                                                       target="_blank"
-                                                                                      href="https://pay.einundzwanzig.space/i/{{ $payment->btc_pay_invoice }}/receipt"/>
+                                                                                       size="xs"
+                                                                                       variant="subtle">
+                                                                                Quittung
+                                                                            </flux:button>
                                                                         @endif
                                                                     </td>
                                                                 </tr>
@@ -731,7 +733,7 @@ new class extends Component {
                                             </div>
                                         </div>
                                     </div>
-                                </div>
+                                </flux:card>
                             @endif
                         </section>
 

resources/views/livewire/association/project-support/show.blade.php

@@ -48,8 +48,7 @@ class extends Component {
             <div class="md:flex">
                 <!-- Left column -->
                 <div class="w-full md:w-60 mb-4 md:mb-0">
-                    <div
+                    <flux:card>
-                        class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
                         <h2 class="text-lg font-semibold text-gray-800 dark:text-gray-100 mb-4">
                             Details
                         </h2>
@@ -73,26 +72,25 @@ class extends Component {
                                 </dd>
                             </div>
                         </dl>
-                    </div>
+                    </flux:card>
                 </div>
 
                 <!-- Right column -->
                 <div class="flex-1 md:ml-8">
-                    <div
+                    <flux:card>
-                        class="bg-white dark:bg-gray-800 shadow-sm rounded-xl p-5">
                         <h2 class="text-lg font-semibold text-gray-800 dark:text-gray-100 mb-4">
                             Beschreibung
                         </h2>
                         <p class="text-sm text-gray-800 dark:text-gray-100">
                             {{ $project->description ?? 'Keine Beschreibung' }}
                         </p>
-                    </div>
+                    </flux:card>
                 </div>
             </div>
         </div>
     @else
         <div class="px-4 sm:px-6 lg:px-8 py-8 w-full max-w-9xl mx-auto">
-            <div class="bg-white dark:bg-[#1B1B1B] shadow overflow-hidden sm:rounded-lg">
+            <flux:card>
                 <div class="px-4 py-5 sm:px-6">
                     <h3 class="text-lg font-medium leading-6 text-gray-900 dark:text-gray-200">
                         Projektförderung
@@ -100,7 +98,7 @@ class extends Component {
                     <p class="mt-1 max-w">
                         Du bist nicht berechtigt, die Projektförderung einzusehen.
                     </p>
-                </div>
+                </flux:card>
             </div>
         </div>
     @endif

routes/web.php

@@ -1,4 +1,5 @@
 <?php
+
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\Session;