From 086ca30323c7321ca5071e74820f56eddb523b72 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 30 Aug 2022 15:15:57 +0000 Subject: [PATCH 1/4] fix: oh god Prisma --- Dockerfile | 2 +- apps/api/src/lib/common.ts | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2b0b4605..6be789f4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \ PRISMA_CLI_QUERY_ENGINE_TYPE=binary \ PRISMA_CLIENT_ENGINE_TYPE=binary -COPY --from=coollabsio/prisma-engine:4.2.0 /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/ +COPY --from=coollabsio/prisma-engine:3.15 /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/ RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl psmisc RUN curl -sL https://unpkg.com/@pnpm/self-installer | node diff --git a/apps/api/src/lib/common.ts b/apps/api/src/lib/common.ts index 71a573280..f38dfef82 100644 --- a/apps/api/src/lib/common.ts +++ b/apps/api/src/lib/common.ts @@ -21,7 +21,7 @@ import { scheduler } from './scheduler'; import { supportedServiceTypesAndVersions } from './services/supportedVersions'; import { includeServices } from './services/common'; -export const version = '3.8.8'; +export const version = '3.8.9'; export const isDev = process.env.NODE_ENV === 'development'; const algorithm = 'aes-256-ctr'; diff --git a/package.json b/package.json index 20afc9b6a..8bba562bf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "coolify", "description": "An open-source & self-hostable Heroku / Netlify alternative.", - "version": "3.8.8", + "version": "3.8.9", "license": "Apache-2.0", "repository": "github:coollabsio/coolify", "scripts": { From 6ff080c36b87c3f47b08b5984bef9f7f7309523e Mon Sep 17 00:00:00 2001 From: LL Date: Wed, 31 Aug 2022 01:02:33 -0300 Subject: [PATCH 2/4] improving github page responsiveness --- apps/ui/src/routes/__layout.svelte | 4 +- .../ui/src/routes/sources/[id]/_Github.svelte | 46 ++++++++++--------- apps/ui/src/tailwind.css | 6 ++- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/apps/ui/src/routes/__layout.svelte b/apps/ui/src/routes/__layout.svelte index 12e680488..5f19fe0ad 100644 --- a/apps/ui/src/routes/__layout.svelte +++ b/apps/ui/src/routes/__layout.svelte @@ -71,7 +71,7 @@ $appSession.version = baseSettings.version; $appSession.whiteLabeled = baseSettings.whiteLabeled; $appSession.whiteLabeledDetails.icon = baseSettings.whiteLabeledIcon; - $appSession.supportedServiceTypesAndVersions = supportedServiceTypesAndVersions + $appSession.supportedServiceTypesAndVersions = supportedServiceTypesAndVersions; export let userId: string; export let teamId: string; @@ -396,7 +396,7 @@ {/if} {/if}
-
+
diff --git a/apps/ui/src/routes/sources/[id]/_Github.svelte b/apps/ui/src/routes/sources/[id]/_Github.svelte index 8ed240cf2..a1d39145e 100644 --- a/apps/ui/src/routes/sources/[id]/_Github.svelte +++ b/apps/ui/src/routes/sources/[id]/_Github.svelte @@ -24,7 +24,7 @@ apiUrl: source.apiUrl.replace(/\/$/, '') }); return addToast({ - message:'Configuration saved.', + message: 'Configuration saved.', type: 'success' }); } catch (error) { @@ -93,7 +93,7 @@
{#if !source.githubAppId}
-
+
General
{#if !source.githubAppId} @@ -101,20 +101,20 @@
-
+
-
+
-
+
-
+
-
+
{:else if source.githubApp?.installationId} -
+
{$t('general')}
{#if $appSession.isAdmin} - {loading ? 'Saving...' : 'Save'} {$t('source.change_app_settings', { name: 'GitHub' })} {/if}
-
+
-
+
-
+
{#if selfHosted} -
+
@@ -210,7 +210,7 @@ />
{/if} -
+
{:else}
- - +
{/if} diff --git a/apps/ui/src/tailwind.css b/apps/ui/src/tailwind.css index 5b551a4c8..22ad0093f 100644 --- a/apps/ui/src/tailwind.css +++ b/apps/ui/src/tailwind.css @@ -85,7 +85,7 @@ label { @apply inline-block w-64 text-xs tracking-tight md:text-sm; } .btn { - @apply text-white text-base; + @apply text-white text-base min-w-fit h-12; } a { @@ -195,4 +195,8 @@ .table thead th{ } .table *{ border: none; +} + +input { + @apply w-48 lg:w-96; } \ No newline at end of file From 008d0900932aa202490160e17472ff26ee69ff3a Mon Sep 17 00:00:00 2001 From: LL Date: Wed, 31 Aug 2022 01:03:27 -0300 Subject: [PATCH 3/4] improving identity and access responsiveness --- apps/ui/src/routes/iam/index.svelte | 38 ++++++++++++----------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/apps/ui/src/routes/iam/index.svelte b/apps/ui/src/routes/iam/index.svelte index e50c2fbdd..9b61ec9cc 100644 --- a/apps/ui/src/routes/iam/index.svelte +++ b/apps/ui/src/routes/iam/index.svelte @@ -108,24 +108,21 @@
Identity and Access Management
- +
{#if invitations.length > 0} @@ -170,14 +167,11 @@ {#each accounts as account} - + {account.email} resetPassword(account.id)}> - +
deleteUser(account.id)}>
-
+
-
+
-
+
{#if $appSession.teamId === '0'} -
+