- {#if loading.usage}
-
- {:else}
-
- {/if}
-
+
@@ -99,6 +93,11 @@ class="btn btn-sm">Cleanup Storage {/if} + {#if loading.usage} + + {/if}
diff --git a/apps/ui/src/lib/components/svg/applications/Compose.svelte b/apps/ui/src/lib/components/svg/applications/Compose.svelte
index 86b9d622a..f0482e776 100644
--- a/apps/ui/src/lib/components/svg/applications/Compose.svelte
+++ b/apps/ui/src/lib/components/svg/applications/Compose.svelte
@@ -5,5 +5,5 @@
diff --git a/apps/ui/src/lib/components/svg/services/Appwrite.svelte b/apps/ui/src/lib/components/svg/services/Appwrite.svelte
deleted file mode 100644
index 5523a6f09..000000000
--- a/apps/ui/src/lib/components/svg/services/Appwrite.svelte
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Fider.svelte b/apps/ui/src/lib/components/svg/services/Fider.svelte
deleted file mode 100644
index 98d62b9f7..000000000
--- a/apps/ui/src/lib/components/svg/services/Fider.svelte
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Ghost.svelte b/apps/ui/src/lib/components/svg/services/Ghost.svelte
deleted file mode 100644
index d01ab2e3f..000000000
--- a/apps/ui/src/lib/components/svg/services/Ghost.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Grafana.svelte b/apps/ui/src/lib/components/svg/services/Grafana.svelte
deleted file mode 100644
index 8701f58e7..000000000
--- a/apps/ui/src/lib/components/svg/services/Grafana.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Hasura.svelte b/apps/ui/src/lib/components/svg/services/Hasura.svelte
deleted file mode 100644
index 51a427ccd..000000000
--- a/apps/ui/src/lib/components/svg/services/Hasura.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/LanguageTool.svelte b/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
deleted file mode 100644
index ce3ec948a..000000000
--- a/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/MinIO.svelte b/apps/ui/src/lib/components/svg/services/MinIO.svelte
deleted file mode 100644
index 5a314bf73..000000000
--- a/apps/ui/src/lib/components/svg/services/MinIO.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Moodle.svelte b/apps/ui/src/lib/components/svg/services/Moodle.svelte
deleted file mode 100644
index a52ddc6f7..000000000
--- a/apps/ui/src/lib/components/svg/services/Moodle.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/apps/ui/src/lib/components/svg/services/N8n.svelte b/apps/ui/src/lib/components/svg/services/N8n.svelte
deleted file mode 100644
index da7ab2b88..000000000
--- a/apps/ui/src/lib/components/svg/services/N8n.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/NocoDB.svelte b/apps/ui/src/lib/components/svg/services/NocoDB.svelte
deleted file mode 100644
index fcaac6a96..000000000
--- a/apps/ui/src/lib/components/svg/services/NocoDB.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte b/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte
deleted file mode 100644
index e10ead645..000000000
--- a/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Searxng.svelte b/apps/ui/src/lib/components/svg/services/Searxng.svelte
deleted file mode 100644
index bb775d2bf..000000000
--- a/apps/ui/src/lib/components/svg/services/Searxng.svelte
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte
index a4a515689..d47411c1c 100644
--- a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte
+++ b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte
@@ -1,49 +1,45 @@
-{#if type === 'plausibleanalytics'}
- 
{/if}
diff --git a/apps/ui/src/lib/components/svg/services/Trilium.svelte b/apps/ui/src/lib/components/svg/services/Trilium.svelte
deleted file mode 100644
index 2bd749f44..000000000
--- a/apps/ui/src/lib/components/svg/services/Trilium.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte b/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
deleted file mode 100644
index 00f3d0edd..000000000
--- a/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Wordpress.svelte b/apps/ui/src/lib/components/svg/services/Wordpress.svelte
deleted file mode 100644
index c6a79e5e9..000000000
--- a/apps/ui/src/lib/components/svg/services/Wordpress.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/index.ts b/apps/ui/src/lib/components/svg/services/index.ts
deleted file mode 100644
index 5f3bf2b10..000000000
--- a/apps/ui/src/lib/components/svg/services/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-//@ts-nocheck
-export { default as PlausibleAnalytics } from './PlausibleAnalytics.svelte';
-export { default as NocoDb } from './NocoDB.svelte';
-export { default as MinIo } from './MinIO.svelte';
-export { default as VsCodeServer } from './VSCodeServer.svelte';
-export { default as Wordpress } from './Wordpress.svelte';
-export { default as VaultWarden } from './VaultWarden.svelte';
-export { default as LanguageTool } from './LanguageTool.svelte';
-export { default as N8n } from './N8n.svelte';
-export { default as UptimeKuma } from './UptimeKuma.svelte';
-export { default as Ghost } from './Ghost.svelte';
-export { default as MeiliSearch } from './MeiliSearch.svelte';
-export { default as Umami } from './Umami.svelte';
-export { default as Hasura } from './Hasura.svelte';
-export { default as Fider } from './Fider.svelte';
-export { default as Appwrite } from './Appwrite.svelte';
-export { default as Moodle } from './Moodle.svelte';
-export { default as GlitchTip } from './GlitchTip.svelte';
-export { default as Searxng } from './Searxng.svelte';
-export { default as Weblate } from './Weblate.svelte';
-export { default as Grafana } from './Grafana.svelte';
-export { default as Trilium } from './Trilium.svelte'
diff --git a/apps/ui/src/lib/locales/en.json b/apps/ui/src/lib/locales/en.json
index 5abe6ee55..709ba4227 100644
--- a/apps/ui/src/lib/locales/en.json
+++ b/apps/ui/src/lib/locales/en.json
@@ -41,7 +41,7 @@
"saving": "Saving...",
"name": "Name",
"value": "Value",
- "action": "Action",
+ "action": "Actions",
"is_required": "is required.",
"add": "Add",
"set": "Set",
diff --git a/apps/ui/src/lib/store.ts b/apps/ui/src/lib/store.ts
index 38a8eb4eb..03e9c9116 100644
--- a/apps/ui/src/lib/store.ts
+++ b/apps/ui/src/lib/store.ts
@@ -1,7 +1,11 @@
import { dev } from '$app/env';
import cuid from 'cuid';
+import Cookies from 'js-cookie';
import { writable, readable, type Writable } from 'svelte/store';
+import { io as ioClient } from 'socket.io-client';
+const socket = ioClient(dev ? 'http://localhost:3001' : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
+export const io = socket;
interface AppSession {
isRegistrationEnabled: boolean;
ipv4: string | null,
@@ -19,7 +23,6 @@ interface AppSession {
github: string | null,
gitlab: string | null,
},
- supportedServiceTypesAndVersions: Array
pendingInvitations: Array
}
interface AddToast {
@@ -48,7 +51,6 @@ export const appSession: Writable = writable({
github: null,
gitlab: null
},
- supportedServiceTypesAndVersions: [],
pendingInvitations: []
});
export const disabledButton: Writable = writable(false);
@@ -81,9 +83,10 @@ export const status: Writable = writable({
initialLoading: true
},
service: {
- isRunning: false,
- isExited: false,
+ statuses: [],
+ overallStatus: 'stopped',
loading: false,
+ startup: {},
initialLoading: true
},
database: {
@@ -161,4 +164,11 @@ export const addToast = (toast: AddToast) => {
toasts.update((all: any) => [t, ...all])
}
-export const selectedBuildId: any = writable(null)
\ No newline at end of file
+export const selectedBuildId: any = writable(null)
+
+type State = {
+ requests: Array;
+};
+export const state = writable({
+ requests: [],
+});
diff --git a/apps/ui/src/routes/_NewResource.svelte b/apps/ui/src/routes/_NewResource.svelte
index 181464821..c02221d02 100644
--- a/apps/ui/src/routes/_NewResource.svelte
+++ b/apps/ui/src/routes/_NewResource.svelte
@@ -16,6 +16,7 @@
}
+
@@ -295,7 +306,7 @@
{#if $appSession.whiteLabeled}
Powered by CoolifyPowered by Coolify
{/if}
{/if}
@@ -436,6 +447,7 @@
diff --git a/apps/ui/src/lib/components/svg/services/Appwrite.svelte b/apps/ui/src/lib/components/svg/services/Appwrite.svelte
deleted file mode 100644
index 5523a6f09..000000000
--- a/apps/ui/src/lib/components/svg/services/Appwrite.svelte
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Fider.svelte b/apps/ui/src/lib/components/svg/services/Fider.svelte
deleted file mode 100644
index 98d62b9f7..000000000
--- a/apps/ui/src/lib/components/svg/services/Fider.svelte
+++ /dev/null
@@ -1,121 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Ghost.svelte b/apps/ui/src/lib/components/svg/services/Ghost.svelte
deleted file mode 100644
index d01ab2e3f..000000000
--- a/apps/ui/src/lib/components/svg/services/Ghost.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Grafana.svelte b/apps/ui/src/lib/components/svg/services/Grafana.svelte
deleted file mode 100644
index 8701f58e7..000000000
--- a/apps/ui/src/lib/components/svg/services/Grafana.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Hasura.svelte b/apps/ui/src/lib/components/svg/services/Hasura.svelte
deleted file mode 100644
index 51a427ccd..000000000
--- a/apps/ui/src/lib/components/svg/services/Hasura.svelte
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/LanguageTool.svelte b/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
deleted file mode 100644
index ce3ec948a..000000000
--- a/apps/ui/src/lib/components/svg/services/LanguageTool.svelte
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/MinIO.svelte b/apps/ui/src/lib/components/svg/services/MinIO.svelte
deleted file mode 100644
index 5a314bf73..000000000
--- a/apps/ui/src/lib/components/svg/services/MinIO.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Moodle.svelte b/apps/ui/src/lib/components/svg/services/Moodle.svelte
deleted file mode 100644
index a52ddc6f7..000000000
--- a/apps/ui/src/lib/components/svg/services/Moodle.svelte
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
diff --git a/apps/ui/src/lib/components/svg/services/N8n.svelte b/apps/ui/src/lib/components/svg/services/N8n.svelte
deleted file mode 100644
index da7ab2b88..000000000
--- a/apps/ui/src/lib/components/svg/services/N8n.svelte
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/NocoDB.svelte b/apps/ui/src/lib/components/svg/services/NocoDB.svelte
deleted file mode 100644
index fcaac6a96..000000000
--- a/apps/ui/src/lib/components/svg/services/NocoDB.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte b/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte
deleted file mode 100644
index e10ead645..000000000
--- a/apps/ui/src/lib/components/svg/services/PlausibleAnalytics.svelte
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Searxng.svelte b/apps/ui/src/lib/components/svg/services/Searxng.svelte
deleted file mode 100644
index bb775d2bf..000000000
--- a/apps/ui/src/lib/components/svg/services/Searxng.svelte
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte
index a4a515689..d47411c1c 100644
--- a/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte
+++ b/apps/ui/src/lib/components/svg/services/ServiceIcons.svelte
@@ -1,49 +1,45 @@
-{#if type === 'plausibleanalytics'}
-
diff --git a/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte b/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
deleted file mode 100644
index 00f3d0edd..000000000
--- a/apps/ui/src/lib/components/svg/services/VSCodeServer.svelte
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/Wordpress.svelte b/apps/ui/src/lib/components/svg/services/Wordpress.svelte
deleted file mode 100644
index c6a79e5e9..000000000
--- a/apps/ui/src/lib/components/svg/services/Wordpress.svelte
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
diff --git a/apps/ui/src/lib/components/svg/services/index.ts b/apps/ui/src/lib/components/svg/services/index.ts
deleted file mode 100644
index 5f3bf2b10..000000000
--- a/apps/ui/src/lib/components/svg/services/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-//@ts-nocheck
-export { default as PlausibleAnalytics } from './PlausibleAnalytics.svelte';
-export { default as NocoDb } from './NocoDB.svelte';
-export { default as MinIo } from './MinIO.svelte';
-export { default as VsCodeServer } from './VSCodeServer.svelte';
-export { default as Wordpress } from './Wordpress.svelte';
-export { default as VaultWarden } from './VaultWarden.svelte';
-export { default as LanguageTool } from './LanguageTool.svelte';
-export { default as N8n } from './N8n.svelte';
-export { default as UptimeKuma } from './UptimeKuma.svelte';
-export { default as Ghost } from './Ghost.svelte';
-export { default as MeiliSearch } from './MeiliSearch.svelte';
-export { default as Umami } from './Umami.svelte';
-export { default as Hasura } from './Hasura.svelte';
-export { default as Fider } from './Fider.svelte';
-export { default as Appwrite } from './Appwrite.svelte';
-export { default as Moodle } from './Moodle.svelte';
-export { default as GlitchTip } from './GlitchTip.svelte';
-export { default as Searxng } from './Searxng.svelte';
-export { default as Weblate } from './Weblate.svelte';
-export { default as Grafana } from './Grafana.svelte';
-export { default as Trilium } from './Trilium.svelte'
diff --git a/apps/ui/src/lib/locales/en.json b/apps/ui/src/lib/locales/en.json
index 5abe6ee55..709ba4227 100644
--- a/apps/ui/src/lib/locales/en.json
+++ b/apps/ui/src/lib/locales/en.json
@@ -41,7 +41,7 @@
"saving": "Saving...",
"name": "Name",
"value": "Value",
- "action": "Action",
+ "action": "Actions",
"is_required": "is required.",
"add": "Add",
"set": "Set",
diff --git a/apps/ui/src/lib/store.ts b/apps/ui/src/lib/store.ts
index 38a8eb4eb..03e9c9116 100644
--- a/apps/ui/src/lib/store.ts
+++ b/apps/ui/src/lib/store.ts
@@ -1,7 +1,11 @@
import { dev } from '$app/env';
import cuid from 'cuid';
+import Cookies from 'js-cookie';
import { writable, readable, type Writable } from 'svelte/store';
+import { io as ioClient } from 'socket.io-client';
+const socket = ioClient(dev ? 'http://localhost:3001' : '/', { auth: { token: Cookies.get('token') }, autoConnect: false });
+export const io = socket;
interface AppSession {
isRegistrationEnabled: boolean;
ipv4: string | null,
@@ -19,7 +23,6 @@ interface AppSession {
github: string | null,
gitlab: string | null,
},
- supportedServiceTypesAndVersions: Array
Build & DeployConfiguration
{#if (index === 0 && !isNewSecret) || length === 0}
-
+
{/if}
diff --git a/apps/ui/src/routes/applications/[id]/_Storage.svelte b/apps/ui/src/routes/applications/[id]/_Storage.svelte
index dc7058036..cf54e16df 100644
--- a/apps/ui/src/routes/applications/[id]/_Storage.svelte
+++ b/apps/ui/src/routes/applications/[id]/_Storage.svelte
@@ -59,19 +59,33 @@
}
-
-
{:else}
-
-
-
+
diff --git a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
index 6209e851a..13e16e1ce 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/destination.svelte
@@ -88,31 +88,111 @@
+
diff --git a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
index 94fc11885..8f2c09ea0 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/_GitlabRepositories.svelte
@@ -195,27 +195,11 @@
}
}
- async function isBranchAlreadyUsed(event) {
+ async function selectBranch(event: any) {
selected.branch = event.detail;
- try {
- // const data = await get(
- // `/applications/${id}/configuration/repository?repository=${selected.project.path_with_namespace}&branch=${selected.branch.name}`
- // );
- // if (data.used) {
- // const sure = confirm($t('application.configuration.branch_already_in_use'));
- // if (sure) {
- // autodeploy = false;
- // showSave = true;
- // return true;
- // }
- // showSave = false;
- // return true;
- // }
- showSave = true;
- } catch (error) {
- return errorNotification(error);
- }
+ showSave = true;
}
+
async function checkSSHKey(sshkeyUrl: any) {
try {
return await post(sshkeyUrl, {});
@@ -394,7 +378,7 @@
showIndicator={!loading.branches}
isWaiting={loading.branches}
isDisabled={loading.branches || !selected.project}
- on:select={isBranchAlreadyUsed}
+ on:select={selectBranch}
on:clear={() => {
showSave = false;
selected.branch = null;
@@ -414,7 +398,6 @@
class="btn btn-wide"
type="submit"
disabled={!showSave || loading.save}
- class:bg-applications={showSave && !loading.save}
>{loading.save ? $t('forms.saving') : $t('forms.save')}
{#if tryAgain}
@@ -423,7 +406,7 @@
configuration here.
+ {#if storage.id}
+
+
+
+
+ {/if}
+
+
+
+
+
{#if isNew}
-
diff --git a/apps/ui/src/routes/applications/[id]/__layout.svelte b/apps/ui/src/routes/applications/[id]/__layout.svelte
index dc51e0185..1f91a495a 100644
--- a/apps/ui/src/routes/applications/[id]/__layout.svelte
+++ b/apps/ui/src/routes/applications/[id]/__layout.svelte
@@ -75,7 +75,7 @@
let statusInterval: any;
let forceDelete = false;
-
+ let stopping = false;
const { id } = $page.params;
$isDeploymentEnabled = checkIfDeploymentEnabledApplications($appSession.isAdmin, application);
@@ -138,17 +138,17 @@
}
async function stopApplication() {
try {
- $status.application.initialLoading = true;
+ stopping = true;
await post(`/applications/${id}/stop`, {});
} catch (error) {
return errorNotification(error);
} finally {
- $status.application.initialLoading = false;
+ stopping = false;
await getStatus();
}
}
async function getStatus() {
- if ($status.application.loading) return;
+ if ($status.application.loading && stopping) return;
$status.application.loading = true;
const data = await get(`/applications/${id}/status`);
@@ -194,6 +194,8 @@
onDestroy(() => {
$status.application.initialLoading = true;
$status.application.loading = false;
+ $status.application.statuses = [];
+ $status.application.overallStatus = 'stopped';
$location = null;
$isDeploymentEnabled = false;
clearInterval(statusInterval);
@@ -233,7 +235,7 @@
class:text-red-500={$status.application.overallStatus === 'stopped'}
>
{$status.application.overallStatus === 'healthy'
- ? 'Running'
+ ? 'Healthy'
: $status.application.overallStatus === 'degraded'
? 'Degraded'
: 'Stopped'}
@@ -296,7 +298,29 @@
Application Error
{/if}
- {#if $status.application.initialLoading}
+ {#if stopping}
+
+ {:else if $status.application.initialLoading}
+
{#each ownDestinations as destination}
-
{#if otherDestinations.length > 0 && $appSession.teamId === '0'}
-
-
+
{/each}
Other Destinations
{/if}
-
+
{#each otherDestinations as destination}
-
{/if}
diff --git a/apps/ui/src/routes/applications/[id]/configuration/source.svelte b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
index f06c0ad38..f29613198 100644
--- a/apps/ui/src/routes/applications/[id]/configuration/source.svelte
+++ b/apps/ui/src/routes/applications/[id]/configuration/source.svelte
@@ -68,7 +68,9 @@
-
-
+
{/each}
-
Git App
+ {#if !filteredSources}
+ Git App
+ {/if}
{#if !filteredSources}
@@ -76,10 +78,7 @@
{$t('application.configuration.no_configurable_git')}
-
+