From edfafa2c487222db098656c07975f3743faee267 Mon Sep 17 00:00:00 2001 From: Alex Lloyd Date: Thu, 7 Dec 2023 18:16:31 -0600 Subject: [PATCH] Fix parameter type for generateCode --- frontend/src/App.tsx | 10 ++++++++-- frontend/src/generateCode.ts | 11 ++--------- frontend/src/types.ts | 10 ++++++++++ 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index f1301e0..3ae08a9 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from "react"; import ImageUpload from "./components/ImageUpload"; import CodePreview from "./components/CodePreview"; import Preview from "./components/Preview"; -import { CodeGenerationParams, generateCode } from "./generateCode"; +import { generateCode } from "./generateCode"; import Spinner from "./components/Spinner"; import classNames from "classnames"; import { @@ -18,7 +18,13 @@ import { Button } from "@/components/ui/button"; import { Textarea } from "@/components/ui/textarea"; import { Tabs, TabsContent, TabsList, TabsTrigger } from "./components/ui/tabs"; import SettingsDialog from "./components/SettingsDialog"; -import { Settings, EditorTheme, AppState, GeneratedCodeConfig } from "./types"; +import { + AppState, + CodeGenerationParams, + EditorTheme, + GeneratedCodeConfig, + Settings, +} from "./types"; import { IS_RUNNING_ON_CLOUD } from "./config"; import { PicoBadge } from "./components/PicoBadge"; import { OnboardingNote } from "./components/OnboardingNote"; diff --git a/frontend/src/generateCode.ts b/frontend/src/generateCode.ts index 8a05fe7..96fbdc1 100644 --- a/frontend/src/generateCode.ts +++ b/frontend/src/generateCode.ts @@ -1,23 +1,16 @@ import toast from "react-hot-toast"; import { WS_BACKEND_URL } from "./config"; import { USER_CLOSE_WEB_SOCKET_CODE } from "./constants"; +import { FullGenerationSettings } from "./types"; const ERROR_MESSAGE = "Error generating code. Check the Developer Console AND the backend logs for details. Feel free to open a Github issue."; const STOP_MESSAGE = "Code generation stopped"; -export interface CodeGenerationParams { - generationType: "create" | "update"; - image: string; - resultImage?: string; - history?: string[]; - // isImageGenerationEnabled: boolean; // TODO: Merge with Settings type in types.ts -} - export function generateCode( wsRef: React.MutableRefObject, - params: CodeGenerationParams, + params: FullGenerationSettings, onChange: (chunk: string) => void, onSetCode: (code: string) => void, onStatusUpdate: (status: string) => void, diff --git a/frontend/src/types.ts b/frontend/src/types.ts index deb370a..653b648 100644 --- a/frontend/src/types.ts +++ b/frontend/src/types.ts @@ -28,3 +28,13 @@ export enum AppState { CODING = "CODING", CODE_READY = "CODE_READY", } + +export interface CodeGenerationParams { + generationType: "create" | "update"; + image: string; + resultImage?: string; + history?: string[]; + // isImageGenerationEnabled: boolean; // TODO: Merge with Settings type in types.ts +} + +export type FullGenerationSettings = CodeGenerationParams & Settings;