diff options
| author | Sinan <148682358+sinanptm@users.noreply.github.com> | 2025-06-26 15:16:53 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-26 15:16:53 +0530 |
| commit | 23f118969b41dfcee98ad027a3ed175ac5f44214 (patch) | |
| tree | dd85c4b246362a8f3d35dc43c91d0286a213857e /apps | |
| parent | cd88a92c6d25c6884ee36e5e157c350559b95570 (diff) | |
| parent | b10bb8ed55330d98cbbb88d7e139b943a9f95f00 (diff) | |
| download | opencut-23f118969b41dfcee98ad027a3ed175ac5f44214.tar.gz | |
Merge branch 'OpenCut-app:main' into main
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/web/src/components/auth-form.tsx | 2 | ||||
| -rw-r--r-- | apps/web/src/components/editor/media-panel.tsx | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/apps/web/src/components/auth-form.tsx b/apps/web/src/components/auth-form.tsx index 7508eb39..2736a627 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,
diff --git a/apps/web/src/components/editor/media-panel.tsx b/apps/web/src/components/editor/media-panel.tsx index 64b3f30a..dfe08365 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); |