update remaining variable names for GeneratedCodeConfig

This commit is contained in:
Abi Raja 2024-01-09 08:12:33 -08:00
parent 3723c81a04
commit 7bc368d9bf
6 changed files with 28 additions and 43 deletions

View File

@ -18,13 +18,7 @@ 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 {
AppState,
CodeGenerationParams,
EditorTheme,
GeneratedCodeConfig,
Settings,
} from "./types";
import { AppState, CodeGenerationParams, EditorTheme, Settings } from "./types";
import { IS_RUNNING_ON_CLOUD } from "./config";
import { PicoBadge } from "./components/PicoBadge";
import { OnboardingNote } from "./components/OnboardingNote";
@ -40,6 +34,7 @@ import HistoryDisplay from "./components/history/HistoryDisplay";
import { extractHistoryTree } from "./components/history/utils";
import toast from "react-hot-toast";
import ImportCodeSection from "./components/ImportCodeSection";
import { Stack } from "./lib/stacks/types";
const IS_OPENAI_DOWN = false;
@ -60,7 +55,7 @@ function App() {
screenshotOneApiKey: null,
isImageGenerationEnabled: true,
editorTheme: EditorTheme.COBALT,
generatedCodeConfig: GeneratedCodeConfig.HTML_TAILWIND,
generatedCodeConfig: Stack.HTML_TAILWIND,
// Only relevant for hosted version
isTermOfServiceAccepted: false,
accessCode: null,
@ -85,7 +80,7 @@ function App() {
if (!settings.generatedCodeConfig) {
setSettings((prev) => ({
...prev,
generatedCodeConfig: GeneratedCodeConfig.HTML_TAILWIND,
generatedCodeConfig: Stack.HTML_TAILWIND,
}));
}
}, [settings.generatedCodeConfig, setSettings]);
@ -289,15 +284,14 @@ function App() {
}));
};
// TODO: Rename everything to "stack" instead of "config"
function setStack(stack: GeneratedCodeConfig) {
function setStack(stack: Stack) {
setSettings((prev) => ({
...prev,
generatedCodeConfig: stack,
}));
}
function importFromCode(code: string, stack: GeneratedCodeConfig) {
function importFromCode(code: string, stack: Stack) {
setIsImportedFromCode(true);
// Set up this project
@ -333,8 +327,8 @@ function App() {
</div>
<OutputSettingsSection
generatedCodeConfig={settings.generatedCodeConfig}
setGeneratedCodeConfig={(config) => setStack(config)}
stack={settings.generatedCodeConfig}
setStack={(config) => setStack(config)}
shouldDisableUpdates={
appState === AppState.CODING || appState === AppState.CODE_READY
}

View File

@ -11,18 +11,16 @@ import {
} from "./ui/dialog";
import { Textarea } from "./ui/textarea";
import OutputSettingsSection from "./OutputSettingsSection";
import { GeneratedCodeConfig } from "../types";
import toast from "react-hot-toast";
import { Stack } from "../lib/stacks/types";
interface Props {
importFromCode: (code: string, stack: GeneratedCodeConfig) => void;
importFromCode: (code: string, stack: Stack) => void;
}
function ImportCodeSection({ importFromCode }: Props) {
const [code, setCode] = useState("");
const [stack, setStack] = useState<GeneratedCodeConfig | undefined>(
undefined
);
const [stack, setStack] = useState<Stack | undefined>(undefined);
const doImport = () => {
if (code === "") {
@ -57,10 +55,8 @@ function ImportCodeSection({ importFromCode }: Props) {
/>
<OutputSettingsSection
generatedCodeConfig={stack}
setGeneratedCodeConfig={(config: GeneratedCodeConfig) =>
setStack(config)
}
stack={stack}
setStack={(config: Stack) => setStack(config)}
label="Stack:"
shouldDisableUpdates={false}
/>

View File

@ -7,10 +7,10 @@ import {
SelectTrigger,
} from "./ui/select";
import { Badge } from "./ui/badge";
import { GeneratedCodeConfig } from "../lib/stacks/types";
import { Stack } from "../lib/stacks/types";
import { STACK_DESCRIPTIONS } from "../lib/stacks/descriptions";
function generateDisplayComponent(stack: GeneratedCodeConfig) {
function generateDisplayComponent(stack: Stack) {
const stackComponents = STACK_DESCRIPTIONS[stack].components;
return (
@ -26,15 +26,15 @@ function generateDisplayComponent(stack: GeneratedCodeConfig) {
}
interface Props {
generatedCodeConfig: GeneratedCodeConfig | undefined;
setGeneratedCodeConfig: (config: GeneratedCodeConfig) => void;
stack: Stack | undefined;
setStack: (config: Stack) => void;
label?: string;
shouldDisableUpdates?: boolean;
}
function OutputSettingsSection({
generatedCodeConfig,
setGeneratedCodeConfig,
stack,
setStack,
label = "Generating:",
shouldDisableUpdates = false,
}: Props) {
@ -43,20 +43,16 @@ function OutputSettingsSection({
<div className="grid grid-cols-3 items-center gap-4">
<span>{label}</span>
<Select
value={generatedCodeConfig}
onValueChange={(value: string) =>
setGeneratedCodeConfig(value as GeneratedCodeConfig)
}
value={stack}
onValueChange={(value: string) => setStack(value as Stack)}
disabled={shouldDisableUpdates}
>
<SelectTrigger className="col-span-2" id="output-settings-js">
{generatedCodeConfig
? generateDisplayComponent(generatedCodeConfig)
: "Select a stack"}
{stack ? generateDisplayComponent(stack) : "Select a stack"}
</SelectTrigger>
<SelectContent>
<SelectGroup>
{Object.values(GeneratedCodeConfig).map((stack) => (
{Object.values(Stack).map((stack) => (
<SelectItem value={stack}>
<div className="flex items-center">
{generateDisplayComponent(stack)}

View File

@ -1,7 +1,7 @@
import { GeneratedCodeConfig } from "./types";
import { Stack } from "./types";
export const STACK_DESCRIPTIONS: {
[key in GeneratedCodeConfig]: { components: string[]; inBeta: boolean };
[key in Stack]: { components: string[]; inBeta: boolean };
} = {
html_tailwind: { components: ["HTML", "Tailwind"], inBeta: false },
react_tailwind: { components: ["React", "Tailwind"], inBeta: false },

View File

@ -1,5 +1,5 @@
// Keep in sync with backend (prompts/types.py)
export enum GeneratedCodeConfig {
export enum Stack {
HTML_TAILWIND = "html_tailwind",
REACT_TAILWIND = "react_tailwind",
BOOTSTRAP = "bootstrap",

View File

@ -1,4 +1,4 @@
import { GeneratedCodeConfig } from "./lib/stacks/types";
import { Stack } from "./lib/stacks/types";
export enum EditorTheme {
ESPRESSO = "espresso",
@ -11,7 +11,7 @@ export interface Settings {
screenshotOneApiKey: string | null;
isImageGenerationEnabled: boolean;
editorTheme: EditorTheme;
generatedCodeConfig: GeneratedCodeConfig;
generatedCodeConfig: Stack;
// Only relevant for hosted version
isTermOfServiceAccepted: boolean;
accessCode: string | null;
@ -32,4 +32,3 @@ export interface CodeGenerationParams {
}
export type FullGenerationSettings = CodeGenerationParams & Settings;
export { GeneratedCodeConfig };