fs
6e3fc63c1d
Replace the single tenant avatar with a pair of theme-scoped brand logos.
Render only the theme-matching <img> server-side and swap src on theme
toggle via a JS hook — no reload, no double request, no CSS tricks.
Tenant logos
- TenantLogoService (ImageUploadTrait) with theme whitelist and per-theme
storage storage/tenants/{uuid}/logo/{light|dark}/, SIZES 128/256/512
- Public serving endpoint auth/tenant-logo-file so login can show the
logo pre-auth; matching authenticated admin preview endpoint
- appTenantLogoUrl(?size, ?theme) with 4-step fallback cascade; PDF +
mail always request 'light'
- Admin tenant edit: avatar block replaced by "Tenant logos" details
block inside the Master-data tab, two side-by-side slots via Pico
.grid with the core app-file-upload partial
- Policy rename ABILITY_ADMIN_TENANTS_AVATAR_VIEW -> LOGO_VIEW, action
routes logo / logo-delete / logo-file with theme body/query param
- API endpoint path kept (backward compat), internals on new service
- CLI tenant:logo-migrate-avatars moves legacy avatar/ -> logo/light/
idempotently (--dry-run, --yes, --cleanup)
- i18n "Tenant image" removed, 12 new keys synced across de/en
File upload component
- Full-width preview + filename/actions below (3D stack layout)
- Fixed 16:9 aspect ratio with 1rem inner padding for consistent
preview size across any logo aspect
- Transparency checker pattern as background so black logos stay
visible on dark mode and white logos on light mode
- form="" + deleteFormId support so the partial works with barrier
forms inside another form
Buttons
- width:100% dropped from button[type="submit"]; scoped back via
.login-main for the auth-flow primary CTA
- .outline base rule now tints background via color-mix of --app-color
so secondary/primary/danger outlines all gain a subtle surface
- .outline.secondary restyled Stripe-style in both themes: solid white
chip with soft shadow in light, solid elevated dark chip with white
text in dark; neutral border replaces role-colored border
- .app-action-success/.app-action-danger outlines get color-mix bg +
theme-aware outline-text tokens for stronger contrast
- Filled .primary/.app-action-success/.app-action-danger get raised
box-shadow (inset highlight + drop) — opt-in via class so chrome
buttons stay flat
- Dropped the legacy .secondary utility that was clobbering the
custom-property cascade with a hardcoded muted color
Theme swap
- Logo img carries data-src-light + data-src-dark; theme-toggle JS
swaps src when data-theme changes, keeping the topbar/login logo in
sync without a page reload
Quality gates: PHPUnit (2045), PHPStan L5, CS-Fixer, docs link/drift,
codex skills sync — all green.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
64 lines
2.1 KiB
PHP
64 lines
2.1 KiB
PHP
<?php
|
|
|
|
use MintyPHP\Http\SessionStoreInterface;
|
|
use MintyPHP\Router;
|
|
use MintyPHP\Service\Access\TenantAuthorizationPolicy;
|
|
use MintyPHP\Service\Tenant\TenantLogoService;
|
|
use MintyPHP\Support\Flash;
|
|
use MintyPHP\Support\Guard;
|
|
|
|
$session = app(SessionStoreInterface::class)->all();
|
|
Guard::requireLogin();
|
|
$authorizationService = app(\MintyPHP\Service\Access\AuthorizationService::class);
|
|
$tenantLogoService = app(TenantLogoService::class);
|
|
|
|
if (!actionRequirePost('admin/tenants')) {
|
|
return;
|
|
}
|
|
|
|
if (!actionRequireCsrf('admin/tenants', 'admin/tenants', 'tenant_logo')) {
|
|
return;
|
|
}
|
|
|
|
$errorBag = formErrors();
|
|
$uuid = trim((string) ($id ?? ''));
|
|
if (!$tenantLogoService->isValidUuid($uuid)) {
|
|
$errorBag->addGlobal('Tenant not found');
|
|
flashFormErrors($errorBag, 'admin/tenants', 'tenant_logo');
|
|
Router::redirect('admin/tenants');
|
|
return;
|
|
}
|
|
|
|
$body = requestInput()->bodyAll();
|
|
$theme = strtolower(trim((string) ($body['theme'] ?? '')));
|
|
if (!$tenantLogoService->isValidTheme($theme)) {
|
|
$errorBag->addGlobal(t('Invalid theme'));
|
|
flashFormErrors($errorBag, "admin/tenants/edit/{$uuid}", 'tenant_logo_upload');
|
|
Router::redirect("admin/tenants/edit/{$uuid}");
|
|
return;
|
|
}
|
|
|
|
$tenant = app(\MintyPHP\Service\Tenant\TenantService::class)->findByUuid($uuid);
|
|
$tenantId = (int) ($tenant['id'] ?? 0);
|
|
$currentUserId = (int) ($session['user']['id'] ?? 0);
|
|
$decision = $authorizationService->authorize(TenantAuthorizationPolicy::ABILITY_ADMIN_TENANTS_MEDIA_UPDATE, [
|
|
'actor_user_id' => $currentUserId,
|
|
'target_tenant_id' => $tenantId,
|
|
]);
|
|
if (!$decision->isAllowed()) {
|
|
Router::redirect('error/forbidden');
|
|
return;
|
|
}
|
|
|
|
$result = $tenantLogoService->saveUpload($uuid, $theme, requestInput()->filesAll()['logo'] ?? []);
|
|
if (!($result['ok'] ?? false)) {
|
|
$error = $result['error'] ?? t('Upload failed');
|
|
$errorBag->addGlobal((string) $error);
|
|
flashFormErrors($errorBag, "admin/tenants/edit/{$uuid}", 'tenant_logo_upload');
|
|
Router::redirect("admin/tenants/edit/{$uuid}");
|
|
return;
|
|
}
|
|
|
|
Flash::success('Logo updated', "admin/tenants/edit/{$uuid}", 'tenant_logo_updated');
|
|
Router::redirect("admin/tenants/edit/{$uuid}");
|