clean up

Author: Kitenite

apps/web/client/src/app/project/[id]/_components/canvas/frame/index.tsx

@@ -5,7 +5,7 @@ import { GestureScreen } from './gesture';
 import { ResizeHandles } from './resize-handles';
 import { RightClickMenu } from './right-click';
 import { TopBar } from './top-bar';
-import { FrameComponent } from './web-frame';
+import { FrameComponent } from './view';
 
 export const FrameView = observer(({ frame }: { frame: Frame }) => {
     const [isResizing, setIsResizing] = useState(false);

apps/web/client/src/app/project/[id]/_components/canvas/frame/web-frame.tsx renamed to apps/web/client/src/app/project/[id]/_components/canvas/frame/view.tsx

@@ -1,4 +1,4 @@
-import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/web-frame.tsx';
+import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/view';
 import { api } from '@/trpc/client';
 import { toDbFrame, toDbPartialFrame } from '@onlook/db';
 import { type Frame } from '@onlook/models';

apps/web/client/src/components/store/editor/frames/manager.ts

@@ -1,4 +1,4 @@
-import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/web-frame';
+import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/view';
 import { DefaultSettings, EditorAttributes } from '@onlook/constants';
 import type {
     DomElement,

apps/web/client/src/components/store/editor/insert/index.ts

@@ -1,4 +1,4 @@
-import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/web-frame';
+import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/view';
 import { EditorAttributes } from '@onlook/constants';
 import type { ElementPosition, RectDimensions } from '@onlook/models';
 
@@ -92,7 +92,7 @@ export function getRelativeMousePositionToFrameView(
     const canvasContainer = document.getElementById(EditorAttributes.CANVAS_CONTAINER_ID);
     if (!canvasContainer) {
         console.error('Canvas container not found');
-        return rect;
+        return rect satisfies ElementPosition;
     }
 
     // Get canvas transform matrix to handle scaling and translation
@@ -102,5 +102,5 @@ export function getRelativeMousePositionToFrameView(
 
     const x = (e.clientX - rect.left) / scale;
     const y = (e.clientY - rect.top) / scale;
-    return { x, y };
+    return { x, y } satisfies ElementPosition;
 }

apps/web/client/src/components/store/editor/overlay/utils.ts

@@ -1,4 +1,4 @@
-import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/web-frame';
+import type { FrameView } from '@/app/project/[id]/_components/canvas/frame/view';
 import type { DomElement, EditTextResult, ElementPosition } from '@onlook/models';
 import { makeAutoObservable } from 'mobx';
 import type { EditorEngine } from '../engine';

apps/web/client/src/components/store/editor/text/index.ts

@@ -1,7 +1,7 @@
 import { relations } from "drizzle-orm";
 import { numeric, pgTable, uuid, varchar } from "drizzle-orm/pg-core";
 import { createInsertSchema, createUpdateSchema } from "drizzle-zod";
-import { branches } from "../project/branch";
+import { branches } from "../project";
 import { canvases } from "./canvas";
 
 export const frames = pgTable("frames", {
@@ -22,7 +22,10 @@ export const frames = pgTable("frames", {
 }).enableRLS();
 
 export const frameInsertSchema = createInsertSchema(frames);
-export const frameUpdateSchema = createUpdateSchema(frames);
+export const frameUpdateSchema = createUpdateSchema(frames).omit({
+    id: true,
+    canvasId: true,
+});
 
 export type Frame = typeof frames.$inferSelect;
 export type NewFrame = typeof frames.$inferInsert;