Update app_enhanced.py

app_enhanced.py

@@ -1,4 +1,4 @@
-import spaces
+import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
 import os
 import time
 import threading
@@ -70,6 +70,14 @@ def bubble(dialog="", x=50, y=20, type='speech'):
         'font': "'Comic Neue', cursive"
     }
 
+def panel(image=""):
+    return {'image': image}
+
+class Page:
+    def __init__(self, panels, bubbles):
+        self.panels = panels
+        self.bubbles = bubbles
+
 # ======================================================
 # 🧠 GPU GENERATION
 # ======================================================
@@ -82,23 +90,32 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     from backend.subtitles.subs_real import get_real_subtitles
     
     cap = cv2.VideoCapture(video_path)
-    if not cap.isOpened(): raise Exception("Cannot open video")
+    if not cap.isOpened(): 
+        raise Exception("Cannot open video")
+    
     fps = cap.get(cv2.CAP_PROP_FPS) or 25
     total_frames = int(cap.get(cv2.CAP_PROP_FRAME_COUNT))
     duration = total_frames / fps
     cap.release()
 
+    # Subtitles Logic (FIXED SYNTAX)
     user_srt = os.path.join(user_dir, 'subs.srt')
     try:
         get_real_subtitles(video_path)
-        if os.path.exists('test1.srt'): shutil.move('test1.srt', user_srt)
-        elif not os.path.exists(user_srt): with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
+        if os.path.exists('test1.srt'):
+            shutil.move('test1.srt', user_srt)
+        elif not os.path.exists(user_srt):
+            with open(user_srt, 'w') as f:
+                f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
     except:
-        with open(user_srt, 'w') as f: f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
+        with open(user_srt, 'w') as f:
+            f.write("1\n00:00:01,000 --> 00:00:04,000\n...\n")
             
     with open(user_srt, 'r', encoding='utf-8') as f:
-        try: all_subs = list(srt.parse(f.read()))
-        except: all_subs = []
+        try:
+            all_subs = list(srt.parse(f.read()))
+        except:
+            all_subs = []
 
     valid_subs = [s for s in all_subs if s.content.strip()]
     if valid_subs:
@@ -106,13 +123,15 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     else:
         raw_moments = []
 
+    # 4 Panels Per Page
     panels_per_page = 4
     total_panels_needed = int(target_pages) * panels_per_page
 
     selected_moments = []
     if not raw_moments:
         times = np.linspace(1, max(1, duration-1), total_panels_needed)
-        for t in times: selected_moments.append({'text': '', 'start': t, 'end': t+1})
+        for t in times:
+            selected_moments.append({'text': '', 'start': t, 'end': t+1})
     elif len(raw_moments) <= total_panels_needed:
         selected_moments = raw_moments
     else:
@@ -129,7 +148,7 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         cap.set(cv2.CAP_PROP_POS_MSEC, mid * 1000)
         ret, frame = cap.read()
         if ret:
-            # 1280x720 (No Crop)
+            # 🎯 EXTRACT FULL HD (1280x720) - NO CROP
             frame = cv2.resize(frame, (1280, 720))
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
@@ -139,15 +158,18 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
             count += 1
     cap.release()
     
-    with open(metadata_path, 'w') as f: json.dump(frame_metadata, f, indent=2)
+    with open(metadata_path, 'w') as f:
+        json.dump(frame_metadata, f, indent=2)
         
     bubbles_list = []
     for i, f in enumerate(frame_files_ordered):
         dialogue = frame_metadata.get(f, {}).get('dialogue', '')
+        
         b_type = 'speech'
         if '(' in dialogue: b_type = 'narration'
         elif '!' in dialogue: b_type = 'reaction'
         
+        # 1 Bubble Per Panel Placement
         pos_idx = i % 4
         if pos_idx == 0: bx, by = 150, 50
         elif pos_idx == 1: bx, by = 550, 50
@@ -166,23 +188,33 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
         
         while len(p_frames) < 4:
              fname = f"empty_{i}_{len(p_frames)}.png"
