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

✨ Add file upload support: enable image uploads, implement file validation, and integrate media handling in project-support forms. 🛠 Update Blade templates and Livewire components for improved UX.

Browse Source
This commit is contained in:
HolgerHatGarKeineNode
2026-01-20 15:57:13 +01:00
parent 4a425da923
commit 5e5e211244
6 changed files with 307 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,12 @@ new class extends Component {
public ?string $nip05Handle = ''; public ?string $nip05Handle = '';
public bool $nip05Verified = false;
public ?string $nip05VerifiedHandle = null;
public bool $nip05HandleMismatch = false;
public array $yearsPaid = []; public array $yearsPaid = [];
public array $events = []; public array $events = [];
@@ -63,8 +69,30 @@ new class extends Component {
if ($this->currentPleb) { if ($this->currentPleb) {
$this->email = $this->currentPleb->email; $this->email = $this->currentPleb->email;
if ($this->currentPleb->nip05_handle) { if ($this->currentPleb->nip05_handle) {
$this->nip05Handle = strtolower(str_replace('@einundzwanzig.space', '', $this->nip05Handle = $this->currentPleb->nip05_handle;
$this->currentPleb->nip05_handle));
// Verify NIP-05 handle against nostr.json
try {
$response = \Illuminate\Support\Facades\Http::get(
'https://einundzwanzig.space/.well-known/nostr.json',
);
$data = $response->json();
if (isset($data['names'])) {
foreach ($data['names'] as $handle => $pubkey) {
if ($pubkey === $this->currentPubkey) {
$this->nip05Verified = true;
$this->nip05VerifiedHandle = $handle;
// Check if verified handle differs from database handle
if ($handle !== $this->nip05Handle) {
$this->nip05HandleMismatch = true;
}
break;
}
}
}
} catch (\Exception) {
// Silently fail if nostr.json is not accessible
}
} }
$this->no = $this->currentPleb->no_email; $this->no = $this->currentPleb->no_email;
$this->showEmail = !$this->no; $this->showEmail = !$this->no;
@@ -114,7 +142,7 @@ new class extends Component {
'nip05Handle' => 'required|string|max:255|regex:/^[a-z0-9_-]+$/|unique:einundzwanzig_plebs,nip05_handle', 'nip05Handle' => 'required|string|max:255|regex:/^[a-z0-9_-]+$/|unique:einundzwanzig_plebs,nip05_handle',
]); ]);
$nip05Handle = strtolower($this->nip05Handle).'@einundzwanzig.space'; $nip05Handle = strtolower($this->nip05Handle);
$this->currentPleb->update([ $this->currentPleb->update([
'nip05_handle' => $nip05Handle, 'nip05_handle' => $nip05Handle,
@@ -399,6 +427,39 @@ new class extends Component {
vertrauenswürdiger. vertrauenswürdiger.
</p> </p>
</div> </div>
<!-- NIP-05 Verification Status -->
@if($nip05Verified)
@if($nip05HandleMismatch)
<flux:callout variant="warning" icon="exclamation-triangle" class="mt-4">
<p class="font-medium text-zinc-800 dark:text-zinc-100">
Dein aktiviertes Handle ist <strong>{{ $nip05VerifiedHandle }}@einundzwanzig.space</strong>
</p>
<p class="text-sm text-zinc-600 dark:text-zinc-400 mt-1">
Die Synchronisation zu <strong>{{ $nip05Handle }}@einundzwanzig.space</strong> wird automatisch im Hintergrund durchgeführt.
</p>
</flux:callout>
@else
<flux:callout variant="success" icon="check-circle" class="mt-4">
<p class="font-medium text-zinc-800 dark:text-zinc-100">
Dein Handle <strong>{{ $nip05VerifiedHandle }}@einundzwanzig.space</strong> ist aktiv verifiziert!
</p>
<p class="text-sm text-zinc-600 dark:text-zinc-400 mt-1">
Dein Handle ist in der NIP-05 Konfiguration eingetragen und bereit für die Verwendung.
</p>
</flux:callout>
@endif
@elseif($nip05Handle)
<flux:callout variant="secondary" icon="information-circle" class="mt-4">
<p class="font-medium text-zinc-800 dark:text-zinc-100">
Dein Handle <strong>{{ $nip05Handle }}@einundzwanzig.space</strong> ist noch nicht aktiv.
</p>
<p class="text-sm text-zinc-600 dark:text-zinc-400 mt-1">
Das Handle ist gespeichert, aber noch nicht in der NIP-05 Konfiguration veröffentlicht.
Der Vorstand wird dies bald aktivieren.
</p>
</flux:callout>
@endif
</div> </div>
@else @else
<div class="text-xs text-zinc-500 dark:text-zinc-400 italic"> <div class="text-xs text-zinc-500 dark:text-zinc-400 italic">

49
resources/views/livewire/association/project-support/form/create.blade.php
View File

@@ -5,12 +5,15 @@ use App\Support\NostrAuth;
use Livewire\Attributes\Layout; use Livewire\Attributes\Layout;
use Livewire\Attributes\Title; use Livewire\Attributes\Title;
use Livewire\Component; use Livewire\Component;
use Livewire\WithFileUploads;
new new
#[Layout('layouts.app')] #[Layout('layouts.app')]
#[Title('Projektförderung anlegen')] #[Title('Projektförderung anlegen')]
class extends Component class extends Component
{ {
use WithFileUploads;
public array $form = [ public array $form = [
'name' => '', 'name' => '',
'description' => '', 'description' => '',
@@ -20,6 +23,8 @@ class extends Component
'sats_paid' => 0, 'sats_paid' => 0,
]; ];
public $file = null;
public bool $isAllowed = false; public bool $isAllowed = false;
public bool $isAdmin = false; public bool $isAdmin = false;
@@ -40,6 +45,14 @@ class extends Component
} }
} }
public function removeFile(): void
{
if ($this->file) {
$this->file->delete();
$this->file = null;
}
}
public function save(): void public function save(): void
{ {
$this->validate([ $this->validate([
@@ -47,9 +60,10 @@ class extends Component
'form.description' => 'required|string', 'form.description' => 'required|string',
'form.support_in_sats' => 'required|integer|min:0', 'form.support_in_sats' => 'required|integer|min:0',
'form.website' => 'required|url|max:255', 'form.website' => 'required|url|max:255',
'file' => 'nullable|file|mimes:jpeg,png,jpg,gif,webp|max:10240',
]); ]);
ProjectProposal::query()->create([ $projectProposal = ProjectProposal::query()->create([
'name' => $this->form['name'], 'name' => $this->form['name'],
'description' => $this->form['description'], 'description' => $this->form['description'],
'support_in_sats' => (int) $this->form['support_in_sats'], 'support_in_sats' => (int) $this->form['support_in_sats'],
@@ -59,6 +73,10 @@ class extends Component
'einundzwanzig_pleb_id' => \App\Models\EinundzwanzigPleb::query()->where('pubkey', NostrAuth::pubkey())->first()->id, 'einundzwanzig_pleb_id' => \App\Models\EinundzwanzigPleb::query()->where('pubkey', NostrAuth::pubkey())->first()->id,
]); ]);
if ($this->file) {
$projectProposal->addMedia($this->file)->toMediaCollection('main');
}
$this->redirectRoute('association.projectSupport'); $this->redirectRoute('association.projectSupport');
} }
}; };
@@ -70,8 +88,11 @@ class extends Component
class="flex flex-col md:flex-row items-center mb-6 space-y-4 md:space-y-0 md:space-x-4"> class="flex flex-col md:flex-row items-center mb-6 space-y-4 md:space-y-0 md:space-x-4">
<div class="flex items-center justify-between w-full"> <div class="flex items-center justify-between w-full">
<h1 class="text-2xl md:text-3xl text-zinc-800 dark:text-zinc-100 font-bold"> <h1 class="text-2xl md:text-3xl text-zinc-800 dark:text-zinc-100 font-bold">
Projektförderung anlegen Projektförderungs-Antrag anlegen
</h1> </h1>
<flux:button :href="route('association.projectSupport')" variant="ghost" icon="arrow-left">
Zurück
</flux:button>
</div> </div>
</div> </div>
@@ -97,6 +118,30 @@ class extends Component
<flux:input wire:model="form.support_in_sats" type="number" placeholder="100000" /> <flux:input wire:model="form.support_in_sats" type="number" placeholder="100000" />
<flux:error name="form.support_in_sats" /> <flux:error name="form.support_in_sats" />
</flux:field> </flux:field>
<flux:field>
<flux:label>Bild</flux:label>
<flux:file-upload wire:model="file" label="Bild hochladen">
<flux:file-upload.dropzone
heading="Bild hier ablegen oder zum Durchsuchen klicken"
text="JPG, PNG, GIF, WebP bis zu 10MB"
/>
</flux:file-upload>
<flux:error name="file" />
@if($file)
<div class="mt-4 flex flex-col gap-2">
<flux:file-item
:heading="$file->getClientOriginalName()"
:image="$file->temporaryUrl()"
:size="$file->getSize()"
>
<x-slot name="actions">
<flux:file-item.remove wire:click="removeFile" />
</x-slot>
</flux:file-item>
</div>
@endif
</flux:field>
<flux:editor wire:model="form.description" label="Beschreibung" description="Projektbeschreibung..." /> <flux:editor wire:model="form.description" label="Beschreibung" description="Projektbeschreibung..." />
<flux:error name="form.description" /> <flux:error name="form.description" />

70
resources/views/livewire/association/project-support/form/edit.blade.php
View File

@@ -5,12 +5,15 @@ use App\Support\NostrAuth;
use Livewire\Attributes\Layout; use Livewire\Attributes\Layout;
use Livewire\Attributes\Title; use Livewire\Attributes\Title;
use Livewire\Component; use Livewire\Component;
use Livewire\WithFileUploads;
new new
#[Layout('layouts.app')] #[Layout('layouts.app')]
#[Title('Projektförderung bearbeiten')] #[Title('Projektförderung bearbeiten')]
class extends Component class extends Component
{ {
use WithFileUploads;
public ProjectProposal $project; public ProjectProposal $project;
public array $form = [ public array $form = [
@@ -22,6 +25,8 @@ class extends Component
'sats_paid' => 0, 'sats_paid' => 0,
]; ];
public $file = null;
public bool $isAllowed = false; public bool $isAllowed = false;
public bool $isAdmin = false; public bool $isAdmin = false;
@@ -58,6 +63,21 @@ class extends Component
} }
} }
public function deleteMainImage(): void
{
if ($this->project->getFirstMedia('main')) {
$this->project->getFirstMedia('main')->delete();
}
}
public function removeFile(): void
{
if ($this->file) {
$this->file->delete();
$this->file = null;
}
}
public function update(): void public function update(): void
{ {
$this->validate([ $this->validate([
@@ -65,6 +85,7 @@ class extends Component
'form.description' => 'required|string', 'form.description' => 'required|string',
'form.support_in_sats' => 'required|integer|min:0', 'form.support_in_sats' => 'required|integer|min:0',
'form.website' => 'required|url|max:255', 'form.website' => 'required|url|max:255',
'file' => 'nullable|file|mimes:jpeg,png,jpg,gif,webp|max:10240',
]); ]);
$this->project->update([ $this->project->update([
@@ -76,6 +97,10 @@ class extends Component
'sats_paid' => $this->isAdmin ? $this->form['sats_paid'] : $this->project->sats_paid, 'sats_paid' => $this->isAdmin ? $this->form['sats_paid'] : $this->project->sats_paid,
]); ]);
if ($this->file) {
$this->project->addMedia($this->file)->toMediaCollection('main');
}
$this->redirectRoute('association.projectSupport.item', $this->project); $this->redirectRoute('association.projectSupport.item', $this->project);
} }
}; };
@@ -88,8 +113,11 @@ class extends Component
class="flex flex-col md:flex-row items-center mb-6 space-y-4 md:space-y-0 md:space-x-4"> class="flex flex-col md:flex-row items-center mb-6 space-y-4 md:space-y-0 md:space-x-4">
<div class="flex items-center justify-between w-full"> <div class="flex items-center justify-between w-full">
<h1 class="text-2xl md:text-3xl text-zinc-800 dark:text-zinc-100 font-bold"> <h1 class="text-2xl md:text-3xl text-zinc-800 dark:text-zinc-100 font-bold">
Projektförderung bearbeiten Projektförderungs-Antrag bearbeiten
</h1> </h1>
<flux:button :href="route('association.projectSupport')" variant="ghost" icon="arrow-left">
Zurück
</flux:button>
</div> </div>
</div> </div>
@@ -121,6 +149,46 @@ class extends Component
<flux:error name="form.support_in_sats" /> <flux:error name="form.support_in_sats" />
</flux:field> </flux:field>
</div> </div>
<div>
<flux:field>
<flux:label>Bild</flux:label>
<flux:file-upload wire:model="file" label="Bild hochladen">
<flux:file-upload.dropzone
heading="Bild hier ablegen oder zum Durchsuchen klicken"
text="JPG, PNG, GIF, WebP bis zu 10MB"
/>
</flux:file-upload>
<flux:error name="file" />
@if($file)
<div class="mt-4 flex flex-col gap-2">
<flux:file-item
:heading="$file->getClientOriginalName()"
:image="$file->temporaryUrl()"
:size="$file->getSize()"
>
<x-slot name="actions">
<flux:file-item.remove wire:click="removeFile" />
</x-slot>
</flux:file-item>
</div>
@endif
</flux:field>
@if($project->getFirstMedia('main'))
<div class="mt-4">
<flux:file-item
:heading="$project->getFirstMedia('main')->file_name"
:image="$project->getFirstMediaUrl('main')"
:size="$project->getFirstMedia('main')->size"
>
<x-slot name="actions">
<flux:file-item.remove wire:click="deleteMainImage" />
</x-slot>
</flux:file-item>
</div>
@endif
</div>
<div> <div>
<flux:editor wire:model="form.description" label="Beschreibung" description="Projektbeschreibung..." /> <flux:editor wire:model="form.description" label="Beschreibung" description="Projektbeschreibung..." />
<flux:error name="form.description" /> <flux:error name="form.description" />

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

