Update app_enhanced.py

app_enhanced.py

@@ -1,4 +1,4 @@
-import spaces  # <--- CRITICAL: MUST BE THE FIRST IMPORT
+import spaces
 import os
 import time
 import threading
@@ -53,10 +53,9 @@ def generate_save_code(length=8):
 # 🧱 DATA CLASSES
 # ======================================================
 def bubble(dialog="", x=50, y=20, type='speech'):
-    # Determine CSS classes based on type
     classes = f"speech-bubble {type}"
     if type == 'speech':
-        classes += " tail-bottom" # Default tail position
+        classes += " tail-bottom"
     elif type == 'thought':
         classes += " pos-bl"
         
@@ -71,14 +70,6 @@ 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
 # ======================================================
@@ -97,14 +88,11 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     duration = total_frames / fps
     cap.release()
 
-    # Subtitles
     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")
             
@@ -141,19 +129,11 @@ 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:
-            # 🎯 SQUARE PADDING (0% Cut)
-            h, w = frame.shape[:2]
-            sq_dim = max(h, w)
-            square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-            x_off = (sq_dim - w) // 2
-            y_off = (sq_dim - h) // 2
-            square_img[y_off:y_off+h, x_off:x_off+w] = frame
-            square_img = cv2.resize(square_img, (1024, 1024))
-            
+            # 1280x720 (No Crop)
+            frame = cv2.resize(frame, (1280, 720))
             fname = f"frame_{count:04d}.png"
             p = os.path.join(frames_dir, fname)
-            cv2.imwrite(p, square_img)
-            
+            cv2.imwrite(p, frame)
             frame_metadata[fname] = {'dialogue': moment['text'], 'time': mid}
             frame_files_ordered.append(fname)
             count += 1
@@ -164,13 +144,10 @@ def generate_comic_gpu(video_path, user_dir, frames_dir, metadata_path, target_p
     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'
-        elif '?' in dialogue: b_type = 'speech'
         
-        # 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
@@ -189,22 +166,16 @@ 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((1024, 1024, 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 = [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
+            pg_panels = [{'image': f} for f in p_frames]
+            pages.append({'panels': pg_panels, 'bubbles': p_bubbles})
+
+    return pages
 
 @spaces.GPU
 def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
@@ -224,15 +195,8 @@ def regen_frame_gpu(video_path, frames_dir, metadata_path, fname, direction):
     cap.release()
 
     if ret:
-        h, w = frame.shape[:2]
-        sq_dim = max(h, w)
-        square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-        x_off = (sq_dim - w) // 2
-        y_off = (sq_dim - h) // 2
-        square_img[y_off:y_off+h, x_off:x_off+w] = frame
-        square_img = cv2.resize(square_img, (1024, 1024))
-        
-        cv2.imwrite(os.path.join(frames_dir, fname), square_img)
+        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)
@@ -249,15 +213,8 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, ts):
     cap.release()
 
     if ret:
-        h, w = frame.shape[:2]
-        sq_dim = max(h, w)
-        square_img = np.zeros((sq_dim, sq_dim, 3), dtype=np.uint8)
-        x_off = (sq_dim - w) // 2
-        y_off = (sq_dim - h) // 2
-        square_img[y_off:y_off+h, x_off:x_off+w] = frame
-        square_img = cv2.resize(square_img, (1024, 1024))
-        
-        cv2.imwrite(os.path.join(frames_dir, fname), square_img)
+        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)
             if fname in meta:
@@ -265,7 +222,7 @@ def get_frame_at_ts_gpu(video_path, frames_dir, metadata_path, fname, 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, "message": "Invalid timestamp"}
+    return {"success": False}
 
 class EnhancedComicGenerator:
     def __init__(self, sid):
@@ -300,41 +257,94 @@ class EnhancedComicGenerator:
             json.dump({'message': msg, 'progress': prog}, f)
 
 # ======================================================
-# 🌐 ROUTES & FRONTEND
+# 🌐 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>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; }
+<!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; }
+    
     #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; }
-    #editor-container { display: none; padding: 20px; width: 100%; box-sizing: border-box; padding-bottom: 150px; }
     
