From d5cfb63f5250f095cf762f923b709df174f57a57 Mon Sep 17 00:00:00 2001 From: Kaname <56084970+kaname-png@users.noreply.github.com> Date: Wed, 7 Sep 2022 00:50:34 +0000 Subject: [PATCH] fix(routes): ui from services page --- .../src/routes/applications/[id]/index.svelte | 23 +- .../services/[id]/_Services/_Appwrite.svelte | 24 +- .../services/[id]/_Services/_Fider.svelte | 72 +-- .../services/[id]/_Services/_Ghost.svelte | 34 +- .../services/[id]/_Services/_GlitchTip.svelte | 62 +-- .../services/[id]/_Services/_Hasura.svelte | 16 +- .../[id]/_Services/_MeiliSearch.svelte | 4 +- .../services/[id]/_Services/_MinIO.svelte | 15 +- .../services/[id]/_Services/_Moodle.svelte | 38 +- .../[id]/_Services/_PlausibleAnalytics.svelte | 34 +- .../services/[id]/_Services/_Searxng.svelte | 8 +- .../services/[id]/_Services/_Services.svelte | 374 +++++++-------- .../services/[id]/_Services/_Taiga.svelte | 36 +- .../services/[id]/_Services/_Umami.svelte | 8 +- .../[id]/_Services/_VSCodeServer.svelte | 4 +- .../services/[id]/_Services/_Weblate.svelte | 20 +- .../services/[id]/_Services/_Wordpress.svelte | 54 ++- .../src/routes/services/[id]/__layout.svelte | 444 +++++++++--------- apps/ui/src/routes/services/[id]/index.svelte | 6 +- 19 files changed, 645 insertions(+), 631 deletions(-) diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte index 3dd4a6bae..82fdf3414 100644 --- a/apps/ui/src/routes/applications/[id]/index.svelte +++ b/apps/ui/src/routes/applications/[id]/index.svelte @@ -370,7 +370,7 @@
-
{$t('general')}
+

{$t('general')}