-             img = np.zeros((720, 1280, 3), dtype=np.uint8); img[:] = (30,30,30)
+             img = np.zeros((720, 1280, 3), dtype=np.uint8)
+             img[:] = (30,30,30)
              cv2.imwrite(os.path.join(frames_dir, fname), img)
              p_frames.append(fname)
              p_bubbles.append(bubble(dialog="", x=-999, y=-999, type='speech'))
 
         if p_frames:
-            pg_panels = [{'image': f} for f in p_frames]
-            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
-
-    return pages
+            pg_panels = [panel(image=f) for f in p_frames]
+            pages.append(Page(panels=pg_panels, bubbles=p_bubbles))
+
+    result = []
+    for pg in pages:
+        p_data = [p if isinstance(p, dict) else p.__dict__ for p in pg.panels]
+        b_data = [b if isinstance(b, dict) else b.__dict__ for b in pg.bubbles]
+        result.append({'panels': p_data, 'bubbles': b_data})
+        
+    return result
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     import cv2
     import json
-    if not os.path.exists(metadata_path): return {"success": False, "message": "No metadata"}
-    with open(metadata_path, 'r') as f: meta = json.load(f)
+    if not os.path.exists(metadata_path):
+        return {"success": False, "message": "No metadata"}
+    
+    with open(metadata_path, 'r') as f:
+        meta = json.load(f)
     
     t = meta[fname]['time'] if isinstance(meta[fname], dict) else meta[fname]
     cap = cv2.VideoCapture(video_path)
@@ -197,9 +229,12 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     if ret:
         frame = cv2.resize(frame, (1280, 720))
         cv2.imwrite(os.path.join(frames_dir, fname), frame)
-        if isinstance(meta[fname], dict): meta[fname]['time'] = new_t
-        else: meta[fname] = new_t
-        with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
+        if isinstance(meta[fname], dict):
+            meta[fname]['time'] = new_t
+        else:
+            meta[fname] = new_t
+        with open(metadata_path, 'w') as f:
+            json.dump(meta, f, indent=2)
         return {"success": True, "message": f"Time: {new_t:.2f}s"}
     return {"success": False}
 
@@ -216,14 +251,21 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
         frame = cv2.resize(frame, (1280, 720))
         cv2.imwrite(os.path.join(frames_dir, fname), frame)
         if os.path.exists(metadata_path):
-            with open(metadata_path, 'r') as f: meta = json.load(f)
+            with open(metadata_path, 'r') as f:
+                meta = json.load(f)
             if fname in meta:
-                if isinstance(meta[fname], dict): meta[fname]['time'] = float(ts)
-                else: meta[fname] = float(ts)
-                with open(metadata_path, 'w') as f: json.dump(meta, f, indent=2)
+                if isinstance(meta[fname], dict):
+                    meta[fname]['time'] = float(ts)
+                else:
+                    meta[fname] = float(ts)
+                with open(metadata_path, 'w') as f:
+                    json.dump(meta, f, indent=2)
         return {"success": True, "message": f"Jumped to {ts}s"}
     return {"success": False}
 
+# ======================================================
+# 💻 BACKEND CLASS
+# ======================================================
 class EnhancedComicGenerator:
     def __init__(self, sid):
         self.sid = sid
@@ -257,10 +299,10 @@ class EnhancedComicGenerator:
             json.dump({'message': msg, 'progress': prog}, f)
 
 # ======================================================
