From 4a425da9236a6383840d708300930d3701b9b2c2 Mon Sep 17 00:00:00 2001 From: HolgerHatGarKeineNode Date: Tue, 20 Jan 2026 14:58:02 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Update=20color=20palette:=20repl?= =?UTF-8?q?ace=20`gray`=20with=20`zinc`=20across=20Blade=20templates=20for?= =?UTF-8?q?=20improved=20design=20consistency=20and=20accessibility.=20?= =?UTF-8?q?=F0=9F=9B=A0=20Refactor=20forms:=20rename=20NostrAuth=20method?= =?UTF-8?q?=20for=20clarity=20and=20enhance=20Flux=20button=20usage=20for?= =?UTF-8?q?=20cleaner=20and=20reusable=20components.=20=E2=9C=A8=20Add=20`?= =?UTF-8?q?WithNostrAuth`=20trait:=20refactor=20`show`=20template=20logic,?= =?UTF-8?q?=20streamline=20project-support=20handling,=20and=20improve=20l?= =?UTF-8?q?ayout=20readability.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Livewire/Traits/WithNostrAuth.php | 2 +- .../views/components/project-card.blade.php | 71 ++++--- .../association/election/admin.blade.php | 14 +- .../association/election/show.blade.php | 56 ++--- .../views/livewire/association/news.blade.php | 16 +- .../livewire/association/profile.blade.php | 110 +++++----- .../project-support/form/create.blade.php | 6 +- .../project-support/form/edit.blade.php | 6 +- .../project-support/index.blade.php | 24 +-- .../project-support/show.blade.php | 194 ++++++++---------- 10 files changed, 240 insertions(+), 259 deletions(-) diff --git a/app/Livewire/Traits/WithNostrAuth.php b/app/Livewire/Traits/WithNostrAuth.php index 4238467..9831132 100644 --- a/app/Livewire/Traits/WithNostrAuth.php +++ b/app/Livewire/Traits/WithNostrAuth.php @@ -43,7 +43,7 @@ trait WithNostrAuth $this->canEdit = false; } - public function mountNostrAuth(): void + public function mountWithNostrAuth(): void { if ($user = NostrAuth::user()) { $this->currentPubkey = $user->getPubkey(); diff --git a/resources/views/components/project-card.blade.php b/resources/views/components/project-card.blade.php index ad3807e..8b19256 100644 --- a/resources/views/components/project-card.blade.php +++ b/resources/views/components/project-card.blade.php @@ -27,22 +27,23 @@ src="{{ $project->getFirstMediaUrl('main') }}" alt="Meetup 01"> @else -
+ Meetup 01 -
+ @endif
@@ -63,45 +64,41 @@
+ {{ number_format($project->support_in_sats, 0, ',', '.') }} Sats
- {{ number_format($project->support_in_sats, 0, ',', '.') }} Sats -
-
- Webseite + Webseite
@if($project->votes->where('value', true)->count() > 0) @endif
-
- @if( - ($currentPleb && $currentPleb->id === $project->einundzwanzig_pleb_id) - || ($currentPleb && in_array($currentPleb->npub, config('einundzwanzig.config.current_board'), true)) - ) - - Löschen - +
+ @if( + ($currentPleb && $currentPleb->id === $project->einundzwanzig_pleb_id) + || ($currentPleb && in_array($currentPleb->npub, config('einundzwanzig.config.current_board'), true)) + ) + + Löschen + - - Editieren - - @endif + + Editieren + + @endif @if(($currentPleb && $currentPleb->association_status->value > 2) || $project->accepted)
@if($project->sats_paid) - Wurde mit {{ number_format($project->sats_paid, 0, ',', '.') }} Sats unterstützt + Wurde mit {{ number_format($project->sats_paid, 0, ',', '.') }} Sats + unterstützt + @endif
diff --git a/resources/views/livewire/association/election/admin.blade.php b/resources/views/livewire/association/election/admin.blade.php index 3d7c2c8..22b7fce 100644 --- a/resources/views/livewire/association/election/admin.blade.php +++ b/resources/views/livewire/association/election/admin.blade.php @@ -168,7 +168,7 @@ new class extends Component {
-

+

Wahl des Vorstands {{ $election->year }}

@@ -183,9 +183,9 @@ new class extends Component {
-
-

+
+

{{ $president['title'] }}

@@ -196,9 +196,9 @@ new class extends Component {

-
-

+
+

{{ $board['title'] }}

diff --git a/resources/views/livewire/association/election/show.blade.php b/resources/views/livewire/association/election/show.blade.php index f296b5d..75d952b 100644 --- a/resources/views/livewire/association/election/show.blade.php +++ b/resources/views/livewire/association/election/show.blade.php @@ -124,7 +124,7 @@ new class extends Component { ->get() ->map(function ($p) use ($loadedEvents, $c) { $votedClass = ' bg-green-500/20 text-green-700'; - $notVotedClass = ' bg-gray-500/20 text-gray-100'; + $notVotedClass = ' bg-zinc-500/20 text-zinc-100'; $hasVoted = $loadedEvents ->filter(fn ($e) => $e['type'] === $c['type'] && $e['pubkey'] === $this->currentPubkey) ->firstWhere('votedFor.pubkey', $p->pubkey); @@ -158,7 +158,7 @@ new class extends Component { ->get() ->map(function ($p) use ($loadedBoardEvents, $c) { $votedClass = ' bg-green-500/20 text-green-700'; - $notVotedClass = ' bg-gray-500/20 text-gray-100'; + $notVotedClass = ' bg-zinc-500/20 text-zinc-100'; $hasVoted = $loadedBoardEvents ->filter(fn ($e) => $e['type'] === $c['type'] && $e['pubkey'] === $this->currentPubkey) ->firstWhere('votedFor.pubkey', $p->pubkey); @@ -311,13 +311,13 @@ new class extends Component { class="absolute z-20 top-0 bottom-0 w-full md:w-auto md:static md:top-auto md:bottom-auto -mr-px md:translate-x-0 transition-transform duration-200 ease-in-out" :class="inboxSidebarOpen ? 'translate-x-0' : '-translate-x-full'">
+ class="sticky top-16 bg-white dark:bg-[#1B1B1B] overflow-x-hidden overflow-y-auto no-scrollbar shrink-0 border-r border-zinc-200 dark:border-zinc-700/60 md:w-[18rem] xl:w-[20rem] h-[calc(100dvh-64px)]">
-
+
@@ -325,16 +325,16 @@ new class extends Component { @click.prevent="open = !open" :aria-expanded="open">
2024 + class="font-semibold text-zinc-800 dark:text-zinc-100">2024

+ class="inline-flex text-zinc-800 dark:text-zinc-100 hover:text-zinc-900 dark:hover:text-white mb-1">

{{ $positions['presidency']['title'] }}

@@ -541,7 +541,7 @@ new class extends Component {
-

+

Wahl der übrigen Vorstandsmitglieder

@@ -583,18 +583,18 @@ new class extends Component {