Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Merge pull request #436 from coollabsio/next

Browse Source 
v2.9.1
This commit is contained in:
Andras Bacsai 2022-05-31 14:00:17 +02:00 committed by GitHub
commit db9db61d92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "coolify", "name": "coolify",
"description": "An open-source & self-hostable Heroku / Netlify alternative.", "description": "An open-source & self-hostable Heroku / Netlify alternative.",
"version": "2.9.0", "version": "2.9.1",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"scripts": { "scripts": {
"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev --host 0.0.0.0", "dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev --host 0.0.0.0",

8
src/lib/database/gitSources.ts
View File

@ -67,16 +67,10 @@ export async function getSource({
return body; return body;
} }
export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl, organization }) { export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl, organization }) {
await prisma.gitSource.update({ return await prisma.gitSource.update({
where: { id }, where: { id },
data: { type, name, htmlUrl, apiUrl, organization } data: { type, name, htmlUrl, apiUrl, organization }
}); });
return await prisma.githubApp.create({
data: {
teams: { connect: { id: teamId } },
gitSource: { connect: { id } }
}
});
} }
export async function addGitLabSource({ export async function addGitLabSource({
id, id,

4
src/routes/sources/[id]/_Github.svelte
View File

@ -80,7 +80,7 @@
</script> </script>
<div class="mx-auto max-w-4xl px-6"> <div class="mx-auto max-w-4xl px-6">
{#if !source.githubApp?.installationId} {#if !source.githubAppId}
<form on:submit|preventDefault={newGithubApp} class="py-4"> <form on:submit|preventDefault={newGithubApp} class="py-4">
<div class="flex space-x-1 pb-5 font-bold"> <div class="flex space-x-1 pb-5 font-bold">
<div class="title">General</div> <div class="title">General</div>
@ -171,7 +171,7 @@
</form> </form>
{:else} {:else}
<div class="text-center"> <div class="text-center">
<button class=" bg-orange-600 mt-8" on:click={() => installRepositories(source)} <button class=" mt-8 bg-orange-600" on:click={() => installRepositories(source)}
>Install Repositories</button >Install Repositories</button
> >
</div> </div>

2
src/routes/sources/[id]/index.svelte
View File

@ -113,7 +113,7 @@
</div> </div>
<div class="flex flex-col justify-center"> <div class="flex flex-col justify-center">
{#if !source.gitlabAppId && (!source.githubAppId || !source.githubApp?.installationId)} {#if !source.gitlabAppId && !source.githubAppId}
<div class="flex-col space-y-2 pb-10 text-center"> <div class="flex-col space-y-2 pb-10 text-center">
<div class="text-xl font-bold text-white">Select a provider</div> <div class="text-xl font-bold text-white">Select a provider</div>
<div class="flex justify-center space-x-2"> <div class="flex justify-center space-x-2">