Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Rebuild the select repo screen

Vasek Mlejnskyfa1354523418
diff --git a/components/RepositoriesList.tsx b/components/RepositoriesList.tsx
index db7d8d4f5..1fa02857d 100644
--- a/components/RepositoriesList.tsx
+++ b/components/RepositoriesList.tsx
@@ -1,80 +1,49 @@
-const people = [
- {
- name: 'Leslie Alexander',
- email: '[email protected]',
- role: 'Co-Founder / CEO',
- imageUrl:
- 'https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Michael Foster',
- email: '[email protected]',
- role: 'Co-Founder / CTO',
- imageUrl:
- 'https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Dries Vincent',
- email: '[email protected]',
- role: 'Business Relations',
- imageUrl:
- 'https://images.unsplash.com/photo-1506794778202-cad84cf45f1d?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: null,
- },
- {
- name: 'Lindsay Walton',
- email: '[email protected]',
- role: 'Front-end Developer',
- imageUrl:
- 'https://images.unsplash.com/photo-1517841905240-472988babdf9?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Courtney Henry',
- email: '[email protected]',
- role: 'Designer',
- imageUrl:
- 'https://images.unsplash.com/photo-1438761681033-6461ffad8d80?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Tom Cook',
- email: '[email protected]',
- role: 'Director of Product',
- imageUrl:
- 'https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: null,
- },
-]
+import {
+ Check,
+} from 'lucide-react'
-function RepositoriesList() {
+export interface Props {
+ repos: {
+ id: number
+ owner: string
+ name: string
+ language?: string
+ }[]
+ selectedRepositoryID?: number
+ onRepoSelection: (repoID: number) => void
+}
+
+function RepositoriesList({
+ repos,
+ selectedRepositoryID,
+ onRepoSelection,
+}: Props) {
return (
- <ul role="list" className="overflow-auto divide-y divide-gray-800">
- {people.map((person) => (
- <li key={person.email} className="px-2 flex items-center justify-between py-5">
- <div className="flex gap-x-4">
- <img
- className="h-12 w-12 flex-none rounded-full bg-gray-800"
- src={person.imageUrl}
- alt=""
- />
- <div className="min-w-0 flex-auto">
- <p className="text-sm font-semibold leading-6 text-white">{person.name}</p>
- <p className="mt-1 truncate text-xs leading-5 text-gray-400">{person.email}</p>
+ <ul role="list" className="w-full overflow-auto divide-y divide-gray-700">
+ {repos.map((r) => (
+ <li key={r.id} className="px-2 flex items-center justify-between py-5 h-[70px]">
+ <div className="flex flex-col items-start justify-start">
+ <div className="flex items-center space-x-1">
+ <p className="text-xs leading-6 text-white">{r.owner}</p>
+ <p className="text-xs text-white">/</p>
+ <p className="text-sm font-semibold leading-6 text-white">{r.name}</p>
</div>
+ <p className="text-xs leading-6 text-gray-400">{r.language}</p>
</div>
- <button
- type="button"
- className="rounded bg-white/10 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-white/20"
- >
- Select
- </button>
+ {r.id === selectedRepositoryID ? (
+ <div className="flex items-center space-x-1">
+ <span className="text-xs text-gray-400">Selected</span>
+ <Check size={16} className="text-green-300" />
+ </div>
+ ) : (
+ <button
+ type="button"
+ className="rounded bg-white/10 px-2 py-1 text-sm font-semibold text-white shadow-sm hover:bg-white/20"
+ onClick={() => onRepoSelection(r.id)}
+ >
+ Select
+ </button>
+ )}
</li>
))}
</ul>
diff --git a/components/SelectRepository.tsx b/components/SelectRepository.tsx
new file mode 100644
index 000000000..0ea8c4b33
--- /dev/null
+++ b/components/SelectRepository.tsx
@@ -0,0 +1,110 @@
+import {
+ Github,
+} from 'lucide-react'
+import {
+ useUser,
+} from '@supabase/auth-helpers-react'
+
+import { configureGitHubApp } from 'utils/github'
+import RepositoriesList from 'components/RepositoriesList'
+import SpinnerIcon from 'components/Spinner'
+
+export interface Props {
+ repos?: any[]
+ hasAccessToken: boolean
+ selectedRepositoryID?: number
+ onRepoSelection: (repoID: number) => void
+}
+
+function SelectRepository({
+ repos,
+ hasAccessToken,
+ selectedRepositoryID,
+ onRepoSelection,
+}: Props) {
+ const user = useUser()
+ const ghUsername: string = user?.user_metadata['user_name'] || ''
+
+ return (
+ <>
+ <h2 className="text-3xl font-bold tracking-tight text-white sm:text-4xl">
+ Select Git Repository
+ </h2>
+ <p className="mt-2 mb-6 text-lg leading-8 text-gray-400">
+ Select a git repository to which you want to give the AI developer access.
+ </p>
+
+ {!user && (
+ <div
+ className="
+ flex
+ justify-center
+ "
+ >
+ <SpinnerIcon className="text-slate-400" />
+ </div>
+ )}
+
+ {user && (
+ <>
+ {ghUsername && (
+ <span className="mb-1 text-xs text-gray-400 font-semibold">
+ {ghUsername}{ghUsername.endsWith('s') ? "'" : "'s"} repositories
+ </span>
+ )}
+ <div className="overflow-hidden flex-1 flex flex-col items-center justify-center border border-gray-700 rounded-md">
+ {!hasAccessToken && (
+ <button
+ type="button"
+ className="flex items-center space-x-2 rounded-md bg-white/10 px-3.5 py-2 text-sm font-semibold text-white shadow-sm hover:bg-white/20 transition-all"
+ onClick={configureGitHubApp}
+ >
+ <Github size={16} />
+ <span>Configure GitHub Permissions</span>
+ </button>
+ )}
+
+ {hasAccessToken && (
+ <>
+ {!repos && (
+ <div className="flex justify-center">
+ <SpinnerIcon className="text-slate-400" />
+ </div>
+ )}
+ {repos && repos.length === 0 && (
+ <>
+ <span className="mb-2 text-sm text-gray-400 font-semibold">
+ No connected repositories found
+ </span>
+ <button
+ type="button"
+ className="flex items-center space-x-2 rounded-md bg-white/10 px-3.5 py-2 text-sm font-semibold text-white shadow-sm hover:bg-white/20 transition-all"
+ onClick={configureGitHubApp}
+ >
+ <Github size={16} />
+ <span>Configure GitHub Permissions</span>
+ </button>
+ </>
+ )}
+ {repos && repos.length > 0 && (
+ <RepositoriesList
+ repos={repos.sort((a, b) => (new Date(b.updated_at) as any) - (new Date(a.updated_at) as any)).map(r => ({
+ id: r.id,
+ owner: r.owner.login,
+ name: r.name,
+ language: r.language,
+ }))}
+ selectedRepositoryID={selectedRepositoryID}
+ onRepoSelection={onRepoSelection}
+ />
+ )}
+ </>
+ )}
+ </div>
+ </>
+ )}
+ </>
+ )
+}
+
+export default SelectRepository
diff --git a/components/Steps.tsx b/components/Steps.tsx
index 9190d1cb7..aba4cd8c2 100644
--- a/components/Steps.tsx
+++ b/components/Steps.tsx
@@ -1,39 +1,43 @@
-const steps = [
- { name: 'Step 1', href: '#repo', status: 'current' },
- { name: 'Step 2', href: '#instructions', status: 'upcoming' },
- { name: 'Step 3', href: '#keys', status: 'upcoming' },
-]
+export interface Props {
+ steps: { name: string, status: string }[]
+}
-function Steps() {
+function Steps({
+ steps,
+}: Props) {
+ const currentName = steps.find(s => s.status === 'current')?.name
return (
- <nav className="flex items-center justify-center" aria-label="Progress">
- <ol role="list" className="ml-8 flex items-center space-x-5">
- <p className="text-gray-400 text-sm font-medium">
- Step {steps.findIndex((step) => step.status === 'current') + 1} of {steps.length}
- </p>
+ <div className="px-px w-full flex items-center justify-center">
+ <ol role="list" className="w-full flex items-center space-x-5">
+ <div className="w-full flex items-center justify-between">
+ <span className="text-xs font-medium text-white">{currentName}</span>
+ <p className="text-gray-400 text-xs font-medium">
+ Step {steps.findIndex((step) => step.status === 'current') + 1} of {steps.length}
+ </p>
+ </div>
{steps.map((step) => (
<li key={step.name}>
{step.status === 'complete' ? (
- <a href={step.href} className="block h-2.5 w-2.5 rounded-full bg-indigo-500">
+ <div className="block h-2.5 w-2.5 rounded-full bg-indigo-500">
<span className="sr-only">{step.name}</span>
- </a>
+ </div>
) : step.status === 'current' ? (
- <a href={step.href} className="relative flex items-center justify-center" aria-current="step">
- <span className="absolute flex h-5 w-5 p-px" aria-hidden="true">
+ <div className="relative flex items-center justify-center">
+ <span className="absolute flex h-5 w-5 p-px">
<span className="h-full w-full rounded-full bg-indigo-600/30 ring-1 ring-inset ring-indigo-500/20" />
</span>
- <span className="relative block h-2.5 w-2.5 rounded-full bg-indigo-500" aria-hidden="true" />
+ <span className="relative block h-2.5 w-2.5 rounded-full bg-indigo-500" />
<span className="sr-only">{step.name}</span>
- </a>
+ </div>
) : (
- <a href={step.href} className="block h-2.5 w-2.5 rounded-full bg-white/5 ring-1 ring-white/10 hover:bg-gray-500 transition-all">
+ <div className="block h-2.5 w-2.5 rounded-full bg-white/5 ring-1 ring-white/10">
<span className="sr-only">{step.name}</span>
- </a>
+ </div>
)}
</li>
))}
</ol>
- </nav>
+ </div>
)
}
diff --git a/hooks/useRepositories.ts b/hooks/useRepositories.ts
index e3e9b38a0..e39068a68 100644
--- a/hooks/useRepositories.ts
+++ b/hooks/useRepositories.ts
@@ -17,10 +17,13 @@ async function fetchRepos(client: GitHubClient) {
'If-Modified-Since': 'Sun, 14 Nov 2021 13:42:15 GMT',
},
})
- return repos.data.repositories.map(r => ({
- ...r,
- installation_id: i.id,
- }))
+
+ return repos.data.repositories.map(r => {
+ return {
+ ...r,
+ installation_id: i.id,
+ }
+ })
} catch (err) {
console.error(err)
return []
diff --git a/pages/agent/smol-developer/setup.tsx b/pages/agent/smol-developer/setup.tsx
index 1f84e688a..ce038cb7b 100644
--- a/pages/agent/smol-developer/setup.tsx
+++ b/pages/agent/smol-developer/setup.tsx
@@ -16,24 +16,6 @@ import { getDefaultModelConfig, getModelArgs, ModelConfig } from 'state/model'
import { TemplateID } from 'state/template'
import { Creds } from 'hooks/useModelProviderArgs'
-export const getServerSideProps: GetServerSideProps = async (ctx) => {
- const supabase = createServerSupabaseClient(ctx, serverCreds)
- const {
- data: { session },
- } = await supabase.auth.getSession()
-
- if (!session) {
- return {
- redirect: {
- destination: '/agent/smol-developer',
- permanent: false,
- },
- }
- }
-
- return { props: {} }
-}
-
export interface PostAgentBody {
// ID of the installation of the GitHub App
installationID: number
@@ -56,6 +38,24 @@ export interface PostAgentBody {
modelConfig: ModelConfig
}
+export const getServerSideProps: GetServerSideProps = async (ctx) => {
+ const supabase = createServerSupabaseClient(ctx, serverCreds)
+ const {
+ data: { session },
+ } = await supabase.auth.getSession()
+
+ if (!session) {
+ return {
+ redirect: {
+ destination: '/agent/smol-developer',
+ permanent: false,
+ },
+ }
+ }
+
+ return { props: {} }
+}
+
async function handlePostAgent(url: string, { arg }: { arg: PostAgentBody }) {
return await fetch(url, {
method: 'POST',
@@ -124,61 +124,6 @@ function Repo() {
})
}
- const people = [
- {
- name: 'Leslie Alexander',
- email: '[email protected]',
- role: 'Co-Founder / CEO',
- imageUrl:
- 'https://images.unsplash.com/photo-1494790108377-be9c29b29330?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Michael Foster',
- email: '[email protected]',
- role: 'Co-Founder / CTO',
- imageUrl:
- 'https://images.unsplash.com/photo-1519244703995-f4e0f30006d5?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Dries Vincent',
- email: '[email protected]',
- role: 'Business Relations',
- imageUrl:
- 'https://images.unsplash.com/photo-1506794778202-cad84cf45f1d?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: null,
- },
- {
- name: 'Lindsay Walton',
- email: '[email protected]',
- role: 'Front-end Developer',
- imageUrl:
- 'https://images.unsplash.com/photo-1517841905240-472988babdf9?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Courtney Henry',
- email: '[email protected]',
- role: 'Designer',
- imageUrl:
- 'https://images.unsplash.com/photo-1438761681033-6461ffad8d80?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: '3h ago',
- lastSeenDateTime: '2023-01-23T13:23Z',
- },
- {
- name: 'Tom Cook',
- email: '[email protected]',
- role: 'Director of Product',
- imageUrl:
- 'https://images.unsplash.com/photo-1472099645785-5658abf4ff4e?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=facearea&facepad=2&w=256&h=256&q=80',
- lastSeen: null,
- },
- ]
-
return (
<div
className="
diff --git a/pages/agent/smol-developer/setup2.tsx b/pages/agent/smol-developer/setup2.tsx
index d7c76969c..fe9a80fda 100644
--- a/pages/agent/smol-developer/setup2.tsx
+++ b/pages/agent/smol-developer/setup2.tsx
@@ -2,46 +2,17 @@ import {
useState,
useCallback,
} from 'react'
-import {
- Github,
-} from 'lucide-react'
+import useSWRMutation from 'swr/mutation'
import type { GetServerSideProps } from 'next'
-import { useSessionContext, useSupabaseClient } from '@supabase/auth-helpers-react'
import { createServerSupabaseClient } from '@supabase/auth-helpers-nextjs'
-import {
- useUser,
- useSession,
-} from '@supabase/auth-helpers-react'
-import useSWRMutation from 'swr/mutation'
+import Steps from 'components/Steps'
+import SelectRepository from 'components/SelectRepository'
import { serverCreds } from 'db/credentials'
-import { openPopupModal } from 'utils/popupModal'
-import useListenOnMessage from 'hooks/useListenOnMessage'
import { useGitHubClient } from 'hooks/useGitHubClient'
import { useRepositories } from 'hooks/useRepositories'
-import { RepoSetup } from 'components/Repos'
-import RepositoriesList from 'components/RepositoriesList'
import { useLocalStorage } from 'hooks/useLocalStorage'
-import SpinnerIcon from 'components/Spinner'
-import Steps from 'components/Steps'
-
-export const getServerSideProps: GetServerSideProps = async (ctx) => {
- const supabase = createServerSupabaseClient(ctx, serverCreds)
- const {
- data: { session },
- } = await supabase.auth.getSession()
-
- if (!session) {
- return {
- redirect: {
- destination: '/agent/smol-developer',
- permanent: false,
- },
- }
- }
-
- return { props: {} }
-}
+import useListenOnMessage from 'hooks/useListenOnMessage'
export interface PostAgentBody {
// ID of the installation of the GitHub App
@@ -64,6 +35,41 @@ export interface PostAgentBody {
commitMessage: string
}
+// export interface Repository {
+// repositoryID: number
+// installationID: number
+// fullName: string
+// branches?: string[]
+// defaultBranch: string
+// url: string
+// owner: string
+// name: string
+// }
+
+const steps = [
+ { name: 'Select Repository', status: 'current' },
+ { name: 'Write Instructions', status: 'upcoming' },
+ { name: 'Step 3', status: 'upcoming' },
+]
+
+export const getServerSideProps: GetServerSideProps = async (ctx) => {
+ const supabase = createServerSupabaseClient(ctx, serverCreds)
+ const {
+ data: { session },
+ } = await supabase.auth.getSession()
+
+ if (!session) {
+ return {
+ redirect: {
+ destination: '/agent/smol-developer',
+ permanent: false,
+ },
+ }
+ }
+
+ return { props: {} }
+}
+
async function handlePostAgent(url: string, { arg }: { arg: PostAgentBody }) {
return await fetch(url, {
method: 'POST',
@@ -75,18 +81,17 @@ async function handlePostAgent(url: string, { arg }: { arg: PostAgentBody }) {
}).then(r => r.json())
}
-function Repo() {
+function Setup() {
+ const [currentStep, setCurrentStep] = useState(0)
+ const [selectedRepositoryID, setSelectedRepositoryID] = useState<number>()
+ // const supabaseClient = useSupabaseClient()
+ // const session = useSession()
+ // const sessionCtx = useSessionContext()
+ // const [selectedRepo, setSelectedRepo] = useState<RepoSetup>()
+
const [accessToken, setAccessToken] = useLocalStorage<string | undefined>('gh_access_token', undefined)
const gitHub = useGitHubClient(accessToken)
const { repos, refetch } = useRepositories(gitHub)
- const supabaseClient = useSupabaseClient()
- const user = useUser()
- const session = useSession()
- const sessionCtx = useSessionContext()
- const [selectedRepo, setSelectedRepo] = useState<RepoSetup>()
-
-
- const ghUsername: string = user?.user_metadata['user_name'] || ''
const handleMessageEvent = useCallback((event: MessageEvent) => {
if (event.data.accessToken) {
@@ -97,91 +102,60 @@ function Repo() {
}, [refetch, setAccessToken])
useListenOnMessage(handleMessageEvent)
- function configureGitHubApp() {
- const url = new URL('https://github.com/apps/e2b-for-github/installations/new')
- openPopupModal(url)
- }
-
const {
trigger: createAgent,
} = useSWRMutation('/api/agent', handlePostAgent)
- async function deployAgent() {
- if (!selectedRepo) return
- console.log('selectedRepo', selectedRepo)
-
-
- return
- await createAgent({
- defaultBranch: selectedRepo.defaultBranch,
- installationID: selectedRepo.installationID,
- owner: selectedRepo.owner,
- repo: selectedRepo.repo,
- repositoryID: selectedRepo.repositoryID,
- title,
- branch,
- body,
- commitMessage,
+ // async function deployAgent() {
+ // if (!selectedRepo) return
+ // console.log('selectedRepo', selectedRepo)
+
+
+ // return
+ // await createAgent({
+ // defaultBranch: selectedRepo.defaultBranch,
+ // installationID: selectedRepo.installationID,
+ // owner: selectedRepo.owner,
+ // repo: selectedRepo.repo,
+ // repositoryID: selectedRepo.repositoryID,
+ // title,
+ // branch,
+ // body,
+ // commitMessage,
+ // })
+ // }
+
+ function handleRepoSelection(repoID: number) {
+ setSelectedRepositoryID(repoID)
+ setCurrentStep(val => {
+ const newVal = val + 1
+ steps[val].status = 'complete'
+ steps[newVal].status = 'current'
+ return newVal
})
}
-
return (
<div className="h-full flex flex-col items-center justify-start bg-gray-800 py-8 px-6">
- <Steps />
- {/* Horizontal separator */}
-
- <div className="flex-1 mx-auto max-w-lg flex flex-col">
+ <div className="overflow-hidden flex-1 mx-auto w-full max-w-lg flex flex-col">
+ <Steps steps={steps} />
<div className="h-px bg-gray-700 my-8" />
- <h2 className="text-3xl font-bold tracking-tight text-white sm:text-4xl">
- Select Git Repository
- </h2>
- <p className="mt-2 mb-6 text-lg leading-8 text-gray-400">
- Select a git repository to which you want to give the AI developer access.
- </p>
-
- {!user && (
- <div
- className="
- flex
- justify-center
- "
- >
- <SpinnerIcon className="text-slate-400" />
- </div>
- )}
-
- {user && (
- <>
- {ghUsername && (
- <span className="mb-1 text-xs text-gray-400 font-semibold">
- {ghUsername}{ghUsername.endsWith('s') ? "'" : "'s"} repositories
- </span>
- )}
- <div className="flex-1 flex flex-col items-center justify-center border border-gray-700 rounded-md">
- {!accessToken && (
- <button
- type="button"
- className="flex items-center space-x-2 rounded-md bg-white/10 px-3.5 py-2 text-sm font-semibold text-white shadow-sm hover:bg-white/20 transition-all"
- onClick={configureGitHubApp}
- >
- <Github size={16} />
- <span>Configure GitHub Permissions</span>
- </button>
- )}
-
- {accessToken && (
- <>
- <RepositoriesList />
- </>
- )}
- </div>
- </>
- )}
+ {currentStep === 0 ? (
+ <SelectRepository
+ repos={repos}
+ selectedRepositoryID={selectedRepositoryID}
+ onRepoSelection={handleRepoSelection}
+ hasAccessToken={!!accessToken}
+ />
+ ) : currentStep === 1 ? (
+ <div>prompt</div>
+ ) : currentStep === 2 ? (
+ <div>keys + deploy</div>
+ ) : null}
</div>
</div>
)
}
-export default Repo
+export default Setup
diff --git a/utils/github.ts b/utils/github.ts
new file mode 100644
index 000000000..9a3f56cf2
--- /dev/null
+++ b/utils/github.ts
@@ -0,0 +1,6 @@
+import { openPopupModal } from 'utils/popupModal'
+
+export function configureGitHubApp() {
+ const url = new URL('https://github.com/apps/e2b-for-github/installations/new')
+ openPopupModal(url)
+}