Merge branch 'main' of https://github.com/mazeincoding/AppCut

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);

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";

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 { signIn, signUp } from "@opencut/auth/client";
 import { Button } from "@/components/ui/button";
 import {
   Card,

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>
           ) : (

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 {