sparkbooth anbindung gefixt

This commit is contained in:
2025-12-07 17:39:23 +01:00
parent 08ee2205f5
commit b0d835d142
10 changed files with 597 additions and 40 deletions

View File

@@ -50,6 +50,10 @@ class SparkboothConnections extends Page implements HasTable
->label('Upload-Pfad')
->copyable()
->toggleable(),
TextColumn::make('sparkbooth_username')
->label('Benutzername')
->copyable()
->toggleable(),
TextColumn::make('created_at')
->label('Angelegt')
->since()
@@ -62,7 +66,7 @@ class SparkboothConnections extends Page implements HasTable
->color('primary')
->modalHeading('Upload-Zugangsdaten')
->modalSubmitAction(false)
->modalCancelActionLabel('Schließen')
->modalCancelActionLabel('Schliessen')
->modalContent(function (Gallery $record) {
$plainToken = $record->regenerateUploadToken();
@@ -71,11 +75,14 @@ class SparkboothConnections extends Page implements HasTable
'upload_token' => $plainToken,
'upload_url' => route('api.sparkbooth.upload'),
'gallery_url' => route('gallery.show', $record),
'sparkbooth_username' => $record->sparkbooth_username,
'sparkbooth_password' => $record->sparkbooth_password,
'response_format' => $record->sparkbooth_response_format,
];
Notification::make()
->title('Upload-Token wurde erneuert.')
->body('Bitte verwende den neuen Token in Sparkbooth.')
->title('Zugangsdaten aktualisiert.')
->body('Der Upload-Token wurde erneuert. Username/Passwort bleiben unveraendert.')
->success()
->send();
@@ -83,6 +90,9 @@ class SparkboothConnections extends Page implements HasTable
}),
])
->emptyStateHeading('Keine Sparkbooth-Verbindungen')
->emptyStateDescription('Lege eine neue Verbindung an oder aktiviere Uploads für eine Galerie.');
->emptyStateDescription('Lege eine neue Verbindung an oder aktiviere Uploads fuer eine Galerie.');
}
}

View File

@@ -4,6 +4,7 @@ namespace App\Filament\Pages;
use App\Models\Gallery;
use BackedEnum;
use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput;
use Filament\Forms\Components\Toggle;
use Filament\Forms\Concerns\InteractsWithForms;
@@ -62,6 +63,23 @@ class SparkboothSetup extends Page implements HasForms
Toggle::make('upload_enabled')
->label('Uploads aktivieren')
->default(true),
TextInput::make('sparkbooth_username')
->label('Sparkbooth Benutzername')
->helperText('Wird in Sparkbooth unter „Username“ eingetragen. Erlaubt sind Buchstaben, Zahlen sowie ._-')
->default(fn (): string => 'spark-'.Str::lower(Str::random(6)))
->required()
->maxLength(64)
->rule('regex:/^[A-Za-z0-9._-]+$/')
->unique(table: Gallery::class, column: 'sparkbooth_username'),
Select::make('sparkbooth_response_format')
->label('Standard-Antwortformat')
->helperText('Sparkbooth kann JSON oder XML erwarten. JSON ist empfohlen.')
->options([
'json' => 'JSON',
'xml' => 'XML',
])
->default('json')
->required(),
])
->statePath('data');
}
@@ -70,6 +88,9 @@ class SparkboothSetup extends Page implements HasForms
{
$data = $this->form->getState();
$sparkboothUsername = $this->normalizeUsername($data['sparkbooth_username'] ?? '');
$sparkboothPassword = Str::random(24);
$gallery = new Gallery([
'name' => $data['name'],
'title' => $data['title'],
@@ -78,6 +99,9 @@ class SparkboothSetup extends Page implements HasForms
'allow_ai_styles' => (bool) $data['allow_ai_styles'],
'allow_print' => (bool) $data['allow_print'],
'upload_enabled' => (bool) $data['upload_enabled'],
'sparkbooth_username' => $sparkboothUsername,
'sparkbooth_password' => $sparkboothPassword,
'sparkbooth_response_format' => $data['sparkbooth_response_format'] ?? 'json',
]);
$gallery->slug = Str::uuid()->toString();
@@ -91,6 +115,9 @@ class SparkboothSetup extends Page implements HasForms
'upload_token' => $plainToken,
'upload_url' => route('api.sparkbooth.upload'),
'gallery_url' => route('gallery.show', $gallery),
'sparkbooth_username' => $sparkboothUsername,
'sparkbooth_password' => $sparkboothPassword,
'response_format' => $gallery->sparkbooth_response_format,
];
Notification::make()
@@ -114,4 +141,11 @@ class SparkboothSetup extends Page implements HasForms
->url(route('filament.admin.pages.dashboard')),
];
}
protected function normalizeUsername(string $value): string
{
$clean = preg_replace('/[^A-Za-z0-9._-]/', '', $value) ?? '';
return Str::of($clean)->lower()->trim()->value();
}
}