@@ -1,5 +1,6 @@
<?php <?php
use App\Livewire\Traits\WithNostrAuth;
use App\Models\EinundzwanzigPleb; use App\Models\EinundzwanzigPleb;
use App\Models\ProjectProposal; use App\Models\ProjectProposal;
use App\Support\NostrAuth; use App\Support\NostrAuth;
@@ -8,6 +9,8 @@ use Illuminate\Database\Eloquent\Collection;
use Livewire\Component; use Livewire\Component;
new class extends Component { new class extends Component {
use WithNostrAuth;
public string $activeFilter = 'all'; public string $activeFilter = 'all';
public ?string $confirmDeleteId = null; public ?string $confirmDeleteId = null;
@@ -20,8 +23,6 @@ new class extends Component {
public ?string $currentPubkey = null; public ?string $currentPubkey = null;
public ?EinundzwanzigPleb $currentPleb = null;
public ?ProjectProposal $projectToDelete = null; public ?ProjectProposal $projectToDelete = null;
protected $listeners = [ protected $listeners = [
@@ -33,11 +34,6 @@ new class extends Component {
public function mount(): void public function mount(): void
{ {
$this->loadProjects(); $this->loadProjects();
if (NostrAuth::check()) {
$this->currentPubkey = NostrAuth::pubkey();
$this->currentPleb = EinundzwanzigPleb::query()->where('pubkey', $this->currentPubkey)->first();
$this->isAllowed = true;
}
} }
public function updatedSearch(): void public function updatedSearch(): void
@@ -134,44 +130,46 @@ new class extends Component {
</flux:button> </flux:button>
</li> </li>
<li class="m-1"> <li class="m-1">
<flux:button wire:click="setFilter('supported')" :variant="$activeFilter === 'supported' ? 'primary' : 'ghost'"> <flux:button wire:click="setFilter('supported')"
:variant="$activeFilter === 'supported' ? 'primary' : 'ghost'">
Unterstützt Unterstützt
</flux:button> </flux:button>
</li> </li>
<li class="m-1"> <li class="m-1">
<flux:button wire:click="setFilter('rejected')" :variant="$activeFilter === 'rejected' ? 'primary' : 'ghost'"> <flux:button wire:click="setFilter('rejected')"
:variant="$activeFilter === 'rejected' ? 'primary' : 'ghost'">
Abgelehnt Abgelehnt
</flux:button> </flux:button>
</li> </li>
</ul> </ul>
</div> </div>
<div class="text-sm text-zinc-500 dark:text-zinc-400 italic mb-4">{{ $projects->count() }} Projekte</div> <div class="text-sm text-zinc-500 dark:text-zinc-400 italic mb-4">{{ $projects->count() }} Projekte</div>
<!-- Content --> <!-- Content -->
<div class="grid xl:grid-cols-2 gap-6 mb-8"> <div class="grid xl:grid-cols-2 gap-6 mb-8">
@foreach($this->projects as $project) @foreach($this->projects as $project)
<x-project-card :project="$project" :currentPleb="$currentPleb" :section="$activeFilter"/> <x-project-card :project="$project" :currentPleb="$currentPleb" :section="$activeFilter"/>
@endforeach @endforeach
</div> </div>
<!-- Delete confirmation modal --> <!-- Delete confirmation modal -->
<flux:modal name="delete-project" class="min-w-88"> <flux:modal name="delete-project" class="min-w-88">
<div class="space-y-6"> <div class="space-y-6">
<div> <div>
<flux:heading size="lg">Projektunterstützung löschen?</flux:heading> <flux:heading size="lg">Projektunterstützung löschen?</flux:heading>
<flux:text class="mt-2"> <flux:text class="mt-2">
<p>Du bist dabei, diese Projektunterstützung zu löschen.</p> <p>Du bist dabei, diese Projektunterstützung zu löschen.</p>
<p>Diese Aktion kann nicht rückgängig gemacht werden.</p> <p>Diese Aktion kann nicht rückgängig gemacht werden.</p>
</flux:text> </flux:text>
</div> </div>
<div class="flex gap-2"> <div class="flex gap-2">
<flux:spacer/> <flux:spacer/>
<flux:modal.close> <flux:modal.close>
<flux:button variant="ghost">Abbrechen</flux:button> <flux:button variant="ghost">Abbrechen</flux:button>
</flux:modal.close> </flux:modal.close>
<flux:button wire:click="delete" variant="danger">Löschen</flux:button> <flux:button wire:click="delete" variant="danger">Löschen</flux:button>
</div> </div>
</div> </div>
</flux:modal> </flux:modal>
</div> </div>
</div> </div>

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

@@ -1,6 +1,7 @@
<?php <?php
use App\Livewire\Traits\WithNostrAuth; use App\Livewire\Traits\WithNostrAuth;
use App\Models\ProjectProposal;
use App\Models\Vote; use App\Models\Vote;
use App\Support\NostrAuth; use App\Support\NostrAuth;
use Livewire\Component; use Livewire\Component;
@@ -20,10 +21,15 @@ new class extends Component {
public function mount($projectProposal): void public function mount($projectProposal): void
{ {
$this->projectProposal = \App\Models\ProjectProposal::query()->where('slug', $projectProposal)->firstOrFail(); $this->projectProposal = ProjectProposal::query()->where('slug', $projectProposal)->firstOrFail();
if (NostrAuth::check()) { if (NostrAuth::check()) {
$this->currentPubkey = NostrAuth::pubkey(); $this->currentPubkey = NostrAuth::pubkey();
$this->isAllowed = true; $this->isAllowed = true;
$this->mountWithNostrAuth();
$this->ownVoteExists = Vote::query()
->where('project_proposal_id', $this->projectProposal->id)
->where('einundzwanzig_pleb_id', $this->currentPleb->id)
->exists();
} }
} }
@@ -54,6 +60,10 @@ new class extends Component {
], [ ], [
'value' => true, 'value' => true,
]); ]);
$this->ownVoteExists = Vote::query()
->where('project_proposal_id', $this->projectProposal->id)
->where('einundzwanzig_pleb_id', $this->currentPleb->id)
->exists();
} }
public function handleNotApprove(): void public function handleNotApprove(): void
@@ -64,6 +74,10 @@ new class extends Component {
], [ ], [
'value' => false, 'value' => false,
]); ]);
$this->ownVoteExists = Vote::query()
->where('project_proposal_id', $this->projectProposal->id)
->where('einundzwanzig_pleb_id', $this->currentPleb->id)
->exists();
} }
} }
?> ?>

