diff --git a/src/lib/components/CopyPasswordField.svelte b/src/lib/components/CopyPasswordField.svelte index de9c6c9af..9a409fb17 100644 --- a/src/lib/components/CopyPasswordField.svelte +++ b/src/lib/components/CopyPasswordField.svelte @@ -20,7 +20,7 @@ function copyToClipboard() { if (isHttps && navigator.clipboard) { navigator.clipboard.writeText(value); - toast.push('Copied to clipboard'); + toast.push('Copied to clipboard.'); } } diff --git a/src/lib/components/Setting.svelte b/src/lib/components/Setting.svelte index 680203c95..c8764bed7 100644 --- a/src/lib/components/Setting.svelte +++ b/src/lib/components/Setting.svelte @@ -15,7 +15,12 @@ -
+
Waiting for the new version to start...'); + toast.push('Update completed.

Waiting for the new version to start...'); let reachable = false; let tries = 0; do { diff --git a/src/routes/applications/[id]/check.json.ts b/src/routes/applications/[id]/check.json.ts index 36e87b616..82fb487ed 100644 --- a/src/routes/applications/[id]/check.json.ts +++ b/src/routes/applications/[id]/check.json.ts @@ -16,7 +16,7 @@ export const post: RequestHandler = async (event) => { const found = await db.isDomainConfigured({ id, fqdn }); if (found) { throw { - message: `Domain ${getDomain(fqdn).replace('www.', '')} is already configured.` + message: `Domain ${getDomain(fqdn).replace('www.', '')} is already used.` }; } return { diff --git a/src/routes/applications/[id]/index.svelte b/src/routes/applications/[id]/index.svelte index 4e487ed9c..bfd9133eb 100644 --- a/src/routes/applications/[id]/index.svelte +++ b/src/routes/applications/[id]/index.svelte @@ -173,81 +173,71 @@ {/if}
-
+
-
- -
+
-
+
-
- -
+
-
+
-
- -
+
-
+
-
- - -
+ +
-
+
-
-
- -
+
+
@@ -255,24 +245,24 @@
Application
-
- -
- +
+
+
+
{#if !staticDeployments.includes(application.buildPack)} -
+
-
- -
-
- {/if} - - {#if !notNodeDeployments.includes(application.buildPack)} -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- {/if} - -
- -
-
+ {/if} + + {#if !notNodeDeployments.includes(application.buildPack)} +
+ + +
+
+ + +
+
+ + +
+ {/if} + +
+ + +
{#if !notNodeDeployments.includes(application.buildPack)} -
+
-
- - -
+ +
{/if}
diff --git a/src/routes/destinations/[id]/_FoundApp.svelte b/src/routes/destinations/[id]/_FoundApp.svelte index f183388fa..835c121bf 100644 --- a/src/routes/destinations/[id]/_FoundApp.svelte +++ b/src/routes/destinations/[id]/_FoundApp.svelte @@ -61,12 +61,12 @@
Loading...
{:else if app.foundByDomain}
- Domain already configured for + Domain already used for {app.foundName}
{:else if app.foundByRepository}
- Repository already configured for + Repository already used for {app.foundName}
{:else} diff --git a/src/routes/services/[id]/check.json.ts b/src/routes/services/[id]/check.json.ts index 861daee84..9a9193524 100644 --- a/src/routes/services/[id]/check.json.ts +++ b/src/routes/services/[id]/check.json.ts @@ -17,7 +17,7 @@ export const post: RequestHandler = async (event) => { return { status: found ? 500 : 200, body: { - error: found && `Domain ${getDomain(fqdn).replace('www.', '')} is already configured` + error: found && `Domain ${getDomain(fqdn).replace('www.', '')} is already used.` } }; } catch (error) { diff --git a/src/routes/settings/check.json.ts b/src/routes/settings/check.json.ts index 15d91613f..d24dcc0e6 100644 --- a/src/routes/settings/check.json.ts +++ b/src/routes/settings/check.json.ts @@ -16,7 +16,7 @@ export const post: RequestHandler = async (event) => { return { status: found ? 500 : 200, body: { - error: found && `Domain ${fqdn.replace('www.', '')} is already configured` + error: found && `Domain ${fqdn.replace('www.', '')} is already used.` } }; } catch (error) { diff --git a/src/routes/settings/index.json.ts b/src/routes/settings/index.json.ts index bd365d5e4..a1182bb42 100644 --- a/src/routes/settings/index.json.ts +++ b/src/routes/settings/index.json.ts @@ -78,7 +78,7 @@ export const post: RequestHandler = async (event) => { }; if (status === 401) return { status, body }; - const { fqdn, isRegistrationEnabled, dualCerts } = await event.request.json(); + const { fqdn, isRegistrationEnabled, dualCerts, minPort, maxPort } = await event.request.json(); try { const { id, @@ -119,6 +119,9 @@ export const post: RequestHandler = async (event) => { data: { isCoolifyProxyUsed: true } }); } + if (minPort && maxPort) { + await db.prisma.setting.update({ where: { id }, data: { minPort, maxPort } }); + } return { status: 201 diff --git a/src/routes/settings/index.svelte b/src/routes/settings/index.svelte index f86af5e4b..80c3cee80 100644 --- a/src/routes/settings/index.svelte +++ b/src/routes/settings/index.svelte @@ -35,6 +35,9 @@ let isRegistrationEnabled = settings.isRegistrationEnabled; let dualCerts = settings.dualCerts; + let minPort = settings.minPort; + let maxPort = settings.maxPort; + let fqdn = settings.fqdn; let isFqdnSet = !!settings.fqdn; let loading = { @@ -75,7 +78,11 @@ if (fqdn) { await post(`/settings/check.json`, { fqdn }); await post(`/settings.json`, { fqdn }); - return window.location.reload(); + } + if (minPort !== settings.minPort || maxPort !== settings.maxPort) { + await post(`/settings.json`, { minPort, maxPort }); + settings.minPort = minPort; + settings.maxPort = maxPort; } } catch ({ error }) { return errorNotification(error); @@ -112,7 +119,12 @@
-
Domain (FQDN)
+
+
Domain (FQDN)
+ +
+
+
+
+
+
Public Port Range
+
+
+ + - +
@@ -135,7 +168,7 @@ disabled={isFqdnSet} bind:setting={dualCerts} title="Generate SSL for www and non-www?" - description="It will generate certificates for both www and non-www.
You need to have both DNS entries set in advance.

Useful if you expect to have visitors on both." + description="It will generate certificates for both www and non-www.
You need to have both DNS entries set in advance.

Useful if you expect to have visitors on both." on:click={() => !isFqdnSet && changeSettings('dualCerts')} />