From fd2cf591b797be792f2b79d3bdd41c52cf04149a Mon Sep 17 00:00:00 2001
From: priyankarpal <88102392+priyankarpal@users.noreply.github.com>
Date: Wed, 25 Jun 2025 12:01:30 +0530
Subject: [PATCH 01/10] fix: text visible

---
 apps/web/src/components/editor/timeline.tsx | 121 ++++++++++----------
 1 file changed, 58 insertions(+), 63 deletions(-)

diff --git a/apps/web/src/components/editor/timeline.tsx b/apps/web/src/components/editor/timeline.tsx
index ce0ffa3..3242f40 100644
--- a/apps/web/src/components/editor/timeline.tsx
+++ b/apps/web/src/components/editor/timeline.tsx
@@ -1,33 +1,27 @@
 "use client";
 
-import { ScrollArea } from "../ui/scroll-area";
-import { Button } from "../ui/button";
-import {
-  Scissors,
-  ArrowLeftToLine,
-  ArrowRightToLine,
-  Trash2,
-  Snowflake,
-  Copy,
-  SplitSquareHorizontal,
-  MoreVertical,
-  Volume2,
-  VolumeX,
-  Pause,
-  Play,
-} from "lucide-react";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipTrigger,
-  TooltipProvider,
-} from "../ui/tooltip";
-import { useTimelineStore, type TimelineTrack } from "@/stores/timeline-store";
+import { processMediaFiles } from "@/lib/media-processing";
 import { useMediaStore } from "@/stores/media-store";
 import { usePlaybackStore } from "@/stores/playback-store";
-import { processMediaFiles } from "@/lib/media-processing";
+import { useTimelineStore, type TimelineTrack } from "@/stores/timeline-store";
+import {
+  ArrowLeftToLine,
+  ArrowRightToLine,
+  Copy,
+  MoreVertical,
+  Pause,
+  Play,
+  Scissors,
+  Snowflake,
+  SplitSquareHorizontal,
+  Trash2,
+  Volume2,
+  VolumeX,
+} from "lucide-react";
+import { useCallback, useEffect, useRef, useState } from "react";
 import { toast } from "sonner";
