ac1cd96ecd
Test and Lint / backend-test (push) Successful in 1m16s
continuous-integration/drone/push Build is failing
Test and Lint / frontend-test (push) Successful in 2m18s
Version and Release / version-bump (push) Successful in 43s
Version and Release / trigger-drone (push) Successful in 4s
Major fixes for production deployment with Traefik: 1. API Path Fixes: - Remove double /api prefix from all frontend service calls - Fix auth.service.ts to use correct paths (/auth/admin/login) - Update all services to use single /api prefix from base URL - Fix template literal paths in photo services 2. Docker Configuration: - Add build args for VITE_API_URL in docker-compose.prod.yml - Create Dockerfile.prod with proper API URL configuration - Ensure frontend is built with correct API base path 3. Documentation: - Add comprehensive TRAEFIK_DEPLOYMENT.md guide - Document proper Traefik labels and routing configuration - Include troubleshooting steps for common issues - Explain network configuration and SSL handling This resolves: - 502 Bad Gateway errors - Double /api/api paths in requests - Frontend unable to communicate with backend - Login functionality not working The frontend now correctly calls the backend API through Traefik's routing, with all requests going to /api/* being forwarded to the backend service on port 3000. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com>
221 lines
7.5 KiB
TypeScript
221 lines
7.5 KiB
TypeScript
import React, { useState, useRef } from 'react';
|
|
import { Upload, X, Image, Loader2 } from 'lucide-react';
|
|
import { Button } from '../common';
|
|
import { clsx } from 'clsx';
|
|
import { api } from '../../config/api';
|
|
import { toast } from 'react-toastify';
|
|
import { useQuery } from '@tanstack/react-query';
|
|
import { categoriesService } from '../../services/categories.service';
|
|
import { useTranslation } from 'react-i18next';
|
|
|
|
interface PhotoUploadProps {
|
|
eventId: number;
|
|
onUploadComplete?: () => void;
|
|
}
|
|
|
|
export const PhotoUpload: React.FC<PhotoUploadProps> = ({ eventId, onUploadComplete }) => {
|
|
const { t } = useTranslation();
|
|
const [isUploading, setIsUploading] = useState(false);
|
|
const [selectedFiles, setSelectedFiles] = useState<File[]>([]);
|
|
const [uploadProgress, setUploadProgress] = useState(0);
|
|
const [selectedCategoryId, setSelectedCategoryId] = useState<number | null>(null);
|
|
const fileInputRef = useRef<HTMLInputElement>(null);
|
|
|
|
// Fetch categories for this event
|
|
const { data: categories = [] } = useQuery({
|
|
queryKey: ['event-categories', eventId],
|
|
queryFn: () => categoriesService.getEventCategories(eventId),
|
|
});
|
|
|
|
const handleFileSelect = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
const files = Array.from(e.target.files || []);
|
|
const imageFiles = files.filter(file =>
|
|
['image/jpeg', 'image/png', 'image/webp'].includes(file.type)
|
|
);
|
|
setSelectedFiles(prev => [...prev, ...imageFiles]);
|
|
};
|
|
|
|
const removeFile = (index: number) => {
|
|
setSelectedFiles(prev => prev.filter((_, i) => i !== index));
|
|
};
|
|
|
|
const handleUpload = async () => {
|
|
if (selectedFiles.length === 0) return;
|
|
|
|
setIsUploading(true);
|
|
setUploadProgress(0);
|
|
|
|
const formData = new FormData();
|
|
selectedFiles.forEach((file, index) => {
|
|
console.log(`Adding file ${index}: ${file.name}, size: ${file.size}`);
|
|
formData.append('photos', file);
|
|
});
|
|
|
|
if (selectedCategoryId) {
|
|
formData.append('category_id', selectedCategoryId.toString());
|
|
}
|
|
|
|
// Debug: Log FormData contents
|
|
console.log('FormData entries:');
|
|
for (let pair of formData.entries()) {
|
|
console.log(pair[0], pair[1]);
|
|
}
|
|
|
|
try {
|
|
const response = await api.post(`/admin/events/${eventId}/upload`, formData, {
|
|
// Don't set Content-Type header - axios will set it with the boundary
|
|
onUploadProgress: (progressEvent) => {
|
|
if (progressEvent.total) {
|
|
const progress = Math.round((progressEvent.loaded * 100) / progressEvent.total);
|
|
setUploadProgress(progress);
|
|
}
|
|
},
|
|
});
|
|
|
|
console.log('Upload result:', response.data);
|
|
|
|
// Clear selected files
|
|
setSelectedFiles([]);
|
|
if (fileInputRef.current) {
|
|
fileInputRef.current.value = '';
|
|
}
|
|
|
|
// Show success message
|
|
toast.success(t('toast.uploadSuccess'));
|
|
|
|
// Call callback
|
|
if (onUploadComplete) {
|
|
onUploadComplete();
|
|
}
|
|
} catch (error: any) {
|
|
console.error('Upload error:', error);
|
|
toast.error(error.response?.data?.error || t('toast.uploadError'));
|
|
} finally {
|
|
setIsUploading(false);
|
|
setUploadProgress(0);
|
|
}
|
|
};
|
|
|
|
const formatFileSize = (bytes: number) => {
|
|
if (bytes < 1024) return bytes + ' B';
|
|
if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(1) + ' KB';
|
|
return (bytes / (1024 * 1024)).toFixed(1) + ' MB';
|
|
};
|
|
|
|
return (
|
|
<div className="space-y-4">
|
|
{/* Category Selection */}
|
|
<div>
|
|
<label className="block text-sm font-medium text-neutral-700 mb-2">
|
|
{t('upload.photoCategory')}
|
|
</label>
|
|
<select
|
|
value={selectedCategoryId || ''}
|
|
onChange={(e) => setSelectedCategoryId(e.target.value ? Number(e.target.value) : null)}
|
|
className="w-full px-3 py-2 border border-neutral-300 rounded-lg focus:ring-2 focus:ring-primary-500"
|
|
>
|
|
<option value="">{t('upload.noCategory')}</option>
|
|
{categories.map((category) => (
|
|
<option key={category.id} value={category.id}>
|
|
{category.name} {!category.is_global && t('upload.eventSpecific')}
|
|
</option>
|
|
))}
|
|
</select>
|
|
</div>
|
|
|
|
{/* File Input Area */}
|
|
<div
|
|
className={clsx(
|
|
"border-2 border-dashed rounded-lg p-8 text-center transition-colors",
|
|
"hover:border-primary-400 hover:bg-primary-50/50",
|
|
selectedFiles.length > 0 ? "border-primary-400 bg-primary-50/30" : "border-neutral-300"
|
|
)}
|
|
onClick={() => fileInputRef.current?.click()}
|
|
>
|
|
<Upload className="w-12 h-12 mx-auto text-neutral-400 mb-4" />
|
|
<p className="text-neutral-700 font-medium mb-1">
|
|
{t('upload.clickToUpload')}
|
|
</p>
|
|
<p className="text-sm text-neutral-500">
|
|
{t('upload.fileRequirements')}
|
|
</p>
|
|
<input
|
|
ref={fileInputRef}
|
|
type="file"
|
|
multiple
|
|
accept="image/jpeg,image/png,image/webp"
|
|
onChange={handleFileSelect}
|
|
className="hidden"
|
|
/>
|
|
</div>
|
|
|
|
{/* Selected Files */}
|
|
{selectedFiles.length > 0 && (
|
|
<div className="space-y-2">
|
|
<p className="text-sm font-medium text-neutral-700">
|
|
{t('upload.selectedFiles')} ({selectedFiles.length})
|
|
</p>
|
|
<div className="max-h-48 overflow-y-auto space-y-2">
|
|
{selectedFiles.map((file, index) => (
|
|
<div
|
|
key={index}
|
|
className="flex items-center justify-between p-2 bg-neutral-50 rounded-lg"
|
|
>
|
|
<div className="flex items-center gap-3">
|
|
<Image className="w-5 h-5 text-neutral-400" />
|
|
<div>
|
|
<p className="text-sm font-medium text-neutral-700 truncate max-w-xs">
|
|
{file.name}
|
|
</p>
|
|
<p className="text-xs text-neutral-500">
|
|
{formatFileSize(file.size)}
|
|
</p>
|
|
</div>
|
|
</div>
|
|
<button
|
|
onClick={(e) => {
|
|
e.stopPropagation();
|
|
removeFile(index);
|
|
}}
|
|
className="p-1 hover:bg-neutral-200 rounded"
|
|
>
|
|
<X className="w-4 h-4" />
|
|
</button>
|
|
</div>
|
|
))}
|
|
</div>
|
|
</div>
|
|
)}
|
|
|
|
{/* Upload Button */}
|
|
<div className="flex justify-end">
|
|
<Button
|
|
variant="primary"
|
|
onClick={handleUpload}
|
|
disabled={selectedFiles.length === 0 || isUploading}
|
|
leftIcon={isUploading ? <Loader2 className="w-4 h-4 animate-spin" /> : <Upload className="w-4 h-4" />}
|
|
>
|
|
{isUploading ? t('upload.uploading') : t('common.upload') + ` ${selectedFiles.length} ${t(selectedFiles.length === 1 ? 'common.photo' : 'common.photos')}`}
|
|
</Button>
|
|
</div>
|
|
|
|
{/* Progress Bar */}
|
|
{isUploading && (
|
|
<div className="mt-4">
|
|
<div className="flex justify-between text-sm text-neutral-600 mb-1">
|
|
<span>{t('upload.uploading')}</span>
|
|
<span>{uploadProgress}%</span>
|
|
</div>
|
|
<div className="w-full bg-neutral-200 rounded-full h-2">
|
|
<div
|
|
className="bg-primary-600 h-2 rounded-full transition-all duration-300"
|
|
style={{ width: `${uploadProgress}%` }}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
PhotoUpload.displayName = 'PhotoUpload'; |