From 4946ca2d918d959cbabd88462d7e6b3229a60b45 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 00:08:29 +0200
Subject: [PATCH 01/57] Dockerfile for multiarch builds

---
 Dockerfile | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5d0a8912b..90409e5be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16.14.0-alpine
+FROM node:17-alpine
 RUN apk add --no-cache g++ cmake make python3
 WORKDIR /app
 COPY package*.json .
@@ -6,20 +6,18 @@ RUN yarn install
 COPY . .
 RUN yarn build
 
-FROM node:16.14.0-alpine
+FROM node:17-alpine
 WORKDIR /app
-
+ARG TARGETPLATFORM
 LABEL coolify.managed true
-
 RUN apk add --no-cache git openssh-client curl jq cmake sqlite
-
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
 RUN pnpm add -g pnpm
 
-RUN curl -fsSL "https://download.docker.com/linux/static/stable/x86_64/docker-20.10.9.tgz" | tar -xzvf - docker/docker -C . --strip-components 1 && mv docker /usr/bin/docker
 RUN mkdir -p ~/.docker/cli-plugins/
-RUN curl -SL https://github.com/docker/compose/releases/download/v2.2.2/docker-compose-linux-x86_64 -o ~/.docker/cli-plugins/docker-compose
-RUN chmod +x ~/.docker/cli-plugins/docker-compose
+RUN curl -SL https://cdn.coollabs.io/bin/docker-20.10.9-$TARGETPLATFORM -o /usr/bin/docker
+RUN curl -SL https://cdn.coollabs.io/bin/docker-compose-linux-2.3.4-$TARGETPLATFORM -o ~/.docker/cli-plugins/docker-compose
+RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
 
 COPY --from=0 /app/docker-compose.yaml .
 COPY --from=0 /app/build .

From f56361c0ca4db1e8055a60ab8a5a8555b7125714 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 14:25:55 +0200
Subject: [PATCH 02/57] updates for ARM

---
 Dockerfile                |  44 ++++--
 package.json              |   3 +-
 pnpm-lock.yaml            | 302 ++------------------------------------
 src/lib/database/users.ts |   2 +-
 4 files changed, 44 insertions(+), 307 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 90409e5be..28e7e820b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,29 +1,41 @@
-FROM node:17-alpine
-RUN apk add --no-cache g++ cmake make python3
+FROM node:16.14.2-alpine as install
 WORKDIR /app
 COPY package*.json .
 RUN yarn install
-COPY . .
-RUN yarn build
 
-FROM node:17-alpine
-WORKDIR /app
+
+FROM rust:1.58.1-alpine3.14 as prisma
+WORKDIR /prisma
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+RUN apk --no-cache add openssl direnv git musl-dev openssl-dev build-base perl protoc
+RUN git clone --depth=1 --branch=3.11.x https://github.com/prisma/prisma-engines.git /prisma 
+RUN cargo build --release
+
+FROM node:16.14.2-alpine 
 ARG TARGETPLATFORM
-LABEL coolify.managed true
-RUN apk add --no-cache git openssh-client curl jq cmake sqlite
+
+WORKDIR /app
+
+ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \
+  PRISMA_MIGRATION_ENGINE_BINARY=/app/prisma-engines/migration-engine \
+  PRISMA_INTROSPECTION_ENGINE_BINARY=/app/prisma-engines/introspection-engine \
+  PRISMA_FMT_BINARY=/app/prisma-engines/prisma-fmt \
+  PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
+  PRISMA_CLIENT_ENGINE_TYPE=binary
+COPY --from=prisma /prisma/target/release/query-engine /prisma/target/release/migration-engine /prisma/target/release/introspection-engine /prisma/target/release/prisma-fmt /app/prisma-engines/
+
+COPY --from=install /app/node_modules ./node_modules
+COPY . .
+
+RUN apk add --no-cache git openssh-client curl jq sqlite
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
 RUN pnpm add -g pnpm
 
 RUN mkdir -p ~/.docker/cli-plugins/
-RUN curl -SL https://cdn.coollabs.io/bin/docker-20.10.9-$TARGETPLATFORM -o /usr/bin/docker
-RUN curl -SL https://cdn.coollabs.io/bin/docker-compose-linux-2.3.4-$TARGETPLATFORM -o ~/.docker/cli-plugins/docker-compose
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
+RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.3.4 -o ~/.docker/cli-plugins/docker-compose
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
 
-COPY --from=0 /app/docker-compose.yaml .
-COPY --from=0 /app/build .
-COPY --from=0 /app/package.json .
-COPY --from=0 /app/node_modules ./node_modules
-COPY --from=0 /app/prisma ./prisma
-
+RUN pnpm build
 EXPOSE 3000
 CMD ["pnpm", "start"]
\ No newline at end of file
diff --git a/package.json b/package.json
index 6c7237198..7dfd0f6e8 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,6 @@
 	"devDependencies": {
 		"@sveltejs/adapter-node": "1.0.0-next.73",
 		"@sveltejs/kit": "1.0.0-next.303",
-		"@types/bcrypt": "5.0.0",
 		"@types/js-cookie": "3.0.1",
 		"@types/js-yaml": "^4.0.5",
 		"@types/node": "17.0.23",
@@ -62,7 +61,7 @@
 		"@iarna/toml": "2.2.5",
 		"@prisma/client": "3.11.1",
 		"@sentry/node": "6.19.2",
-		"bcrypt": "5.0.1",
+		"bcryptjs": "^2.4.3",
 		"bullmq": "1.78.1",
 		"compare-versions": "4.1.3",
 		"cookie": "0.4.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index a89edbf25..29d97a688 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,7 +6,6 @@ specifiers:
   '@sentry/node': 6.19.2
   '@sveltejs/adapter-node': 1.0.0-next.73
   '@sveltejs/kit': 1.0.0-next.303
-  '@types/bcrypt': 5.0.0
   '@types/js-cookie': 3.0.1
   '@types/js-yaml': ^4.0.5
   '@types/node': 17.0.23
@@ -15,7 +14,7 @@ specifiers:
   '@typescript-eslint/parser': 4.31.1
   '@zerodevx/svelte-toast': 0.7.1
   autoprefixer: 10.4.4
-  bcrypt: 5.0.1
+  bcryptjs: ^2.4.3
   bullmq: 1.78.1
   compare-versions: 4.1.3
   cookie: 0.4.2
@@ -59,7 +58,7 @@ dependencies:
   '@iarna/toml': 2.2.5
   '@prisma/client': 3.11.1_prisma@3.11.1
   '@sentry/node': 6.19.2
-  bcrypt: 5.0.1
+  bcryptjs: 2.4.3
   bullmq: 1.78.1
   compare-versions: 4.1.3
   cookie: 0.4.2
@@ -83,7 +82,6 @@ dependencies:
 devDependencies:
   '@sveltejs/adapter-node': 1.0.0-next.73
   '@sveltejs/kit': 1.0.0-next.303_svelte@3.46.4
-  '@types/bcrypt': 5.0.0
   '@types/js-cookie': 3.0.1
   '@types/js-yaml': 4.0.5
   '@types/node': 17.0.23
@@ -208,26 +206,6 @@ packages:
       }
     dev: false
 
-  /@mapbox/node-pre-gyp/1.0.6:
-    resolution:
-      {
-        integrity: sha512-qK1ECws8UxuPqOA8F5LFD90vyVU33W7N3hGfgsOVfrJaRVc8McC3JClTDHpeSbL9CBrOHly/4GsNPAvIgNZE+g==
-      }
-    hasBin: true
-    dependencies:
-      detect-libc: 1.0.3
-      https-proxy-agent: 5.0.0
-      make-dir: 3.1.0
-      node-fetch: 2.6.6
-      nopt: 5.0.0
-      npmlog: 5.0.1
-      rimraf: 3.0.2
-      semver: 7.3.5
-      tar: 6.1.11
-    transitivePeerDependencies:
-      - supports-color
-    dev: false
-
   /@nodelib/fs.scandir/2.1.5:
     resolution:
       {
@@ -480,15 +458,6 @@ packages:
       }
     dev: true
 
-  /@types/bcrypt/5.0.0:
-    resolution:
-      {
-        integrity: sha512-agtcFKaruL8TmcvqbndlqHPSJgsolhf/qPWchFlgnW1gECTN/nKbFcoFnvKAQRFfKbh+BO6A3SWdJu9t+xF3Lw==
-      }
-    dependencies:
-      '@types/node': 17.0.23
-    dev: true
-
   /@types/cacheable-request/6.0.2:
     resolution:
       {
@@ -718,13 +687,6 @@ packages:
       }
     dev: true
 
