Drop in a screenshot and convert it to clean code (HTML/Tailwind/React/Vue)
Python
Merge branch 'main' into pr/62
Abi Raja339f07373aca
diff --cc backend/main.pyindex bd161c86,4c5823b1..fd2e7e26--- a/backend/main.py+++ b/backend/main.py@@@ -90,12 -110,7 +110,21 @@@ async def stream_code(websocket: WebSoc})return- # openai_base_url="https://flag.smarttrot.com/v1"+++ # Get the OpenAI Base URL from the request. Fall back to environment variable if not provided.++ openai_base_url = None++ if params["openAiBaseURL"]:++ openai_base_url = params["openAiBaseURL"]++ print("Using OpenAI Base URL from client-side settings dialog")++ else:++ openai_base_url = os.environ.get("OPENAI_BASE_URL")++ if openai_base_url:++ print("Using OpenAI Base URL from environment variable")+++ if not openai_base_url:- openai_base_url = None+ print("Using Offical OpenAI Base URL")+-++ # Get the image generation flag from the request. Fall back to True if not provided.should_generate_images = (params["isImageGenerationEnabled"]if "isImageGenerationEnabled" in params@@@ -129,7 -149,6 +163,7 @@@completion = await stream_openai_response(prompt_messages,api_key=openai_api_key,- base_url = openai_base_url,++ base_url=openai_base_url,callback=lambda x: process_chunk(x),)@@@ -142,7 -161,7 +176,10 @@@{"type": "status", "value": "Generating images..."})updated_html = await generate_images(- completion, api_key=openai_api_key, base_url=openai_base_url, image_cache=image_cache- completion, api_key=openai_api_key, image_cache=image_cache++ completion,++ api_key=openai_api_key,++ base_url=openai_base_url,++ image_cache=image_cache,)else:updated_html = completiondiff --cc frontend/src/App.tsxindex 7e89041e,89111656..ed416da8--- a/frontend/src/App.tsx+++ b/frontend/src/App.tsx@@@ -37,10 -47,11 +47,12 @@@ function App()const [settings, setSettings] = usePersistedState<Settings>({openAiApiKey: null,+ openAiBaseURL: null,screenshotOneApiKey: null,isImageGenerationEnabled: true,- editorTheme: "cobalt",+ editorTheme: EditorTheme.COBALT,+ isTermOfServiceAccepted: false,+ accessCode: null,},"setting");diff --cc frontend/src/components/SettingsDialog.tsxindex 411dad0c,361d1945..60d644a6--- a/frontend/src/components/SettingsDialog.tsx+++ b/frontend/src/components/SettingsDialog.tsx@@@ -75,67 -108,91 +108,110 @@@ function SettingsDialog({ settings, set}))}/>++ <Label htmlFor="openai-api-key">+ <div>OpenAI Base URL</div>+ <div className="font-light mt-2 leading-relaxed">+ You can replace it for the third api server.+ </div>+ </Label>++ <Input+ id="openai-base-url"+ placeholder="OpenAI Base Url"+ value={settings.openAiBaseURL || ""}+ onChange={(e) =>+ setSettings((s) => ({+ ...s,+ openAiBaseURL: e.target.value,+ }))+ }+ />- <Label htmlFor="screenshot-one-api-key">- <div>ScreenshotOne API key</div>- <div className="font-light mt-2 leading-relaxed">- Only stored in your browser. Never stored on servers.{" "}- <a- href="https://screenshotone.com?via=screenshot-to-code"- className="underline"- target="_blank"- >- Get 100 screenshots/mo for free.- </a>- </div>- </Label>+ <Accordion type="single" collapsible className="w-full">+ <AccordionItem value="item-1">+ <AccordionTrigger>Screenshot by URL Config</AccordionTrigger>+ <AccordionContent>+ <Label htmlFor="screenshot-one-api-key">+ <div className="leading-normal font-normal text-xs">+ If you want to use URLs directly instead of taking the+ screenshot yourself, add a ScreenshotOne API key.{" "}+ <a+ href="https://screenshotone.com?via=screenshot-to-code"+ className="underline"+ target="_blank"+ >+ Get 100 screenshots/mo for free.+ </a>+ </div>+ </Label>- <Input- id="screenshot-one-api-key"- placeholder="ScreenshotOne API key"- value={settings.screenshotOneApiKey || ""}- onChange={(e) =>- setSettings((s) => ({- ...s,- screenshotOneApiKey: e.target.value,- }))- }- />+ <Input+ id="screenshot-one-api-key"+ className="mt-2"+ placeholder="ScreenshotOne API key"+ value={settings.screenshotOneApiKey || ""}+ onChange={(e) =>+ setSettings((s) => ({+ ...s,+ screenshotOneApiKey: e.target.value,+ }))+ }+ />+ </AccordionContent>+ </AccordionItem>+ </Accordion>- <Label htmlFor="editor-theme">- <div>Editor Theme</div>- </Label>- <div>- <Select // Use the custom Select component here- id="editor-theme"- value={settings.editorTheme}- onChange={(e: React.ChangeEvent<HTMLSelectElement>) =>- handleThemeChange(e.target.value)- }- >- <option value="cobalt">Cobalt</option>- <option value="espresso">Espresso</option>- </Select>- </div>+ <Accordion type="single" collapsible className="w-full">+ <AccordionItem value="item-1">+ <AccordionTrigger>Theme Settings</AccordionTrigger>+ <AccordionContent className="space-y-4 flex flex-col">+ <div className="flex items-center justify-between">+ <Label htmlFor="app-theme">+ <div>App Theme</div>+ </Label>+ <div>+ <button+ className="flex rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors file:border-0 file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50t"+ onClick={() => {+ document+ .querySelector("div.mt-2")+ ?.classList.toggle("dark"); // enable dark mode for sidebar+ document.body.classList.toggle("dark");+ document+ .querySelector('div[role="presentation"]')+ ?.classList.toggle("dark"); // enable dark mode for upload container+ }}+ >+ Toggle dark mode+ </button>+ </div>+ </div>+ <div className="flex items-center justify-between">+ <Label htmlFor="editor-theme">+ <div>Code Editor Theme</div>+ </Label>+ <div>+ <Select // Use the custom Select component here+ name="editor-theme"+ value={settings.editorTheme}+ onValueChange={(value) =>+ handleThemeChange(value as EditorTheme)+ }+ >+ <SelectTrigger className="w-[180px]">+ {capitalize(settings.editorTheme)}+ </SelectTrigger>+ <SelectContent>+ <SelectItem value="cobalt">Cobalt</SelectItem>+ <SelectItem value="espresso">Espresso</SelectItem>+ </SelectContent>+ </Select>+ </div>+ </div>+ </AccordionContent>+ </AccordionItem>+ </Accordion></div><DialogFooter>diff --cc frontend/src/types.tsindex 0fc532fc,42b06f9a..137f7701--- a/frontend/src/types.ts+++ b/frontend/src/types.ts@@@ -1,7 -1,35 +1,36 @@@+ export enum EditorTheme {+ ESPRESSO = "espresso",+ COBALT = "cobalt",+ }++ export enum CSSOption {+ TAILWIND = "tailwind",+ BOOTSTRAP = "bootstrap",+ }++ export enum JSFrameworkOption {+ NO_FRAMEWORK = "vanilla",+ REACT = "react",+ VUE = "vue",+ }++ export interface OutputSettings {+ css: CSSOption;+ js: JSFrameworkOption;+ }+export interface Settings {openAiApiKey: string | null;+ openAiBaseURL: string | null;screenshotOneApiKey: string | null;isImageGenerationEnabled: boolean;- editorTheme: string;+ editorTheme: EditorTheme;+ isTermOfServiceAccepted: boolean; // Only relevant for hosted version+ accessCode: string | null; // Only relevant for hosted version+ }++ export enum AppState {+ INITIAL = "INITIAL",+ CODING = "CODING",+ CODE_READY = "CODE_READY",}