From f959ba87e20aaae42bc270edc127ae89b97241cb Mon Sep 17 00:00:00 2001
From: 3raphat <96657413+3raphat@users.noreply.github.com>
Date: Tue, 24 Jun 2025 01:38:53 +0700
Subject: fix: update auth routes

---
 apps/web/src/app/(auth)/login/page.tsx  | 26 ++++++++++++++++------
 apps/web/src/app/(auth)/signup/page.tsx | 38 +++++++++++++++++++++++++--------
 2 files changed, 49 insertions(+), 15 deletions(-)

(limited to 'apps/web/src/app')

diff --git a/apps/web/src/app/(auth)/login/page.tsx b/apps/web/src/app/(auth)/login/page.tsx
index ebf2eb3f..5f37ced9 100644
--- a/apps/web/src/app/(auth)/login/page.tsx
+++ b/apps/web/src/app/(auth)/login/page.tsx
@@ -77,14 +77,21 @@ function LoginForm() {
         size="lg"
         disabled={isAnyLoading}
       >
-        {isGoogleLoading ? <Loader2 className="animate-spin" /> : (<GoogleIcon />)} Continue with Google
+        {isGoogleLoading ? (
+          <Loader2 className="animate-spin" />
+        ) : (
+          <GoogleIcon />
+        )}{" "}
+        Continue with Google
       </Button>
       <div className="relative">
         <div className="absolute inset-0 flex items-center">
           <Separator className="w-full" />
         </div>
         <div className="relative flex justify-center text-xs uppercase">
-          <span className="bg-background px-2 text-muted-foreground">Or continue with</span>
+          <span className="bg-background px-2 text-muted-foreground">
+            Or continue with
+          </span>
         </div>
       </div>
       <div className="space-y-4">
@@ -144,14 +151,21 @@ export default function LoginPage() {
           </CardDescription>
         </CardHeader>
         <CardContent className="pt-0">
-          <Suspense fallback={<div className="text-center">
-            <Loader2 className="animate-spin" />
-          </div>}>
+          <Suspense
+            fallback={
+              <div className="text-center">
+                <Loader2 className="animate-spin" />
+              </div>
+            }
+          >
             <LoginForm />
           </Suspense>
           <div className="mt-6 text-center text-sm">
             Don't have an account?{" "}
-            <Link href="/auth/signup" className="font-medium text-primary underline-offset-4 hover:underline">
+            <Link
+              href="/signup"
+              className="font-medium text-primary underline-offset-4 hover:underline"
+            >
               Sign up
             </Link>
           </div>
diff --git a/apps/web/src/app/(auth)/signup/page.tsx b/apps/web/src/app/(auth)/signup/page.tsx
index 3d125a07..d1feece2 100644
--- a/apps/web/src/app/(auth)/signup/page.tsx
+++ b/apps/web/src/app/(auth)/signup/page.tsx
@@ -44,7 +44,7 @@ function SignUpForm() {
       return;
     }
 
-    router.push("/auth/login");
+    router.push("/login");
   };
 
   const handleGoogleSignUp = async () => {
@@ -80,7 +80,12 @@ function SignUpForm() {
         size="lg"
         disabled={isAnyLoading}
       >
-        {isGoogleLoading ? <Loader2 className="animate-spin" /> : (<GoogleIcon />)} Continue with Google
+        {isGoogleLoading ? (
+          <Loader2 className="animate-spin" />
+        ) : (
+          <GoogleIcon />
+        )}{" "}
+        Continue with Google
       </Button>
 
       <div className="relative">
@@ -88,7 +93,9 @@ function SignUpForm() {
           <Separator className="w-full" />
         </div>
         <div className="relative flex justify-center text-xs uppercase">
-          <span className="bg-background px-2 text-muted-foreground">Or continue with</span>
+          <span className="bg-background px-2 text-muted-foreground">
+            Or continue with
+          </span>
         </div>
       </div>
 
@@ -135,7 +142,11 @@ function SignUpForm() {
           className="w-full h-11"
           size="lg"
         >
-          {isEmailLoading ? <Loader2 className="animate-spin" /> : "Create account"}
+          {isEmailLoading ? (
+            <Loader2 className="animate-spin" />
+          ) : (
+            "Create account"
+          )}
         </Button>
       </div>
     </div>
@@ -157,20 +168,29 @@ export default function SignUpPage() {
 
       <Card className="w-[400px] shadow-lg border-0">
         <CardHeader className="text-center pb-4">
-          <CardTitle className="text-2xl font-semibold">Create your account</CardTitle>
+          <CardTitle className="text-2xl font-semibold">
+            Create your account
+          </CardTitle>
           <CardDescription className="text-base">
             Get started with your free account today
           </CardDescription>
         </CardHeader>
         <CardContent className="pt-0">
-          <Suspense fallback={<div className="text-center">
-            <Loader2 className="animate-spin" />
-          </div>}>
+          <Suspense
+            fallback={
+              <div className="text-center">
+                <Loader2 className="animate-spin" />
+              </div>
+            }
+          >
             <SignUpForm />
           </Suspense>
           <div className="mt-6 text-center text-sm">
             Already have an account?{" "}
-            <Link href="/auth/login" className="font-medium text-primary underline-offset-4 hover:underline">
+            <Link
+              href="/login"
+              className="font-medium text-primary underline-offset-4 hover:underline"
+            >
               Sign in
             </Link>
           </div>
-- 
cgit v1.3.1


From 2a1ac8fcf7075a4a25523c7601e98013313658c5 Mon Sep 17 00:00:00 2001
From: Andrew Kordampalos <megakor@gmail.com>
Date: Mon, 23 Jun 2025 22:17:36 +0300
Subject: Implement click-to-seek functionality in timeline

---
 .gitignore                                  |  3 +++
 apps/web/src/app/editor/editor.css          |  4 ++++
 apps/web/src/app/editor/page.tsx            |  1 +
 apps/web/src/components/editor/timeline.tsx | 19 +++++++++++++++++--
 4 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 apps/web/src/app/editor/editor.css

(limited to 'apps/web/src/app')

diff --git a/.gitignore b/.gitignore
index 24d66f81..3deed249 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,6 @@
 # typescript
 /apps/web/next-env.d.ts
 /apps/web/yarn.lock
+
+# asdf version management
+.tool-versions
diff --git a/apps/web/src/app/editor/editor.css b/apps/web/src/app/editor/editor.css
new file mode 100644
index 00000000..f482c6de
--- /dev/null
+++ b/apps/web/src/app/editor/editor.css
@@ -0,0 +1,4 @@
+/* Prevent scroll jumping on Mac devices when using the editor */
+body {
+  overflow: hidden;
+} 
\ No newline at end of file
diff --git a/apps/web/src/app/editor/page.tsx b/apps/web/src/app/editor/page.tsx
index 64186a3e..2efb59cc 100644
--- a/apps/web/src/app/editor/page.tsx
+++ b/apps/web/src/app/editor/page.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { useEffect } from "react";
+import "./editor.css";
 import {
   ResizablePanelGroup,
   ResizablePanel,
diff --git a/apps/web/src/components/editor/timeline.tsx b/apps/web/src/components/editor/timeline.tsx
index 675b398c..24169b69 100644
--- a/apps/web/src/components/editor/timeline.tsx
+++ b/apps/web/src/components/editor/timeline.tsx
@@ -290,11 +290,18 @@ export function Timeline() {
     }
   };
 
-  // Deselect all clips when clicking empty timeline area
+  // Deselect all clips when clicking empty timeline area and seek to clicked position
   const handleTimelineAreaClick = (e: React.MouseEvent) => {
     // Only clear selection if the click target is the timeline background (not a child/clip)
     if (e.target === e.currentTarget) {
       clearSelectedClips();
+      
+      // Calculate the clicked time position and seek to it
+      const rect = e.currentTarget.getBoundingClientRect();
+      const clickX = e.clientX - rect.left;
+      const clickedTime = clickX / (50 * zoomLevel);
+      const clampedTime = Math.max(0, Math.min(duration, clickedTime));
+      seek(clampedTime);
     }
   };
 
@@ -487,10 +494,18 @@ export function Timeline() {
           <div className="flex-1 relative overflow-hidden">
             <ScrollArea className="w-full">
               <div
-                className="relative h-12 bg-muted/30"
+                className="relative h-12 bg-muted/30 cursor-pointer"
                 style={{
                   width: `${Math.max(1000, duration * 50 * zoomLevel)}px`,
                 }}
+                onClick={(e) => {
+                  // Calculate the clicked time position and seek to it
+                  const rect = e.currentTarget.getBoundingClientRect();
+                  const clickX = e.clientX - rect.left;
+                  const clickedTime = clickX / (50 * zoomLevel);
+                  const clampedTime = Math.max(0, Math.min(duration, clickedTime));
+                  seek(clampedTime);
+                }}
               >
                 {/* Time markers */}
                 {(() => {
-- 
cgit v1.3.1