-  /abbrev/1.1.1:
-    resolution:
-      {
-        integrity: sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
-      }
-    dev: false
-
   /acorn-jsx/5.3.2_acorn@7.4.1:
     resolution:
       {
@@ -851,17 +813,13 @@ packages:
     engines: { node: '>=0.10.0' }
     dev: true
 
-  /ansi-regex/3.0.0:
-    resolution: { integrity: sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= }
-    engines: { node: '>=4' }
-    dev: false
-
   /ansi-regex/5.0.1:
     resolution:
       {
         integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
       }
     engines: { node: '>=8' }
+    dev: true
 
   /ansi-regex/6.0.1:
     resolution:
@@ -915,24 +873,6 @@ packages:
       picomatch: 2.3.0
     dev: true
 
-  /aproba/2.0.0:
-    resolution:
-      {
-        integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
-      }
-    dev: false
-
-  /are-we-there-yet/2.0.0:
-    resolution:
-      {
-        integrity: sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
-      }
-    engines: { node: '>=10' }
-    dependencies:
-      delegates: 1.0.0
-      readable-stream: 3.6.0
-    dev: false
-
   /arg/4.1.3:
     resolution:
       {
@@ -1652,18 +1592,8 @@ packages:
       tweetnacl: 0.14.5
     dev: false
 
-  /bcrypt/5.0.1:
-    resolution:
-      {
-        integrity: sha512-9BTgmrhZM2t1bNuDtrtIMVSmmxZBrJ71n8Wg+YgdjHuIWYF7SjjmCPZFB+/5i/o/PIeRpwVJR3P+NrpIItUjqw==
-      }
-    engines: { node: '>= 10.0.0' }
-    requiresBuild: true
-    dependencies:
-      '@mapbox/node-pre-gyp': 1.0.6
-      node-addon-api: 3.2.1
-    transitivePeerDependencies:
-      - supports-color
+  /bcryptjs/2.4.3:
+    resolution: { integrity: sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms= }
     dev: false
 
   /binary-extensions/2.2.0:
@@ -1870,14 +1800,6 @@ packages:
       }
     dev: false
 
-  /chownr/2.0.0:
-    resolution:
-      {
-        integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
-      }
-    engines: { node: '>=10' }
-    dev: false
-
   /clean-stack/2.2.0:
     resolution:
       {
@@ -1962,14 +1884,6 @@ packages:
       }
     dev: true
 
-  /color-support/1.1.3:
-    resolution:
-      {
-        integrity: sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-      }
-    hasBin: true
-    dev: false
-
   /colorette/2.0.16:
     resolution:
       {
@@ -1995,10 +1909,6 @@ packages:
   /concat-map/0.0.1:
     resolution: { integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= }
 
-  /console-control-strings/1.1.0:
-    resolution: { integrity: sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= }
-    dev: false
-
   /convert-source-map/1.8.0:
     resolution:
       {
@@ -2202,10 +2112,6 @@ packages:
     resolution: { integrity: sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= }
     dev: true
 
-  /delegates/1.0.0:
-    resolution: { integrity: sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= }
-    dev: false
-
   /denque/1.5.1:
     resolution:
       {
@@ -2229,12 +2135,6 @@ packages:
     engines: { node: '>=8' }
     dev: true
 
-  /detect-libc/1.0.3:
-    resolution: { integrity: sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= }
-    engines: { node: '>=0.10' }
-    hasBin: true
-    dev: false
-
   /detective/5.2.0:
     resolution:
       {
@@ -2368,6 +2268,7 @@ packages:
       {
         integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
       }
+    dev: true
 
   /emoji-regex/9.2.2:
     resolution:
@@ -3010,16 +2911,6 @@ packages:
       }
     dev: false
 
-  /fs-minipass/2.1.0:
-    resolution:
-      {
-        integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
-      }
-    engines: { node: '>= 8' }
-    dependencies:
-      minipass: 3.1.5
-    dev: false
-
   /fs.realpath/1.0.0:
     resolution: { integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8= }
 
@@ -3054,24 +2945,6 @@ packages:
     resolution: { integrity: sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= }
     dev: true
 
-  /gauge/3.0.1:
-    resolution:
-      {
-        integrity: sha512-6STz6KdQgxO4S/ko+AbjlFGGdGcknluoqU+79GOFCDqqyYj5OanQf9AjxwN0jCidtT+ziPMmPSt9E4hfQ0CwIQ==
-      }
-    engines: { node: '>=10' }
-    dependencies:
-      aproba: 2.0.0
-      color-support: 1.1.3
-      console-control-strings: 1.1.0
-      has-unicode: 2.0.1
-      object-assign: 4.1.1
-      signal-exit: 3.0.5
-      string-width: 2.1.1
-      strip-ansi: 4.0.0
-      wide-align: 1.1.5
-    dev: false
-
   /generate-password/1.7.0:
     resolution:
       {
@@ -3241,10 +3114,6 @@ packages:
     engines: { node: '>=8' }
     dev: true
 
-  /has-unicode/2.0.1:
-    resolution: { integrity: sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= }
-    dev: false
-
   /has/1.0.3:
     resolution:
       {
@@ -3457,17 +3326,13 @@ packages:
     engines: { node: '>=0.10.0' }
     dev: true
 
-  /is-fullwidth-code-point/2.0.0:
-    resolution: { integrity: sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= }
-    engines: { node: '>=4' }
-    dev: false
-
   /is-fullwidth-code-point/3.0.0:
     resolution:
       {
         integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
       }
     engines: { node: '>=8' }
+    dev: true
 
   /is-fullwidth-code-point/4.0.0:
     resolution:
@@ -3839,6 +3704,7 @@ packages:
     engines: { node: '>=10' }
     dependencies:
       yallist: 4.0.0
+    dev: true
 
   /lru_map/0.3.3:
     resolution: { integrity: sha1-tcg1G5Rky9dQM1p5ZQoOwOVhGN0= }
@@ -3860,16 +3726,6 @@ packages:
       sourcemap-codec: 1.4.8
     dev: true
 
-  /make-dir/3.1.0:
-    resolution:
-      {
-        integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      semver: 6.3.0
-    dev: false
-
   /make-error/1.3.6:
     resolution:
       {
@@ -3950,27 +3806,6 @@ packages:
       }
     dev: true
 
-  /minipass/3.1.5:
-    resolution:
-      {
-        integrity: sha512-+8NzxD82XQoNKNrl1d/FSi+X8wAEWR+sbYAfIvub4Nz0d22plFG72CEVVaufV8PNf4qSslFTD8VMOxNVhHCjTw==
-      }
-    engines: { node: '>=8' }
-    dependencies:
-      yallist: 4.0.0
-    dev: false
-
-  /minizlib/2.1.2:
-    resolution:
-      {
-        integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
-      }
-    engines: { node: '>= 8' }
-    dependencies:
-      minipass: 3.1.5
-      yallist: 4.0.0
-    dev: false
-
   /mkdirp-classic/0.5.3:
     resolution:
       {
@@ -3988,15 +3823,6 @@ packages:
       minimist: 1.2.5
     dev: true
 
-  /mkdirp/1.0.4:
-    resolution:
-      {
-        integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
-      }
-    engines: { node: '>=10' }
-    hasBin: true
-    dev: false
-
   /mri/1.2.0:
     resolution:
       {
@@ -4065,23 +3891,6 @@ packages:
     resolution: { integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= }
     dev: true
 
-  /node-addon-api/3.2.1:
-    resolution:
-      {
-        integrity: sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
-      }
-    dev: false
-
-  /node-fetch/2.6.6:
-    resolution:
-      {
-        integrity: sha512-Z8/6vRlTUChSdIgMa51jxQ4lrw/Jy5SOW10ObaA47/RElsAN2c5Pn8bTgFGWn/ibwzXTE8qwr1Yzx28vsecXEA==
-      }
-    engines: { node: 4.x || >=6.0.0 }
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: false
-
   /node-forge/1.3.0:
     resolution:
       {
@@ -4113,17 +3922,6 @@ packages:
       }
     dev: false
 
-  /nopt/5.0.0:
-    resolution:
-      {
-        integrity: sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
-      }
-    engines: { node: '>=6' }
-    hasBin: true
-    dependencies:
-      abbrev: 1.1.1
-    dev: false
-
   /normalize-path/3.0.0:
     resolution:
       {
@@ -4155,23 +3953,6 @@ packages:
       path-key: 3.1.1
     dev: true
 
-  /npmlog/5.0.1:
-    resolution:
-      {
-        integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==
-      }
-    dependencies:
-      are-we-there-yet: 2.0.0
-      console-control-strings: 1.1.0
-      gauge: 3.0.1
-      set-blocking: 2.0.0
-    dev: false
-
-  /object-assign/4.1.1:
-    resolution: { integrity: sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= }
-    engines: { node: '>=0.10.0' }
-    dev: false
-
   /object-hash/2.2.0:
     resolution:
       {
@@ -4706,6 +4487,7 @@ packages:
     hasBin: true
     dependencies:
       glob: 7.2.0
+    dev: true
 
   /rollup/2.61.1:
     resolution:
@@ -4801,10 +4583,7 @@ packages:
     hasBin: true
     dependencies:
       lru-cache: 6.0.0
-
-  /set-blocking/2.0.0:
-    resolution: { integrity: sha1-BF+XgtARrppoA93TgrJDkrPYkPc= }
-    dev: false
+    dev: true
 
   /shebang-command/1.2.0:
     resolution: { integrity: sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= }
@@ -4839,6 +4618,7 @@ packages:
       {
         integrity: sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ==
       }
+    dev: true
 
   /slash/1.0.0:
     resolution: { integrity: sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU= }
@@ -4973,17 +4753,6 @@ packages:
     engines: { node: '>=0.6.19' }
     dev: true
 
-  /string-width/2.1.1:
-    resolution:
-      {
-        integrity: sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
-      }
-    engines: { node: '>=4' }
-    dependencies:
-      is-fullwidth-code-point: 2.0.0
-      strip-ansi: 4.0.0
-    dev: false
-
   /string-width/4.2.3:
     resolution:
       {
@@ -4994,6 +4763,7 @@ packages:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
+    dev: true
 
   /string-width/5.1.0:
     resolution:
@@ -5023,13 +4793,6 @@ packages:
       ansi-regex: 2.1.1
     dev: true
 
-  /strip-ansi/4.0.0:
-    resolution: { integrity: sha1-qEeQIusaw2iocTibY1JixQXuNo8= }
-    engines: { node: '>=4' }
-    dependencies:
-      ansi-regex: 3.0.0
-    dev: false
-
   /strip-ansi/6.0.1:
     resolution:
       {
@@ -5038,6 +4801,7 @@ packages:
     engines: { node: '>=8' }
     dependencies:
       ansi-regex: 5.0.1
+    dev: true
 
   /strip-ansi/7.0.1:
     resolution:
@@ -5324,21 +5088,6 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /tar/6.1.11:
-    resolution:
-      {
-        integrity: sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
-      }
-    engines: { node: '>= 10' }
-    dependencies:
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      minipass: 3.1.5
-      minizlib: 2.1.2
-      mkdirp: 1.0.4
-      yallist: 4.0.0
-    dev: false
-
   /text-table/0.2.0:
     resolution: { integrity: sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= }
     dev: true
@@ -5372,10 +5121,6 @@ packages:
       is-number: 7.0.0
     dev: true
 
-  /tr46/0.0.3:
-    resolution: { integrity: sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= }
-    dev: false
-
   /trim-right/1.0.1:
     resolution: { integrity: sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= }
     engines: { node: '>=0.10.0' }
@@ -5558,17 +5303,6 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /webidl-conversions/3.0.1:
-    resolution: { integrity: sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= }
-    dev: false
-
-  /whatwg-url/5.0.0:
-    resolution: { integrity: sha1-lmRU6HZUYuN2RNNib2dCzotwll0= }
-    dependencies:
-      tr46: 0.0.3
-      webidl-conversions: 3.0.1
-    dev: false
-
   /which/1.3.1:
     resolution:
       {
@@ -5589,15 +5323,6 @@ packages:
     dependencies:
       isexe: 2.0.0
 
-  /wide-align/1.1.5:
-    resolution:
-      {
-        integrity: sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
-      }
-    dependencies:
-      string-width: 4.2.3
-    dev: false
-
   /word-wrap/1.2.3:
     resolution:
       {
@@ -5650,6 +5375,7 @@ packages:
       {
         integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
       }
+    dev: true
 
   /yaml/1.10.2:
     resolution:
diff --git a/src/lib/database/users.ts b/src/lib/database/users.ts
index 7e5cc481e..552b422b5 100644
--- a/src/lib/database/users.ts
+++ b/src/lib/database/users.ts
@@ -1,5 +1,5 @@
 import cuid from 'cuid';
-import bcrypt from 'bcrypt';
+import bcrypt from 'bcryptjs';
 
 import { prisma } from './common';
 import { asyncExecShell, uniqueName } from '$lib/common';

From 823279fb60389009e6357b7731da19f034652aca Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 17:16:11 +0200
Subject: [PATCH 03/57] Updates

---
 Dockerfile                                            | 11 ++---------
 .../haproxy-http.Dockerfile                           |  0
 haproxy-tcp.Dockerfile => data/haproxy-tcp.Dockerfile |  0
 haproxy.Dockerfile => data/haproxy.Dockerfile         |  0
 data/prisma-engine.Dockerfile                         | 10 ++++++++++
 5 files changed, 12 insertions(+), 9 deletions(-)
 rename haproxy-http.Dockerfile => data/haproxy-http.Dockerfile (100%)
 rename haproxy-tcp.Dockerfile => data/haproxy-tcp.Dockerfile (100%)
 rename haproxy.Dockerfile => data/haproxy.Dockerfile (100%)
 create mode 100644 data/prisma-engine.Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 28e7e820b..5c95c5398 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,14 +3,6 @@ WORKDIR /app
 COPY package*.json .
 RUN yarn install
 
-
-FROM rust:1.58.1-alpine3.14 as prisma
-WORKDIR /prisma
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-RUN apk --no-cache add openssl direnv git musl-dev openssl-dev build-base perl protoc
-RUN git clone --depth=1 --branch=3.11.x https://github.com/prisma/prisma-engines.git /prisma 
-RUN cargo build --release
-
 FROM node:16.14.2-alpine 
 ARG TARGETPLATFORM
 
@@ -22,7 +14,8 @@ ENV PRISMA_QUERY_ENGINE_BINARY=/app/prisma-engines/query-engine \
   PRISMA_FMT_BINARY=/app/prisma-engines/prisma-fmt \
   PRISMA_CLI_QUERY_ENGINE_TYPE=binary \
   PRISMA_CLIENT_ENGINE_TYPE=binary
-COPY --from=prisma /prisma/target/release/query-engine /prisma/target/release/migration-engine /prisma/target/release/introspection-engine /prisma/target/release/prisma-fmt /app/prisma-engines/
+  
+COPY --from=coollabsio/prisma-engine:arm64 /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
 
 COPY --from=install /app/node_modules ./node_modules
 COPY . .
diff --git a/haproxy-http.Dockerfile b/data/haproxy-http.Dockerfile
similarity index 100%
rename from haproxy-http.Dockerfile
rename to data/haproxy-http.Dockerfile
diff --git a/haproxy-tcp.Dockerfile b/data/haproxy-tcp.Dockerfile
similarity index 100%
rename from haproxy-tcp.Dockerfile
rename to data/haproxy-tcp.Dockerfile
diff --git a/haproxy.Dockerfile b/data/haproxy.Dockerfile
similarity index 100%
rename from haproxy.Dockerfile
rename to data/haproxy.Dockerfile
diff --git a/data/prisma-engine.Dockerfile b/data/prisma-engine.Dockerfile
new file mode 100644
index 000000000..086472e23
--- /dev/null
+++ b/data/prisma-engine.Dockerfile
@@ -0,0 +1,10 @@
+FROM rust:1.58.1-alpine3.14 as prisma
+WORKDIR /prisma
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+RUN apk --no-cache add openssl direnv git musl-dev openssl-dev build-base perl protoc
+RUN git clone --depth=1 --branch=3.11.x https://github.com/prisma/prisma-engines.git /prisma 
+RUN cargo build --release
+
+FROM alpine
+WORKDIR /prisma-engines
+COPY --from=prisma /prisma/target/release/query-engine /prisma/target/release/migration-engine /prisma/target/release/introspection-engine /prisma/target/release/prisma-fmt /prisma-engines/

From 22ef0b5d29c30e39542d3f3549c20418f0afee6d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 17:46:08 +0200
Subject: [PATCH 04/57] Update packages

---
 Dockerfile   | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5c95c5398..4b7b67b85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,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:arm64 /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
+COPY --from=coollabsio/prisma-engine:latest /prisma-engines/query-engine /prisma-engines/migration-engine /prisma-engines/introspection-engine /prisma-engines/prisma-fmt /app/prisma-engines/
 
 COPY --from=install /app/node_modules ./node_modules
 COPY . .
diff --git a/package.json b/package.json
index 7dfd0f6e8..18c3a208e 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
 		"dev:stop": "docker-compose -f docker-compose-dev.yaml down",
 		"dev:logs": "docker-compose -f docker-compose-dev.yaml logs -f --tail 10",
 		"studio": "npx prisma studio",
-		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node index.js",
+		"start": "npx prisma migrate deploy && npx prisma generate && npx prisma db seed && node build/index.js",
 		"build": "svelte-kit build",
 		"preview": "svelte-kit preview",
 		"check": "svelte-check --tsconfig ./tsconfig.json",

From fe17e2eaba615cb83c154837e7b7b709d7c4b526 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 17:57:37 +0200
Subject: [PATCH 05/57] Prisma Engine build script

---
 data/build-prisma-engine.sh | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 data/build-prisma-engine.sh

diff --git a/data/build-prisma-engine.sh b/data/build-prisma-engine.sh
new file mode 100644
index 000000000..42c2af608
--- /dev/null
+++ b/data/build-prisma-engine.sh
@@ -0,0 +1 @@
+nohup docker build -t coollabsio/prisma-engine:<arm64/amd64> --push . &
\ No newline at end of file

From f6858a68e0f298ec34ba95240883534a92933fd8 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 22:51:08 +0200
Subject: [PATCH 06/57] Update schema

---
 prisma/schema.prisma | 1 +
 1 file changed, 1 insertion(+)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index a849ae36f..b05a6a6a4 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,5 +1,6 @@
 generator client {
   provider = "prisma-client-js"
+  binaryTargets = ["linux-musl"]
 }
 
 datasource db {

From 321fb019eb544946ce3ff54ab1b77dfbcc45ed20 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 1 Apr 2022 23:02:23 +0200
Subject: [PATCH 07/57] Update dockerfiles for arm

---
 data/haproxy-http.Dockerfile           | 6 +++---
 data/haproxy-tcp.Dockerfile            | 6 +++---
 data/haproxy.Dockerfile                | 6 +++---
 data/haproxy/haproxy.cfg-http.template | 8 ++++----
 data/haproxy/haproxy.cfg.template      | 8 ++++----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/data/haproxy-http.Dockerfile b/data/haproxy-http.Dockerfile
index 089ae0f96..de5246628 100644
--- a/data/haproxy-http.Dockerfile
+++ b/data/haproxy-http.Dockerfile
@@ -1,6 +1,6 @@
 FROM haproxytech/haproxy-alpine:2.5
 RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
 
-COPY data/haproxy/haproxy.cfg-http.template /usr/local/etc/haproxy/haproxy.cfg
-COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
-COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 
\ No newline at end of file
+COPY haproxy/haproxy.cfg-http.template /usr/local/etc/haproxy/haproxy.cfg
+COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
+COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 
\ No newline at end of file
diff --git a/data/haproxy-tcp.Dockerfile b/data/haproxy-tcp.Dockerfile
index bddcbe541..9b9639777 100644
--- a/data/haproxy-tcp.Dockerfile
+++ b/data/haproxy-tcp.Dockerfile
@@ -1,6 +1,6 @@
 FROM haproxytech/haproxy-alpine:2.5
 RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
 
-COPY data/haproxy/haproxy.cfg-tcp.template /usr/local/etc/haproxy/haproxy.cfg
-COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
-COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 
\ No newline at end of file
+COPY haproxy/haproxy.cfg-tcp.template /usr/local/etc/haproxy/haproxy.cfg
+COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
+COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 
\ No newline at end of file
diff --git a/data/haproxy.Dockerfile b/data/haproxy.Dockerfile
index 45e2d9d71..3ab520a65 100644
--- a/data/haproxy.Dockerfile
+++ b/data/haproxy.Dockerfile
@@ -1,6 +1,6 @@
 FROM haproxytech/haproxy-alpine:2.5
 RUN mkdir -p /usr/local/etc/haproxy/ssl /usr/local/etc/haproxy/maps /usr/local/etc/haproxy/spoe
 
-COPY data/haproxy/haproxy.cfg.template /usr/local/etc/haproxy/haproxy.cfg
-COPY data/haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
-COPY data/haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 
\ No newline at end of file
+COPY haproxy/haproxy.cfg.template /usr/local/etc/haproxy/haproxy.cfg
+COPY haproxy/dataplaneapi.hcl /usr/local/etc/haproxy/dataplaneapi.hcl
+COPY haproxy/ssl/default.pem /usr/local/etc/haproxy/ssl/default.pem 
\ No newline at end of file
diff --git a/data/haproxy/haproxy.cfg-http.template b/data/haproxy/haproxy.cfg-http.template
index 72fdece7a..f819e9be7 100644
--- a/data/haproxy/haproxy.cfg-http.template
+++ b/data/haproxy/haproxy.cfg-http.template
@@ -4,10 +4,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
-  timeout connect 10s
-  timeout client 60s
-  timeout server 60s
+  timeout http-request 120s
+  timeout connect 20s
+  timeout client 120s
+  timeout server 120s
 
 frontend "${APP}"
   mode http
diff --git a/data/haproxy/haproxy.cfg.template b/data/haproxy/haproxy.cfg.template
index c39cb7878..35cb8a74d 100644
--- a/data/haproxy/haproxy.cfg.template
+++ b/data/haproxy/haproxy.cfg.template
@@ -5,10 +5,10 @@ global
 defaults 
   mode http
   log global
-  timeout http-request 60s
-  timeout connect 10s
-  timeout client 60s
-  timeout server 60s
+  timeout http-request 120s
+  timeout connect 20s
+  timeout client 120s
+  timeout server 120s
 
 userlist haproxy-dataplaneapi 
   user admin insecure-password "${HAPROXY_PASSWORD}"

From 1b43976ff0b827c3d176b331a5056ee142373e1a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 2 Apr 2022 13:39:24 +0200
Subject: [PATCH 08/57] Update proxy build commands

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 18c3a208e..922ffc220 100644
--- a/package.json
+++ b/package.json
@@ -20,9 +20,9 @@
 		"release:staging": "cross-var docker build -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
 		"release:pre": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
 		"release:coolify": "cross-var yarn release:pre && docker push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
-		"release:haproxy": "docker build -f haproxy.Dockerfile -t coollabsio/coolify-haproxy-alpine:1.0.0 -t coollabsio/coolify-haproxy-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-alpine",
-		"release:haproxy:tcp": "docker build -f haproxy-tcp.Dockerfile -t coollabsio/coolify-haproxy-tcp-alpine:1.0.0 -t coollabsio/coolify-haproxy-tcp-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-tcp-alpine",
-		"release:haproxy:http": "docker build -f haproxy-http.Dockerfile -t coollabsio/coolify-haproxy-http-alpine:1.0.0 -t coollabsio/coolify-haproxy-http-alpine:latest . && docker image push --all-tags coollabsio/coolify-haproxy-http-alpine",
+		"release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f haproxy.Dockerfile --push .",
+		"release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f haproxy-tcp.Dockerfile --push .",
+		"release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f haproxy-http.Dockerfile --push .",
 		"prepare": "husky install"
 	},
 	"devDependencies": {

From fd652bfce6aa18344049e6c01d1690541e1cad2f Mon Sep 17 00:00:00 2001
From: Philip Schmidt <philip.schmidt@networkteam.com>
Date: Wed, 6 Apr 2022 18:33:02 +0200
Subject: [PATCH 09/57] write args at the beginning of dockerfile and inherit
 them for each stage

---
 src/lib/buildPacks/docker.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/lib/buildPacks/docker.ts b/src/lib/buildPacks/docker.ts
index 371ffed82..2db5d567c 100644
--- a/src/lib/buildPacks/docker.ts
+++ b/src/lib/buildPacks/docker.ts
@@ -26,14 +26,17 @@ export default async function ({
 		if (secrets.length > 0) {
 			secrets.forEach((secret) => {
 				if (secret.isBuildSecret) {
-					if (pullmergeRequestId) {
-						if (secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-						}
-					} else {
-						if (!secret.isPRMRSecret) {
-							Dockerfile.push(`ARG ${secret.name}=${secret.value}`);
-						}
+					if (
+						(pullmergeRequestId && secret.isPRMRSecret) ||
+						(!pullmergeRequestId && !secret.isPRMRSecret)
+					) {
+						Dockerfile.unshift(`ARG ${secret.name}=${secret.value}`);
+
+						Dockerfile.forEach((line, index) => {
+							if (line.startsWith('FROM')) {
+								Dockerfile.splice(index + 1, 0, `ARG ${secret.name}`);
+							}
+						});
 					}
 				}
 			});

From 5bf14f4639e188084863fc06e601cbfd096e045f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 14:29:40 +0200
Subject: [PATCH 10/57] feat: Able to modify database passwords

---
 src/app.d.ts                                  |  3 +
 src/lib/components/common.ts                  |  2 +-
 src/lib/database/databases.ts                 | 34 ++++++++
 src/lib/database/destinations.ts              |  4 +-
 .../[id]/_Databases/_Databases.svelte         | 82 +++++++++++++------
 .../databases/[id]/_Databases/_MongoDB.svelte |  9 +-
 .../databases/[id]/_Databases/_MySQL.svelte   | 16 ++--
 .../[id]/_Databases/_PostgreSQL.svelte        |  9 +-
 .../databases/[id]/_Databases/_Redis.svelte   | 36 ++------
 src/routes/databases/[id]/__layout.svelte     | 16 ++--
 src/routes/databases/[id]/index.json.ts       | 33 ++++++--
 src/routes/databases/[id]/index.svelte        |  6 +-
 .../destinations/[id]/_LocalDocker.svelte     | 12 ++-
 13 files changed, 167 insertions(+), 95 deletions(-)

diff --git a/src/app.d.ts b/src/app.d.ts
index a88bd7502..d432aef4a 100644
--- a/src/app.d.ts
+++ b/src/app.d.ts
@@ -15,6 +15,9 @@ declare namespace App {
 		readOnly: boolean;
 		source: string;
 		settings: string;
+		database: Record<string, any>;
+		versions: string;
+		privatePort: string;
 	}
 }
 
diff --git a/src/lib/components/common.ts b/src/lib/components/common.ts
index 3e5568432..2bd962c4c 100644
--- a/src/lib/components/common.ts
+++ b/src/lib/components/common.ts
@@ -56,7 +56,7 @@ export const supportedDatabaseTypesAndVersions = [
 		name: 'postgresql',
 		fancyName: 'PostgreSQL',
 		baseImage: 'bitnami/postgresql',
-		versions: ['14.2', '13.6', '12.10', '11.15', '10.20']
+		versions: ['14.2.0', '13.6.0', '12.10.0	', '11.15.0', '10.20.0']
 	},
 	{
 		name: 'redis',
diff --git a/src/lib/database/databases.ts b/src/lib/database/databases.ts
index 7fc237944..2179b5479 100644
--- a/src/lib/database/databases.ts
+++ b/src/lib/database/databases.ts
@@ -137,3 +137,37 @@ export async function stopDatabase(database) {
 	}
 	return everStarted;
 }
+
+export async function updatePasswordInDb(database, user, newPassword) {
+	const {
+		id,
+		type,
+		rootUser,
+		rootUserPassword,
+		dbUser,
+		dbUserPassword,
+		defaultDatabase,
+		destinationDockerId,
+		destinationDocker: { engine }
+	} = database;
+	if (destinationDockerId) {
+		const host = getEngine(engine);
+		if (type === 'mysql') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} mysql -u ${rootUser} -p${rootUserPassword} -e \"ALTER USER '${user}'@'%' IDENTIFIED WITH caching_sha2_password BY '${newPassword}';\"`
+			);
+		} else if (type === 'postgresql') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} psql postgresql://${dbUser}:${dbUserPassword}@${id}:5432/${defaultDatabase} -c "ALTER role ${user} WITH PASSWORD '${newPassword}'"`
+			);
+		} else if (type === 'mongodb') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} mongo 'mongodb://${rootUser}:${rootUserPassword}@${id}:27017/admin?readPreference=primary&ssl=false' --eval "db.changeUserPassword('${user}','${newPassword}')"`
+			);
+		} else if (type === 'redis') {
+			await asyncExecShell(
+				`DOCKER_HOST=${host} docker exec ${id} redis-cli -u redis://${dbUserPassword}@${id}:6379 --raw CONFIG SET requirepass ${newPassword}`
+			);
+		}
+	}
+}
diff --git a/src/lib/database/destinations.ts b/src/lib/database/destinations.ts
index 5bd63c81b..7b2570d93 100644
--- a/src/lib/database/destinations.ts
+++ b/src/lib/database/destinations.ts
@@ -44,9 +44,7 @@ export async function configureDestinationForDatabase({ id, destinationId }) {
 		const host = getEngine(engine);
 		if (type && version) {
 			const baseImage = getDatabaseImage(type);
-			asyncExecShell(
-				`DOCKER_HOST=${host} docker pull ${baseImage}:${version} && echo "FROM ${baseImage}:${version}" | docker build --label coolify.image="true" -t "${baseImage}:${version}" -`
-			);
+			asyncExecShell(`DOCKER_HOST=${host} docker pull ${baseImage}:${version}`);
 		}
 	}
 }
diff --git a/src/routes/databases/[id]/_Databases/_Databases.svelte b/src/routes/databases/[id]/_Databases/_Databases.svelte
index 1820577bc..731dcd80e 100644
--- a/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -2,6 +2,8 @@
 	export let database;
 	export let privatePort;
 	export let settings;
+	export let isRunning;
+
 	import { page, session } from '$app/stores';
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
 	import Setting from '$lib/components/Setting.svelte';
@@ -15,24 +17,36 @@
 	import { browser } from '$app/env';
 	import { post } from '$lib/api';
 	import { getDomain } from '$lib/components/common';
+	import { toast } from '@zerodevx/svelte-toast';
 
 	const { id } = $page.params;
+
 	let loading = false;
+	let publicLoading = false;
+
 	let isPublic = database.settings.isPublic || false;
 	let appendOnly = database.settings.appendOnly;
 
-	let databaseDefault = database.defaultDatabase;
-	let databaseDbUser = database.dbUser;
-	let databaseDbUserPassword = database.dbUserPassword;
-	if (database.type === 'mongodb') {
-		databaseDefault = '?readPreference=primary&ssl=false';
-		databaseDbUser = database.rootUser;
-		databaseDbUserPassword = database.rootUserPassword;
-	} else if (database.type === 'redis') {
-		databaseDefault = '';
-		databaseDbUser = '';
+	let databaseDefault;
+	let databaseDbUser;
+	let databaseDbUserPassword;
+
+	generateDbDetails();
+
+	function generateDbDetails() {
+		databaseDefault = database.defaultDatabase;
+		databaseDbUser = database.dbUser;
+		databaseDbUserPassword = database.dbUserPassword;
+		if (database.type === 'mongodb') {
+			databaseDefault = '?readPreference=primary&ssl=false';
+			databaseDbUser = database.rootUser;
+			databaseDbUserPassword = database.rootUserPassword;
+		} else if (database.type === 'redis') {
+			databaseDefault = '';
+			databaseDbUser = '';
+		}
 	}
-	let databaseUrl = generateUrl();
+	$: databaseUrl = generateUrl();
 
 	function generateUrl() {
 		return browser
@@ -49,28 +63,46 @@
 	}
 
 	async function changeSettings(name) {
+		if (publicLoading || !isRunning) return;
+		publicLoading = true;
+		let data = {
+			isPublic,
+			appendOnly
+		};
 		if (name === 'isPublic') {
-			isPublic = !isPublic;
+			data.isPublic = !isPublic;
 		}
 		if (name === 'appendOnly') {
-			appendOnly = !appendOnly;
+			data.appendOnly = !appendOnly;
 		}
 		try {
-			const { publicPort } = await post(`/databases/${id}/settings.json`, { isPublic, appendOnly });
+			const { publicPort } = await post(`/databases/${id}/settings.json`, {
+				isPublic: data.isPublic,
+				appendOnly: data.appendOnly
+			});
+			isPublic = data.isPublic;
+			appendOnly = data.appendOnly;
+			databaseUrl = generateUrl();
 			if (isPublic) {
 				database.publicPort = publicPort;
 			}
-			databaseUrl = generateUrl();
 		} catch ({ error }) {
 			return errorNotification(error);
+		} finally {
+			publicLoading = false;
 		}
 	}
 	async function handleSubmit() {
 		try {
-			await post(`/databases/${id}.json`, { ...database });
-			return window.location.reload();
+			loading = true;
+			await post(`/databases/${id}.json`, { ...database, isRunning });
+			generateDbDetails();
+			databaseUrl = generateUrl();
+			toast.push('Settings saved.');
 		} catch ({ error }) {
 			return errorNotification(error);
+		} finally {
+			loading = false;
 		}
 	}
 </script>
@@ -142,21 +174,21 @@
 					readonly
 					disabled
 					name="publicPort"
-					value={isPublic ? database.publicPort : privatePort}
+					value={publicLoading ? 'Loading...' : isPublic ? database.publicPort : privatePort}
 				/>
 			</div>
 		</div>
 		<div class="grid grid-flow-row gap-2">
 			{#if database.type === 'mysql'}
-				<MySql bind:database />
+				<MySql bind:database {isRunning} />
 			{:else if database.type === 'postgresql'}
-				<PostgreSql bind:database />
+				<PostgreSql bind:database {isRunning} />
 			{:else if database.type === 'mongodb'}
-				<MongoDb {database} />
+				<MongoDb bind:database {isRunning} />
 			{:else if database.type === 'redis'}
-				<Redis {database} />
+				<Redis bind:database {isRunning} />
 			{:else if database.type === 'couchdb'}
-				<CouchDb bind:database />
+				<CouchDb {database} />
 			{/if}
 			<div class="grid grid-cols-2 items-center px-10 pb-8">
 				<label for="url" class="text-base font-bold text-stone-100">Connection String</label>
@@ -168,7 +200,7 @@
 					name="url"
 					readonly
 					disabled
-					value={databaseUrl}
+					value={publicLoading || loading ? 'Loading...' : databaseUrl}
 				/>
 			</div>
 		</div>
@@ -179,10 +211,12 @@
 	<div class="px-10 pb-10">
 		<div class="grid grid-cols-2 items-center">
 			<Setting
+				loading={publicLoading}
 				bind:setting={isPublic}
 				on:click={() => changeSettings('isPublic')}
 				title="Set it public"
 				description="Your database will be reachable over the internet. <br>Take security seriously in this case!"
+				disabled={!isRunning}
 			/>
 		</div>
 		{#if database.type === 'redis'}
diff --git a/src/routes/databases/[id]/_Databases/_MongoDB.svelte b/src/routes/databases/[id]/_Databases/_MongoDB.svelte
index 7ec21edcd..fa73b870e 100644
--- a/src/routes/databases/[id]/_Databases/_MongoDB.svelte
+++ b/src/routes/databases/[id]/_Databases/_MongoDB.svelte
@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -21,13 +23,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
 		<CopyPasswordField
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField={true}
-			readonly
-			disabled
 			id="rootUserPassword"
 			name="rootUserPassword"
-			value={database.rootUserPassword}
+			bind:value={database.rootUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 </div>
diff --git a/src/routes/databases/[id]/_Databases/_MySQL.svelte b/src/routes/databases/[id]/_Databases/_MySQL.svelte
index f085b3320..27057049b 100644
--- a/src/routes/databases/[id]/_Databases/_MySQL.svelte
+++ b/src/routes/databases/[id]/_Databases/_MySQL.svelte
@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -33,14 +35,15 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
 		<CopyPasswordField
-			readonly
-			disabled
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
-			value={database.dbUserPassword}
+			bind:value={database.dbUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUser" class="text-base font-bold text-stone-100">Root User</label>
@@ -56,13 +59,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="rootUserPassword" class="text-base font-bold text-stone-100">Root's Password</label>
 		<CopyPasswordField
-			readonly
-			disabled
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="rootUserPassword"
 			name="rootUserPassword"
-			value={database.rootUserPassword}
+			bind:value={database.rootUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 </div>
diff --git a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
index 3f995cafc..d59f6bbbc 100644
--- a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
+++ b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -33,13 +35,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
 		<CopyPasswordField
-			readonly
-			disabled
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
-			value={database.dbUserPassword}
+			bind:value={database.dbUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
 </div>
diff --git a/src/routes/databases/[id]/_Databases/_Redis.svelte b/src/routes/databases/[id]/_Databases/_Redis.svelte
index fece7c837..fdd2ce5f1 100644
--- a/src/routes/databases/[id]/_Databases/_Redis.svelte
+++ b/src/routes/databases/[id]/_Databases/_Redis.svelte
@@ -1,6 +1,8 @@
 <script>
 	export let database;
+	export let isRunning;
 	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import Explainer from '$lib/components/Explainer.svelte';
 </script>
 
 <div class="flex space-x-1 py-5 font-bold">
@@ -10,40 +12,14 @@
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUserPassword" class="text-base font-bold text-stone-100">Password</label>
 		<CopyPasswordField
-			disabled
-			readonly
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			isPasswordField
 			id="dbUserPassword"
 			name="dbUserPassword"
-			value={database.dbUserPassword}
+			bind:value={database.dbUserPassword}
 		/>
+		<Explainer text="Could be changed while the database is running." />
 	</div>
-	<!-- <div class="grid grid-cols-3 items-center">
-		<label for="rootUser">Root User</label>
-		<div class="col-span-2 ">
-			<CopyPasswordField
-				disabled
-				readonly
-				placeholder="Generated automatically after start"
-				id="rootUser"
-				name="rootUser"
-				value={database.rootUser}
-			/>
-		</div>
-	</div>
-	<div class="grid grid-cols-3 items-center">
-		<label for="rootUserPassword">Root's Password</label>
-		<div class="col-span-2 ">
-			<CopyPasswordField
-				disabled
-				readonly
-				placeholder="Generated automatically after start"
-				isPasswordField
-				id="rootUserPassword"
-				name="rootUserPassword"
-				value={database.rootUserPassword}
-			/>
-		</div>
-	</div> -->
 </div>
diff --git a/src/routes/databases/[id]/__layout.svelte b/src/routes/databases/[id]/__layout.svelte
index ae08d48f7..45016da69 100644
--- a/src/routes/databases/[id]/__layout.svelte
+++ b/src/routes/databases/[id]/__layout.svelte
@@ -15,7 +15,7 @@
 		const endpoint = `/databases/${params.id}.json`;
 		const res = await fetch(endpoint);
 		if (res.ok) {
-			const { database, state, versions, privatePort, settings } = await res.json();
+			const { database, isRunning, versions, privatePort, settings } = await res.json();
 			if (!database || Object.entries(database).length === 0) {
 				return {
 					status: 302,
@@ -35,13 +35,13 @@
 			return {
 				props: {
 					database,
-					state,
+					isRunning,
 					versions,
 					privatePort
 				},
 				stuff: {
 					database,
-					state,
+					isRunning,
 					versions,
 					privatePort,
 					settings
@@ -65,7 +65,7 @@
 	import { goto } from '$app/navigation';
 
 	export let database;
-	export let state;
+	export let isRunning;
 	let loading = false;
 
 	async function deleteDatabase() {
@@ -91,8 +91,6 @@
 				return window.location.reload();
 			} catch ({ error }) {
 				return errorNotification(error);
-			} finally {
-				loading = false;
 			}
 		}
 	}
@@ -103,8 +101,6 @@
 			return window.location.reload();
 		} catch ({ error }) {
 			return errorNotification(error);
-		} finally {
-			loading = false;
 		}
 	}
 </script>
@@ -114,7 +110,7 @@
 		<Loading fullscreen cover />
 	{:else}
 		{#if database.type && database.destinationDockerId && database.version && database.defaultDatabase}
-			{#if state === 'running'}
+			{#if isRunning}
 				<button
 					on:click={stopDatabase}
 					title="Stop database"
@@ -140,7 +136,7 @@
 						<rect x="14" y="5" width="4" height="14" rx="1" />
 					</svg>
 				</button>
-			{:else if state === 'not started'}
+			{:else}
 				<button
 					on:click={startDatabase}
 					title="Start database"
diff --git a/src/routes/databases/[id]/index.json.ts b/src/routes/databases/[id]/index.json.ts
index 3fce43482..cdfb33d21 100644
--- a/src/routes/databases/[id]/index.json.ts
+++ b/src/routes/databases/[id]/index.json.ts
@@ -1,6 +1,11 @@
 import { asyncExecShell, getEngine, getUserDetails } from '$lib/common';
 import * as db from '$lib/database';
-import { generateDatabaseConfiguration, getVersions, ErrorHandler } from '$lib/database';
+import {
+	generateDatabaseConfiguration,
+	getVersions,
+	ErrorHandler,
+	updatePasswordInDb
+} from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
 
 export const get: RequestHandler = async (event) => {
@@ -12,7 +17,7 @@ export const get: RequestHandler = async (event) => {
 		const database = await db.getDatabase({ id, teamId });
 		const { destinationDockerId, destinationDocker } = database;
 
-		let state = 'not started';
+		let isRunning = false;
 		if (destinationDockerId) {
 			const host = getEngine(destinationDocker.engine);
 
@@ -22,7 +27,7 @@ export const get: RequestHandler = async (event) => {
 				);
 
 				if (JSON.parse(stdout).Running) {
-					state = 'running';
+					isRunning = true;
 				}
 			} catch (error) {
 				//
@@ -34,7 +39,7 @@ export const get: RequestHandler = async (event) => {
 			body: {
 				privatePort: configuration?.privatePort,
 				database,
-				state,
+				isRunning,
 				versions: getVersions(database.type),
 				settings
 			}
@@ -48,10 +53,26 @@ export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 	const { id } = event.params;
-	const { name, defaultDatabase, dbUser, dbUserPassword, rootUser, rootUserPassword, version } =
-		await event.request.json();
+	const {
+		name,
+		defaultDatabase,
+		dbUser,
+		dbUserPassword,
+		rootUser,
+		rootUserPassword,
+		version,
+		isRunning
+	} = await event.request.json();
 
 	try {
+		const database = await db.getDatabase({ id, teamId });
+		if (isRunning) {
+			if (database.dbUserPassword !== dbUserPassword) {
+				await updatePasswordInDb(database, dbUser, dbUserPassword);
+			} else if (database.rootUserPassword !== rootUserPassword) {
+				await updatePasswordInDb(database, rootUser, rootUserPassword);
+			}
+		}
 		await db.updateDatabase({
 			id,
 			name,
diff --git a/src/routes/databases/[id]/index.svelte b/src/routes/databases/[id]/index.svelte
index e4d7ea883..3ead53529 100644
--- a/src/routes/databases/[id]/index.svelte
+++ b/src/routes/databases/[id]/index.svelte
@@ -8,7 +8,8 @@
 					database: stuff.database,
 					versions: stuff.versions,
 					privatePort: stuff.privatePort,
-					settings: stuff.settings
+					settings: stuff.settings,
+					isRunning: stuff.isRunning
 				}
 			};
 		}
@@ -35,6 +36,7 @@
 	export let database;
 	export let settings;
 	export let privatePort;
+	export let isRunning;
 </script>
 
 <div class="flex items-center space-x-2 p-6 text-2xl font-bold">
@@ -47,4 +49,4 @@
 	<DatabaseLinks {database} />
 </div>
 
-<Databases bind:database {privatePort} {settings} />
+<Databases bind:database {privatePort} {settings} {isRunning} />
diff --git a/src/routes/destinations/[id]/_LocalDocker.svelte b/src/routes/destinations/[id]/_LocalDocker.svelte
index 1ed6d3b99..ecbd0313b 100644
--- a/src/routes/destinations/[id]/_LocalDocker.svelte
+++ b/src/routes/destinations/[id]/_LocalDocker.svelte
@@ -12,8 +12,8 @@
 	import { onMount } from 'svelte';
 	const { id } = $page.params;
 	let cannotDisable = settings.fqdn && destination.engine === '/var/run/docker.sock';
-	// let scannedApps = [];
 	let loading = false;
+	let loadingProxy = false;
 	let restarting = false;
 	async function handleSubmit() {
 		loading = true;
@@ -25,12 +25,6 @@
 			loading = false;
 		}
 	}
-	// async function scanApps() {
-	// 	scannedApps = [];
-	// 	const data = await fetch(`/destinations/${id}/scan.json`);
-	// 	const { containers } = await data.json();
-	// 	scannedApps = containers;
-	// }
 	onMount(async () => {
 		if (state === false && destination.isCoolifyProxyUsed === true) {
 			destination.isCoolifyProxyUsed = !destination.isCoolifyProxyUsed;
@@ -71,6 +65,7 @@
 			}
 			destination.isCoolifyProxyUsed = !destination.isCoolifyProxyUsed;
 			try {
+				loadingProxy = true;
 				await post(`/destinations/${id}/settings.json`, {
 					isCoolifyProxyUsed: destination.isCoolifyProxyUsed,
 					engine: destination.engine
@@ -82,6 +77,8 @@
 				}
 			} catch ({ error }) {
 				return errorNotification(error);
+			} finally {
+				loadingProxy = false;
 			}
 		}
 	}
@@ -187,6 +184,7 @@
 	{#if $session.teamId === '0'}
 		<div class="grid grid-cols-2 items-center">
 			<Setting
+				loading={loadingProxy}
 				disabled={cannotDisable}
 				bind:setting={destination.isCoolifyProxyUsed}
 				on:click={changeProxySetting}

From 2f8d0ee60cd482caac44f53ae556f9fa8f392710 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 15:23:32 +0200
Subject: [PATCH 11/57] ui: Better layout for root team

---
 src/lib/common.ts                    |   1 +
 src/routes/__layout.svelte           |   2 +-
 src/routes/applications/index.svelte |  31 +++++-
 src/routes/dashboard.json.ts         |  15 ++-
 src/routes/databases/index.svelte    | 114 +++++++++++++++------
 src/routes/destinations/index.svelte |  56 ++++++++---
 src/routes/services/index.svelte     | 144 +++++++++++++++++++--------
 src/routes/settings/index.json.ts    |   4 +-
 src/routes/settings/index.svelte     |   7 +-
 src/routes/sources/index.svelte      |  87 ++++++++++++----
 src/routes/teams/index.json.ts       |   2 +-
 src/routes/teams/index.svelte        |  65 +++++++++---
 12 files changed, 396 insertions(+), 132 deletions(-)

diff --git a/src/lib/common.ts b/src/lib/common.ts
index 680e35208..4eec73539 100644
--- a/src/lib/common.ts
+++ b/src/lib/common.ts
@@ -100,6 +100,7 @@ export const getUserDetails = async (event, isAdminRequired = true) => {
 			message: 'OK'
 		}
 	};
+
 	if (isAdminRequired && permission !== 'admin' && permission !== 'owner') {
 		payload.status = 401;
 		payload.body.message =
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 8d5922450..b6cb57435 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -12,7 +12,7 @@
 		if (!session.userId) {
 			return {};
 		}
-		const endpoint = `/teams.json`;
+		const endpoint = `/dashboard.json`;
 		const res = await fetch(endpoint);
 
 		if (res.ok) {
diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 5f6056ac5..049bded43 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -8,6 +8,16 @@
 		const { id } = await post('/applications/new', {});
 		return await goto(`/applications/${id}`, { replaceState: true });
 	}
+	const ownApplications = applications.filter((application) => {
+		if (application.teams[0].id === $session.teamId) {
+			return application;
+		}
+	});
+	const otherApplications = applications.filter((application) => {
+		if (application.teams[0].id !== $session.teamId) {
+			return application;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -36,8 +46,23 @@
 			<div class="text-center text-xl font-bold">No applications found</div>
 		</div>
 	{:else}
-		{#each applications as application}
-			<Application {application} />
-		{/each}
+		<div class="flex flex-col">
+			{#if $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
+			{/if}
+			<div class="flex flex-col md:flex-row">
+				{#each ownApplications as application}
+					<Application {application} />
+				{/each}
+			</div>
+			{#if otherApplications.length > 0 && $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 pt-10 -ml-10">Other Team's Applications</div>
+				<div class="flex">
+					{#each otherApplications as application}
+						<Application {application} />
+					{/each}
+				</div>
+			{/if}
+		</div>
 	{/if}
 </div>
diff --git a/src/routes/dashboard.json.ts b/src/routes/dashboard.json.ts
index 4c3ed3097..11ff9bab3 100644
--- a/src/routes/dashboard.json.ts
+++ b/src/routes/dashboard.json.ts
@@ -9,23 +9,28 @@ export const get: RequestHandler = async (event) => {
 
 	try {
 		const applicationsCount = await db.prisma.application.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const sourcesCount = await db.prisma.gitSource.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const destinationsCount = await db.prisma.destinationDocker.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const teamsCount = await db.prisma.permission.count({ where: { userId } });
 		const databasesCount = await db.prisma.database.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
 		});
 		const servicesCount = await db.prisma.service.count({
-			where: { teams: { some: { id: teamId } } }
+			where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
+		});
+		const teams = await db.prisma.permission.findMany({
+			where: { userId },
+			include: { team: { include: { _count: { select: { users: true } } } } }
 		});
 		return {
 			body: {
+				teams,
 				applicationsCount,
 				sourcesCount,
 				destinationsCount,
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 32156ef4b..26fc89d9c 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -14,6 +14,16 @@
 		const { id } = await post('/databases/new', {});
 		return await goto(`/databases/${id}`, { replaceState: true });
 	}
+	const ownDatabases = databases.filter((database) => {
+		if (database.teams[0].id === $session.teamId) {
+			return database;
+		}
+	});
+	const otherDatabases = databases.filter((database) => {
+		if (database.teams[0].id !== $session.teamId) {
+			return database;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -41,37 +51,81 @@
 			<div class="text-center text-xl font-bold">No databases found</div>
 		</div>
 	{:else}
-		{#each databases as database}
-			<a href="/databases/{database.id}" class="no-underline p-2 w-96">
-				<div class="box-selection relative hover:bg-purple-600 group">
-					{#if database.type === 'clickhouse'}
-						<Clickhouse isAbsolute />
-					{:else if database.type === 'couchdb'}
-						<CouchDB isAbsolute />
-					{:else if database.type === 'mongodb'}
-						<MongoDB isAbsolute />
-					{:else if database.type === 'mysql'}
-						<MySQL isAbsolute />
-					{:else if database.type === 'postgresql'}
-						<PostgreSQL isAbsolute />
-					{:else if database.type === 'redis'}
-						<Redis isAbsolute />
-					{/if}
-					<div class="font-bold text-xl text-center truncate">
-						{database.name}
-					</div>
-					{#if $session.teamId === '0'}
-						<div class="text-center truncate">Team {database.teams[0].name}</div>
-					{/if}
-					{#if !database.type}
-						<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
-							Configuration missing
+		<div class="flex flex-col">
+			{#if $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Databases</div>
+			{/if}
+			<div class="flex flex-col md:flex-row">
+				{#each ownDatabases as database}
+					<a href="/databases/{database.id}" class="no-underline p-2 w-96">
+						<div class="box-selection relative hover:bg-purple-600 group">
+							{#if database.type === 'clickhouse'}
+								<Clickhouse isAbsolute />
+							{:else if database.type === 'couchdb'}
+								<CouchDB isAbsolute />
+							{:else if database.type === 'mongodb'}
+								<MongoDB isAbsolute />
+							{:else if database.type === 'mysql'}
+								<MySQL isAbsolute />
+							{:else if database.type === 'postgresql'}
+								<PostgreSQL isAbsolute />
+							{:else if database.type === 'redis'}
+								<Redis isAbsolute />
+							{/if}
+							<div class="font-bold text-xl text-center truncate">
+								{database.name}
+							</div>
+							{#if $session.teamId === '0'}
+								<div class="text-center truncate">Team {database.teams[0].name}</div>
+							{/if}
+							{#if !database.type}
+								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{:else}
+								<div class="text-center truncate">{database.type}</div>
+							{/if}
 						</div>
-					{:else}
-						<div class="text-center truncate">{database.type}</div>
-					{/if}
+					</a>
+				{/each}
+			</div>
+			{#if otherDatabases.length > 0 && $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Databases</div>
+				<div class="flex">
+					{#each otherDatabases as database}
+						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
+							<div class="box-selection relative hover:bg-purple-600 group">
+								{#if database.type === 'clickhouse'}
+									<Clickhouse isAbsolute />
+								{:else if database.type === 'couchdb'}
+									<CouchDB isAbsolute />
+								{:else if database.type === 'mongodb'}
+									<MongoDB isAbsolute />
+								{:else if database.type === 'mysql'}
+									<MySQL isAbsolute />
+								{:else if database.type === 'postgresql'}
+									<PostgreSQL isAbsolute />
+								{:else if database.type === 'redis'}
+									<Redis isAbsolute />
+								{/if}
+								<div class="font-bold text-xl text-center truncate">
+									{database.name}
+								</div>
+								{#if $session.teamId === '0'}
+									<div class="text-center truncate">Team {database.teams[0].name}</div>
+								{/if}
+								{#if !database.type}
+									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+										Configuration missing
+									</div>
+								{:else}
+									<div class="text-center truncate">{database.type}</div>
+								{/if}
+							</div>
+						</a>
+					{/each}
 				</div>
-			</a>
-		{/each}
+			{/if}
+		</div>
 	{/if}
 </div>
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index df186e35f..f78f8dc7a 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -24,6 +24,16 @@
 
 	import { session } from '$app/stores';
 	export let destinations: Prisma.DestinationDocker[];
+	const ownDestinations = destinations.filter((destination) => {
+		if (destination.teams[0].id === $session.teamId) {
+			return destination;
+		}
+	});
+	const otherDestinations = destinations.filter((destination) => {
+		if (destination.teams[0].id !== $session.teamId) {
+			return destination;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -52,18 +62,40 @@
 			<div class="text-center text-xl font-bold">No destination found</div>
 		</div>
 	{:else}
-		<div class="flex flex-wrap justify-center">
-			{#each destinations as destination}
-				<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
-					<div class="box-selection hover:bg-sky-600">
-						<div class="font-bold text-xl text-center truncate">{destination.name}</div>
-						{#if $session.teamId === '0'}
-							<div class="text-center truncate">Team {destination.teams[0].name}</div>
-						{/if}
-						<div class="text-center truncate">{destination.network}</div>
-					</div>
-				</a>
-			{/each}
+		<div class="flex flex-col">
+			{#if $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Destinations</div>
+			{/if}
+			<div class="flex flex-col md:flex-row">
+				{#each ownDestinations as destination}
+					<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
+						<div class="box-selection hover:bg-sky-600">
+							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
+							{#if $session.teamId === '0'}
+								<div class="text-center truncate">Team {destination.teams[0].name}</div>
+							{/if}
+							<div class="text-center truncate">{destination.network}</div>
+						</div>
+					</a>
+				{/each}
+			</div>
+
+			{#if otherDestinations.length > 0 && $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Destinations</div>
+				<div class="flex">
+					{#each otherDestinations as destination}
+						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
+							<div class="box-selection hover:bg-sky-600">
+								<div class="font-bold text-xl text-center truncate">{destination.name}</div>
+								{#if $session.teamId === '0'}
+									<div class="text-center truncate">Team {destination.teams[0].name}</div>
+								{/if}
+								<div class="text-center truncate">{destination.network}</div>
+							</div>
+						</a>
+					{/each}
+				</div>
+			{/if}
 		</div>
 	{/if}
 </div>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index d590761a2..19f651d7e 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -19,6 +19,16 @@
 		const { id } = await post('/services/new', {});
 		return await goto(`/services/${id}`, { replaceState: true });
 	}
+	const ownServices = services.filter((service) => {
+		if (service.teams[0].id === $session.teamId) {
+			return service;
+		}
+	});
+	const otherServices = services.filter((service) => {
+		if (service.teams[0].id !== $session.teamId) {
+			return service;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -46,47 +56,101 @@
 			<div class="text-center text-xl font-bold">No services found</div>
 		</div>
 	{:else}
-		{#each services as service}
-			<a href="/services/{service.id}" class="no-underline p-2 w-96">
-				<div class="box-selection relative hover:bg-pink-600 group">
-					{#if service.type === 'plausibleanalytics'}
-						<PlausibleAnalytics isAbsolute />
-					{:else if service.type === 'nocodb'}
-						<NocoDb isAbsolute />
-					{:else if service.type === 'minio'}
-						<MinIo isAbsolute />
-					{:else if service.type === 'vscodeserver'}
-						<VsCodeServer isAbsolute />
-					{:else if service.type === 'wordpress'}
-						<Wordpress isAbsolute />
-					{:else if service.type === 'vaultwarden'}
-						<VaultWarden isAbsolute />
-					{:else if service.type === 'languagetool'}
-						<LanguageTool isAbsolute />
-					{:else if service.type === 'n8n'}
-						<N8n isAbsolute />
-					{:else if service.type === 'uptimekuma'}
-						<UptimeKuma isAbsolute />
-					{:else if service.type === 'ghost'}
-						<Ghost isAbsolute />
-					{:else if service.type === 'meilisearch'}
-						<MeiliSearch isAbsolute />
-					{/if}
-					<div class="font-bold text-xl text-center truncate">
-						{service.name}
-					</div>
-					{#if $session.teamId === '0'}
-						<div class="text-center truncate">Team {service.teams[0].name}</div>
-					{/if}
-					{#if !service.type || !service.fqdn}
-						<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
-							Configuration missing
+		<div class="flex flex-col">
+			{#if $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
+			{/if}
+			<div class="flex flex-col md:flex-row">
+				{#each ownServices as service}
+					<a href="/services/{service.id}" class="no-underline p-2 w-96">
+						<div class="box-selection relative hover:bg-pink-600 group">
+							{#if service.type === 'plausibleanalytics'}
+								<PlausibleAnalytics isAbsolute />
+							{:else if service.type === 'nocodb'}
+								<NocoDb isAbsolute />
+							{:else if service.type === 'minio'}
+								<MinIo isAbsolute />
+							{:else if service.type === 'vscodeserver'}
+								<VsCodeServer isAbsolute />
+							{:else if service.type === 'wordpress'}
+								<Wordpress isAbsolute />
+							{:else if service.type === 'vaultwarden'}
+								<VaultWarden isAbsolute />
+							{:else if service.type === 'languagetool'}
+								<LanguageTool isAbsolute />
+							{:else if service.type === 'n8n'}
+								<N8n isAbsolute />
+							{:else if service.type === 'uptimekuma'}
+								<UptimeKuma isAbsolute />
+							{:else if service.type === 'ghost'}
+								<Ghost isAbsolute />
+							{:else if service.type === 'meilisearch'}
+								<MeiliSearch isAbsolute />
+							{/if}
+							<div class="font-bold text-xl text-center truncate">
+								{service.name}
+							</div>
+							{#if $session.teamId === '0'}
+								<div class="text-center truncate">Team {service.teams[0].name}</div>
+							{/if}
+							{#if !service.type || !service.fqdn}
+								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{:else}
+								<div class="text-center truncate">{service.type}</div>
+							{/if}
 						</div>
-					{:else}
-						<div class="text-center truncate">{service.type}</div>
-					{/if}
+					</a>
+				{/each}
+			</div>
+			{#if otherServices.length > 0 && $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Applications</div>
+				<div class="flex">
+					{#each otherServices as service}
+						<a href="/services/{service.id}" class="no-underline p-2 w-96">
+							<div class="box-selection relative hover:bg-pink-600 group">
+								{#if service.type === 'plausibleanalytics'}
+									<PlausibleAnalytics isAbsolute />
+								{:else if service.type === 'nocodb'}
+									<NocoDb isAbsolute />
+								{:else if service.type === 'minio'}
+									<MinIo isAbsolute />
+								{:else if service.type === 'vscodeserver'}
+									<VsCodeServer isAbsolute />
+								{:else if service.type === 'wordpress'}
+									<Wordpress isAbsolute />
+								{:else if service.type === 'vaultwarden'}
+									<VaultWarden isAbsolute />
+								{:else if service.type === 'languagetool'}
+									<LanguageTool isAbsolute />
+								{:else if service.type === 'n8n'}
+									<N8n isAbsolute />
+								{:else if service.type === 'uptimekuma'}
+									<UptimeKuma isAbsolute />
+								{:else if service.type === 'ghost'}
+									<Ghost isAbsolute />
+								{:else if service.type === 'meilisearch'}
+									<MeiliSearch isAbsolute />
+								{/if}
+								<div class="font-bold text-xl text-center truncate">
+									{service.name}
+								</div>
+								{#if $session.teamId === '0'}
+									<div class="text-center truncate">Team {service.teams[0].name}</div>
+								{/if}
+								{#if !service.type || !service.fqdn}
+									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+										Configuration missing
+									</div>
+								{:else}
+									<div class="text-center truncate">{service.type}</div>
+								{/if}
+							</div>
+						</a>
+					{/each}
 				</div>
-			</a>
-		{/each}
+			{/if}
+		</div>
 	{/if}
 </div>
diff --git a/src/routes/settings/index.json.ts b/src/routes/settings/index.json.ts
index db3dc0710..d126b2313 100644
--- a/src/routes/settings/index.json.ts
+++ b/src/routes/settings/index.json.ts
@@ -5,9 +5,9 @@ import type { RequestHandler } from '@sveltejs/kit';
 import { promises as dns } from 'dns';
 
 export const get: RequestHandler = async (event) => {
-	const { status, body } = await getUserDetails(event);
+	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
-
+	if (teamId !== '0') return { status: 401, body: { message: 'You are not an admin.' } };
 	try {
 		const settings = await listSettings();
 		return {
diff --git a/src/routes/settings/index.svelte b/src/routes/settings/index.svelte
index e6148a26f..0af8d534c 100644
--- a/src/routes/settings/index.svelte
+++ b/src/routes/settings/index.svelte
@@ -11,7 +11,12 @@
 				}
 			};
 		}
-
+		if (res.status === 401) {
+			return {
+				status: 302,
+				redirect: '/databases'
+			};
+		}
 		return {
 			status: res.status,
 			error: new Error(`Could not load ${url}`)
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index c57efdaa6..8fe0617dc 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -22,6 +22,16 @@
 <script lang="ts">
 	export let sources;
 	import { session } from '$app/stores';
+	const ownSources = sources.filter((source) => {
+		if (source.teams[0].id === $session.teamId) {
+			return source;
+		}
+	});
+	const otherSources = sources.filter((source) => {
+		if (source.teams[0].id !== $session.teamId) {
+			return source;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -50,29 +60,62 @@
 			<div class="text-center text-xl font-bold">No git sources found</div>
 		</div>
 	{:else}
-		<div class="flex flex-wrap justify-center">
-			{#each sources as source}
-				<a href="/sources/{source.id}" class="no-underline p-2 w-96">
-					<div
-						class="box-selection hover:bg-orange-600 group"
-						class:border-red-500={source.gitlabApp && !source.gitlabAppId}
-						class:border-0={source.gitlabApp && !source.gitlabAppId}
-						class:border-l-4={source.gitlabApp && !source.gitlabAppId}
-					>
-						<div class="font-bold text-xl text-center truncate">{source.name}</div>
-						{#if $session.teamId === '0'}
-							<div class="text-center truncate">Team {source.teams[0].name}</div>
-						{/if}
-						{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
-							<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
-								Configuration missing
+		<div class="flex flex-col">
+			{#if $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
+			{/if}
+			<div class="flex flex-col md:flex-row">
+				{#each ownSources as source}
+					<a href="/sources/{source.id}" class="no-underline p-2 w-96">
+						<div
+							class="box-selection hover:bg-orange-600 group"
+							class:border-red-500={source.gitlabApp && !source.gitlabAppId}
+							class:border-0={source.gitlabApp && !source.gitlabAppId}
+							class:border-l-4={source.gitlabApp && !source.gitlabAppId}
+						>
+							<div class="font-bold text-xl text-center truncate">{source.name}</div>
+							{#if $session.teamId === '0'}
+								<div class="text-center truncate">Team {source.teams[0].name}</div>
+							{/if}
+							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
+								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{:else}
+								<div class="truncate text-center">{source.htmlUrl}</div>
+							{/if}
+						</div>
+					</a>
+				{/each}
+			</div>
+
+			{#if otherSources.length > 0 && $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Applications</div>
+				<div class="flex">
+					{#each otherSources as source}
+						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
+							<div
+								class="box-selection hover:bg-orange-600 group"
+								class:border-red-500={source.gitlabApp && !source.gitlabAppId}
+								class:border-0={source.gitlabApp && !source.gitlabAppId}
+								class:border-l-4={source.gitlabApp && !source.gitlabAppId}
+							>
+								<div class="font-bold text-xl text-center truncate">{source.name}</div>
+								{#if $session.teamId === '0'}
+									<div class="text-center truncate">Team {source.teams[0].name}</div>
+								{/if}
+								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
+									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+										Configuration missing
+									</div>
+								{:else}
+									<div class="truncate text-center">{source.htmlUrl}</div>
+								{/if}
 							</div>
-						{:else}
-							<div class="truncate text-center">{source.htmlUrl}</div>
-						{/if}
-					</div>
-				</a>
-			{/each}
+						</a>
+					{/each}
+				</div>
+			{/if}
 		</div>
 	{/if}
 </div>
diff --git a/src/routes/teams/index.json.ts b/src/routes/teams/index.json.ts
index 702e20887..f382800ea 100644
--- a/src/routes/teams/index.json.ts
+++ b/src/routes/teams/index.json.ts
@@ -9,7 +9,7 @@ export const get: RequestHandler = async (event) => {
 
 	try {
 		const teams = await db.prisma.permission.findMany({
-			where: { userId: teamId === '0' ? undefined : teamId },
+			where: { userId: teamId === '0' ? undefined : userId },
 			include: { team: { include: { _count: { select: { users: true } } } } }
 		});
 
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 05c020cdf..ee8269234 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -43,6 +43,16 @@
 			return errorNotification(error);
 		}
 	}
+	const ownTeams = teams.filter((team) => {
+		if (team.team.id === $session.teamId) {
+			return team;
+		}
+	});
+	const otherTeams = teams.filter((team) => {
+		if (team.team.id !== $session.teamId) {
+			return team;
+		}
+	});
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -92,20 +102,45 @@
 	</div>
 {/if}
 <div class="flex flex-wrap justify-center">
-	{#each teams as team}
-		<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
-			<div
-				class="box-selection relative"
-				class:hover:bg-cyan-600={team.team?.id !== '0'}
-				class:hover:bg-red-500={team.team?.id === '0'}
-			>
-				<div class="truncate text-center text-xl font-bold">
-					{team.team.name}
-					{team.team?.id === '0' ? '(root)' : ''}
-				</div>
+	<div class="flex flex-col">
+		<div class="-ml-10 pb-5 text-xl font-bold">Current Team</div>
+		<div class="flex flex-col md:flex-row">
+			{#each ownTeams as team}
+				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
+					<div
+						class="box-selection relative"
+						class:hover:bg-cyan-600={team.team?.id !== '0'}
+						class:hover:bg-red-500={team.team?.id === '0'}
+					>
+						<div class="truncate text-center text-xl font-bold">
+							{team.team.name}
+							{team.team?.id === '0' ? '(admin team)' : ''}
+						</div>
 
-				<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
-			</div>
-		</a>
-	{/each}
+						<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
+					</div>
+				</a>
+			{/each}
+		</div>
+
+		<div class="-ml-10 pb-5 pt-10 text-xl  font-bold">Other Teams</div>
+		<div class="flex">
+			{#each otherTeams as team}
+				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
+					<div
+						class="box-selection relative"
+						class:hover:bg-cyan-600={team.team?.id !== '0'}
+						class:hover:bg-red-500={team.team?.id === '0'}
+					>
+						<div class="truncate text-center text-xl font-bold">
+							{team.team.name}
+							{team.team?.id === '0' ? '(admin team)' : ''}
+						</div>
+
+						<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
+					</div>
+				</a>
+			{/each}
+		</div>
+	</div>
 </div>

From 9c47b8495cd3ea4652a50cc454e039414e2b3c38 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 15:40:32 +0200
Subject: [PATCH 12/57] ui: fix

---
 src/routes/applications/index.svelte | 4 ++--
 src/routes/databases/index.svelte    | 4 ++--
 src/routes/destinations/index.svelte | 6 +++---
 src/routes/services/index.svelte     | 4 ++--
 src/routes/sources/index.svelte      | 4 ++--
 src/routes/teams/index.svelte        | 4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 049bded43..3c902a125 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -50,14 +50,14 @@
 			{#if $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
 			{/if}
-			<div class="flex flex-col md:flex-row">
+			<div class="flex flex-col md:flex-row flex-wrap">
 				{#each ownApplications as application}
 					<Application {application} />
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 pt-10 -ml-10">Other Team's Applications</div>
-				<div class="flex">
+				<div class="flex flex-col md:flex-row flex-wrap">
 					{#each otherApplications as application}
 						<Application {application} />
 					{/each}
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 26fc89d9c..1e97b5fda 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -55,7 +55,7 @@
 			{#if $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Databases</div>
 			{/if}
-			<div class="flex flex-col md:flex-row">
+			<div class="flex flex-col md:flex-row flex-wrap">
 				{#each ownDatabases as database}
 					<a href="/databases/{database.id}" class="no-underline p-2 w-96">
 						<div class="box-selection relative hover:bg-purple-600 group">
@@ -91,7 +91,7 @@
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Databases</div>
-				<div class="flex">
+				<div class="flex flex-col md:flex-row flex-wrap">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
 							<div class="box-selection relative hover:bg-purple-600 group">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index f78f8dc7a..0ee85e7da 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -66,7 +66,7 @@
 			{#if $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Destinations</div>
 			{/if}
-			<div class="flex flex-col md:flex-row">
+			<div class="flex flex-col md:flex-row flex-wrap">
 				{#each ownDestinations as destination}
 					<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 						<div class="box-selection hover:bg-sky-600">
@@ -81,8 +81,8 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Destinations</div>
-				<div class="flex">
+				<div class="text-xl font-bold pb-5 pt-10 -ml-10">Other Team's Destinations</div>
+				<div class="flex flex-col md:flex-row flex-wrap">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 							<div class="box-selection hover:bg-sky-600">
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 19f651d7e..80463beec 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -60,7 +60,7 @@
 			{#if $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
 			{/if}
-			<div class="flex flex-col md:flex-row">
+			<div class="flex flex-col md:flex-row flex-wrap">
 				{#each ownServices as service}
 					<a href="/services/{service.id}" class="no-underline p-2 w-96">
 						<div class="box-selection relative hover:bg-pink-600 group">
@@ -106,7 +106,7 @@
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Applications</div>
-				<div class="flex">
+				<div class="flex flex-col md:flex-row flex-wrap">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
 							<div class="box-selection relative hover:bg-pink-600 group">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 8fe0617dc..51d04c967 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -64,7 +64,7 @@
 			{#if $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
 			{/if}
-			<div class="flex flex-col md:flex-row">
+			<div class="flex flex-col md:flex-row flex-wrap">
 				{#each ownSources as source}
 					<a href="/sources/{source.id}" class="no-underline p-2 w-96">
 						<div
@@ -91,7 +91,7 @@
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Applications</div>
-				<div class="flex">
+				<div class="flex flex-col md:flex-row flex-wrap">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
 							<div
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index ee8269234..6c52c62bf 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -104,7 +104,7 @@
 <div class="flex flex-wrap justify-center">
 	<div class="flex flex-col">
 		<div class="-ml-10 pb-5 text-xl font-bold">Current Team</div>
-		<div class="flex flex-col md:flex-row">
+		<div class="flex flex-col flex-wrap md:flex-row">
 			{#each ownTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
 					<div
@@ -124,7 +124,7 @@
 		</div>
 
 		<div class="-ml-10 pb-5 pt-10 text-xl  font-bold">Other Teams</div>
-		<div class="flex">
+		<div class="flex flex-col flex-wrap md:flex-row">
 			{#each otherTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
 					<div

From eb2e07afc557384aea2dcd98c64e7b62610bcf42 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 15:50:57 +0200
Subject: [PATCH 13/57] ui: fixes

---
 src/routes/applications/index.svelte |  8 ++++----
 src/routes/databases/index.svelte    | 10 +++++-----
 src/routes/destinations/index.svelte |  8 ++++----
 src/routes/services/index.svelte     |  8 ++++----
 src/routes/sources/index.svelte      |  8 ++++----
 src/routes/teams/index.svelte        |  8 ++++----
 6 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 3c902a125..6ced3899b 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -48,16 +48,16 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
+				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
 			{/if}
-			<div class="flex flex-col md:flex-row flex-wrap">
+			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownApplications as application}
 					<Application {application} />
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 -ml-10">Other Team's Applications</div>
-				<div class="flex flex-col md:flex-row flex-wrap">
+				<div class="text-xl font-bold pb-5 pt-10">Other Team's Applications</div>
+				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
 					{/each}
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 1e97b5fda..a15572b45 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -51,11 +51,11 @@
 			<div class="text-center text-xl font-bold">No databases found</div>
 		</div>
 	{:else}
-		<div class="flex flex-col">
+		<div class="flex flex-col px-8">
 			{#if $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Databases</div>
+				<div class="text-xl font-bold pb-5">Your Team's Databases</div>
 			{/if}
-			<div class="flex flex-col md:flex-row flex-wrap">
+			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDatabases as database}
 					<a href="/databases/{database.id}" class="no-underline p-2 w-96">
 						<div class="box-selection relative hover:bg-purple-600 group">
@@ -90,8 +90,8 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Databases</div>
-				<div class="flex flex-col md:flex-row flex-wrap">
+				<div class="text-xl font-bold pb-5 pt-10">Other Team's Databases</div>
+				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
 							<div class="box-selection relative hover:bg-purple-600 group">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 0ee85e7da..66e324472 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -64,9 +64,9 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Destinations</div>
+				<div class="text-xl font-bold pb-5">Your Team's Destinations</div>
 			{/if}
-			<div class="flex flex-col md:flex-row flex-wrap">
+			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDestinations as destination}
 					<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 						<div class="box-selection hover:bg-sky-600">
@@ -81,8 +81,8 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 -ml-10">Other Team's Destinations</div>
-				<div class="flex flex-col md:flex-row flex-wrap">
+				<div class="text-xl font-bold pb-5 pt-10">Other Team's Destinations</div>
+				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 							<div class="box-selection hover:bg-sky-600">
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 80463beec..806f8bbe5 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -58,9 +58,9 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
+				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
 			{/if}
-			<div class="flex flex-col md:flex-row flex-wrap">
+			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
 					<a href="/services/{service.id}" class="no-underline p-2 w-96">
 						<div class="box-selection relative hover:bg-pink-600 group">
@@ -105,8 +105,8 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Applications</div>
-				<div class="flex flex-col md:flex-row flex-wrap">
+				<div class="text-xl font-bold pb-5 pt-10  ">Other Team's Applications</div>
+				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
 							<div class="box-selection relative hover:bg-pink-600 group">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 51d04c967..b08563bf3 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -62,9 +62,9 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 -ml-10">Your Team's Applications</div>
+				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
 			{/if}
-			<div class="flex flex-col md:flex-row flex-wrap">
+			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
 					<a href="/sources/{source.id}" class="no-underline p-2 w-96">
 						<div
@@ -90,8 +90,8 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10  -ml-10">Other Team's Applications</div>
-				<div class="flex flex-col md:flex-row flex-wrap">
+				<div class="text-xl font-bold pb-5 pt-10  ">Other Team's Applications</div>
+				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
 							<div
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 6c52c62bf..7ff8dede8 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -103,8 +103,8 @@
 {/if}
 <div class="flex flex-wrap justify-center">
 	<div class="flex flex-col">
-		<div class="-ml-10 pb-5 text-xl font-bold">Current Team</div>
-		<div class="flex flex-col flex-wrap md:flex-row">
+		<div class=" pb-5 text-xl font-bold">Current Team</div>
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each ownTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
 					<div
@@ -123,8 +123,8 @@
 			{/each}
 		</div>
 
-		<div class="-ml-10 pb-5 pt-10 text-xl  font-bold">Other Teams</div>
-		<div class="flex flex-col flex-wrap md:flex-row">
+		<div class=" pb-5 pt-10 text-xl font-bold">Other Teams</div>
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each otherTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
 					<div

From 9f581c82a91c5d3145f30f14460907e6bab30c37 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 15:59:01 +0200
Subject: [PATCH 14/57] ui: fix

---
 src/routes/applications/index.svelte | 2 +-
 src/routes/databases/index.svelte    | 2 +-
 src/routes/destinations/index.svelte | 2 +-
 src/routes/services/index.svelte     | 2 +-
 src/routes/sources/index.svelte      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 6ced3899b..495dc5c48 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -47,7 +47,7 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0'}
+			{#if $session.teamId === '0' && ownApplications.length > 0}
 				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index a15572b45..b38add542 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -52,7 +52,7 @@
 		</div>
 	{:else}
 		<div class="flex flex-col px-8">
-			{#if $session.teamId === '0'}
+			{#if $session.teamId === '0' && ownDatabases.length > 0}
 				<div class="text-xl font-bold pb-5">Your Team's Databases</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 66e324472..cc5e53583 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -63,7 +63,7 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0'}
+			{#if $session.teamId === '0' && ownDestinations.length > 0}
 				<div class="text-xl font-bold pb-5">Your Team's Destinations</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 806f8bbe5..2424c7ef4 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -57,7 +57,7 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0'}
+			{#if $session.teamId === '0' && ownServices.length > 0}
 				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index b08563bf3..bf372c779 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -61,7 +61,7 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0'}
+			{#if $session.teamId === '0' && ownSources.length > 0}
 				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">

From 70de2538e2c43d0a27b2deed3290aa80228ad892 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 16:01:14 +0200
Subject: [PATCH 15/57] ui: fix

---
 src/routes/applications/index.svelte | 4 ++--
 src/routes/databases/index.svelte    | 4 ++--
 src/routes/destinations/index.svelte | 4 ++--
 src/routes/services/index.svelte     | 4 ++--
 src/routes/sources/index.svelte      | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 495dc5c48..784629325 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -48,7 +48,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownApplications.length > 0}
-				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownApplications as application}
@@ -56,7 +56,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10">Other Team's Applications</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index b38add542..5cf67e356 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -53,7 +53,7 @@
 	{:else}
 		<div class="flex flex-col px-8">
 			{#if $session.teamId === '0' && ownDatabases.length > 0}
-				<div class="text-xl font-bold pb-5">Your Team's Databases</div>
+				<div class="text-xl font-bold pb-5 px-1">Your Team's Databases</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDatabases as database}
@@ -90,7 +90,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10">Other Team's Databases</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10">Other Team's Databases</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index cc5e53583..4f5a32f52 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -64,7 +64,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownDestinations.length > 0}
-				<div class="text-xl font-bold pb-5">Your Team's Destinations</div>
+				<div class="text-xl font-bold pb-5 px-1">Your Team's Destinations</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDestinations as destination}
@@ -81,7 +81,7 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10">Other Team's Destinations</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10">Other Team's Destinations</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 2424c7ef4..b97feec03 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -58,7 +58,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownServices.length > 0}
-				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
@@ -105,7 +105,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10  ">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's Applications</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index bf372c779..b784db072 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -62,7 +62,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownSources.length > 0}
-				<div class="text-xl font-bold pb-5">Your Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
@@ -90,7 +90,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10  ">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's Applications</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">

From 020013683b2aaac670e0f64ba185a8b65e9457b4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 16:02:02 +0200
Subject: [PATCH 16/57] ui: fix

---
 src/routes/__layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index b6cb57435..010298059 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -525,7 +525,7 @@
 	{/if}
 
 	<select
-		class="fixed right-0 bottom-0 z-50 m-2 w-64 bg-opacity-30 p-2 px-4"
+		class="fixed right-0 bottom-0 z-50 m-2 w-64 bg-opacity-30 p-2 px-4 hover:bg-opacity-100"
 		bind:value={selectedTeamId}
 		on:change={switchTeam}
 	>

From aae108032c3b43a268a96829e15b70ed6f403c75 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 18:45:21 +0200
Subject: [PATCH 17/57] ui:fix

---
 src/routes/applications/index.svelte | 2 +-
 src/routes/databases/index.svelte    | 2 +-
 src/routes/destinations/index.svelte | 2 +-
 src/routes/teams/index.svelte        | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 784629325..e13b3f240 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -56,7 +56,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Applications</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 5cf67e356..bb19b0ab8 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -90,7 +90,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10">Other Team's Databases</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Databases</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 4f5a32f52..6c5d105f2 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -81,7 +81,7 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10">Other Team's Destinations</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Destinations</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 7ff8dede8..88d1a3b4e 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -103,7 +103,7 @@
 {/if}
 <div class="flex flex-wrap justify-center">
 	<div class="flex flex-col">
-		<div class=" pb-5 text-xl font-bold">Current Team</div>
+		<div class=" px-6 pb-5 text-xl font-bold">Current Team</div>
 		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each ownTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
@@ -123,7 +123,7 @@
 			{/each}
 		</div>
 
-		<div class=" pb-5 pt-10 text-xl font-bold">Other Teams</div>
+		<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Teams</div>
 		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each otherTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">

From fedb38f2bc28f06b8ed8b60911a60c57812973dd Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 18:51:52 +0200
Subject: [PATCH 18/57] ui: fix

---
 src/routes/applications/index.svelte | 6 +++---
 src/routes/databases/index.svelte    | 6 +++---
 src/routes/destinations/index.svelte | 6 +++---
 src/routes/services/index.svelte     | 6 +++---
 src/routes/sources/index.svelte      | 6 +++---
 src/routes/teams/index.svelte        | 2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index e13b3f240..801aba8c5 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -47,8 +47,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownApplications.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
+			{#if $session.teamId === '0' && ownApplications.length > 0 && otherApplications.length > 0}
+				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownApplications as application}
@@ -56,7 +56,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index bb19b0ab8..554954e2f 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -52,8 +52,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col px-8">
-			{#if $session.teamId === '0' && ownDatabases.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Databases</div>
+			{#if $session.teamId === '0' && ownDatabases.length > 0 && otherDatabases.length > 0}
+				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDatabases as database}
@@ -90,7 +90,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Databases</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 6c5d105f2..782958aa5 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -63,8 +63,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownDestinations.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Destinations</div>
+			{#if $session.teamId === '0' && ownDestinations.length > 0 && otherDestinations.length > 0}
+				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDestinations as destination}
@@ -81,7 +81,7 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10 px-6">Other Team's Destinations</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index b97feec03..702187d07 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -57,8 +57,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownServices.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
+			{#if $session.teamId === '0' && ownServices.length > 0 && otherServices.length > 0}
+				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
@@ -105,7 +105,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index b784db072..570a3c3cc 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -61,8 +61,8 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownSources.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Your Team's Applications</div>
+			{#if $session.teamId === '0' && ownSources.length > 0 && otherSources.length > 0}
+				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
@@ -90,7 +90,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's Applications</div>
+				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 88d1a3b4e..87e491d20 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -123,7 +123,7 @@
 			{/each}
 		</div>
 
-		<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Teams</div>
+		<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Team's</div>
 		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each otherTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">

From 4e819f6ebabf7b745ca998e8a379da3c11e9a839 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 19:11:58 +0200
Subject: [PATCH 19/57] ui: fix

---
 src/routes/databases/index.svelte | 2 +-
 src/routes/services/index.svelte  | 2 +-
 src/routes/sources/index.svelte   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 554954e2f..488dd5bba 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -51,7 +51,7 @@
 			<div class="text-center text-xl font-bold">No databases found</div>
 		</div>
 	{:else}
-		<div class="flex flex-col px-8">
+		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownDatabases.length > 0 && otherDatabases.length > 0}
 				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 702187d07..bee9b08f1 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -105,7 +105,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 570a3c3cc..3f1953a39 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -90,7 +90,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 px-1 pt-10  ">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">

From 61716738ed53c35c5915c33fe0e42a85fbe37d3d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 19:17:03 +0200
Subject: [PATCH 20/57] ui: fix

---
 src/routes/applications/index.svelte | 2 +-
 src/routes/databases/index.svelte    | 6 +++---
 src/routes/destinations/index.svelte | 6 +++---
 src/routes/services/index.svelte     | 8 ++++----
 src/routes/sources/index.svelte      | 8 ++++----
 src/routes/teams/index.svelte        | 2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 801aba8c5..ad8e43c69 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -56,7 +56,7 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 488dd5bba..5e271bcfe 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -76,7 +76,7 @@
 								{database.name}
 							</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {database.teams[0].name}</div>
+								<div class="text-center truncate">{database.teams[0].name}</div>
 							{/if}
 							{#if !database.type}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -90,7 +90,7 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
@@ -112,7 +112,7 @@
 									{database.name}
 								</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {database.teams[0].name}</div>
+									<div class="text-center truncate">{database.teams[0].name}</div>
 								{/if}
 								{#if !database.type}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 782958aa5..34a9faefb 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -72,7 +72,7 @@
 						<div class="box-selection hover:bg-sky-600">
 							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {destination.teams[0].name}</div>
+								<div class="text-center truncate">{destination.teams[0].name}</div>
 							{/if}
 							<div class="text-center truncate">{destination.network}</div>
 						</div>
@@ -81,14 +81,14 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 							<div class="box-selection hover:bg-sky-600">
 								<div class="font-bold text-xl text-center truncate">{destination.name}</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {destination.teams[0].name}</div>
+									<div class="text-center truncate">{destination.teams[0].name}</div>
 								{/if}
 								<div class="text-center truncate">{destination.network}</div>
 							</div>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index bee9b08f1..293c51087 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -58,7 +58,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownServices.length > 0 && otherServices.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
+				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
@@ -91,7 +91,7 @@
 								{service.name}
 							</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {service.teams[0].name}</div>
+								<div class="text-center truncate">{service.teams[0].name}</div>
 							{/if}
 							{#if !service.type || !service.fqdn}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -105,7 +105,7 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
@@ -137,7 +137,7 @@
 									{service.name}
 								</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {service.teams[0].name}</div>
+									<div class="text-center truncate">{service.teams[0].name}</div>
 								{/if}
 								{#if !service.type || !service.fqdn}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 3f1953a39..224916fb8 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -62,7 +62,7 @@
 	{:else}
 		<div class="flex flex-col">
 			{#if $session.teamId === '0' && ownSources.length > 0 && otherSources.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
+				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
 			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
@@ -75,7 +75,7 @@
 						>
 							<div class="font-bold text-xl text-center truncate">{source.name}</div>
 							{#if $session.teamId === '0'}
-								<div class="text-center truncate">Team {source.teams[0].name}</div>
+								<div class="text-center truncate">{source.teams[0].name}</div>
 							{/if}
 							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -90,7 +90,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Team's</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
@@ -102,7 +102,7 @@
 							>
 								<div class="font-bold text-xl text-center truncate">{source.name}</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">Team {source.teams[0].name}</div>
+									<div class="text-center truncate">{source.teams[0].name}</div>
 								{/if}
 								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
index 87e491d20..79e600ca6 100644
--- a/src/routes/teams/index.svelte
+++ b/src/routes/teams/index.svelte
@@ -123,7 +123,7 @@
 			{/each}
 		</div>
 
-		<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Team's</div>
+		<div class="px-6 pb-5 pt-10 text-xl font-bold">Others</div>
 		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 			{#each otherTeams as team}
 				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">

From 3abe1610bf7eebab06d787cfdfbfee1a4a282d18 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 20:37:08 +0200
Subject: [PATCH 21/57] fix: Do not trigger >1 webhooks on GitLab

---
 src/lib/database/gitSources.ts       |  1 -
 src/routes/webhooks/gitlab/events.ts | 19 +++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/lib/database/gitSources.ts b/src/lib/database/gitSources.ts
index 7e4e90633..0ed6f29b1 100644
--- a/src/lib/database/gitSources.ts
+++ b/src/lib/database/gitSources.ts
@@ -26,7 +26,6 @@ export async function newSource({ name, teamId, type, htmlUrl, apiUrl, organizat
 	});
 }
 export async function removeSource({ id }) {
-	// TODO: Disconnect application with this sourceId! Maybe not needed?
 	const source = await prisma.gitSource.delete({
 		where: { id },
 		include: { githubApp: true, gitlabApp: true }
diff --git a/src/routes/webhooks/gitlab/events.ts b/src/routes/webhooks/gitlab/events.ts
index 4a1eeafcc..f8bb54383 100644
--- a/src/routes/webhooks/gitlab/events.ts
+++ b/src/routes/webhooks/gitlab/events.ts
@@ -22,6 +22,15 @@ export const post: RequestHandler = async (event) => {
 	const allowedActions = ['opened', 'reopen', 'close', 'open', 'update'];
 	const body = await event.request.json();
 	const buildId = cuid();
+	const webhookToken = event.request.headers.get('x-gitlab-token');
+	if (!webhookToken) {
+		return {
+			status: 500,
+			body: {
+				message: 'Ooops, something is not okay, are you okay?'
+			}
+		};
+	}
 	try {
 		const { object_kind: objectKind } = body;
 		if (objectKind === 'push') {
@@ -77,16 +86,6 @@ export const post: RequestHandler = async (event) => {
 				};
 			}
 		} else if (objectKind === 'merge_request') {
-			const webhookToken = event.request.headers.get('x-gitlab-token');
-			if (!webhookToken) {
-				return {
-					status: 500,
-					body: {
-						message: 'Ooops, something is not okay, are you okay?'
-					}
-				};
-			}
-
 			const isDraft = body.object_attributes.work_in_progress;
 			const action = body.object_attributes.action;
 			const projectId = Number(body.project.id);

From 1bd2ccbc16b5fc56751f3741d8e81a41efe904ff Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 21:12:41 +0200
Subject: [PATCH 22/57] fix: Possible fix for spikes in CPU usage

---
 src/lib/letsencrypt/index.ts | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/lib/letsencrypt/index.ts b/src/lib/letsencrypt/index.ts
index c9f9c037b..edbc48395 100644
--- a/src/lib/letsencrypt/index.ts
+++ b/src/lib/letsencrypt/index.ts
@@ -3,6 +3,7 @@ import { checkContainer, reloadHaproxy } from '$lib/haproxy';
 import * as db from '$lib/database';
 import { dev } from '$app/env';
 import cuid from 'cuid';
+import fs from 'fs/promises';
 import getPort, { portNumbers } from 'get-port';
 import { supportedServiceTypesAndVersions } from '$lib/components/common';
 
@@ -182,12 +183,35 @@ export async function generateSSLCerts() {
 		if (isHttps) ssls.push({ domain, id: 'coolify', isCoolify: true });
 	}
 	if (ssls.length > 0) {
+		const sslDir = dev ? '/tmp/ssl' : '/app/ssl';
+		if (dev) {
+			try {
+				await asyncExecShell(`mkdir -p ${sslDir}`);
+			} catch (error) {
+				//
+			}
+		}
+		const files = await fs.readdir(sslDir);
+		let certificates = [];
+		if (files.length > 0) {
+			for (const file of files) {
+				file.endsWith('.pem') && certificates.push(file.replace(/\.pem$/, ''));
+			}
+		}
 		for (const ssl of ssls) {
 			if (!dev) {
-				console.log('Checking SSL for', ssl.domain);
+				if (certificates.includes(ssl.domain)) {
+					console.log(`Certificate for ${ssl.domain} already exists`);
+					return;
+				}
+				console.log('Generating SSL for', ssl.domain);
 				await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
 			} else {
-				console.log('Checking SSL for', ssl.domain);
+				if (certificates.includes(ssl.domain)) {
+					console.log(`Certificate for ${ssl.domain} already exists`);
+					return;
+				}
+				console.log('Generating SSL for', ssl.domain);
 			}
 		}
 	}

From 84b4cc5d540ea1ba8e830f33f89cae847a7ef867 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 21:18:36 +0200
Subject: [PATCH 23/57] fix: Last commit

---
 src/lib/letsencrypt/index.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/letsencrypt/index.ts b/src/lib/letsencrypt/index.ts
index edbc48395..240b561ea 100644
--- a/src/lib/letsencrypt/index.ts
+++ b/src/lib/letsencrypt/index.ts
@@ -202,16 +202,16 @@ export async function generateSSLCerts() {
 			if (!dev) {
 				if (certificates.includes(ssl.domain)) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
-					return;
+				} else {
+					console.log('Generating SSL for', ssl.domain);
+					await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
 				}
-				console.log('Generating SSL for', ssl.domain);
-				await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
 			} else {
 				if (certificates.includes(ssl.domain)) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
-					return;
+				} else {
+					console.log('Generating SSL for', ssl.domain);
 				}
-				console.log('Generating SSL for', ssl.domain);
 			}
 		}
 	}

From 6462982d12c7f2ec97943ef30799cd6dd6502c2a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 21:24:05 +0200
Subject: [PATCH 24/57] fix: www or not-www, that's the question

---
 src/lib/letsencrypt/index.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/lib/letsencrypt/index.ts b/src/lib/letsencrypt/index.ts
index 240b561ea..12b527890 100644
--- a/src/lib/letsencrypt/index.ts
+++ b/src/lib/letsencrypt/index.ts
@@ -200,14 +200,20 @@ export async function generateSSLCerts() {
 		}
 		for (const ssl of ssls) {
 			if (!dev) {
-				if (certificates.includes(ssl.domain)) {
+				if (
+					certificates.includes(ssl.domain) ||
+					certificates.includes(ssl.domain.replace('www', ''))
+				) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
 				} else {
 					console.log('Generating SSL for', ssl.domain);
 					await letsEncrypt(ssl.domain, ssl.id, ssl.isCoolify);
 				}
 			} else {
-				if (certificates.includes(ssl.domain)) {
+				if (
+					certificates.includes(ssl.domain) ||
+					certificates.includes(ssl.domain.replace('www', ''))
+				) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
 				} else {
 					console.log('Generating SSL for', ssl.domain);

From f779b3bb5421a65c70c700f5ebdd4d037f5a6af2 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 21:29:45 +0200
Subject: [PATCH 25/57] fix: fix for the fix that fixes the fix

---
 src/lib/letsencrypt/index.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/letsencrypt/index.ts b/src/lib/letsencrypt/index.ts
index 12b527890..fb1fa46ac 100644
--- a/src/lib/letsencrypt/index.ts
+++ b/src/lib/letsencrypt/index.ts
@@ -202,7 +202,7 @@ export async function generateSSLCerts() {
 			if (!dev) {
 				if (
 					certificates.includes(ssl.domain) ||
-					certificates.includes(ssl.domain.replace('www', ''))
+					certificates.includes(ssl.domain.replace('www.', ''))
 				) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
 				} else {
@@ -212,7 +212,7 @@ export async function generateSSLCerts() {
 			} else {
 				if (
 					certificates.includes(ssl.domain) ||
-					certificates.includes(ssl.domain.replace('www', ''))
+					certificates.includes(ssl.domain.replace('www.', ''))
 				) {
 					console.log(`Certificate for ${ssl.domain} already exists`);
 				} else {

From b96c1a23ec1ff9e35972bd3f715146abd2d20645 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 23:26:06 +0200
Subject: [PATCH 26/57] fix: Ton of updates for users/teams

---
 src/lib/database/users.ts                     |  46 +++--
 src/routes/__layout.svelte                    |  15 +-
 src/routes/applications/index.svelte          |   5 +-
 src/routes/databases/index.svelte             |   7 +-
 src/routes/destinations/index.svelte          |   5 +-
 src/routes/iam/index.json.ts                  | 130 +++++++++++++
 src/routes/iam/index.svelte                   | 178 ++++++++++++++++++
 src/routes/iam/password.json.ts               |  22 +++
 .../{teams => iam/team}/[id]/__layout.svelte  |   6 +-
 .../{teams => iam/team}/[id]/index.json.ts    |   0
 .../{teams => iam/team}/[id]/index.svelte     |  12 +-
 .../team}/[id]/invitation/accept.json.ts      |   0
 .../team}/[id]/invitation/invite.json.ts      |   0
 .../team}/[id]/invitation/revoke.json.ts      |   0
 .../team}/[id]/permission/change.json.ts      |   0
 .../team}/[id]/remove/user.json.ts            |   0
 src/routes/services/index.svelte              |   7 +-
 src/routes/sources/index.svelte               |   5 +-
 src/routes/teams/index.json.ts                |  27 ---
 src/routes/teams/index.svelte                 | 146 --------------
 20 files changed, 383 insertions(+), 228 deletions(-)
 create mode 100644 src/routes/iam/index.json.ts
 create mode 100644 src/routes/iam/index.svelte
 create mode 100644 src/routes/iam/password.json.ts
 rename src/routes/{teams => iam/team}/[id]/__layout.svelte (83%)
 rename src/routes/{teams => iam/team}/[id]/index.json.ts (100%)
 rename src/routes/{teams => iam/team}/[id]/index.svelte (94%)
 rename src/routes/{teams => iam/team}/[id]/invitation/accept.json.ts (100%)
 rename src/routes/{teams => iam/team}/[id]/invitation/invite.json.ts (100%)
 rename src/routes/{teams => iam/team}/[id]/invitation/revoke.json.ts (100%)
 rename src/routes/{teams => iam/team}/[id]/permission/change.json.ts (100%)
 rename src/routes/{teams => iam/team}/[id]/remove/user.json.ts (100%)
 delete mode 100644 src/routes/teams/index.json.ts
 delete mode 100644 src/routes/teams/index.svelte

diff --git a/src/lib/database/users.ts b/src/lib/database/users.ts
index 7e5cc481e..36b130b35 100644
--- a/src/lib/database/users.ts
+++ b/src/lib/database/users.ts
@@ -32,26 +32,42 @@ export async function login({ email, password, isLogin }) {
 	if (users === 0) {
 		await prisma.setting.update({ where: { id }, data: { isRegistrationEnabled: false } });
 		// Create default network & start Coolify Proxy
-		asyncExecShell(`docker network create --attachable coolify`)
-			.then(() => {
-				console.log('Network created');
-			})
-			.catch(() => {
-				console.log('Network already exists.');
-			});
-
-		startCoolifyProxy('/var/run/docker.sock')
-			.then(() => {
-				console.log('Coolify Proxy started.');
-			})
-			.catch((err) => {
-				console.log(err);
-			});
+		await asyncExecShell(`docker network create --attachable coolify`);
+		await startCoolifyProxy('/var/run/docker.sock');
 		uid = '0';
 	}
 
 	if (userFound) {
 		if (userFound.type === 'email') {
+			if (userFound.password === 'RESETME') {
+				const hashedPassword = await hashPassword(password);
+				if (userFound.updatedAt < new Date(Date.now() - 1000 * 60 * 10)) {
+					await prisma.user.update({
+						where: { email: userFound.email },
+						data: { password: 'RESETTIMEOUT' }
+					});
+					throw {
+						error: 'Password reset link has expired. Please request a new one.'
+					};
+				} else {
+					await prisma.user.update({
+						where: { email: userFound.email },
+						data: { password: hashedPassword }
+					});
+					return {
+						status: 200,
+						headers: {
+							'Set-Cookie': `teamId=${uid}; HttpOnly; Path=/; Max-Age=15778800;`
+						},
+						body: {
+							userId: userFound.id,
+							teamId: userFound.id,
+							permission: userFound.permission,
+							isAdmin: true
+						}
+					};
+				}
+			}
 			const passwordMatch = await bcrypt.compare(password, userFound.password);
 			if (!passwordMatch) {
 				throw {
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 010298059..09b030328 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -434,13 +434,12 @@
 			<div class="flex flex-col space-y-4 py-2">
 				<a
 					sveltekit:prefetch
-					href="/teams"
-					class="icons tooltip-right bg-coolgray-200 hover:text-cyan-500"
-					class:text-cyan-500={$page.url.pathname.startsWith('/teams')}
-					class:bg-coolgray-500={$page.url.pathname.startsWith('/teams')}
-					data-tooltip="Teams"
-				>
-					<svg
+					href="/iam"
+					class="icons tooltip-right bg-coolgray-200 hover:text-fuchsia-500"
+					class:text-fuchsia-500={$page.url.pathname.startsWith('/iam')}
+					class:bg-coolgray-500={$page.url.pathname.startsWith('/iam')}
+					data-tooltip="IAM"
+					><svg
 						xmlns="http://www.w3.org/2000/svg"
 						class="h-8 w-8"
 						viewBox="0 0 24 24"
@@ -457,6 +456,7 @@
 						<path d="M21 21v-2a4 4 0 0 0 -3 -3.85" />
 					</svg>
 				</a>
+
 				{#if $session.teamId === '0'}
 					<a
 						sveltekit:prefetch
@@ -484,6 +484,7 @@
 						</svg>
 					</a>
 				{/if}
+
 				<div
 					class="icons tooltip-right bg-coolgray-200 hover:text-red-500"
 					data-tooltip="Logout"
diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index ad8e43c69..547382498 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -47,16 +47,13 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownApplications.length > 0 && otherApplications.length > 0}
-				<div class="text-xl font-bold pb-5 px-1">Current Team</div>
-			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownApplications as application}
 					<Application {application} />
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Applications</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
 						<Application {application} />
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 5e271bcfe..7185e7f28 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -52,9 +52,6 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownDatabases.length > 0 && otherDatabases.length > 0}
-				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
-			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDatabases as database}
 					<a href="/databases/{database.id}" class="no-underline p-2 w-96">
@@ -82,15 +79,13 @@
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 									Configuration missing
 								</div>
-							{:else}
-								<div class="text-center truncate">{database.type}</div>
 							{/if}
 						</div>
 					</a>
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Databases</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDatabases as database}
 						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 34a9faefb..04077f57c 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -63,9 +63,6 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownDestinations.length > 0 && otherDestinations.length > 0}
-				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
-			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownDestinations as destination}
 					<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
@@ -81,7 +78,7 @@
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Destinations</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherDestinations as destination}
 						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/iam/index.json.ts b/src/routes/iam/index.json.ts
new file mode 100644
index 000000000..fa44e55ba
--- /dev/null
+++ b/src/routes/iam/index.json.ts
@@ -0,0 +1,130 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const get: RequestHandler = async (event) => {
+	const { teamId, userId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	try {
+		const account = await db.prisma.user.findUnique({
+			where: { id: userId },
+			select: { id: true, email: true, teams: true }
+		});
+		let accounts = [];
+		if (teamId === '0') {
+			accounts = await db.prisma.user.findMany({ select: { id: true, email: true, teams: true } });
+		}
+
+		const teams = await db.prisma.permission.findMany({
+			where: { userId: teamId === '0' ? undefined : userId },
+			include: { team: { include: { _count: { select: { users: true } } } } }
+		});
+
+		const invitations = await db.prisma.teamInvitation.findMany({ where: { uid: userId } });
+		return {
+			status: 200,
+			body: {
+				teams,
+				invitations,
+				account,
+				accounts
+			}
+		};
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, userId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+	if (teamId !== '0')
+		return { status: 401, body: { message: 'You are not authorized to perform this action' } };
+
+	const { id } = await event.request.json();
+	try {
+		const aloneInTeams = await db.prisma.team.findMany({ where: { users: { every: { id } } } });
+		if (aloneInTeams.length > 0) {
+			for (const team of aloneInTeams) {
+				const applications = await db.prisma.application.findMany({
+					where: { teams: { every: { id: team.id } } }
+				});
+				if (applications.length > 0) {
+					for (const application of applications) {
+						await db.prisma.application.update({
+							where: { id: application.id },
+							data: { teams: { connect: { id: '0' } } }
+						});
+					}
+				}
+				const services = await db.prisma.service.findMany({
+					where: { teams: { every: { id: team.id } } }
+				});
+				if (services.length > 0) {
+					for (const service of services) {
+						await db.prisma.service.update({
+							where: { id: service.id },
+							data: { teams: { connect: { id: '0' } } }
+						});
+					}
+				}
+				const databases = await db.prisma.database.findMany({
+					where: { teams: { every: { id: team.id } } }
+				});
+				if (databases.length > 0) {
+					for (const database of databases) {
+						await db.prisma.database.update({
+							where: { id: database.id },
+							data: { teams: { connect: { id: '0' } } }
+						});
+					}
+				}
+				const sources = await db.prisma.gitSource.findMany({
+					where: { teams: { every: { id: team.id } } }
+				});
+				if (sources.length > 0) {
+					for (const source of sources) {
+						await db.prisma.gitSource.update({
+							where: { id: source.id },
+							data: { teams: { connect: { id: '0' } } }
+						});
+					}
+				}
+				const destinations = await db.prisma.destinationDocker.findMany({
+					where: { teams: { every: { id: team.id } } }
+				});
+				if (destinations.length > 0) {
+					for (const destination of destinations) {
+						await db.prisma.destinationDocker.update({
+							where: { id: destination.id },
+							data: { teams: { connect: { id: '0' } } }
+						});
+					}
+				}
+				await db.prisma.teamInvitation.deleteMany({ where: { teamId: team.id } });
+				await db.prisma.permission.deleteMany({ where: { teamId: team.id } });
+				await db.prisma.user.delete({ where: { id } });
+				await db.prisma.team.delete({ where: { id: team.id } });
+			}
+		}
+
+		const notAloneInTeams = await db.prisma.team.findMany({ where: { users: { some: { id } } } });
+		if (notAloneInTeams.length > 0) {
+			for (const team of notAloneInTeams) {
+				await db.prisma.team.update({
+					where: { id: team.id },
+					data: { users: { disconnect: { id } } }
+				});
+			}
+		}
+		return {
+			status: 201
+		};
+	} catch (error) {
+		return {
+			status: 500
+		};
+	}
+};
diff --git a/src/routes/iam/index.svelte b/src/routes/iam/index.svelte
new file mode 100644
index 000000000..0541abbb8
--- /dev/null
+++ b/src/routes/iam/index.svelte
@@ -0,0 +1,178 @@
+<script context="module" lang="ts">
+	import type { Load } from '@sveltejs/kit';
+	export const load: Load = async ({ fetch }) => {
+		const url = `/iam.json`;
+		const res = await fetch(url);
+
+		if (res.ok) {
+			return {
+				props: {
+					...(await res.json())
+				}
+			};
+		}
+		if (res.status === 401) {
+			return {
+				status: 302,
+				redirect: '/'
+			};
+		}
+		return {
+			status: res.status,
+			error: new Error(`Could not load ${url}`)
+		};
+	};
+</script>
+
+<script lang="ts">
+	import { session } from '$app/stores';
+	import { get, post } from '$lib/api';
+	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
+
+	export let account;
+	export let accounts;
+	if (accounts.length === 0) {
+		accounts.push(account);
+	}
+	export let teams;
+
+	const ownTeams = teams.filter((team) => {
+		if (team.team.id === $session.teamId) {
+			return team;
+		}
+	});
+	const otherTeams = teams.filter((team) => {
+		if (team.team.id !== $session.teamId) {
+			return team;
+		}
+	});
+
+	async function resetPassword(id) {
+		const sure = window.confirm('Are you sure you want to reset the password?');
+		if (!sure) {
+			return;
+		}
+		try {
+			await post(`/iam/password.json`, { id });
+			toast.push('Password reset successfully.');
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+	async function deleteUser(id) {
+		const sure = window.confirm('Are you sure you want to delete this user?');
+		if (!sure) {
+			return;
+		}
+		try {
+			await post(`/iam.json`, { id });
+			toast.push('Account deleted.');
+			const data = await get('/iam.json');
+			accounts = data.accounts;
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
+	}
+</script>
+
+<div class="flex space-x-1 p-6 font-bold">
+	<div class="mr-4 text-2xl tracking-tight">Identity and Access Management System</div>
+</div>
+
+<!-- <div class="flex items-center px-6">
+	<div>{account.email}</div>
+</div> -->
+<div class="mx-auto max-w-4xl px-6">
+	{#if $session.teamId === '0' && accounts.length > 0}
+		<div class="title font-bold">Accounts</div>
+	{:else}
+		<div class="title font-bold">Account</div>
+	{/if}
+	<div class="flex items-center justify-center pt-10">
+		<table class="mx-2 text-left">
+			<thead class="mb-2">
+				<tr>
+					{#if accounts.length > 1}
+						<th class="px-2">Email</th>
+						<th>Actions</th>
+					{/if}
+				</tr>
+			</thead>
+
+			<tbody>
+				{#each accounts as account}
+					<tr>
+						<td class="px-2">{account.email}</td>
+						<td class="flex space-x-2">
+							<form on:submit|preventDefault={() => resetPassword(account.id)}>
+								<button
+									class="mx-auto my-4 w-32 bg-coollabs hover:bg-coollabs-100 disabled:bg-coolgray-200"
+									>Reset Password</button
+								>
+							</form>
+							<form on:submit|preventDefault={() => deleteUser(account.id)}>
+								<button
+									disabled={account.id === $session.userId}
+									class="mx-auto my-4 w-32 bg-coollabs hover:bg-coollabs-100 disabled:bg-coolgray-200"
+									type="submit">Delete User</button
+								>
+							</form>
+						</td>
+					</tr>
+				{/each}
+			</tbody>
+		</table>
+	</div>
+</div>
+
+<div class="mx-auto max-w-4xl px-6">
+	<div class="title font-bold">Teams</div>
+	<div class="flex items-center justify-center pt-10">
+		<div class="flex flex-col">
+			<div class="flex flex-col flex-wrap justify-center px-2 pb-10 md:flex-row">
+				{#each ownTeams as team}
+					<a href="/iam/team/{team.teamId}" class="w-96 p-2 no-underline">
+						<div
+							class="box-selection relative"
+							class:hover:bg-cyan-600={team.team?.id !== '0'}
+							class:hover:bg-red-500={team.team?.id === '0'}
+						>
+							<div class="truncate text-center text-xl font-bold">
+								{team.team.name}
+							</div>
+							<div class="truncate text-center font-bold">
+								{team.team?.id === '0' ? 'root team' : ''}
+							</div>
+
+							<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
+						</div>
+					</a>
+				{/each}
+			</div>
+			{#if $session.teamId === '0' && otherTeams.length > 0}
+				<div class="pb-5 pt-10 text-xl font-bold">Other Teams</div>
+			{/if}
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+				{#each otherTeams as team}
+					<a href="/iam/team/{team.teamId}" class="w-96 p-2 no-underline">
+						<div
+							class="box-selection relative"
+							class:hover:bg-cyan-600={team.team?.id !== '0'}
+							class:hover:bg-red-500={team.team?.id === '0'}
+						>
+							<div class="truncate text-center text-xl font-bold">
+								{team.team.name}
+							</div>
+							<div class="truncate text-center font-bold">
+								{team.team?.id === '0' ? 'root team' : ''}
+							</div>
+
+							<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
+						</div>
+					</a>
+				{/each}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/iam/password.json.ts b/src/routes/iam/password.json.ts
new file mode 100644
index 000000000..b8ba2ca8e
--- /dev/null
+++ b/src/routes/iam/password.json.ts
@@ -0,0 +1,22 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, userId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+
+	const { id } = await event.request.json();
+	try {
+		await db.prisma.user.update({ where: { id }, data: { password: 'RESETME' } });
+		return {
+			status: 201
+		};
+	} catch (error) {
+		console.log(error);
+		return {
+			status: 500
+		};
+	}
+};
diff --git a/src/routes/teams/[id]/__layout.svelte b/src/routes/iam/team/[id]/__layout.svelte
similarity index 83%
rename from src/routes/teams/[id]/__layout.svelte
rename to src/routes/iam/team/[id]/__layout.svelte
index 9ad4eb110..972ca111f 100644
--- a/src/routes/teams/[id]/__layout.svelte
+++ b/src/routes/iam/team/[id]/__layout.svelte
@@ -1,14 +1,14 @@
 <script context="module" lang="ts">
 	import type { Load } from '@sveltejs/kit';
 	export const load: Load = async ({ fetch, params }) => {
-		const url = `/teams/${params.id}.json`;
+		const url = `/iam/team/${params.id}.json`;
 		const res = await fetch(url);
 		if (res.ok) {
 			const data = await res.json();
 			if (!data.permissions || Object.entries(data.permissions).length === 0) {
 				return {
 					status: 302,
-					redirect: '/teams'
+					redirect: '/iam'
 				};
 			}
 			return {
@@ -20,7 +20,7 @@
 
 		return {
 			status: 302,
-			redirect: '/teams'
+			redirect: '/iam'
 		};
 	};
 </script>
diff --git a/src/routes/teams/[id]/index.json.ts b/src/routes/iam/team/[id]/index.json.ts
similarity index 100%
rename from src/routes/teams/[id]/index.json.ts
rename to src/routes/iam/team/[id]/index.json.ts
diff --git a/src/routes/teams/[id]/index.svelte b/src/routes/iam/team/[id]/index.svelte
similarity index 94%
rename from src/routes/teams/[id]/index.svelte
rename to src/routes/iam/team/[id]/index.svelte
index 964b57612..541b21379 100644
--- a/src/routes/teams/[id]/index.svelte
+++ b/src/routes/iam/team/[id]/index.svelte
@@ -1,7 +1,7 @@
 <script context="module" lang="ts">
 	import type { Load } from '@sveltejs/kit';
 	export const load: Load = async ({ fetch, params }) => {
-		const url = `/teams/${params.id}.json`;
+		const url = `/iam/team/${params.id}.json`;
 		const res = await fetch(url);
 
 		if (res.ok) {
@@ -44,7 +44,7 @@
 
 	async function sendInvitation() {
 		try {
-			await post(`/teams/${id}/invitation/invite.json`, {
+			await post(`/iam/team/${id}/invitation/invite.json`, {
 				teamId: team.id,
 				teamName: invitation.teamName,
 				email: invitation.email.toLowerCase(),
@@ -57,7 +57,7 @@
 	}
 	async function revokeInvitation(id: string) {
 		try {
-			await post(`/teams/${id}/invitation/revoke.json`, { id });
+			await post(`/iam/team/${id}/invitation/revoke.json`, { id });
 			return window.location.reload();
 		} catch ({ error }) {
 			return errorNotification(error);
@@ -65,7 +65,7 @@
 	}
 	async function removeFromTeam(uid: string) {
 		try {
-			await post(`/teams/${id}/remove/user.json`, { teamId: team.id, uid });
+			await post(`/iam/team/${id}/remove/user.json`, { teamId: team.id, uid });
 			return window.location.reload();
 		} catch ({ error }) {
 			return errorNotification(error);
@@ -77,7 +77,7 @@
 			newPermission = 'admin';
 		}
 		try {
-			await post(`/teams/${id}/permission/change.json`, { userId, newPermission, permissionId });
+			await post(`/iam/team/${id}/permission/change.json`, { userId, newPermission, permissionId });
 			return window.location.reload();
 		} catch ({ error }) {
 			return errorNotification(error);
@@ -85,7 +85,7 @@
 	}
 	async function handleSubmit() {
 		try {
-			await post(`/teams/${id}.json`, { ...team });
+			await post(`/iam/team/${id}.json`, { ...team });
 			return window.location.reload();
 		} catch ({ error }) {
 			return errorNotification(error);
diff --git a/src/routes/teams/[id]/invitation/accept.json.ts b/src/routes/iam/team/[id]/invitation/accept.json.ts
similarity index 100%
rename from src/routes/teams/[id]/invitation/accept.json.ts
rename to src/routes/iam/team/[id]/invitation/accept.json.ts
diff --git a/src/routes/teams/[id]/invitation/invite.json.ts b/src/routes/iam/team/[id]/invitation/invite.json.ts
similarity index 100%
rename from src/routes/teams/[id]/invitation/invite.json.ts
rename to src/routes/iam/team/[id]/invitation/invite.json.ts
diff --git a/src/routes/teams/[id]/invitation/revoke.json.ts b/src/routes/iam/team/[id]/invitation/revoke.json.ts
similarity index 100%
rename from src/routes/teams/[id]/invitation/revoke.json.ts
rename to src/routes/iam/team/[id]/invitation/revoke.json.ts
diff --git a/src/routes/teams/[id]/permission/change.json.ts b/src/routes/iam/team/[id]/permission/change.json.ts
similarity index 100%
rename from src/routes/teams/[id]/permission/change.json.ts
rename to src/routes/iam/team/[id]/permission/change.json.ts
diff --git a/src/routes/teams/[id]/remove/user.json.ts b/src/routes/iam/team/[id]/remove/user.json.ts
similarity index 100%
rename from src/routes/teams/[id]/remove/user.json.ts
rename to src/routes/iam/team/[id]/remove/user.json.ts
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 293c51087..06e74873b 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -57,9 +57,6 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownServices.length > 0 && otherServices.length > 0}
-				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
-			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownServices as service}
 					<a href="/services/{service.id}" class="no-underline p-2 w-96">
@@ -97,15 +94,13 @@
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 									Configuration missing
 								</div>
-							{:else}
-								<div class="text-center truncate">{service.type}</div>
 							{/if}
 						</div>
 					</a>
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Services</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherServices as service}
 						<a href="/services/{service.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 224916fb8..c763e0b58 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -61,9 +61,6 @@
 		</div>
 	{:else}
 		<div class="flex flex-col">
-			{#if $session.teamId === '0' && ownSources.length > 0 && otherSources.length > 0}
-				<div class="text-xl font-bold pb-5 px-6">Current Team</div>
-			{/if}
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownSources as source}
 					<a href="/sources/{source.id}" class="no-underline p-2 w-96">
@@ -90,7 +87,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Others</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Srouces</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
diff --git a/src/routes/teams/index.json.ts b/src/routes/teams/index.json.ts
deleted file mode 100644
index f382800ea..000000000
--- a/src/routes/teams/index.json.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { getUserDetails } from '$lib/common';
-import * as db from '$lib/database';
-import { ErrorHandler } from '$lib/database';
-import type { RequestHandler } from '@sveltejs/kit';
-
-export const get: RequestHandler = async (event) => {
-	const { teamId, userId, status, body } = await getUserDetails(event, false);
-	if (status === 401) return { status, body };
-
-	try {
-		const teams = await db.prisma.permission.findMany({
-			where: { userId: teamId === '0' ? undefined : userId },
-			include: { team: { include: { _count: { select: { users: true } } } } }
-		});
-
-		const invitations = await db.prisma.teamInvitation.findMany({ where: { uid: userId } });
-		return {
-			status: 200,
-			body: {
-				teams,
-				invitations
-			}
-		};
-	} catch (error) {
-		return ErrorHandler(error);
-	}
-};
diff --git a/src/routes/teams/index.svelte b/src/routes/teams/index.svelte
deleted file mode 100644
index 79e600ca6..000000000
--- a/src/routes/teams/index.svelte
+++ /dev/null
@@ -1,146 +0,0 @@
-<script context="module" lang="ts">
-	import type { Load } from '@sveltejs/kit';
-	export const load: Load = async ({ fetch }) => {
-		const url = `/teams.json`;
-		const res = await fetch(url);
-
-		if (res.ok) {
-			return {
-				props: {
-					...(await res.json())
-				}
-			};
-		}
-
-		return {
-			status: res.status,
-			error: new Error(`Could not load ${url}`)
-		};
-	};
-</script>
-
-<script lang="ts">
-	import { errorNotification } from '$lib/form';
-	import { session } from '$app/stores';
-	import { post } from '$lib/api';
-
-	export let teams;
-	export let invitations;
-
-	async function acceptInvitation(id, teamId) {
-		try {
-			await post(`/teams/${teamId}/invitation/accept.json`, { id });
-			return window.location.reload();
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-	async function revokeInvitation(id, teamId) {
-		try {
-			await post(`/teams/${teamId}/invitation/revoke.json`, { id });
-			return window.location.reload();
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-	const ownTeams = teams.filter((team) => {
-		if (team.team.id === $session.teamId) {
-			return team;
-		}
-	});
-	const otherTeams = teams.filter((team) => {
-		if (team.team.id !== $session.teamId) {
-			return team;
-		}
-	});
-</script>
-
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Teams</div>
-	{#if $session.isAdmin}
-		<a href="/new/team" class="add-icon bg-cyan-600 hover:bg-cyan-500">
-			<svg
-				class="w-6"
-				xmlns="http://www.w3.org/2000/svg"
-				fill="none"
-				viewBox="0 0 24 24"
-				stroke="currentColor"
-				><path
-					stroke-linecap="round"
-					stroke-linejoin="round"
-					stroke-width="2"
-					d="M12 6v6m0 0v6m0-6h6m-6 0H6"
-				/></svg
-			>
-		</a>
-	{/if}
-</div>
-
-{#if invitations.length > 0}
-	<div class="mx-auto max-w-2xl pb-10">
-		<div class="flex space-x-1 p-6 font-bold">
-			<div class="title">Pending invitations</div>
-		</div>
-		<div class="text-center">
-			{#each invitations as invitation}
-				<div class="flex justify-center space-x-2">
-					<div>
-						Invited to <span class="font-bold text-pink-600">{invitation.teamName}</span> with
-						<span class="font-bold text-rose-600">{invitation.permission}</span> permission.
-					</div>
-					<button
-						class="hover:bg-green-500"
-						on:click={() => acceptInvitation(invitation.id, invitation.teamId)}>Accept</button
-					>
-					<button
-						class="hover:bg-red-600"
-						on:click={() => revokeInvitation(invitation.id, invitation.teamId)}>Delete</button
-					>
-				</div>
-			{/each}
-		</div>
-	</div>
-{/if}
-<div class="flex flex-wrap justify-center">
-	<div class="flex flex-col">
-		<div class=" px-6 pb-5 text-xl font-bold">Current Team</div>
-		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
-			{#each ownTeams as team}
-				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
-					<div
-						class="box-selection relative"
-						class:hover:bg-cyan-600={team.team?.id !== '0'}
-						class:hover:bg-red-500={team.team?.id === '0'}
-					>
-						<div class="truncate text-center text-xl font-bold">
-							{team.team.name}
-							{team.team?.id === '0' ? '(admin team)' : ''}
-						</div>
-
-						<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
-					</div>
-				</a>
-			{/each}
-		</div>
-
-		<div class="px-6 pb-5 pt-10 text-xl font-bold">Others</div>
-		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
-			{#each otherTeams as team}
-				<a href="/teams/{team.teamId}" class="w-96 p-2 no-underline">
-					<div
-						class="box-selection relative"
-						class:hover:bg-cyan-600={team.team?.id !== '0'}
-						class:hover:bg-red-500={team.team?.id === '0'}
-					>
-						<div class="truncate text-center text-xl font-bold">
-							{team.team.name}
-							{team.team?.id === '0' ? '(admin team)' : ''}
-						</div>
-
-						<div class="mt-1 text-center">{team.team._count.users} member(s)</div>
-					</div>
-				</a>
-			{/each}
-		</div>
-	</div>
-</div>

From 2b0df270dfd81129fc9d7f34e2149e94273e8a8c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Thu, 7 Apr 2022 23:58:56 +0200
Subject: [PATCH 27/57] fix: small typo

---
 src/routes/services/[id]/_Services/_Services.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/services/[id]/_Services/_Services.svelte b/src/routes/services/[id]/_Services/_Services.svelte
index 637944b65..41dd86ff6 100644
--- a/src/routes/services/[id]/_Services/_Services.svelte
+++ b/src/routes/services/[id]/_Services/_Services.svelte
@@ -93,7 +93,7 @@
 				</div>
 			</div>
 			<div class="grid grid-cols-2 items-center px-10">
-				<label for="buildPack" class="text-base font-bold text-stone-100">Version / Tag</label>
+				<label for="version" class="text-base font-bold text-stone-100">Version / Tag</label>
 				<a
 					href={$session.isAdmin
 						? `/services/${id}/configuration/version?from=/services/${id}`

From b8b4f559db0bd12c1ff56d589c561add544c91f9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 00:09:09 +0200
Subject: [PATCH 28/57] fix: Unique storage paths

---
 .../20220407220809_unique_storage_fix/migration.sql          | 5 +++++
 prisma/schema.prisma                                         | 4 ++--
 src/routes/iam/index.svelte                                  | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 prisma/migrations/20220407220809_unique_storage_fix/migration.sql

diff --git a/prisma/migrations/20220407220809_unique_storage_fix/migration.sql b/prisma/migrations/20220407220809_unique_storage_fix/migration.sql
new file mode 100644
index 000000000..9b645cc3b
--- /dev/null
+++ b/prisma/migrations/20220407220809_unique_storage_fix/migration.sql
@@ -0,0 +1,5 @@
+-- DropIndex
+DROP INDEX "ApplicationPersistentStorage_path_key";
+
+-- DropIndex
+DROP INDEX "ApplicationPersistentStorage_applicationId_key";
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 7f37f9a2b..2c97a9e8b 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -117,8 +117,8 @@ model ApplicationSettings {
 model ApplicationPersistentStorage {
   id            String      @id @default(cuid())
   application   Application @relation(fields: [applicationId], references: [id])
-  applicationId String      @unique
-  path          String      @unique
+  applicationId String      
+  path          String      
   createdAt     DateTime    @default(now())
   updatedAt     DateTime    @updatedAt
 
diff --git a/src/routes/iam/index.svelte b/src/routes/iam/index.svelte
index 0541abbb8..f2554813e 100644
--- a/src/routes/iam/index.svelte
+++ b/src/routes/iam/index.svelte
@@ -77,7 +77,7 @@
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Identity and Access Management System</div>
+	<div class="mr-4 text-2xl tracking-tight">Identity and Access Management</div>
 </div>
 
 <!-- <div class="flex items-center px-6">

From 4da27a46a24f7130aeb4688310d78b25031c324d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 00:16:10 +0200
Subject: [PATCH 29/57] fix: self-hosted GitLab URL

---
 src/lib/importers/gitlab.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/importers/gitlab.ts b/src/lib/importers/gitlab.ts
index 81ef54c10..0cf57d98a 100644
--- a/src/lib/importers/gitlab.ts
+++ b/src/lib/importers/gitlab.ts
@@ -10,7 +10,7 @@ export default async function ({
 	buildId,
 	privateSshKey
 }): Promise<any> {
-	const url = htmlUrl.replace('https://', '').replace('http://', '');
+	const url = htmlUrl.replace('https://', '').replace('http://', '').replace(/\/$/, '');
 	await saveBuildLog({ line: 'GitLab importer started.', buildId, applicationId });
 	await asyncExecShell(`echo '${privateSshKey}' > ${repodir}/id.rsa`);
 	await asyncExecShell(`chmod 600 ${repodir}/id.rsa`);

From 76754ded7934e4c6c1d16205c6f14eca09ac7b9a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 00:28:10 +0200
Subject: [PATCH 30/57] docs: Contribution guide

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f839dfce6..8a21ec10a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,7 +16,7 @@ First of all, thank you for considering to contribute to my project! It means a
 - Push to your fork repo
 - Create a pull request: https://github.com/coollabsio/compare
 - Write a proper description
-- Click "Change to draft"
+- Open the pull request to review
 
 # How to start after you set up your local fork?
 

From 0d0715a3405f959209ebf9a3faee020a04e7df8e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 10:35:16 +0200
Subject: [PATCH 31/57] ui/fix: Insane amount

---
 src/lib/database/applications.ts              |   6 +-
 src/lib/database/gitSources.ts                |  35 ++-
 src/routes/applications/[id]/delete.json.ts   |   1 +
 src/routes/applications/_Application.svelte   |  70 -----
 src/routes/applications/index.svelte          | 117 ++++++-
 src/routes/databases/index.svelte             |   2 +-
 src/routes/destinations/index.svelte          |   2 +-
 src/routes/iam/index.svelte                   |   7 +-
 src/routes/index.svelte                       |   2 +-
 src/routes/new/source/_Github.svelte          |  96 ------
 src/routes/new/source/_Gitlab.svelte          |  73 -----
 src/routes/new/source/index.svelte            |  66 ----
 src/routes/services/index.svelte              |   9 +-
 src/routes/sources/[id]/_Github.svelte        | 114 +++++--
 src/routes/sources/[id]/_Gitlab.svelte        | 286 ++++++++++--------
 src/routes/sources/[id]/github.json.ts        |  18 ++
 src/routes/sources/[id]/gitlab.json.ts        |  16 +-
 src/routes/sources/[id]/index.json.ts         |   4 +-
 src/routes/sources/[id]/index.svelte          |  53 +++-
 src/routes/sources/[id]/newGithubApp.svelte   |   1 +
 src/routes/sources/index.svelte               |  15 +-
 .../source/index.json.ts => sources/new.ts}   |   6 +-
 22 files changed, 509 insertions(+), 490 deletions(-)
 delete mode 100644 src/routes/applications/_Application.svelte
 delete mode 100644 src/routes/new/source/_Github.svelte
 delete mode 100644 src/routes/new/source/_Gitlab.svelte
 delete mode 100644 src/routes/new/source/index.svelte
 create mode 100644 src/routes/sources/[id]/github.json.ts
 rename src/routes/{new/source/index.json.ts => sources/new.ts} (64%)

diff --git a/src/lib/database/applications.ts b/src/lib/database/applications.ts
index 1c6e172c2..ce53fe709 100644
--- a/src/lib/database/applications.ts
+++ b/src/lib/database/applications.ts
@@ -73,7 +73,11 @@ export async function removeApplication({ id, teamId }) {
 	await prisma.build.deleteMany({ where: { applicationId: id } });
 	await prisma.secret.deleteMany({ where: { applicationId: id } });
 	await prisma.applicationPersistentStorage.deleteMany({ where: { applicationId: id } });
-	await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
+	if (teamId === '0') {
+		await prisma.application.deleteMany({ where: { id } });
+	} else {
+		await prisma.application.deleteMany({ where: { id, teams: { some: { id: teamId } } } });
+	}
 }
 
 export async function getApplicationWebhook({ projectId, branch }) {
diff --git a/src/lib/database/gitSources.ts b/src/lib/database/gitSources.ts
index 0ed6f29b1..b8279c268 100644
--- a/src/lib/database/gitSources.ts
+++ b/src/lib/database/gitSources.ts
@@ -13,15 +13,11 @@ export async function listSources(teamId) {
 	});
 }
 
-export async function newSource({ name, teamId, type, htmlUrl, apiUrl, organization }) {
+export async function newSource({ teamId, name }) {
 	return await prisma.gitSource.create({
 		data: {
-			teams: { connect: { id: teamId } },
 			name,
-			type,
-			htmlUrl,
-			apiUrl,
-			organization
+			teams: { connect: { id: teamId } }
 		}
 	});
 }
@@ -55,8 +51,29 @@ export async function getSource({ id, teamId }) {
 	if (body?.gitlabApp?.appSecret) body.gitlabApp.appSecret = decrypt(body.gitlabApp.appSecret);
 	return body;
 }
-export async function addSource({ id, appId, teamId, oauthId, groupName, appSecret }) {
+export async function addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl }) {
+	await prisma.gitSource.update({ where: { id }, data: { type, name, htmlUrl, apiUrl } });
+	return await prisma.githubApp.create({
+		data: {
+			teams: { connect: { id: teamId } },
+			gitSource: { connect: { id } }
+		}
+	});
+}
+export async function addGitLabSource({
+	id,
+	teamId,
+	type,
+	name,
+	htmlUrl,
+	apiUrl,
+	oauthId,
+	appId,
+	appSecret,
+	groupName
+}) {
 	const encrptedAppSecret = encrypt(appSecret);
+	await prisma.gitSource.update({ where: { id }, data: { type, apiUrl, htmlUrl, name } });
 	return await prisma.gitlabApp.create({
 		data: {
 			teams: { connect: { id: teamId } },
@@ -75,9 +92,9 @@ export async function configureGitsource({ id, gitSourceId }) {
 		data: { gitSource: { connect: { id: gitSourceId } } }
 	});
 }
-export async function updateGitsource({ id, name }) {
+export async function updateGitsource({ id, name, htmlUrl, apiUrl }) {
 	return await prisma.gitSource.update({
 		where: { id },
-		data: { name }
+		data: { name, htmlUrl, apiUrl }
 	});
 }
diff --git a/src/routes/applications/[id]/delete.json.ts b/src/routes/applications/[id]/delete.json.ts
index b451728df..03e48a847 100644
--- a/src/routes/applications/[id]/delete.json.ts
+++ b/src/routes/applications/[id]/delete.json.ts
@@ -14,6 +14,7 @@ export const del: RequestHandler = async (event) => {
 			status: 200
 		};
 	} catch (error) {
+		console.log(error);
 		return ErrorHandler(error);
 	}
 };
diff --git a/src/routes/applications/_Application.svelte b/src/routes/applications/_Application.svelte
deleted file mode 100644
index 8f183eb13..000000000
--- a/src/routes/applications/_Application.svelte
+++ /dev/null
@@ -1,70 +0,0 @@
-<script lang="ts">
-	export let application;
-	import Rust from '$lib/components/svg/applications/Rust.svelte';
-	import Nodejs from '$lib/components/svg/applications/Nodejs.svelte';
-	import React from '$lib/components/svg/applications/React.svelte';
-	import Svelte from '$lib/components/svg/applications/Svelte.svelte';
-	import Vuejs from '$lib/components/svg/applications/Vuejs.svelte';
-	import PHP from '$lib/components/svg/applications/PHP.svelte';
-	import Python from '$lib/components/svg/applications/Python.svelte';
-	import Static from '$lib/components/svg/applications/Static.svelte';
-	import Nestjs from '$lib/components/svg/applications/Nestjs.svelte';
-	import Nuxtjs from '$lib/components/svg/applications/Nuxtjs.svelte';
-	import Nextjs from '$lib/components/svg/applications/Nextjs.svelte';
-	import Gatsby from '$lib/components/svg/applications/Gatsby.svelte';
-	import Docker from '$lib/components/svg/applications/Docker.svelte';
-	import Astro from '$lib/components/svg/applications/Astro.svelte';
-	import Eleventy from '$lib/components/svg/applications/Eleventy.svelte';
-	import { session } from '$app/stores';
-
-	const buildPack = application?.buildPack?.toLowerCase();
-</script>
-
-<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
-	<div class="box-selection group relative hover:bg-green-600">
-		{#if buildPack === 'rust'}
-			<Rust />
-		{:else if buildPack === 'node'}
-			<Nodejs />
-		{:else if buildPack === 'react'}
-			<React />
-		{:else if buildPack === 'svelte'}
-			<Svelte />
-		{:else if buildPack === 'vuejs'}
-			<Vuejs />
-		{:else if buildPack === 'php'}
-			<PHP />
-		{:else if buildPack === 'python'}
-			<Python />
-		{:else if buildPack === 'static'}
-			<Static />
-		{:else if buildPack === 'nestjs'}
-			<Nestjs />
-		{:else if buildPack === 'nuxtjs'}
-			<Nuxtjs />
-		{:else if buildPack === 'nextjs'}
-			<Nextjs />
-		{:else if buildPack === 'gatsby'}
-			<Gatsby />
-		{:else if buildPack === 'docker'}
-			<Docker />
-		{:else if buildPack === 'astro'}
-			<Astro />
-		{:else if buildPack === 'eleventy'}
-			<Eleventy />
-		{/if}
-
-		<div class="truncate text-center text-xl font-bold">{application.name}</div>
-		{#if $session.teamId === '0'}
-			<div class="truncate text-center">Team {application.teams[0].name}</div>
-		{/if}
-		{#if application.fqdn}
-			<div class="truncate text-center">{application.fqdn}</div>
-		{/if}
-		{#if !application.gitSourceId || !application.destinationDockerId}
-			<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-				Configuration missing
-			</div>
-		{/if}
-	</div>
-</a>
diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 547382498..0c69c47fe 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -1,9 +1,26 @@
 <script lang="ts">
 	export let applications: Array<Application>;
 	import { session } from '$app/stores';
-	import Application from './_Application.svelte';
 	import { post } from '$lib/api';
 	import { goto } from '$app/navigation';
+
+	import Rust from '$lib/components/svg/applications/Rust.svelte';
+	import Nodejs from '$lib/components/svg/applications/Nodejs.svelte';
+	import React from '$lib/components/svg/applications/React.svelte';
+	import Svelte from '$lib/components/svg/applications/Svelte.svelte';
+	import Vuejs from '$lib/components/svg/applications/Vuejs.svelte';
+	import PHP from '$lib/components/svg/applications/PHP.svelte';
+	import Python from '$lib/components/svg/applications/Python.svelte';
+	import Static from '$lib/components/svg/applications/Static.svelte';
+	import Nestjs from '$lib/components/svg/applications/Nestjs.svelte';
+	import Nuxtjs from '$lib/components/svg/applications/Nuxtjs.svelte';
+	import Nextjs from '$lib/components/svg/applications/Nextjs.svelte';
+	import Gatsby from '$lib/components/svg/applications/Gatsby.svelte';
+	import Docker from '$lib/components/svg/applications/Docker.svelte';
+	import Astro from '$lib/components/svg/applications/Astro.svelte';
+	import Eleventy from '$lib/components/svg/applications/Eleventy.svelte';
+	import { getDomain } from '$lib/components/common';
+
 	async function newApplication() {
 		const { id } = await post('/applications/new', {});
 		return await goto(`/applications/${id}`, { replaceState: true });
@@ -49,14 +66,108 @@
 		<div class="flex flex-col">
 			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 				{#each ownApplications as application}
-					<Application {application} />
+					<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
+						<div class="box-selection group relative hover:bg-green-600">
+							{#if application.buildPack.toLowerCase() === 'rust'}
+								<Rust />
+							{:else if application.buildPack.toLowerCase() === 'node'}
+								<Nodejs />
+							{:else if application.buildPack.toLowerCase() === 'react'}
+								<React />
+							{:else if application.buildPack.toLowerCase() === 'svelte'}
+								<Svelte />
+							{:else if application.buildPack.toLowerCase() === 'vuejs'}
+								<Vuejs />
+							{:else if application.buildPack.toLowerCase() === 'php'}
+								<PHP />
+							{:else if application.buildPack.toLowerCase() === 'python'}
+								<Python />
+							{:else if application.buildPack.toLowerCase() === 'static'}
+								<Static />
+							{:else if application.buildPack.toLowerCase() === 'nestjs'}
+								<Nestjs />
+							{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
+								<Nuxtjs />
+							{:else if application.buildPack.toLowerCase() === 'nextjs'}
+								<Nextjs />
+							{:else if application.buildPack.toLowerCase() === 'gatsby'}
+								<Gatsby />
+							{:else if application.buildPack.toLowerCase() === 'docker'}
+								<Docker />
+							{:else if application.buildPack.toLowerCase() === 'astro'}
+								<Astro />
+							{:else if application.buildPack.toLowerCase() === 'eleventy'}
+								<Eleventy />
+							{/if}
+
+							<div class="truncate text-center text-xl font-bold">{application.name}</div>
+							{#if $session.teamId === '0' && otherApplications.length > 0}
+								<div class="truncate text-center">Team {application.teams[0].name}</div>
+							{/if}
+							{#if application.fqdn}
+								<div class="truncate text-center">{getDomain(application.fqdn)}</div>
+							{/if}
+							{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
+								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{/if}
+						</div>
+					</a>
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
 				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Applications</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherApplications as application}
-						<Application {application} />
+						<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
+							<div class="box-selection group relative hover:bg-green-600">
+								{#if application.buildPack.toLowerCase() === 'rust'}
+									<Rust />
+								{:else if application.buildPack.toLowerCase() === 'node'}
+									<Nodejs />
+								{:else if application.buildPack.toLowerCase() === 'react'}
+									<React />
+								{:else if application.buildPack.toLowerCase() === 'svelte'}
+									<Svelte />
+								{:else if application.buildPack.toLowerCase() === 'vuejs'}
+									<Vuejs />
+								{:else if application.buildPack.toLowerCase() === 'php'}
+									<PHP />
+								{:else if application.buildPack.toLowerCase() === 'python'}
+									<Python />
+								{:else if application.buildPack.toLowerCase() === 'static'}
+									<Static />
+								{:else if application.buildPack.toLowerCase() === 'nestjs'}
+									<Nestjs />
+								{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
+									<Nuxtjs />
+								{:else if application.buildPack.toLowerCase() === 'nextjs'}
+									<Nextjs />
+								{:else if application.buildPack.toLowerCase() === 'gatsby'}
+									<Gatsby />
+								{:else if application.buildPack.toLowerCase() === 'docker'}
+									<Docker />
+								{:else if application.buildPack.toLowerCase() === 'astro'}
+									<Astro />
+								{:else if application.buildPack.toLowerCase() === 'eleventy'}
+									<Eleventy />
+								{/if}
+
+								<div class="truncate text-center text-xl font-bold">{application.name}</div>
+								{#if $session.teamId === '0'}
+									<div class="truncate text-center">Team {application.teams[0].name}</div>
+								{/if}
+								{#if application.fqdn}
+									<div class="truncate text-center">{getDomain(application.fqdn)}</div>
+								{/if}
+								{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
+									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
+										Configuration missing
+									</div>
+								{/if}
+							</div>
+						</a>
 					{/each}
 				</div>
 			{/if}
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 7185e7f28..c160bc009 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -72,7 +72,7 @@
 							<div class="font-bold text-xl text-center truncate">
 								{database.name}
 							</div>
-							{#if $session.teamId === '0'}
+							{#if $session.teamId === '0' && otherDatabases.length > 0}
 								<div class="text-center truncate">{database.teams[0].name}</div>
 							{/if}
 							{#if !database.type}
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 04077f57c..84d1fc0bb 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -68,7 +68,7 @@
 					<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
 						<div class="box-selection hover:bg-sky-600">
 							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
-							{#if $session.teamId === '0'}
+							{#if $session.teamId === '0' && otherDestinations.length > 0}
 								<div class="text-center truncate">{destination.teams[0].name}</div>
 							{/if}
 							<div class="text-center truncate">{destination.network}</div>
diff --git a/src/routes/iam/index.svelte b/src/routes/iam/index.svelte
index f2554813e..8c33d5a38 100644
--- a/src/routes/iam/index.svelte
+++ b/src/routes/iam/index.svelte
@@ -55,7 +55,7 @@
 		}
 		try {
 			await post(`/iam/password.json`, { id });
-			toast.push('Password reset successfully.');
+			toast.push('Password reset successfully. Please relogin to reset it.');
 		} catch ({ error }) {
 			return errorNotification(error);
 		}
@@ -80,10 +80,7 @@
 	<div class="mr-4 text-2xl tracking-tight">Identity and Access Management</div>
 </div>
 
-<!-- <div class="flex items-center px-6">
-	<div>{account.email}</div>
-</div> -->
-<div class="mx-auto max-w-4xl px-6">
+<div class="mx-auto max-w-4xl px-6 py-4">
 	{#if $session.teamId === '0' && accounts.length > 0}
 		<div class="title font-bold">Accounts</div>
 	{:else}
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 1a5f61b4b..84cf7188f 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -92,7 +92,7 @@
 					</a>
 
 					<a
-						href="/teams"
+						href="/iam"
 						sveltekit:prefetch
 						class="flex cursor-pointer flex-col rounded p-6 text-center text-cyan-500 no-underline transition duration-150 hover:bg-cyan-500 hover:text-white"
 					>
diff --git a/src/routes/new/source/_Github.svelte b/src/routes/new/source/_Github.svelte
deleted file mode 100644
index e8f2d33c4..000000000
--- a/src/routes/new/source/_Github.svelte
+++ /dev/null
@@ -1,96 +0,0 @@
-<script lang="ts">
-	export let gitSource;
-	import { goto } from '$app/navigation';
-	import { post } from '$lib/api';
-
-	import Explainer from '$lib/components/Explainer.svelte';
-
-	import { errorNotification } from '$lib/form';
-	import { onMount } from 'svelte';
-
-	let nameEl;
-	let organizationEl;
-
-	onMount(() => {
-		nameEl.focus();
-	});
-	async function handleSubmit() {
-		try {
-			const { id } = await post(`/new/source.json`, { ...gitSource });
-			return await goto(`/sources/${id}/`);
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-</script>
-
-<div class="mx-auto max-w-4xl px-6">
-	<div class="flex justify-center pb-8">
-		<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-			<div class="flex h-8 items-center space-x-2">
-				<div class="text-xl font-bold text-white">Configuration</div>
-				<button type="submit" class="bg-orange-600 hover:bg-orange-500">Save</button>
-			</div>
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="type" class="text-base font-bold text-stone-100">Type</label>
-
-				<select name="type" id="type" class="w-96" bind:value={gitSource.type}>
-					<option value="github">GitHub</option>
-					<option value="gitlab">GitLab</option>
-					<option value="bitbucket">BitBucket</option>
-				</select>
-			</div>
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="name" class="text-base font-bold text-stone-100">Name</label>
-				<input
-					name="name"
-					id="name"
-					placeholder="GitHub.com"
-					required
-					bind:this={nameEl}
-					bind:value={gitSource.name}
-				/>
-			</div>
-
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
-				<input
-					type="url"
-					name="htmlUrl"
-					id="htmlUrl"
-					placeholder="eg: https://github.com"
-					required
-					bind:value={gitSource.htmlUrl}
-				/>
-			</div>
-			<div class="grid grid-cols-2 items-center px-10">
-				<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
-				<input
-					name="apiUrl"
-					type="url"
-					id="apiUrl"
-					placeholder="eg: https://api.github.com"
-					required
-					bind:value={gitSource.apiUrl}
-				/>
-			</div>
-			<div class="grid grid-cols-2 px-10">
-				<div class="flex flex-col">
-					<label for="organization" class="pt-2 text-base font-bold text-stone-100"
-						>Organization</label
-					>
-					<Explainer
-						text="Fill it if you would like to use an organization's as your Git Source. Otherwise your user will be used."
-					/>
-				</div>
-				<input
-					name="organization"
-					id="organization"
-					placeholder="eg: coollabsio"
-					bind:value={gitSource.organization}
-					bind:this={organizationEl}
-				/>
-			</div>
-		</form>
-	</div>
-</div>
diff --git a/src/routes/new/source/_Gitlab.svelte b/src/routes/new/source/_Gitlab.svelte
deleted file mode 100644
index 219bc56b0..000000000
--- a/src/routes/new/source/_Gitlab.svelte
+++ /dev/null
@@ -1,73 +0,0 @@
-<script lang="ts">
-	export let gitSource;
-	import { goto } from '$app/navigation';
-	import { post } from '$lib/api';
-
-	import { errorNotification } from '$lib/form';
-	import { onMount } from 'svelte';
-
-	let nameEl;
-
-	onMount(() => {
-		nameEl.focus();
-	});
-	async function handleSubmit() {
-		try {
-			const { id } = await post(`/new/source.json`, { ...gitSource });
-			return await goto(`/sources/${id}/`);
-		} catch ({ error }) {
-			return errorNotification(error);
-		}
-	}
-</script>
-
-<div class="flex justify-center pb-8">
-	<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4">
-		<div class="flex h-8 items-center space-x-2">
-			<div class="text-xl font-bold text-white">Configuration</div>
-			<button type="submit" class="bg-orange-600 hover:bg-orange-500">Save</button>
-		</div>
-		<div class="grid grid-cols-2 items-center px-10">
-			<label for="type" class="text-base font-bold text-stone-100">Type</label>
-			<select name="type" id="type" class="w-96" bind:value={gitSource.type}>
-				<option value="github">GitHub</option>
-				<option value="gitlab">GitLab</option>
-				<option value="bitbucket">BitBucket</option>
-			</select>
-		</div>
-		<div class="grid grid-cols-2 items-center px-10">
-			<label for="name" class="text-base font-bold text-stone-100">Name</label>
-			<input
-				name="name"
-				id="name"
-				placeholder="GitHub.com"
-				required
-				bind:this={nameEl}
-				bind:value={gitSource.name}
-			/>
-		</div>
-
-		<div class="grid grid-cols-2 items-center px-10">
-			<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
-			<input
-				type="url"
-				name="htmlUrl"
-				id="htmlUrl"
-				placeholder="eg: https://github.com"
-				required
-				bind:value={gitSource.htmlUrl}
-			/>
-		</div>
-		<div class="grid grid-cols-2 items-center px-10">
-			<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
-			<input
-				name="apiUrl"
-				type="url"
-				id="apiUrl"
-				placeholder="eg: https://api.github.com"
-				required
-				bind:value={gitSource.apiUrl}
-			/>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/new/source/index.svelte b/src/routes/new/source/index.svelte
deleted file mode 100644
index 73384561a..000000000
--- a/src/routes/new/source/index.svelte
+++ /dev/null
@@ -1,66 +0,0 @@
-<script lang="ts">
-	import Github from './_Github.svelte';
-	import Gitlab from './_Gitlab.svelte';
-	let gitSource = {
-		name: undefined,
-		type: 'github',
-		htmlUrl: undefined,
-		apiUrl: undefined,
-		organization: undefined
-	};
-	function setPredefined(type) {
-		switch (type) {
-			case 'github':
-				gitSource = {
-					name: 'GitHub.com',
-					type,
-					htmlUrl: 'https://github.com',
-					apiUrl: 'https://api.github.com',
-					organization: undefined
-				};
-				break;
-			case 'gitlab':
-				gitSource = {
-					name: 'GitLab.com',
-					type,
-					htmlUrl: 'https://gitlab.com',
-					apiUrl: 'https://gitlab.com/api',
-					organization: undefined
-				};
-				break;
-			case 'bitbucket':
-				gitSource = {
-					name: 'BitBucket.com',
-					type,
-					htmlUrl: 'https://bitbucket.com',
-					apiUrl: 'https://bitbucket.com',
-					organization: undefined
-				};
-				break;
-			default:
-				break;
-		}
-	}
-</script>
-
-<div class="flex space-x-1 p-6 font-bold">
-	<div class="mr-4 text-2xl tracking-tight">Add New Git Source</div>
-</div>
-
-<div class="flex-col space-y-2 pb-10 text-center">
-	<div class="text-xl font-bold text-white">Official providers</div>
-	<div class="flex justify-center space-x-2">
-		<button class="w-32" on:click={() => setPredefined('github')}>GitHub.com</button>
-		<button class="w-32" on:click={() => setPredefined('gitlab')}>GitLab.com</button>
-		<button class="w-32" on:click={() => setPredefined('bitbucket')}>Bitbucket.com</button>
-	</div>
-</div>
-<div class="px-6">
-	{#if gitSource.type === 'github'}
-		<Github {gitSource} />
-	{:else if gitSource.type === 'gitlab'}
-		<Gitlab {gitSource} />
-	{:else if gitSource.type === 'bitbucket'}
-		<div class="text-center font-bold text-4xl py-10">Not implemented yet</div>
-	{/if}
-</div>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 06e74873b..389ee8036 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -13,6 +13,7 @@
 	import Ghost from '$lib/components/svg/services/Ghost.svelte';
 	import MeiliSearch from '$lib/components/svg/services/MeiliSearch.svelte';
 	import { session } from '$app/stores';
+	import { getDomain } from '$lib/components/common';
 
 	export let services;
 	async function newService() {
@@ -87,9 +88,12 @@
 							<div class="font-bold text-xl text-center truncate">
 								{service.name}
 							</div>
-							{#if $session.teamId === '0'}
+							{#if $session.teamId === '0' && otherServices.length > 0}
 								<div class="text-center truncate">{service.teams[0].name}</div>
 							{/if}
+							{#if service.fqdn}
+								<div class="truncate text-center">{getDomain(service.fqdn)}</div>
+							{/if}
 							{#if !service.type || !service.fqdn}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 									Configuration missing
@@ -134,6 +138,9 @@
 								{#if $session.teamId === '0'}
 									<div class="text-center truncate">{service.teams[0].name}</div>
 								{/if}
+								{#if service.fqdn}
+									<div class="truncate text-center">{getDomain(service.fqdn)}</div>
+								{/if}
 								{#if !service.type || !service.fqdn}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
 										Configuration missing
diff --git a/src/routes/sources/[id]/_Github.svelte b/src/routes/sources/[id]/_Github.svelte
index 102971353..b2866d195 100644
--- a/src/routes/sources/[id]/_Github.svelte
+++ b/src/routes/sources/[id]/_Github.svelte
@@ -3,13 +3,19 @@
 	import { page, session } from '$app/stores';
 	import { post } from '$lib/api';
 	import { errorNotification } from '$lib/form';
+	import { toast } from '@zerodevx/svelte-toast';
 	const { id } = $page.params;
 
 	let loading = false;
 	async function handleSubmit() {
 		loading = true;
 		try {
-			return await post(`/sources/${id}.json`, { name: source.name });
+			await post(`/sources/${id}.json`, {
+				name: source.name,
+				htmlUrl: source.htmlUrl,
+				apiUrl: source.apiUrl
+			});
+			toast.push('Settings saved.');
 		} catch ({ error }) {
 			return errorNotification(error);
 		} finally {
@@ -38,7 +44,18 @@
 		}, 100);
 	}
 
-	function newGithubApp() {
+	async function newGithubApp() {
+		loading = true;
+		try {
+			await post(`/sources/${id}/github.json`, {
+				type: 'github',
+				name: source.name,
+				htmlUrl: source.htmlUrl,
+				apiUrl: source.apiUrl
+			});
+		} catch ({ error }) {
+			return errorNotification(error);
+		}
 		const left = screen.width / 2 - 1020 / 2;
 		const top = screen.height / 2 - 618 / 2;
 		const newWindow = open(
@@ -59,31 +76,72 @@
 	}
 </script>
 
-{#if !source.githubAppId}
-	<button on:click={newGithubApp}>Create new GitHub App</button>
-{:else if source.githubApp?.installationId}
-	<form on:submit|preventDefault={handleSubmit} class="py-4">
-		<div class="flex space-x-1 pb-5 font-bold">
-			<div class="title">General</div>
-			{#if $session.isAdmin}
-				<button
-					type="submit"
-					class:bg-orange-600={!loading}
-					class:hover:bg-orange-500={!loading}
-					disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
-				>
-				<button on:click|preventDefault={() => installRepositories(source)}
-					>Change GitHub App Settings</button
-				>
-			{/if}
-		</div>
-		<div class="grid grid-flow-row gap-2 px-10">
-			<div class="grid grid-cols-2 items-center mt-2">
-				<label for="name" class="text-base font-bold text-stone-100">Name</label>
-				<input name="name" id="name" required bind:value={source.name} />
+<div class="mx-auto max-w-4xl">
+	{#if !source.githubAppId}
+		<form on:submit|preventDefault={newGithubApp} class="py-4">
+			<div class="flex space-x-1 pb-5 font-bold">
+				<div class="title">General</div>
 			</div>
+			<div class="grid grid-flow-row gap-2 px-10">
+				<div class="grid grid-flow-row gap-2">
+					<div class="mt-2 grid grid-cols-2 items-center">
+						<label for="name" class="text-base font-bold text-stone-100">Name</label>
+						<input name="name" id="name" required bind:value={source.name} />
+					</div>
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
+					<input name="htmlUrl" id="htmlUrl" required bind:value={source.htmlUrl} />
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
+					<input name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
+				</div>
+			</div>
+			{#if source.apiUrl && source.htmlUrl && source.name}
+				<div class="text-center">
+					<button class=" mt-8 bg-orange-600" type="submit">Create new GitHub App</button>
+				</div>
+			{/if}
+		</form>
+	{:else if source.githubAppId}
+		<form on:submit|preventDefault={handleSubmit} class="py-4">
+			<div class="flex space-x-1 pb-5 font-bold">
+				<div class="title">General</div>
+				{#if $session.isAdmin}
+					<button
+						type="submit"
+						class:bg-orange-600={!loading}
+						class:hover:bg-orange-500={!loading}
+						disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
+					>
+					<button on:click|preventDefault={() => installRepositories(source)}
+						>Change GitHub App Settings</button
+					>
+				{/if}
+			</div>
+			<div class="grid grid-flow-row gap-2 px-10">
+				<div class="grid grid-flow-row gap-2">
+					<div class="mt-2 grid grid-cols-2 items-center">
+						<label for="name" class="text-base font-bold text-stone-100">Name</label>
+						<input name="name" id="name" required bind:value={source.name} />
+					</div>
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
+					<input name="htmlUrl" id="htmlUrl" required bind:value={source.htmlUrl} />
+				</div>
+				<div class="grid grid-cols-2 items-center">
+					<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
+					<input name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
+				</div>
+			</div>
+		</form>
+	{:else}
+		<div class="text-center">
+			<button class=" bg-orange-600 mt-8" on:click={() => installRepositories(source)}
+				>Install Repositories</button
+			>
 		</div>
-	</form>
-{:else}
-	<button on:click={() => installRepositories(source)}>Install Repositories</button>
-{/if}
+	{/if}
+</div>
diff --git a/src/routes/sources/[id]/_Gitlab.svelte b/src/routes/sources/[id]/_Gitlab.svelte
index 7823aebe9..bf3b48733 100644
--- a/src/routes/sources/[id]/_Gitlab.svelte
+++ b/src/routes/sources/[id]/_Gitlab.svelte
@@ -1,35 +1,73 @@
 <script lang="ts">
 	export let source;
+	export let settings;
 	import Explainer from '$lib/components/Explainer.svelte';
-	import { enhance, errorNotification } from '$lib/form';
+	import { errorNotification } from '$lib/form';
 	import { page, session } from '$app/stores';
 	import { onMount } from 'svelte';
 	import { post } from '$lib/api';
 	import { browser } from '$app/env';
+	import CopyPasswordField from '$lib/components/CopyPasswordField.svelte';
+	import { toast } from '@zerodevx/svelte-toast';
+
 	const { id } = $page.params;
+	let url = browser ? (settings.fqdn ? settings.fqdn : window.location.origin) : '';
 
 	let loading = false;
+
 	let oauthIdEl;
-	let payload = {
-		oauthId: undefined,
-		groupName: undefined,
-		appId: undefined,
-		appSecret: undefined,
-		applicationType: 'user'
-	};
+	let applicationType;
+	if (!source.gitlabAppId) {
+		source.gitlabApp = {
+			oauthId: null,
+			groupName: null,
+			appId: null,
+			appSecret: null
+		};
+	}
 	onMount(() => {
 		oauthIdEl && oauthIdEl.focus();
 	});
-	async function handleSubmitSave() {
+
+	async function handleSubmit() {
+		if (loading) return;
 		loading = true;
-		try {
-			return await post(`/sources/${id}.json`, { name: source.name });
-		} catch ({ error }) {
-			return errorNotification(error);
-		} finally {
-			loading = false;
+		if (!source.gitlabAppId) {
+			// New GitLab App
+			try {
+				await post(`/sources/${id}/gitlab.json`, {
+					type: 'gitlab',
+					name: source.name,
+					htmlUrl: source.htmlUrl,
+					apiUrl: source.apiUrl,
+					oauthId: source.gitlabApp.oauthId,
+					appId: source.gitlabApp.appId,
+					appSecret: source.gitlabApp.appSecret,
+					groupName: source.gitlabApp.groupName
+				});
+				return window.location.reload();
+			} catch ({ error }) {
+				return errorNotification(error);
+			} finally {
+				loading = false;
+			}
+		} else {
+			// Update GitLab App
+			try {
+				await post(`/sources/${id}.json`, {
+					name: source.name,
+					htmlUrl: source.htmlUrl,
+					apiUrl: source.apiUrl
+				});
+			} catch ({ error }) {
+				return errorNotification(error);
+			} finally {
+				toast.push('Settings saved.');
+				loading = false;
+			}
 		}
 	}
+
 	async function changeSettings() {
 		const {
 			htmlUrl,
@@ -53,23 +91,27 @@
 		}, 100);
 	}
 	async function checkOauthId() {
-		if (payload.oauthId) {
+		if (source.gitlabApp?.oauthId) {
 			try {
-				await post(`/sources/${id}/check.json`, { oauthId: payload.oauthId });
+				await post(`/sources/${id}/check.json`, {
+					oauthId: source.gitlabApp?.oauthId
+				});
 			} catch ({ error }) {
-				payload.oauthId = null;
+				source.gitlabApp.oauthId = null;
 				oauthIdEl.focus();
 				return errorNotification(error);
 			}
 		}
 	}
 	function newApp() {
-		switch (payload.applicationType) {
+		switch (applicationType) {
 			case 'user':
 				window.open(`${source.htmlUrl}/-/profile/applications`);
 				break;
 			case 'group':
-				window.open(`${source.htmlUrl}/groups/${payload.groupName}/-/settings/applications`);
+				window.open(
+					`${source.htmlUrl}/groups/${source.gitlabApp.groupName}/-/settings/applications`
+				);
 				break;
 			case 'instance':
 				break;
@@ -77,130 +119,136 @@
 				break;
 		}
 	}
-	async function handleSubmit() {
-		loading = true;
-		try {
-			await post(`/sources/${id}/gitlab.json`, { ...payload });
-			return window.location.reload();
-		} catch ({ error }) {
-			return errorNotification(error);
-		} finally {
-			loading = false;
-		}
-	}
 </script>
 
-{#if !source.gitlabApp?.appId}
-	<div>
-		<form class="grid grid-flow-row gap-2 py-4" on:submit|preventDefault={newApp}>
-			<div class="grid grid-cols-2 items-center">
-				<label for="type">GitLab Application Type</label>
-				<select name="type" id="type" class="w-96" bind:value={payload.applicationType}>
-					<option value="user">User owned application</option>
-					<option value="group">Group owned application</option>
-					{#if source.htmlUrl !== 'https://gitlab.com'}
-						<option value="instance">Instance-wide application (self-hosted)</option>
-					{/if}
-				</select>
-			</div>
-			{#if payload.applicationType === 'group'}
-				<div class="grid grid-cols-2 items-center">
-					<label for="groupName">Group Name</label>
-					<input name="groupName" id="groupName" required bind:value={payload.groupName} />
-				</div>
-			{/if}
-
-			<div class="w-full pt-10 text-center">
-				<button class="w-96 bg-orange-600 hover:bg-orange-500" type="submit"
-					>Register new OAuth application on GitLab</button
-				>
-			</div>
-
-			<Explainer
-				customClass="w-full"
-				text="<span class='font-bold text-base text-white'>Scopes required:</span> 	
-	<br>- <span class='text-orange-500 font-bold'>api</span> (Access the authenticated user's API)
-	<br>- <span class='text-orange-500 font-bold'>read_repository</span> (Allows read-only access to the repository)
-	<br>- <span class='text-orange-500 font-bold'>email</span> (Allows read-only access to the user's primary email address using OpenID Connect)
-	<br>
-	<br>For extra security, you can set Expire access tokens!
-	<br><br>Webhook URL: <span class='text-orange-500 font-bold'>{browser
-					? window.location.origin
-					: ''}/webhooks/gitlab</span>
-	<br>But if you will set a custom domain name for Coolify, use that instead."
-			/>
-		</form>
-		<form on:submit|preventDefault={handleSubmit} class="grid grid-flow-row gap-2 py-4 pt-10">
-			<div class="flex h-8 items-center space-x-2">
-				<div class="text-xl font-bold text-white">Configuration</div>
+<div class="mx-auto max-w-4xl">
+	<form on:submit|preventDefault={handleSubmit} class="py-4">
+		<div class="flex space-x-1 pb-5 font-bold">
+			<div class="title">General</div>
+			{#if $session.isAdmin}
 				<button
 					type="submit"
 					class:bg-orange-600={!loading}
 					class:hover:bg-orange-500={!loading}
 					disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
 				>
-			</div>
+				{#if source.gitlabAppId}
+					<button on:click|preventDefault={changeSettings}>Change GitLab App Settings</button>
+				{/if}
+			{/if}
+		</div>
+		<div class="grid grid-flow-row gap-2 px-10">
+			{#if !source.gitlabAppId}
+				<div class="grid grid-cols-2 items-center">
+					<label for="type" class="text-base font-bold text-stone-100"
+						>GitLab Application Type</label
+					>
+					<select name="type" id="type" class="w-96" bind:value={applicationType}>
+						<option value="user">User owned application</option>
+						<option value="group">Group owned application</option>
+						{#if source.htmlUrl !== 'https://gitlab.com'}
+							<option value="instance">Instance-wide application (self-hosted)</option>
+						{/if}
+					</select>
+				</div>
 
-			<div class="grid grid-cols-2 items-start">
-				<div class="flex-col">
-					<label for="oauthId" class="pt-2">OAuth ID</label>
-					<Explainer
-						text="The OAuth ID is the unique identifier of the GitLab application. <br>You can find it <span class='font-bold text-orange-600' >in the URL</span> of your GitLab OAuth Application."
+				{#if applicationType === 'group'}
+					<div class="grid grid-cols-2 items-center">
+						<label for="groupName" class="text-base font-bold text-stone-100">Group Name</label>
+						<input
+							name="groupName"
+							id="groupName"
+							required
+							bind:value={source.gitlabApp.groupName}
+						/>
+					</div>
+				{/if}
+			{/if}
+
+			<div class="grid grid-flow-row gap-2">
+				<div class="mt-2 grid grid-cols-2 items-center">
+					<label for="name" class="text-base font-bold text-stone-100">Name</label>
+					<input name="name" id="name" required bind:value={source.name} />
+				</div>
+			</div>
+			{#if source.gitlabApp.groupName}
+				<div class="grid grid-cols-2 items-center">
+					<label for="groupName" class="text-base font-bold text-stone-100">Group Name</label>
+					<input
+						name="groupName"
+						id="groupName"
+						disabled={source.gitlabAppId}
+						readonly={source.gitlabAppId}
+						required
+						bind:value={source.gitlabApp.groupName}
 					/>
 				</div>
+			{/if}
+			<div class="grid grid-cols-2 items-center">
+				<label for="htmlUrl" class="text-base font-bold text-stone-100">HTML URL</label>
+				<input name="htmlUrl" id="htmlUrl" required bind:value={source.htmlUrl} />
+			</div>
+			<div class="grid grid-cols-2 items-center">
+				<label for="apiUrl" class="text-base font-bold text-stone-100">API URL</label>
+				<input name="apiUrl" id="apiUrl" required bind:value={source.apiUrl} />
+			</div>
+			<div class="grid grid-cols-2 items-start">
+				<div class="flex-col">
+					<label for="oauthId" class="pt-2 text-base font-bold text-stone-100">OAuth ID</label>
+					{#if !source.gitlabAppId}
+						<Explainer
+							text="The OAuth ID is the unique identifier of the GitLab application. <br>You can find it <span class='font-bold text-orange-600' >in the URL</span> of your GitLab OAuth Application."
+						/>
+					{/if}
+				</div>
 				<input
+					disabled={source.gitlabAppId}
+					readonly={source.gitlabAppId}
 					on:change={checkOauthId}
 					bind:this={oauthIdEl}
 					name="oauthId"
 					id="oauthId"
 					type="number"
 					required
-					bind:value={payload.oauthId}
+					bind:value={source.gitlabApp.oauthId}
 				/>
 			</div>
-			{#if payload.applicationType === 'group'}
-				<div class="grid grid-cols-2 items-center">
-					<label for="groupName">Group Name</label>
-					<input name="groupName" id="groupName" required bind:value={payload.groupName} />
-				</div>
-			{/if}
+
 			<div class="grid grid-cols-2 items-center">
-				<label for="appId">Application ID</label>
-				<input name="appId" id="appId" required bind:value={payload.appId} />
+				<label for="appId" class="text-base font-bold text-stone-100">Application ID</label>
+				<input
+					name="appId"
+					id="appId"
+					disabled={source.gitlabAppId}
+					readonly={source.gitlabAppId}
+					required
+					bind:value={source.gitlabApp.appId}
+				/>
 			</div>
 			<div class="grid grid-cols-2 items-center">
-				<label for="appSecret">Secret</label>
-				<input
+				<label for="appSecret" class="text-base font-bold text-stone-100">Secret</label>
+				<CopyPasswordField
+					disabled={source.gitlabAppId}
+					readonly={source.gitlabAppId}
+					isPasswordField={true}
 					name="appSecret"
 					id="appSecret"
-					type="password"
 					required
-					bind:value={payload.appSecret}
+					bind:value={source.gitlabApp.appSecret}
 				/>
 			</div>
-		</form>
-	</div>
-{:else}
-	<div class="mx-auto max-w-4xl px-6">
-		<form on:submit|preventDefault={handleSubmitSave} class="py-4">
-			<div class="flex space-x-1 pb-5 font-bold">
-				<div class="title">General</div>
-				{#if $session.isAdmin}
-					<button
-						type="submit"
-						class:bg-orange-600={!loading}
-						class:hover:bg-orange-500={!loading}
-						disabled={loading}>{loading ? 'Saving...' : 'Save'}</button
-					>
-					<button on:click|preventDefault={changeSettings}>Change GitLab App Settings</button>
-				{/if}
-			</div>
-			<div class="grid grid-flow-row gap-2 px-10">
-				<div class="mt-2 grid grid-cols-2 items-center">
-					<label for="name" class="text-base font-bold text-stone-100">Name</label>
-					<input name="name" id="name" required bind:value={source.name} />
-				</div>
-			</div>
-		</form>
-	</div>
-{/if}
+		</div>
+	</form>
+	{#if !source.gitlabAppId}
+		<Explainer
+			customClass="w-full"
+			text="<span class='font-bold text-base text-white'>Scopes required:</span> 	
+<br>- <span class='text-orange-500 font-bold'>api</span> (Access the authenticated user's API)
+<br>- <span class='text-orange-500 font-bold'>read_repository</span> (Allows read-only access to the repository)
+<br>- <span class='text-orange-500 font-bold'>email</span> (Allows read-only access to the user's primary email address using OpenID Connect)
+<br>
+<br>For extra security, you can set <span class='text-orange-500 font-bold'>Expire Access Tokens</span>
+<br><br>Webhook URL: <span class='text-orange-500 font-bold'>{url}/webhooks/gitlab</span>"
+		/>
+	{/if}
+</div>
diff --git a/src/routes/sources/[id]/github.json.ts b/src/routes/sources/[id]/github.json.ts
new file mode 100644
index 000000000..e0f1d3b61
--- /dev/null
+++ b/src/routes/sources/[id]/github.json.ts
@@ -0,0 +1,18 @@
+import { getUserDetails } from '$lib/common';
+import * as db from '$lib/database';
+import { ErrorHandler } from '$lib/database';
+import type { RequestHandler } from '@sveltejs/kit';
+
+export const post: RequestHandler = async (event) => {
+	const { teamId, status, body } = await getUserDetails(event);
+	if (status === 401) return { status, body };
+	const { id } = event.params;
+
+	try {
+		let { type, name, htmlUrl, apiUrl } = await event.request.json();
+		await db.addGitHubSource({ id, teamId, type, name, htmlUrl, apiUrl });
+		return { status: 201 };
+	} catch (error) {
+		return ErrorHandler(error);
+	}
+};
diff --git a/src/routes/sources/[id]/gitlab.json.ts b/src/routes/sources/[id]/gitlab.json.ts
index 8420669e6..b1ed314bf 100644
--- a/src/routes/sources/[id]/gitlab.json.ts
+++ b/src/routes/sources/[id]/gitlab.json.ts
@@ -9,11 +9,23 @@ export const post: RequestHandler = async (event) => {
 	const { id } = event.params;
 
 	try {
-		let { oauthId, groupName, appId, appSecret } = await event.request.json();
+		let { type, name, htmlUrl, apiUrl, oauthId, appId, appSecret, groupName } =
+			await event.request.json();
 
 		oauthId = Number(oauthId);
 
-		await db.addSource({ id, teamId, oauthId, groupName, appId, appSecret });
+		await db.addGitLabSource({
+			id,
+			teamId,
+			type,
+			name,
+			htmlUrl,
+			apiUrl,
+			oauthId,
+			appId,
+			appSecret,
+			groupName
+		});
 		return { status: 201 };
 	} catch (error) {
 		return ErrorHandler(error);
diff --git a/src/routes/sources/[id]/index.json.ts b/src/routes/sources/[id]/index.json.ts
index 58fb7008b..cd19e6785 100644
--- a/src/routes/sources/[id]/index.json.ts
+++ b/src/routes/sources/[id]/index.json.ts
@@ -43,10 +43,10 @@ export const post: RequestHandler = async (event) => {
 
 	const { id } = event.params;
 
-	const { name } = await event.request.json();
+	const { name, htmlUrl, apiUrl } = await event.request.json();
 
 	try {
-		await db.updateGitsource({ id, name });
+		await db.updateGitsource({ id, name, htmlUrl, apiUrl });
 		return { status: 201 };
 	} catch (error) {
 		return ErrorHandler(error);
diff --git a/src/routes/sources/[id]/index.svelte b/src/routes/sources/[id]/index.svelte
index 83f171412..015c98a1f 100644
--- a/src/routes/sources/[id]/index.svelte
+++ b/src/routes/sources/[id]/index.svelte
@@ -29,9 +29,41 @@
 
 <script lang="ts">
 	export let source: Prisma.GitSource;
+	export let settings;
 	import type Prisma from '@prisma/client';
 	import Github from './_Github.svelte';
 	import Gitlab from './_Gitlab.svelte';
+
+	function setPredefined(type) {
+		switch (type) {
+			case 'github':
+				source.name = 'Github.com';
+				source.type = 'github';
+				source.htmlUrl = 'https://github.com';
+				source.apiUrl = 'https://api.github.com';
+				source.organization = undefined;
+
+				break;
+			case 'gitlab':
+				source.name = 'Gitlab.com';
+				source.type = 'gitlab';
+				source.htmlUrl = 'https://gitlab.com';
+				source.apiUrl = 'https://gitlab.com/api';
+				source.organization = undefined;
+
+				break;
+			case 'bitbucket':
+				source.name = 'Bitbucket.com';
+				source.type = 'bitbucket';
+				source.htmlUrl = 'https://bitbucket.com';
+				source.apiUrl = 'https://api.bitbucket.org';
+				source.organization = undefined;
+
+				break;
+			default:
+				break;
+		}
+	}
 </script>
 
 <div class="flex space-x-1 p-6 px-6 text-2xl font-bold">
@@ -40,10 +72,21 @@
 	<span class="pr-2">{source.name}</span>
 </div>
 
-<div class="flex justify-center px-6 pb-8">
-	{#if source.type === 'github'}
-		<Github bind:source />
-	{:else if source.type === 'gitlab'}
-		<Gitlab bind:source />
+<div class="flex flex-col justify-center">
+	{#if !source.gitlabAppId && !source.githubAppId}
+		<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="flex justify-center space-x-2">
+				<button class="w-32" on:click={() => setPredefined('github')}>GitHub.com</button>
+				<button class="w-32" on:click={() => setPredefined('gitlab')}>GitLab.com</button>
+			</div>
+		</div>
 	{/if}
+	<div>
+		{#if source.type === 'github'}
+			<Github bind:source />
+		{:else if source.type === 'gitlab'}
+			<Gitlab bind:source {settings} />
+		{/if}
+	</div>
 </div>
diff --git a/src/routes/sources/[id]/newGithubApp.svelte b/src/routes/sources/[id]/newGithubApp.svelte
index c8cb4f6f3..b6a74c3ba 100644
--- a/src/routes/sources/[id]/newGithubApp.svelte
+++ b/src/routes/sources/[id]/newGithubApp.svelte
@@ -36,6 +36,7 @@
 	export let settings;
 	onMount(() => {
 		const { organization, id, htmlUrl } = source;
+		console.log(source);
 		const { fqdn } = settings;
 		const host = dev
 			? 'http://localhost:3000'
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index c763e0b58..e07c21973 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -22,6 +22,9 @@
 <script lang="ts">
 	export let sources;
 	import { session } from '$app/stores';
+	import { post } from '$lib/api';
+	import { goto } from '$app/navigation';
+	import { getDomain } from '$lib/components/common';
 	const ownSources = sources.filter((source) => {
 		if (source.teams[0].id === $session.teamId) {
 			return source;
@@ -32,12 +35,16 @@
 			return source;
 		}
 	});
+	async function newSource() {
+		const { id } = await post('/sources/new', {});
+		return await goto(`/sources/${id}`, { replaceState: true });
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Git Sources</div>
 	{#if $session.isAdmin}
-		<a href="/new/source" sveltekit:prefetch class="add-icon bg-orange-600 hover:bg-orange-500">
+		<button on:click={newSource} class="add-icon bg-orange-600 hover:bg-orange-500">
 			<svg
 				class="w-6"
 				xmlns="http://www.w3.org/2000/svg"
@@ -51,7 +58,7 @@
 					d="M12 6v6m0 0v6m0-6h6m-6 0H6"
 				/></svg
 			>
-		</a>
+		</button>
 	{/if}
 </div>
 <div class="flex justify-center">
@@ -71,7 +78,7 @@
 							class:border-l-4={source.gitlabApp && !source.gitlabAppId}
 						>
 							<div class="font-bold text-xl text-center truncate">{source.name}</div>
-							{#if $session.teamId === '0'}
+							{#if $session.teamId === '0' && otherSources.length > 0}
 								<div class="text-center truncate">{source.teams[0].name}</div>
 							{/if}
 							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
@@ -79,7 +86,7 @@
 									Configuration missing
 								</div>
 							{:else}
-								<div class="truncate text-center">{source.htmlUrl}</div>
+								<div class="truncate text-center">{getDomain(source.htmlUrl)}</div>
 							{/if}
 						</div>
 					</a>
diff --git a/src/routes/new/source/index.json.ts b/src/routes/sources/new.ts
similarity index 64%
rename from src/routes/new/source/index.json.ts
rename to src/routes/sources/new.ts
index 803b597e9..25943f8bc 100644
--- a/src/routes/new/source/index.json.ts
+++ b/src/routes/sources/new.ts
@@ -1,4 +1,4 @@
-import { getUserDetails } from '$lib/common';
+import { getUserDetails, uniqueName } from '$lib/common';
 import * as db from '$lib/database';
 import { ErrorHandler } from '$lib/database';
 import type { RequestHandler } from '@sveltejs/kit';
@@ -7,9 +7,9 @@ export const post: RequestHandler = async (event) => {
 	const { teamId, status, body } = await getUserDetails(event);
 	if (status === 401) return { status, body };
 
-	const { name, type, htmlUrl, apiUrl, organization } = await event.request.json();
+	const name = uniqueName();
 	try {
-		const { id } = await db.newSource({ name, teamId, type, htmlUrl, apiUrl, organization });
+		const { id } = await db.newSource({ teamId, name });
 		return { status: 201, body: { id } };
 	} catch (e) {
 		return ErrorHandler(e);

From a165b219500572416b7566a517a770864901d589 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 10:47:01 +0200
Subject: [PATCH 32/57] ui: fix

---
 src/routes/sources/[id]/_Github.svelte | 2 +-
 src/routes/sources/[id]/_Gitlab.svelte | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/routes/sources/[id]/_Github.svelte b/src/routes/sources/[id]/_Github.svelte
index b2866d195..af776cfea 100644
--- a/src/routes/sources/[id]/_Github.svelte
+++ b/src/routes/sources/[id]/_Github.svelte
@@ -76,7 +76,7 @@
 	}
 </script>
 
-<div class="mx-auto max-w-4xl">
+<div class="mx-auto max-w-4xl px-6">
 	{#if !source.githubAppId}
 		<form on:submit|preventDefault={newGithubApp} class="py-4">
 			<div class="flex space-x-1 pb-5 font-bold">
diff --git a/src/routes/sources/[id]/_Gitlab.svelte b/src/routes/sources/[id]/_Gitlab.svelte
index bf3b48733..89e43cfe3 100644
--- a/src/routes/sources/[id]/_Gitlab.svelte
+++ b/src/routes/sources/[id]/_Gitlab.svelte
@@ -121,7 +121,7 @@
 	}
 </script>
 
-<div class="mx-auto max-w-4xl">
+<div class="mx-auto max-w-4xl px-6">
 	<form on:submit|preventDefault={handleSubmit} class="py-4">
 		<div class="flex space-x-1 pb-5 font-bold">
 			<div class="title">General</div>

From 1657e5a151cd28f2b805cbf56798b8b6749ed615 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 10:54:40 +0200
Subject: [PATCH 33/57] fix: no line during buildLog

---
 src/lib/common.ts | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/lib/common.ts b/src/lib/common.ts
index 4eec73539..57cdabba2 100644
--- a/src/lib/common.ts
+++ b/src/lib/common.ts
@@ -52,12 +52,14 @@ export const sentry = Sentry;
 export const uniqueName = () => uniqueNamesGenerator(customConfig);
 
 export const saveBuildLog = async ({ line, buildId, applicationId }) => {
-	if (line.includes('ghs_')) {
-		const regex = /ghs_.*@/g;
-		line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
+	if (line) {
+		if (line.includes('ghs_')) {
+			const regex = /ghs_.*@/g;
+			line = line.replace(regex, '<SENSITIVE_DATA_DELETED>@');
+		}
+		const addTimestamp = `${generateTimestamp()} ${line}`;
+		return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
 	}
-	const addTimestamp = `${generateTimestamp()} ${line}`;
-	return await buildLogQueue.add(buildId, { buildId, line: addTimestamp, applicationId });
 };
 
 export const isTeamIdTokenAvailable = (request) => {

From 0b709c93a8a2fa9892b720255a87717c2741e11c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 10:57:44 +0200
Subject: [PATCH 34/57] fix: html/apiUrls cannot end with /

---
 src/routes/sources/[id]/_Github.svelte | 8 ++++----
 src/routes/sources/[id]/_Gitlab.svelte | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/routes/sources/[id]/_Github.svelte b/src/routes/sources/[id]/_Github.svelte
index af776cfea..6b8aa0c89 100644
--- a/src/routes/sources/[id]/_Github.svelte
+++ b/src/routes/sources/[id]/_Github.svelte
@@ -12,8 +12,8 @@
 		try {
 			await post(`/sources/${id}.json`, {
 				name: source.name,
-				htmlUrl: source.htmlUrl,
-				apiUrl: source.apiUrl
+				htmlUrl: source.htmlUrl.replace(/\/$/, ''),
+				apiUrl: source.apiUrl.replace(/\/$/, '')
 			});
 			toast.push('Settings saved.');
 		} catch ({ error }) {
@@ -50,8 +50,8 @@
 			await post(`/sources/${id}/github.json`, {
 				type: 'github',
 				name: source.name,
-				htmlUrl: source.htmlUrl,
-				apiUrl: source.apiUrl
+				htmlUrl: source.htmlUrl.replace(/\/$/, ''),
+				apiUrl: source.apiUrl.replace(/\/$/, '')
 			});
 		} catch ({ error }) {
 			return errorNotification(error);
diff --git a/src/routes/sources/[id]/_Gitlab.svelte b/src/routes/sources/[id]/_Gitlab.svelte
index 89e43cfe3..b528b1850 100644
--- a/src/routes/sources/[id]/_Gitlab.svelte
+++ b/src/routes/sources/[id]/_Gitlab.svelte
@@ -38,8 +38,8 @@
 				await post(`/sources/${id}/gitlab.json`, {
 					type: 'gitlab',
 					name: source.name,
-					htmlUrl: source.htmlUrl,
-					apiUrl: source.apiUrl,
+					htmlUrl: source.htmlUrl.replace(/\/$/, ''),
+					apiUrl: source.apiUrl.replace(/\/$/, ''),
 					oauthId: source.gitlabApp.oauthId,
 					appId: source.gitlabApp.appId,
 					appSecret: source.gitlabApp.appSecret,
@@ -56,8 +56,8 @@
 			try {
 				await post(`/sources/${id}.json`, {
 					name: source.name,
-					htmlUrl: source.htmlUrl,
-					apiUrl: source.apiUrl
+					htmlUrl: source.htmlUrl.replace(/\/$/, ''),
+					apiUrl: source.apiUrl.replace(/\/$/, '')
 				});
 			} catch ({ error }) {
 				return errorNotification(error);

From d9ba1a0b5c6fb42087cbd830263cdbfe770f1130 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 11:16:07 +0200
Subject: [PATCH 35/57] fix: typo

---
 src/routes/sources/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index e07c21973..f8891531d 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -94,7 +94,7 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Srouces</div>
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Sources</div>
 				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
 					{#each otherSources as source}
 						<a href="/sources/{source.id}" class="no-underline p-2 w-96">

From ce71dccbc1285cbe1956675706530de437b1da2e Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 11:19:01 +0200
Subject: [PATCH 36/57] fix: Missing buildpack

---
 src/routes/applications/index.svelte | 112 ++++++++++++++-------------
 1 file changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 0c69c47fe..5fb4979cc 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -68,60 +68,7 @@
 				{#each ownApplications as application}
 					<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
 						<div class="box-selection group relative hover:bg-green-600">
-							{#if application.buildPack.toLowerCase() === 'rust'}
-								<Rust />
-							{:else if application.buildPack.toLowerCase() === 'node'}
-								<Nodejs />
-							{:else if application.buildPack.toLowerCase() === 'react'}
-								<React />
-							{:else if application.buildPack.toLowerCase() === 'svelte'}
-								<Svelte />
-							{:else if application.buildPack.toLowerCase() === 'vuejs'}
-								<Vuejs />
-							{:else if application.buildPack.toLowerCase() === 'php'}
-								<PHP />
-							{:else if application.buildPack.toLowerCase() === 'python'}
-								<Python />
-							{:else if application.buildPack.toLowerCase() === 'static'}
-								<Static />
-							{:else if application.buildPack.toLowerCase() === 'nestjs'}
-								<Nestjs />
-							{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
-								<Nuxtjs />
-							{:else if application.buildPack.toLowerCase() === 'nextjs'}
-								<Nextjs />
-							{:else if application.buildPack.toLowerCase() === 'gatsby'}
-								<Gatsby />
-							{:else if application.buildPack.toLowerCase() === 'docker'}
-								<Docker />
-							{:else if application.buildPack.toLowerCase() === 'astro'}
-								<Astro />
-							{:else if application.buildPack.toLowerCase() === 'eleventy'}
-								<Eleventy />
-							{/if}
-
-							<div class="truncate text-center text-xl font-bold">{application.name}</div>
-							{#if $session.teamId === '0' && otherApplications.length > 0}
-								<div class="truncate text-center">Team {application.teams[0].name}</div>
-							{/if}
-							{#if application.fqdn}
-								<div class="truncate text-center">{getDomain(application.fqdn)}</div>
-							{/if}
-							{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
-								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
-									Configuration missing
-								</div>
-							{/if}
-						</div>
-					</a>
-				{/each}
-			</div>
-			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Applications</div>
-				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
-					{#each otherApplications as application}
-						<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
-							<div class="box-selection group relative hover:bg-green-600">
+							{#if application.buildPack}
 								{#if application.buildPack.toLowerCase() === 'rust'}
 									<Rust />
 								{:else if application.buildPack.toLowerCase() === 'node'}
@@ -153,6 +100,63 @@
 								{:else if application.buildPack.toLowerCase() === 'eleventy'}
 									<Eleventy />
 								{/if}
+							{/if}
+
+							<div class="truncate text-center text-xl font-bold">{application.name}</div>
+							{#if $session.teamId === '0' && otherApplications.length > 0}
+								<div class="truncate text-center">Team {application.teams[0].name}</div>
+							{/if}
+							{#if application.fqdn}
+								<div class="truncate text-center">{getDomain(application.fqdn)}</div>
+							{/if}
+							{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
+								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{/if}
+						</div>
+					</a>
+				{/each}
+			</div>
+			{#if otherApplications.length > 0 && $session.teamId === '0'}
+				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Applications</div>
+				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+					{#each otherApplications as application}
+						<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
+							<div class="box-selection group relative hover:bg-green-600">
+								{#if application.buildPack}
+									{#if application.buildPack.toLowerCase() === 'rust'}
+										<Rust />
+									{:else if application.buildPack.toLowerCase() === 'node'}
+										<Nodejs />
+									{:else if application.buildPack.toLowerCase() === 'react'}
+										<React />
+									{:else if application.buildPack.toLowerCase() === 'svelte'}
+										<Svelte />
+									{:else if application.buildPack.toLowerCase() === 'vuejs'}
+										<Vuejs />
+									{:else if application.buildPack.toLowerCase() === 'php'}
+										<PHP />
+									{:else if application.buildPack.toLowerCase() === 'python'}
+										<Python />
+									{:else if application.buildPack.toLowerCase() === 'static'}
+										<Static />
+									{:else if application.buildPack.toLowerCase() === 'nestjs'}
+										<Nestjs />
+									{:else if application.buildPack.toLowerCase() === 'nuxtjs'}
+										<Nuxtjs />
+									{:else if application.buildPack.toLowerCase() === 'nextjs'}
+										<Nextjs />
+									{:else if application.buildPack.toLowerCase() === 'gatsby'}
+										<Gatsby />
+									{:else if application.buildPack.toLowerCase() === 'docker'}
+										<Docker />
+									{:else if application.buildPack.toLowerCase() === 'astro'}
+										<Astro />
+									{:else if application.buildPack.toLowerCase() === 'eleventy'}
+										<Eleventy />
+									{/if}
+								{/if}
 
 								<div class="truncate text-center text-xl font-bold">{application.name}</div>
 								{#if $session.teamId === '0'}

From 13acf09dcc119e42594829428e3f5c8d03ef9081 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 14:03:21 +0200
Subject: [PATCH 37/57] ui: fixes

---
 src/routes/applications/[id]/configuration/source.svelte | 8 ++++++--
 src/routes/applications/index.svelte                     | 6 +++---
 src/routes/databases/index.svelte                        | 2 +-
 src/routes/destinations/index.svelte                     | 2 +-
 src/routes/services/index.svelte                         | 6 +++---
 src/routes/sources/index.svelte                          | 4 ++--
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/routes/applications/[id]/configuration/source.svelte b/src/routes/applications/[id]/configuration/source.svelte
index 953c23d69..1be6330d1 100644
--- a/src/routes/applications/[id]/configuration/source.svelte
+++ b/src/routes/applications/[id]/configuration/source.svelte
@@ -54,6 +54,10 @@
 			return errorNotification(error);
 		}
 	}
+	async function newSource() {
+		const { id } = await post('/sources/new', {});
+		return await goto(`/sources/${id}`, { replaceState: true });
+	}
 </script>
 
 <div class="flex space-x-1 p-6 font-bold">
@@ -64,7 +68,7 @@
 		<div class="flex-col">
 			<div class="pb-2 text-center">No configurable Git Source found</div>
 			<div class="flex justify-center">
-				<a href="/new/source" sveltekit:prefetch class="add-icon bg-orange-600 hover:bg-orange-500">
+				<button on:click={newSource} class="add-icon bg-orange-600 hover:bg-orange-500">
 					<svg
 						class="w-6"
 						xmlns="http://www.w3.org/2000/svg"
@@ -78,7 +82,7 @@
 							d="M12 6v6m0 0v6m0-6h6m-6 0H6"
 						/></svg
 					>
-				</a>
+				</button>
 			</div>
 		</div>
 	{:else}
diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 5fb4979cc..3221f6634 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -58,7 +58,7 @@
 	{/if}
 </div>
 <div class="flex flex-wrap justify-center">
-	{#if !applications || applications.length === 0}
+	{#if !applications || ownApplications.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No applications found</div>
 		</div>
@@ -107,7 +107,7 @@
 								<div class="truncate text-center">Team {application.teams[0].name}</div>
 							{/if}
 							{#if application.fqdn}
-								<div class="truncate text-center">{getDomain(application.fqdn)}</div>
+								<div class="truncate text-center">{getDomain(application.fqdn) || ''}</div>
 							{/if}
 							{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
 								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
@@ -163,7 +163,7 @@
 									<div class="truncate text-center">Team {application.teams[0].name}</div>
 								{/if}
 								{#if application.fqdn}
-									<div class="truncate text-center">{getDomain(application.fqdn)}</div>
+									<div class="truncate text-center">{getDomain(application.fqdn) || ''}</div>
 								{/if}
 								{#if !application.gitSourceId || !application.destinationDockerId || !application.fqdn}
 									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index c160bc009..4ace17e27 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -46,7 +46,7 @@
 </div>
 
 <div class="flex flex-wrap justify-center">
-	{#if !databases || databases.length === 0}
+	{#if !databases || ownDatabases.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No databases found</div>
 		</div>
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 84d1fc0bb..7c04f8aab 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -57,7 +57,7 @@
 	{/if}
 </div>
 <div class="flex justify-center">
-	{#if !destinations || destinations.length === 0}
+	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No destination found</div>
 		</div>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index 389ee8036..e829256c4 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -52,7 +52,7 @@
 </div>
 
 <div class="flex flex-wrap justify-center">
-	{#if !services || services.length === 0}
+	{#if !services || ownServices.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No services found</div>
 		</div>
@@ -92,7 +92,7 @@
 								<div class="text-center truncate">{service.teams[0].name}</div>
 							{/if}
 							{#if service.fqdn}
-								<div class="truncate text-center">{getDomain(service.fqdn)}</div>
+								<div class="truncate text-center">{getDomain(service.fqdn) || ''}</div>
 							{/if}
 							{#if !service.type || !service.fqdn}
 								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
@@ -139,7 +139,7 @@
 									<div class="text-center truncate">{service.teams[0].name}</div>
 								{/if}
 								{#if service.fqdn}
-									<div class="truncate text-center">{getDomain(service.fqdn)}</div>
+									<div class="truncate text-center">{getDomain(service.fqdn) || ''}</div>
 								{/if}
 								{#if !service.type || !service.fqdn}
 									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index f8891531d..ba4e6e9c5 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -62,7 +62,7 @@
 	{/if}
 </div>
 <div class="flex justify-center">
-	{#if !sources || sources.length === 0}
+	{#if !sources || ownSources.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No git sources found</div>
 		</div>
@@ -86,7 +86,7 @@
 									Configuration missing
 								</div>
 							{:else}
-								<div class="truncate text-center">{getDomain(source.htmlUrl)}</div>
+								<div class="truncate text-center">{getDomain(source.htmlUrl) || ''}</div>
 							{/if}
 						</div>
 					</a>

From 66af12f9b5be595841f19b2263744728eb9c5455 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 14:12:06 +0200
Subject: [PATCH 38/57] ui: fixes

---
 src/routes/applications/index.svelte |  9 +++++----
 src/routes/databases/index.svelte    | 29 ++++++++++++++--------------
 src/routes/destinations/index.svelte | 25 ++++++++++++------------
 src/routes/services/index.svelte     | 29 ++++++++++++++--------------
 src/routes/sources/index.svelte      | 29 ++++++++++++++--------------
 5 files changed, 63 insertions(+), 58 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 3221f6634..99bb67175 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -62,9 +62,10 @@
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No applications found</div>
 		</div>
-	{:else}
+	{/if}
+	{#if ownApplications.length > 0 || otherApplications.length > 0}
 		<div class="flex flex-col">
-			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 				{#each ownApplications as application}
 					<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
 						<div class="box-selection group relative hover:bg-green-600">
@@ -119,8 +120,8 @@
 				{/each}
 			</div>
 			{#if otherApplications.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Applications</div>
-				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Applications</div>
+				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherApplications as application}
 						<a href="/applications/{application.id}" class="w-96 p-2 no-underline">
 							<div class="box-selection group relative hover:bg-green-600">
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 4ace17e27..29ef54965 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -50,12 +50,13 @@
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No databases found</div>
 		</div>
-	{:else}
+	{/if}
+	{#if ownDatabases.length > 0 || otherDatabases.length > 0}
 		<div class="flex flex-col">
-			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 				{#each ownDatabases as database}
-					<a href="/databases/{database.id}" class="no-underline p-2 w-96">
-						<div class="box-selection relative hover:bg-purple-600 group">
+					<a href="/databases/{database.id}" class="w-96 p-2 no-underline">
+						<div class="box-selection group relative hover:bg-purple-600">
 							{#if database.type === 'clickhouse'}
 								<Clickhouse isAbsolute />
 							{:else if database.type === 'couchdb'}
@@ -69,14 +70,14 @@
 							{:else if database.type === 'redis'}
 								<Redis isAbsolute />
 							{/if}
-							<div class="font-bold text-xl text-center truncate">
+							<div class="truncate text-center text-xl font-bold">
 								{database.name}
 							</div>
 							{#if $session.teamId === '0' && otherDatabases.length > 0}
-								<div class="text-center truncate">{database.teams[0].name}</div>
+								<div class="truncate text-center">{database.teams[0].name}</div>
 							{/if}
 							{#if !database.type}
-								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 									Configuration missing
 								</div>
 							{/if}
@@ -85,11 +86,11 @@
 				{/each}
 			</div>
 			{#if otherDatabases.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Databases</div>
-				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Databases</div>
+				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherDatabases as database}
-						<a href="/databases/{database.id}" class="no-underline p-2 w-96">
-							<div class="box-selection relative hover:bg-purple-600 group">
+						<a href="/databases/{database.id}" class="w-96 p-2 no-underline">
+							<div class="box-selection group relative hover:bg-purple-600">
 								{#if database.type === 'clickhouse'}
 									<Clickhouse isAbsolute />
 								{:else if database.type === 'couchdb'}
@@ -103,14 +104,14 @@
 								{:else if database.type === 'redis'}
 									<Redis isAbsolute />
 								{/if}
-								<div class="font-bold text-xl text-center truncate">
+								<div class="truncate text-center text-xl font-bold">
 									{database.name}
 								</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">{database.teams[0].name}</div>
+									<div class="truncate text-center">{database.teams[0].name}</div>
 								{/if}
 								{#if !database.type}
-									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 										Configuration missing
 									</div>
 								{:else}
diff --git a/src/routes/destinations/index.svelte b/src/routes/destinations/index.svelte
index 7c04f8aab..6921e4db4 100644
--- a/src/routes/destinations/index.svelte
+++ b/src/routes/destinations/index.svelte
@@ -61,33 +61,34 @@
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No destination found</div>
 		</div>
-	{:else}
+	{/if}
+	{#if ownDestinations.length > 0 || otherDestinations.length > 0}
 		<div class="flex flex-col">
-			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 				{#each ownDestinations as destination}
-					<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
+					<a href="/destinations/{destination.id}" class="w-96 p-2 no-underline">
 						<div class="box-selection hover:bg-sky-600">
-							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
+							<div class="truncate text-center text-xl font-bold">{destination.name}</div>
 							{#if $session.teamId === '0' && otherDestinations.length > 0}
-								<div class="text-center truncate">{destination.teams[0].name}</div>
+								<div class="truncate text-center">{destination.teams[0].name}</div>
 							{/if}
-							<div class="text-center truncate">{destination.network}</div>
+							<div class="truncate text-center">{destination.network}</div>
 						</div>
 					</a>
 				{/each}
 			</div>
 
 			{#if otherDestinations.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Destinations</div>
-				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Destinations</div>
+				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherDestinations as destination}
-						<a href="/destinations/{destination.id}" class="no-underline p-2 w-96">
+						<a href="/destinations/{destination.id}" class="w-96 p-2 no-underline">
 							<div class="box-selection hover:bg-sky-600">
-								<div class="font-bold text-xl text-center truncate">{destination.name}</div>
+								<div class="truncate text-center text-xl font-bold">{destination.name}</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">{destination.teams[0].name}</div>
+									<div class="truncate text-center">{destination.teams[0].name}</div>
 								{/if}
-								<div class="text-center truncate">{destination.network}</div>
+								<div class="truncate text-center">{destination.network}</div>
 							</div>
 						</a>
 					{/each}
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index e829256c4..f8022f14f 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -56,12 +56,13 @@
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No services found</div>
 		</div>
-	{:else}
+	{/if}
+	{#if ownServices.length > 0 || otherServices.length > 0}
 		<div class="flex flex-col">
-			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 				{#each ownServices as service}
-					<a href="/services/{service.id}" class="no-underline p-2 w-96">
-						<div class="box-selection relative hover:bg-pink-600 group">
+					<a href="/services/{service.id}" class="w-96 p-2 no-underline">
+						<div class="box-selection group relative hover:bg-pink-600">
 							{#if service.type === 'plausibleanalytics'}
 								<PlausibleAnalytics isAbsolute />
 							{:else if service.type === 'nocodb'}
@@ -85,17 +86,17 @@
 							{:else if service.type === 'meilisearch'}
 								<MeiliSearch isAbsolute />
 							{/if}
-							<div class="font-bold text-xl text-center truncate">
+							<div class="truncate text-center text-xl font-bold">
 								{service.name}
 							</div>
 							{#if $session.teamId === '0' && otherServices.length > 0}
-								<div class="text-center truncate">{service.teams[0].name}</div>
+								<div class="truncate text-center">{service.teams[0].name}</div>
 							{/if}
 							{#if service.fqdn}
 								<div class="truncate text-center">{getDomain(service.fqdn) || ''}</div>
 							{/if}
 							{#if !service.type || !service.fqdn}
-								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 									Configuration missing
 								</div>
 							{/if}
@@ -104,11 +105,11 @@
 				{/each}
 			</div>
 			{#if otherServices.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Services</div>
-				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Services</div>
+				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherServices as service}
-						<a href="/services/{service.id}" class="no-underline p-2 w-96">
-							<div class="box-selection relative hover:bg-pink-600 group">
+						<a href="/services/{service.id}" class="w-96 p-2 no-underline">
+							<div class="box-selection group relative hover:bg-pink-600">
 								{#if service.type === 'plausibleanalytics'}
 									<PlausibleAnalytics isAbsolute />
 								{:else if service.type === 'nocodb'}
@@ -132,17 +133,17 @@
 								{:else if service.type === 'meilisearch'}
 									<MeiliSearch isAbsolute />
 								{/if}
-								<div class="font-bold text-xl text-center truncate">
+								<div class="truncate text-center text-xl font-bold">
 									{service.name}
 								</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">{service.teams[0].name}</div>
+									<div class="truncate text-center">{service.teams[0].name}</div>
 								{/if}
 								{#if service.fqdn}
 									<div class="truncate text-center">{getDomain(service.fqdn) || ''}</div>
 								{/if}
 								{#if !service.type || !service.fqdn}
-									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 										Configuration missing
 									</div>
 								{:else}
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index ba4e6e9c5..9bde85feb 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -66,23 +66,24 @@
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No git sources found</div>
 		</div>
-	{:else}
+	{/if}
+	{#if ownSources.length > 0 || otherSources.length > 0}
 		<div class="flex flex-col">
-			<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+			<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 				{#each ownSources as source}
-					<a href="/sources/{source.id}" class="no-underline p-2 w-96">
+					<a href="/sources/{source.id}" class="w-96 p-2 no-underline">
 						<div
-							class="box-selection hover:bg-orange-600 group"
+							class="box-selection group hover:bg-orange-600"
 							class:border-red-500={source.gitlabApp && !source.gitlabAppId}
 							class:border-0={source.gitlabApp && !source.gitlabAppId}
 							class:border-l-4={source.gitlabApp && !source.gitlabAppId}
 						>
-							<div class="font-bold text-xl text-center truncate">{source.name}</div>
+							<div class="truncate text-center text-xl font-bold">{source.name}</div>
 							{#if $session.teamId === '0' && otherSources.length > 0}
-								<div class="text-center truncate">{source.teams[0].name}</div>
+								<div class="truncate text-center">{source.teams[0].name}</div>
 							{/if}
 							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
-								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 									Configuration missing
 								</div>
 							{:else}
@@ -94,22 +95,22 @@
 			</div>
 
 			{#if otherSources.length > 0 && $session.teamId === '0'}
-				<div class="text-xl font-bold pb-5 pt-10 px-6">Other Sources</div>
-				<div class="flex flex-col md:flex-row flex-wrap px-2 justify-center">
+				<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Sources</div>
+				<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
 					{#each otherSources as source}
-						<a href="/sources/{source.id}" class="no-underline p-2 w-96">
+						<a href="/sources/{source.id}" class="w-96 p-2 no-underline">
 							<div
-								class="box-selection hover:bg-orange-600 group"
+								class="box-selection group hover:bg-orange-600"
 								class:border-red-500={source.gitlabApp && !source.gitlabAppId}
 								class:border-0={source.gitlabApp && !source.gitlabAppId}
 								class:border-l-4={source.gitlabApp && !source.gitlabAppId}
 							>
-								<div class="font-bold text-xl text-center truncate">{source.name}</div>
+								<div class="truncate text-center text-xl font-bold">{source.name}</div>
 								{#if $session.teamId === '0'}
-									<div class="text-center truncate">{source.teams[0].name}</div>
+									<div class="truncate text-center">{source.teams[0].name}</div>
 								{/if}
 								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
-									<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 										Configuration missing
 									</div>
 								{:else}

From 3449e0f8fc02ced1ce13f8b911f04d4a92bc2b1d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 14:16:14 +0200
Subject: [PATCH 39/57] ui: fix

---
 src/routes/sources/index.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 9bde85feb..fe4063f3f 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -61,7 +61,7 @@
 		</button>
 	{/if}
 </div>
-<div class="flex justify-center">
+<div class="flex flex-wrap justify-center">
 	{#if !sources || ownSources.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No git sources found</div>

From e3f78a1cf9d052ff37d870b30d4b5149d255a8c9 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 15:02:48 +0200
Subject: [PATCH 40/57] ui: fixes

---
 src/routes/applications/index.svelte | 2 +-
 src/routes/databases/index.svelte    | 2 +-
 src/routes/services/index.svelte     | 2 +-
 src/routes/sources/index.svelte      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/routes/applications/index.svelte b/src/routes/applications/index.svelte
index 99bb67175..3cfcbf141 100644
--- a/src/routes/applications/index.svelte
+++ b/src/routes/applications/index.svelte
@@ -57,7 +57,7 @@
 		</div>
 	{/if}
 </div>
-<div class="flex flex-wrap justify-center">
+<div class="flex flex-col flex-wrap justify-center">
 	{#if !applications || ownApplications.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No applications found</div>
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index 29ef54965..a47dbc66f 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -45,7 +45,7 @@
 	</div>
 </div>
 
-<div class="flex flex-wrap justify-center">
+<div class="flex flex-col flex-wrap justify-center">
 	{#if !databases || ownDatabases.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No databases found</div>
diff --git a/src/routes/services/index.svelte b/src/routes/services/index.svelte
index f8022f14f..998779a1f 100644
--- a/src/routes/services/index.svelte
+++ b/src/routes/services/index.svelte
@@ -51,7 +51,7 @@
 	</div>
 </div>
 
-<div class="flex flex-wrap justify-center">
+<div class="flex flex-col flex-wrap justify-center">
 	{#if !services || ownServices.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No services found</div>
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index fe4063f3f..1e2d4d510 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -61,7 +61,7 @@
 		</button>
 	{/if}
 </div>
-<div class="flex flex-wrap justify-center">
+<div class="flex flex-col flex-wrap justify-center">
 	{#if !sources || ownSources.length === 0}
 		<div class="flex-col">
 			<div class="text-center text-xl font-bold">No git sources found</div>

From e8516bc83193a4b4fd439aa32e76cacc4c06c824 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Apr 2022 15:12:10 +0200
Subject: [PATCH 41/57] ui: fixes

---
 .../[id]/configuration/destination.svelte     | 35 ++++++++++++--
 .../[id]/configuration/source.svelte          | 46 +++++++++++++++++--
 2 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/src/routes/applications/[id]/configuration/destination.svelte b/src/routes/applications/[id]/configuration/destination.svelte
index 2c796b5ed..1b0c6df5c 100644
--- a/src/routes/applications/[id]/configuration/destination.svelte
+++ b/src/routes/applications/[id]/configuration/destination.svelte
@@ -29,7 +29,7 @@
 <script lang="ts">
 	import type Prisma from '@prisma/client';
 
-	import { page } from '$app/stores';
+	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
@@ -39,6 +39,16 @@
 
 	export let destinations: Prisma.DestinationDocker[];
 
+	const ownDestinations = destinations.filter((destination) => {
+		if (destination.teams[0].id === $session.teamId) {
+			return destination;
+		}
+	});
+	const otherDestinations = destinations.filter((destination) => {
+		if (destination.teams[0].id !== $session.teamId) {
+			return destination;
+		}
+	});
 	async function handleSubmit(destinationId) {
 		try {
 			await post(`/applications/${id}/configuration/destination.json`, { destinationId });
@@ -52,8 +62,8 @@
 <div class="flex space-x-1 p-6 font-bold">
 	<div class="mr-4 text-2xl tracking-tight">Configure Destination</div>
 </div>
-<div class="flex justify-center">
-	{#if !destinations || destinations.length === 0}
+<div class="flex flex-col justify-center">
+	{#if !destinations || ownDestinations.length === 0}
 		<div class="flex-col">
 			<div class="pb-2">No configurable Destination found</div>
 			<div class="flex justify-center">
@@ -75,8 +85,23 @@
 			</div>
 		</div>
 	{:else}
-		<div class="flex flex-wrap justify-center">
-			{#each destinations as destination}
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+			{#each ownDestinations as destination}
+				<div class="p-2">
+					<form on:submit|preventDefault={() => handleSubmit(destination.id)}>
+						<button type="submit" class="box-selection hover:bg-sky-700 font-bold">
+							<div class="font-bold text-xl text-center truncate">{destination.name}</div>
+							<div class="text-center truncate">{destination.network}</div>
+						</button>
+					</form>
+				</div>
+			{/each}
+		</div>
+		{#if otherDestinations.length > 0 && $session.teamId === '0'}
+			<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Destinations</div>
+		{/if}
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+			{#each otherDestinations as destination}
 				<div class="p-2">
 					<form on:submit|preventDefault={() => handleSubmit(destination.id)}>
 						<button type="submit" class="box-selection hover:bg-sky-700 font-bold">
diff --git a/src/routes/applications/[id]/configuration/source.svelte b/src/routes/applications/[id]/configuration/source.svelte
index 1be6330d1..e5c05ebdd 100644
--- a/src/routes/applications/[id]/configuration/source.svelte
+++ b/src/routes/applications/[id]/configuration/source.svelte
@@ -29,7 +29,7 @@
 <script lang="ts">
 	import type Prisma from '@prisma/client';
 
-	import { page } from '$app/stores';
+	import { page, session } from '$app/stores';
 	import { errorNotification } from '$lib/form';
 	import { goto } from '$app/navigation';
 	import { post } from '$lib/api';
@@ -46,6 +46,17 @@
 			(source.type === 'github' && source.githubAppId && source.githubApp.installationId) ||
 			(source.type === 'gitlab' && source.gitlabAppId)
 	);
+	const ownSources = filteredSources.filter((source) => {
+		if (source.teams[0].id === $session.teamId) {
+			return source;
+		}
+	});
+	const otherSources = filteredSources.filter((source) => {
+		if (source.teams[0].id !== $session.teamId) {
+			return source;
+		}
+	});
+
 	async function handleSubmit(gitSourceId) {
 		try {
 			await post(`/applications/${id}/configuration/source.json`, { gitSourceId });
@@ -64,7 +75,7 @@
 	<div class="mr-4 text-2xl tracking-tight">Select a Git Source</div>
 </div>
 <div class="flex flex-col justify-center">
-	{#if !filteredSources || filteredSources.length === 0}
+	{#if !filteredSources || ownSources.length === 0}
 		<div class="flex-col">
 			<div class="pb-2 text-center">No configurable Git Source found</div>
 			<div class="flex justify-center">
@@ -86,8 +97,35 @@
 			</div>
 		</div>
 	{:else}
-		<div class="flex flex-wrap justify-center">
-			{#each filteredSources as source}
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+			{#each ownSources as source}
+				<div class="p-2">
+					<form on:submit|preventDefault={() => handleSubmit(source.id)}>
+						<button
+							disabled={source.gitlabApp && !source.gitlabAppId}
+							type="submit"
+							class="disabled:opacity-95 bg-coolgray-200 disabled:text-white box-selection hover:bg-orange-700 group"
+							class:border-red-500={source.gitlabApp && !source.gitlabAppId}
+							class:border-0={source.gitlabApp && !source.gitlabAppId}
+							class:border-l-4={source.gitlabApp && !source.gitlabAppId}
+						>
+							<div class="font-bold text-xl text-center truncate">{source.name}</div>
+							{#if source.gitlabApp && !source.gitlabAppId}
+								<div class="font-bold text-center truncate text-red-500 group-hover:text-white">
+									Configuration missing
+								</div>
+							{/if}
+						</button>
+					</form>
+				</div>
+			{/each}
+		</div>
+
+		{#if otherSources.length > 0 && $session.teamId === '0'}
+			<div class="px-6 pb-5 pt-10 text-xl font-bold">Other Sources</div>
+		{/if}
+		<div class="flex flex-col flex-wrap justify-center px-2 md:flex-row">
+			{#each otherSources as source}
 				<div class="p-2">
 					<form on:submit|preventDefault={() => handleSubmit(source.id)}>
 						<button

From a5f1b4b6756f857ad198c52c9b3cb6d177dee61b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 9 Apr 2022 13:25:46 +0200
Subject: [PATCH 42/57] fix: Enable https for Ghost

---
 src/lib/database/services.ts                 | 2 +-
 src/routes/services/[id]/ghost/start.json.ts | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/lib/database/services.ts b/src/lib/database/services.ts
index b4d355946..0aec569b6 100644
--- a/src/lib/database/services.ts
+++ b/src/lib/database/services.ts
@@ -165,7 +165,7 @@ export async function configureServiceType({ id, type }) {
 			}
 		});
 	} else if (type === 'ghost') {
-		const defaultEmail = `${cuid()}@coolify.io`;
+		const defaultEmail = `${cuid()}@example.com`;
 		const defaultPassword = encrypt(generatePassword());
 		const mariadbUser = cuid();
 		const mariadbPassword = encrypt(generatePassword());
diff --git a/src/routes/services/[id]/ghost/start.json.ts b/src/routes/services/[id]/ghost/start.json.ts
index 9e0b4ba11..41c5e95d4 100644
--- a/src/routes/services/[id]/ghost/start.json.ts
+++ b/src/routes/services/[id]/ghost/start.json.ts
@@ -44,12 +44,15 @@ export const post: RequestHandler = async (event) => {
 		const { workdir } = await createDirectories({ repository: type, buildId: id });
 		const image = getServiceImage(type);
 		const domain = getDomain(fqdn);
+		const isHttps = fqdn.startsWith('https://');
 		const config = {
 			ghost: {
 				image: `${image}:${version}`,
 				volume: `${id}-ghost:/bitnami/ghost`,
 				environmentVariables: {
+					url: fqdn,
 					GHOST_HOST: domain,
+					GHOST_ENABLE_HTTPS: isHttps ? 'yes' : 'no',
 					GHOST_EMAIL: defaultEmail,
 					GHOST_PASSWORD: defaultPassword,
 					GHOST_DATABASE_HOST: `${id}-mariadb`,

From e92775887daa907cf018d7600cdb057787f1604d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 9 Apr 2022 13:26:00 +0200
Subject: [PATCH 43/57] fix: Postgres root passwor shown and set

---
 src/lib/database/common.ts                          |  1 +
 .../databases/[id]/_Databases/_PostgreSQL.svelte    | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/lib/database/common.ts b/src/lib/database/common.ts
index 287dcd834..9d588fcc4 100644
--- a/src/lib/database/common.ts
+++ b/src/lib/database/common.ts
@@ -159,6 +159,7 @@ export function generateDatabaseConfiguration(database) {
 			// url: `psql://${dbUser}:${dbUserPassword}@${id}:${isPublic ? port : 5432}/${defaultDatabase}`,
 			privatePort: 5432,
 			environmentVariables: {
+				POSTGRESQL_POSTGRES_PASSWORD: rootUserPassword,
 				POSTGRESQL_PASSWORD: dbUserPassword,
 				POSTGRESQL_USERNAME: dbUser,
 				POSTGRESQL_DATABASE: defaultDatabase
diff --git a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
index d59f6bbbc..72b01bcea 100644
--- a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
+++ b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
@@ -21,6 +21,19 @@
 			bind:value={database.defaultDatabase}
 		/>
 	</div>
+	<div class="grid grid-cols-2 items-center">
+		<label for="rootUser" class="text-base font-bold text-stone-100"
+			>Root (postgres) User Password</label
+		>
+		<CopyPasswordField
+			readonly
+			disabled
+			placeholder="Generated automatically after start"
+			id="rootUserPassword"
+			name="rootUserPassword"
+			value={database.rootUserPassword}
+		/>
+	</div>
 	<div class="grid grid-cols-2 items-center">
 		<label for="dbUser" class="text-base font-bold text-stone-100">User</label>
 		<CopyPasswordField

From f4315144aff4c4f8312d6a3d69d62b2dba67003d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 9 Apr 2022 13:26:08 +0200
Subject: [PATCH 44/57] chore: version++

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ac2396dab..5bfd9fa40 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.4.0",
+	"version": "2.4.1",
 	"license": "AGPL-3.0",
 	"scripts": {
 		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev",

From d2f5a58f3bcb97acb34803d63fd4e750de57f81f Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 9 Apr 2022 13:33:23 +0200
Subject: [PATCH 45/57] fix: Able to change postgres user password from ui

---
 src/lib/database/databases.ts                      | 14 ++++++++++----
 .../databases/[id]/_Databases/_PostgreSQL.svelte   |  6 +++---
 src/routes/databases/[id]/index.json.ts            |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/lib/database/databases.ts b/src/lib/database/databases.ts
index 2179b5479..9132fc2b2 100644
--- a/src/lib/database/databases.ts
+++ b/src/lib/database/databases.ts
@@ -138,7 +138,7 @@ export async function stopDatabase(database) {
 	return everStarted;
 }
 
-export async function updatePasswordInDb(database, user, newPassword) {
+export async function updatePasswordInDb(database, user, newPassword, isRoot) {
 	const {
 		id,
 		type,
@@ -157,9 +157,15 @@ export async function updatePasswordInDb(database, user, newPassword) {
 				`DOCKER_HOST=${host} docker exec ${id} mysql -u ${rootUser} -p${rootUserPassword} -e \"ALTER USER '${user}'@'%' IDENTIFIED WITH caching_sha2_password BY '${newPassword}';\"`
 			);
 		} else if (type === 'postgresql') {
-			await asyncExecShell(
-				`DOCKER_HOST=${host} docker exec ${id} psql postgresql://${dbUser}:${dbUserPassword}@${id}:5432/${defaultDatabase} -c "ALTER role ${user} WITH PASSWORD '${newPassword}'"`
-			);
+			if (isRoot) {
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker exec ${id} psql postgresql://postgres:${rootUserPassword}@${id}:5432/${defaultDatabase} -c "ALTER role postgres WITH PASSWORD '${newPassword}'"`
+				);
+			} else {
+				await asyncExecShell(
+					`DOCKER_HOST=${host} docker exec ${id} psql postgresql://${dbUser}:${dbUserPassword}@${id}:5432/${defaultDatabase} -c "ALTER role ${user} WITH PASSWORD '${newPassword}'"`
+				);
+			}
 		} else if (type === 'mongodb') {
 			await asyncExecShell(
 				`DOCKER_HOST=${host} docker exec ${id} mongo 'mongodb://${rootUser}:${rootUserPassword}@${id}:27017/admin?readPreference=primary&ssl=false' --eval "db.changeUserPassword('${user}','${newPassword}')"`
diff --git a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
index 72b01bcea..343ad74d6 100644
--- a/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
+++ b/src/routes/databases/[id]/_Databases/_PostgreSQL.svelte
@@ -26,12 +26,12 @@
 			>Root (postgres) User Password</label
 		>
 		<CopyPasswordField
-			readonly
-			disabled
+			disabled={!isRunning}
+			readonly={!isRunning}
 			placeholder="Generated automatically after start"
 			id="rootUserPassword"
 			name="rootUserPassword"
-			value={database.rootUserPassword}
+			bind:value={database.rootUserPassword}
 		/>
 	</div>
 	<div class="grid grid-cols-2 items-center">
diff --git a/src/routes/databases/[id]/index.json.ts b/src/routes/databases/[id]/index.json.ts
index cdfb33d21..830deee10 100644
--- a/src/routes/databases/[id]/index.json.ts
+++ b/src/routes/databases/[id]/index.json.ts
@@ -68,9 +68,9 @@ export const post: RequestHandler = async (event) => {
 		const database = await db.getDatabase({ id, teamId });
 		if (isRunning) {
 			if (database.dbUserPassword !== dbUserPassword) {
-				await updatePasswordInDb(database, dbUser, dbUserPassword);
+				await updatePasswordInDb(database, dbUser, dbUserPassword, false);
 			} else if (database.rootUserPassword !== rootUserPassword) {
-				await updatePasswordInDb(database, rootUser, rootUserPassword);
+				await updatePasswordInDb(database, rootUser, rootUserPassword, true);
 			}
 		}
 		await db.updateDatabase({

From 7ec296be6b31982b5dbec3b8bf49c4091e66233c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sat, 9 Apr 2022 13:58:13 +0200
Subject: [PATCH 46/57] fix: DB Connecting string generator

---
 src/routes/databases/[id]/_Databases/_Databases.svelte | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/routes/databases/[id]/_Databases/_Databases.svelte b/src/routes/databases/[id]/_Databases/_Databases.svelte
index 731dcd80e..c441534e4 100644
--- a/src/routes/databases/[id]/_Databases/_Databases.svelte
+++ b/src/routes/databases/[id]/_Databases/_Databases.svelte
@@ -49,7 +49,7 @@
 	$: databaseUrl = generateUrl();
 
 	function generateUrl() {
-		return browser
+		return (databaseUrl = browser
 			? `${database.type}://${
 					databaseDbUser ? databaseDbUser + ':' : ''
 			  }${databaseDbUserPassword}@${
@@ -59,7 +59,7 @@
 							: window.location.hostname
 						: database.id
 			  }:${isPublic ? database.publicPort : privatePort}/${databaseDefault}`
-			: 'Loading...';
+			: 'Loading...');
 	}
 
 	async function changeSettings(name) {
@@ -200,7 +200,7 @@
 					name="url"
 					readonly
 					disabled
-					value={publicLoading || loading ? 'Loading...' : databaseUrl}
+					value={publicLoading || loading ? 'Loading...' : generateUrl()}
 				/>
 			</div>
 		</div>

From 7953c1df30ae00e717df59ca38c74050d2f531f3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 10 Apr 2022 00:30:47 +0200
Subject: [PATCH 47/57] fix: Missing install repositories GitHub

---
 src/routes/sources/[id]/_Github.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/routes/sources/[id]/_Github.svelte b/src/routes/sources/[id]/_Github.svelte
index 6b8aa0c89..a01746267 100644
--- a/src/routes/sources/[id]/_Github.svelte
+++ b/src/routes/sources/[id]/_Github.svelte
@@ -104,7 +104,7 @@
 				</div>
 			{/if}
 		</form>
-	{:else if source.githubAppId}
+	{:else if source.githubApp?.installationId}
 		<form on:submit|preventDefault={handleSubmit} class="py-4">
 			<div class="flex space-x-1 pb-5 font-bold">
 				<div class="title">General</div>

From bb0c93dc2fe57b42c6d50564145ad7dcd602254b Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 10 Apr 2022 00:31:10 +0200
Subject: [PATCH 48/57] fix: Return own and other sources better

---
 src/routes/applications/[id]/configuration/source.svelte | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/routes/applications/[id]/configuration/source.svelte b/src/routes/applications/[id]/configuration/source.svelte
index e5c05ebdd..2f23de4d8 100644
--- a/src/routes/applications/[id]/configuration/source.svelte
+++ b/src/routes/applications/[id]/configuration/source.svelte
@@ -46,15 +46,12 @@
 			(source.type === 'github' && source.githubAppId && source.githubApp.installationId) ||
 			(source.type === 'gitlab' && source.gitlabAppId)
 	);
+	console.log(filteredSources);
 	const ownSources = filteredSources.filter((source) => {
-		if (source.teams[0].id === $session.teamId) {
-			return source;
-		}
+		return source.teams.filter((team) => team.id === $session.teamId);
 	});
 	const otherSources = filteredSources.filter((source) => {
-		if (source.teams[0].id !== $session.teamId) {
-			return source;
-		}
+		return source.teams.filter((team) => team.id !== $session.teamId);
 	});
 
 	async function handleSubmit(gitSourceId) {

From 41c5dd3b53dc7e6a2158727a3179c151e4c4fa44 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 10 Apr 2022 00:36:42 +0200
Subject: [PATCH 49/57] fix: Show config missing on sources

---
 src/routes/sources/index.svelte | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 1e2d4d510..191eb8857 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -82,7 +82,8 @@
 							{#if $session.teamId === '0' && otherSources.length > 0}
 								<div class="truncate text-center">{source.teams[0].name}</div>
 							{/if}
-							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
+
+							{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && source.githubApp?.installationId === null)}
 								<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 									Configuration missing
 								</div>
@@ -109,7 +110,7 @@
 								{#if $session.teamId === '0'}
 									<div class="truncate text-center">{source.teams[0].name}</div>
 								{/if}
-								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && !source.githubAppId && !source.githubApp?.installationId)}
+								{#if (source.type === 'gitlab' && !source.gitlabAppId) || (source.type === 'github' && source.githubApp?.installationId === null)}
 									<div class="truncate text-center font-bold text-red-500 group-hover:text-white">
 										Configuration missing
 									</div>

From 73c9cb1d51db851b4d368d1eab46363185460e9c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 10 Apr 2022 00:39:50 +0200
Subject: [PATCH 50/57] Revert source configuration changes

---
 src/routes/applications/[id]/configuration/source.svelte | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/routes/applications/[id]/configuration/source.svelte b/src/routes/applications/[id]/configuration/source.svelte
index 2f23de4d8..e5c05ebdd 100644
--- a/src/routes/applications/[id]/configuration/source.svelte
+++ b/src/routes/applications/[id]/configuration/source.svelte
@@ -46,12 +46,15 @@
 			(source.type === 'github' && source.githubAppId && source.githubApp.installationId) ||
 			(source.type === 'gitlab' && source.gitlabAppId)
 	);
-	console.log(filteredSources);
 	const ownSources = filteredSources.filter((source) => {
-		return source.teams.filter((team) => team.id === $session.teamId);
+		if (source.teams[0].id === $session.teamId) {
+			return source;
+		}
 	});
 	const otherSources = filteredSources.filter((source) => {
-		return source.teams.filter((team) => team.id !== $session.teamId);
+		if (source.teams[0].id !== $session.teamId) {
+			return source;
+		}
 	});
 
 	async function handleSubmit(gitSourceId) {

From b2e7435d0f6e3b9aad6189199c0b0a2d2175cd72 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Sun, 10 Apr 2022 00:40:12 +0200
Subject: [PATCH 51/57] chore: version++

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5bfd9fa40..a272908c7 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.4.1",
+	"version": "2.4.2",
 	"license": "AGPL-3.0",
 	"scripts": {
 		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev",

From 7c7b5a61e512e0d6569470bd23875500b74168a3 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Apr 2022 20:36:03 +0200
Subject: [PATCH 52/57] fix: Remove unnecessary save button haha

---
 src/routes/applications/[id]/secrets/index.svelte | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/routes/applications/[id]/secrets/index.svelte b/src/routes/applications/[id]/secrets/index.svelte
index 5ca2bbfcb..980e88177 100644
--- a/src/routes/applications/[id]/secrets/index.svelte
+++ b/src/routes/applications/[id]/secrets/index.svelte
@@ -61,9 +61,6 @@
 		await refreshSecrets();
 		toast.push('Secrets saved');
 	}
-	function asd() {
-		console.log(secrets);
-	}
 </script>
 
 <div class="flex items-center space-x-2 p-5 px-6 font-bold">
@@ -164,7 +161,6 @@
 			</tr>
 		</tbody>
 	</table>
-	<button on:click={asd}>Save</button>
 	<h2 class="title my-6 font-bold">Paste .env file</h2>
 	<form on:submit|preventDefault={getValues} class="mb-12 w-full">
 		<textarea bind:value={batchSecrets} class="mb-2 min-h-[200px] w-full" />

From 56c4295e1678a295099e46295f604d0bea62053d Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Apr 2022 20:36:15 +0200
Subject: [PATCH 53/57] chore: Update packages

---
 package.json   |  21 ++--
 pnpm-lock.yaml | 319 ++++++++++++++++++++++++-------------------------
 2 files changed, 168 insertions(+), 172 deletions(-)

diff --git a/package.json b/package.json
index d19791e10..cbd22e7b2 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-node": "1.0.0-next.73",
-		"@sveltejs/kit": "1.0.0-next.303",
+		"@sveltejs/kit": "1.0.0-next.310",
 		"@types/js-cookie": "3.0.1",
 		"@types/js-yaml": "4.0.5",
 		"@types/node": "17.0.23",
@@ -44,13 +44,13 @@
 		"husky": "7.0.4",
 		"lint-staged": "12.3.7",
 		"postcss": "8.4.12",
-		"prettier": "2.6.1",
-		"prettier-plugin-svelte": "2.6.0",
+		"prettier": "2.6.2",
+		"prettier-plugin-svelte": "2.7.0",
 		"prettier-plugin-tailwindcss": "0.1.8",
 		"prisma": "3.11.1",
-		"svelte": "3.46.4",
-		"svelte-check": "2.4.6",
-		"svelte-preprocess": "4.10.4",
+		"svelte": "3.47.0",
+		"svelte-check": "2.6.0",
+		"svelte-preprocess": "4.10.5",
 		"svelte-select": "4.4.7",
 		"tailwindcss": "3.0.23",
 		"ts-node": "10.7.0",
@@ -61,24 +61,23 @@
 	"dependencies": {
 		"@iarna/toml": "2.2.5",
 		"@prisma/client": "3.11.1",
-		"@sentry/node": "6.19.2",
+		"@sentry/node": "6.19.6",
 		"bcryptjs": "^2.4.3",
-		"bullmq": "1.78.1",
+		"bullmq": "1.79.0",
 		"compare-versions": "4.1.3",
 		"cookie": "0.4.2",
-		"cooltipz-css": "2.1.0",
 		"cuid": "2.1.8",
 		"dayjs": "1.11.0",
 		"dockerode": "3.3.1",
 		"dotenv-extended": "2.9.0",
 		"generate-password": "1.7.0",
 		"get-port": "6.1.2",
-		"got": "12.0.2",
+		"got": "12.0.3",
 		"js-cookie": "3.0.1",
 		"js-yaml": "4.1.0",
 		"jsonwebtoken": "8.5.1",
 		"mustache": "4.2.0",
-		"node-forge": "1.3.0",
+		"node-forge": "1.3.1",
 		"p-limit": "4.0.0",
 		"svelte-kit-cookie-session": "2.1.2",
 		"tailwindcss-scrollbar": "0.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fca22ec75..5577cc3fa 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -3,9 +3,9 @@ lockfileVersion: 5.3
 specifiers:
   '@iarna/toml': 2.2.5
   '@prisma/client': 3.11.1
-  '@sentry/node': 6.19.2
+  '@sentry/node': 6.19.6
   '@sveltejs/adapter-node': 1.0.0-next.73
-  '@sveltejs/kit': 1.0.0-next.303
+  '@sveltejs/kit': 1.0.0-next.310
   '@types/js-cookie': 3.0.1
   '@types/js-yaml': 4.0.5
   '@types/node': 17.0.23
@@ -15,10 +15,9 @@ specifiers:
   '@zerodevx/svelte-toast': 0.7.1
   autoprefixer: 10.4.4
   bcryptjs: ^2.4.3
-  bullmq: 1.78.1
+  bullmq: 1.79.0
   compare-versions: 4.1.3
   cookie: 0.4.2
-  cooltipz-css: 2.1.0
   cross-env: 7.0.3
   cross-var: 1.1.0
   cuid: 2.1.8
@@ -30,24 +29,24 @@ specifiers:
   eslint-plugin-svelte3: 3.4.1
   generate-password: 1.7.0
   get-port: 6.1.2
-  got: 12.0.2
+  got: 12.0.3
   husky: 7.0.4
   js-cookie: 3.0.1
   js-yaml: 4.1.0
   jsonwebtoken: 8.5.1
   lint-staged: 12.3.7
   mustache: 4.2.0
-  node-forge: 1.3.0
+  node-forge: 1.3.1
   p-limit: 4.0.0
   postcss: 8.4.12
-  prettier: 2.6.1
-  prettier-plugin-svelte: 2.6.0
+  prettier: 2.6.2
+  prettier-plugin-svelte: 2.7.0
   prettier-plugin-tailwindcss: 0.1.8
   prisma: 3.11.1
-  svelte: 3.46.4
-  svelte-check: 2.4.6
+  svelte: 3.47.0
+  svelte-check: 2.6.0
   svelte-kit-cookie-session: 2.1.2
-  svelte-preprocess: 4.10.4
+  svelte-preprocess: 4.10.5
   svelte-select: 4.4.7
   tailwindcss: 3.0.23
   tailwindcss-scrollbar: 0.1.0
@@ -59,24 +58,23 @@ specifiers:
 dependencies:
   '@iarna/toml': 2.2.5
   '@prisma/client': 3.11.1_prisma@3.11.1
-  '@sentry/node': 6.19.2
+  '@sentry/node': 6.19.6
   bcryptjs: 2.4.3
-  bullmq: 1.78.1
+  bullmq: 1.79.0
   compare-versions: 4.1.3
   cookie: 0.4.2
-  cooltipz-css: 2.1.0
   cuid: 2.1.8
   dayjs: 1.11.0
   dockerode: 3.3.1
   dotenv-extended: 2.9.0
   generate-password: 1.7.0
   get-port: 6.1.2
-  got: 12.0.2
+  got: 12.0.3
   js-cookie: 3.0.1
   js-yaml: 4.1.0
   jsonwebtoken: 8.5.1
   mustache: 4.2.0
-  node-forge: 1.3.0
+  node-forge: 1.3.1
   p-limit: 4.0.0
   svelte-kit-cookie-session: 2.1.2
   tailwindcss-scrollbar: 0.1.0_tailwindcss@3.0.23
@@ -84,7 +82,7 @@ dependencies:
 
 devDependencies:
   '@sveltejs/adapter-node': 1.0.0-next.73
-  '@sveltejs/kit': 1.0.0-next.303_svelte@3.46.4
+  '@sveltejs/kit': 1.0.0-next.310_svelte@3.47.0
   '@types/js-cookie': 3.0.1
   '@types/js-yaml': 4.0.5
   '@types/node': 17.0.23
@@ -97,17 +95,17 @@ devDependencies:
   cross-var: 1.1.0
   eslint: 7.32.0
   eslint-config-prettier: 8.5.0_eslint@7.32.0
-  eslint-plugin-svelte3: 3.4.1_eslint@7.32.0+svelte@3.46.4
+  eslint-plugin-svelte3: 3.4.1_eslint@7.32.0+svelte@3.47.0
   husky: 7.0.4
   lint-staged: 12.3.7
   postcss: 8.4.12
-  prettier: 2.6.1
-  prettier-plugin-svelte: 2.6.0_prettier@2.6.1+svelte@3.46.4
-  prettier-plugin-tailwindcss: 0.1.8_prettier@2.6.1
+  prettier: 2.6.2
+  prettier-plugin-svelte: 2.7.0_prettier@2.6.2+svelte@3.47.0
+  prettier-plugin-tailwindcss: 0.1.8_prettier@2.6.2
   prisma: 3.11.1
-  svelte: 3.46.4
-  svelte-check: 2.4.6_postcss@8.4.12+svelte@3.46.4
-  svelte-preprocess: 4.10.4_296873641a0ad9f42fe92172d27bcedd
+  svelte: 3.47.0
+  svelte-check: 2.6.0_postcss@8.4.12+svelte@3.47.0
+  svelte-preprocess: 4.10.5_41810887ae6c6d59323116f47e33fa38
   svelte-select: 4.4.7
   tailwindcss: 3.0.23_b89136460714832cdda11d1e9d57d1ff
   ts-node: 10.7.0_ee885bc7281b682b6adbed6ae09ee090
@@ -283,55 +281,55 @@ packages:
       picomatch: 2.3.0
     dev: true
 
-  /@sentry/core/6.19.2:
+  /@sentry/core/6.19.6:
     resolution:
       {
-        integrity: sha512-yu1R3ewBT4udmB4v7sc4biQZ0Z0rfB9+TzB5ZKoCftbe6kqXjFMMaFRYNUF9HicVldKAsBktgkWw3+yfqGkw/A==
+        integrity: sha512-biEotGRr44/vBCOegkTfC9rwqaqRKIpFljKGyYU6/NtzMRooktqOhjmjmItNCMRknArdeaQwA8lk2jcZDXX3Og==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/hub': 6.19.2
-      '@sentry/minimal': 6.19.2
-      '@sentry/types': 6.19.2
-      '@sentry/utils': 6.19.2
+      '@sentry/hub': 6.19.6
+      '@sentry/minimal': 6.19.6
+      '@sentry/types': 6.19.6
+      '@sentry/utils': 6.19.6
       tslib: 1.14.1
     dev: false
 
-  /@sentry/hub/6.19.2:
+  /@sentry/hub/6.19.6:
     resolution:
       {
-        integrity: sha512-W7KCgNBgdBIMagOxy5J5KQPe+maYxSqfE8a5ncQ3R8BcZDQEKnkW/1FplNbfRLZqA/tL/ndKb7pTPqVtzsbARw==
+        integrity: sha512-PuEOBZxvx3bjxcXmWWZfWXG+orojQiWzv9LQXjIgroVMKM/GG4QtZbnWl1hOckUj7WtKNl4hEGO2g/6PyCV/vA==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/types': 6.19.2
-      '@sentry/utils': 6.19.2
+      '@sentry/types': 6.19.6
+      '@sentry/utils': 6.19.6
       tslib: 1.14.1
     dev: false
 
-  /@sentry/minimal/6.19.2:
+  /@sentry/minimal/6.19.6:
     resolution:
       {
-        integrity: sha512-ClwxKm77iDHET7kpzv1JvzDx1er5DoNu+EUjst0kQzARIrXvu9xuZuE2/CnBWycQWqw8o3HoGoKz65uIhsUCzQ==
+        integrity: sha512-T1NKcv+HTlmd8EbzUgnGPl4ySQGHWMCyZ8a8kXVMZOPDzphN3fVIzkYzWmSftCWp0rpabXPt9aRF2mfBKU+mAQ==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/hub': 6.19.2
-      '@sentry/types': 6.19.2
+      '@sentry/hub': 6.19.6
+      '@sentry/types': 6.19.6
       tslib: 1.14.1
     dev: false
 
-  /@sentry/node/6.19.2:
+  /@sentry/node/6.19.6:
     resolution:
       {
-        integrity: sha512-Z1qREpTpYHxaeWjc1zMUk8ZTAp1WbxMiI2TVNc+a14DVT19Z2xNXb06MiRfeLgNc9lVGdmzR62dPmMBjVgPJYg==
+        integrity: sha512-kHQMfsy40ZxxdS9zMPmXCOOLWOJbQj6/aVSHt/L1QthYcgkAi7NJQNXnQIPWQDe8eP3DfNIWM7dc446coqjXrQ==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/core': 6.19.2
-      '@sentry/hub': 6.19.2
-      '@sentry/types': 6.19.2
-      '@sentry/utils': 6.19.2
+      '@sentry/core': 6.19.6
+      '@sentry/hub': 6.19.6
+      '@sentry/types': 6.19.6
+      '@sentry/utils': 6.19.6
       cookie: 0.4.2
       https-proxy-agent: 5.0.0
       lru_map: 0.3.3
@@ -340,22 +338,22 @@ packages:
       - supports-color
     dev: false
 
-  /@sentry/types/6.19.2:
+  /@sentry/types/6.19.6:
     resolution:
       {
-        integrity: sha512-XO5qmVBdTs+7PdCz7fAwn1afWxSnRE2KLBFg5/vOdKosPSSHsSHUURSkxiEZc2QsR+JpRB4AeQ26AkIRX38qTg==
+        integrity: sha512-QH34LMJidEUPZK78l+Frt3AaVFJhEmIi05Zf8WHd9/iTt+OqvCHBgq49DDr1FWFqyYWm/QgW/3bIoikFpfsXyQ==
       }
     engines: { node: '>=6' }
     dev: false
 
-  /@sentry/utils/6.19.2:
+  /@sentry/utils/6.19.6:
     resolution:
       {
-        integrity: sha512-2DQQ2OJaxjtyxGq5FmMlqb6hptsqMs2xoBiVRMkTS/rvyTrk1oQdKZ8ePwjtgX3nJ728ni3IXIyXV+vfGp4EBw==
+        integrity: sha512-fAMWcsguL0632eWrROp/vhPgI7sBj/JROWVPzpabwVkm9z3m1rQm6iLFn4qfkZL8Ozy6NVZPXOQ7EXmeU24byg==
       }
     engines: { node: '>=6' }
     dependencies:
-      '@sentry/types': 6.19.2
+      '@sentry/types': 6.19.6
       tslib: 1.14.1
     dev: false
 
@@ -376,20 +374,20 @@ packages:
       tiny-glob: 0.2.9
     dev: true
 
-  /@sveltejs/kit/1.0.0-next.303_svelte@3.46.4:
+  /@sveltejs/kit/1.0.0-next.310_svelte@3.47.0:
     resolution:
       {
-        integrity: sha512-WdxDc8OiF1WEd/bEza7CBdzA+3qIcCi1GKBj/gieKX9I3N8iDJt/Cg2POrLo9wQoJ47nZcAd1eOhfr7XEX1aIQ==
+        integrity: sha512-pTyMyaoyHS+V5cQZIQMfQXmLkhw1VaRwT9avOSgwDc0QBpnNw2LdzwoPYsUr96ca5B6cfT3SMUNolxErTNHmPQ==
       }
     engines: { node: '>=14.13' }
     hasBin: true
     peerDependencies:
       svelte: ^3.44.0
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 1.0.0-next.33_svelte@3.46.4+vite@2.8.0
+      '@sveltejs/vite-plugin-svelte': 1.0.0-next.33_svelte@3.47.0+vite@2.9.1
       sade: 1.7.4
-      svelte: 3.46.4
-      vite: 2.8.0
+      svelte: 3.47.0
+      vite: 2.9.1
     transitivePeerDependencies:
       - diff-match-patch
       - less
@@ -398,7 +396,7 @@ packages:
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte/1.0.0-next.33_svelte@3.46.4+vite@2.8.0:
+  /@sveltejs/vite-plugin-svelte/1.0.0-next.33_svelte@3.47.0+vite@2.9.1:
     resolution:
       {
         integrity: sha512-aj0h2+ZixgT+yoJFIs8dRRw/Cj9tgNu3+hY4CJikpa04mfhR61wXqJFfi2ZEFMUvFda5nCxKYIChFkc6wq5fJA==
@@ -417,9 +415,9 @@ packages:
       kleur: 4.1.4
       magic-string: 0.25.7
       require-relative: 0.8.7
-      svelte: 3.46.4
-      svelte-hmr: 0.14.9_svelte@3.46.4
-      vite: 2.8.0
+      svelte: 3.47.0
+      svelte-hmr: 0.14.9_svelte@3.47.0
+      vite: 2.9.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -1671,10 +1669,10 @@ packages:
       ieee754: 1.2.1
     dev: false
 
-  /bullmq/1.78.1:
+  /bullmq/1.79.0:
     resolution:
       {
-        integrity: sha512-er45mM8nGhgA83EVCJ4PNxPyDSzakvoxeFGU4vdSgYeB+SbeFQAlJYmAC50Ms7YFPstm1LeinbVZ+oX/BmBzOg==
+        integrity: sha512-rVtNCDpcWdc+U1MinRtvhJv+GBFNkz0Q3Unf20010qIC6Pj+O2kkIUeepBkCmMNz6G9abrhsee2PheGRJ32+sw==
       }
     dependencies:
       cron-parser: 4.2.1
@@ -1930,19 +1928,6 @@ packages:
     engines: { node: '>= 0.6' }
     dev: false
 
-  /cooltipz-css/2.1.0:
-    resolution:
-      {
-        integrity: sha512-howXMSGn4tYvroGUad5jg1QFKUMxxc2GiQSXrv6TQBIMmhrf8t//hz1Fx8eyc5t93SS9ZzUa5rHbPtjBTg5j1w==
-      }
-    engines: { node: '>=16', npm: '>=8' }
-    peerDependencies:
-      sass: 1.x
-    peerDependenciesMeta:
-      sass:
-        optional: true
-    dev: false
-
   /core-js/2.6.12:
     resolution:
       {
@@ -2324,10 +2309,22 @@ packages:
     resolution: { integrity: sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM= }
     dev: true
 
-  /esbuild-android-arm64/0.14.21:
+  /esbuild-android-64/0.14.34:
     resolution:
       {
-        integrity: sha512-Bqgld1TY0wZv8TqiQmVxQFgYzz8ZmyzT7clXBDZFkOOdRybzsnj8AZuK1pwcLVA7Ya6XncHgJqIao7NFd3s0RQ==
+        integrity: sha512-XfxcfJqmMYsT/LXqrptzFxmaR3GWzXHDLdFNIhm6S00zPaQF1TBBWm+9t0RZ6LRR7iwH57DPjaOeW20vMqI4Yw==
+      }
+    engines: { node: '>=12' }
+    cpu: [x64]
+    os: [android]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /esbuild-android-arm64/0.14.34:
+    resolution:
+      {
+        integrity: sha512-T02+NXTmSRL1Mc6puz+R9CB54rSPICkXKq6+tw8B6vxZFnCPzbJxgwIX4kcluz9p8nYBjF3+lSilTGWb7+Xgew==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2336,10 +2333,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-64/0.14.21:
+  /esbuild-darwin-64/0.14.34:
     resolution:
       {
-        integrity: sha512-j+Eg+e13djzyYINVvAbOo2/zvZ2DivuJJTaBrJnJHSD7kUNuGHRkHoSfFjbI80KHkn091w350wdmXDNSgRjfYQ==
+        integrity: sha512-pLRip2Bh4Ng7Bf6AMgCrSp3pPe/qZyf11h5Qo2mOfJqLWzSVjxrXW+CFRJfrOVP7TCnh/gmZSM2AFdCPB72vtw==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2348,10 +2345,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-darwin-arm64/0.14.21:
+  /esbuild-darwin-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-nDNTKWDPI0RuoPj5BhcSB2z5EmZJJAyRtZLIjyXSqSpAyoB8eyAKXl4lB8U2P78Fnh4Lh1le/fmpewXE04JhBQ==
+        integrity: sha512-vpidSJEBxx6lf1NWgXC+DCmGqesJuZ5Y8aQVVsaoO4i8tRXbXb0whChRvop/zd3nfNM4dIl5EXAky0knRX5I6w==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2360,10 +2357,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-64/0.14.21:
+  /esbuild-freebsd-64/0.14.34:
     resolution:
       {
-        integrity: sha512-zIurkCHXhxELiDZtLGiexi8t8onQc2LtuE+S7457H/pP0g0MLRKMrsn/IN4LDkNe6lvBjuoZZi2OfelOHn831g==
+        integrity: sha512-m0HBjePhe0hAQJgtMRMNV9kMgIyV4/qSnzPx42kRMQBcPhgjAq1JRu4Il26czC+9FgpMbFkUktb07f/Lwnc6CA==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2372,10 +2369,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-freebsd-arm64/0.14.21:
+  /esbuild-freebsd-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-wdxMmkJfbwcN+q85MpeUEamVZ40FNsBa9mPq8tAszDn8TRT2HoJvVRADPIIBa9SWWwlDChIMjkDKAnS3KS/sPA==
+        integrity: sha512-cpRc2B94L1KvMPPYB4D6G39jLqpKlD3noAMY4/e86iXXXkhUYJJEtTuyNFTa9JRpWM0xCAp4mxjHjoIiLuoCLA==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2384,10 +2381,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-32/0.14.21:
+  /esbuild-linux-32/0.14.34:
     resolution:
       {
-        integrity: sha512-fmxvyzOPPh2xiEHojpCeIQP6pXcoKsWbz3ryDDIKLOsk4xp3GbpHIEAWP0xTeuhEbendmvBDVKbAVv3PnODXLg==
+        integrity: sha512-8nQaEaoW7MH/K/RlozJa+lE1ejHIr8fuPIHhc513UebRav7HtXgQvxHQ6VZRUkWtep23M6dd7UqhwO1tMOfzQQ==
       }
     engines: { node: '>=12' }
     cpu: [ia32]
@@ -2396,10 +2393,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-64/0.14.21:
+  /esbuild-linux-64/0.14.34:
     resolution:
       {
-        integrity: sha512-edZyNOv1ql+kpmlzdqzzDjRQYls+tSyi4QFi+PdBhATJFUqHsnNELWA9vMSzAaInPOEaVUTA5Ml28XFChcy4DA==
+        integrity: sha512-Y3of4qQoLLlAgf042MlrY1P+7PnN9zWj8nVtw9XQG5hcLOZLz7IKpU35oeu7n4wvyaZHwvQqDJ93gRLqdJekcQ==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2408,10 +2405,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-arm/0.14.21:
+  /esbuild-linux-arm/0.14.34:
     resolution:
       {
-        integrity: sha512-aSU5pUueK6afqmLQsbU+QcFBT62L+4G9hHMJDHWfxgid6hzhSmfRH9U/f+ymvxsSTr/HFRU4y7ox8ZyhlVl98w==
+        integrity: sha512-9lpq1NcJqssAF7alCO6zL3gvBVVt/lKw4oetUM7OgNnRX0OWpB+ZIO9FwCrSj/dMdmgDhPLf+119zB8QxSMmAg==
       }
     engines: { node: '>=12' }
     cpu: [arm]
@@ -2420,10 +2417,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-arm64/0.14.21:
+  /esbuild-linux-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-t5qxRkq4zdQC0zXpzSB2bTtfLgOvR0C6BXYaRE/6/k8/4SrkZcTZBeNu+xGvwCU4b5dU9ST9pwIWkK6T1grS8g==
+        integrity: sha512-IlWaGtj9ir7+Nrume1DGcyzBDlK8GcnJq0ANKwcI9pVw8tqr+6GD0eqyF9SF1mR8UmAp+odrx1H5NdR2cHdFHA==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2432,10 +2429,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-mips64le/0.14.21:
+  /esbuild-linux-mips64le/0.14.34:
     resolution:
       {
-        integrity: sha512-jLZLQGCNlUsmIHtGqNvBs3zN+7a4D9ckf0JZ+jQTwHdZJ1SgV9mAjbB980OFo66LoY+WeM7t3WEnq3FjI1zw4A==
+        integrity: sha512-k3or+01Rska1AjUyNjA4buEwB51eyN/xPQAoOx1CjzAQC3l8rpjUDw55kXyL63O/1MUi4ISvtNtl8gLwdyEcxw==
       }
     engines: { node: '>=12' }
     cpu: [mips64el]
@@ -2444,10 +2441,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-ppc64le/0.14.21:
+  /esbuild-linux-ppc64le/0.14.34:
     resolution:
       {
-        integrity: sha512-4TWxpK391en2UBUw6GSrukToTDu6lL9vkm3Ll40HrI08WG3qcnJu7bl8e1+GzelDsiw1QmfAY/nNvJ6iaHRpCQ==
+        integrity: sha512-+qxb8M9FfM2CJaVU7GgYpJOHM1ngQOx+/VrtBjb4C8oVqaPcESCeg2anjl+HRZy8VpYc71q/iBYausPPbJ+Keg==
       }
     engines: { node: '>=12' }
     cpu: [ppc64]
@@ -2456,10 +2453,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-riscv64/0.14.21:
+  /esbuild-linux-riscv64/0.14.34:
     resolution:
       {
-        integrity: sha512-fElngqOaOfTsF+u+oetDLHsPG74vB2ZaGZUqmGefAJn3a5z9Z2pNa4WpVbbKgHpaAAy5tWM1m1sbGohj6Ki6+Q==
+        integrity: sha512-Y717ltBdQ5j5sZIHdy1DV9kieo0wMip0dCmVSTceowCPYSn1Cg33Kd6981+F/3b9FDMzNWldZFOBRILViENZSA==
       }
     engines: { node: '>=12' }
     cpu: [riscv64]
@@ -2468,10 +2465,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-linux-s390x/0.14.21:
+  /esbuild-linux-s390x/0.14.34:
     resolution:
       {
-        integrity: sha512-brleZ6R5fYv0qQ7ZBwenQmP6i9TdvJCB092c/3D3pTLQHBGHJb5zWgKxOeS7bdHzmLy6a6W7GbFk6QKpjyD6QA==
+        integrity: sha512-bDDgYO4LhL4+zPs+WcBkXph+AQoPcQRTv18FzZS0WhjfH8TZx2QqlVPGhmhZ6WidrY+jKthUqO6UhGyIb4MpmA==
       }
     engines: { node: '>=12' }
     cpu: [s390x]
@@ -2480,10 +2477,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-netbsd-64/0.14.21:
+  /esbuild-netbsd-64/0.14.34:
     resolution:
       {
-        integrity: sha512-nCEgsLCQ8RoFWVV8pVI+kX66ICwbPP/M9vEa0NJGIEB/Vs5sVGMqkf67oln90XNSkbc0bPBDuo4G6FxlF7PN8g==
+        integrity: sha512-cfaFGXdRt0+vHsjNPyF0POM4BVSHPSbhLPe8mppDc7GDDxjIl08mV1Zou14oDWMp/XZMjYN1kWYRSfftiD0vvQ==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2492,10 +2489,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-openbsd-64/0.14.21:
+  /esbuild-openbsd-64/0.14.34:
     resolution:
       {
-        integrity: sha512-h9zLMyVD0T73MDTVYIb/qUTokwI6EJH9O6wESuTNq6+XpMSr6C5aYZ4fvFKdNELW+Xsod+yDS2hV2JTUAbFrLA==
+        integrity: sha512-vmy9DxXVnRiI14s8GKuYBtess+EVcDALkbpTqd5jw4XITutIzyB7n4x0Tj5utAkKsgZJB22lLWGekr0ABnSLow==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2504,10 +2501,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-sunos-64/0.14.21:
+  /esbuild-sunos-64/0.14.34:
     resolution:
       {
-        integrity: sha512-Kl+7Cot32qd9oqpLdB1tEGXEkjBlijrIxMJ0+vlDFaqsODutif25on0IZlFxEBtL2Gosd4p5WCV1U7UskNQfXA==
+        integrity: sha512-eNPVatNET1F7tRMhii7goL/eptfxc0ALRjrj9SPFNqp0zmxrehBFD6BaP3R4LjMn6DbMO0jOAnTLFKr8NqcJAA==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2516,10 +2513,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-32/0.14.21:
+  /esbuild-windows-32/0.14.34:
     resolution:
       {
-        integrity: sha512-V7vnTq67xPBUCk/9UtlolmQ798Ecjdr1ZoI1vcSgw7M82aSSt0eZdP6bh5KAFZU8pxDcx3qoHyWQfHYr11f22A==
+        integrity: sha512-EFhpXyHEcnqWYe2rAHFd8dRw8wkrd9U+9oqcyoEL84GbanAYjiiIjBZsnR8kl0sCQ5w6bLpk7vCEIA2VS32Vcg==
       }
     engines: { node: '>=12' }
     cpu: [ia32]
@@ -2528,10 +2525,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-64/0.14.21:
+  /esbuild-windows-64/0.14.34:
     resolution:
       {
-        integrity: sha512-kDgHjKOHwjfJDCyRGELzVxiP/RBJBTA+wyspf78MTTJQkyPuxH2vChReNdWc+dU2S4gIZFHMdP1Qrl/k22ZmaA==
+        integrity: sha512-a8fbl8Ky7PxNEjf1aJmtxdDZj32/hC7S1OcA2ckEpCJRTjiKslI9vAdPpSjrKIWhws4Galpaawy0nB7fjHYf5Q==
       }
     engines: { node: '>=12' }
     cpu: [x64]
@@ -2540,10 +2537,10 @@ packages:
     dev: true
     optional: true
 
-  /esbuild-windows-arm64/0.14.21:
+  /esbuild-windows-arm64/0.14.34:
     resolution:
       {
-        integrity: sha512-8Sbo0zpzgwWrwjQYLmHF78f7E2xg5Ve63bjB2ng3V2aManilnnTGaliq2snYg+NOX60+hEvJHRdVnuIAHW0lVw==
+        integrity: sha512-EYvmKbSa2B3sPnpC28UEu9jBK5atGV4BaVRE7CYGUci2Hlz4AvtV/LML+TcDMT6gBgibnN2gcltWclab3UutMg==
       }
     engines: { node: '>=12' }
     cpu: [arm64]
@@ -2552,34 +2549,35 @@ packages:
     dev: true
     optional: true
 
-  /esbuild/0.14.21:
+  /esbuild/0.14.34:
     resolution:
       {
-        integrity: sha512-7WEoNMBJdLN993dr9h0CpFHPRc3yFZD+EAVY9lg6syJJ12gc5fHq8d75QRExuhnMkT2DaRiIKFThRvDWP+fO+A==
+        integrity: sha512-QIWdPT/gFF6hCaf4m7kP0cJ+JIuFkdHibI7vVFvu3eJS1HpVmYHWDulyN5WXwbRA0SX/7ZDaJ/1DH8SdY9xOJg==
       }
     engines: { node: '>=12' }
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      esbuild-android-arm64: 0.14.21
-      esbuild-darwin-64: 0.14.21
-      esbuild-darwin-arm64: 0.14.21
-      esbuild-freebsd-64: 0.14.21
-      esbuild-freebsd-arm64: 0.14.21
-      esbuild-linux-32: 0.14.21
-      esbuild-linux-64: 0.14.21
-      esbuild-linux-arm: 0.14.21
-      esbuild-linux-arm64: 0.14.21
-      esbuild-linux-mips64le: 0.14.21
-      esbuild-linux-ppc64le: 0.14.21
-      esbuild-linux-riscv64: 0.14.21
-      esbuild-linux-s390x: 0.14.21
-      esbuild-netbsd-64: 0.14.21
-      esbuild-openbsd-64: 0.14.21
-      esbuild-sunos-64: 0.14.21
-      esbuild-windows-32: 0.14.21
-      esbuild-windows-64: 0.14.21
-      esbuild-windows-arm64: 0.14.21
+      esbuild-android-64: 0.14.34
+      esbuild-android-arm64: 0.14.34
+      esbuild-darwin-64: 0.14.34
+      esbuild-darwin-arm64: 0.14.34
+      esbuild-freebsd-64: 0.14.34
+      esbuild-freebsd-arm64: 0.14.34
+      esbuild-linux-32: 0.14.34
+      esbuild-linux-64: 0.14.34
+      esbuild-linux-arm: 0.14.34
+      esbuild-linux-arm64: 0.14.34
+      esbuild-linux-mips64le: 0.14.34
+      esbuild-linux-ppc64le: 0.14.34
+      esbuild-linux-riscv64: 0.14.34
+      esbuild-linux-s390x: 0.14.34
+      esbuild-netbsd-64: 0.14.34
+      esbuild-openbsd-64: 0.14.34
+      esbuild-sunos-64: 0.14.34
+      esbuild-windows-32: 0.14.34
+      esbuild-windows-64: 0.14.34
+      esbuild-windows-arm64: 0.14.34
     dev: true
 
   /escalade/3.1.1:
@@ -2615,7 +2613,7 @@ packages:
       eslint: 7.32.0
     dev: true
 
-  /eslint-plugin-svelte3/3.4.1_eslint@7.32.0+svelte@3.46.4:
+  /eslint-plugin-svelte3/3.4.1_eslint@7.32.0+svelte@3.47.0:
     resolution:
       {
         integrity: sha512-7p59WG8qV8L6wLdl4d/c3mdjkgVglQCdv5XOTk/iNPBKXuuV+Q0eFP5Wa6iJd/G2M1qR3BkLPEzaANOqKAZczw==
@@ -2626,7 +2624,7 @@ packages:
       svelte: ^3.2.0
     dependencies:
       eslint: 7.32.0
-      svelte: 3.46.4
+      svelte: 3.47.0
     dev: true
 
   /eslint-scope/5.1.1:
@@ -3080,10 +3078,10 @@ packages:
       }
     dev: true
 
-  /got/12.0.2:
+  /got/12.0.3:
     resolution:
       {
-        integrity: sha512-Zi4yHiqCgaorUbknr/RHFBsC3XqjSodaw0F3qxlqAqyj+OGYZl37/uy01R0qz++KANKQYdY5FHJ0okXZpEzwWQ==
+        integrity: sha512-hmdcXi/S0gcAtDg4P8j/rM7+j3o1Aq6bXhjxkDhRY2ipe7PHpvx/14DgTY2czHOLaGeU8VRvRecidwfu9qdFug==
       }
     engines: { node: '>=14.16' }
     dependencies:
@@ -3906,10 +3904,10 @@ packages:
     resolution: { integrity: sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= }
     dev: true
 
-  /node-forge/1.3.0:
+  /node-forge/1.3.1:
     resolution:
       {
-        integrity: sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==
+        integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
       }
     engines: { node: '>= 6.13.0' }
     dev: false
@@ -4214,20 +4212,20 @@ packages:
     engines: { node: '>= 0.8.0' }
     dev: true
 
-  /prettier-plugin-svelte/2.6.0_prettier@2.6.1+svelte@3.46.4:
+  /prettier-plugin-svelte/2.7.0_prettier@2.6.2+svelte@3.47.0:
     resolution:
       {
-        integrity: sha512-NPSRf6Y5rufRlBleok/pqg4+1FyGsL0zYhkYP6hnueeL1J/uCm3OfOZPsLX4zqD9VAdcXfyEL2PYqGv8ZoOSfA==
+        integrity: sha512-fQhhZICprZot2IqEyoiUYLTRdumULGRvw0o4dzl5jt0jfzVWdGqeYW27QTWAeXhoupEZJULmNoH3ueJwUWFLIA==
       }
     peerDependencies:
       prettier: ^1.16.4 || ^2.0.0
       svelte: ^3.2.0
     dependencies:
-      prettier: 2.6.1
-      svelte: 3.46.4
+      prettier: 2.6.2
+      svelte: 3.47.0
     dev: true
 
-  /prettier-plugin-tailwindcss/0.1.8_prettier@2.6.1:
+  /prettier-plugin-tailwindcss/0.1.8_prettier@2.6.2:
     resolution:
       {
         integrity: sha512-hwarSBCswAXa+kqYtaAkFr3Vop9o04WOyZs0qo3NyvW8L7f1rif61wRyq0+ArmVThOuRBcJF5hjGXYk86cwemg==
@@ -4236,13 +4234,13 @@ packages:
     peerDependencies:
       prettier: '>=2.2.0'
     dependencies:
-      prettier: 2.6.1
+      prettier: 2.6.2
     dev: true
 
-  /prettier/2.6.1:
+  /prettier/2.6.2:
     resolution:
       {
-        integrity: sha512-8UVbTBYGwN37Bs9LERmxCPjdvPxlEowx2urIL6urHzdb3SDq4B/Z6xLFCblrSnE4iKWcS6ziJ3aOYrc1kz/E2A==
+        integrity: sha512-PkUpF+qoXTqhOeWL9fu7As8LXsIUZ1WYaJiY/a7McAQzxjk82OF0tibkFXVCDImZtWxbvojFjerkiLb0/q8mew==
       }
     engines: { node: '>=10.13.0' }
     hasBin: true
@@ -4905,10 +4903,10 @@ packages:
     engines: { node: '>= 0.4' }
     dev: true
 
-  /svelte-check/2.4.6_postcss@8.4.12+svelte@3.46.4:
+  /svelte-check/2.6.0_postcss@8.4.12+svelte@3.47.0:
     resolution:
       {
-        integrity: sha512-luzdly7RJhyXucQe8ID/7CqDgXdMrPYXmyZBjCbp+cixzTopZotuWevrB5hWDOnOU19m2cyetigIIa7WDHnCmQ==
+        integrity: sha512-POL3IqLUuGqb9DdvuXQaSTNXYnw/odK4hqW86+2LwGcZTdbUPKBBln7pq74wXmcnRE+12bXMY1CvbcUNa2d5nw==
       }
     hasBin: true
     peerDependencies:
@@ -4917,12 +4915,11 @@ packages:
       chokidar: 3.5.3
       fast-glob: 3.2.11
       import-fresh: 3.3.0
-      minimist: 1.2.5
       picocolors: 1.0.0
       sade: 1.7.4
       source-map: 0.7.3
-      svelte: 3.46.4
-      svelte-preprocess: 4.10.4_296873641a0ad9f42fe92172d27bcedd
+      svelte: 3.47.0
+      svelte-preprocess: 4.10.5_41810887ae6c6d59323116f47e33fa38
       typescript: 4.6.3
     transitivePeerDependencies:
       - '@babel/core'
@@ -4937,7 +4934,7 @@ packages:
       - sugarss
     dev: true
 
-  /svelte-hmr/0.14.9_svelte@3.46.4:
+  /svelte-hmr/0.14.9_svelte@3.47.0:
     resolution:
       {
         integrity: sha512-bKE9+4qb4sAnA+TKHiYurUl970rjA0XmlP9TEP7K/ncyWz3m81kA4HOgmlZK/7irGK7gzZlaPDI3cmf8fp/+tg==
@@ -4945,7 +4942,7 @@ packages:
     peerDependencies:
       svelte: '>=3.19.0'
     dependencies:
-      svelte: 3.46.4
+      svelte: 3.47.0
     dev: true
 
   /svelte-kit-cookie-session/2.1.2:
@@ -4955,10 +4952,10 @@ packages:
       }
     dev: false
 
-  /svelte-preprocess/4.10.4_296873641a0ad9f42fe92172d27bcedd:
+  /svelte-preprocess/4.10.5_41810887ae6c6d59323116f47e33fa38:
     resolution:
       {
-        integrity: sha512-fuwol0N4UoHsNQolLFbMqWivqcJ9N0vfWO9IuPAiX/5okfoGXURyJ6nECbuEIv0nU3M8Xe2I1ONNje2buk7l6A==
+        integrity: sha512-VKXPRScCzAZqeBZOGq4LLwtNrAu++mVn7XvQox3eFDV7Ciq0Lg70Q8QWjH9iXF7J+pMlXhPsSFwpCb2E+hoeyA==
       }
     engines: { node: '>= 9.11.2' }
     requiresBuild: true
@@ -5006,7 +5003,7 @@ packages:
       postcss: 8.4.12
       sorcery: 0.10.0
       strip-indent: 3.0.0
-      svelte: 3.46.4
+      svelte: 3.47.0
       typescript: 4.6.3
     dev: true
 
@@ -5017,10 +5014,10 @@ packages:
       }
     dev: true
 
-  /svelte/3.46.4:
+  /svelte/3.47.0:
     resolution:
       {
-        integrity: sha512-qKJzw6DpA33CIa+C/rGp4AUdSfii0DOTCzj/2YpSKKayw5WGSS624Et9L1nU1k2OVRS9vaENQXp2CVZNU+xvIg==
+        integrity: sha512-4JaJp3HEoTCGARRWZQIZDUanhYv0iyoHikklVHVLH9xFE9db22g4TDv7CPeNA8HD1JgjXI1vlhR1JZvvhaTu2Q==
       }
     engines: { node: '>= 8' }
     dev: true
@@ -5301,10 +5298,10 @@ packages:
       }
     dev: true
 
-  /vite/2.8.0:
+  /vite/2.9.1:
     resolution:
       {
-        integrity: sha512-ed5rjyeysttuPJX/aKSA0gTB/8ZKLM5xF6FtEuKy1B9DiQbDNFMVMQxnb9JesgBPUMMIJxC8w5KZ/KNWLKFXoA==
+        integrity: sha512-vSlsSdOYGcYEJfkQ/NeLXgnRv5zZfpAsdztkIrs7AZHV8RCMZQkwjo4DS5BnrYTqoWqLoUe1Cah4aVO4oNNqCQ==
       }
     engines: { node: '>=12.2.0' }
     hasBin: true
@@ -5320,7 +5317,7 @@ packages:
       stylus:
         optional: true
     dependencies:
-      esbuild: 0.14.21
+      esbuild: 0.14.34
       postcss: 8.4.12
       resolve: 1.22.0
       rollup: 2.61.1

From 9bead1d6b4ed050b4bd354f0b1dd5b0d06e8b950 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Apr 2022 20:36:46 +0200
Subject: [PATCH 54/57] chore: Version++

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cbd22e7b2..fb5ba6a86 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "coolify",
 	"description": "An open-source & self-hostable Heroku / Netlify alternative.",
-	"version": "2.4.2",
+	"version": "2.4.3",
 	"license": "AGPL-3.0",
 	"scripts": {
 		"dev": "docker-compose -f docker-compose-dev.yaml up -d && cross-env NODE_ENV=development & svelte-kit dev",

From 1979e431b85565620bc4552194af9188f22c057a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Apr 2022 20:40:06 +0200
Subject: [PATCH 55/57] chore: update build scripts

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index fb5ba6a86..12bf63cd2 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,9 @@
 		"db:push": "prisma db push && prisma generate",
 		"db:seed": "prisma db seed",
 		"db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
-		"release:staging": "cross-var docker build -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
-		"release:pre": "cross-var docker build -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
-		"release:coolify": "cross-var yarn release:pre && docker push coollabsio/coolify:$npm_package_version && docker push coollabsio/coolify:latest",
+		"release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
+		"release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
+		"release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
 		"release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f haproxy.Dockerfile --push .",
 		"release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f haproxy-tcp.Dockerfile --push .",
 		"release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f haproxy-http.Dockerfile --push .",

From bea4943e9f9a1fa7fa549a300a4bb41ad9f3a6b4 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Apr 2022 20:43:19 +0200
Subject: [PATCH 56/57] chore: update build packages

---
 package.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 12bf63cd2..ceef4b161 100644
--- a/package.json
+++ b/package.json
@@ -17,9 +17,9 @@
 		"db:push": "prisma db push && prisma generate",
 		"db:seed": "prisma db seed",
 		"db:migrate": "COOLIFY_DATABASE_URL=file:../db/migration.db prisma migrate dev --skip-seed --name",
-		"release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest .",
-		"release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
-		"release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version . && docker push coollabsio/coolify:$npm_package_version",
+		"release:production:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version -t coollabsio/coolify:latest --push .",
+		"release:staging:all": "cross-var docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify:$npm_package_version --push .",
+		"release:staging:amd": "cross-var docker build --platform linux/amd64 -t coollabsio/coolify:$npm_package_version --push .",
 		"release:haproxy": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-alpine:latest -t coollabsio/coolify-haproxy-alpine:1.1.0 -f haproxy.Dockerfile --push .",
 		"release:haproxy:tcp": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-tcp-alpine:latest -t coollabsio/coolify-haproxy-tcp-alpine:1.1.0 -f haproxy-tcp.Dockerfile --push .",
 		"release:haproxy:http": "docker build --platform linux/amd64,linux/arm64 -t coollabsio/coolify-haproxy-http-alpine:latest -t coollabsio/coolify-haproxy-http-alpine:1.1.0 -f haproxy-http.Dockerfile --push .",

From 7ebcad6abb37cc3784e928597b2710b91f496355 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Mon, 11 Apr 2022 22:31:27 +0200
Subject: [PATCH 57/57] fix: Update dockerfile

---
 Dockerfile | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fa19947eb..87c4d54c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,14 @@
 FROM node:16.14.2-alpine as install
 WORKDIR /app
-COPY package*.json .
-RUN yarn install
 
-FROM node:16.14.2-alpine 
+RUN apk add --no-cache curl
+RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
+RUN pnpm add -g pnpm
+
+COPY package*.json .
+RUN pnpm install
+
+FROM node:16.14.2-alpine
 ARG TARGETPLATFORM
 
 WORKDIR /app
@@ -23,12 +28,15 @@ COPY . .
 RUN apk add --no-cache git git-lfs openssh-client curl jq cmake sqlite openssl
 RUN curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@6
 RUN pnpm add -g pnpm
-
 RUN mkdir -p ~/.docker/cli-plugins/
 RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-20.10.9 -o /usr/bin/docker
 RUN curl -SL https://cdn.coollabs.io/bin/$TARGETPLATFORM/docker-compose-linux-2.3.4 -o ~/.docker/cli-plugins/docker-compose
 RUN chmod +x ~/.docker/cli-plugins/docker-compose /usr/bin/docker
 
+RUN pnpm prisma generate
 RUN pnpm build
+
+
+
 EXPOSE 3000
 CMD ["pnpm", "start"]
\ No newline at end of file