einundzwanzig/einundzwanzig-verein
1
0
Fork 0
mirror of https://github.com/HolgerHatGarKeineNode/einundzwanzig-nostr.git synced 2026-01-27 06:33:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

🚀 Integrate Flux modals and toasts into Blade templates, refactor delete confirmation logic, and replace deprecated WireUI notifications for improved UX.

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2026-01-18 20:47:12 +01:00
parent b090336c4f
commit 18f8dd99e3
6 changed files with 127 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
resources/views/components/project-card.blade.php
View File

@@ -89,14 +89,15 @@
($currentPleb && $currentPleb->id === $project->einundzwanzig_pleb_id) ($currentPleb && $currentPleb->id === $project->einundzwanzig_pleb_id)
|| ($currentPleb && in_array($currentPleb->npub, config('einundzwanzig.config.current_board'), true)) || ($currentPleb && in_array($currentPleb->npub, config('einundzwanzig.config.current_board'), true))
) )
<flux:button <flux:modal.trigger name="delete-project">
icon="trash" <flux:button
xs icon="trash"
negative xs
wire:click="confirmDelete({{ $project->id }})" negative
wire:loading.attr="disabled"> wire:loading.attr="disabled">
Löschen Löschen
</flux:button> </flux:button>
</flux:modal.trigger>
<flux:button <flux:button
icon="pencil" icon="pencil"
xs xs

4
resources/views/layouts/app.blade.php
View File

@@ -120,6 +120,10 @@
{{ $slot }} {{ $slot }}
</flux:main> </flux:main>
@persist('toast')
<flux:toast />
@endpersist
@fluxScripts @fluxScripts
@livewireScriptConfig @livewireScriptConfig
<script> <script>

7
resources/views/livewire/association/election/show.blade.php
View File

