Merge branch 'main' of github.com:ga1az/OpenCut into fix-docker-setup

3 files changed, 60 insertions, 29 deletions

diff --git a/apps/web/src/app/layout.tsx b/apps/web/src/app/layout.tsx
index 1cd4b3b9..5d33100d 100644
--- a/apps/web/src/app/layout.tsx
+++ b/apps/web/src/app/layout.tsx
@@ -16,6 +16,35 @@ export const metadata: Metadata = {
   title: "OpenCut",
   description:
     "A simple but powerful video editor that gets the job done. In your browser.",
+  openGraph: {
+    title: "OpenCut",
+    description:
+      "A simple but powerful video editor that gets the job done. In your browser.",
+    url: "https://opencut.app",
+    siteName: "OpenCut",
+    locale: "en_US",
+    type: "website",
+    images: [
+      {
+        url: "https://opencut.app/opengraph-image.jpg",
+        width: 1200,
+        height: 630,
+        alt: "OpenCut",
+      },
+    ],
+  },
+  twitter: {
+    card: "summary_large_image",
+    title: "OpenCut",
+    description:
+      "A simple but powerful video editor that gets the job done. In your browser.",
+    creator: "@opencutapp",
+    images: ["/opengraph-image.jpg"],
+  },
+  robots: {
+    index: true,
+    follow: true,
+  },
 };
 
 export default function RootLayout({
diff --git a/apps/web/src/app/opengraph-image.jpg b/apps/web/src/app/opengraph-image.jpg
deleted file mode 100644
index d45c0854..00000000
--- a/apps/web/src/app/opengraph-image.jpg
+++ /dev/null
diff --git a/apps/web/src/components/editor/timeline.tsx b/apps/web/src/components/editor/timeline.tsx
index 12907738..ce0ffa30 100644
--- a/apps/web/src/components/editor/timeline.tsx
+++ b/apps/web/src/components/editor/timeline.tsx
@@ -221,7 +221,7 @@ export function Timeline() {
         const clipLeft = clip.startTime * 50 * zoomLevel;

         const clipTop = trackIdx * 60;

         const clipBottom = clipTop + 60;

-        const clipRight = clipLeft + clipWidth;

+        const clipRight = clipLeft + 60; // Set a fixed width for time display

         if (

           bx1 < clipRight &&

           bx2 > clipLeft &&

@@ -602,38 +602,40 @@ export function Timeline() {
           <div className="w-px h-6 bg-border mx-1" />

 

           {/* Time Display */}

-          <div className="text-xs text-muted-foreground font-mono px-2">

-            {Math.floor(currentTime * 10) / 10}s /{" "}

-            {Math.floor(duration * 10) / 10}s

+          <div className="text-xs text-muted-foreground font-mono px-2"

+            style={{ minWidth: '18ch', textAlign: 'center' }}

+            >

+              {currentTime.toFixed(1)}s / {duration.toFixed(1)}s

           </div>

 

-          <div className="w-px h-6 bg-border mx-1" />

-

           {/* Test Clip Button - for debugging */}

           {tracks.length === 0 && (

-            <Tooltip>

-              <TooltipTrigger asChild>

-                <Button

-                  variant="outline"

-                  size="sm"

-                  onClick={() => {

-                    const trackId = addTrack("video");

-                    addClipToTrack(trackId, {

-                      mediaId: "test",

-                      name: "Test Clip",

-                      duration: 5,

-                      startTime: 0,

-                      trimStart: 0,

-                      trimEnd: 0,

-                    });

-                  }}

-                  className="text-xs"

-                >

-                  Add Test Clip

-                </Button>

-              </TooltipTrigger>

-              <TooltipContent>Add a test clip to try playback</TooltipContent>

-            </Tooltip>

+            <>

+              <div className="w-px h-6 bg-border mx-1" />

+              <Tooltip>

+                <TooltipTrigger asChild>

+                  <Button

+                    variant="outline"

+                    size="sm"

+                    onClick={() => {

+                      const trackId = addTrack("video");

+                      addClipToTrack(trackId, {

+                        mediaId: "test",

+                        name: "Test Clip",

+                        duration: 5,

+                        startTime: 0,

+                        trimStart: 0,

+                        trimEnd: 0,

+                      });

+                    }}

+                    className="text-xs"

+                  >

+                    Add Test Clip

+                  </Button>

+                </TooltipTrigger>

+                <TooltipContent>Add a test clip to try playback</TooltipContent>

+              </Tooltip>

+            </>

           )}

 

           <div className="w-px h-6 bg-border mx-1" />