Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature: Enable Deployment from Git Repositories to Akash Network #358

Closed
wants to merge 76 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
001311a
create 23 files and update 8 files
dharamveergit Aug 16, 2024
93053db
feat: Update Remote Deploy
dharamveergit Aug 16, 2024
774ed43
update 4 files and create 2 files
dharamveergit Aug 16, 2024
2c8636d
feat: new Repo selection
dharamveergit Aug 16, 2024
1dec0b3
feat: Bitbucket Repo Selection
dharamveergit Aug 16, 2024
ab30a3b
feat: Gitlab Repo Selection
dharamveergit Aug 16, 2024
d7ef049
fix: Gitlab repos ui fix
dharamveergit Aug 16, 2024
82e25fe
feat: update disable _pull
dharamveergit Aug 16, 2024
89f5d5c
fix : update ui
dharamveergit Aug 17, 2024
5c125d5
feat: New Frameworks
dharamveergit Aug 17, 2024
6466920
feat: vite Framework
dharamveergit Aug 17, 2024
dc35ad4
fix: open fix repos
dharamveergit Aug 17, 2024
040a626
update Repos.tsx, RemoteDeployUpdate.tsx and utils.ts
dharamveergit Aug 19, 2024
d047872
fix : more git repo fetch
dharamveergit Aug 20, 2024
4fb2650
test: temp fix
dharamveergit Aug 21, 2024
0a8a3eb
fix: relogin
dharamveergit Aug 22, 2024
cf05236
feat: remote-deploy: bug fixes
dharamveergit Aug 22, 2024
a788457
fix: redeploy advanced
dharamveergit Aug 22, 2024
6805c5a
update GihubDeploy.tsx
dharamveergit Aug 23, 2024
f681b75
update 5 files
dharamveergit Aug 23, 2024
cf15e95
update RemoteDeployUpdate.tsx and templates.ts
dharamveergit Aug 24, 2024
4ec0ee1
Merge remote-tracking branch 'upstream/main'
dharamveergit Aug 26, 2024
449c4e4
update : descriptions
dharamveergit Aug 26, 2024
29591f1
fixes: type
dharamveergit Aug 28, 2024
5e5b392
fix:repo filtering
dharamveergit Aug 28, 2024
7cd8536
remove: console.logs
dharamveergit Aug 28, 2024
21973f8
fix: repo redeploy selection
dharamveergit Aug 28, 2024
933c1a4
feat: images for git accounts
dharamveergit Aug 28, 2024
41a30c6
Merge remote-tracking branch 'upstream/main'
dharamveergit Aug 29, 2024
b9239ea
fix: filtering of repo (In Github)
dharamveergit Aug 29, 2024
0d64352
fix: ui (remote deploy)
dharamveergit Aug 30, 2024
a18e288
ui fix : rollback
dharamveergit Aug 30, 2024
1d785ef
Merge remote-tracking branch 'upstream/main'
dharamveergit Aug 30, 2024
e2d66fc
update Rollback.tsx
dharamveergit Aug 30, 2024
5547af2
fix : names( Remote Deploy)
dharamveergit Aug 31, 2024
7c623b5
update LeaseRow.tsx
dharamveergit Aug 31, 2024
5491178
fix: ui issues (Remote Deploy)
dharamveergit Aug 31, 2024
895d42c
remove : service name edit form remote deploy
dharamveergit Aug 31, 2024
cbf4dd9
update Advanced.tsx and EnvFormModal.tsx
dharamveergit Sep 3, 2024
69c0366
api: github api (next)
dharamveergit Sep 5, 2024
0bdadb4
Merge remote-tracking branch 'upstream/main'
dharamveergit Sep 6, 2024
18bdf90
next api: remote deploy - gitlab,bitbucket
dharamveergit Sep 6, 2024
874145c
ui fixes : Env and account ui (Remote Deploy)
dharamveergit Sep 7, 2024
c49d5d1
fix : env in update deployment
dharamveergit Sep 7, 2024
83ec32b
fix: Account select in smaller screens (Remote Deploy)
dharamveergit Sep 7, 2024
7e0d4f8
Merge remote-tracking branch 'upstream/main'
dharamveergit Sep 7, 2024
4c1c7a0
remove: console logs (Remote Deploy)
dharamveergit Sep 7, 2024
2cd1458
update api.ts
dharamveergit Sep 7, 2024
2841b9e
Merge pull request #6 from dharamveergit/main
dharamveergit Sep 7, 2024
376bbfa
fix: auth github
dharamveergit Sep 7, 2024
86428b0
build(deps): update package-lock.json
dharamveergit Sep 7, 2024
6104d66
update authenticate.ts
dharamveergit Sep 7, 2024
65c1d49
fix : Deploy
dharamveergit Sep 7, 2024
c86d5bc
Merge pull request #7 from dharamveergit/main
dharamveergit Sep 7, 2024
1469353
fix: remove "Environment Variables" in expanded state (Remote Deploy)
dharamveergit Sep 9, 2024
01708cd
Merge pull request #8 from dharamveergit/main
dharamveergit Sep 9, 2024
b9ed85b
Merge remote-tracking branch 'upstream/main'
dharamveergit Sep 12, 2024
29c8d5a
fix: Reordering of variables and useEffects
dharamveergit Sep 12, 2024
2da9923
fix: code clean (Remote Deploy)
dharamveergit Sep 12, 2024
a693d7a
fix: type fixes (Remote Deploy)
dharamveergit Sep 12, 2024
6f38fa9
fix: types (Remote Deploy)
dharamveergit Sep 12, 2024
299fe33
update Repos.tsx, bitbucket-api.ts and gitlab-api.ts
dharamveergit Sep 12, 2024
c026375
fix: vercel deploy fix
dharamveergit Sep 12, 2024
5647200
revert: vercel deploy
dharamveergit Sep 12, 2024
bcf6b8d
Merge pull request #9 from dharamveergit/main
dharamveergit Sep 12, 2024
5821792
fix: types and api class logic (Remote Deployment)
dharamveergit Sep 13, 2024
1a2ab6b
fix: vercel deploy
dharamveergit Sep 13, 2024
c133100
Merge pull request #10 from dharamveergit/main
dharamveergit Sep 13, 2024
999660c
Merge remote-tracking branch 'upstream/main'
dharamveergit Sep 13, 2024
beebec7
Merge pull request #11 from dharamveergit/main
dharamveergit Sep 13, 2024
dfb4367
fix: fetch deploy.yml from awesome akash
dharamveergit Sep 16, 2024
166016f
Merge pull request #12 from dharamveergit/main
dharamveergit Sep 16, 2024
83a2a06
Merge remote-tracking branch 'upstream/main'
dharamveergit Sep 20, 2024
3052eca
Merge remote-tracking branch 'upstream/main'
dharamveergit Sep 20, 2024
368b22a
build(deps): update browser-env.config.ts, env-config.schema.ts and p…
dharamveergit Sep 20, 2024
cc5beed
Merge pull request #13 from dharamveergit/main
dharamveergit Sep 20, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: ui issues (Remote Deploy)
dharamveergit committed Aug 31, 2024
commit 5491178b1a1346a4b8bcf142c9069933c897eb19
2 changes: 1 addition & 1 deletion apps/deploy-web/src/components/deployments/LeaseRow.tsx
Original file line number Diff line number Diff line change
@@ -364,7 +364,7 @@ export const LeaseRow = React.forwardRef<AcceptRefType, Props>(
<ul className="mt-2 space-y-2">
<li className="flex items-center">
<Link href={repo} target="_blank" className="inline-flex items-center space-x-2 truncate text-sm">
<span>{repo?.replaceAll("https://github.com/", "")} </span>
<span>{repo?.replace("https://github.com/", "")?.replace("https://gitlab.com/", "")} </span>

<OpenInWindow className="text-xs" />
</Link>
30 changes: 14 additions & 16 deletions apps/deploy-web/src/components/remote-deploy/Details.tsx
Original file line number Diff line number Diff line change
@@ -27,6 +27,19 @@ const Details = ({ services, setValue }) => {
{expanded && <Separator />}
<CollapsibleContent>
<div className="grid gap-6 p-5 md:grid-cols-2">
<CustomInput
onChange={e => appendEnv("INSTALL_COMMAND", e.target.value, false, setValue, services)}
label="Install Command"
placeholder="npm install"
/>
<CustomInput onChange={e => appendEnv("BUILD_DIRECTORY", e.target.value, false, setValue, services)} label="Build Directory" placeholder="dist" />
<CustomInput
onChange={e => appendEnv("BUILD_COMMAND", e.target.value, false, setValue, services)}
label="Build Command"
placeholder="npm run build"
/>
<CustomInput onChange={e => appendEnv("CUSTOM_SRC", e.target.value, false, setValue, services)} label="Start Command" placeholder="npm start" />
<CustomInput onChange={e => appendEnv("NODE_VERSION", e.target.value, false, setValue, services)} label="Node Version" placeholder="21" />
<div className="flex flex-col gap-3 rounded border bg-card px-6 py-6 text-card-foreground">
<div className="flex items-center justify-between gap-5">
<Label htmlFor="disable-pull" className="text-base">
@@ -43,23 +56,8 @@ const Details = ({ services, setValue }) => {
}}
/>
</div>
<p className="text-sm text-muted-foreground">
By default, console automatically detects and deploys changes, disable it to handle deploys manually
</p>
<p className="text-sm text-muted-foreground">If checked, Console will automatically re-deploy your app on any code commits</p>
</div>
<CustomInput
onChange={e => appendEnv("INSTALL_COMMAND", e.target.value, false, setValue, services)}
label="Install Command"
placeholder="npm install"
/>
<CustomInput onChange={e => appendEnv("BUILD_DIRECTORY", e.target.value, false, setValue, services)} label="Build Directory" placeholder="dist" />
<CustomInput
onChange={e => appendEnv("BUILD_COMMAND", e.target.value, false, setValue, services)}
label="Build Command"
placeholder="npm run build"
/>
<CustomInput onChange={e => appendEnv("CUSTOM_SRC", e.target.value, false, setValue, services)} label="Start Command" placeholder="npm start" />
<CustomInput onChange={e => appendEnv("NODE_VERSION", e.target.value, false, setValue, services)} label="Node Version" placeholder="21" />
</div>
</CollapsibleContent>
</CardContent>
Original file line number Diff line number Diff line change
@@ -109,7 +109,7 @@ const Repos = ({
<div className="flex flex-col gap-5 rounded border bg-card px-6 py-6 text-card-foreground">
<div className="flex flex-col gap-2">
<h1 className="font-semibold">Select Repository</h1>
<p className="text-muted-foreground">The Repository Branch used for your private service</p>
<p className="text-muted-foreground">Select a Repo to be deployed</p>
</div>

<Dialog open={open} onOpenChange={setOpen}>
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ const RemoteDeployUpdate = ({ sdlString, setEditedManifest }: { sdlString: strin
}}
/>
</div>
<p className="text-sm text-muted-foreground">By default, console automatically detects and deploys changes, disable it to handle deploys manually</p>
<p className="text-sm text-muted-foreground">If checked, Console will automatically re-deploy your app on any code commits</p>
</div>
{services[0]?.env?.length && <EnvFormModal control={control} serviceIndex={0} envs={services[0]?.env ?? []} onClose={() => {}} />}
{/* //type === github */}
Original file line number Diff line number Diff line change
@@ -77,15 +77,15 @@ const Field = ({ data, control }: { data: any; control: Control<SdlBuilderFormVa
<DialogContent className="max-h-[90dvh] gap-0 overflow-y-auto p-0">
<DialogHeader className="sticky top-0 z-[20] border-b bg-popover p-5">
<DialogTitle>Rollbacks</DialogTitle>
<DialogDescription className="flex items-center gap-2">
<DialogDescription className="mt-1 flex items-center gap-2">
<Info className="h-4 w-4" />
You need to click update deployment button to apply changes
</DialogDescription>
</DialogHeader>
<Tabs defaultValue="git">
<TabsList className="mx-5 mt-4">
<TabsTrigger value="git">Git</TabsTrigger>
<TabsTrigger value="Custom">Custom</TabsTrigger>
<TabsTrigger value="git">Commit Name</TabsTrigger>
<TabsTrigger value="Custom">Commit Hash</TabsTrigger>
</TabsList>
<TabsContent value="git" className="mt-0 flex flex-col gap-6">
<div className="flex flex-col">