@@ -517,8 +517,6 @@ new class extends Component {
Wahl des Präsidiums Wahl des Präsidiums
</h1> </h1>
<div class="grid sm:grid-cols-2 gap-6"> <div class="grid sm:grid-cols-2 gap-6">
<div
<div class="grid sm:grid-cols-2 gap-6">
<flux:card> <flux:card>
<header> <header>
<div class="flex items-center justify-between"> <div class="flex items-center justify-between">
@@ -565,12 +563,10 @@ new class extends Component {
</flux:card> </flux:card>
</div> </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"> <h1 class="mt-6 text-xl leading-snug text-gray-800 dark:text-gray-100 font-bold mb-1 sm:mb-0 ml-2">
Wahl der übrigen Vorstandsmitglieder Wahl der übrigen Vorstandsmitglieder
</h1> </h1>
<div class="grid gap-6"> <div class="grid gap-6">
<div
<flux:card> <flux:card>
<div class="flex flex-col h-full p-5"> <div class="flex flex-col h-full p-5">
<div class="grow mt-2"> <div class="grow mt-2">
@@ -744,6 +740,7 @@ new class extends Component {
</div> </div>
</div> </div>
</div>
@endif @endif
</div> </div>

4
resources/views/livewire/association/news.blade.php
View File

@@ -160,9 +160,7 @@ class extends Component {
<div class="space-y-2"> <div class="space-y-2">
@forelse($news as $post) @forelse($news as $post)
<article wire:key="post_{{ $post->id }}" <flux:card wire:key="post_{{ $post->id }}">
<article wire:key="post_{{ $post->id }}"
<flux:card>
<!-- Avatar --> <!-- Avatar -->
<div class="shrink-0 mt-1.5"> <div class="shrink-0 mt-1.5">
<img class="w-8 h-8 rounded-full" <img class="w-8 h-8 rounded-full"

181
resources/views/livewire/association/profile.blade.php
View File

@@ -4,6 +4,7 @@ use App\Enums\AssociationStatus;
use App\Livewire\Forms\ApplicationForm; use App\Livewire\Forms\ApplicationForm;
use App\Models\EinundzwanzigPleb; use App\Models\EinundzwanzigPleb;
use App\Support\NostrAuth; use App\Support\NostrAuth;
use Flux\Flux;
use Livewire\Component; use Livewire\Component;
use swentel\nostr\Event\Event as NostrEvent; use swentel\nostr\Event\Event as NostrEvent;
use swentel\nostr\Filter\Filter; use swentel\nostr\Filter\Filter;
@@ -14,7 +15,6 @@ use swentel\nostr\Relay\RelaySet;
use swentel\nostr\Request\Request; use swentel\nostr\Request\Request;
use swentel\nostr\Sign\Sign; use swentel\nostr\Sign\Sign;
use swentel\nostr\Subscription\Subscription; use swentel\nostr\Subscription\Subscription;
use WireUi\Actions\Notification;
new class extends Component { new class extends Component {
public ApplicationForm $form; public ApplicationForm $form;
@@ -132,8 +132,7 @@ new class extends Component {
$this->currentPleb->update([ $this->currentPleb->update([
'email' => $this->email, 'email' => $this->email,
]); ]);
$notification = new Notification($this); Flux::toast('E-Mail Adresse gespeichert.');
$notification->success('E-Mail Adresse gespeichert.');
} }
public function pay($comment): \Illuminate\Http\RedirectResponse public function pay($comment): \Illuminate\Http\RedirectResponse
@@ -175,9 +174,9 @@ new class extends Component {
return redirect($response->json()['checkoutLink']); return redirect($response->json()['checkoutLink']);
} catch (\Exception $e) { } catch (\Exception $e) {
$notification = new Notification($this); Flux::toast(
$notification->error(
'Fehler beim Erstellen der Rechnung. Bitte versuche es später erneut: '.$e->getMessage(), 'Fehler beim Erstellen der Rechnung. Bitte versuche es später erneut: '.$e->getMessage(),
variant: 'danger',
); );
return redirect()->route('association.profile'); return redirect()->route('association.profile');
@@ -319,7 +318,7 @@ new class extends Component {
</div> </div>
<flux:card mb-8> <flux:card>
<div class="flex flex-col md:flex-row md:-mr-px"> <div class="flex flex-col md:flex-row md:-mr-px">
<!-- Sidebar --> <!-- Sidebar -->
@@ -340,7 +339,7 @@ new class extends Component {
</a> </a>
</li> </li>
</ul> </ul>
</flux:card> </div>
<!-- Panel --> <!-- Panel -->
<div class="grow"> <div class="grow">
@@ -349,7 +348,7 @@ new class extends Component {
<div class="p-6 space-y-6"> <div class="p-6 space-y-6">
<h2 class="sm:text-2xl text-[#1B1B1B] dark:text-gray-100 font-bold mb-5">Aktueller Status</h2> <h2 class="sm:text-2xl text-[#1B1B1B] dark:text-gray-100 font-bold mb-5">Aktueller Status</h2>
<section> <section>
@if(!$currentPleb) @if(!$currentPleb)
<div class="space-y-2 mb-12"> <div class="space-y-2 mb-12">
@@ -432,8 +431,6 @@ new class extends Component {
</div> </div>
</flux:card> </flux:card>
<flux:card> <flux:card>
<div
class="md:flex justify-between items-center space-y-4 md:space-y-0 space-x-2">
<!-- Left side --> <!-- Left side -->
<div class="flex items-start space-x-3 md:space-x-4"> <div class="flex items-start space-x-3 md:space-x-4">
<div> <div>
@@ -453,12 +450,10 @@ new class extends Component {
Browser Firefox Browser Firefox
</div> </div>
</div> </div>
</flux:card> </flux:card>
</div> @endif
</div>
@endif
<div class="flex flex-wrap space-y-2 sm:space-y-0 items-center justify-between"> <div class="flex flex-wrap space-y-2 sm:space-y-0 items-center justify-between">
<template x-if="$store.nostr.user"> <template x-if="$store.nostr.user">
<div class="flex items"> <div class="flex items">
<img class="w-12 h-12 rounded-full" <img class="w-12 h-12 rounded-full"
@@ -473,10 +468,8 @@ new class extends Component {
</div> </div>
</div> </div>
</template> </template>
@if($currentPubkey && $currentPleb->association_status->value < 2) @if($currentPubkey && $currentPleb->association_status->value < 2)
<div
<flux:card> <flux:card>
<div class="flex w-full justify-between items-start">
<div class="flex"> <div class="flex">
<svg class="shrink-0 fill-current text-green-500 mt-[3px] mr-3" <svg class="shrink-0 fill-current text-green-500 mt-[3px] mr-3"
width="16" height="16" viewBox="0 0 16 16"> width="16" height="16" viewBox="0 0 16 16">
@@ -486,13 +479,12 @@ new class extends Component {
<div>Profil in der Datenbank vorhanden.</div> <div>Profil in der Datenbank vorhanden.</div>
</div> </div>
</flux:card> </flux:card>
</div> </div>
@endif @endif
</div> </div>
</section> </section>
<section> <section>
@if($currentPubkey && !$currentPleb->application_for && $currentPleb->association_status->value < 2)
<h3 class="text-xl leading-snug text-[#1B1B1B] dark:text-gray-100 font-bold mb-1"> <h3 class="text-xl leading-snug text-[#1B1B1B] dark:text-gray-100 font-bold mb-1">
Einundzwanzig Mitglied werden Einundzwanzig Mitglied werden
</h3> </h3>
@@ -518,11 +510,9 @@ new class extends Component {
<flux:button wire:click="save({{ AssociationStatus::PASSIVE() }})"> <flux:button wire:click="save({{ AssociationStatus::PASSIVE() }})">
Mit deinem aktuellen Nostr-Profil Mitglied werden Mit deinem aktuellen Nostr-Profil Mitglied werden
</flux:button> </flux:button>
</div> </div>
</div> </div>
@endif @if($currentPubkey)
@if($currentPubkey)
<div
<flux:card class="mt-6"> <flux:card class="mt-6">
<div class="flex w-full justify-between items-start"> <div class="flex w-full justify-between items-start">
<div class="flex w-full"> <div class="flex w-full">
@@ -570,22 +560,26 @@ new class extends Component {
<flux:error name="email" /> <flux:error name="email" />
</flux:field> </flux:field>
</div> </div>
<div wire:key="showSave" class="flex space-x-2 mt-2"> <div wire:key="showSave" class="flex space-x-2 mt-2">
<flux:button wire:click="saveEmail" wire:loading.attr="disabled"> <flux:button wire:click="saveEmail" wire:loading.attr="disabled">
Speichern Speichern
</flux:button> </flux:button>
</div> </div>
@endif @endif
</div> </div>
</flux:card> </div>
</div> </div>
</div>
@endif
@endif
</div> </div>
@endif </div>
</section> @endif
</section>
<section> <section>
@if($currentPleb && $currentPleb->association_status->value > 1) @if($currentPleb && $currentPleb->association_status->value > 1)
<div class="flex flex-col space-y-4"> <div class="flex flex-col space-y-4">
<div <div
<flux:card class="max-w-lg"> <flux:card class="max-w-lg">
<div class="flex w-full justify-between items-start"> <div class="flex w-full justify-between items-start">
@@ -603,14 +597,13 @@ new class extends Component {
</div> </div>
</div> </div>
</div> </div>
</flux:card> </flux:card>
</div> </div>
@endif @endif
</section> </section>
<section> <section>
@if($currentPleb && $currentPleb->association_status->value > 1) @if($currentPleb && $currentPleb->association_status->value > 1)
<div
<flux:card> <flux:card>
<div class="flex w-full justify-between items-start"> <div class="flex w-full justify-between items-start">
<div class="flex"> <div class="flex">
@@ -626,47 +619,36 @@ new class extends Component {
Mitgliedsbeitrags: <span Mitgliedsbeitrags: <span
class="break-all">{{ $currentPleb->paymentEvents->last()->event_id }}</span> class="break-all">{{ $currentPleb->paymentEvents->last()->event_id }}</span>
</p> </p>
<div> <div>
@php @if(isset($latestEvent))
// latest event by created_at field of $events
$latestEvent = collect($events)->sortByDesc('created_at')->first();
@endphp
@if(isset($latestEvent))
<p>{{ $latestEvent['content'] }}</p> <p>{{ $latestEvent['content'] }}</p>
<div class="mt-8"> <div class="mt-8">
@if(!$currentYearIsPaid) @if(!$currentYearIsPaid)
<div class="flex justify-center"> <div class="flex justify-center">
<button <flux:button wire:click="pay('{{ date('Y') }}:{{ $currentPubkey }}')" class="text-2xl">
wire:click="pay('{{ date('Y') }}:{{ $currentPubkey }}')"
class="btn text-2xl dark:bg-gray-800 border-gray-200 dark:border-gray-700/60 hover:border-gray-300 dark:hover:border-gray-600 text-green-500"
>
<i class="fa-sharp-duotone fa-solid fa-bolt-lightning mr-2"></i> <i class="fa-sharp-duotone fa-solid fa-bolt-lightning mr-2"></i>
Pay {{ $amountToPay }} Sats Pay {{ $amountToPay }} Sats
</button> </flux:button>
</div> </div>
@else @else
@if($currentYearIsPaid) @if($currentYearIsPaid)
<div class="flex sm:justify-center"> <div class="flex sm:justify-center">
<div <flux:button disabled class="sm:text-2xl">
class="btn sm:text-2xl dark:bg-gray-800 border-gray-200 dark:border-gray-700/60 text-green-500"
>
<i class="fa-sharp-duotone fa-solid fa-check-circle mr-2"></i> <i class="fa-sharp-duotone fa-solid fa-check-circle mr-2"></i>
aktuelles Jahr bezahlt aktuelles Jahr bezahlt
</div> </flux:button>
</div> </div>
@endif @endif
@endif @endif
</div> </div>
@else @else
<div class="flex sm:justify-center"> <div class="flex sm:justify-center">
<button <flux:button disabled>
class="btn dark:bg-gray-800 border-gray-200 dark:border-gray-700/60 hover:border-gray-300 dark:hover:border-gray-600 text-amber-500"
>
<i class="fa-sharp-duotone fa-solid fa-user-helmet-safety mr-2"></i> <i class="fa-sharp-duotone fa-solid fa-user-helmet-safety mr-2"></i>
Unser Nostr-Relay konnte derzeit nicht erreicht Unser Nostr-Relay konnte derzeit nicht erreicht
werden, um eine Zahlung zu initialisieren. Bitte werden, um eine Zahlung zu initialisieren. Bitte
versuche es später noch einmal. versuche es später noch einmal.
</button> </flux:button>
</div> </div>
@endif @endif
</div> </div>
@@ -693,49 +675,49 @@ new class extends Component {
</th> </th>
</tr> </tr>
</thead> </thead>
<!-- Table body --> <!-- Table body -->
<tbody class="text-sm"> <tbody class="text-sm">
@foreach($payments as $payment) @foreach($payments as $payment)
<tr class="flex flex-wrap md:table-row md:flex-no-wrap border-b border-gray-200 dark:border-gray-700/60 py-2 md:py-0"> <tr class="flex flex-wrap md:table-row md:flex-no-wrap border-b border-gray-200 dark:border-gray-700/60 py-2 md:py-0">
<td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2"> <td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2">
<div <div
class="text-left font-medium text-gray-800 dark:text-gray-100"> class="text-left font-medium text-gray-800 dark:text-gray-100">
<span class="sm:hidden">Sats:</span> <span class="sm:hidden">Sats:</span>
{{ $payment->amount }} {{ $payment->amount }}
</div> </div>
</td> </td>
<td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2"> <td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2">
<div <div
class="text-left"><span class="text-left"><span
class="sm:hidden">Jahr:</span>{{ $payment->year }} class="sm:hidden">Jahr:</span>{{ $payment->year }}
</div> </div>
</td> </td>
<td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2"> <td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2">
<div <div
class="text-left font-medium break-all">{{ $payment->event_id }}</div> class="text-left font-medium break-all">{{ $payment->event_id }}</div>
</td> </td>
<td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2"> <td class="w-full block md:w-auto md:table-cell py-0.5 md:py-2">
@if($payment->btc_pay_invoice) @if($payment->btc_pay_invoice)
<flux:button href="https://pay.einundzwanzig.space/i/{{ $payment->btc_pay_invoice }}/receipt" <flux:button href="https://pay.einundzwanzig.space/i/{{ $payment->btc_pay_invoice }}/receipt"
target="_blank" target="_blank"
size="xs" size="xs"
variant="subtle"> variant="subtle">
Quittung Quittung
</flux:button> </flux:button>
@endif @endif
</td> </td>
</tr> </tr>
@endforeach @endforeach
</tbody> </tbody>
</table> </table>
</section> </section>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</flux:card> </flux:card>
@endif @endif
</section> </section>
</div> </div>
@@ -743,6 +725,7 @@ new class extends Component {
</div> </div>
</div> </div>
</div>
</div> </div>
</div> </div>

42
resources/views/livewire/association/project-support/index.blade.php
View File

@@ -2,12 +2,14 @@
use App\Models\ProjectProposal; use App\Models\ProjectProposal;
use App\Support\NostrAuth; use App\Support\NostrAuth;
use Flux\Flux;
use Livewire\Component; use Livewire\Component;
use WireUi\Actions\Notification;
new class extends Component { new class extends Component {
public string $activeFilter = 'all'; public string $activeFilter = 'all';
public ?string $confirmDeleteId = null;
public string $search = ''; public string $search = '';
public \Illuminate\Database\Eloquent\Collection $projects; public \Illuminate\Database\Eloquent\Collection $projects;
@@ -74,16 +76,8 @@ new class extends Component {
public function confirmDelete($id): void public function confirmDelete($id): void
{ {
$notification = new Notification($this); $this->confirmDeleteId = $id;
$notification->confirm([ Flux::modal('delete-project')->show();
'title' => 'Projektunterstützung löschen',
'message' => 'Bist du sicher, dass du diese Projektunterstützung löschen möchtest?',
'accept' => [
'label' => 'Ja, löschen',
'method' => 'delete',
'params' => $id,
],
]);
} }
public function setFilter($filter): void public function setFilter($filter): void
@@ -91,10 +85,12 @@ new class extends Component {
$this->activeFilter = $filter; $this->activeFilter = $filter;
} }
public function delete($id): void public function delete(): void
{ {
ProjectProposal::query()->findOrFail($id)->delete(); ProjectProposal::query()->findOrFail($this->confirmDeleteId)->delete();
Flux::toast('Projektunterstützung gelöscht.');
$this->loadProjects(); $this->loadProjects();
Flux::modals()->close();
} }
}; };
@@ -170,5 +166,25 @@ new class extends Component {
@endforeach @endforeach
</div> </div>
<!-- Confirmation modal -->
<flux:modal name="delete-project" class="min-w-[22rem]">
<div class="space-y-6">
<div>
<flux:heading size="lg">Projektunterstützung löschen</flux:heading>
<flux:text class="mt-2">
<p>Bist du sicher, dass du diese Projektunterstützung löschen möchtest?</p>
<p>Diese Aktion kann nicht rückgängig gemacht werden.</p>
</flux:text>
</div>
<div class="flex gap-2">
<flux:spacer />
<flux:modal.close>
<flux:button variant="ghost">Abbrechen</flux:button>
</flux:modal.close>
<flux:button type="submit" wire:click="delete" variant="danger">Ja, löschen</flux:button>
</div>
</div>
</flux:modal>
</div> </div>
</div> </div>