-# 🌐 FRONTEND
+# 🌐 ROUTES & FRONTEND
 # ======================================================
 INDEX_HTML = '''
-<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Fixed Comic Editor</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&family=Gloria+Hallelujah&family=Lato&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #2c3e50; font-family: 'Lato', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
+<!DOCTYPE html><html lang="en"> <head> <meta charset="UTF-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0"> <title>Square HD Comic</title> <script src="https://cdnjs.cloudflare.com/ajax/libs/html-to-image/1.11.11/html-to-image.min.js"></script> <link href="https://fonts.googleapis.com/css2?family=Bangers&family=Comic+Neue:wght@700&family=Gloria+Hallelujah&family=Lato&display=swap" rel="stylesheet"> <style> * { box-sizing: border-box; } body { background-color: #2c3e50; font-family: 'Lato', sans-serif; color: #eee; margin: 0; min-height: 100vh; }
     
     #upload-container { display: flex; flex-direction:column; justify-content: center; align-items: center; min-height: 100vh; width: 100%; padding: 20px; }
     .upload-box { max-width: 500px; width: 100%; padding: 40px; background: #34495e; border-radius: 12px; box-shadow: 0 10px 30px rgba(0,0,0,0.5); text-align: center; }
@@ -279,9 +321,12 @@ INDEX_HTML = '''
     h1 { color: #fff; margin-bottom: 20px; }
     .file-input { display: none; }
     .file-label { display: block; padding: 15px; background: #e67e22; color: white; border-radius: 8px; cursor: pointer; font-weight: bold; margin-bottom: 10px; transition:0.2s; }
+    .file-label:hover { background: #d35400; }
+    
     .page-input-group { margin: 20px 0; text-align: left; }
     .page-input-group label { font-weight: bold; font-size: 14px; display: block; margin-bottom: 5px; color: #ccc; }
     .page-input-group input { width: 100%; padding: 12px; border: 2px solid #555; background: #2c3e50; color: white; border-radius: 8px; font-size: 16px; box-sizing: border-box; }
+    
     .submit-btn { width: 100%; padding: 15px; background: #2980b9; color: white; border: none; border-radius: 8px; font-size: 18px; font-weight: bold; cursor: pointer; }
     .loader { width: 100px; height: 10px; background: #e67e22; margin: 20px auto; animation: load 1s infinite alternate; }
     @keyframes load { from { width: 20px; } to { width: 100px; } }
@@ -302,15 +347,13 @@ INDEX_HTML = '''
         background: white; 
         box-shadow: 0 5px 30px rgba(0,0,0,0.6); 
         position: relative; overflow: hidden; 
-        border: 5px solid #ffffff; 
+        border: 6px solid #000; 
         flex-shrink: 0;
     }
     
     .comic-grid {
-        width: 100%; height: 100%; position: relative; 
-        background: #ffffff;
-        --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; 
-        --gap: 5px;
+        width: 100%; height: 100%; position: relative; background: #000;
+        --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; --gap: 3px; 
     }
 
     .panel { position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a1a; cursor: grab; }
@@ -357,18 +400,30 @@ INDEX_HTML = '''
         mask: radial-gradient(calc(var(--t)*100%) 105% at 100% 0,#0000 99%,#000 101%);
     }
     .speech-bubble.speech.tail-bottom:before { top: 100%; left: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); }
-    .speech-bubble.speech.tail-top:before { bottom: 100%; left: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: scaleY(-1); }
-    .speech-bubble.speech.tail-left:before { right: 100%; top: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: rotate(90deg); transform-origin: top right; }
-    .speech-bubble.speech.tail-right:before { left: 100%; top: clamp(0%, calc(var(--p) - (1 - var(--t)) * var(--b) / 2), calc(100% - (1 - var(--t)) * var(--b))); transform: rotate(-90deg); transform-origin: top left; }
-
-    .speech-bubble.thought { background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); border: 2px dashed #555; border-radius: 50%; }
+    
+    /* Thought Bubble */
+    .speech-bubble.thought { 
+        background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); 
+        border: 2px dashed #555; border-radius: 50%; 
+    }
     .speech-bubble.thought::before { display:none; }
     .thought-dot { position: absolute; background-color: var(--bubble-fill, #fff); border: 2px solid #555; border-radius: 50%; z-index: -1; }
-    .thought-dot-1 { width: 15px; height: 15px; bottom:-15px; left:20px; } .thought-dot-2 { width: 10px; height: 10px; bottom:-25px; left:10px; }
-    
-    .speech-bubble.reaction { background: #FFD700; border: 3px solid #E53935; color: #D32F2F; font-family: 'Bangers'; text-transform: uppercase; clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); }
+    .thought-dot-1 { width: 15px; height: 15px; bottom:-15px; left:20px; } 
+    .thought-dot-2 { width: 10px; height: 10px; bottom:-25px; left:10px; }
+    
+    /* Reaction */
+    .speech-bubble.reaction { 
+        background: #FFD700; border: 3px solid #E53935; color: #D32F2F; 
+        font-family: 'Bangers'; text-transform: uppercase; 
+        clip-path: polygon(0% 25%, 17% 21%, 17% 0%, 31% 16%, 50% 4%, 69% 16%, 83% 0%, 83% 21%, 100% 25%, 85% 45%, 95% 62%, 82% 79%, 100% 97%, 79% 89%, 60% 98%, 46% 82%, 27% 95%, 15% 78%, 5% 62%, 15% 45%); 
+    }
     
-    .speech-bubble.narration { background: #eee; border: 2px solid #000; color: #000; border-radius: 0; font-family: 'Lato'; bottom: 10px; left: 50%; transform: translateX(-50%); width: 80% !important; height: auto !important; }
+    /* Narration */
+    .speech-bubble.narration { 
+        background: #eee; border: 2px solid #000; color: #000; 
+        border-radius: 0; font-family: 'Lato'; 
+        bottom: 10px; left: 50%; transform: translateX(-50%); width: 80% !important; height: auto !important; 
+    }
     
     .resize-handle { position: absolute; bottom:-5px; right:-5px; width:15px; height:15px; background:#3498db; border:1px solid white; cursor:se-resize; display:none; }
     .speech-bubble.selected .resize-handle { display:block; }
@@ -387,43 +442,103 @@ INDEX_HTML = '''
     .save-btn { background: #8e44ad; color: white; }
     
     .tip { text-align:center; padding:10px; background:#e74c3c; color:white; font-weight:bold; margin-bottom:20px; border-radius:5px; }
+    .modal-overlay { position: fixed; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,0.8); display: none; justify-content: center; align-items: center; z-index: 2000; }
+    .modal-content { background: white; padding: 30px; border-radius: 12px; width: 90%; max-width: 400px; text-align: center; color: #333; }
+    .code { font-size: 24px; font-weight: bold; letter-spacing: 3px; background: #eee; padding: 10px; margin: 15px 0; display: inline-block; font-family: monospace; }
 </style>
 </head> <body> 
 
 <div id="upload-container"> 
     <div class="upload-box"> 
-        <h1>⚡ Square HD Comic</h1> 
+        <h1>⚡ Ultimate Square Comic</h1> 
         <input type="file" id="file-upload" class="file-input" onchange="document.getElementById('fn').innerText=this.files[0].name"> 
         <label for="file-upload" class="file-label">📁 Choose Video</label> 
         <span id="fn" style="margin-bottom:10px; display:block; color:#aaa;">No file selected</span>
-        <div class="page-input-group"> <label>📚 Total Pages:</label> <input type="number" id="page-count" value="4" min="1" max="15"> </div>
+        
+        <div class="page-input-group">
+            <label>📚 Total Pages:</label>
+            <input type="number" id="page-count" value="4" min="1" max="15">
+        </div>
+        
         <button class="submit-btn" onclick="upload()">🚀 Generate</button>
         <button id="restore-draft-btn" class="reset-btn" style="display:none; margin-top:10px;" onclick="restoreDraft()">📂 Restore Draft</button>
-        <div class="loading-view" id="loading-view" style="display:none; margin-top:20px;"> <div class="loader"></div> <p id="status-text" style="margin-top:10px;">Processing...</p> </div>
+        
+        <div style="margin-top:20px; border-top:1px solid #555; padding-top:10px;">
+            <input type="text" id="load-code" placeholder="ENTER SAVE CODE" style="width:70%; display:inline-block;">
+            <button onclick="loadComic()" style="width:25%; display:inline-block; background:#9b59b6; color:white;">Load</button>
+        </div>
+        <div class="loading-view" id="loading-view" style="display:none; margin-top:20px;">
+            <div class="loader"></div>
+            <p id="status-text" style="margin-top:10px;">Analyzing Video...</p>
+        </div>
     </div>
 </div>
 
 <div id="editor-container">
-    <div class="tip">👉 Drag dots from RIGHT edge to LEFT to reveal 4 panels!</div>
+    <div class="tip">👉 Drag Right-Side Dots to reveal 4 panels! | 📜 Scroll to Zoom/Pan</div>
     <div class="comic-wrapper" id="comic-container"></div>
     <input type="file" id="image-uploader" style="display: none;" accept="image/*">
+    
     <div class="edit-controls">
         <h4>✏️ Editor</h4>
-        <div class="control-group"> <button onclick="undo()" style="background:#7f8c8d; color:white;">↩️ Undo</button> <button onclick="saveComic()" class="save-btn">💾 Save Comic</button> </div>
+        
+        <div class="control-group">
+            <button onclick="undo()" style="background:#7f8c8d; color:white;">↩️ Undo</button>
+            <button onclick="saveComic()" class="save-btn">💾 Save Comic</button>
+        </div>
+
         <div class="control-group">
             <label>💬 Bubble Styling:</label>
-            <select id="bubble-type" onchange="updateBubbleType()"> <option value="speech">Speech 💬</option> <option value="thought">Thought 💭</option> <option value="reaction">Reaction 💥</option> <option value="narration">Narration ⬜</option> </select>
-            <select id="font-select" onchange="updateFont()"> <option value="'Comic Neue', cursive">Comic Neue</option> <option value="'Bangers', cursive">Bangers</option> <option value="'Lato', sans-serif">Modern</option> </select>
-            <div class="color-grid"> <input type="color" id="bub-fill" value="#ffffff" onchange="updateColors()"> <input type="color" id="bub-text" value="#000000" onchange="updateColors()"> </div>
-            <div class="button-grid"> <button onclick="addBubble()" class="action-btn">Add</button> <button onclick="deleteBubble()" class="reset-btn">Delete</button> </div>
-            <div id="tail-controls">
-                <button onclick="rotateTail()" class="secondary-btn" style="margin-top:5px;">🔄 Rotate Tail</button>
-                <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
+            <select id="bubble-type" onchange="updateBubbleType()">
+                <option value="speech">Speech 💬</option>
+                <option value="thought">Thought 💭</option>
+                <option value="reaction">Reaction 💥</option>
+                <option value="narration">Narration ⬜</option>
+            </select>
+            <select id="font-select" onchange="updateFont()">
+                <option value="'Comic Neue', cursive">Comic Neue</option>
+                <option value="'Bangers', cursive">Bangers</option>
+                <option value="'Gloria Hallelujah', cursive">Handwritten</option>
+                <option value="'Lato', sans-serif">Modern</option>
+            </select>
+            <div class="color-grid">
+                <input type="color" id="bub-fill" value="#ffffff" onchange="updateColors()" title="Fill">
+                <input type="color" id="bub-text" value="#000000" onchange="updateColors()" title="Text">
+            </div>
+            <div class="button-grid">
+                <button onclick="addBubble()" class="action-btn">Add</button>
+                <button onclick="deleteBubble()" class="reset-btn">Delete</button>
+            </div>
+            <input type="range" min="10" max="90" value="50" oninput="slideTail(this.value)" title="Tail Pos">
+        </div>
+
+        <div class="control-group">
+            <label>🖼️ Image Control:</label>
+            <button onclick="replaceImage()" class="action-btn">Replace Image</button>
+            <div class="button-grid">
+                <button onclick="adjustFrame('backward')" class="secondary-btn">⬅️ Frame</button>
+                <button onclick="adjustFrame('forward')" class="action-btn">Frame ➡️</button>
             </div>
         </div>
-        <div class="control-group"> <label>🖼️ Image:</label> <div class="button-grid"> <button onclick="adjustFrame('backward')" class="secondary-btn">⬅️ Frame</button> <button onclick="adjustFrame('forward')" class="action-btn">Frame ➡️</button> </div> </div>
-        <div class="control-group"> <label>🔍 Zoom (Scroll):</label> <input type="range" id="zoom-slider" min="20" max="300" value="100" step="5" oninput="handleZoom(this.value)" disabled> <button onclick="resetPanelTransform()" class="secondary-btn">Reset</button> </div>
-        <div class="control-group"> <button onclick="exportComic()" class="action-btn" style="background:#3498db;">📥 Export PNG</button> <button onclick="location.reload()" class="reset-btn" style="margin-top:10px;">🏠 Home</button> </div>
+        
+        <div class="control-group">
+            <label>🔍 Zoom (Scroll Wheel):</label>
+            <input type="range" id="zoom-slider" min="20" max="300" value="100" step="5" oninput="handleZoom(this.value)" disabled>
+            <button onclick="resetPanelTransform()" class="secondary-btn">Reset View</button>
+        </div>
+        
+        <div class="control-group">
+            <button onclick="exportComic()" class="action-btn" style="background:#3498db;">📥 Export PNG</button>
+            <button onclick="location.reload()" class="reset-btn" style="margin-top:10px;">🏠 Home</button>
+        </div>
+    </div>
+</div>
+
+<div class="modal-overlay" id="save-modal">
+    <div class="modal-content">
+        <h2>✅ Comic Saved!</h2>
+        <div class="code" id="modal-code">XXXX</div>
+        <button onclick="closeModal()">Close</button>
     </div>
 </div>
 
@@ -465,7 +580,13 @@ INDEX_HTML = '''
         localStorage.setItem('comic_draft_'+sid, JSON.stringify(state));
     }
     
-    function undo() { if(historyStack.length > 1) { historyStack.pop(); const prev = JSON.parse(historyStack[historyStack.length-1]); restoreFromState(prev); } }
+    function undo() {
+        if(historyStack.length > 1) {
+            historyStack.pop(); 
+            const prev = JSON.parse(historyStack[historyStack.length-1]);
+            restoreFromState(prev);
+        }
+    }
     
     function restoreFromState(stateData) {
         if(!stateData) return;
@@ -473,7 +594,10 @@ INDEX_HTML = '''
         stateData.forEach((pgData, i) => {
             if(i >= pages.length) return;
             const grid = pages[i].querySelector('.comic-grid');
-            if(pgData.layout) { grid.style.setProperty('--t1', pgData.layout.t1); grid.style.setProperty('--t2', pgData.layout.t2); grid.style.setProperty('--b1', pgData.layout.b1); grid.style.setProperty('--b2', pgData.layout.b2); }
+            if(pgData.layout) {
+                grid.style.setProperty('--t1', pgData.layout.t1); grid.style.setProperty('--t2', pgData.layout.t2);
+                grid.style.setProperty('--b1', pgData.layout.b1); grid.style.setProperty('--b2', pgData.layout.b2);
+            }
             grid.querySelectorAll('.speech-bubble').forEach(b=>b.remove());
             pgData.bubbles.forEach(bData => { const b = createBubbleHTML(bData); grid.appendChild(b); });
             const panels = grid.querySelectorAll('.panel');
@@ -489,7 +613,14 @@ INDEX_HTML = '''
     }
     
     if(localStorage.getItem('comic_draft_'+sid)) document.getElementById('restore-draft-btn').style.display='inline-block';
-    function restoreDraft() { document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='flex'; loadNewComic().then(() => { setTimeout(() => restoreFromState(JSON.parse(localStorage.getItem('comic_draft_'+sid))), 500); }); }
+    function restoreDraft() {
+        document.getElementById('upload-container').style.display='none';
+        document.getElementById('editor-container').style.display='flex';
+        loadNewComic().then(() => {
+            setTimeout(() => restoreFromState(JSON.parse(localStorage.getItem('comic_draft_'+sid))), 500);
+        });
+    }
+
     async function upload() {
         const f = document.getElementById('file-upload').files[0];
         const pCount = document.getElementById('page-count').value;
@@ -502,6 +633,7 @@ INDEX_HTML = '''
         if(r.ok) interval = setInterval(checkStatus, 1500); 
         else { const d = await r.json(); alert("Upload failed: " + d.message); location.reload(); }
     }
+    
     async function checkStatus() {
         try {
             const r = await fetch(`/status?sid=${sid}`); const d = await r.json();
@@ -509,15 +641,21 @@ INDEX_HTML = '''
             if(d.progress >= 100) { clearInterval(interval); document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='flex'; loadNewComic(); }
         } catch(e) {}
     }
+    
     async function loadNewComic() {
         const r = await fetch(`/output/pages.json?sid=${sid}`);
         const data = await r.json();
         const cleanData = data.map(p => ({
             panels: p.panels.map(pan => ({ src: `/frames/${pan.image}?sid=${sid}` })),
-            bubbles: p.bubbles.map(b => ({ text: b.dialog, left: (b.bubble_offset_x||50)+'px', top: (b.bubble_offset_y||20)+'px', type: b.type, colors: b.colors, font: b.font, classes: b.classes, tailPos: b.tail_pos }))
+            bubbles: p.bubbles.map(b => ({
+                text: b.dialog, left: (b.bubble_offset_x||50)+'px', top: (b.bubble_offset_y||20)+'px', type: b.type,
+                colors: b.colors, font: b.font, classes: b.classes, tailPos: b.tail_pos
+            }))
         }));
-        renderFromState(cleanData); saveState();
+        renderFromState(cleanData);
+        saveState();
     }
+
     function renderFromState(pagesData) {
         const con = document.getElementById('comic-container'); con.innerHTML = '';
         pagesData.forEach((page, pageIdx) => {
@@ -525,6 +663,7 @@ INDEX_HTML = '''
             pageWrapper.innerHTML = `<h2 class="page-title">Page ${pageIdx + 1}</h2>`;
             const div = document.createElement('div'); div.className = 'comic-page';
             const grid = document.createElement('div'); grid.className = 'comic-grid';
+            
             page.panels.forEach((pan, idx) => {
                 const pDiv = document.createElement('div'); pDiv.className = 'panel';
                 const img = document.createElement('img');
@@ -534,12 +673,28 @@ INDEX_HTML = '''
                 img.onwheel = (e) => { e.preventDefault(); let zoom = parseFloat(img.dataset.zoom); zoom += e.deltaY * -0.1; zoom = Math.min(Math.max(20, zoom), 300); img.dataset.zoom = zoom; updateImageTransform(img); if(selectedPanel === pDiv) document.getElementById('zoom-slider').value = zoom; saveState(); };
                 pDiv.appendChild(img); grid.appendChild(pDiv);
             });
+            
             grid.append(createHandle('h-t1', grid, 't1'), createHandle('h-t2', grid, 't2'), createHandle('h-b1', grid, 'b1'), createHandle('h-b2', grid, 'b2'));
-            if(page.bubbles) { page.bubbles.forEach((bData, bIdx) => { if(bData.text) { const b = createBubbleHTML(bData); grid.appendChild(b); } }); }
+            
+            if(page.bubbles) {
+                page.bubbles.forEach((bData, bIdx) => {
+                    // Only append valid bubbles, ignore dummies
+                    if(bData.text) {
+                        const b = createBubbleHTML(bData); 
+                        grid.appendChild(b);
+                    }
+                });
+            }
+            
             div.appendChild(grid); pageWrapper.appendChild(div); con.appendChild(pageWrapper);
         });
     }
-    function createHandle(cls, grid, varName) { let h = document.createElement('div'); h.className = `handle ${cls}`; h.onmousedown = (e) => { e.stopPropagation(); dragType = 'handle'; activeObj = { grid: grid, var: varName }; }; return h; }
+    
+    function createHandle(cls, grid, varName) {
+        let h = document.createElement('div'); h.className = `handle ${cls}`;
+        h.onmousedown = (e) => { e.stopPropagation(); dragType = 'handle'; activeObj = { grid: grid, var: varName }; };
+        return h;
+    }
     
     function createBubbleHTML(data) {
         const b = document.createElement('div');
@@ -575,6 +730,7 @@ INDEX_HTML = '''
         const newText = prompt("Edit Text:", textSpan.textContent);
         if(newText !== null) { textSpan.textContent = newText; saveState(); }
     }
+    
     document.addEventListener('mousemove', (e) => {
         if(!dragType) return;
         if(dragType === 'handle') {
@@ -597,18 +753,19 @@ INDEX_HTML = '''
             activeObj.b.style.height = (activeObj.startH + dy) + 'px';
         }
     });
-    document.addEventListener('mouseup', () => { if(activeObj && activeObj.classList) activeObj.classList.remove('panning'); if(dragType) saveState(); dragType = null; activeObj = null; });
+    
+    document.addEventListener('mouseup', () => { 
+        if(activeObj && activeObj.classList) activeObj.classList.remove('panning');
+        if(dragType) saveState();
+        dragType = null; activeObj = null; 
+    });
     
     function selectBubble(el) { 
         if(selectedBubble) selectedBubble.classList.remove('selected'); 
         selectedBubble = el; el.classList.add('selected'); 
         document.getElementById('bubble-type').value = el.dataset.type;
         document.getElementById('font-select').value = el.style.fontFamily || "'Comic Neue', cursive";
-        
-        // Show/Hide Tail Controls
-        document.getElementById('tail-controls').style.display = (el.dataset.type === 'speech' || el.dataset.type === 'thought') ? 'block' : 'none';
     }
-    
     function selectPanel(el) { 
         if(selectedPanel) selectedPanel.classList.remove('selected'); 
         selectedPanel = el; el.classList.add('selected'); 
@@ -640,19 +797,6 @@ INDEX_HTML = '''
     function updateFont() { if(selectedBubble) { selectedBubble.style.fontFamily = document.getElementById('font-select').value; saveState(); } }
     function slideTail(val) { if(selectedBubble) { selectedBubble.style.setProperty('--tail-pos', val+'%'); saveState(); } }
     
-    function rotateTail() {
-        if(!selectedBubble) return;
-        const type = selectedBubble.dataset.type;
-        if(type === 'speech') {
-            const positions = ['tail-bottom', 'tail-right', 'tail-top', 'tail-left'];
-            let current = positions.find(p => selectedBubble.classList.contains(p)) || 'tail-bottom';
-            selectedBubble.classList.remove(current);
-            let next = positions[(positions.indexOf(current)+1)%4];
-            selectedBubble.classList.add(next);
-        }
-        saveState();
-    }
-
     function handleZoom(val) { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom = val; updateImageTransform(img); saveState(); } }
     function updateImageTransform(img) { const z = (img.dataset.zoom||100)/100, x = img.dataset.translateX||0, y = img.dataset.translateY||0; img.style.transform = `translateX(${x}px) translateY(${y}px) scale(${z})`; }
     function resetPanelTransform() { if(selectedPanel) { const img = selectedPanel.querySelector('img'); img.dataset.zoom=100; img.dataset.translateX=0; img.dataset.translateY=0; updateImageTransform(img); document.getElementById('zoom-slider').value=100; saveState(); } }
@@ -749,6 +893,23 @@ def regen():
     gen = EnhancedComicGenerator(sid)
     return jsonify(regen_frame_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], d['direction']))
 
+@app.route('/goto_timestamp', methods=['POST'])
+def go_time():
+    sid = request.args.get('sid')
+    d = request.get_json()
+    gen = EnhancedComicGenerator(sid)
+    return jsonify(get_frame_at_ts_gpu(gen.video_path, gen.frames_dir, gen.metadata_path, d['filename'], float(d['timestamp'])))
+
+@app.route('/replace_panel', methods=['POST'])
+def rep_panel():
+    sid = request.args.get('sid')
+    f = request.files['image']
+    frames_dir = os.path.join(BASE_USER_DIR, sid, 'frames')
+    os.makedirs(frames_dir, exist_ok=True)
+    fname = f"replaced_{int(time.time() * 1000)}.png"
+    f.save(os.path.join(frames_dir, fname))
+    return jsonify({'success': True, 'new_filename': fname})
+
 @app.route('/save_comic', methods=['POST'])
 def save_comic():
     sid = request.args.get('sid')