78
tests/Feature/Livewire/Association/ProjectSupportTest.php
View File

@@ -226,3 +226,81 @@ it('displays project details', function () {
->assertSee('Test Project Name') ->assertSee('Test Project Name')
->assertSee('Test Project Description'); ->assertSee('Test Project Description');
}); });
it('initializes currentPleb when authenticated', function () {
$pleb = EinundzwanzigPleb::factory()->create();
$project = ProjectProposal::factory()->create();
NostrAuth::login($pleb->pubkey);
Livewire::test('association.project-support.show', ['project' => $project])
->assertSet('currentPleb.id', $pleb->id);
});
it('initializes ownVoteExists to false when no vote exists', function () {
$pleb = EinundzwanzigPleb::factory()->create();
$project = ProjectProposal::factory()->create();
NostrAuth::login($pleb->pubkey);
Livewire::test('association.project-support.show', ['project' => $project])
->assertSet('ownVoteExists', false)
->assertSee('Zustimmen')
->assertSee('Ablehnen');
});
it('initializes ownVoteExists to true when vote exists', function () {
$pleb = EinundzwanzigPleb::factory()->create();
$project = ProjectProposal::factory()->create();
\App\Models\Vote::create([
'project_proposal_id' => $project->id,
'einundzwanzig_pleb_id' => $pleb->id,
'value' => true,
]);
NostrAuth::login($pleb->pubkey);
Livewire::test('association.project-support.show', ['project' => $project])
->assertSet('ownVoteExists', true)
->assertDontSee('Zustimmen')
->assertDontSee('Ablehnen')
->assertSee('Du hast bereits abgestimmt.');
});
it('can handle approve vote', function () {
$pleb = EinundzwanzigPleb::factory()->create();
$project = ProjectProposal::factory()->create();
NostrAuth::login($pleb->pubkey);
Livewire::test('association.project-support.show', ['project' => $project])
->call('handleApprove')
->assertHasNoErrors();
$vote = \App\Models\Vote::query()
->where('project_proposal_id', $project->id)
->where('einundzwanzig_pleb_id', $pleb->id)
->first();
expect($vote)->not->toBeNull()
->and($vote->value)->toBeTrue();
});
it('can handle not approve vote', function () {
$pleb = EinundzwanzigPleb::factory()->create();
$project = ProjectProposal::factory()->create();
NostrAuth::login($pleb->pubkey);
Livewire::test('association.project-support.show', ['project' => $project])
->call('handleNotApprove')
->assertHasNoErrors();
$vote = \App\Models\Vote::query()
->where('project_proposal_id', $project->id)
->where('einundzwanzig_pleb_id', $pleb->id)
->first();
expect($vote)->not->toBeNull()
->and($vote->value)->toBeFalse();
});