From ffe9103da6eb7f93819f6c0d0ddf0905ccfc4524 Mon Sep 17 00:00:00 2001 From: codetorso Date: Sat, 29 Jun 2024 20:08:46 +0530 Subject: [PATCH] user canvas (2/2) --- apps/web/app/(canvas)/canvas/[id]/page.tsx | 135 ++------------ .../_canvas_comp/(components)}/canvas.tsx | 8 +- .../(components)}/draggableComponent.tsx | 4 - .../(components)}/dropComponent.tsx | 0 .../(components)}/enabledComp copy.tsx | 0 .../(components)}/enabledComp.tsx | 0 .../(components)/resizableLayout.tsx | 170 ++++++++++++++++++ .../_canvas_comp/(components)}/savesnap.tsx | 24 +-- .../_canvas_comp/(components)}/textCard.tsx | 0 .../(components)}/twitterCard.tsx | 0 .../canvas/_canvas_comp}/lib/context.ts | 0 .../_canvas_comp}/lib/createAssetUrl.ts | 0 .../canvas/_canvas_comp}/lib/createEmbeds.ts | 0 .../canvas/_canvas_comp/lib/loadSnap.ts | 13 ++ apps/web/app/actions/doers.ts | 15 +- apps/web/app/actions/fetchers.ts | 43 +++++ apps/web/env.d.ts | 1 + apps/web/wrangler.toml | 4 + packages/ui/components/canvas/lib/loadSnap.ts | 14 -- 19 files changed, 271 insertions(+), 160 deletions(-) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/canvas.tsx (92%) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/draggableComponent.tsx (93%) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/dropComponent.tsx (100%) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/enabledComp copy.tsx (100%) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/enabledComp.tsx (100%) create mode 100644 apps/web/app/(canvas)/canvas/_canvas_comp/(components)/resizableLayout.tsx rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/savesnap.tsx (55%) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/textCard.tsx (100%) rename {packages/ui/components/canvas/components => apps/web/app/(canvas)/canvas/_canvas_comp/(components)}/twitterCard.tsx (100%) rename {packages/ui/components/canvas => apps/web/app/(canvas)/canvas/_canvas_comp}/lib/context.ts (100%) rename {packages/ui/components/canvas => apps/web/app/(canvas)/canvas/_canvas_comp}/lib/createAssetUrl.ts (100%) rename {packages/ui/components/canvas => apps/web/app/(canvas)/canvas/_canvas_comp}/lib/createEmbeds.ts (100%) create mode 100644 apps/web/app/(canvas)/canvas/_canvas_comp/lib/loadSnap.ts delete mode 100644 packages/ui/components/canvas/lib/loadSnap.ts diff --git a/apps/web/app/(canvas)/canvas/[id]/page.tsx b/apps/web/app/(canvas)/canvas/[id]/page.tsx index e58ab35e..7cf5b91c 100644 --- a/apps/web/app/(canvas)/canvas/[id]/page.tsx +++ b/apps/web/app/(canvas)/canvas/[id]/page.tsx @@ -1,125 +1,18 @@ -"use client"; - -import { Canvas } from "@repo/ui/components/canvas/components/canvas"; -import React, { useState } from "react"; -import { Panel, PanelGroup, PanelResizeHandle } from "react-resizable-panels"; -import { SettingsIcon, DragIcon } from "@repo/ui/icons"; -import DraggableComponentsContainer from "@repo/ui/components/canvas/components/draggableComponent"; -import { AutocompleteIcon, blockIcon } from "@repo/ui/icons"; -import Image from "next/image"; -import { Switch } from "@repo/ui/shadcn/switch"; -import { Label } from "@repo/ui/shadcn/label"; - -function page() { - const [fullScreen, setFullScreen] = useState(false); - const [visible, setVisible] = useState(true); +import { userHasCanvas } from "@/app/actions/fetchers"; +import { redirect } from "next/navigation"; +import { + RectProvider, + ResizaleLayout, +} from "../_canvas_comp/(components)/resizableLayout"; +export default async function page({ params }: any) { + const canvasExists = await userHasCanvas(params.id); + if (!canvasExists.success) { + redirect("/canvas"); + } return ( -
-
- { - l[0]! < 20 ? setVisible(false) : setVisible(true); - }} - className={` ${fullScreen ? "w-[calc(100vw-2rem)]" : "w-screen"} transition-all`} - direction="horizontal" - > - { - setTimeout(() => setFullScreen(false), 50); - }} - onCollapse={() => { - setTimeout(() => setFullScreen(true), 50); - }} - defaultSize={30} - collapsible={true} - > -
-
- Change Filters - setting-icon -
- {visible ? ( - - ) : ( -

- Need more space to show! -

- )} -
- - -
- drag-icon -
- - -
- -
- - -
-
+ + + ); } - -function SidePanel() { - const [value, setValue] = useState(""); - const [dragAsText, setDragAsText] = useState(false); - return ( - <> -
- { - setValue(e.target.value); - }} - value={value} - // rows={1} - className="w-full resize-none rounded-xl bg-[#151515] px-3 py-4 text-xl text-[#989EA4] outline-none focus:outline-none sm:max-h-52" - /> -
-
- setDragAsText(e)} - id="drag-text-mode" - /> - -
- - - ); -} - -export default page; - -const content = [ - { - content: - "Regional growth patterns diverge, with strong performance in the United States and several emerging markets, contrasted by weaker prospects in many advanced economies, particularly in Europe (World Economic Forum) (OECD). The rapid adoption of artificial intelligence (AI) is expected to drive productivity growth, especially in advanced economies, potentially mitigating labor shortages and boosting income levels in emerging markets (World Economic Forum) (OECD). However, ongoing geopolitical tensions and economic fragmentation are likely to maintain a level of uncertainty and volatility in the global economy (World Economic Forum.", - icon: AutocompleteIcon, - iconAlt: "Autocomplete", - extraInfo: - "Page Url: https://chatgpt.com/c/762cd44e-1752-495b-967a-aa3c23c6024a", - }, - { - content: - "As of mid-2024, the global economy is experiencing modest growth with significant regional disparities. Global GDP growth is projected to be around 3.1% in 2024, rising slightly to 3.2% in 2025. This performance, although below the pre-pandemic average, reflects resilience despite various economic pressures, including tight monetary conditions and geopolitical tensions (IMF)(OECD) Inflation is moderating faster than expected, with global headline inflation projected to fall to 5.8% in 2024 and 4.4% in 2025, contributing to improving real incomes and positive trade growth (IMF) (OECD)", - icon: blockIcon, - iconAlt: "Autocomplete", - extraInfo: - "Page Url: https://www.cnbc.com/2024/05/23/nvidia-keeps-hitting-records-can-investors-still-buy-the-stock.html?&qsearchterm=nvidia", - }, -]; diff --git a/packages/ui/components/canvas/components/canvas.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/canvas.tsx similarity index 92% rename from packages/ui/components/canvas/components/canvas.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/canvas.tsx index f3e4c090..22fcd709 100644 --- a/packages/ui/components/canvas/components/canvas.tsx +++ b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/canvas.tsx @@ -12,6 +12,7 @@ import { getAssetUrls } from "@tldraw/assets/selfHosted"; import { memo } from "react"; import DragContext from "../lib/context"; import DropZone from "./dropComponent"; +import { useRect } from "./resizableLayout"; // import "./canvas.css"; export const Canvas = memo(() => { @@ -46,12 +47,13 @@ export const Canvas = memo(() => { }); const TldrawComponent = memo(() => { + const { id } = useRect(); const [storeWithStatus, setStoreWithStatus] = useState({ status: "loading", }); useEffect(() => { const fetchStore = async () => { - const store = await loadRemoteSnapshot(); + const store = await loadRemoteSnapshot(id); setStoreWithStatus({ store: store, @@ -71,7 +73,7 @@ const TldrawComponent = memo(() => { }); }, []); - setUserPreferences({ id: "supermemory" }); + setUserPreferences({ id: "supermemory",colorScheme: "dark" }); const assetUrls = getAssetUrls(); return ( @@ -85,7 +87,7 @@ const TldrawComponent = memo(() => { onMount={handleMount} >
- +
diff --git a/packages/ui/components/canvas/components/draggableComponent.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/draggableComponent.tsx similarity index 93% rename from packages/ui/components/canvas/components/draggableComponent.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/draggableComponent.tsx index d0832e81..8c39c732 100644 --- a/packages/ui/components/canvas/components/draggableComponent.tsx +++ b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/draggableComponent.tsx @@ -4,7 +4,6 @@ import { useRef, useState } from "react"; interface DraggableComponentsProps { content: string; extraInfo?: string; - icon: string; iconAlt: string; } @@ -19,7 +18,6 @@ export default function DraggableComponentsContainer({ return ( @@ -32,7 +30,6 @@ export default function DraggableComponentsContainer({ function DraggableComponents({ content, extraInfo, - icon, iconAlt, }: DraggableComponentsProps) { const [isDragging, setIsDragging] = useState(false); @@ -59,7 +56,6 @@ function DraggableComponents({ draggable className={`flex gap-4 px-1 rounded-md text-[#989EA4] border-2 transition ${isDragging ? "border-blue-600" : "border-[#1F2428]"}`} > - {iconAlt}

{content}

diff --git a/packages/ui/components/canvas/components/dropComponent.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/dropComponent.tsx similarity index 100% rename from packages/ui/components/canvas/components/dropComponent.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/dropComponent.tsx diff --git a/packages/ui/components/canvas/components/enabledComp copy.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/enabledComp copy.tsx similarity index 100% rename from packages/ui/components/canvas/components/enabledComp copy.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/enabledComp copy.tsx diff --git a/packages/ui/components/canvas/components/enabledComp.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/enabledComp.tsx similarity index 100% rename from packages/ui/components/canvas/components/enabledComp.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/enabledComp.tsx diff --git a/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/resizableLayout.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/resizableLayout.tsx new file mode 100644 index 00000000..5ba6780b --- /dev/null +++ b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/resizableLayout.tsx @@ -0,0 +1,170 @@ +"use client"; + +import { Canvas } from "./canvas"; +import React, { createContext, useContext, useState } from "react"; +import { Panel, PanelGroup, PanelResizeHandle } from "react-resizable-panels"; +import { SettingsIcon, DragIcon } from "@repo/ui/icons"; +import DraggableComponentsContainer from "./draggableComponent"; +import Image from "next/image"; +import { Label } from "@repo/ui/shadcn/label"; + +interface RectContextType { + fullScreen: boolean; + setFullScreen: React.Dispatch>; + visible: boolean; + setVisible: React.Dispatch>; + id: string +} + +const RectContext = createContext(undefined); + +export const RectProvider = ({ id, children }: {id: string, children: React.ReactNode}) => { + const [fullScreen, setFullScreen] = useState(false); + const [visible, setVisible] = useState(true); + + const value = { + id, + fullScreen, + setFullScreen, + visible, + setVisible, + }; + + return {children}; +}; + +export const useRect = () => { + const context = useContext(RectContext); + if (context === undefined) { + throw new Error('useRect must be used within a RectProvider'); + } + return context; +}; + + +export function ResizaleLayout() { + const { setVisible, fullScreen, setFullScreen } = useRect(); + + return ( +
+ { + l[0]! < 20 ? setVisible(false) : setVisible(true); + }} + className={` ${fullScreen ? "w-[calc(100vw-2rem)]" : "w-screen"} transition-all`} + direction="horizontal" + > + { + setTimeout(() => setFullScreen(false), 50); + }} + onCollapse={() => { + setTimeout(() => setFullScreen(true), 50); + }} + defaultSize={30} + collapsible={true} + > + + + + + + + + + +
+ ); +} + +function DragIconContainer() { + const { fullScreen} = useRect(); + return ( +
+ drag-icon +
+ ); +} + +function CanvasContainer() { + const { fullScreen} = useRect(); + return ( +
+ +
+ ); +} + +function SidePanelContainer() { + const { fullScreen, visible} = useRect(); + return ( +
+
+ Change Filters + setting-icon +
+ {visible ? ( + + ) : ( +

Need more space to show!

+ )} +
+ ); +} + +function SidePanel() { + const [value, setValue] = useState(""); + // const [dragAsText, setDragAsText] = useState(false); + return ( + <> +
+ { + setValue(e.target.value); + }} + value={value} + // rows={1} + className="w-full resize-none rounded-xl bg-[#151515] px-3 py-4 text-xl text-[#989EA4] outline-none focus:outline-none sm:max-h-52" + /> +
+
+ {/* setDragAsText(e)} + id="drag-text-mode" + /> */} + +
+ + + ); +} + + +const content = [ + { + content: + "Regional growth patterns diverge, with strong performance in the United States and several emerging markets, contrasted by weaker prospects in many advanced economies, particularly in Europe (World Economic Forum) (OECD). The rapid adoption of artificial intelligence (AI) is expected to drive productivity growth, especially in advanced economies, potentially mitigating labor shortages and boosting income levels in emerging markets (World Economic Forum) (OECD). However, ongoing geopolitical tensions and economic fragmentation are likely to maintain a level of uncertainty and volatility in the global economy (World Economic Forum.", + iconAlt: "Autocomplete", + extraInfo: + "Page Url: https://chatgpt.com/c/762cd44e-1752-495b-967a-aa3c23c6024a", + }, + { + content: + "As of mid-2024, the global economy is experiencing modest growth with significant regional disparities. Global GDP growth is projected to be around 3.1% in 2024, rising slightly to 3.2% in 2025. This performance, although below the pre-pandemic average, reflects resilience despite various economic pressures, including tight monetary conditions and geopolitical tensions (IMF)(OECD) Inflation is moderating faster than expected, with global headline inflation projected to fall to 5.8% in 2024 and 4.4% in 2025, contributing to improving real incomes and positive trade growth (IMF) (OECD)", + iconAlt: "Autocomplete", + extraInfo: + "Page Url: https://www.cnbc.com/2024/05/23/nvidia-keeps-hitting-records-can-investors-still-buy-the-stock.html?&qsearchterm=nvidia", + }, +]; diff --git a/packages/ui/components/canvas/components/savesnap.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/savesnap.tsx similarity index 55% rename from packages/ui/components/canvas/components/savesnap.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/savesnap.tsx index f82e97e3..45fc7e9d 100644 --- a/packages/ui/components/canvas/components/savesnap.tsx +++ b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/savesnap.tsx @@ -1,27 +1,17 @@ import { useCallback, useEffect, useState } from "react"; -import { debounce, useEditor } from "tldraw"; +import { debounce, getSnapshot, useEditor } from "tldraw"; +import { SaveCanvas } from "@/app/actions/doers"; -export function SaveStatus() { +export function SaveStatus({id}: {id:string}) { const [save, setSave] = useState("saved!"); const editor = useEditor(); + const debouncedSave = useCallback( debounce(async () => { - const snapshot = editor.store.getSnapshot(); - localStorage.setItem("saved", JSON.stringify(snapshot)); - - const res = await fetch( - "https://learning-cf.pruthvirajthinks.workers.dev/post/page3", - { - method: "POST", - headers: { "Content-Type": "application/json" }, - body: JSON.stringify({ - data: snapshot, - }), - }, - ); - - console.log(await res.json()); + const snapshot = getSnapshot(editor.store) + SaveCanvas({id, data: JSON.stringify(snapshot)}) + setSave("saved!"); }, 3000), [editor], // Dependency array ensures the function is not recreated on every render diff --git a/packages/ui/components/canvas/components/textCard.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/textCard.tsx similarity index 100% rename from packages/ui/components/canvas/components/textCard.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/textCard.tsx diff --git a/packages/ui/components/canvas/components/twitterCard.tsx b/apps/web/app/(canvas)/canvas/_canvas_comp/(components)/twitterCard.tsx similarity index 100% rename from packages/ui/components/canvas/components/twitterCard.tsx rename to apps/web/app/(canvas)/canvas/_canvas_comp/(components)/twitterCard.tsx diff --git a/packages/ui/components/canvas/lib/context.ts b/apps/web/app/(canvas)/canvas/_canvas_comp/lib/context.ts similarity index 100% rename from packages/ui/components/canvas/lib/context.ts rename to apps/web/app/(canvas)/canvas/_canvas_comp/lib/context.ts diff --git a/packages/ui/components/canvas/lib/createAssetUrl.ts b/apps/web/app/(canvas)/canvas/_canvas_comp/lib/createAssetUrl.ts similarity index 100% rename from packages/ui/components/canvas/lib/createAssetUrl.ts rename to apps/web/app/(canvas)/canvas/_canvas_comp/lib/createAssetUrl.ts diff --git a/packages/ui/components/canvas/lib/createEmbeds.ts b/apps/web/app/(canvas)/canvas/_canvas_comp/lib/createEmbeds.ts similarity index 100% rename from packages/ui/components/canvas/lib/createEmbeds.ts rename to apps/web/app/(canvas)/canvas/_canvas_comp/lib/createEmbeds.ts diff --git a/apps/web/app/(canvas)/canvas/_canvas_comp/lib/loadSnap.ts b/apps/web/app/(canvas)/canvas/_canvas_comp/lib/loadSnap.ts new file mode 100644 index 00000000..ee4dc22f --- /dev/null +++ b/apps/web/app/(canvas)/canvas/_canvas_comp/lib/loadSnap.ts @@ -0,0 +1,13 @@ +import { createTLStore, defaultShapeUtils, loadSnapshot } from "tldraw"; +import { twitterCardUtil } from "../(components)/twitterCard"; +import { textCardUtil } from "../(components)/textCard"; +import { getCanvasData } from "@/app/actions/fetchers"; +export async function loadRemoteSnapshot(id:string) { + const snapshot = await getCanvasData(id); + + const newStore = createTLStore({ + shapeUtils: [...defaultShapeUtils, twitterCardUtil, textCardUtil], + }); + loadSnapshot(newStore, snapshot); + return newStore; +} diff --git a/apps/web/app/actions/doers.ts b/apps/web/app/actions/doers.ts index 30ddbc8e..00feaa17 100644 --- a/apps/web/app/actions/doers.ts +++ b/apps/web/app/actions/doers.ts @@ -415,4 +415,17 @@ export const createCanvas = async () => { // }; // } // } -}; \ No newline at end of file +}; + +export const SaveCanvas = async ({id, data}: {id: string, data: string}) => { + console.log({id, data}) + try { + await process.env.CANVAS_SNAPS.put(id, data) + return { + success: true, + message: "in-sync" + } + } catch (error) { + return {success: false, error, message:"An error occured while saving your canvas"} + } +} \ No newline at end of file diff --git a/apps/web/app/actions/fetchers.ts b/apps/web/app/actions/fetchers.ts index f485c28d..d93cd4d0 100644 --- a/apps/web/app/actions/fetchers.ts +++ b/apps/web/app/actions/fetchers.ts @@ -213,3 +213,46 @@ export const getCanvas = async () => { }; } }; + +export const userHasCanvas = async (canvasId: string) => { + const data = await auth(); + + if (!data || !data.user || !data.user.id) { + redirect("/signin"); + return { error: "Not authenticated", success: false }; + } + + try { + const canvases = await db.select().from(canvas).where(eq(canvas.userId, data.user.id)) + const exists = !!canvases.find(canvas => canvas.id === canvasId); + return { + success: exists, + }; + } catch (e) { + return { + success: false, + error: (e as Error).message, + }; + } +} + +export const getCanvasData = async (canvasId: string) => { + + const data = await auth(); + + if (!data || !data.user || !data.user.id) { + redirect("/signin"); + return { error: "Not authenticated", success: false }; + } + + const canvas = await process.env.CANVAS_SNAPS.get(canvasId) + + console.log({canvas, canvasId}) + if (canvas){ + return JSON.parse(canvas); + } else { + return {} + } +} + + diff --git a/apps/web/env.d.ts b/apps/web/env.d.ts index ee41239f..d52ab7b5 100644 --- a/apps/web/env.d.ts +++ b/apps/web/env.d.ts @@ -5,4 +5,5 @@ interface CloudflareEnv { STORAGE: R2Bucket; DATABASE: D1Database; DEV_IMAGES: R2Bucket; + CANVAS_SNAPS: KVNamespace; } diff --git a/apps/web/wrangler.toml b/apps/web/wrangler.toml index 594614c7..a5f9b461 100644 --- a/apps/web/wrangler.toml +++ b/apps/web/wrangler.toml @@ -16,6 +16,10 @@ binding = "DATABASE" database_name = "dev-d1-anycontext" database_id = "fc562605-157a-4f60-b439-2a24ffed5b4c" +[[kv_namespaces]] +binding = "CANVAS_SNAPS" +id = "c6446f7190dd4afebe1c318df3400518" + [[env.production.d1_databases]] binding = "DATABASE" database_name = "prod-d1-supermemory" diff --git a/packages/ui/components/canvas/lib/loadSnap.ts b/packages/ui/components/canvas/lib/loadSnap.ts deleted file mode 100644 index 846b1967..00000000 --- a/packages/ui/components/canvas/lib/loadSnap.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { createTLStore, defaultShapeUtils, loadSnapshot } from "tldraw"; -import { twitterCardUtil } from "../components/twitterCard"; -import { textCardUtil } from "../components/textCard"; -export async function loadRemoteSnapshot() { - const res = await fetch( - "https://learning-cf.pruthvirajthinks.workers.dev/get/page3", - ); - const snapshot = JSON.parse(await res.json()); - const newStore = createTLStore({ - shapeUtils: [...defaultShapeUtils, twitterCardUtil, textCardUtil], - }); - loadSnapshot(newStore, snapshot); - return newStore; -}