{#if $appSession.isAdmin}
+
@@ -474,7 +475,7 @@ + {isDisabled} + containerClasses={(isDisabled && containerClass()) || 'bg-neutral border-0'} + id="baseImages" + showIndicator={!$status.application.isRunning} + items={application.baseImages} + on:select={selectBaseImage} + value={application.baseImage} + isClearable={false} + />
{/if} {#if application.buildPack !== 'docker' && (application.buildPack === 'nextjs' || application.buildPack === 'nuxtjs')} diff --git a/apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte b/apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte index f27e49fd4..a0bee65bc 100644 --- a/apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte +++ b/apps/ui/src/routes/services/[id]/_Services/_Appwrite.svelte @@ -10,8 +10,8 @@
Appwrite
-
- +
+
-
- +
+ Redis
- +
- +
- +
- +
- +
- + Fider
-
- +
+
-
- - + +
Email
-
- +
+
-
- - + +
-
- +
+
+ +
-
- - + +
-
- - + +
-
- +
+
-
- - + + PostgreSQL
-
- +
+
-
- +
+
-
- +
+
-
- - + +
-
- +
+
MariaDB
-
- +
+
-
- +
+
-
- - + +
-
- +
+
-
- +
+ GlitchTip
-
+
Email settings
-
+
-
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+
-
- +
+ Default User & Superuser
-
- +
+
-
- +
+
-
- +
+ PostgreSQL
-
- +
+
-
- +
+
-
- +
+ Hasura
-
- +
+ PostgreSQL
-
- +
+
-
- +
+
-
- +
+
MeiliSearch
-
- +
+
MinIO
-
- - + +
-
- +
+
{#if !service.minio.apiFqdn} -
- +
+
Moodle
-
- - + +
-
- +
+
-
- +
+
MariaDB
-
- +
+
-
- +
+
-
- - + +
-
- +
+
-
- +
+
Plausible Analytics
-
-
-
- - + +
-
- +
+
-
- +
+
PostgreSQL
-
- +
+
-
- +
+
-
- +
+ SearXNG
-
- +
+ Redis
-
- +
+ -
+
{$t('general')}
- {#if $appSession.isAdmin} +
+ {#if $appSession.isAdmin} {/if} +
-
- {#if service.type === 'minio' && !service.minio.apiFqdn && $status.service.isRunning} -
- IMPORTANT! There was a small modification with - Minio in the latest version of Coolify. Now you can separate the Console URL from the API URL, - so you could use both through SSL. But this proccess cannot be done automatically, so you have - to stop your Minio instance, configure the new domain and start it back. Sorry for any inconvenience. -
- {/if} -
- -
- -
+ {#if service.type === 'minio' && !service.minio.apiFqdn && $status.service.isRunning} +
+ IMPORTANT! There was a small modification with Minio + in the latest version of Coolify. Now you can separate the Console URL from the API URL, so you + could use both through SSL. But this proccess cannot be done automatically, so you have to stop + your Minio instance, configure the new domain and start it back. Sorry for any inconvenience.
-
- - - -
-
- -
- {#if service.destinationDockerId} -
- -
- {/if} -
-
- {#if service.type === 'minio'} -
-
- -
+ {/if} - -
-
-
- -
- - -
- {:else} -
-
- -
- - -
- {/if} - {#if forceSave} -
- {#if isNonWWWDomainOK} - - {:else} - - {/if} - {#if dualCerts} - {#if isWWWDomainOK} - - {:else} - - {/if} - {/if} -
- {/if} -
- !$status.service.isRunning && changeSettings('dualCerts')} +
+ +
+
-
- + + + +
+ {#if service.destinationDockerId} +
+ +
+ {/if} +
+ + {#if service.type === 'minio'} + + + + + + {:else} + + -
- - {#if service.type === 'plausibleanalytics'} - - {:else if service.type === 'minio'} - - {:else if service.type === 'vscodeserver'} - - {:else if service.type === 'wordpress'} - - {:else if service.type === 'ghost'} - - {:else if service.type === 'meilisearch'} - - {:else if service.type === 'umami'} - - {:else if service.type === 'hasura'} - - {:else if service.type === 'fider'} - - {:else if service.type === 'appwrite'} - - {:else if service.type === 'moodle'} - - {:else if service.type === 'glitchTip'} - - {:else if service.type === 'searxng'} - - {:else if service.type === 'weblate'} - - {:else if service.type === 'taiga'} - {/if}
+ {#if forceSave} +
+ {#if isNonWWWDomainOK} + + {:else} + + {/if} + {#if dualCerts} + {#if isWWWDomainOK} + + {:else} + + {/if} + {/if} +
+ {/if} + +
+ !$status.service.isRunning && changeSettings('dualCerts')} + /> + + +
+ {#if service.type === 'plausibleanalytics'} + + {:else if service.type === 'minio'} + + {:else if service.type === 'vscodeserver'} + + {:else if service.type === 'wordpress'} + + {:else if service.type === 'ghost'} + + {:else if service.type === 'meilisearch'} + + {:else if service.type === 'umami'} + + {:else if service.type === 'hasura'} + + {:else if service.type === 'fider'} + + {:else if service.type === 'appwrite'} + + {:else if service.type === 'moodle'} + + {:else if service.type === 'glitchTip'} + + {:else if service.type === 'searxng'} + + {:else if service.type === 'weblate'} + + {:else if service.type === 'taiga'} + + {/if}
diff --git a/apps/ui/src/routes/services/[id]/_Services/_Taiga.svelte b/apps/ui/src/routes/services/[id]/_Services/_Taiga.svelte index 1a29943e9..ca064ef3d 100644 --- a/apps/ui/src/routes/services/[id]/_Services/_Taiga.svelte +++ b/apps/ui/src/routes/services/[id]/_Services/_Taiga.svelte @@ -8,8 +8,8 @@
Taiga
-
- +
+ Django
-
- +
+
-
- +
+ RabbitMQ
-
- +
+
-
- +
+ PostgreSQL
-
- +
+
-
- +
+
-
- +
+
-
- +
+
Umami
-
- +
+
-
-
-
- +
+ Weblate
-
- +
+ PostgreSQL
-
- +
+
-
- +
+
-
- +
+
-
- +
+ Wordpress
-
- +
+