-    .comic-page { width: 800px; height: 800px; background: white; box-shadow: 0 5px 30px rgba(0,0,0,0.6); position: relative; overflow: hidden; border: 6px solid #000; }
-    .comic-grid { width: 100%; height: 100%; position: relative; background: #000; --y: 50%; --t1: 100%; --t2: 100%; --b1: 100%; --b2: 100%; --gap: 3px; }
+    /* 🎯 CENTER THE COMIC EDITOR */
+    #editor-container { 
+        display: none; 
+        padding: 20px; 
+        width: 100%; 
+        box-sizing: border-box; 
+        padding-bottom: 150px;
+        flex-direction: column;
+        align-items: center; /* Centers comic horizontally */
+    }
+    
+    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; }
+    .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; } }
+    
+    /* COMIC PAGE - 800x800 */
+    .comic-wrapper { 
+        margin: 0 auto; 
+        display: flex; 
+        flex-direction: column; 
+        align-items: center; /* Center pages */
+        gap: 40px; 
+        width: 100%;
+    }
+    
+    .comic-page { 
+        width: 800px; 
+        height: 800px; 
+        background: white; 
+        box-shadow: 0 5px 30px rgba(0,0,0,0.6); 
+        position: relative; overflow: hidden; 
+        border: 5px solid #ffffff; 
+        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;
+    }
+
     .panel { position: absolute; top: 0; left: 0; width: 100%; height: 100%; overflow: hidden; background: #1a1a1a; cursor: grab; }
     .panel img { width: 100%; height: 100%; object-fit: cover; transform-origin: center; transition: transform 0.05s ease-out; display: block; }
     .panel img.panning { cursor: grabbing; transition: none; }
     .panel.selected { outline: 4px solid #3498db; z-index: 5; }
 
+    /* Clip Paths */
     .panel:nth-child(1) { clip-path: polygon(0 0, calc(var(--t1) - var(--gap)) 0, calc(var(--t2) - var(--gap)) calc(var(--y) - var(--gap)), 0 calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(2) { clip-path: polygon(calc(var(--t1) + var(--gap)) 0, 100% 0, 100% calc(var(--y) - var(--gap)), calc(var(--t2) + var(--gap)) calc(var(--y) - var(--gap))); z-index: 1; }
     .panel:nth-child(3) { clip-path: polygon(0 calc(var(--y) + var(--gap)), calc(var(--b1) - var(--gap)) calc(var(--y) + var(--gap)), calc(var(--b2) - var(--gap)) 100%, 0 100%); z-index: 1; }
     .panel:nth-child(4) { clip-path: polygon(calc(var(--b1) + var(--gap)) calc(var(--y) + var(--gap)), 100% calc(var(--y) + var(--gap)), 100% 100%, calc(var(--b2) + var(--gap)) 100%); z-index: 1; }
 
     .handle { position: absolute; width: 26px; height: 26px; border: 3px solid white; border-radius: 50%; transform: translate(-50%, -50%); z-index: 101; cursor: ew-resize; box-shadow: 0 2px 5px rgba(0,0,0,0.8); }
-    .h-t1 { background: #3498db; left: var(--t1); top: 0%; margin-top: 15px; } .h-t2 { background: #3498db; left: var(--t2); top: 50%; margin-top: -15px; }
-    .h-b1 { background: #2ecc71; left: var(--b1); top: 50%; margin-top: 15px; } .h-b2 { background: #2ecc71; left: var(--b2); top: 100%; margin-top: -15px; }
+    .h-t1 { background: #3498db; left: var(--t1); top: 0%; margin-top: 15px; }
+    .h-t2 { background: #3498db; left: var(--t2); top: 50%; margin-top: -15px; }
+    .h-b1 { background: #2ecc71; left: var(--b1); top: 50%; margin-top: 15px; }
+    .h-b2 { background: #2ecc71; left: var(--b2); top: 100%; margin-top: -15px; }
     
-    /* === ADVANCED BUBBLE CSS (WITH ROTATION) === */
+    /* BUBBLES */
     .speech-bubble { 
         position: absolute; display: flex; justify-content: center; align-items: center; 
         min-width: 60px; min-height: 40px; box-sizing: border-box; 
         z-index: 10; cursor: move; font-weight: bold; text-align: center; 
         overflow: visible; line-height: 1.2; --tail-pos: 50%;
     }
-    .bubble-text { padding: 0.8em; width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; border-radius: inherit; pointer-events: none; }
+    .bubble-text { 
+        padding: 0.8em; word-wrap: break-word; white-space: pre-wrap; 
+        width: 100%; height: 100%; display: flex; align-items: center; justify-content: center; 
+        border-radius: inherit; pointer-events: none;
+    }
     .speech-bubble.selected { outline: 2px dashed #4CAF50; z-index: 100; }
     
-    /* Speech Bubble + Rotation Classes */
+    /* TYPES */
     .speech-bubble.speech {
         --b: 3em; --h: 1.8em; --t: 0.6; --p: var(--tail-pos, 50%); --r: 1.2em;
         background: var(--bubble-fill, #fff); color: var(--bubble-text, #000); padding: 0;
@@ -346,26 +356,18 @@ INDEX_HTML = '''
         -webkit-mask: radial-gradient(calc(var(--t)*100%) 105% at 100% 0,#0000 99%,#000 101%);
         mask: radial-gradient(calc(var(--t)*100%) 105% at 100% 0,#0000 99%,#000 101%);
     }
-    /* Tail Orientations */
     .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 { border-radius: min(var(--r), calc(var(--p) - (1 - var(--t)) * var(--b) / 2)) min(var(--r), calc(100% - var(--p) - (1 - var(--t)) * var(--b) / 2)) var(--r) var(--r) / var(--r); }
     .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 { border-radius: var(--r); }
     .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 { border-radius: var(--r); }
     .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; }
 
-    /* Thought & Others */
     .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.thought.pos-bl .thought-dot-1 { left: 20px; bottom: -20px; }
     
     .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; }
     
     .resize-handle { position: absolute; bottom:-5px; right:-5px; width:15px; height:15px; background:#3498db; border:1px solid white; cursor:se-resize; display:none; }
@@ -385,34 +387,24 @@ 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>⚡ Ultimate Square Comic</h1> 
+        <h1>⚡ Square HD 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>
         <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 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 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>
 </div>
 
 <div id="editor-container">
-    <div class="tip">👉 Drag Right-Side Dots to reveal 4 panels! | 📜 Scroll to Zoom/Pan</div>
+    <div class="tip">👉 Drag dots from RIGHT edge to LEFT to reveal 4 panels!</div>
     <div class="comic-wrapper" id="comic-container"></div>
     <input type="file" id="image-uploader" style="display: none;" accept="image/*">
     <div class="edit-controls">
@@ -421,28 +413,20 @@ INDEX_HTML = '''
         <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="'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>
+            <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 Side</button>
+                <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">
             </div>
         </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>🔍 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"> <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>
 </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>
-
 <script>
     function genUUID(){ return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g,c=>{var r=Math.random()*16|0,v=c=='x'?r:(r&0x3|0x8);return v.toString(16);}); }
     let sid = localStorage.getItem('comic_sid') || genUUID();
@@ -458,7 +442,14 @@ INDEX_HTML = '''
             const layout = { t1: grid.style.getPropertyValue('--t1')||'100%', t2: grid.style.getPropertyValue('--t2')||'100%', b1: grid.style.getPropertyValue('--b1')||'100%', b2: grid.style.getPropertyValue('--b2')||'100%' };
             const bubbles = [];
             grid.querySelectorAll('.speech-bubble').forEach(b => {
-                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, type: b.dataset.type, font: b.style.fontFamily, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos'), classes: b.className });
+                bubbles.push({
+                    text: b.querySelector('.bubble-text').textContent,
+                    left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height,
+                    type: b.dataset.type, font: b.style.fontFamily,
+                    colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') },
+                    tailPos: b.style.getPropertyValue('--tail-pos'),
+                    classes: b.className
+                });
             });
             const panels = [];
             grid.querySelectorAll('.panel').forEach(pan => {
@@ -475,6 +466,7 @@ INDEX_HTML = '''
     }
     
     function undo() { if(historyStack.length > 1) { historyStack.pop(); const prev = JSON.parse(historyStack[historyStack.length-1]); restoreFromState(prev); } }
+    
     function restoreFromState(stateData) {
         if(!stateData) return;
         const pages = document.querySelectorAll('.comic-page');
@@ -497,7 +489,7 @@ 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='block'; 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;
@@ -514,7 +506,7 @@ INDEX_HTML = '''
         try {
             const r = await fetch(`/status?sid=${sid}`); const d = await r.json();
             document.getElementById('status-text').innerText = d.message;
-            if(d.progress >= 100) { clearInterval(interval); document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='block'; loadNewComic(); }
+            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() {
@@ -548,12 +540,17 @@ INDEX_HTML = '''
         });
     }
     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');
         const type = data.type || 'speech';
-        let className = data.classes || `speech-bubble ${type} tail-bottom`;
-        if (type === 'thought' && !className.includes('pos-')) className += ' pos-bl';
+        
+        // 🎯 FIX: REGENERATE CLASSES BASED ON TYPE, DO NOT INHERIT BLINDLY
+        let className = `speech-bubble ${type}`;
+        if(type === 'speech') className += ' tail-bottom';
+        else if(type === 'thought') className += ' pos-bl';
         b.className = className;
+        
         b.dataset.type = type;
         b.style.left = data.left; b.style.top = data.top;
         if(data.width) b.style.width = data.width;
@@ -561,7 +558,9 @@ INDEX_HTML = '''
         if(data.font) b.style.fontFamily = data.font;
         if(data.colors) { b.style.setProperty('--bubble-fill', data.colors.fill); b.style.setProperty('--bubble-text', data.colors.text); }
         if(data.tailPos) b.style.setProperty('--tail-pos', data.tailPos);
+        
         if(type === 'thought') { for(let i=1; i<=2; i++){ const d = document.createElement('div'); d.className = `thought-dot thought-dot-${i}`; b.appendChild(d); } }
+        
         const textSpan = document.createElement('span'); textSpan.className = 'bubble-text'; textSpan.textContent = data.text || 'Text'; b.appendChild(textSpan);
         const resizer = document.createElement('div'); resizer.className = 'resize-handle'; 
         resizer.onmousedown = (e) => { e.stopPropagation(); dragType='resize'; activeObj={b:b, startW:b.offsetWidth, startH:b.offsetHeight, mx:e.clientX, my:e.clientY}; };
@@ -570,6 +569,7 @@ INDEX_HTML = '''
         b.ondblclick = (e) => { e.stopPropagation(); editBubbleText(b); };
         return b;
     }
+    
     function editBubbleText(bubble) {
         const textSpan = bubble.querySelector('.bubble-text'); 
         const newText = prompt("Edit Text:", textSpan.textContent);
@@ -598,21 +598,39 @@ INDEX_HTML = '''
         }
     });
     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"; }
-    function selectPanel(el) { if(selectedPanel) selectedPanel.classList.remove('selected'); selectedPanel = el; el.classList.add('selected'); document.getElementById('zoom-slider').disabled = false; document.getElementById('zoom-slider').value = el.querySelector('img').dataset.zoom; }
+    
+    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'); 
+        document.getElementById('zoom-slider').disabled = false;
+        document.getElementById('zoom-slider').value = el.querySelector('img').dataset.zoom;
+    }
     function addBubble() { const grid = document.querySelector('.comic-grid'); if(grid) { const b = createBubbleHTML({ text: "Text", left: "50%", top: "50%" }); grid.appendChild(b); selectBubble(b); saveState(); } }
     function deleteBubble() { if(selectedBubble) { selectedBubble.remove(); selectedBubble=null; saveState(); } }
+    
+    // 🎯 UPDATED BUBBLE TYPE LOGIC
     function updateBubbleType() {
         if(!selectedBubble) return;
         const type = document.getElementById('bubble-type').value;
         const oldB = selectedBubble;
+        
+        // Don't pass 'classes' key so createBubbleHTML generates fresh ones
         const data = {
             text: oldB.querySelector('.bubble-text').textContent,
             left: oldB.style.left, top: oldB.style.top, width: oldB.style.width, height: oldB.style.height,
             type: type, font: oldB.style.fontFamily,
             colors: { fill: oldB.style.getPropertyValue('--bubble-fill'), text: oldB.style.getPropertyValue('--bubble-text') },
-            tailPos: oldB.style.getPropertyValue('--tail-pos'),
-            classes: oldB.className 
+            tailPos: oldB.style.getPropertyValue('--tail-pos')
         };
         const newB = createBubbleHTML(data);
         oldB.parentElement.replaceChild(newB, oldB);
@@ -622,24 +640,15 @@ 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(); } }
     
-    // 🎯 NEW ROTATE TAIL FUNCTION
     function rotateTail() {
         if(!selectedBubble) return;
         const type = selectedBubble.dataset.type;
-        
         if(type === 'speech') {
             const positions = ['tail-bottom', 'tail-right', 'tail-top', 'tail-left'];
-            // Find current class match
-            let current = positions.find(pos => selectedBubble.classList.contains(pos)) || 'tail-bottom';
+            let current = positions.find(p => selectedBubble.classList.contains(p)) || 'tail-bottom';
             selectedBubble.classList.remove(current);
-            // Cycle
-            let nextIndex = (positions.indexOf(current) + 1) % 4;
-            selectedBubble.classList.add(positions[nextIndex]);
-        } 
-        else if (type === 'thought') {
-            // Logic for thought bubble (flipping dots) if needed, or simple rotation
-            // For now, let's allow thought bubbles to use the same tail classes if CSS supports it, 
-            // or just flip positions.
+            let next = positions[(positions.indexOf(current)+1)%4];
+            selectedBubble.classList.add(next);
         }
         saveState();
     }
@@ -670,18 +679,6 @@ INDEX_HTML = '''
         if(d.success) img.src = `/frames/${fname}?sid=${sid}&t=${Date.now()}`;
         img.style.opacity='1'; saveState();
     }
-    async function gotoTimestamp() {
-        if(!selectedPanel) return alert("Select a panel");
-        let v = document.getElementById('timestamp-input').value.trim();
-        if(!v) return;
-        if(v.includes(':')) { let p = v.split(':'); v = parseInt(p[0]) * 60 + parseFloat(p[1]); } else { v = parseFloat(v); }
-        const img = selectedPanel.querySelector('img'); let fname = img.src.split('/').pop().split('?')[0]; 
-        img.style.opacity = '0.5';
-        const r = await fetch(`/goto_timestamp?sid=${sid}`, { method:'POST', headers:{'Content-Type':'application/json'}, body:JSON.stringify({filename:fname, timestamp:v}) });
-        const d = await r.json();
-        if(d.success) img.src = `/frames/${fname}?sid=${sid}&t=${Date.now()}`;
-        img.style.opacity='1'; saveState();
-    }
     
     async function exportComic() {
         const pgs = document.querySelectorAll('.comic-page');
@@ -700,31 +697,10 @@ INDEX_HTML = '''
         const code = document.getElementById('load-code').value;
         const r = await fetch(`/load_comic/${code}`);
         const d = await r.json();
-        if(d.success) { sid=d.originalSid; localStorage.setItem('comic_sid', sid); restoreFromState(d.pages); document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='block'; }
+        if(d.success) { sid=d.originalSid; localStorage.setItem('comic_sid', sid); restoreFromState(d.pages); document.getElementById('upload-container').style.display='none'; document.getElementById('editor-container').style.display='flex'; }
         else alert(d.message);
     }
     function closeModal() { document.getElementById('save-modal').style.display='none'; }
-    
-    function getCurrentState() {
-        const state = [];
-        document.querySelectorAll('.comic-page').forEach(pg => {
-            const grid = pg.querySelector('.comic-grid');
-            const layout = { t1: grid.style.getPropertyValue('--t1')||'100%', t2: grid.style.getPropertyValue('--t2')||'100%', b1: grid.style.getPropertyValue('--b1')||'100%', b2: grid.style.getPropertyValue('--b2')||'100%' };
-            const bubbles = [];
-            grid.querySelectorAll('.speech-bubble').forEach(b => {
-                bubbles.push({ text: b.querySelector('.bubble-text').textContent, left: b.style.left, top: b.style.top, width: b.style.width, height: b.style.height, type: b.dataset.type, colors: { fill: b.style.getPropertyValue('--bubble-fill'), text: b.style.getPropertyValue('--bubble-text') }, tailPos: b.style.getPropertyValue('--tail-pos'), classes: b.className });
-            });
-            const panels = [];
-            grid.querySelectorAll('.panel').forEach(pan => {
-                const img = pan.querySelector('img');
-                const srcParts = img.src.split('frames/');
-                const fname = srcParts.length > 1 ? srcParts[1].split('?')[0] : '';
-                panels.push({ image: fname, zoom: img.dataset.zoom, tx: img.dataset.translateX, ty: img.dataset.translateY });
-            });
-            state.push({ layout, bubbles, panels });
-        });
-        return state;
-    }
 </script>
 </body> </html> '''
 
@@ -773,23 +749,6 @@ 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')