From 8c05214e78c45784b716f0adf7e47edd05d6e454 Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Wed, 12 Mar 2025 09:06:25 -0400 Subject: [PATCH 1/5] fix(monitoring): remove extra percent from cpu usage --- .../free/container/show-free-container-monitoring.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx index 968cf9c2..117fae38 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx @@ -218,7 +218,7 @@ export const ContainerFreeMonitoring = ({
- Used: {currentData.cpu.value}% + Used: {currentData.cpu.value} From 7afbe8b20812279b575ba190b5692a4430f8a325 Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Wed, 12 Mar 2025 09:07:31 -0400 Subject: [PATCH 2/5] chore(ui): standardize status badge for containers --- .../settings/web-server/docker-terminal-modal.tsx | 7 ++++++- .../dashboard/settings/web-server/show-modal-logs.tsx | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx index fa9f1a41..44dda0d3 100644 --- a/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx +++ b/apps/dokploy/components/dashboard/settings/web-server/docker-terminal-modal.tsx @@ -1,3 +1,4 @@ +import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { Dialog, @@ -23,6 +24,7 @@ import { Loader2 } from "lucide-react"; import dynamic from "next/dynamic"; import type React from "react"; import { useEffect, useState } from "react"; +import { badgeStateColor } from "../../application/logs/show"; const Terminal = dynamic( () => @@ -109,7 +111,10 @@ export const DockerTerminalModal = ({ children, appName, serverId }: Props) => { key={container.containerId} value={container.containerId} > - {container.name} ({container.containerId}) {container.state} + {container.name} ({container.containerId}){" "} + + {container.state} + ))} Containers ({data?.length}) diff --git a/apps/dokploy/components/dashboard/settings/web-server/show-modal-logs.tsx b/apps/dokploy/components/dashboard/settings/web-server/show-modal-logs.tsx index 43b1838d..a19d4fb7 100644 --- a/apps/dokploy/components/dashboard/settings/web-server/show-modal-logs.tsx +++ b/apps/dokploy/components/dashboard/settings/web-server/show-modal-logs.tsx @@ -21,6 +21,8 @@ import { Loader2 } from "lucide-react"; import dynamic from "next/dynamic"; import type React from "react"; import { useEffect, useState } from "react"; +import { badgeStateColor } from "../../application/logs/show"; +import { Badge } from "@/components/ui/badge"; export const DockerLogsId = dynamic( () => @@ -90,7 +92,10 @@ export const ShowModalLogs = ({ key={container.containerId} value={container.containerId} > - {container.name} ({container.containerId}) {container.state} + {container.name} ({container.containerId}){" "} + + {container.state} + ))} Containers ({data?.length}) From 8f671d1691c56d6f946d863426af71bc32450c5a Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Wed, 12 Mar 2025 09:07:54 -0400 Subject: [PATCH 3/5] chore(ui): standardize view logs / terminal menu items --- apps/dokploy/public/locales/en/settings.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokploy/public/locales/en/settings.json b/apps/dokploy/public/locales/en/settings.json index ebc5ea62..699a456e 100644 --- a/apps/dokploy/public/locales/en/settings.json +++ b/apps/dokploy/public/locales/en/settings.json @@ -1,6 +1,6 @@ { "settings.common.save": "Save", - "settings.common.enterTerminal": "Enter the terminal", + "settings.common.enterTerminal": "Terminal", "settings.server.domain.title": "Server Domain", "settings.server.domain.description": "Add a domain to your server application.", "settings.server.domain.form.domain": "Domain", @@ -14,7 +14,7 @@ "settings.server.webServer.description": "Reload or clean the web server.", "settings.server.webServer.actions": "Actions", "settings.server.webServer.reload": "Reload", - "settings.server.webServer.watchLogs": "Watch logs", + "settings.server.webServer.watchLogs": "View Logs", "settings.server.webServer.updateServerIp": "Update Server IP", "settings.server.webServer.server.label": "Server", "settings.server.webServer.traefik.label": "Traefik", From 68f608bdc9946b40456f59a6db0061b25d9d0dad Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Wed, 12 Mar 2025 09:10:04 -0400 Subject: [PATCH 4/5] chore(ui): replace placeholder company name --- .../components/dashboard/application/update-application.tsx | 2 +- apps/dokploy/components/dashboard/compose/update-compose.tsx | 2 +- apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx | 2 +- apps/dokploy/components/dashboard/mongo/update-mongo.tsx | 2 +- apps/dokploy/components/dashboard/mysql/update-mysql.tsx | 2 +- apps/dokploy/components/dashboard/postgres/update-postgres.tsx | 2 +- apps/dokploy/components/dashboard/projects/handle-project.tsx | 2 +- apps/dokploy/components/dashboard/redis/update-redis.tsx | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/dokploy/components/dashboard/application/update-application.tsx b/apps/dokploy/components/dashboard/application/update-application.tsx index 90b63f08..934a596d 100644 --- a/apps/dokploy/components/dashboard/application/update-application.tsx +++ b/apps/dokploy/components/dashboard/application/update-application.tsx @@ -121,7 +121,7 @@ export const UpdateApplication = ({ applicationId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/compose/update-compose.tsx b/apps/dokploy/components/dashboard/compose/update-compose.tsx index 3120f2d4..c8961860 100644 --- a/apps/dokploy/components/dashboard/compose/update-compose.tsx +++ b/apps/dokploy/components/dashboard/compose/update-compose.tsx @@ -121,7 +121,7 @@ export const UpdateCompose = ({ composeId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx index 48d94489..64705b69 100644 --- a/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx +++ b/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx @@ -119,7 +119,7 @@ export const UpdateMariadb = ({ mariadbId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/mongo/update-mongo.tsx b/apps/dokploy/components/dashboard/mongo/update-mongo.tsx index c2e3616c..d42f406f 100644 --- a/apps/dokploy/components/dashboard/mongo/update-mongo.tsx +++ b/apps/dokploy/components/dashboard/mongo/update-mongo.tsx @@ -121,7 +121,7 @@ export const UpdateMongo = ({ mongoId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/mysql/update-mysql.tsx b/apps/dokploy/components/dashboard/mysql/update-mysql.tsx index efe1eb11..ec3c1b45 100644 --- a/apps/dokploy/components/dashboard/mysql/update-mysql.tsx +++ b/apps/dokploy/components/dashboard/mysql/update-mysql.tsx @@ -119,7 +119,7 @@ export const UpdateMysql = ({ mysqlId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/postgres/update-postgres.tsx b/apps/dokploy/components/dashboard/postgres/update-postgres.tsx index 7be6908f..2b8804a5 100644 --- a/apps/dokploy/components/dashboard/postgres/update-postgres.tsx +++ b/apps/dokploy/components/dashboard/postgres/update-postgres.tsx @@ -121,7 +121,7 @@ export const UpdatePostgres = ({ postgresId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/projects/handle-project.tsx b/apps/dokploy/components/dashboard/projects/handle-project.tsx index f5d62dfc..85b8aea9 100644 --- a/apps/dokploy/components/dashboard/projects/handle-project.tsx +++ b/apps/dokploy/components/dashboard/projects/handle-project.tsx @@ -148,7 +148,7 @@ export const HandleProject = ({ projectId }: Props) => { Name - + diff --git a/apps/dokploy/components/dashboard/redis/update-redis.tsx b/apps/dokploy/components/dashboard/redis/update-redis.tsx index 193aec3b..8d720703 100644 --- a/apps/dokploy/components/dashboard/redis/update-redis.tsx +++ b/apps/dokploy/components/dashboard/redis/update-redis.tsx @@ -119,7 +119,7 @@ export const UpdateRedis = ({ redisId }: Props) => { Name - + From 9f9492af796ab1224f6fcdb7376cf627ae886cba Mon Sep 17 00:00:00 2001 From: Nicholas Penree Date: Wed, 12 Mar 2025 09:46:59 -0400 Subject: [PATCH 5/5] fix: generate domains from templates using slugified project name --- apps/dokploy/server/api/routers/compose.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index acb8e172..cab9bc41 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/apps/dokploy/server/api/routers/compose.ts @@ -437,13 +437,12 @@ export const composeRouter = createTRPCRouter({ serverIp = "127.0.0.1"; } + const projectName = slugify(`${project.name} ${input.id}`); const generate = processTemplate(template.config, { serverIp: serverIp, - projectName: project.name, + projectName: projectName, }); - const projectName = slugify(`${project.name} ${input.id}`); - const compose = await createComposeByTemplate({ ...input, composeFile: template.dockerCompose,