Merge pull request #63 from clean99/feat/add-reset-button
Feat: add stop button when generating code
This commit is contained in:
commit
52b7ff7795
@ -1,4 +1,4 @@
|
|||||||
import { useState, useCallback } from "react";
|
import { useRef, useState, useCallback } from "react";
|
||||||
import ImageUpload from "./components/ImageUpload";
|
import ImageUpload from "./components/ImageUpload";
|
||||||
import CodePreview from "./components/CodePreview";
|
import CodePreview from "./components/CodePreview";
|
||||||
import Preview from "./components/Preview";
|
import Preview from "./components/Preview";
|
||||||
@ -14,24 +14,23 @@ import {
|
|||||||
FaUndo,
|
FaUndo,
|
||||||
} from "react-icons/fa";
|
} from "react-icons/fa";
|
||||||
import copy from "copy-to-clipboard";
|
import copy from "copy-to-clipboard";
|
||||||
|
import toast from "react-hot-toast";
|
||||||
import { Button } from "@/components/ui/button";
|
import { Button } from "@/components/ui/button";
|
||||||
import { Textarea } from "@/components/ui/textarea";
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
import { Tabs, TabsContent, TabsList, TabsTrigger } from "./components/ui/tabs";
|
import { Tabs, TabsContent, TabsList, TabsTrigger } from "./components/ui/tabs";
|
||||||
import CodeMirror from "./components/CodeMirror";
|
import CodeMirror from "./components/CodeMirror";
|
||||||
import SettingsDialog from "./components/SettingsDialog";
|
import SettingsDialog from "./components/SettingsDialog";
|
||||||
import { Settings } from "./types";
|
import { AppState, Settings } from "./types";
|
||||||
import { IS_RUNNING_ON_CLOUD } from "./config";
|
import { IS_RUNNING_ON_CLOUD } from "./config";
|
||||||
import { PicoBadge } from "./components/PicoBadge";
|
import { PicoBadge } from "./components/PicoBadge";
|
||||||
import { OnboardingNote } from "./components/OnboardingNote";
|
import { OnboardingNote } from "./components/OnboardingNote";
|
||||||
import { usePersistedState } from "./hooks/usePersistedState";
|
import { usePersistedState } from "./hooks/usePersistedState";
|
||||||
import { UrlInputSection } from "./components/UrlInputSection";
|
import { UrlInputSection } from "./components/UrlInputSection";
|
||||||
import TermsOfServiceDialog from "./components/TermsOfServiceDialog";
|
import TermsOfServiceDialog from "./components/TermsOfServiceDialog";
|
||||||
import toast from "react-hot-toast";
|
import { USER_CLOSE_WEB_SOCKET_CODE } from "./constants";
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
const [appState, setAppState] = useState<"INITIAL" | "CODING" | "CODE_READY">(
|
const [appState, setAppState] = useState<AppState>(AppState.INITIAL);
|
||||||
"INITIAL"
|
|
||||||
);
|
|
||||||
const [generatedCode, setGeneratedCode] = useState<string>("");
|
const [generatedCode, setGeneratedCode] = useState<string>("");
|
||||||
const [referenceImages, setReferenceImages] = useState<string[]>([]);
|
const [referenceImages, setReferenceImages] = useState<string[]>([]);
|
||||||
const [executionConsole, setExecutionConsole] = useState<string[]>([]);
|
const [executionConsole, setExecutionConsole] = useState<string[]>([]);
|
||||||
@ -46,6 +45,7 @@ function App() {
|
|||||||
},
|
},
|
||||||
"setting"
|
"setting"
|
||||||
);
|
);
|
||||||
|
const wsRef = useRef<WebSocket>(null);
|
||||||
|
|
||||||
const downloadCode = () => {
|
const downloadCode = () => {
|
||||||
// Create a blob from the generated code
|
// Create a blob from the generated code
|
||||||
@ -65,26 +65,31 @@ function App() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const reset = () => {
|
const reset = () => {
|
||||||
setAppState("INITIAL");
|
setAppState(AppState.INITIAL);
|
||||||
setGeneratedCode("");
|
setGeneratedCode("");
|
||||||
setReferenceImages([]);
|
setReferenceImages([]);
|
||||||
setExecutionConsole([]);
|
setExecutionConsole([]);
|
||||||
setHistory([]);
|
setHistory([]);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const stop = () => {
|
||||||
|
wsRef.current?.close?.(USER_CLOSE_WEB_SOCKET_CODE);
|
||||||
|
};
|
||||||
|
|
||||||
function doGenerateCode(params: CodeGenerationParams) {
|
function doGenerateCode(params: CodeGenerationParams) {
|
||||||
setExecutionConsole([]);
|
setExecutionConsole([]);
|
||||||
setAppState("CODING");
|
setAppState(AppState.CODING);
|
||||||
|
|
||||||
// Merge settings with params
|
// Merge settings with params
|
||||||
const updatedParams = { ...params, ...settings };
|
const updatedParams = { ...params, ...settings };
|
||||||
|
|
||||||
generateCode(
|
generateCode(
|
||||||
|
wsRef,
|
||||||
updatedParams,
|
updatedParams,
|
||||||
(token) => setGeneratedCode((prev) => prev + token),
|
(token) => setGeneratedCode((prev) => prev + token),
|
||||||
(code) => setGeneratedCode(code),
|
(code) => setGeneratedCode(code),
|
||||||
(line) => setExecutionConsole((prev) => [...prev, line]),
|
(line) => setExecutionConsole((prev) => [...prev, line]),
|
||||||
() => setAppState("CODE_READY")
|
() => setAppState(AppState.CODE_READY)
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -130,7 +135,7 @@ function App() {
|
|||||||
<h1 className="text-2xl ">Screenshot to Code</h1>
|
<h1 className="text-2xl ">Screenshot to Code</h1>
|
||||||
<SettingsDialog settings={settings} setSettings={setSettings} />
|
<SettingsDialog settings={settings} setSettings={setSettings} />
|
||||||
</div>
|
</div>
|
||||||
{appState === "INITIAL" && (
|
{appState === AppState.INITIAL && (
|
||||||
<h2 className="text-sm text-gray-500 mb-2">
|
<h2 className="text-sm text-gray-500 mb-2">
|
||||||
Drag & drop a screenshot to get started.
|
Drag & drop a screenshot to get started.
|
||||||
</h2>
|
</h2>
|
||||||
@ -138,20 +143,26 @@ function App() {
|
|||||||
|
|
||||||
{IS_RUNNING_ON_CLOUD && !settings.openAiApiKey && <OnboardingNote />}
|
{IS_RUNNING_ON_CLOUD && !settings.openAiApiKey && <OnboardingNote />}
|
||||||
|
|
||||||
{(appState === "CODING" || appState === "CODE_READY") && (
|
{(appState === AppState.CODING ||
|
||||||
|
appState === AppState.CODE_READY) && (
|
||||||
<>
|
<>
|
||||||
{/* Show code preview only when coding */}
|
{/* Show code preview only when coding */}
|
||||||
{appState === "CODING" && (
|
{appState === AppState.CODING && (
|
||||||
<div className="flex flex-col">
|
<div className="flex flex-col">
|
||||||
<div className="flex items-center gap-x-1">
|
<div className="flex items-center gap-x-1">
|
||||||
<Spinner />
|
<Spinner />
|
||||||
{executionConsole.slice(-1)[0]}
|
{executionConsole.slice(-1)[0]}
|
||||||
</div>
|
</div>
|
||||||
|
<div className="flex mt-4 w-full">
|
||||||
|
<Button onClick={stop} className="w-full">
|
||||||
|
Stop
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
<CodePreview code={generatedCode} />
|
<CodePreview code={generatedCode} />
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{appState === "CODE_READY" && (
|
{appState === AppState.CODE_READY && (
|
||||||
<div>
|
<div>
|
||||||
<div className="grid w-full gap-2">
|
<div className="grid w-full gap-2">
|
||||||
<Textarea
|
<Textarea
|
||||||
@ -184,7 +195,7 @@ function App() {
|
|||||||
<div className="flex flex-col">
|
<div className="flex flex-col">
|
||||||
<div
|
<div
|
||||||
className={classNames({
|
className={classNames({
|
||||||
"scanning relative": appState === "CODING",
|
"scanning relative": appState === AppState.CODING,
|
||||||
})}
|
})}
|
||||||
>
|
>
|
||||||
<img
|
<img
|
||||||
@ -217,7 +228,7 @@ function App() {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<main className="py-2 lg:pl-96">
|
<main className="py-2 lg:pl-96">
|
||||||
{appState === "INITIAL" && (
|
{appState === AppState.INITIAL && (
|
||||||
<div className="flex flex-col justify-center items-center gap-y-10">
|
<div className="flex flex-col justify-center items-center gap-y-10">
|
||||||
<ImageUpload setReferenceImages={doCreate} />
|
<ImageUpload setReferenceImages={doCreate} />
|
||||||
<UrlInputSection
|
<UrlInputSection
|
||||||
@ -227,7 +238,7 @@ function App() {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{(appState === "CODING" || appState === "CODE_READY") && (
|
{(appState === AppState.CODING || appState === AppState.CODE_READY) && (
|
||||||
<div className="ml-4">
|
<div className="ml-4">
|
||||||
<Tabs defaultValue="desktop">
|
<Tabs defaultValue="desktop">
|
||||||
<div className="flex justify-end mr-8 mb-4">
|
<div className="flex justify-end mr-8 mb-4">
|
||||||
|
|||||||
1
frontend/src/constants.ts
Normal file
1
frontend/src/constants.ts
Normal file
@ -0,0 +1 @@
|
|||||||
|
export const USER_CLOSE_WEB_SOCKET_CODE = 4333;
|
||||||
@ -1,9 +1,12 @@
|
|||||||
import toast from "react-hot-toast";
|
import toast from "react-hot-toast";
|
||||||
import { WS_BACKEND_URL } from "./config";
|
import { WS_BACKEND_URL } from "./config";
|
||||||
|
import { USER_CLOSE_WEB_SOCKET_CODE } from "./constants";
|
||||||
|
|
||||||
const ERROR_MESSAGE =
|
const ERROR_MESSAGE =
|
||||||
"Error generating code. Check the Developer Console for details. Feel free to open a Github issue";
|
"Error generating code. Check the Developer Console for details. Feel free to open a Github issue";
|
||||||
|
|
||||||
|
const STOP_MESSAGE = "Code generation stopped";
|
||||||
|
|
||||||
export interface CodeGenerationParams {
|
export interface CodeGenerationParams {
|
||||||
generationType: "create" | "update";
|
generationType: "create" | "update";
|
||||||
image: string;
|
image: string;
|
||||||
@ -12,6 +15,7 @@ export interface CodeGenerationParams {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function generateCode(
|
export function generateCode(
|
||||||
|
wsRef: React.MutableRefObject<WebSocket | null>,
|
||||||
params: CodeGenerationParams,
|
params: CodeGenerationParams,
|
||||||
onChange: (chunk: string) => void,
|
onChange: (chunk: string) => void,
|
||||||
onSetCode: (code: string) => void,
|
onSetCode: (code: string) => void,
|
||||||
@ -22,6 +26,7 @@ export function generateCode(
|
|||||||
console.log("Connecting to backend @ ", wsUrl);
|
console.log("Connecting to backend @ ", wsUrl);
|
||||||
|
|
||||||
const ws = new WebSocket(wsUrl);
|
const ws = new WebSocket(wsUrl);
|
||||||
|
wsRef.current = ws;
|
||||||
|
|
||||||
ws.addEventListener("open", () => {
|
ws.addEventListener("open", () => {
|
||||||
ws.send(JSON.stringify(params));
|
ws.send(JSON.stringify(params));
|
||||||
@ -40,13 +45,16 @@ export function generateCode(
|
|||||||
toast.error(response.value);
|
toast.error(response.value);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
ws.addEventListener("close", (event) => {
|
ws.addEventListener("close", (event) => {
|
||||||
console.log("Connection closed", event.code, event.reason);
|
console.log("Connection closed", event.code, event.reason);
|
||||||
if (event.code != 1000) {
|
if (event.code === USER_CLOSE_WEB_SOCKET_CODE) {
|
||||||
|
toast.success(STOP_MESSAGE);
|
||||||
|
onComplete();
|
||||||
|
} else if (event.code === 1000) {
|
||||||
|
onComplete();
|
||||||
|
} else {
|
||||||
console.error("WebSocket error code", event);
|
console.error("WebSocket error code", event);
|
||||||
toast.error(ERROR_MESSAGE);
|
toast.error(ERROR_MESSAGE);
|
||||||
} else {
|
|
||||||
onComplete();
|
onComplete();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|||||||
@ -4,3 +4,9 @@ export interface Settings {
|
|||||||
isImageGenerationEnabled: boolean;
|
isImageGenerationEnabled: boolean;
|
||||||
editorTheme: string;
|
editorTheme: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export enum AppState {
|
||||||
|
INITIAL = "INITIAL",
|
||||||
|
CODING = "CODING",
|
||||||
|
CODE_READY = "CODE_READY",
|
||||||
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user