fix: multiple improvements and CI/CD updates

Frontend fixes:
- Add missing translations for chunk upload (upload.uploadingChunks, common.chunk)
- Fix photo deletion visual bug by tracking deletion state per photo
- Prevent UI confusion when deleting photos in admin grid

Backend fixes:
- Add file existence checks before deleting thumbnails
- Prevent ENOENT errors for missing thumbnail files
- Improve error handling in photo deletion

CI/CD updates:
- Remove Gitea release creation from Drone pipeline
- Simplify GitHub mirror workflow (remove history rewriting, keep file removal)
- Add clean-git-history.sh script for manual history cleanup

These changes improve the admin photo management experience and streamline
the CI/CD process for better maintainability.

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

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

.drone.yml

@@ -108,51 +108,6 @@ steps:
         - VERSION=${DRONE_TAG}
         - VITE_API_URL=${VITE_API_URL:-/api}
 
-  # -------- NEW: Create GitHub Release --------
-  - name: github-release
-    image: plugins/github-release
-    when:
-      event: tag
-    settings:
-      api_key:
-        from_secret: GITHUB_TOKEN
-      files: []
-      title: PicPeak ${DRONE_TAG}
-      note: |
-        # PicPeak ${DRONE_TAG}
-
-        ## 🐳 Docker Images
-
-        This release includes Docker images published to GitHub Container Registry:
-
-        ```bash
-        # Backend
-        docker pull ghcr.io/the-luap/picpeak-backend:${DRONE_TAG}
-        docker pull ghcr.io/the-luap/picpeak-backend:latest
-
-        # Frontend
-        docker pull ghcr.io/the-luap/picpeak-frontend:${DRONE_TAG}
-        docker pull ghcr.io/the-luap/picpeak-frontend:latest
-        ```
-
-        ## 📦 What's New
-
-        See the [README](https://github.com/the-luap/picpeak#readme) for features and documentation.
-
-        ## 🚀 Quick Start
-
-        ```bash
-        # Clone and deploy
-        git clone https://github.com/the-luap/picpeak.git
-        cd picpeak
-
-        # Use the tagged version
-        docker-compose -f docker-compose.prod.yml up -d
-        ```
-
-        ---
-
-        For detailed deployment instructions, see the [Deployment Guide](https://github.com/the-luap/picpeak/blob/main/DEPLOYMENT.md).
 
 trigger:
   event:

.gitea/workflows/mirror-to-github.yml

@@ -10,120 +10,18 @@ jobs:
   mirror:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository with full history
+      - name: Checkout repository
         uses: actions/checkout@v3
         with:
-          fetch-depth: 0  # Full history needed for finding the commit
+          fetch-depth: 0  # Full history for proper mirroring
 
       - name: Setup Git
         run: |
           git config --global user.name "the-luap"
           git config --global user.email "paul-nothaft@hotmail.de"
 
-      - name: Debug - Show current branch and status
-        run: |
-          echo "Current branch:"
-          git branch -a
-          echo "Git status:"
-          git status
-          echo "Remote info:"
-          git remote -v
-          echo "Checking target commit exists:"
-          git show --oneline 7aca927937 || echo "Target commit not found!"
-
-      - name: Create completely new history from specific commit
-        run: |
-          TARGET_COMMIT="7aca927937"
-          
-          # Verify the target commit exists
-          if ! git cat-file -e $TARGET_COMMIT^{commit}; then
-            echo "ERROR: Target commit $TARGET_COMMIT does not exist!"
-            exit 1
-          fi
-          
-          echo "✅ Target commit found: $(git log --oneline -1 $TARGET_COMMIT)"
-          
-          # Clean up any existing github-mirror branch
-          git branch -D github-mirror || true
-          
-          # Create a completely new orphan branch (no history)
-          git checkout --orphan github-mirror
-          
-          # Clear the staging area completely
-          git rm -rf . || true
-          
-          # Get the file tree from the target commit and create initial commit
-          echo "Creating new history starting from $TARGET_COMMIT..."
-          git read-tree $TARGET_COMMIT
-          git commit -m "Initial commit - imported from $(git log --oneline -1 $TARGET_COMMIT)"
-          
-          echo "✅ Created new initial commit: $(git log --oneline -1)"
-          
-          # Now get all commits after the target commit and apply their changes
-          COMMITS_AFTER_TARGET=$(git rev-list --reverse --no-merges $TARGET_COMMIT..main)
-          
-          if [ -n "$COMMITS_AFTER_TARGET" ]; then
-            echo "📋 Applying changes from commits after $TARGET_COMMIT (excluding Claude commits):"
-            
-            for commit in $COMMITS_AFTER_TARGET; do
-              # Get the commit author name
-              COMMIT_AUTHOR_NAME=$(git log --format="%an" -n 1 $commit)
-              
-              # Skip commits by Claude
-              if [ "$COMMIT_AUTHOR_NAME" = "Claude" ]; then
-                echo "⚠️ Skipping commit by Claude: $(git log --oneline -1 $commit)"
-                continue
-              fi
-              
-              echo "Processing: $(git log --oneline -1 $commit)"
-              
-              # Get the commit message and author info
-              COMMIT_MSG=$(git log --format="%B" -n 1 $commit)
-              COMMIT_AUTHOR=$(git log --format="%an <%ae>" -n 1 $commit)
-              COMMIT_DATE=$(git log --format="%ad" -n 1 $commit)
-              
-              # Apply the changes from this commit
-              if git diff-tree --no-commit-id --name-only -r $commit | xargs -I {} git show $commit:{} > /dev/null 2>&1; then
-                # Apply file changes
-                git checkout $commit -- . || true
-                
-                # Stage all changes
-                git add -A
-                
-                # Only commit if there are changes
-                if ! git diff --cached --quiet; then
-                  # Create new commit with original metadata but new SHA
-                  GIT_AUTHOR_NAME=$(echo "$COMMIT_AUTHOR" | cut -d'<' -f1 | xargs)
-                  GIT_AUTHOR_EMAIL=$(echo "$COMMIT_AUTHOR" | cut -d'<' -f2 | cut -d'>' -f1)
-                  GIT_AUTHOR_DATE="$COMMIT_DATE"
-                  
-                  export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
-                  git commit -m "$COMMIT_MSG"
-                  echo "✅ Applied changes as new commit: $(git log --oneline -1)"
-                else
-                  echo "⚠️ No changes to commit for $commit"
-                fi
-              else
-                echo "⚠️ Skipping problematic commit $commit"
-              fi
-            done
-            
-            echo "✅ Finished creating new history"
-          else
-            echo "✅ No commits after target commit - history starts fresh"
-          fi
-          
-          echo ""
-          echo "=== New History Summary ==="
-          echo "Total commits in new history: $(git rev-list --count github-mirror)"
-          echo "History starts with: $(git log --oneline --reverse | head -1)"
-          echo "Latest commit: $(git log --oneline -1)"
-
       - name: Remove sensitive files and directories
         run: |
-          # Switch to the github-mirror branch
-          git checkout github-mirror
-          
           echo "Current files before cleanup:"
           ls -la | head -10 || true
           echo "..."
@@ -164,18 +62,6 @@ jobs:
           echo "Final file structure (top level):"
           ls -la | head -10 || true
 
-      - name: Verify completely new history
-        run: |
-          git checkout github-mirror
-          echo "=== Final History Verification ==="
-          echo "Total commits in new github-mirror branch: $(git rev-list --count github-mirror)"
-          echo ""
-          echo "Complete commit history (should start from target commit content):"
-          git log --oneline --reverse
-          echo ""
-          echo "⚠️ Note: This is a completely NEW history with new commit SHAs"
-          echo "🔍 Original target commit content preserved but with new commit ID"
-
       - name: Check GitHub token
         env:
           GITHUBTOKEN: ${{ secrets.GITHUBTOKEN }}
@@ -187,13 +73,10 @@ jobs:
             echo "GitHub token is available (length: ${#GITHUBTOKEN})"
           fi
 
-      - name: Force push completely new history to GitHub
+      - name: Push to GitHub
         env:
           GITHUBTOKEN: ${{ secrets.GITHUBTOKEN }}
         run: |
-          # Switch to github-mirror branch
-          git checkout github-mirror
-          
           # Remove existing github remote if it exists
           git remote remove github || true
           
@@ -204,17 +87,13 @@ jobs:
           echo "GitHub remote added:"
           git remote -v
           
-          # Force push the completely new history to GitHub main
-          echo "🔥 FORCE PUSHING completely new history to GitHub..."
-          echo "⚠️ This will COMPLETELY REPLACE all history on GitHub!"
-          git push github github-mirror:main --force
-          echo "✅ Force push completed - GitHub now has completely new history!"
+          # Push to GitHub main branch
+          echo "Pushing to GitHub..."
+          git push github main --force
+          echo "✅ Push to GitHub completed!"
 
       - name: Workflow completed
         run: |
           echo "✅ Mirror to GitHub workflow completed successfully!"
-          echo "🔥 COMPLETE HISTORY REPLACEMENT: GitHub now has entirely new history"
-          echo "📊 History starts from commit content: 7aca927937"
-          echo "🔍 Check https://github.com/the-luap/picpeak to verify the new history"
-          echo "📈 Total commits pushed: $(git rev-list --count github-mirror)"
-          echo "🆕 All commit SHAs are NEW - no connection to previous history"
+          echo "📊 Repository mirrored to: https://github.com/the-luap/picpeak"
+          echo "🔒 Sensitive files have been removed from the mirror"

backend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "picpeak-backend",
-  "version": "1.0.84",
+  "version": "1.0.93",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "picpeak-backend",
-      "version": "1.0.84",
+      "version": "1.0.93",
       "dependencies": {
         "@aws-sdk/client-s3": "^3.850.0",
         "@aws-sdk/lib-storage": "^3.850.0",

backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "picpeak-backend",
-  "version": "1.0.84",
+  "version": "1.0.93",
   "description": "Backend for PicPeak event photo sharing platform",
   "main": "server.js",
   "scripts": {

backend/src/routes/adminEvents-enhanced.js

@@ -42,7 +42,7 @@ router.post('/', adminAuth, [
     } = req.body;
     
     // Validate password strength for gallery
-    const passwordValidation = validatePasswordInContext(password, 'gallery', {
+    const passwordValidation = await validatePasswordInContext(password, 'gallery', {
       eventName: event_name
     });
     

backend/src/routes/adminEvents.js

@@ -53,7 +53,7 @@ router.post('/', adminAuth, [
     } = req.body;
     
     // Validate password strength
-    const passwordValidation = validatePasswordInContext(password, 'gallery', {
+    const passwordValidation = await validatePasswordInContext(password, 'gallery', {
       eventName: event_name
     });
     

backend/src/routes/adminFeedback.js

@@ -123,8 +123,8 @@ router.get('/events/:eventId/feedback',
         pagination: {
           page: parseInt(page),
           limit: parseInt(limit),
-          total: totalCount.count || 0,
-          pages: Math.ceil((totalCount.count || 0) / limit)
+          total: totalCount?.count || 0,
+          pages: Math.ceil((totalCount?.count || 0) / limit)
         }
       });
     } catch (error) {
@@ -182,7 +182,35 @@ router.get('/events/:eventId/feedback-analytics',
       const { eventId } = req.params;
       
       // Get summary statistics
-      const summary = await feedbackService.getEventFeedbackSummary(eventId);
+      const summaryData = await feedbackService.getEventFeedbackSummary(eventId);
+      
+      // Calculate average rating and other summary stats
+      const avgRatingResult = await db('photo_feedback')
+        .where('event_id', eventId)
+        .where('feedback_type', 'rating')
+        .avg('rating as average_rating')
+        .first();
+      
+      const pendingModeration = await db('photo_feedback')
+        .where('event_id', eventId)
+        .where('feedback_type', 'comment')
+        .where('is_approved', false)
+        .where('is_hidden', false)
+        .count('* as count')
+        .first();
+      
+      const summary = {
+        average_rating: parseFloat(avgRatingResult?.average_rating || 0),
+        total_ratings: summaryData.stats?.total_ratings || 0,
+        total_likes: summaryData.stats?.total_likes || 0,
+        total_comments: summaryData.stats?.total_comments || 0,
+        total_favorites: summaryData.stats?.total_favorites || 0,
+        pending_moderation: pendingModeration?.count || 0,
+        total_feedback: (summaryData.stats?.total_ratings || 0) + 
+                       (summaryData.stats?.total_likes || 0) + 
+                       (summaryData.stats?.total_comments || 0) + 
+                       (summaryData.stats?.total_favorites || 0)
+      };
       
       // Get top-rated photos
       const topRated = await db('photos')

backend/src/routes/adminPhotos.js

@@ -447,9 +447,14 @@ router.delete('/:eventId/photos/:photoId', adminAuth, async (req, res) => {
     if (photo.thumbnail_path) {
       const thumbPath = path.join(storagePath, 'events/active', photo.thumbnail_path);
       try {
+        // Check if file exists before attempting to delete
+        await fs.access(thumbPath);
         await fs.unlink(thumbPath);
       } catch (error) {
-        console.error('Error deleting thumbnail:', error);
+        // Only log if it's not a "file not found" error
+        if (error.code !== 'ENOENT') {
+          console.error('Error deleting thumbnail:', error);
+        }
       }
     }
     
@@ -534,9 +539,14 @@ router.post('/:eventId/photos/bulk-delete', adminAuth, async (req, res) => {
       if (photo.thumbnail_path) {
         const thumbPath = path.join(storagePath, photo.thumbnail_path);
         try {
+          // Check if file exists before attempting to delete
+          await fs.access(thumbPath);
           await fs.unlink(thumbPath);
         } catch (error) {
-          console.error('Error deleting thumbnail:', error);
+          // Only log if it's not a "file not found" error
+          if (error.code !== 'ENOENT') {
+            console.error('Error deleting thumbnail:', error);
+          }
         }
       }
     }

clean-git-history-safe.sh

@@ -0,0 +1,163 @@
+#!/bin/bash
+
+# Script to clean git history - removes all commits before July 17, 2025
+# Safe version: Moves current main to main-old and creates new clean main
+# WARNING: This will rewrite history!
+
+set -e
+
+echo "⚠️  WARNING: This script will rewrite git history!"
+echo "⚠️  All commits before July 17, 2025 will be removed."
+echo "⚠️  Current main branch will be preserved as main-old"
+echo ""
+read -p "Are you sure you want to continue? (type 'yes' to proceed): " confirmation
+
+if [ "$confirmation" != "yes" ]; then
+    echo "Operation cancelled."
+    exit 1
+fi
+
+# Check current state
+CURRENT_BRANCH=$(git branch --show-current)
+echo "Current branch: $CURRENT_BRANCH"
+
+# Check if we're in the middle of a cherry-pick or rebase
+if [ -d ".git/CHERRY_PICK_HEAD" ] || [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
+    echo "ERROR: You're in the middle of a cherry-pick or rebase. Please resolve or abort it first."
+    echo "To abort cherry-pick: git cherry-pick --abort"
+    echo "To abort rebase: git rebase --abort"
+    exit 1
+fi
+
+# Clean any previous attempts
+echo "Cleaning up any previous attempts..."
+git cherry-pick --abort 2>/dev/null || true
+git rebase --abort 2>/dev/null || true
+
+# Check if main-old already exists
+if git show-ref --verify --quiet refs/heads/main-old; then
+    echo ""
+    echo "⚠️  Branch 'main-old' already exists!"
+    echo "Options:"
+    echo "1. Delete it and continue (previous backup will be lost)"
+    echo "2. Rename it with timestamp and continue"
+    echo "3. Cancel operation"
+    read -p "Choose option (1/2/3): " option
+    
+    case $option in
+        1)
+            echo "Deleting existing main-old branch..."
+            git branch -D main-old
+            ;;
+        2)
+            TIMESTAMP=$(date +%Y%m%d-%H%M%S)
+            NEW_NAME="main-old-${TIMESTAMP}"
+            echo "Renaming existing main-old to ${NEW_NAME}..."
+            git branch -m main-old "${NEW_NAME}"
+            ;;
+        3)
+            echo "Operation cancelled."
+            exit 1
+            ;;
+        *)
+            echo "Invalid option. Operation cancelled."
+            exit 1
+            ;;
+    esac
+fi
+
+# Make sure we're on main branch
+if [ "$CURRENT_BRANCH" != "main" ]; then
+    echo "Switching to main branch..."
+    git checkout main
+fi
+
+# Move current main to main-old
+echo "Moving current main branch to main-old..."
+git branch -m main main-old
+
+# Find the first commit on or after July 17, 2025
+echo "Finding first commit after July 17, 2025..."
+FIRST_COMMIT=$(git log --since="2025-07-17" --reverse --format="%H" | head -1)
+
+if [ -z "$FIRST_COMMIT" ]; then
+    echo "ERROR: No commits found after July 17, 2025"
+    # Restore main branch
+    git branch -m main-old main
+    exit 1
+fi
+
+echo "First commit to keep: $FIRST_COMMIT"
+echo "Commit details: $(git log --oneline -1 $FIRST_COMMIT)"
+
+# Count total commits to process
+TOTAL_COMMITS=$(git log --since="2025-07-17" --oneline | wc -l)
+echo "Total commits to preserve: $TOTAL_COMMITS"
+
+# Create new orphan branch for clean main
+echo "Creating new clean main branch..."
+git checkout --orphan main
+
+# Clean the working directory
+git rm -rf . || true
+
+# Get the tree from the first commit
+git checkout $FIRST_COMMIT -- .
+
+# Create new initial commit with same content
+ORIGINAL_MESSAGE=$(git log --format="%B" -1 $FIRST_COMMIT)
+ORIGINAL_AUTHOR=$(git log --format="%an <%ae>" -1 $FIRST_COMMIT)
+ORIGINAL_DATE=$(git log --format="%ad" -1 $FIRST_COMMIT)
+
+GIT_AUTHOR_NAME=$(echo "$ORIGINAL_AUTHOR" | cut -d'<' -f1 | xargs)
+GIT_AUTHOR_EMAIL=$(echo "$ORIGINAL_AUTHOR" | cut -d'<' -f2 | cut -d'>' -f1)
+GIT_AUTHOR_DATE="$ORIGINAL_DATE"
+export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
+
+git add -A
+git commit -m "Initial commit - Project start (July 17, 2025)
+
+Original: $ORIGINAL_MESSAGE"
+
+# Now rebase the rest of the history onto the new main
+echo "Rebasing remaining commits..."
+echo "This will linearize the history (merge commits will be flattened)..."
+
+# Use rebase to apply all commits
+git rebase --onto main $FIRST_COMMIT main-old || {
+    echo ""
+    echo "⚠️  Rebase encountered conflicts!"
+    echo ""
+    echo "To resolve:"
+    echo "1. Fix the conflicts in the listed files"
+    echo "2. Stage the resolved files: git add <files>"
+    echo "3. Continue rebase: git rebase --continue"
+    echo "4. If you want to abort and restore: git rebase --abort && git branch -D main && git branch -m main-old main"
+    echo ""
+    echo "After successful rebase, your main branch will have the clean history."
+    echo "The old history is preserved in main-old branch."
+    exit 1
+}
+
+# If we get here, rebase was successful
+echo ""
+echo "✅ New clean history created successfully!"
+echo "Total commits in new history: $(git rev-list --count HEAD)"
+echo ""
+echo "Branch status:"
+echo "  - main: Clean history starting from July 17, 2025"
+echo "  - main-old: Original history with all commits"
+echo ""
+echo "To push the new history to remote, run:"
+echo "  git push origin main --force"
+echo ""
+echo "To also push the old history backup:"
+echo "  git push origin main-old"
+echo ""
+echo "⚠️  WARNING: Force pushing will overwrite the remote repository!"
+echo "⚠️  Make sure all team members are aware before pushing!"
+echo ""
+echo "If you need to restore the original history:"
+echo "  git checkout main-old"
+echo "  git branch -D main"
+echo "  git branch -m main"

clean-git-history-v2.sh

@@ -0,0 +1,123 @@
+#!/bin/bash
+
+# Script to clean git history - removes all commits before July 17, 2025
+# Version 2: Handles merge commits properly
+# WARNING: This is destructive and will rewrite history!
+
+set -e
+
+echo "⚠️  WARNING: This script will permanently rewrite git history!"
+echo "⚠️  All commits before July 17, 2025 will be removed."
+echo "⚠️  This action cannot be undone!"
+echo ""
+read -p "Are you sure you want to continue? (type 'yes' to proceed): " confirmation
+
+if [ "$confirmation" != "yes" ]; then
+    echo "Operation cancelled."
+    exit 1
+fi
+
+# Check current state
+CURRENT_BRANCH=$(git branch --show-current)
+echo "Current branch: $CURRENT_BRANCH"
+
+# Check if we're in the middle of a cherry-pick
+if [ -d ".git/CHERRY_PICK_HEAD" ]; then
+    echo "ERROR: You're in the middle of a cherry-pick. Please resolve or abort it first."
+    echo "To abort: git cherry-pick --abort"
+    echo "To continue: git cherry-pick --continue"
+    exit 1
+fi
+
+# Clean any previous attempts
+echo "Cleaning up any previous attempts..."
+git cherry-pick --abort 2>/dev/null || true
+git checkout main 2>/dev/null || true
+git branch -D new-main 2>/dev/null || true
+
+# Create backup branch
+echo "Creating backup branch..."
+BACKUP_BRANCH="backup-before-cleanup-$(date +%Y%m%d-%H%M%S)"
+git checkout -b "$BACKUP_BRANCH"
+git checkout main
+
+# Find the first commit on or after July 17, 2025
+echo "Finding first commit after July 17, 2025..."
+FIRST_COMMIT=$(git log --since="2025-07-17" --reverse --format="%H" | head -1)
+
+if [ -z "$FIRST_COMMIT" ]; then
+    echo "ERROR: No commits found after July 17, 2025"
+    exit 1
+fi
+
+echo "First commit to keep: $FIRST_COMMIT"
+echo "Commit details: $(git log --oneline -1 $FIRST_COMMIT)"
+
+# Count total commits to process
+TOTAL_COMMITS=$(git log --since="2025-07-17" --oneline | wc -l)
+echo "Total commits to preserve: $TOTAL_COMMITS"
+
+# Create new orphan branch
+echo "Creating new clean history..."
+git checkout --orphan new-main
+
+# Clean the working directory
+git rm -rf . || true
+
+# Get the tree from the first commit
+git checkout $FIRST_COMMIT -- .
+
+# Create new initial commit with same content
+ORIGINAL_MESSAGE=$(git log --format="%B" -1 $FIRST_COMMIT)
+ORIGINAL_AUTHOR=$(git log --format="%an <%ae>" -1 $FIRST_COMMIT)
+ORIGINAL_DATE=$(git log --format="%ad" -1 $FIRST_COMMIT)
+
+GIT_AUTHOR_NAME=$(echo "$ORIGINAL_AUTHOR" | cut -d'<' -f1 | xargs)
+GIT_AUTHOR_EMAIL=$(echo "$ORIGINAL_AUTHOR" | cut -d'<' -f2 | cut -d'>' -f1)
+GIT_AUTHOR_DATE="$ORIGINAL_DATE"
+export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
+
+git add -A
+git commit -m "Initial commit - Project start (July 17, 2025)
+
+Original: $ORIGINAL_MESSAGE"
+
+# Now we'll use git rebase instead of cherry-pick to handle merges better
+echo "Rebasing remaining commits..."
+echo "This will linearize the history (merge commits will be flattened)..."
+
+# Get the commit range
+LAST_COMMIT=$(git rev-parse main)
+
+# Use rebase to apply all commits
+git rebase --onto new-main $FIRST_COMMIT main || {
+    echo ""
+    echo "⚠️  Rebase encountered conflicts!"
+    echo ""
+    echo "To resolve:"
+    echo "1. Fix the conflicts in the listed files"
+    echo "2. Stage the resolved files: git add <files>"
+    echo "3. Continue rebase: git rebase --continue"
+    echo "4. If you want to abort: git rebase --abort"
+    echo ""
+    echo "After successful rebase, run:"
+    echo "  git branch -D main"
+    echo "  git branch -m main"
+    echo "  git push origin main --force"
+    exit 1
+}
+
+# If we get here, rebase was successful
+echo ""
+echo "✅ New history created successfully!"
+echo "Total commits in new history: $(git rev-list --count HEAD)"
+echo ""
+echo "Your backup branch is: $BACKUP_BRANCH"
+echo ""
+echo "To finalize the cleanup, run these commands:"
+echo "  git branch -D main"
+echo "  git branch -m main"
+echo "  git push origin main --force"
+echo ""
+echo "⚠️  WARNING: Force pushing will overwrite the remote repository!"
+echo "⚠️  Make sure you have a backup and all team members are aware!"

clean-git-history.sh

@@ -0,0 +1,91 @@
+#!/bin/bash
+
+# Script to clean git history - removes all commits before July 17, 2025
+# WARNING: This is destructive and will rewrite history!
+
+set -e
+
+echo "⚠️  WARNING: This script will permanently rewrite git history!"
+echo "⚠️  All commits before July 17, 2025 will be removed."
+echo "⚠️  This action cannot be undone!"
+echo ""
+read -p "Are you sure you want to continue? (type 'yes' to proceed): " confirmation
+
+if [ "$confirmation" != "yes" ]; then
+    echo "Operation cancelled."
+    exit 1
+fi
+
+# Create backup branch
+echo "Creating backup branch..."
+git checkout -b backup-before-cleanup-$(date +%Y%m%d-%H%M%S)
+git checkout main
+
+# Find the first commit on or after July 17, 2025
+echo "Finding first commit after July 17, 2025..."
+FIRST_COMMIT=$(git log --since="2025-07-17" --reverse --format="%H" | head -1)
+
+if [ -z "$FIRST_COMMIT" ]; then
+    echo "ERROR: No commits found after July 17, 2025"
+    exit 1
+fi
+
+echo "First commit to keep: $FIRST_COMMIT"
+echo "Commit details: $(git log --oneline -1 $FIRST_COMMIT)"
+
+# Get all commits we want to keep
+COMMITS_TO_KEEP=$(git log --since="2025-07-17" --reverse --format="%H")
+COMMIT_COUNT=$(echo "$COMMITS_TO_KEEP" | wc -l)
+echo "Total commits to preserve: $COMMIT_COUNT"
+
+# Create new orphan branch
+echo "Creating new clean history..."
+git checkout --orphan new-main
+
+# Clean the working directory
+git rm -rf . || true
+
+# Get the tree from the first commit
+git checkout $FIRST_COMMIT -- .
+
+# Create new initial commit with same content but new message
+ORIGINAL_MESSAGE=$(git log --format="%B" -1 $FIRST_COMMIT)
+ORIGINAL_AUTHOR=$(git log --format="%an <%ae>" -1 $FIRST_COMMIT)
+ORIGINAL_DATE=$(git log --format="%ad" -1 $FIRST_COMMIT)
+
+GIT_AUTHOR_NAME=$(echo "$ORIGINAL_AUTHOR" | cut -d'<' -f1 | xargs)
+GIT_AUTHOR_EMAIL=$(echo "$ORIGINAL_AUTHOR" | cut -d'<' -f2 | cut -d'>' -f1)
+GIT_AUTHOR_DATE="$ORIGINAL_DATE"
+export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
+
+git add -A
+git commit -m "Initial commit - Project start (July 17, 2025)
+
+Original: $ORIGINAL_MESSAGE"
+
+# Cherry-pick remaining commits
+echo "Applying remaining commits..."
+REMAINING_COMMITS=$(git log --since="2025-07-17" --reverse --format="%H" $FIRST_COMMIT..main)
+
+if [ -n "$REMAINING_COMMITS" ]; then
+    for commit in $REMAINING_COMMITS; do
+        echo "Applying: $(git log --oneline -1 $commit)"
+        git cherry-pick $commit || {
+            echo "ERROR: Failed to cherry-pick $commit"
+            echo "You may need to resolve conflicts and continue manually"
+            exit 1
+        }
+    done
+fi
+
+echo ""
+echo "✅ New history created successfully!"
+echo "Total commits in new history: $(git rev-list --count HEAD)"
+echo ""
+echo "To finalize the cleanup, run these commands:"
+echo "  git branch -D main"
+echo "  git branch -m main"
+echo "  git push origin main --force"
+echo ""
+echo "⚠️  WARNING: Force pushing will overwrite the remote repository!"
+echo "⚠️  Make sure you have a backup and all team members are aware!"

frontend/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "picpeak-frontend",
-  "version": "1.0.88",
+  "version": "1.0.93",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "picpeak-frontend",
-      "version": "1.0.88",
+      "version": "1.0.93",
       "dependencies": {
         "@tanstack/react-query": "^5.0.0",
         "@tiptap/extension-character-count": "^2.26.1",

frontend/package.json

@@ -1,7 +1,7 @@
 {
   "name": "picpeak-frontend",
   "private": true,
-  "version": "1.0.88",
+  "version": "1.0.93",
   "type": "module",
   "scripts": {
     "dev": "vite",

frontend/src/App.tsx

@@ -16,6 +16,7 @@ import {
   EventsListPage,
   CreateEventPageEnhanced as CreateEventPage,
   EventDetailsPage,
+  EventFeedbackPage,
   EmailConfigPage,
   ArchivesPage,
   AnalyticsPage,
@@ -120,6 +121,7 @@ function App() {
                       <Route path="events" element={<EventsListPage />} />
                       <Route path="events/new" element={<CreateEventPage />} />
                       <Route path="events/:id" element={<EventDetailsPage />} />
+                      <Route path="events/:id/feedback" element={<EventFeedbackPage />} />
                       <Route path="archives" element={<ArchivesPage />} />
                       <Route path="email" element={<EmailConfigPage />} />
                       <Route path="analytics" element={<AnalyticsPage />} />

frontend/src/components/admin/AdminPhotoGrid.tsx

@@ -23,7 +23,7 @@ export const AdminPhotoGrid: React.FC<AdminPhotoGridProps> = ({
   const [selectedPhotos, setSelectedPhotos] = useState<Set<number>>(new Set());
   const [isSelectionMode, setIsSelectionMode] = useState(false);
   const [isDeleting, setIsDeleting] = useState(false);
-  const [deletingPhotoId, setDeletingPhotoId] = useState<number | null>(null);
+  const [deletingPhotos, setDeletingPhotos] = useState<Set<number>>(new Set());
 
   const handlePhotoSelect = (photoId: number, e?: React.MouseEvent) => {
     if (e) {
@@ -54,15 +54,18 @@ export const AdminPhotoGrid: React.FC<AdminPhotoGridProps> = ({
       return;
     }
 
-    setDeletingPhotoId(photo.id);
+    setDeletingPhotos(prev => new Set(prev).add(photo.id));
     try {
       await photosService.deletePhoto(eventId, photo.id);
       toast.success('Photo deleted successfully');
       onPhotosDeleted();
     } catch (error) {
       toast.error('Failed to delete photo');
-    } finally {
-      setDeletingPhotoId(null);
+      setDeletingPhotos(prev => {
+        const newSet = new Set(prev);
+        newSet.delete(photo.id);
+        return newSet;
+      });
     }
   };
 
@@ -75,14 +78,18 @@ export const AdminPhotoGrid: React.FC<AdminPhotoGridProps> = ({
     }
 
     setIsDeleting(true);
+    const selectedIds = Array.from(selectedPhotos);
+    setDeletingPhotos(new Set(selectedIds));
+    
     try {
-      await photosService.deletePhotos(eventId, Array.from(selectedPhotos));
+      await photosService.deletePhotos(eventId, selectedIds);
       toast.success(`${count} photo${count > 1 ? 's' : ''} deleted successfully`);
       setSelectedPhotos(new Set());
       setIsSelectionMode(false);
       onPhotosDeleted();
     } catch (error) {
       toast.error('Failed to delete photos');
+      setDeletingPhotos(new Set());
     } finally {
       setIsDeleting(false);
     }
@@ -155,13 +162,15 @@ export const AdminPhotoGrid: React.FC<AdminPhotoGridProps> = ({
 
       {/* Photo Grid */}
       <div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-4 xl:grid-cols-5 gap-4">
-        {photos.map((photo, index) => (
-          <div
-            key={photo.id}
-            className={`relative group cursor-pointer rounded-lg overflow-hidden bg-neutral-100 ${
-              isSelectionMode ? 'ring-2 ring-offset-2 ' + (selectedPhotos.has(photo.id) ? 'ring-primary-500' : 'ring-transparent') : ''
-            }`}
-            onClick={() => isSelectionMode ? handlePhotoSelect(photo.id) : onPhotoClick(photo, index)}
+        {photos.map((photo, index) => {
+          const isDeleting = deletingPhotos.has(photo.id);
+          return (
+            <div
+              key={photo.id}
+              className={`relative group cursor-pointer rounded-lg overflow-hidden bg-neutral-100 transition-opacity ${
+                isSelectionMode ? 'ring-2 ring-offset-2 ' + (selectedPhotos.has(photo.id) ? 'ring-primary-500' : 'ring-transparent') : ''
+              } ${isDeleting ? 'opacity-50' : ''}`}
+              onClick={() => !isDeleting && (isSelectionMode ? handlePhotoSelect(photo.id) : onPhotoClick(photo, index))}
           >
             {/* Selection Checkbox */}
             {isSelectionMode && (
@@ -219,8 +228,8 @@ export const AdminPhotoGrid: React.FC<AdminPhotoGridProps> = ({
                     </button>
                     <button
                       onClick={(e) => handleDeleteSingle(photo, e)}
-                      className="p-1 text-white hover:bg-white/20 rounded"
-                      disabled={deletingPhotoId === photo.id}
+                      className="p-1 text-white hover:bg-white/20 rounded disabled:opacity-50"
+                      disabled={isDeleting}
                     >
                       <Trash2 className="w-3 h-3" />
                     </button>
@@ -238,7 +247,8 @@ export const AdminPhotoGrid: React.FC<AdminPhotoGridProps> = ({
               </div>
             )}
           </div>
-        ))}
+          );
+        })}
       </div>
 
       {photos.length === 0 && (

frontend/src/components/admin/FeedbackModerationPanel.tsx

@@ -0,0 +1,205 @@
+import React, { useState } from 'react';
+import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+import { 
+  MessageSquare, 
+  Eye, 
+  EyeOff, 
+  Trash2, 
+  AlertCircle,
+  CheckCircle,
+  Clock,
+  User
+} from 'lucide-react';
+import { parseISO } from 'date-fns';
+import { toast } from 'react-toastify';
+
+import { Card, Loading, Button } from '../common';
+import { feedbackService } from '../../services/feedback.service';
+import { useLocalizedDate } from '../../hooks/useLocalizedDate';
+
+interface FeedbackModerationPanelProps {
+  eventId: number;
+  className?: string;
+  compact?: boolean;
+  maxItems?: number;
+}
+
+export const FeedbackModerationPanel: React.FC<FeedbackModerationPanelProps> = ({
+  eventId,
+  className = '',
+  compact = false,
+  maxItems = 5
+}) => {
+  const { t } = useTranslation();
+  const { format } = useLocalizedDate();
+  const queryClient = useQueryClient();
+  const [showAll, setShowAll] = useState(false);
+
+  // Fetch pending feedback
+  const { data: feedbackData, isLoading } = useQuery({
+    queryKey: ['event-feedback-moderation', eventId],
+    queryFn: () => feedbackService.getEventFeedback(eventId.toString(), {
+      type: 'comment',
+      status: 'pending',
+      limit: showAll ? 100 : maxItems
+    }),
+    refetchInterval: 30000 // Refresh every 30 seconds
+  });
+
+  // Moderation mutation
+  const moderateMutation = useMutation({
+    mutationFn: ({ feedbackId, action }: { feedbackId: string; action: 'approve' | 'hide' | 'reject' }) =>
+      feedbackService.moderateFeedback(feedbackId, action),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['event-feedback-moderation', eventId] });
+      toast.success(t('feedback.moderationSuccess'));
+    }
+  });
+
+  // Delete mutation
+  const deleteMutation = useMutation({
+    mutationFn: (feedbackId: string) => feedbackService.deleteFeedback(feedbackId),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['event-feedback-moderation', eventId] });
+      toast.success(t('feedback.deleted'));
+    }
+  });
+
+  if (isLoading) {
+    return (
+      <Card className={className}>
+        <div className="p-6">
+          <Loading />
+        </div>
+      </Card>
+    );
+  }
+
+  const pendingComments = feedbackData?.feedback || [];
+  const hasPending = pendingComments.length > 0;
+
+  return (
+    <Card className={className}>
+      <div className="p-6">
+        <div className="flex items-center justify-between mb-4">
+          <h2 className="text-lg font-semibold text-neutral-900">
+            {t('feedback.pendingModeration', 'Pending Moderation')}
+          </h2>
+          {hasPending && (
+            <span className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium bg-yellow-100 text-yellow-800">
+              {pendingComments.length} {t('feedback.pending', 'pending')}
+            </span>
+          )}
+        </div>
+
+        {!hasPending ? (
+          <div className="text-center py-8">
+            <CheckCircle className="w-12 h-12 text-green-500 mx-auto mb-3" />
+            <p className="text-neutral-600">{t('feedback.noPendingComments', 'No comments pending moderation')}</p>
+          </div>
+        ) : (
+          <div className="space-y-3">
+            {pendingComments.slice(0, showAll ? undefined : maxItems).map((item) => (
+              <div key={item.id} className="border border-neutral-200 rounded-lg p-4 hover:bg-neutral-50">
+                <div className="flex items-start gap-3">
+                  <div className="flex-shrink-0">
+                    <div className="w-10 h-10 bg-neutral-100 rounded-full flex items-center justify-center">
+                      <User className="w-5 h-5 text-neutral-600" />
+                    </div>
+                  </div>
+                  
+                  <div className="flex-1 min-w-0">
+                    <div className="flex items-start justify-between gap-2">
+                      <div className="flex-1">
+                        <div className="flex items-center gap-2 text-sm">
+                          <span className="font-medium text-neutral-900">
+                            {item.guest_name || t('feedback.anonymous', 'Anonymous')}
+                          </span>
+                          <span className="text-neutral-500">•</span>
+                          <span className="text-neutral-500">
+                            {format(parseISO(item.created_at), 'MMM d, h:mm a')}
+                          </span>
+                        </div>
+                        <p className="mt-1 text-sm text-neutral-700">{item.comment}</p>
+                        {item.photo_filename && (
+                          <p className="mt-1 text-xs text-neutral-500">
+                            {t('feedback.onPhoto', 'On photo')}: {item.photo_filename}
+                          </p>
+                        )}
+                      </div>
+                    </div>
+
+                    {/* Actions */}
+                    <div className="flex items-center gap-2 mt-3">
+                      <Button
+                        size="sm"
+                        variant="ghost"
+                        leftIcon={<CheckCircle className="w-4 h-4" />}
+                        onClick={() => moderateMutation.mutate({ 
+                          feedbackId: item.id.toString(), 
+                          action: 'approve' 
+                        })}
+                        isLoading={moderateMutation.isPending}
+                      >
+                        {t('feedback.approve', 'Approve')}
+                      </Button>
+                      <Button
+                        size="sm"
+                        variant="ghost"
+                        leftIcon={<EyeOff className="w-4 h-4" />}
+                        onClick={() => moderateMutation.mutate({ 
+                          feedbackId: item.id.toString(), 
+                          action: 'hide' 
+                        })}
+                        isLoading={moderateMutation.isPending}
+                      >
+                        {t('feedback.hide', 'Hide')}
+                      </Button>
+                      <Button
+                        size="sm"
+                        variant="ghost"
+                        leftIcon={<Trash2 className="w-4 h-4" />}
+                        onClick={() => {
+                          if (confirm(t('feedback.confirmDelete', 'Are you sure you want to delete this comment?'))) {
+                            deleteMutation.mutate(item.id.toString());
+                          }
+                        }}
+                        isLoading={deleteMutation.isPending}
+                        className="text-red-600 hover:text-red-700 hover:bg-red-50"
+                      >
+                        {t('common.delete', 'Delete')}
+                      </Button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            ))}
+
+            {pendingComments.length > maxItems && !showAll && (
+              <button
+                onClick={() => setShowAll(true)}
+                className="w-full text-center py-2 text-sm text-primary-600 hover:text-primary-700 font-medium"
+              >
+                {t('feedback.showAll', 'Show all {{count}} pending comments', { count: pendingComments.length })}
+              </button>
+            )}
+          </div>
+        )}
+
+        {/* Quick link to full feedback page */}
+        <div className="mt-4 pt-4 border-t border-neutral-200">
+          <a
+            href={`/admin/events/${eventId}/feedback`}
+            className="text-sm text-primary-600 hover:text-primary-700 font-medium flex items-center gap-1"
+          >
+            <MessageSquare className="w-4 h-4" />
+            {t('feedback.viewAllFeedback', 'View all feedback & settings')}
+          </a>
+        </div>
+      </div>
+    </Card>
+  );
+};
+
+FeedbackModerationPanel.displayName = 'FeedbackModerationPanel';

frontend/src/components/admin/PhotoUpload.tsx

@@ -256,7 +256,7 @@ export const PhotoUpload: React.FC<PhotoUploadProps> = ({ eventId, onUploadCompl
           <div className="flex justify-between text-sm text-neutral-600 mb-1">
             <span>
               {t('upload.uploading')}
-              {totalChunks > 1 && ` (${t('common.chunk') || 'Chunk'} ${currentChunk}/${totalChunks})`}
+              {totalChunks > 1 && ` (${t('common.chunk')} ${currentChunk}/${totalChunks})`}
             </span>
             <span>{uploadProgress}%</span>
           </div>
@@ -268,7 +268,7 @@ export const PhotoUpload: React.FC<PhotoUploadProps> = ({ eventId, onUploadCompl
           </div>
           {totalChunks > 1 && (
             <p className="text-xs text-neutral-500 mt-1">
-              {t('upload.uploadingChunks') || `Uploading ${selectedFiles.length} files in ${totalChunks} batches...`}
+              {t('upload.uploadingChunks', { count: selectedFiles.length, total: totalChunks })}
             </p>
           )}
         </div>

frontend/src/components/admin/index.ts

@@ -27,4 +27,5 @@ export { BackupDashboard } from './BackupDashboard';
 export { BackupConfiguration } from './BackupConfiguration';
 export { BackupHistory } from './BackupHistory';
 export { RestoreWizard } from './RestoreWizard';
-export { FeedbackSettings } from './FeedbackSettings';
+export { FeedbackSettings } from './FeedbackSettings';
+export { FeedbackModerationPanel } from './FeedbackModerationPanel';

frontend/src/components/gallery/GalleryView.tsx

@@ -18,6 +18,7 @@ import { GALLERY_THEME_PRESETS } from '../../types/theme.types';
 import { api } from '../../config/api';
 import { Upload, Menu } from 'lucide-react';
 import { galleryService } from '../../services/gallery.service';
+import { feedbackService } from '../../services/feedback.service';
 import { useWatermarkSettings } from '../../hooks/useWatermarkSettings';
 
 interface GalleryViewProps {
@@ -48,6 +49,7 @@ export const GalleryView: React.FC<GalleryViewProps> = ({ slug, event }) => {
   const [sidebarOpen, setSidebarOpen] = useState(false);
   const [isSelectionMode, setIsSelectionMode] = useState(false);
   const [selectedPhotos, setSelectedPhotos] = useState<Set<number>>(new Set());
+  const [feedbackEnabled, setFeedbackEnabled] = useState(false);
   const [isMobile, setIsMobile] = useState(window.innerWidth < 768);
   const { watermarkEnabled } = useWatermarkSettings();
   
@@ -76,6 +78,25 @@ export const GalleryView: React.FC<GalleryViewProps> = ({ slug, event }) => {
     staleTime: 5 * 60 * 1000, // Cache for 5 minutes
   });
 
+  // Fetch feedback settings
+  const { data: feedbackSettings } = useQuery({
+    queryKey: ['gallery-feedback-settings', event.id],
+    queryFn: async () => {
+      try {
+        // Use public endpoint to get feedback settings
+        const response = await api.get(`/gallery/${slug}/feedback-settings`);
+        return response.data;
+      } catch (error) {
+        // If endpoint doesn't exist or returns error, default to disabled
+        return { feedback_enabled: false };
+      }
+    },
+    onSuccess: (data) => {
+      setFeedbackEnabled(data?.feedback_enabled || false);
+    },
+    enabled: !!event.id,
+  });
+
   // Apply branding settings
   useEffect(() => {
     if (settingsData) {
@@ -429,6 +450,7 @@ export const GalleryView: React.FC<GalleryViewProps> = ({ slug, event }) => {
             photos={filteredPhotos} 
             slug={slug} 
             categoryId={selectedCategoryId}
+            feedbackEnabled={feedbackEnabled}
             isSelectionMode={isSelectionMode}
             selectedPhotos={selectedPhotos}
             onSelectionChange={setSelectedPhotos}

frontend/src/components/gallery/PhotoGrid.tsx

@@ -15,9 +15,10 @@ interface PhotoGridProps {
   photos: Photo[];
   slug: string;
   categoryId?: number | null;
+  feedbackEnabled?: boolean;
 }
 
-export const PhotoGrid: React.FC<PhotoGridProps> = ({ photos, slug, categoryId }) => {
+export const PhotoGrid: React.FC<PhotoGridProps> = ({ photos, slug, categoryId, feedbackEnabled = false }) => {
   const { t } = useTranslation();
   const [selectedPhotoIndex, setSelectedPhotoIndex] = useState<number | null>(null);
   const [selectedPhotos, setSelectedPhotos] = useState<Set<number>>(new Set());
@@ -204,6 +205,7 @@ export const PhotoGrid: React.FC<PhotoGridProps> = ({ photos, slug, categoryId }
           initialIndex={selectedPhotoIndex}
           onClose={() => setSelectedPhotoIndex(null)}
           slug={slug}
+          feedbackEnabled={feedbackEnabled}
         />
       )}
     </>

frontend/src/components/gallery/PhotoGridWithLayouts.tsx

@@ -34,6 +34,7 @@ interface PhotoGridWithLayoutsProps {
   eventLogo?: string | null;
   eventDate?: string;
   expiresAt?: string;
+  feedbackEnabled?: boolean;
 }
 
 export const PhotoGridWithLayouts: React.FC<PhotoGridWithLayoutsProps> = ({ 
@@ -42,6 +43,7 @@ export const PhotoGridWithLayouts: React.FC<PhotoGridWithLayoutsProps> = ({
   categoryId,
   isSelectionMode: parentSelectionMode,
   selectedPhotos: parentSelectedPhotos,
+  feedbackEnabled,
   onSelectionChange,
   onToggleSelectionMode: parentToggleSelectionMode,
   showSelectionControls = true,
@@ -259,6 +261,7 @@ export const PhotoGridWithLayouts: React.FC<PhotoGridWithLayoutsProps> = ({
           initialIndex={selectedPhotoIndex}
           onClose={() => setSelectedPhotoIndex(null)}
           slug={slug}
+          feedbackEnabled={feedbackEnabled || false}
         />
       )}
     </>

frontend/src/components/gallery/PhotoLightbox.tsx

@@ -10,6 +10,7 @@ interface PhotoLightboxProps {
   initialIndex: number;
   onClose: () => void;
   slug: string;
+  feedbackEnabled?: boolean;
 }
 
 export const PhotoLightbox: React.FC<PhotoLightboxProps> = ({
@@ -17,6 +18,7 @@ export const PhotoLightbox: React.FC<PhotoLightboxProps> = ({
   initialIndex,
   onClose,
   slug,
+  feedbackEnabled = false,
 }) => {
   const [currentIndex, setCurrentIndex] = useState(initialIndex);
   const [zoom, setZoom] = useState(1);
@@ -227,13 +229,15 @@ export const PhotoLightbox: React.FC<PhotoLightboxProps> = ({
               <Download className="w-5 h-5 text-white" />
             </button>
             
-            <button
-              onClick={() => setShowFeedback(!showFeedback)}
-              className="p-2 bg-white/10 hover:bg-white/20 rounded-full transition-colors"
-              aria-label="Toggle feedback"
-            >
-              <MessageSquare className="w-5 h-5 text-white" />
-            </button>
+            {feedbackEnabled && (
+              <button
+                onClick={() => setShowFeedback(!showFeedback)}
+                className="p-2 bg-white/10 hover:bg-white/20 rounded-full transition-colors"
+                aria-label="Toggle feedback"
+              >
+                <MessageSquare className="w-5 h-5 text-white" />
+              </button>
+            )}
           </div>
         </div>
       </div>

frontend/src/hooks/useLocalizedDate.ts

@@ -4,6 +4,14 @@ import { de, enUS } from 'date-fns/locale';
 import { useQuery } from '@tanstack/react-query';
 import { publicSettingsService } from '../services/publicSettings.service';
 
+// Convert old date format strings to new date-fns format
+const convertDateFormat = (format: string): string => {
+  return format
+    .replace(/DD/g, 'dd')    // Days: DD -> dd
+    .replace(/YYYY/g, 'yyyy') // Years: YYYY -> yyyy
+    .replace(/YY/g, 'yy');    // Short years: YY -> yy
+};
+
 export const useLocalizedDate = () => {
   const { i18n } = useTranslation();
   
@@ -22,7 +30,18 @@ export const useLocalizedDate = () => {
   const format = (date: Date | string, formatStr?: string) => {
     const dateObj = typeof date === 'string' ? new Date(date) : date;
     // Use admin-configured date format if available and no format string provided
-    const dateFormat = formatStr || settings?.general_date_format || 'PPP';
+    let dateFormat = formatStr;
+    if (!dateFormat && settings?.general_date_format) {
+      // Handle both string and object formats
+      dateFormat = typeof settings.general_date_format === 'string' 
+        ? settings.general_date_format 
+        : settings.general_date_format.format || 'PPP';
+    }
+    dateFormat = dateFormat || 'PPP';
+    
+    // Convert old format to new format
+    dateFormat = convertDateFormat(dateFormat);
+    
     return dateFnsFormat(dateObj, dateFormat, { locale: getLocale() });
   };
   
@@ -35,6 +54,12 @@ export const useLocalizedDate = () => {
     format,
     formatDistanceToNow,
     locale: getLocale(),
-    dateFormat: settings?.general_date_format || 'PPP'
+    dateFormat: settings?.general_date_format 
+      ? convertDateFormat(
+          typeof settings.general_date_format === 'string' 
+            ? settings.general_date_format 
+            : settings.general_date_format.format || 'PPP'
+        )
+      : 'PPP'
   };
 };

frontend/src/i18n/locales/de.json

@@ -35,7 +35,8 @@
     "days": "Tage",
     "customize": "Anpassen",
     "hide": "Ausblenden",
-    "unknown": "Unbekannt"
+    "unknown": "Unbekannt",
+    "chunk": "Teil"
   },
   "upload": {
     "photoCategory": "Fotokategorie",
@@ -51,7 +52,8 @@
     "uploadPhotos": "Fotos hochladen",
     "maxFilesReached": "Maximal 500 Dateien erlaubt",
     "someFilesSkipped": "Einige Dateien wurden übersprungen (500 Dateien Limit)",
-    "tooManyFiles": "Maximal 500 Dateien können gleichzeitig hochgeladen werden"
+    "tooManyFiles": "Maximal 500 Dateien können gleichzeitig hochgeladen werden",
+    "uploadingChunks": "Lade {{count}} Dateien in {{total}} Teilen hoch..."
   },
   "navigation": {
     "dashboard": "Dashboard",
@@ -367,6 +369,11 @@
     "noEventsDescription": "Erstellen Sie Ihre erste Veranstaltung, um zu beginnen.",
     "eventsSelected": "{{count}} Veranstaltung ausgewählt",
     "eventsSelected_plural": "{{count}} Veranstaltungen ausgewählt",
+    "viewDetails": "Details anzeigen",
+    "archiveEventAction": "Veranstaltung archivieren",
+    "downloadArchiveAction": "Archiv herunterladen",
+    "deleteEvent": "Veranstaltung löschen",
+    "deleteEventConfirm": "Sind Sie sicher, dass Sie diese Veranstaltung löschen möchten?",
     "bulkArchive": "Archivieren",
     "confirmBulkArchive": "Sind Sie sicher, dass Sie {{count}} Veranstaltung(en) archivieren möchten?",
     "confirmBulkArchiveDescription": "Diese Aktion kann nicht rückgängig gemacht werden. Archivierte Veranstaltungen sind nicht mehr öffentlich zugänglich.",

frontend/src/i18n/locales/en.json

@@ -35,7 +35,8 @@
     "days": "days",
     "customize": "Customize",
     "hide": "Hide",
-    "unknown": "Unknown"
+    "unknown": "Unknown",
+    "chunk": "Chunk"
   },
   "upload": {
     "photoCategory": "Photo Category",
@@ -51,7 +52,8 @@
     "uploadPhotos": "Upload Photos",
     "maxFilesReached": "Maximum 500 files allowed",
     "someFilesSkipped": "Some files were skipped (500 file limit)",
-    "tooManyFiles": "Maximum 500 files can be uploaded at once"
+    "tooManyFiles": "Maximum 500 files can be uploaded at once",
+    "uploadingChunks": "Uploading {{count}} files in {{total}} batches..."
   },
   "navigation": {
     "dashboard": "Dashboard",

frontend/src/pages/admin/CreateEventPageEnhanced.tsx

@@ -84,7 +84,7 @@ export const CreateEventPageEnhanced: React.FC = () => {
   const [formData, setFormData] = useState<FormData>({
     event_type: 'wedding',
     event_name: '',
-    event_date: format(new Date(), 'yyyy-MM-dd'),
+    event_date: new Date().toISOString().split('T')[0], // Initialize with ISO date format
     host_name: '',
     host_email: '',
     admin_email: '',

frontend/src/pages/admin/EventDetailsPage.tsx

@@ -24,11 +24,12 @@ import { toast } from 'react-toastify';
 import { useLocalizedDate } from '../../hooks/useLocalizedDate';
 
 import { Button, Input, Card, Loading } from '../../components/common';
-import { EventCategoryManager, AdminPhotoGrid, AdminPhotoViewer, PhotoFilters, PasswordResetModal, ThemeCustomizerEnhanced, ThemeDisplay, HeroPhotoSelector, PhotoUploadModal } from '../../components/admin';
+import { EventCategoryManager, AdminPhotoGrid, AdminPhotoViewer, PhotoFilters, PasswordResetModal, ThemeCustomizerEnhanced, ThemeDisplay, HeroPhotoSelector, PhotoUploadModal, FeedbackSettings, FeedbackModerationPanel } from '../../components/admin';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { eventsService } from '../../services/events.service';
 import { archiveService } from '../../services/archive.service';
 import { photosService, AdminPhoto } from '../../services/photos.service';
+import { feedbackService, FeedbackSettings as FeedbackSettingsType } from '../../services/feedback.service';
 import { ThemeConfig, GALLERY_THEME_PRESETS } from '../../types/theme.types';
 
 export const EventDetailsPage: React.FC = () => {
@@ -55,6 +56,15 @@ export const EventDetailsPage: React.FC = () => {
     hero_photo_id: null as number | null,
     host_name: '',
   });
+  const [feedbackSettings, setFeedbackSettings] = useState<FeedbackSettingsType>({
+    feedback_enabled: false,
+    allow_ratings: true,
+    allow_likes: true,
+    allow_comments: true,
+    allow_favorites: true,
+    require_moderation: true,
+    show_public_stats: false
+  });
   const [copiedLink, setCopiedLink] = useState(false);
   const [showPhotoUpload, setShowPhotoUpload] = useState(false);
   const [activeTab, setActiveTab] = useState<'overview' | 'photos' | 'categories'>('overview');
@@ -78,6 +88,16 @@ export const EventDetailsPage: React.FC = () => {
     enabled: !!id,
   });
 
+  // Fetch feedback settings
+  const { data: eventFeedbackSettings } = useQuery({
+    queryKey: ['admin-event-feedback-settings', id],
+    queryFn: () => feedbackService.getEventFeedbackSettings(id!),
+    enabled: !!id,
+    onSuccess: (data) => {
+      setFeedbackSettings(data);
+    }
+  });
+
   // Statistics are now fetched with the event details from the admin API
 
   // Fetch photos (needed for both photos tab and hero photo selector)
@@ -198,7 +218,7 @@ export const EventDetailsPage: React.FC = () => {
     setIsEditing(true);
   };
 
-  const handleSaveEdit = () => {
+  const handleSaveEdit = async () => {
     // Prepare color_theme - if we have a custom theme, serialize it
     let themeToSave = editForm.color_theme;
     if (currentTheme && currentPresetName === 'custom') {
@@ -240,7 +260,16 @@ export const EventDetailsPage: React.FC = () => {
     
     console.log('Updating event with data:', updateData);
     console.log('Theme length:', updateData.color_theme ? updateData.color_theme.length : 0);
+    
+    // Update event details
     updateMutation.mutate(updateData);
+    
+    // Update feedback settings separately
+    try {
+      await feedbackService.updateEventFeedbackSettings(id!, feedbackSettings);
+    } catch (error) {
+      console.error('Failed to update feedback settings:', error);
+    }
   };
 
   const handleCopyLink = async () => {
@@ -320,14 +349,16 @@ export const EventDetailsPage: React.FC = () => {
                     {t('common.edit')}
                   </Button>
                 )}
-                <Button
-                  variant="outline"
-                  size="sm"
-                  leftIcon={<MessageSquare className="w-4 h-4" />}
-                  onClick={() => navigate(`/admin/events/${id}/feedback`)}
-                >
-                  {t('feedback.manage', 'Manage Feedback')}
-                </Button>
+                {feedbackSettings?.feedback_enabled && (
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    leftIcon={<MessageSquare className="w-4 h-4" />}
+                    onClick={() => navigate(`/admin/events/${id}/feedback`)}
+                  >
+                    {t('feedback.manage', 'Manage Feedback')}
+                  </Button>
+                )}
               </>
             )}
             {event.share_link && (
@@ -518,6 +549,15 @@ export const EventDetailsPage: React.FC = () => {
                     </p>
                   </div>
                 )}
+                
+                {/* Feedback Settings */}
+                <div className="mt-4 pt-4 border-t border-neutral-200">
+                  <h3 className="text-sm font-semibold text-neutral-900 mb-3">{t('feedback.settings', 'Feedback Settings')}</h3>
+                  <FeedbackSettings
+                    settings={feedbackSettings}
+                    onChange={setFeedbackSettings}
+                  />
+                </div>
               </div>
             ) : (
               <dl className="space-y-4">
@@ -788,6 +828,15 @@ export const EventDetailsPage: React.FC = () => {
             </Card>
           )}
 
+          {/* Feedback Moderation Panel */}
+          {!event.is_archived && feedbackSettings?.feedback_enabled && (
+            <FeedbackModerationPanel 
+              eventId={parseInt(id!)} 
+              compact={true}
+              maxItems={3}
+            />
+          )}
+
           {/* Archive Status */}
           {event.is_archived ? (
             <Card padding="md">

frontend/src/pages/admin/EventFeedbackPage.tsx

@@ -392,7 +392,7 @@ export const EventFeedbackPage: React.FC = () => {
                     <div className="flex items-center gap-3 mb-2">
                       <Star className="w-8 h-8 text-yellow-500" />
                       <div>
-                        <p className="text-2xl font-bold">{analytics.summary.average_rating.toFixed(1)}</p>
+                        <p className="text-2xl font-bold">{(analytics.summary.average_rating || 0).toFixed(1)}</p>
                         <p className="text-sm text-neutral-600">{t('feedback.avgRating', 'Average Rating')}</p>
                       </div>
                     </div>

frontend/src/pages/admin/SettingsPage.tsx

@@ -57,7 +57,7 @@ export const SettingsPage: React.FC = () => {
     enable_registration: false,
     maintenance_mode: false,
     default_language: 'en',
-    date_format: { format: 'DD/MM/YYYY', locale: 'en-GB' }
+    date_format: { format: 'dd/MM/yyyy', locale: 'en-GB' }
   });
 
   // Security settings state
@@ -99,7 +99,11 @@ export const SettingsPage: React.FC = () => {
         enable_registration: settings.general_enable_registration || false,
         maintenance_mode: settings.general_maintenance_mode || false,
         default_language: settings.general_default_language || 'en',
-        date_format: settings.general_date_format || { format: 'DD/MM/YYYY', locale: 'en-GB' }
+        date_format: settings.general_date_format 
+          ? (typeof settings.general_date_format === 'string'
+              ? { format: settings.general_date_format, locale: settings.general_date_format.includes('MM/dd') ? 'en-US' : 'en-GB' }
+              : settings.general_date_format)
+          : { format: 'dd/MM/yyyy', locale: 'en-GB' }
       });
 
       // Extract security settings
@@ -130,7 +134,12 @@ export const SettingsPage: React.FC = () => {
       // Convert to the format expected by the API
       const settingsData: Record<string, any> = {};
       Object.entries(generalSettings).forEach(([key, value]) => {
-        settingsData[`general_${key}`] = value;
+        // Special handling for date_format - only send the format string
+        if (key === 'date_format' && typeof value === 'object' && value.format) {
+          settingsData[`general_${key}`] = value.format;
+        } else {
+          settingsData[`general_${key}`] = value;
+        }
       });
       return settingsService.updateSettings(settingsData);
     },
@@ -395,10 +404,10 @@ export const SettingsPage: React.FC = () => {
                   {t('settings.general.dateFormat')}
                 </label>
                 <select
-                  value={generalSettings.date_format?.format || 'DD/MM/YYYY'}
+                  value={generalSettings.date_format?.format || 'dd/MM/yyyy'}
                   onChange={(e) => {
                     const format = e.target.value;
-                    const locale = format === 'MM/DD/YYYY' ? 'en-US' : 'en-GB';
+                    const locale = format === 'MM/dd/yyyy' ? 'en-US' : 'en-GB';
                     setGeneralSettings(prev => ({ 
                       ...prev, 
                       date_format: { format, locale }
@@ -406,10 +415,10 @@ export const SettingsPage: React.FC = () => {
                   }}
                   className="w-full px-3 py-2 border border-neutral-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary-500 focus:border-primary-500"
                 >
-                  <option value="DD/MM/YYYY">DD/MM/YYYY (European)</option>
-                  <option value="MM/DD/YYYY">MM/DD/YYYY (US)</option>
-                  <option value="YYYY-MM-DD">YYYY-MM-DD (ISO)</option>
-                  <option value="DD.MM.YYYY">DD.MM.YYYY (German)</option>
+                  <option value="dd/MM/yyyy">DD/MM/YYYY (European)</option>
+                  <option value="MM/dd/yyyy">MM/DD/YYYY (US)</option>
+                  <option value="yyyy-MM-dd">YYYY-MM-DD (ISO)</option>
+                  <option value="dd.MM.yyyy">DD.MM.YYYY (German)</option>
                 </select>
                 <p className="text-xs text-neutral-500 mt-1">
                   {t('settings.general.dateFormatHelp')}

frontend/src/services/publicSettings.service.ts

@@ -15,7 +15,7 @@ export interface PublicSettings {
   theme_config: any;
   default_language: string;
   enable_analytics: boolean;
-  general_date_format: string;
+  general_date_format: string | { format: string; locale: string };
   enable_recaptcha: boolean;
   recaptcha_site_key: string | null;
   maintenance_mode: boolean;