Fix language setting not being saved to database on admin settings page

- Added default_language field to general settings state in SettingsPage
- Replaced LanguageSelector component with simple select dropdown on settings page
- Fixed public settings endpoint to read general_default_language from database
- Language setting now properly saved when clicking Save Settings button
- Setting is correctly used by gallery login page and legal pages

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

backend/src/routes/gallery.js

@@ -4,6 +4,7 @@ const { db } = require('../database/db');
 const archiver = require('archiver');
 const path = require('path');
 const router = express.Router();
+const watermarkService = require('../services/watermarkService');
 
 // Get storage path from environment or default
 const getStoragePath = () => process.env.STORAGE_PATH || path.join(__dirname, '../../../storage');
@@ -26,7 +27,8 @@ async function verifyGalleryAccess(req, res, next) {
     req.event = event;
     next();
   } catch (error) {
-    res.status(401).json({ error: 'Invalid token' });
+    console.error('Error verifying gallery access:', error);
+    res.status(401).json({ error: 'Invalid token', details: error.message });
   }
 }
 
@@ -52,7 +54,8 @@ router.get('/:slug/verify-token/:token', async (req, res) => {
     
     res.json({ valid: true });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to verify token' });
+    console.error('Error verifying token:', error);
+    res.status(500).json({ error: 'Failed to verify token', details: error.message });
   }
 });
 
@@ -89,7 +92,8 @@ router.get('/:slug/info', async (req, res) => {
       requires_password: true
     });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to fetch gallery info' });
+    console.error('Error fetching gallery info:', error);
+    res.status(500).json({ error: 'Failed to fetch gallery info', details: error.message });
   }
 });
 
@@ -97,8 +101,23 @@ router.get('/:slug/info', async (req, res) => {
 router.get('/:slug/photos', verifyGalleryAccess, async (req, res) => {
   try {
     const photos = await db('photos')
-      .where('event_id', req.event.id)
-      .orderBy('uploaded_at', 'desc');
+      .leftJoin('photo_categories', 'photos.category_id', 'photo_categories.id')
+      .where('photos.event_id', req.event.id)
+      .select(
+        'photos.*',
+        'photo_categories.name as category_name',
+        'photo_categories.slug as category_slug'
+      )
+      .orderBy('photos.uploaded_at', 'desc');
+    
+    // Get all categories for this event
+    const categories = await db('photo_categories')
+      .where(function() {
+        this.where('is_global', true)
+          .orWhere('event_id', req.event.id);
+      })
+      .orderBy('is_global', 'desc')
+      .orderBy('name', 'asc');
     
     // Log view
     await db('access_logs').insert({
@@ -118,18 +137,28 @@ router.get('/:slug/photos', verifyGalleryAccess, async (req, res) => {
         color_theme: req.event.color_theme,
         expires_at: req.event.expires_at
       },
+      categories: categories.map(cat => ({
+        id: cat.id,
+        name: cat.name,
+        slug: cat.slug,
+        is_global: cat.is_global
+      })),
       photos: photos.map(photo => ({
         id: photo.id,
         filename: photo.filename,
-        url: `/photos/${req.event.slug}/${photo.path}`,
-        thumbnail_url: photo.thumbnail_path ? `/photos/${photo.thumbnail_path}` : null,
+        url: `/photos/${photo.path}`,
+        thumbnail_url: photo.thumbnail_path ? `/${photo.thumbnail_path}` : null,
         type: photo.type,
+        category_id: photo.category_id,
+        category_name: photo.category_name,
+        category_slug: photo.category_slug,
         size: photo.size_bytes,
         uploaded_at: photo.uploaded_at
       }))
     });
   } catch (error) {
-    res.status(500).json({ error: 'Failed to fetch photos' });
+    console.error('Error fetching photos:', error);
+    res.status(500).json({ error: 'Failed to fetch photos', details: error.message });
   }
 });
 
@@ -159,7 +188,25 @@ router.get('/:slug/download/:photoId', verifyGalleryAccess, async (req, res) =>
     });
     
     const filePath = path.join(getStoragePath(), 'events/active', req.event.slug, photo.path);
-    res.download(filePath, photo.filename);
+    
+    // Get watermark settings
+    const watermarkSettings = await watermarkService.getWatermarkSettings();
+    
+    if (watermarkSettings && watermarkSettings.enabled) {
+      // Apply watermark and send
+      const watermarkedBuffer = await watermarkService.applyWatermark(filePath, watermarkSettings);
+      
+      res.set({
+        'Content-Type': photo.mime_type || 'image/jpeg',
+        'Content-Disposition': `attachment; filename="${photo.filename}"`,
+        'Content-Length': watermarkedBuffer.length
+      });
+      
+      res.send(watermarkedBuffer);
+    } else {
+      // Send original file
+      res.download(filePath, photo.filename);
+    }
   } catch (error) {
     res.status(500).json({ error: 'Failed to download photo' });
   }
@@ -184,10 +231,21 @@ router.get('/:slug/download-all', verifyGalleryAccess, async (req, res) => {
     
     archive.pipe(res);
     
+    // Get watermark settings
+    const watermarkSettings = await watermarkService.getWatermarkSettings();
+    
     // Add photos to archive
     for (const photo of photos) {
       const filePath = path.join(getStoragePath(), 'events/active', req.event.slug, photo.path);
-      archive.file(filePath, { name: photo.path });
+      
+      if (watermarkSettings && watermarkSettings.enabled) {
+        // Apply watermark
+        const watermarkedBuffer = await watermarkService.applyWatermark(filePath, watermarkSettings);
+        archive.append(watermarkedBuffer, { name: photo.path });
+      } else {
+        // Add original file
+        archive.file(filePath, { name: photo.path });
+      }
     }
     
     await archive.finalize();