Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Remove hardcoded new project template selection
Tomas Valentac676e9878689
diff --git a/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts b/components/Editor/Template/NodeJSExpressTemplate/useRoutes.tsindex c1411a024..53c9cf3f9 100644--- a/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts+++ b/components/Editor/Template/NodeJSExpressTemplate/useRoutes.ts@@ -106,14 +106,13 @@ function useRoutes(): {} else {i.Routes.push(route)}+ i.selectedRouteID = route.id})}, [setInstructions])useEffect(function addDefaultRoute() {if (routes === undefined || routes?.length === 0) {- const id = nanoid()addRoute()- selectRoute(id)}}, [routes, addRoute, selectRoute])diff --git a/components/NewProjectIDForm.tsx b/components/NewProjectIDForm.tsxindex d8bb53697..8c19f19e0 100644--- a/components/NewProjectIDForm.tsx+++ b/components/NewProjectIDForm.tsx@@ -22,7 +22,7 @@ function NewProjectIDForm({space-y-6roundedborder- p-8+ p-6flexflex-colbg-whitediff --git a/components/NewProjectTemplateForm.tsx b/components/NewProjectTemplateForm.tsxindex 1ffab5798..a13bb18d1 100644--- a/components/NewProjectTemplateForm.tsx+++ b/components/NewProjectTemplateForm.tsx@@ -1,15 +1,17 @@import SpinnerIcon from 'components/Spinner'import Text from 'components/Text'import Button from 'components/Button'-import NodejsIcon from 'components/icons/Nodejs'import {CreationState,} from 'utils/newProjectState'+import { TemplateID, templates } from 'state/template'+import TemplateButton from './TemplateButton'+import { useState } from 'react'export interface Props {state: CreationState- onBack: (e: any) => void- onCreate: (e: any) => void+ onBack: () => void+ onCreate: (templateID: TemplateID) => void}function NewProjectTemplateForm({@@ -17,74 +19,48 @@ function NewProjectTemplateForm({onBack,onCreate,}: Props) {+ const [selectedTemplateID, setSelectedTemplateID] = useState<TemplateID>(TemplateID.NodeJSExpress)+return (<div className="space-y-6roundedborder- p-8- flex- flex-col+ p-6bg-white- ">- <div className="- flex- flex-col- items-start- space-y-1">+ <div className="space-y-1"><Textsize={Text.size.S3}text="Select template"/><div className="- flex- gap-2- ">+ sm:grid-cols-2+ grid+ gap-2+ ">+ {Object.values(TemplateID).map(t =>+ <TemplateButton+ key={t}+ onClick={() => setSelectedTemplateID(t)}+ template={templates[t]}+ isSelected={t === selectedTemplateID}+ />+ )}<div className="- py-2- px-4- bg-transparent- cursor-pointer- border- border-green-800- rounded+ justify-center+ items-center+ border-dashed+ rounded+ border-2+ border-slate-200+ py-4+ flex">- <div className="- flex- space-x-6- items-center- ">- <NodejsIcon- className="text-3xl"- />- <div className="- flex- flex-col- items-start- space-y-0.5- ">- <Text- className="- font-semibold- text-slate-700- "- text="REST API Server"- />- <Text- size={Text.size.S3}- className="- text-slate-500- "- text="JavaScript + Express"- />- </div>- </div>+ <Text+ text="More coming soon"+ /></div>-- <Text- text="More coming soon"- /></div></div><div className="@@ -101,7 +77,7 @@ function NewProjectTemplateForm({icon={state === CreationState.CreatingProject ? <SpinnerIcon /> : null}variant={Button.variant.Full}text={state === CreationState.CreatingProject ? 'Creating...' : 'Create'}- onClick={onCreate}+ onClick={() => onCreate(selectedTemplateID)}/></div></div>diff --git a/components/TemplateButton.tsx b/components/TemplateButton.tsxnew file mode 100644index 000000000..3e6aca1bd--- /dev/null+++ b/components/TemplateButton.tsx@@ -0,0 +1,65 @@+import clsx from 'clsx'+import { Template } from 'state/template'+import Text from './Text'++export interface Props {+ onClick: () => void+ template: Template+ isSelected?: boolean+}++function TemplateButton({+ onClick,+ template,+ isSelected,+}: Props) {+ return (+ <div+ onClick={onClick}+ className={clsx(`+ py-2+ px-4+ cursor-pointer+ border+ border-green-800+ rounded`,+ {+ 'border-green-800': isSelected,+ 'border-transparent': !isSelected,+ },+ )}>+ <div className="+ flex+ space-x-6+ items-center+ ">+ <div className="h-8 w-8">+ {template.icon}+ </div>+ <div className="+ flex+ flex-col+ items-start+ space-y-0.5+ ">+ <Text+ className="+ font-semibold+ text-slate-700+ "+ text={template.description}+ />+ <Text+ size={Text.size.S3}+ className="+ text-slate-500+ "+ text={template.stackDescription}+ />+ </div>+ </div>+ </div>+ )+}++export default TemplateButtondiff --git a/components/icons/Nodejs.tsx b/components/icons/Nodejs.tsxindex 57a6e1856..fe67c7a73 100644--- a/components/icons/Nodejs.tsx+++ b/components/icons/Nodejs.tsx@@ -2,7 +2,6 @@ export interface Props {className?: string}function Nodejs({-className,}: Props) {return (@@ -11,8 +10,6 @@ function Nodejs({xmlns="http://www.w3.org/2000/svg"viewBox="0 0 16 16"fill="#689F63"- width="1em"- height="1em"><path d="M8 15.9c-.2 0-.42-.06-.6-.17l-1.93-1.14c-.3-.17-.15-.22-.06-.26.39-.13.47-.16.88-.4.04-.02.1 0 .14.02l1.48.88a.2.2 0 00.18 0l5.79-3.34c.05-.03.08-.1.08-.16V4.66a.19.19 0 00-.09-.16L8.1 1.16a.18.18 0 00-.17 0L2.14 4.5c-.06.03-.1.1-.1.16v6.67c0 .06.04.13.1.16l1.58.91c.86.43 1.38-.08 1.38-.59V5.23c0-.1.08-.17.17-.17H6c.1 0 .17.07.17.17v6.59c0 1.14-.63 1.8-1.71 1.8-.34 0-.6 0-1.34-.36l-1.51-.87A1.22 1.22 0 011 11.33V4.66c0-.44.23-.84.6-1.06L7.4.26c.36-.2.85-.2 1.21 0l5.78 3.35A1.22 1.22 0 0115 4.66v6.67c0 .44-.23.84-.6 1.06l-5.8 3.34c-.18.1-.4.16-.6.16m1.79-4.59c-2.53 0-3.06-1.17-3.06-2.14 0-.1.07-.17.17-.17h.74c.09 0 .15.06.17.14.11.76.45 1.15 1.98 1.15 1.22 0 1.73-.28 1.73-.92 0-.38-.14-.65-2.04-.84-1.58-.15-2.56-.5-2.56-1.77 0-1.17.98-1.86 2.63-1.86 1.85 0 2.77.64 2.89 2.02a.17.17 0 01-.17.18h-.75a.17.17 0 01-.16-.13c-.18-.8-.62-1.05-1.8-1.05-1.34 0-1.5.46-1.5.8 0 .43.19.55 1.98.79 1.78.24 2.62.57 2.62 1.82 0 1.26-1.05 1.98-2.88 1.98z"></path></svg>diff --git a/pages/api/project.ts b/pages/api/project.tsindex bc759b95b..d2e0f9608 100644--- a/pages/api/project.ts+++ b/pages/api/project.ts@@ -1,16 +1,15 @@import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'import { NextApiRequest, NextApiResponse } from 'next'+import { PostProjectBody } from 'pages/new'+import { prisma } from 'db/prisma'import { serverCreds } from 'db/credentials'-export interface PostProjectBody {- id: string-}-async function postProject(req: NextApiRequest, res: NextApiResponse) {const {id,+ state,} = req.body as PostProjectBodytry {@@ -51,6 +50,7 @@ async function postProject(req: NextApiRequest, res: NextApiResponse) {const project = await prisma.projects.create({data: {id,+ data: { state } as any,teams: {connect: {id: defaultTeam.teams.id,diff --git a/pages/new.tsx b/pages/new.tsxindex d9e727ee5..31a6f3c74 100644--- a/pages/new.tsx+++ b/pages/new.tsx@@ -17,11 +17,14 @@ import {CreationState,CreationEvent,} from 'utils/newProjectState'+import { TemplateID } from 'state/template'+import { getDefaultState, SerializedState } from 'state/store'const invalidChars = /[^a-zA-Z0-9\-]/-interface PostProjectBody {+export interface PostProjectBody {id: string+ state: SerializedState}const reducer: Reducer<CreationState, CreationEvent> = (state, event) => {@@ -72,12 +75,15 @@ function NewProject() {trigger: createProject,} = useSWRMutation('/api/project', handlePostProject)- async function confirmTemplate() {+ async function confirmTemplate(templateID: TemplateID) {dispatch(CreationEvent.ConfirmTemplate)try {+ const state = getDefaultState(templateID)+const project = await createProject({- id: trimmedID+ id: trimmedID,+ state,})if (project && 'statusCode' in project) {@@ -123,7 +129,7 @@ function NewProject() {flex-1flex-colspace-x-0- space-y-8+ space-y-6overflow-hiddenp-8lg:p-12@@ -139,7 +145,7 @@ function NewProject() {</div><div className="flex flex-1 justify-center overflow-hidden min-h-[200px]">- <div className="w-[450px] max-h-[600px] flex flex-col space-y-2 overflow-hidden">+ <div className="w-[500px] max-h-[600px] flex flex-col space-y-2 overflow-hidden"><div className="flex space-x-2 items-center transition-all"><Texttext="Configure New Project"diff --git a/state/store.ts b/state/store.tsindex 7214c23b6..81b8d048e 100644--- a/state/store.ts+++ b/state/store.ts@@ -59,7 +59,7 @@ export interface State extends SerializedState {getSelectedModelConfig: () => ModelConfig | null}-function getDefaultState(templateID: TemplateID): SerializedState {+export function getDefaultState(templateID: TemplateID): SerializedState {const defaultModelConfig = getDefaultModelConfig(templateID)return {diff --git a/state/template.tsx b/state/template.tsxindex cf4e8fa12..ade619ffc 100644--- a/state/template.tsx+++ b/state/template.tsx@@ -1,6 +1,8 @@import { ReactNode } from 'react'+import NodeJSIcon from 'components/icons/Nodejs'import NodeJSExpressTemplate from 'components/Editor/Template/NodeJSExpressTemplate'+import { PromptFragment } from './prompt'export enum TemplateID {@@ -10,13 +12,19 @@ export enum TemplateID {export interface Template {component: ReactNodeprompt: PromptFragment[]+ description: string+ stackDescription: string+ icon: ReactNode}export const templates: {[templateID in keyof typeof TemplateID]: Template} = {[TemplateID.NodeJSExpress]: {+ description: 'REST API Server',+ stackDescription: 'JavaScript + Express',component: <NodeJSExpressTemplate />,+ icon: <NodeJSIcon />,prompt: [{role: 'system',