fixed tenants and eventpurchaseresource, changed lightbox in gallery
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +1,4 @@
|
|||||||
|
fotospiel-tenant-app
|
||||||
/.phpunit.cache
|
/.phpunit.cache
|
||||||
/bootstrap/ssr
|
/bootstrap/ssr
|
||||||
/node_modules
|
/node_modules
|
||||||
@@ -26,3 +27,5 @@ yarn-error.log
|
|||||||
/.vscode
|
/.vscode
|
||||||
/.zed
|
/.zed
|
||||||
tools/git-askpass.ps1
|
tools/git-askpass.ps1
|
||||||
|
docker
|
||||||
|
podman-compose.dev.yml
|
||||||
|
|||||||
@@ -13,10 +13,10 @@ use Filament\Schemas\Schema;
|
|||||||
use Filament\Resources\Resource;
|
use Filament\Resources\Resource;
|
||||||
use Filament\Tables;
|
use Filament\Tables;
|
||||||
use Filament\Actions\Action;
|
use Filament\Actions\Action;
|
||||||
use Filament\Tables\Actions\BulkActionGroup;
|
use Filament\Actions\BulkActionGroup;
|
||||||
use Filament\Tables\Actions\DeleteBulkAction;
|
use Filament\Actions\DeleteBulkAction;
|
||||||
use Filament\Tables\Actions\ExportBulkAction;
|
use Filament\Actions\ExportBulkAction;
|
||||||
use Filament\Tables\Actions\ViewAction;
|
use Filament\Actions\ViewAction;
|
||||||
use Filament\Tables\Columns\TextColumn;
|
use Filament\Tables\Columns\TextColumn;
|
||||||
use Filament\Tables\Filters\Filter;
|
use Filament\Tables\Filters\Filter;
|
||||||
use Filament\Tables\Filters\SelectFilter;
|
use Filament\Tables\Filters\SelectFilter;
|
||||||
@@ -71,7 +71,9 @@ class EventPurchaseResource extends Resource
|
|||||||
->minValue(0),
|
->minValue(0),
|
||||||
TextInput::make('price')
|
TextInput::make('price')
|
||||||
->label('Preis')
|
->label('Preis')
|
||||||
->money('EUR')
|
->numeric()
|
||||||
|
->step(0.01)
|
||||||
|
->prefix('€')
|
||||||
->required(),
|
->required(),
|
||||||
Select::make('platform')
|
Select::make('platform')
|
||||||
->label('Plattform')
|
->label('Plattform')
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ use App\Filament\Resources\TenantResource\RelationManagers\PurchasesRelationMana
|
|||||||
use Filament\Resources\RelationManagers\RelationGroup;
|
use Filament\Resources\RelationManagers\RelationGroup;
|
||||||
use UnitEnum;
|
use UnitEnum;
|
||||||
use BackedEnum;
|
use BackedEnum;
|
||||||
|
use Illuminate\Support\Facades\Route;
|
||||||
|
|
||||||
class TenantResource extends Resource
|
class TenantResource extends Resource
|
||||||
{
|
{
|
||||||
@@ -69,7 +70,9 @@ class TenantResource extends Resource
|
|||||||
->label(__('admin.tenants.fields.subscription_expires_at')),
|
->label(__('admin.tenants.fields.subscription_expires_at')),
|
||||||
TextInput::make('total_revenue')
|
TextInput::make('total_revenue')
|
||||||
->label(__('admin.tenants.fields.total_revenue'))
|
->label(__('admin.tenants.fields.total_revenue'))
|
||||||
->money('EUR')
|
->prefix('€')
|
||||||
|
->numeric()
|
||||||
|
->step(0.01)
|
||||||
->readOnly(),
|
->readOnly(),
|
||||||
Toggle::make('is_active')
|
Toggle::make('is_active')
|
||||||
->label(__('admin.tenants.fields.is_active'))
|
->label(__('admin.tenants.fields.is_active'))
|
||||||
@@ -144,7 +147,8 @@ class TenantResource extends Resource
|
|||||||
Actions\Action::make('export')
|
Actions\Action::make('export')
|
||||||
->label('Daten exportieren')
|
->label('Daten exportieren')
|
||||||
->icon('heroicon-o-arrow-down-tray')
|
->icon('heroicon-o-arrow-down-tray')
|
||||||
->url(fn (Tenant $record) => route('admin.tenants.export', $record))
|
->url(fn (Tenant $record) => Route::has('admin.tenants.export') ? route('admin.tenants.export', $record) : null)
|
||||||
|
->visible(fn () => Route::has('admin.tenants.export'))
|
||||||
->openUrlInNewTab(),
|
->openUrlInNewTab(),
|
||||||
])
|
])
|
||||||
->bulkActions([
|
->bulkActions([
|
||||||
|
|||||||
@@ -46,7 +46,9 @@ class PurchasesRelationManager extends RelationManager
|
|||||||
->minValue(0),
|
->minValue(0),
|
||||||
TextInput::make('price')
|
TextInput::make('price')
|
||||||
->label('Preis')
|
->label('Preis')
|
||||||
->money('EUR')
|
->numeric()
|
||||||
|
->step(0.01)
|
||||||
|
->prefix('€')
|
||||||
->required(),
|
->required(),
|
||||||
Select::make('platform')
|
Select::make('platform')
|
||||||
->label('Plattform')
|
->label('Plattform')
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ class Tenant extends Model
|
|||||||
protected $table = 'tenants';
|
protected $table = 'tenants';
|
||||||
protected $guarded = [];
|
protected $guarded = [];
|
||||||
protected $casts = [
|
protected $casts = [
|
||||||
'name' => 'array',
|
|
||||||
'settings' => 'array',
|
'settings' => 'array',
|
||||||
'features' => 'array',
|
'features' => 'array',
|
||||||
'last_activity_at' => 'datetime',
|
'last_activity_at' => 'datetime',
|
||||||
|
|||||||
@@ -0,0 +1,70 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
DB::table('tenants')
|
||||||
|
->select('id', 'name')
|
||||||
|
->orderBy('id')
|
||||||
|
->chunkById(100, function ($tenants): void {
|
||||||
|
foreach ($tenants as $tenant) {
|
||||||
|
$raw = $tenant->name;
|
||||||
|
|
||||||
|
if ($raw === null || $raw === '') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$decoded = json_decode($raw, true);
|
||||||
|
$value = $raw;
|
||||||
|
|
||||||
|
if (json_last_error() === JSON_ERROR_NONE && is_array($decoded)) {
|
||||||
|
$preferred = $decoded['de'] ?? $decoded['en'] ?? null;
|
||||||
|
|
||||||
|
if ($preferred === null) {
|
||||||
|
foreach ($decoded as $entry) {
|
||||||
|
if (is_string($entry) && $entry !== '') {
|
||||||
|
$preferred = $entry;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$value = $preferred ?? (string) $raw;
|
||||||
|
}
|
||||||
|
|
||||||
|
DB::table('tenants')->where('id', $tenant->id)->update([
|
||||||
|
'name' => (string) $value,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
DB::table('tenants')
|
||||||
|
->select('id', 'name')
|
||||||
|
->orderBy('id')
|
||||||
|
->chunkById(100, function ($tenants): void {
|
||||||
|
foreach ($tenants as $tenant) {
|
||||||
|
$raw = $tenant->name;
|
||||||
|
|
||||||
|
if ($raw === null || $raw === '') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$localized = json_encode([
|
||||||
|
'de' => $raw,
|
||||||
|
'en' => $raw,
|
||||||
|
], JSON_UNESCAPED_UNICODE);
|
||||||
|
|
||||||
|
DB::table('tenants')->where('id', $tenant->id)->update([
|
||||||
|
'name' => $localized,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -13,7 +13,7 @@ class TasksSeeder extends Seeder
|
|||||||
$demoTenant = \App\Models\Tenant::updateOrCreate(
|
$demoTenant = \App\Models\Tenant::updateOrCreate(
|
||||||
['slug' => 'demo'],
|
['slug' => 'demo'],
|
||||||
[
|
[
|
||||||
'name' => ['de' => 'Demo Tenant', 'en' => 'Demo Tenant'],
|
'name' => 'Demo Tenant',
|
||||||
'domain' => null,
|
'domain' => null,
|
||||||
'is_active' => true,
|
'is_active' => true,
|
||||||
'settings' => [],
|
'settings' => [],
|
||||||
@@ -58,4 +58,3 @@ class TasksSeeder extends Seeder
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
47
package-lock.json
generated
47
package-lock.json
generated
@@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "fotospiel-app",
|
"name": "html",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
@@ -30,6 +30,7 @@
|
|||||||
"globals": "^15.14.0",
|
"globals": "^15.14.0",
|
||||||
"laravel-vite-plugin": "^2.0",
|
"laravel-vite-plugin": "^2.0",
|
||||||
"lucide-react": "^0.475.0",
|
"lucide-react": "^0.475.0",
|
||||||
|
"playwright": "^1.55.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.0.0",
|
||||||
"react-router-dom": "^7.8.2",
|
"react-router-dom": "^7.8.2",
|
||||||
@@ -7863,6 +7864,50 @@
|
|||||||
"node": ">=16.20.0"
|
"node": ">=16.20.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/playwright": {
|
||||||
|
"version": "1.55.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.55.0.tgz",
|
||||||
|
"integrity": "sha512-sdCWStblvV1YU909Xqx0DhOjPZE4/5lJsIS84IfN9dAZfcl/CIZ5O8l3o0j7hPMjDvqoTF8ZUcc+i/GL5erstA==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"dependencies": {
|
||||||
|
"playwright-core": "1.55.0"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"playwright": "cli.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"fsevents": "2.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/playwright-core": {
|
||||||
|
"version": "1.55.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.55.0.tgz",
|
||||||
|
"integrity": "sha512-GvZs4vU3U5ro2nZpeiwyb0zuFaqb9sUiAJuyrWpcGouD8y9/HLgGbNRjIph7zU9D3hnPaisMl9zG9CgFi/biIg==",
|
||||||
|
"license": "Apache-2.0",
|
||||||
|
"bin": {
|
||||||
|
"playwright-core": "cli.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/playwright/node_modules/fsevents": {
|
||||||
|
"version": "2.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||||
|
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/possible-typed-array-names": {
|
"node_modules/possible-typed-array-names": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
|
||||||
|
|||||||
@@ -50,6 +50,7 @@
|
|||||||
"globals": "^15.14.0",
|
"globals": "^15.14.0",
|
||||||
"laravel-vite-plugin": "^2.0",
|
"laravel-vite-plugin": "^2.0",
|
||||||
"lucide-react": "^0.475.0",
|
"lucide-react": "^0.475.0",
|
||||||
|
"playwright": "^1.55.0",
|
||||||
"react": "^19.0.0",
|
"react": "^19.0.0",
|
||||||
"react-dom": "^19.0.0",
|
"react-dom": "^19.0.0",
|
||||||
"react-router-dom": "^7.8.2",
|
"react-router-dom": "^7.8.2",
|
||||||
|
|||||||
@@ -47,8 +47,9 @@ function DialogOverlay({
|
|||||||
function DialogContent({
|
function DialogContent({
|
||||||
className,
|
className,
|
||||||
children,
|
children,
|
||||||
|
hideClose = false,
|
||||||
...props
|
...props
|
||||||
}: React.ComponentProps<typeof DialogPrimitive.Content>) {
|
}: React.ComponentProps<typeof DialogPrimitive.Content> & { hideClose?: boolean }) {
|
||||||
return (
|
return (
|
||||||
<DialogPortal data-slot="dialog-portal">
|
<DialogPortal data-slot="dialog-portal">
|
||||||
<DialogOverlay />
|
<DialogOverlay />
|
||||||
@@ -61,10 +62,12 @@ function DialogContent({
|
|||||||
{...props}
|
{...props}
|
||||||
>
|
>
|
||||||
{children}
|
{children}
|
||||||
|
{!hideClose && (
|
||||||
<DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
|
<DialogPrimitive.Close className="ring-offset-background focus:ring-ring data-[state=open]:bg-accent data-[state=open]:text-muted-foreground absolute top-4 right-4 rounded-xs opacity-70 transition-opacity hover:opacity-100 focus:ring-2 focus:ring-offset-2 focus:outline-hidden disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg]:shrink-0 [&_svg:not([class*='size-'])]:size-4">
|
||||||
<XIcon />
|
<XIcon />
|
||||||
<span className="sr-only">Close</span>
|
<span className="sr-only">Close</span>
|
||||||
</DialogPrimitive.Close>
|
</DialogPrimitive.Close>
|
||||||
|
)}
|
||||||
</DialogPrimitive.Content>
|
</DialogPrimitive.Content>
|
||||||
</DialogPortal>
|
</DialogPortal>
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -97,7 +97,7 @@ export default function GalleryPreview({ slug }: Props) {
|
|||||||
)}
|
)}
|
||||||
<div className="grid grid-cols-2 gap-3">
|
<div className="grid grid-cols-2 gap-3">
|
||||||
{items.map((p: any) => (
|
{items.map((p: any) => (
|
||||||
<Link key={p.id} to={`/e/${slug}/photo/${p.id}`} state={{ photo: p }} className="block">
|
<Link key={p.id} to={`/e/${slug}/gallery?photoId=${p.id}`} className="block">
|
||||||
<div className="relative">
|
<div className="relative">
|
||||||
<img
|
<img
|
||||||
src={p.thumbnail_path || p.file_path}
|
src={p.thumbnail_path || p.file_path}
|
||||||
|
|||||||
@@ -1,19 +1,34 @@
|
|||||||
import React from 'react';
|
import React, { Dispatch, SetStateAction, useEffect, useState } from 'react';
|
||||||
import { Page } from './_util';
|
import { Page } from './_util';
|
||||||
import { useParams } from 'react-router-dom';
|
import { useParams, useSearchParams } from 'react-router-dom';
|
||||||
import { usePollGalleryDelta } from '../polling/usePollGalleryDelta';
|
import { usePollGalleryDelta } from '../polling/usePollGalleryDelta';
|
||||||
import { Card, CardContent } from '@/components/ui/card';
|
import { Card, CardContent } from '@/components/ui/card';
|
||||||
import { Alert, AlertDescription } from '@/components/ui/alert';
|
import { Alert, AlertDescription } from '@/components/ui/alert';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import FiltersBar, { type GalleryFilter } from '../components/FiltersBar';
|
import FiltersBar, { type GalleryFilter } from '../components/FiltersBar';
|
||||||
import { Link } from 'react-router-dom';
|
|
||||||
import { Heart } from 'lucide-react';
|
import { Heart } from 'lucide-react';
|
||||||
import { likePhoto } from '../services/photosApi';
|
import { likePhoto } from '../services/photosApi';
|
||||||
|
import PhotoLightbox from './PhotoLightbox';
|
||||||
|
|
||||||
export default function GalleryPage() {
|
export default function GalleryPage() {
|
||||||
const { slug } = useParams();
|
const { slug } = useParams();
|
||||||
const { photos, loading, newCount, acknowledgeNew } = usePollGalleryDelta(slug!);
|
const { photos, loading, newCount, acknowledgeNew } = usePollGalleryDelta(slug!);
|
||||||
const [filter, setFilter] = React.useState<GalleryFilter>('latest');
|
const [filter, setFilter] = React.useState<GalleryFilter>('latest');
|
||||||
|
const [currentPhotoIndex, setCurrentPhotoIndex] = React.useState<number | null>(null);
|
||||||
|
const [hasOpenedPhoto, setHasOpenedPhoto] = useState(false);
|
||||||
|
|
||||||
|
const [searchParams] = useSearchParams();
|
||||||
|
const photoIdParam = searchParams.get('photoId');
|
||||||
|
// Auto-open lightbox if photoId in query params
|
||||||
|
useEffect(() => {
|
||||||
|
if (photoIdParam && photos.length > 0 && currentPhotoIndex === null && !hasOpenedPhoto) {
|
||||||
|
const index = photos.findIndex((photo: any) => photo.id === parseInt(photoIdParam, 10));
|
||||||
|
if (index !== -1) {
|
||||||
|
setCurrentPhotoIndex(index);
|
||||||
|
setHasOpenedPhoto(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [photos, photoIdParam, currentPhotoIndex, hasOpenedPhoto]);
|
||||||
|
|
||||||
const myPhotoIds = React.useMemo(() => {
|
const myPhotoIds = React.useMemo(() => {
|
||||||
try {
|
try {
|
||||||
@@ -106,7 +121,13 @@ export default function GalleryPage() {
|
|||||||
return (
|
return (
|
||||||
<Card key={p.id} className="relative overflow-hidden">
|
<Card key={p.id} className="relative overflow-hidden">
|
||||||
<CardContent className="p-0">
|
<CardContent className="p-0">
|
||||||
<Link to={`../photo/${p.id}`} state={{ photo: p }}>
|
<div
|
||||||
|
onClick={() => {
|
||||||
|
const index = list.findIndex(photo => photo.id === p.id);
|
||||||
|
setCurrentPhotoIndex(index >= 0 ? index : null);
|
||||||
|
}}
|
||||||
|
className="cursor-pointer"
|
||||||
|
>
|
||||||
<img
|
<img
|
||||||
src={imageUrl}
|
src={imageUrl}
|
||||||
alt={`Foto ${p.id}${p.task_title ? ` - ${p.task_title}` : ''}`}
|
alt={`Foto ${p.id}${p.task_title ? ` - ${p.task_title}` : ''}`}
|
||||||
@@ -119,7 +140,7 @@ export default function GalleryPage() {
|
|||||||
onLoad={() => console.log(`✅ Successfully loaded image ${p.id}:`, imageUrl)}
|
onLoad={() => console.log(`✅ Successfully loaded image ${p.id}:`, imageUrl)}
|
||||||
loading="lazy"
|
loading="lazy"
|
||||||
/>
|
/>
|
||||||
</Link>
|
</div>
|
||||||
</CardContent>
|
</CardContent>
|
||||||
|
|
||||||
{p.task_title && (
|
{p.task_title && (
|
||||||
@@ -138,6 +159,15 @@ export default function GalleryPage() {
|
|||||||
);
|
);
|
||||||
})}
|
})}
|
||||||
</div>
|
</div>
|
||||||
|
{currentPhotoIndex !== null && list.length > 0 && (
|
||||||
|
<PhotoLightbox
|
||||||
|
photos={list}
|
||||||
|
currentIndex={currentPhotoIndex}
|
||||||
|
onClose={() => setCurrentPhotoIndex(null)}
|
||||||
|
onIndexChange={(index: number) => setCurrentPhotoIndex(index)}
|
||||||
|
slug={slug}
|
||||||
|
/>
|
||||||
|
)}
|
||||||
</Page>
|
</Page>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
import React from 'react';
|
import React, { useState, useEffect } from 'react';
|
||||||
import { useLocation, useNavigate, useParams } from 'react-router-dom';
|
import { useParams, useLocation, useNavigate } from 'react-router-dom';
|
||||||
import { Dialog, DialogContent } from '@/components/ui/dialog';
|
import { Dialog, DialogContent } from '@/components/ui/dialog';
|
||||||
import { Button } from '@/components/ui/button';
|
import { Button } from '@/components/ui/button';
|
||||||
import { Heart } from 'lucide-react';
|
import { Heart, ChevronLeft, ChevronRight, X } from 'lucide-react';
|
||||||
import { likePhoto } from '../services/photosApi';
|
import { likePhoto } from '../services/photosApi';
|
||||||
|
|
||||||
type Photo = {
|
type Photo = {
|
||||||
@@ -11,55 +11,123 @@ type Photo = {
|
|||||||
thumbnail_path?: string;
|
thumbnail_path?: string;
|
||||||
likes_count?: number;
|
likes_count?: number;
|
||||||
created_at?: string;
|
created_at?: string;
|
||||||
task_id?: number
|
task_id?: number;
|
||||||
|
task_title?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type Task = { id: number; title: string };
|
type Task = { id: number; title: string };
|
||||||
|
|
||||||
export default function PhotoLightbox() {
|
interface Props {
|
||||||
const navigate = useNavigate();
|
photos?: Photo[];
|
||||||
const location = useLocation();
|
currentIndex?: number;
|
||||||
const { photoId } = useParams();
|
onClose?: () => void;
|
||||||
|
onIndexChange?: (index: number) => void;
|
||||||
const [photo, setPhoto] = React.useState<Photo | null>(null);
|
slug?: string;
|
||||||
const [task, setTask] = React.useState<Task | null>(null);
|
|
||||||
const [taskLoading, setTaskLoading] = React.useState(false);
|
|
||||||
const [likes, setLikes] = React.useState<number | null>(null);
|
|
||||||
const [liked, setLiked] = React.useState(false);
|
|
||||||
|
|
||||||
// Extract event slug from URL path
|
|
||||||
const getEventSlug = () => {
|
|
||||||
const path = window.location.pathname;
|
|
||||||
const match = path.match(/^\/e\/([^\/]+)\/photo\/[^\/]+$/);
|
|
||||||
return match ? match[1] : null;
|
|
||||||
};
|
|
||||||
|
|
||||||
const slug = getEventSlug();
|
|
||||||
|
|
||||||
// Load photo if not passed via state
|
|
||||||
React.useEffect(() => {
|
|
||||||
const statePhoto = (location.state as any)?.photo;
|
|
||||||
if (statePhoto) {
|
|
||||||
setPhoto(statePhoto);
|
|
||||||
setLikes(statePhoto.likes_count ?? 0);
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!photoId) return;
|
export default function PhotoLightbox({ photos, currentIndex, onClose, onIndexChange, slug }: Props) {
|
||||||
|
const params = useParams();
|
||||||
|
const location = useLocation();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const photoId = params.photoId;
|
||||||
|
const eventSlug = params.slug || slug;
|
||||||
|
|
||||||
(async () => {
|
const [standalonePhoto, setStandalonePhoto] = useState<Photo | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [task, setTask] = useState<Task | null>(null);
|
||||||
|
const [taskLoading, setTaskLoading] = useState(false);
|
||||||
|
const [likes, setLikes] = useState<number>(0);
|
||||||
|
const [liked, setLiked] = useState(false);
|
||||||
|
|
||||||
|
// Determine mode and photo
|
||||||
|
const isStandalone = !photos || photos.length === 0;
|
||||||
|
const currentPhotos = isStandalone ? (standalonePhoto ? [standalonePhoto] : []) : photos || [];
|
||||||
|
const currentIndexVal = isStandalone ? 0 : (currentIndex || 0);
|
||||||
|
const photo = currentPhotos[currentIndexVal];
|
||||||
|
|
||||||
|
// Fallback onClose for standalone
|
||||||
|
const handleClose = onClose || (() => navigate(-1));
|
||||||
|
|
||||||
|
// Fetch single photo for standalone mode
|
||||||
|
useEffect(() => {
|
||||||
|
if (isStandalone && photoId && !standalonePhoto && eventSlug) {
|
||||||
|
const fetchPhoto = async () => {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
try {
|
try {
|
||||||
const res = await fetch(`/api/v1/photos/${photoId}`);
|
const res = await fetch(`/api/v1/photos/${photoId}`);
|
||||||
if (res.ok) {
|
if (res.ok) {
|
||||||
const photoData = await res.json();
|
const fetchedPhoto: Photo = await res.json();
|
||||||
setPhoto(photoData);
|
setStandalonePhoto(fetchedPhoto);
|
||||||
setLikes(photoData.likes_count ?? 0);
|
// Check state for initial photo
|
||||||
|
if (location.state?.photo) {
|
||||||
|
setStandalonePhoto(location.state.photo);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} else {
|
||||||
console.error('Failed to load photo:', error);
|
setError('Foto nicht gefunden');
|
||||||
}
|
}
|
||||||
})();
|
} catch (err) {
|
||||||
}, [photoId, location.state]);
|
setError('Fehler beim Laden des Fotos');
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
fetchPhoto();
|
||||||
|
} else if (!isStandalone) {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}, [isStandalone, photoId, eventSlug, standalonePhoto, location.state]);
|
||||||
|
|
||||||
|
// Update likes when photo changes
|
||||||
|
React.useEffect(() => {
|
||||||
|
if (photo) {
|
||||||
|
setLikes(photo.likes_count ?? 0);
|
||||||
|
// Check if liked from localStorage
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem('liked-photo-ids');
|
||||||
|
const likedIds = raw ? JSON.parse(raw) : [];
|
||||||
|
setLiked(likedIds.includes(photo.id));
|
||||||
|
} catch {
|
||||||
|
setLiked(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, [photo]);
|
||||||
|
|
||||||
|
const touchRef = React.useRef<HTMLDivElement>(null);
|
||||||
|
const startX = React.useRef(0);
|
||||||
|
const currentX = React.useRef(0);
|
||||||
|
|
||||||
|
const handleTouchStart = (e: React.TouchEvent) => {
|
||||||
|
startX.current = e.touches[0].clientX;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchMove = (e: React.TouchEvent) => {
|
||||||
|
if (!touchRef.current) return;
|
||||||
|
currentX.current = e.touches[0].clientX;
|
||||||
|
const deltaX = currentX.current - startX.current;
|
||||||
|
touchRef.current.style.transform = `translateX(${deltaX}px)`;
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleTouchEnd = () => {
|
||||||
|
if (!touchRef.current) return;
|
||||||
|
const deltaX = currentX.current - startX.current;
|
||||||
|
const threshold = 50; // pixels
|
||||||
|
|
||||||
|
touchRef.current.style.transform = 'translateX(0)';
|
||||||
|
|
||||||
|
if (Math.abs(deltaX) > threshold) {
|
||||||
|
if (deltaX > 0 && currentIndexVal > 0) {
|
||||||
|
// Swipe right - previous
|
||||||
|
onIndexChange?.(currentIndexVal - 1);
|
||||||
|
} else if (deltaX < 0 && currentIndexVal < currentPhotos.length - 1) {
|
||||||
|
// Swipe left - next
|
||||||
|
onIndexChange?.(currentIndexVal + 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
// Load task info if photo has task_id and slug is available
|
// Load task info if photo has task_id and slug is available
|
||||||
React.useEffect(() => {
|
React.useEffect(() => {
|
||||||
@@ -113,6 +181,14 @@ export default function PhotoLightbox() {
|
|||||||
try {
|
try {
|
||||||
const count = await likePhoto(photo.id);
|
const count = await likePhoto(photo.id);
|
||||||
setLikes(count);
|
setLikes(count);
|
||||||
|
// Update localStorage
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem('liked-photo-ids');
|
||||||
|
const arr: number[] = raw ? JSON.parse(raw) : [];
|
||||||
|
if (!arr.includes(photo.id)) {
|
||||||
|
localStorage.setItem('liked-photo-ids', JSON.stringify([...arr, photo.id]));
|
||||||
|
}
|
||||||
|
} catch {}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error('Like failed:', error);
|
console.error('Like failed:', error);
|
||||||
setLiked(false);
|
setLiked(false);
|
||||||
@@ -120,16 +196,12 @@ export default function PhotoLightbox() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function onOpenChange(open: boolean) {
|
function onOpenChange(open: boolean) {
|
||||||
if (!open) navigate(-1);
|
if (!open) handleClose();
|
||||||
}
|
|
||||||
|
|
||||||
if (!photo && !photoId) {
|
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Dialog open={true} onOpenChange={onOpenChange}>
|
<Dialog open={true} onOpenChange={onOpenChange}>
|
||||||
<DialogContent className="max-w-5xl border-0 bg-black p-0 text-white">
|
<DialogContent hideClose className="max-w-5xl border-0 bg-black p-0 text-white">
|
||||||
{/* Header with controls */}
|
{/* Header with controls */}
|
||||||
<div className="flex items-center justify-between p-2">
|
<div className="flex items-center justify-between p-2">
|
||||||
<div className="flex items-center gap-2">
|
<div className="flex items-center gap-2">
|
||||||
@@ -137,20 +209,47 @@ export default function PhotoLightbox() {
|
|||||||
variant="secondary"
|
variant="secondary"
|
||||||
size="sm"
|
size="sm"
|
||||||
onClick={onLike}
|
onClick={onLike}
|
||||||
disabled={liked || !photo}
|
disabled={liked}
|
||||||
>
|
>
|
||||||
<Heart className={`mr-1 h-4 w-4 ${liked ? 'fill-red-400 text-red-400' : ''}`} />
|
<Heart className={`mr-1 h-4 w-4 ${liked ? 'fill-red-400 text-red-400' : ''}`} />
|
||||||
{likes ?? 0}
|
{likes}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
<Button variant="secondary" size="sm" onClick={() => navigate(-1)}>
|
<div className="flex items-center gap-1">
|
||||||
Schließen
|
{currentIndexVal > 0 && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => onIndexChange?.(currentIndexVal - 1)}
|
||||||
|
className="h-8 w-8 p-0"
|
||||||
|
>
|
||||||
|
<ChevronLeft className="h-4 w-4" />
|
||||||
</Button>
|
</Button>
|
||||||
|
)}
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={onClose}
|
||||||
|
className="h-8 w-8 p-0"
|
||||||
|
>
|
||||||
|
<X className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
{currentIndexVal < currentPhotos.length - 1 && (
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
onClick={() => onIndexChange?.(currentIndexVal + 1)}
|
||||||
|
className="h-8 w-8 p-0"
|
||||||
|
>
|
||||||
|
<ChevronRight className="h-4 w-4" />
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Task Info Overlay */}
|
{/* Task Info Overlay */}
|
||||||
{task && (
|
{task && (
|
||||||
<div className="absolute top-4 left-4 right-4 z-20 bg-black/60 backdrop-blur-sm rounded-xl p-3 border border-white/20 max-w-md">
|
<div className="absolute bottom-4 left-4 right-4 z-20 bg-black/60 backdrop-blur-sm rounded-xl p-3 border border-white/20 max-w-md">
|
||||||
<div className="text-sm">
|
<div className="text-sm">
|
||||||
<div className="font-semibold mb-1 text-white">Task: {task.title}</div>
|
<div className="font-semibold mb-1 text-white">Task: {task.title}</div>
|
||||||
{taskLoading && (
|
{taskLoading && (
|
||||||
@@ -161,23 +260,22 @@ export default function PhotoLightbox() {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{/* Photo Display */}
|
{/* Photo Display */}
|
||||||
<div className="flex items-center justify-center min-h-[60vh] p-4">
|
<div
|
||||||
{photo ? (
|
ref={touchRef}
|
||||||
|
className="flex items-center justify-center min-h-[60vh] p-4 relative overflow-hidden"
|
||||||
|
onTouchStart={handleTouchStart}
|
||||||
|
onTouchMove={handleTouchMove}
|
||||||
|
onTouchEnd={handleTouchEnd}
|
||||||
|
>
|
||||||
<img
|
<img
|
||||||
src={photo.file_path || photo.thumbnail_path}
|
src={photo?.file_path || photo?.thumbnail_path}
|
||||||
alt="Foto"
|
alt={`Foto ${photo?.id || ''}${photo?.task_title ? ` - ${photo.task_title}` : ''}`}
|
||||||
className="max-h-[80vh] max-w-full object-contain"
|
className="max-h-[80vh] max-w-full object-contain transition-transform duration-200"
|
||||||
onError={(e) => {
|
onError={(e) => {
|
||||||
console.error('Image load error:', e);
|
console.error('Image load error:', e);
|
||||||
(e.target as HTMLImageElement).style.display = 'none';
|
(e.target as HTMLImageElement).style.display = 'none';
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
) : (
|
|
||||||
<div className="p-6 text-center">
|
|
||||||
<div className="animate-spin rounded-full h-8 w-8 border-b-2 border-white mx-auto mb-2"></div>
|
|
||||||
<div>Lade Foto...</div>
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Loading state for task */}
|
{/* Loading state for task */}
|
||||||
|
|||||||
44
resources/js/src/images/wedding-lights-background.svg
Normal file
44
resources/js/src/images/wedding-lights-background.svg
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
<svg width="800" height="600" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<defs>
|
||||||
|
<radialGradient id="light" cx="50%" cy="50%" r="50%" fx="50%" fy="50%">
|
||||||
|
<stop offset="0%" stop-color="#ffffff" stop-opacity="0.8"/>
|
||||||
|
<stop offset="100%" stop-color="#ffffff" stop-opacity="0"/>
|
||||||
|
</radialGradient>
|
||||||
|
</defs>
|
||||||
|
<rect width="100%" height="100%" fill="url(#gradient)"/>
|
||||||
|
<g opacity="0.3">
|
||||||
|
<!-- Soft gradient background -->
|
||||||
|
<rect width="100%" height="100%" fill="url(#bgGradient)"/>
|
||||||
|
|
||||||
|
<!-- Decorative lights -->
|
||||||
|
<circle cx="100" cy="100" r="3" fill="#ffd700" opacity="0.7">
|
||||||
|
<animate attributeName="opacity" values="0.5;1;0.5" dur="3s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
<circle cx="200" cy="150" r="2" fill="#ff69b4" opacity="0.6">
|
||||||
|
<animate attributeName="opacity" values="0.3;0.8;0.3" dur="4s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
<circle cx="300" cy="80" r="4" fill="#87cefa" opacity="0.5">
|
||||||
|
<animate attributeName="opacity" values="0.4;0.9;0.4" dur="5s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
<circle cx="400" cy="120" r="2.5" fill="#98fb98" opacity="0.7">
|
||||||
|
<animate attributeName="opacity" values="0.6;1;0.6" dur="3.5s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
<circle cx="500" cy="90" r="3.5" fill="#dda0dd" opacity="0.6">
|
||||||
|
<animate attributeName="opacity" values="0.4;0.9;0.4" dur="4.5s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
<circle cx="600" cy="140" r="2" fill="#f0e68c" opacity="0.8">
|
||||||
|
<animate attributeName="opacity" values="0.5;1;0.5" dur="2.5s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
<circle cx="700" cy="110" r="3" fill="#ff6347" opacity="0.7">
|
||||||
|
<animate attributeName="opacity" values="0.3;0.8;0.3" dur="3s" repeatCount="indefinite"/>
|
||||||
|
</circle>
|
||||||
|
</g>
|
||||||
|
|
||||||
|
<defs>
|
||||||
|
<linearGradient id="bgGradient" x1="0%" y1="0%" x2="100%" y2="100%">
|
||||||
|
<stop offset="0%" stop-color="#fff0f5" />
|
||||||
|
<stop offset="50%" stop-color="#ffe4e1" />
|
||||||
|
<stop offset="100%" stop-color="#e6e6fa" />
|
||||||
|
</linearGradient>
|
||||||
|
</defs>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.0 KiB |
@@ -4,7 +4,29 @@ import react from '@vitejs/plugin-react';
|
|||||||
import laravel from 'laravel-vite-plugin';
|
import laravel from 'laravel-vite-plugin';
|
||||||
import { defineConfig } from 'vite';
|
import { defineConfig } from 'vite';
|
||||||
|
|
||||||
|
const devServerHost = process.env.VITE_DEV_SERVER_HOST ?? '0.0.0.0';
|
||||||
|
const devServerPort = Number.parseInt(process.env.VITE_DEV_SERVER_PORT ?? '5173', 10);
|
||||||
|
const devServerOrigin = process.env.VITE_DEV_SERVER_URL ?? `http://localhost:${devServerPort}`;
|
||||||
|
const parsedOrigin = new URL(devServerOrigin);
|
||||||
|
const hmrPort = parsedOrigin.port === '' ? devServerPort : Number.parseInt(parsedOrigin.port, 10);
|
||||||
|
const appUrl = process.env.APP_URL ?? 'http://localhost:8000';
|
||||||
|
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
|
server: {
|
||||||
|
host: devServerHost,
|
||||||
|
port: devServerPort,
|
||||||
|
strictPort: true,
|
||||||
|
origin: devServerOrigin,
|
||||||
|
hmr: {
|
||||||
|
host: parsedOrigin.hostname,
|
||||||
|
protocol: parsedOrigin.protocol.replace(':', ''),
|
||||||
|
port: hmrPort,
|
||||||
|
},
|
||||||
|
cors: {
|
||||||
|
origin: appUrl,
|
||||||
|
credentials: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
plugins: [
|
plugins: [
|
||||||
laravel({
|
laravel({
|
||||||
input: ['resources/css/app.css', 'resources/js/app.tsx', 'resources/js/guest/main.tsx', 'resources/js/admin/main.tsx'],
|
input: ['resources/css/app.css', 'resources/js/app.tsx', 'resources/js/guest/main.tsx', 'resources/js/admin/main.tsx'],
|
||||||
|
|||||||
Reference in New Issue
Block a user