diff --git a/src/lib/components/templates.ts b/src/lib/components/templates.ts
index 5166baabc..aa1ed9528 100644
--- a/src/lib/components/templates.ts
+++ b/src/lib/components/templates.ts
@@ -128,9 +128,7 @@ export function findBuildPack(pack, packageManager = 'npm') {
if (pack === 'astro') {
return {
...metaData,
- installCommand: `yarn install`,
- buildCommand: `yarn build`,
- startCommand: null,
+ ...defaultBuildAndDeploy(packageManager),
publishDirectory: `dist`,
port: 80
};
@@ -138,9 +136,7 @@ export function findBuildPack(pack, packageManager = 'npm') {
if (pack === 'eleventy') {
return {
...metaData,
- installCommand: `yarn install`,
- buildCommand: `yarn build`,
- startCommand: null,
+ ...defaultBuildAndDeploy(packageManager),
publishDirectory: `_site`,
port: 80
};
diff --git a/src/lib/database/common.ts b/src/lib/database/common.ts
index c6293e76f..53551882b 100644
--- a/src/lib/database/common.ts
+++ b/src/lib/database/common.ts
@@ -28,7 +28,7 @@ if (!dev) {
}
export const prisma = new PrismaClient({
- errorFormat: 'pretty',
+ errorFormat: 'minimal',
rejectOnNotFound: false
});
diff --git a/src/lib/database/services.ts b/src/lib/database/services.ts
index 99bbf224c..a1fb7f2de 100644
--- a/src/lib/database/services.ts
+++ b/src/lib/database/services.ts
@@ -329,7 +329,8 @@ export async function updatePlausibleAnalyticsService({
email,
exposePort,
username,
- name
+ name,
+ scriptName
}: {
id: string;
fqdn: string;
@@ -337,8 +338,12 @@ export async function updatePlausibleAnalyticsService({
name: string;
email: string;
username: string;
+ scriptName: string;
}): Promise
+
-
-
-
-
-
-
{/if}
-
-
+ {#if application.buildPack !== 'docker'}
+
+ {/if}
{#if application.buildCommand || application.buildPack === 'rust' || application.buildPack === 'laravel'}
+
+
-
+
+
+
+
{#if !applications || ownApplications.length === 0}
-{$t('application.no_applications_found')}
diff --git a/src/routes/dashboard.json.ts b/src/routes/dashboard.json.ts
index ff01dbfd8..297ce1a14 100644
--- a/src/routes/dashboard.json.ts
+++ b/src/routes/dashboard.json.ts
@@ -2,45 +2,67 @@ import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
+import os from 'node:os';
+import osu from 'node-os-utils';
export const get: RequestHandler = async (event) => {
const { userId, teamId, status, body } = await getUserDetails(event);
if (status === 401) return { status, body };
-
- try {
- const applicationsCount = await db.prisma.application.count({
- where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
- });
- const sourcesCount = await db.prisma.gitSource.count({
- where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
- });
- const destinationsCount = await db.prisma.destinationDocker.count({
- 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 === '0' ? undefined : teamId } } }
- });
- const servicesCount = await db.prisma.service.count({
- 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,
- teamsCount,
- databasesCount,
- servicesCount
- }
- };
- } catch (error) {
- return ErrorHandler(error);
+ const usage = event.url.searchParams.get('usage');
+ if (usage) {
+ try {
+ return {
+ status: 200,
+ body: {
+ uptime: os.uptime(),
+ memory: await osu.mem.info(),
+ cpu: {
+ load: os.loadavg(),
+ usage: await osu.cpu.usage(),
+ count: os.cpus().length
+ },
+ disk: await osu.drive.info()
+ }
+ };
+ } catch (error) {
+ return ErrorHandler(error);
+ }
+ } else {
+ try {
+ const applicationsCount = await db.prisma.application.count({
+ where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
+ });
+ const sourcesCount = await db.prisma.gitSource.count({
+ where: { teams: { some: { id: teamId === '0' ? undefined : teamId } } }
+ });
+ const destinationsCount = await db.prisma.destinationDocker.count({
+ 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 === '0' ? undefined : teamId } } }
+ });
+ const servicesCount = await db.prisma.service.count({
+ 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,
+ teamsCount,
+ databasesCount,
+ servicesCount
+ }
+ };
+ } catch (error) {
+ return ErrorHandler(error);
+ }
}
};
diff --git a/src/routes/databases/index.svelte b/src/routes/databases/index.svelte
index ec6b86291..94520ba0d 100644
--- a/src/routes/databases/index.svelte
+++ b/src/routes/databases/index.svelte
@@ -47,7 +47,7 @@
+
{#if !databases || ownDatabases.length === 0}
{$t('database.no_databases_found')}
diff --git a/src/routes/destinations/[id]/index.svelte b/src/routes/destinations/[id]/index.svelte
index 1effefdd7..dabc3c88f 100644
--- a/src/routes/destinations/[id]/index.svelte
+++ b/src/routes/destinations/[id]/index.svelte
@@ -39,10 +39,13 @@
import { t } from '$lib/translations';
-
-
{$t('application.destination')}
- >
- {destination.name}
+
+
+
+ Configuration
+
+ {destination.name}
+
diff --git a/src/routes/index.svelte b/src/routes/index.svelte
index 1eaabbd5c..fbf91d066 100644
--- a/src/routes/index.svelte
+++ b/src/routes/index.svelte
@@ -21,6 +21,11 @@
-
{$t('index.dashboard')}
-
+
-
diff --git a/src/routes/services/[id]/_Services/_Services.svelte b/src/routes/services/[id]/_Services/_Services.svelte
index a34f140f0..facf713c1 100644
--- a/src/routes/services/[id]/_Services/_Services.svelte
+++ b/src/routes/services/[id]/_Services/_Services.svelte
@@ -27,7 +27,6 @@
let loading = false;
let loadingVerification = false;
let dualCerts = service.dualCerts;
- let showExposePort = service.exposePort !== null;
async function handleSubmit() {
loading = true;
@@ -161,34 +160,23 @@
on:click={() => !isRunning && changeSettings('dualCerts')}
/>
-
-
-
diff --git a/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte b/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
index 26b11c6f7..c348f123e 100644
--- a/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
+++ b/src/routes/services/[id]/_Services/_PlausibleAnalytics.svelte
@@ -1,13 +1,32 @@
-
-
+ -
-
-
- - {$t('index.applications')} - -
- - {applicationsCount} - - - -
- - {$t('index.destinations')} - -
- - {destinationsCount} - - - -
- - {$t('index.git_sources')} - -
- - {sourcesCount} - - - -
- - {$t('index.databases')} - -
- {databasesCount} - - -
- - {$t('index.services')} - -
- {servicesCount} - +
- Total Memory +
- + {(usage?.memory.totalMemMb).toFixed(0)}MB + +
- - {$t('index.teams')} - -
- - {teamsCount} - - -
+ {#if $session.teamId === '0'}
+
- Server Usage
+ -
+
+
-
-
+ Used Memory
+
+ {(usage?.memory.usedMemMb).toFixed(0)}MB
+
+
+
+
+ Free Memory
+
+ {usage?.memory.freeMemPercentage}%
+ {#if !memoryWarning}
+
+
+
+ -
+
- Total CPUs +
- + {usage?.cpu.count} + +
- Load Average (5/10/30mins) +
- + {usage?.cpu.load.join('/')} + +
- CPU Usage +
-
+ {usage?.cpu.usage}%
+ {#if !cpuWarning}
+
+ {/if} +
+
+
+
+
+
+
+ -
+
- Total Disk +
- + {usage?.disk.totalGb}GB + +
- Used Disk +
- + {usage?.disk.usedGb}GB + +
- Free Disk +
-
+ {usage?.disk.freePercentage}%
+ {#if !diskWarning}
+
+ {/if} +
+
+
+
+
+
+
+ Resources
+ {/if}
+
+
Plausible Analytics
+
+
+
- {
- showExposePort = !showExposePort;
- service.exposePort = undefined;
- }}
- title={$t('application.expose_a_port')}
- description="Expose a port to the host system"
+
-
+
+
+
Useful if you would like to use your own reverse proxy or tunnel and also in development mode. Otherwise leave empty.'} />
- {#if showExposePort}
- Useful if you would like to use your own reverse proxy or tunnel and also in development mode. Otherwise leave empty.'} />
-
-
-
- {/if}
-
{#if service.type === 'plausibleanalytics'}
- MySQL
+ !isRunning && changeSettings('ownMysql')}
+ title="Use your own MySQL server"
+ description="Enables the use of your own MySQL server. If you don't have one, you can use the one provided by Coolify."
+ />
+
+{#if service.wordpress.ownMysql}
+
+
+
+
+
+
+
+
+{/if}
-
-
-
-
-
-
+{#if !service.wordpress.ownMysql}
+
+
+
+
+
+
+
+{/if}
-
+
+
{#if !services || ownServices.length === 0}
{$t('service.no_service')}
diff --git a/src/routes/sources/[id]/index.svelte b/src/routes/sources/[id]/index.svelte
index 7538dbbbd..4b12fe1c6 100644
--- a/src/routes/sources/[id]/index.svelte
+++ b/src/routes/sources/[id]/index.svelte
@@ -68,10 +68,48 @@
}
-
-
{$t('application.git_source')}
- >
- {source.name}
+
+
+
+ {#if source?.type === 'gitlab'}
+
+ {:else if source?.type === 'github'}
+
+ {/if}
+ Configuration
+
+ {source.name}
+
diff --git a/src/routes/sources/index.svelte b/src/routes/sources/index.svelte
index 72489bdea..b9c617b06 100644
--- a/src/routes/sources/index.svelte
+++ b/src/routes/sources/index.svelte
@@ -62,7 +62,7 @@
{/if}
-
+
{#if !sources || ownSources.length === 0}