-import { useState, useRef, useEffect, useCallback } from "react";
+import { Button } from "../ui/button";
+import { ScrollArea } from "../ui/scroll-area";
 import {
   Select,
   SelectContent,
@@ -35,6 +29,12 @@ import {
   SelectTrigger,
   SelectValue,
 } from "../ui/select";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "../ui/tooltip";
 
 export function Timeline() {
   // Timeline shows all tracks (video, audio, effects) and their clips.
@@ -213,7 +213,7 @@ export function Timeline() {
     const bx2 = clamp(x2, 0, rect.width);
     const by1 = clamp(y1, 0, rect.height);
     const by2 = clamp(y2, 0, rect.height);
-    let newSelection: { trackId: string; clipId: string }[] = [];
+    let newSelection: { trackId: string; clipId: string; }[] = [];
     tracks.forEach((track, trackIdx) => {
       track.clips.forEach((clip) => {
         const effectiveDuration = clip.duration - clip.trimStart - clip.trimEnd;
@@ -604,8 +604,8 @@ export function Timeline() {
           {/* Time Display */}
           <div className="text-xs text-muted-foreground font-mono px-2"
             style={{ minWidth: '18ch', textAlign: 'center' }}
-            >
-              {currentTime.toFixed(1)}s / {duration.toFixed(1)}s
+          >
+            {currentTime.toFixed(1)}s / {duration.toFixed(1)}s
           </div>
 
           {/* Test Clip Button - for debugging */}
@@ -786,19 +786,17 @@ export function Timeline() {
                     return (
                       <div
                         key={i}
-                        className={`absolute top-0 bottom-0 ${
-                          isMainMarker
-                            ? "border-l border-muted-foreground/40"
-                            : "border-l border-muted-foreground/20"
-                        }`}
+                        className={`absolute top-0 bottom-0 ${isMainMarker
+                          ? "border-l border-muted-foreground/40"
+                          : "border-l border-muted-foreground/20"
+                          }`}
                         style={{ left: `${time * 50 * zoomLevel}px` }}
                       >
                         <span
-                          className={`absolute top-1 left-1 text-xs ${
-                            isMainMarker
-                              ? "text-muted-foreground font-medium"
-                              : "text-muted-foreground/70"
-                          }`}
+                          className={`absolute top-1 left-1 text-xs ${isMainMarker
+                            ? "text-muted-foreground font-medium"
+                            : "text-muted-foreground/70"
+                            }`}
                         >
                           {(() => {
                             const formatTime = (seconds: number) => {
@@ -859,13 +857,12 @@ export function Timeline() {
                   >
                     <div className="flex items-center flex-1 min-w-0">
                       <div
-                        className={`w-3 h-3 rounded-full flex-shrink-0 ${
-                          track.type === "video"
-                            ? "bg-blue-500"
-                            : track.type === "audio"
-                              ? "bg-green-500"
-                              : "bg-purple-500"
-                        }`}
+                        className={`w-3 h-3 rounded-full flex-shrink-0 ${track.type === "video"
+                          ? "bg-blue-500"
+                          : track.type === "audio"
+                            ? "bg-green-500"
+                            : "bg-purple-500"
+                          }`}
                       />
                       <span className="ml-2 text-sm font-medium truncate">
                         {track.name}
@@ -1194,7 +1191,7 @@ function TimelineTrackContent({
     });
   };
 
-  const updateTrimFromMouseMove = (e: { clientX: number }) => {
+  const updateTrimFromMouseMove = (e: { clientX: number; }) => {
     if (!resizing) return;
 
     const clip = track.clips.find((c) => c.id === resizing.clipId);
@@ -1284,7 +1281,7 @@ function TimelineTrackContent({
             return;
           }
         }
-      } catch (error) {}
+      } catch (error) { }
     }
 
     // Calculate drop position for overlap checking
@@ -1662,13 +1659,12 @@ function TimelineTrackContent({
 
   return (
     <div
-      className={`w-full h-full transition-all duration-150 ease-out ${
-        isDraggedOver
-          ? wouldOverlap
-            ? "bg-red-500/15 border-2 border-dashed border-red-400 shadow-lg"
-            : "bg-blue-500/15 border-2 border-dashed border-blue-400 shadow-lg"
-          : "hover:bg-muted/20"
-      }`}
+      className={`w-full h-full transition-all duration-150 ease-out ${isDraggedOver
+        ? wouldOverlap
+          ? "bg-red-500/15 border-2 border-dashed border-red-400 shadow-lg"
+          : "bg-blue-500/15 border-2 border-dashed border-blue-400 shadow-lg"
+        : "hover:bg-muted/20"
+        }`}
       onContextMenu={(e) => {
         e.preventDefault();
         // Only show track menu if we didn't click on a clip
@@ -1692,13 +1688,12 @@ function TimelineTrackContent({
       <div className="h-full relative track-clips-container min-w-full">
         {track.clips.length === 0 ? (
           <div
-            className={`h-full w-full rounded-sm border-2 border-dashed flex items-center justify-center text-xs text-muted-foreground transition-colors ${
-              isDropping
-                ? wouldOverlap
-                  ? "border-red-500 bg-red-500/10 text-red-600"
-                  : "border-blue-500 bg-blue-500/10 text-blue-600"
-                : "border-muted/30"
-            }`}
+            className={`h-full w-full rounded-sm border-2 border-dashed flex items-center justify-center text-xs text-muted-foreground transition-colors ${isDropping
+              ? wouldOverlap
+                ? "border-red-500 bg-red-500/10 text-red-600"
+                : "border-blue-500 bg-blue-500/10 text-blue-600"
+              : "border-muted/30"
+              }`}
           >
             {isDropping
               ? wouldOverlap
@@ -1722,7 +1717,7 @@ function TimelineTrackContent({
               return (
                 <div
                   key={clip.id}
-                  className={`timeline-clip absolute h-full border transition-all duration-200 ${getTrackColor(track.type)} flex items-center py-3 min-w-[80px] overflow-hidden group hover:shadow-lg ${isSelected ? "ring-2 ring-blue-500 z-10" : ""}`}
+                  className={`timeline-clip absolute h-full border transition-all-200 ${getTrackColor(track.type)} flex items-center py-3 min-w-[80px] overflow-hidden group hover:shadow-lg ${isSelected ? "ring-2 ring-blue-500 z-10" : ""}`}
                   style={{ width: `${clipWidth}px`, left: `${clipLeft}px` }}
                   onClick={(e) => {
                     e.stopPropagation();
@@ -1785,7 +1780,7 @@ function TimelineTrackContent({
                         <MoreVertical className="h-4 w-4" />
                       </Button>
                       {clipMenuOpen === clip.id && (
-                        <div className="absolute right-0 mt-2 w-32 bg-white border rounded shadow z-50">
+                        <div className="absolute right-0 mt-2 w-32 bg-white text-black border rounded shadow z-50">
                           <button
                             className="flex items-center w-full px-3 py-2 text-sm hover:bg-muted/30"
                             onClick={() => {

From 992b0cbf23a14d5d1b1a51911cbf330a92acc678 Mon Sep 17 00:00:00 2001
From: Priyankar Pal <88102392+priyankarpal@users.noreply.github.com>
Date: Wed, 25 Jun 2025 12:16:47 +0530
Subject: [PATCH 02/10] Update apps/web/src/components/editor/timeline.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 apps/web/src/components/editor/timeline.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/web/src/components/editor/timeline.tsx b/apps/web/src/components/editor/timeline.tsx
index 3242f40..7d3c85f 100644
--- a/apps/web/src/components/editor/timeline.tsx
+++ b/apps/web/src/components/editor/timeline.tsx
@@ -1281,7 +1281,9 @@ function TimelineTrackContent({
             return;
           }
         }
-      } catch (error) { }
+      } catch (error) {
+        console.error("Error parsing dropped media item:", error);
+      }
     }
 
     // Calculate drop position for overlap checking

From c0684ca62d16636f2d6ff8725c3c87c2581c6a20 Mon Sep 17 00:00:00 2001
From: Harshit Shukla <120409631+Harshitshukla0208@users.noreply.github.com>
Date: Thu, 26 Jun 2025 01:20:53 +0530
Subject: [PATCH 03/10] fix(issue): Address issue #109 - [FEATURE]  Refactor
 Component Logic by Using Custom Hooks for Cleaner Code

---
 apps/web/src/components/auth-form.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/auth-form.tsx b/apps/web/src/components/auth-form.tsx
index e0f8af2..7508eb3 100644
--- a/apps/web/src/components/auth-form.tsx
+++ b/apps/web/src/components/auth-form.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter } from "next/navigation";
-import { signUp, signIn } from "@opencut/auth/client";
+import { useAuth } from '@/hooks/useAuth';
 import { Button } from "@/components/ui/button";
 import {
   Card,

From 389a546478e3e53544c4ecc83dc28d9d551a1a5a Mon Sep 17 00:00:00 2001
From: Harshit Shukla <120409631+Harshitshukla0208@users.noreply.github.com>
Date: Thu, 26 Jun 2025 01:22:40 +0530
Subject: [PATCH 04/10] fix(issue): Address issue #87 - [BUG] split and delete
 background not visible

---
 apps/web/src/components/editor/media-panel.tsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/web/src/components/editor/media-panel.tsx b/apps/web/src/components/editor/media-panel.tsx
index 95cfa0a..007fdcd 100644
--- a/apps/web/src/components/editor/media-panel.tsx
+++ b/apps/web/src/components/editor/media-panel.tsx
@@ -14,6 +14,12 @@ import { toast } from "sonner";
 // You can upload files or drag them from your computer. Dragging from here to the timeline adds them to your video project.
 
 export function MediaPanel() {
+  return (
+    <div style={{ backgroundColor: 'transparent' }}>
+      {/* Existing content */}
+    </div>
+  );
+}
   const { mediaItems, addMediaItem, removeMediaItem } = useMediaStore();
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [isProcessing, setIsProcessing] = useState(false);

From ebb3456c1040da3457b5d939ee3d62d0770763b2 Mon Sep 17 00:00:00 2001
From: ANAGO Ronnel <ronnel.anago@external.grtgaz.com>
Date: Thu, 26 Jun 2025 02:51:17 +0200
Subject: [PATCH 05/10] refactor: update imports in waitlist API and library to
 ensure consistent usage of drizzle-orm functions

---
 apps/web/src/app/api/waitlist/route.ts | 3 +--
 apps/web/src/lib/waitlist.ts           | 3 +--
 packages/db/src/index.ts               | 5 ++++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/app/api/waitlist/route.ts b/apps/web/src/app/api/waitlist/route.ts
index 0632616..f6f8110 100644
--- a/apps/web/src/app/api/waitlist/route.ts
+++ b/apps/web/src/app/api/waitlist/route.ts
@@ -1,7 +1,6 @@
 import { NextRequest, NextResponse } from "next/server";
-import { db } from "@opencut/db";
+import { db, eq } from "@opencut/db";
 import { waitlist } from "@opencut/db/schema";
-import { eq } from "drizzle-orm";
 import { nanoid } from "nanoid";
 import { waitlistRateLimit } from "@/lib/rate-limit";
 import { z } from "zod";
diff --git a/apps/web/src/lib/waitlist.ts b/apps/web/src/lib/waitlist.ts
index c01347d..7b67258 100644
--- a/apps/web/src/lib/waitlist.ts
+++ b/apps/web/src/lib/waitlist.ts
@@ -1,6 +1,5 @@
-import { db } from "@opencut/db";
+import { db, sql } from "@opencut/db";
 import { waitlist } from "@opencut/db/schema";
-import { sql } from "drizzle-orm";
 
 export async function getWaitlistCount() {
   try {
diff --git a/packages/db/src/index.ts b/packages/db/src/index.ts
index b712776..91fc841 100644
--- a/packages/db/src/index.ts
+++ b/packages/db/src/index.ts
@@ -13,4 +13,7 @@ const client = postgres(process.env.DATABASE_URL);
 export const db = drizzle(client, { schema });
 
 // Re-export schema for convenience
-export * from "./schema"; 
\ No newline at end of file
+export * from "./schema";
+
+// Re-export drizzle-orm functions to ensure version consistency
+export { eq, and, or, not, isNull, isNotNull, inArray, notInArray, exists, notExists, sql } from "drizzle-orm"; 
\ No newline at end of file

From 6626a8c41355904e59ffd2598b6bfaa761a7ea15 Mon Sep 17 00:00:00 2001
From: fathisiddiqi <service.fathisiddiqi@gmail.com>
Date: Tue, 24 Jun 2025 20:15:13 +0700
Subject: [PATCH 06/10] fix: set redirect uri for google login and prevent
 router push when login by google

---
 .github/CONTRIBUTING.md                | 1 +
 apps/web/.env.example                  | 1 +
 apps/web/src/app/(auth)/login/page.tsx | 2 +-
 packages/auth/src/server.ts            | 5 +++--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index b9e2275..120a3ce 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -87,6 +87,7 @@ Thank you for your interest in contributing to OpenCut! This document provides g
    # Only needed if you want to test Google login
    GOOGLE_CLIENT_ID="your-google-client-id"
    GOOGLE_CLIENT_SECRET="your-google-client-secret"
+   GOOGLE_REDIRECT_URI="http://localhost:3000/api/auth/callback/google"
    ```
 
 5. Run database migrations: `bun run db:migrate`
diff --git a/apps/web/.env.example b/apps/web/.env.example
index 0b4c649..70c48e2 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -10,6 +10,7 @@ BETTER_AUTH_SECRET=your-secret-key-here
 #Google Clients
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
+GOOGLE_REDIRECT_URI=http://localhost:3000/api/auth/callback/google
 
 # Development Environment
 NODE_ENV=development
diff --git a/apps/web/src/app/(auth)/login/page.tsx b/apps/web/src/app/(auth)/login/page.tsx
index 73c34e1..755784f 100644
--- a/apps/web/src/app/(auth)/login/page.tsx
+++ b/apps/web/src/app/(auth)/login/page.tsx
@@ -52,8 +52,8 @@ function LoginForm() {
     try {
       await signIn.social({
         provider: "google",
+        callbackURL: "/editor",
       });
-      router.push("/editor");
     } catch (error) {
       setError("Failed to sign in with Google. Please try again.");
       setIsGoogleLoading(false);
diff --git a/packages/auth/src/server.ts b/packages/auth/src/server.ts
index f6c68dc..7c32fbf 100644
--- a/packages/auth/src/server.ts
+++ b/packages/auth/src/server.ts
@@ -16,14 +16,15 @@ export const auth = betterAuth({
   emailAndPassword: {
     enabled: true,
   },
-  socialProviders: {  
+  socialProviders: {
     google: {
       clientId: process.env.GOOGLE_CLIENT_ID as string,
       clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
+      redirectURI: process.env.GOOGLE_REDIRECT_URI as string,
     },
   },
   appName: "OpenCut",
   trustedOrigins: ["http://localhost:3000"],
 });
 
-export type Auth = typeof auth; 
\ No newline at end of file
+export type Auth = typeof auth;

From 2f5bde105158e189b396e2a6d5181ac971a4ed9f Mon Sep 17 00:00:00 2001
From: fathisiddiqi <service.fathisiddiqi@gmail.com>
Date: Thu, 26 Jun 2025 09:55:30 +0700
Subject: [PATCH 07/10] fix: remove GOOGLE_REDIRECT_URI env due to better auth
 set the default of that

---
 .github/CONTRIBUTING.md     | 1 -
 apps/web/.env.example       | 1 -
 packages/auth/src/server.ts | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 120a3ce..b9e2275 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -87,7 +87,6 @@ Thank you for your interest in contributing to OpenCut! This document provides g
    # Only needed if you want to test Google login
    GOOGLE_CLIENT_ID="your-google-client-id"
    GOOGLE_CLIENT_SECRET="your-google-client-secret"
-   GOOGLE_REDIRECT_URI="http://localhost:3000/api/auth/callback/google"
    ```
 
 5. Run database migrations: `bun run db:migrate`
diff --git a/apps/web/.env.example b/apps/web/.env.example
index 70c48e2..0b4c649 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -10,7 +10,6 @@ BETTER_AUTH_SECRET=your-secret-key-here
 #Google Clients
 GOOGLE_CLIENT_ID=
 GOOGLE_CLIENT_SECRET=
-GOOGLE_REDIRECT_URI=http://localhost:3000/api/auth/callback/google
 
 # Development Environment
 NODE_ENV=development
diff --git a/packages/auth/src/server.ts b/packages/auth/src/server.ts
index 7c32fbf..6590c0a 100644
--- a/packages/auth/src/server.ts
+++ b/packages/auth/src/server.ts
@@ -20,7 +20,6 @@ export const auth = betterAuth({
     google: {
       clientId: process.env.GOOGLE_CLIENT_ID as string,
       clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
-      redirectURI: process.env.GOOGLE_REDIRECT_URI as string,
     },
   },
   appName: "OpenCut",

From 896f2ee5542302ba93c1284a6c172b52c18d450b Mon Sep 17 00:00:00 2001
From: DevloperAmanSingh <amansinghneh211205@gmail.com>
Date: Thu, 26 Jun 2025 14:29:24 +0530
Subject: [PATCH 08/10] refactor: remove unnecessary wrapper from MediaPanel
 component

---
 apps/web/src/components/editor/media-panel.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/apps/web/src/components/editor/media-panel.tsx b/apps/web/src/components/editor/media-panel.tsx
index 64b3f30..dfe0836 100644
--- a/apps/web/src/components/editor/media-panel.tsx
+++ b/apps/web/src/components/editor/media-panel.tsx
@@ -14,12 +14,6 @@ import { toast } from "sonner";
 // You can upload files or drag them from your computer. Dragging from here to the timeline adds them to your video project.
 
 export function MediaPanel() {
-  return (
-    <div style={{ backgroundColor: 'transparent' }}>
-      {/* Existing content */}
-    </div>
-  );
-}
   const { mediaItems, addMediaItem, removeMediaItem } = useMediaStore();
   const fileInputRef = useRef<HTMLInputElement>(null);
   const [isProcessing, setIsProcessing] = useState(false);

From 70352ced9222c20fe8a297b2c5bc9598962cfe74 Mon Sep 17 00:00:00 2001
From: DevloperAmanSingh <amansinghneh211205@gmail.com>
Date: Thu, 26 Jun 2025 14:40:35 +0530
Subject: [PATCH 09/10] refactor: update authentication imports in auth-form
 component to use signIn and signUp from OpenCut

---
 apps/web/src/components/auth-form.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/auth-form.tsx b/apps/web/src/components/auth-form.tsx
index 7508eb3..2736a62 100644
--- a/apps/web/src/components/auth-form.tsx
+++ b/apps/web/src/components/auth-form.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { useRouter } from "next/navigation";
-import { useAuth } from '@/hooks/useAuth';
+import { signIn, signUp } from "@opencut/auth/client";
 import { Button } from "@/components/ui/button";
 import {
   Card,

From 063094e70a0eeaddbcf8a771cdd11ece904cfdc5 Mon Sep 17 00:00:00 2001
From: muhammed sinan <muhammedsinan7749@gmail.com>
Date: Thu, 26 Jun 2025 14:54:49 +0530
Subject: [PATCH 10/10] changed empty placeholder to a better one

---
 apps/web/src/components/editor/preview-panel.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/editor/preview-panel.tsx b/apps/web/src/components/editor/preview-panel.tsx
index e19b4de..0eee600 100644
--- a/apps/web/src/components/editor/preview-panel.tsx
+++ b/apps/web/src/components/editor/preview-panel.tsx
@@ -249,7 +249,7 @@ export function PreviewPanel() {
           {activeClips.length === 0 ? (
             <div className="absolute inset-0 flex items-center justify-center text-muted-foreground">
               {tracks.length === 0
-                ? "Drop media to start editing"
+                ? "No media added to timeline"
                 : "No clips at current time"}
             </div>
           ) : (