From e2b155280a72e40d21f62707034e4a89fbfa9ef5 Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sat, 21 Dec 2024 20:08:08 +0100
Subject: [PATCH 01/30] feat: add enter terminal translation

---
 apps/dokploy/public/locales/en/settings.json | 1 +
 apps/dokploy/public/locales/pl/settings.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/dokploy/public/locales/en/settings.json b/apps/dokploy/public/locales/en/settings.json
index 2103ecc0..f71e56ff 100644
--- a/apps/dokploy/public/locales/en/settings.json
+++ b/apps/dokploy/public/locales/en/settings.json
@@ -13,6 +13,7 @@
 	"settings.server.webServer.description": "Reload or clean the web server.",
 	"settings.server.webServer.actions": "Actions",
 	"settings.server.webServer.reload": "Reload",
+	"settings.server.webServer.enterTerminal": "Enter the terminal",
 	"settings.server.webServer.watchLogs": "Watch logs",
 	"settings.server.webServer.updateServerIp": "Update Server IP",
 	"settings.server.webServer.server.label": "Server",
diff --git a/apps/dokploy/public/locales/pl/settings.json b/apps/dokploy/public/locales/pl/settings.json
index 48531e69..a354a871 100644
--- a/apps/dokploy/public/locales/pl/settings.json
+++ b/apps/dokploy/public/locales/pl/settings.json
@@ -13,6 +13,7 @@
 	"settings.server.webServer.description": "Przeładuj lub wyczyść serwer",
 	"settings.server.webServer.actions": "Akcje",
 	"settings.server.webServer.reload": "Przeładuj",
+	"settings.server.webServer.enterTerminal": "Otwórz terminal",
 	"settings.server.webServer.watchLogs": "Obserwuj logi",
 	"settings.server.webServer.updateServerIp": "Zaktualizuj IP serwera",
 	"settings.server.webServer.server.label": "Serwer",

From 0d58935ad1261c94720c91b88b559eb238333764 Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 16:30:53 +0100
Subject: [PATCH 02/30] refactor: translations for common terminal stuff

---
 .../dashboard/settings/servers/add-server.tsx       | 10 ++++++----
 .../dashboard/settings/servers/show-servers.tsx     |  6 +++++-
 .../dashboard/settings/servers/update-server.tsx    | 13 +++++++------
 apps/dokploy/public/locales/en/settings.json        |  9 +++++++--
 apps/dokploy/public/locales/pl/settings.json        |  9 +++++++--
 5 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/servers/add-server.tsx b/apps/dokploy/components/dashboard/settings/servers/add-server.tsx
index b8413303..36f93f5d 100644
--- a/apps/dokploy/components/dashboard/settings/servers/add-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/add-server.tsx
@@ -31,8 +31,8 @@ import { Textarea } from "@/components/ui/textarea";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { PlusIcon } from "lucide-react";
+import { useTranslation } from "next-i18next";
 import Link from "next/link";
-import { useRouter } from "next/router";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -56,6 +56,8 @@ const Schema = z.object({
 type Schema = z.infer<typeof Schema>;
 
 export const AddServer = () => {
+	const { t } = useTranslation("settings");
+
 	const utils = api.useUtils();
 	const [isOpen, setIsOpen] = useState(false);
 	const { data: canCreateMoreServers, refetch } =
@@ -212,7 +214,7 @@ export const AddServer = () => {
 								name="ipAddress"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>IP Address</FormLabel>
+										<FormLabel>{t("settings.terminal.ipAddress")}</FormLabel>
 										<FormControl>
 											<Input placeholder="192.168.1.100" {...field} />
 										</FormControl>
@@ -226,7 +228,7 @@ export const AddServer = () => {
 								name="port"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Port</FormLabel>
+										<FormLabel>{t("settings.terminal.port")}</FormLabel>
 										<FormControl>
 											<Input
 												placeholder="22"
@@ -256,7 +258,7 @@ export const AddServer = () => {
 							name="username"
 							render={({ field }) => (
 								<FormItem>
-									<FormLabel>Username</FormLabel>
+									<FormLabel>{t("settings.terminal.username")}</FormLabel>
 									<FormControl>
 										<Input placeholder="root" {...field} />
 									</FormControl>
diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
index a174cd9c..7527670b 100644
--- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
@@ -33,8 +33,10 @@ import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal";
 import { UpdateServer } from "./update-server";
 import { useRouter } from "next/router";
 import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription";
+import { useTranslation } from "next-i18next";
 
 export const ShowServers = () => {
+	const { t } = useTranslation("settings");
 	const router = useRouter();
 	const query = router.query;
 	const { data, refetch } = api.server.all.useQuery();
@@ -190,7 +192,9 @@ export const ShowServers = () => {
 															<>
 																{server.sshKeyId && (
 																	<TerminalModal serverId={server.serverId}>
-																		<span>Enter the terminal</span>
+																		<span>
+																			{t("settings.common.enterTerminal")}
+																		</span>
 																	</TerminalModal>
 																)}
 																<SetupServer serverId={server.serverId} />
diff --git a/apps/dokploy/components/dashboard/settings/servers/update-server.tsx b/apps/dokploy/components/dashboard/settings/servers/update-server.tsx
index 16eb5ba7..543cacf6 100644
--- a/apps/dokploy/components/dashboard/settings/servers/update-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/update-server.tsx
@@ -31,8 +31,7 @@ import {
 import { Textarea } from "@/components/ui/textarea";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { PlusIcon } from "lucide-react";
-import { useRouter } from "next/router";
+import { useTranslation } from "next-i18next";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -60,6 +59,8 @@ interface Props {
 }
 
 export const UpdateServer = ({ serverId }: Props) => {
+	const { t } = useTranslation("settings");
+
 	const utils = api.useUtils();
 	const [isOpen, setIsOpen] = useState(false);
 	const { data, isLoading } = api.server.one.useQuery(
@@ -212,7 +213,7 @@ export const UpdateServer = ({ serverId }: Props) => {
 								name="ipAddress"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>IP Address</FormLabel>
+										<FormLabel>{t("settings.terminal.ipAddress")}</FormLabel>
 										<FormControl>
 											<Input placeholder="192.168.1.100" {...field} />
 										</FormControl>
@@ -226,7 +227,7 @@ export const UpdateServer = ({ serverId }: Props) => {
 								name="port"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Port</FormLabel>
+										<FormLabel>{t("settings.terminal.port")}</FormLabel>
 										<FormControl>
 											<Input
 												placeholder="22"
@@ -256,7 +257,7 @@ export const UpdateServer = ({ serverId }: Props) => {
 							name="username"
 							render={({ field }) => (
 								<FormItem>
-									<FormLabel>Username</FormLabel>
+									<FormLabel>{t("settings.terminal.username")}</FormLabel>
 									<FormControl>
 										<Input placeholder="root" {...field} />
 									</FormControl>
@@ -273,7 +274,7 @@ export const UpdateServer = ({ serverId }: Props) => {
 							form="hook-form-update-server"
 							type="submit"
 						>
-							Update
+							{t("settings.common.save")}
 						</Button>
 					</DialogFooter>
 				</Form>
diff --git a/apps/dokploy/public/locales/en/settings.json b/apps/dokploy/public/locales/en/settings.json
index f71e56ff..c70c614d 100644
--- a/apps/dokploy/public/locales/en/settings.json
+++ b/apps/dokploy/public/locales/en/settings.json
@@ -1,5 +1,6 @@
 {
 	"settings.common.save": "Save",
+	"settings.common.enterTerminal": "Enter the terminal",
 	"settings.server.domain.title": "Server Domain",
 	"settings.server.domain.description": "Add a domain to your server application.",
 	"settings.server.domain.form.domain": "Domain",
@@ -13,7 +14,6 @@
 	"settings.server.webServer.description": "Reload or clean the web server.",
 	"settings.server.webServer.actions": "Actions",
 	"settings.server.webServer.reload": "Reload",
-	"settings.server.webServer.enterTerminal": "Enter the terminal",
 	"settings.server.webServer.watchLogs": "Watch logs",
 	"settings.server.webServer.updateServerIp": "Update Server IP",
 	"settings.server.webServer.server.label": "Server",
@@ -41,5 +41,10 @@
 	"settings.appearance.themes.dark": "Dark",
 	"settings.appearance.themes.system": "System",
 	"settings.appearance.language": "Language",
-	"settings.appearance.languageDescription": "Select a language for your dashboard"
+	"settings.appearance.languageDescription": "Select a language for your dashboard",
+
+	"settings.terminal.connectionSettings": "Connection settings",
+	"settings.terminal.ipAddress": "IP Address",
+	"settings.terminal.port": "Port",
+	"settings.terminal.username": "Username"
 }
diff --git a/apps/dokploy/public/locales/pl/settings.json b/apps/dokploy/public/locales/pl/settings.json
index a354a871..93414825 100644
--- a/apps/dokploy/public/locales/pl/settings.json
+++ b/apps/dokploy/public/locales/pl/settings.json
@@ -1,5 +1,6 @@
 {
 	"settings.common.save": "Zapisz",
+	"settings.common.enterTerminal":  "Otwórz terminal",
 	"settings.server.domain.title": "Domena",
 	"settings.server.domain.description": "Dodaj domenę do aplikacji",
 	"settings.server.domain.form.domain": "Domena",
@@ -13,7 +14,6 @@
 	"settings.server.webServer.description": "Przeładuj lub wyczyść serwer",
 	"settings.server.webServer.actions": "Akcje",
 	"settings.server.webServer.reload": "Przeładuj",
-	"settings.server.webServer.enterTerminal": "Otwórz terminal",
 	"settings.server.webServer.watchLogs": "Obserwuj logi",
 	"settings.server.webServer.updateServerIp": "Zaktualizuj IP serwera",
 	"settings.server.webServer.server.label": "Serwer",
@@ -41,5 +41,10 @@
 	"settings.appearance.themes.dark": "Ciemny",
 	"settings.appearance.themes.system": "System",
 	"settings.appearance.language": "Język",
-	"settings.appearance.languageDescription": "Wybierz język swojego pulpitu"
+	"settings.appearance.languageDescription": "Wybierz język swojego pulpitu",
+
+	"settings.terminal.connectionSettings": "Ustawienia połączenia",
+	"settings.terminal.ipAddress": "Adres IP",
+	"settings.terminal.port": "Port",
+	"settings.terminal.username": "Nazwa użytkownika"
 }

From ec8eaf624916a7d38446cd6ca342a4664f6f44cf Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 16:31:52 +0100
Subject: [PATCH 03/30] feat: add util to configure and get private ssh key for
 local ssh connection

---
 apps/dokploy/server/wss/utils.ts | 50 ++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/apps/dokploy/server/wss/utils.ts b/apps/dokploy/server/wss/utils.ts
index b5567127..3172e36e 100644
--- a/apps/dokploy/server/wss/utils.ts
+++ b/apps/dokploy/server/wss/utils.ts
@@ -1,4 +1,17 @@
+import { execAsync } from "@dokploy/server/utils/process/execAsync";
 import os from "node:os";
+import path from "node:path";
+import fs from "node:fs";
+
+const HOME_PATH = process.env.HOME || process.env.USERPROFILE || "/";
+
+const LOCAL_SSH_KEY_PATH = path.join(
+	HOME_PATH,
+	".ssh",
+	"auto_generated-dokploy-local",
+);
+
+const AUTHORIZED_KEYS_PATH = path.join(HOME_PATH, ".ssh", "authorized_keys");
 
 export const getShell = () => {
 	switch (os.platform()) {
@@ -10,3 +23,40 @@ export const getShell = () => {
 			return "bash";
 	}
 };
+
+/** Returns private SSH key for dokploy local server terminal. Uses already created SSH key or generates a new SSH key, also automatically appends the public key to `authorized_keys`, creating the file if needed. */
+export const getLocalServerPrivateKey = async () => {
+	try {
+		if (!fs.existsSync(LOCAL_SSH_KEY_PATH)) {
+			// Generate new SSH key if it hasn't been created yet
+			await execAsync(
+				`ssh-keygen -t rsa -b 4096 -f ${LOCAL_SSH_KEY_PATH} -N ""`,
+			);
+		}
+
+		const privateKey = fs.readFileSync(LOCAL_SSH_KEY_PATH, "utf8");
+		const publicKey = fs.readFileSync(`${LOCAL_SSH_KEY_PATH}.pub`, "utf8");
+		const authKeyContent = `${publicKey}\n`;
+
+		if (!fs.existsSync(AUTHORIZED_KEYS_PATH)) {
+			// Create authorized_keys if it doesn't exist yet
+			fs.writeFileSync(AUTHORIZED_KEYS_PATH, authKeyContent, { mode: 0o600 });
+			return privateKey;
+		}
+
+		const existingAuthKeys = fs.readFileSync(AUTHORIZED_KEYS_PATH, "utf8");
+		if (existingAuthKeys.includes(publicKey)) {
+			return privateKey;
+		}
+
+		// Append the public key to authorized_keys
+		fs.appendFileSync(AUTHORIZED_KEYS_PATH, authKeyContent, {
+			mode: 0o600,
+		});
+
+		return privateKey;
+	} catch (error) {
+		console.error("Error getting private SSH key for local terminal:", error);
+		return "";
+	}
+};

From a53929a78762516f41d06b999c2ffbd663b48766 Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 16:32:20 +0100
Subject: [PATCH 04/30] feat: add enter terminal option to server dropdown

---
 .../settings/servers/actions/show-dokploy-actions.tsx         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
index ee749244..0fa4638b 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-dokploy-actions.tsx
@@ -16,6 +16,7 @@ import { useTranslation } from "next-i18next";
 import { toast } from "sonner";
 import { ShowModalLogs } from "../../web-server/show-modal-logs";
 import { GPUSupportModal } from "../gpu-support-modal";
+import { TerminalModal } from "../../web-server/terminal-modal";
 
 export const ShowDokployActions = () => {
 	const { t } = useTranslation("settings");
@@ -49,6 +50,9 @@ export const ShowDokployActions = () => {
 					>
 						<span>{t("settings.server.webServer.reload")}</span>
 					</DropdownMenuItem>
+					<TerminalModal serverId="local">
+						<span>{t("settings.common.enterTerminal")}</span>
+					</TerminalModal>
 					<ShowModalLogs appName="dokploy">
 						<DropdownMenuItem
 							className="cursor-pointer"

From e68d867d31650844063e9b62b02a1812a9cd1f5e Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 16:35:28 +0100
Subject: [PATCH 05/30] refactor: adapt terminal wss to allow local server
 connection, add status logs

---
 apps/dokploy/server/wss/terminal.ts | 72 +++++++++++++++++++++++------
 1 file changed, 57 insertions(+), 15 deletions(-)

diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts
index b1ecb908..fa268124 100644
--- a/apps/dokploy/server/wss/terminal.ts
+++ b/apps/dokploy/server/wss/terminal.ts
@@ -1,8 +1,9 @@
 import type http from "node:http";
 import { findServerById, validateWebSocketRequest } from "@dokploy/server";
 import { publicIpv4, publicIpv6 } from "public-ip";
-import { Client } from "ssh2";
+import { Client, type ConnectConfig } from "ssh2";
 import { WebSocketServer } from "ws";
+import { getLocalServerPrivateKey } from "./utils";
 
 export const getPublicIpWithFallback = async () => {
 	// @ts-ignore
@@ -55,21 +56,67 @@ export const setupTerminalWebSocketServer = (
 			return;
 		}
 
-		const server = await findServerById(serverId);
+		let connectionDetails: ConnectConfig = {};
 
-		if (!server) {
-			ws.close();
-			return;
+		const isLocalServer = serverId === "local";
+
+		if (isLocalServer) {
+			const port = Number(url.searchParams.get("port"));
+			const username = url.searchParams.get("username");
+
+			if (!port || !username) {
+				ws.close();
+				return;
+			}
+
+			ws.send("Getting private SSH key...\n");
+			const privateKey = await getLocalServerPrivateKey();
+
+			if (!privateKey) {
+				ws.close();
+				return;
+			}
+
+			connectionDetails = {
+				host: "localhost",
+				port,
+				username,
+				privateKey,
+			};
+		} else {
+			ws.send("Getting server data...\n");
+			const server = await findServerById(serverId);
+
+			if (!server) {
+				ws.close();
+				return;
+			}
+
+			const { ipAddress, port, username, sshKey, sshKeyId } = server;
+
+			if (!sshKeyId) {
+				throw new Error("No SSH key available for this server");
+			}
+
+			connectionDetails = {
+				host: ipAddress,
+				port: port,
+				username: username,
+				privateKey: sshKey?.privateKey,
+			};
 		}
 
-		if (!server.sshKeyId)
-			throw new Error("No SSH key available for this server");
-
 		const conn = new Client();
 		let stdout = "";
 		let stderr = "";
+
+		ws.send("Connecting...\n");
+
 		conn
 			.once("ready", () => {
+				// Clear terminal content once connected
+				ws.send("\x1bc");
+
 				conn.shell({}, (err, stream) => {
 					if (err) throw err;
 
@@ -112,18 +159,13 @@ export const setupTerminalWebSocketServer = (
 			.on("error", (err) => {
 				if (err.level === "client-authentication") {
 					ws.send(
-						`Authentication failed: Invalid SSH private key. ❌ Error: ${err.message} ${err.level}`,
+						`Authentication failed: Unauthorized ${isLocalServer ? "" : "private SSH key or "}username.\n❌  Error: ${err.message} ${err.level}`,
 					);
 				} else {
 					ws.send(`SSH connection error: ${err.message}`);
 				}
 				conn.end();
 			})
-			.connect({
-				host: server.ipAddress,
-				port: server.port,
-				username: server.username,
-				privateKey: server.sshKey?.privateKey,
-			});
+			.connect(connectionDetails);
 	});
 };

From 7e08c8881eb5904bbfbffb45874dcba3da8b0e4f Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 16:37:26 +0100
Subject: [PATCH 06/30] refactor: adapt terminal component to pass local server
 data and add initialized check

---
 .../settings/web-server/terminal.tsx          | 23 +++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx b/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
index d38f5d9e..b6757b9c 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
@@ -5,6 +5,7 @@ import { FitAddon } from "xterm-addon-fit";
 import "@xterm/xterm/css/xterm.css";
 import { AttachAddon } from "@xterm/addon-attach";
 import { useTheme } from "next-themes";
+import { getLocalServerData } from "./local-server-config";
 
 interface Props {
 	id: string;
@@ -12,9 +13,16 @@ interface Props {
 }
 
 export const Terminal: React.FC<Props> = ({ id, serverId }) => {
-	const termRef = useRef(null);
+	const termRef = useRef<HTMLDivElement>(null);
+	const initialized = useRef<boolean>(false);
 	const { resolvedTheme } = useTheme();
 	useEffect(() => {
+		if (initialized.current) {
+			// Required in strict mode to avoid issues due to double wss connection
+			return;
+		}
+
+		initialized.current = true;
 		const container = document.getElementById(id);
 		if (container) {
 			container.innerHTML = "";
@@ -33,7 +41,18 @@ export const Terminal: React.FC<Props> = ({ id, serverId }) => {
 
 		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
 
-		const wsUrl = `${protocol}//${window.location.host}/terminal?serverId=${serverId}`;
+		const isLocalServer = serverId === "local";
+
+		const urlParams = new URLSearchParams();
+		urlParams.set("serverId", serverId);
+
+		if (isLocalServer) {
+			const { port, username } = getLocalServerData();
+			urlParams.set("port", port.toString());
+			urlParams.set("username", username);
+		}
+
+		const wsUrl = `${protocol}//${window.location.host}/terminal?${urlParams}`;
 
 		const ws = new WebSocket(wsUrl);
 		const addonAttach = new AttachAddon(ws);

From 1ea7d2e1bf38c67b29bc141fc7cc427ec41332b6 Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 18:44:38 +0100
Subject: [PATCH 07/30] feat: enable server translations for servers page

---
 apps/dokploy/pages/dashboard/settings/servers.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/dokploy/pages/dashboard/settings/servers.tsx b/apps/dokploy/pages/dashboard/settings/servers.tsx
index 7aea531b..d25a3513 100644
--- a/apps/dokploy/pages/dashboard/settings/servers.tsx
+++ b/apps/dokploy/pages/dashboard/settings/servers.tsx
@@ -2,6 +2,7 @@ import { ShowServers } from "@/components/dashboard/settings/servers/show-server
 import { DashboardLayout } from "@/components/layouts/dashboard-layout";
 import { SettingsLayout } from "@/components/layouts/settings-layout";
 import { appRouter } from "@/server/api/root";
+import { getLocale, serverSideTranslations } from "@/utils/i18n";
 import { validateRequest } from "@dokploy/server";
 import { createServerSideHelpers } from "@trpc/react-query/server";
 import type { GetServerSidePropsContext } from "next";
@@ -29,6 +30,7 @@ export async function getServerSideProps(
 	ctx: GetServerSidePropsContext<{ serviceId: string }>,
 ) {
 	const { req, res } = ctx;
+	const locale = await getLocale(req.cookies);
 	const { user, session } = await validateRequest(req, res);
 	if (!user) {
 		return {
@@ -64,6 +66,7 @@ export async function getServerSideProps(
 	return {
 		props: {
 			trpcState: helpers.dehydrate(),
+			...(await serverSideTranslations(locale, ["settings"])),
 		},
 	};
 }

From fd0a9b8b585682519bf0f199e163a73c2f30b78c Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 18:46:02 +0100
Subject: [PATCH 08/30] feat: add local server config, add local server support
 in terminal modal, add fixed terminal container height

---
 .../web-server/local-server-config.tsx        | 154 ++++++++++++++++++
 .../settings/web-server/terminal-modal.tsx    |  26 ++-
 2 files changed, 176 insertions(+), 4 deletions(-)
 create mode 100644 apps/dokploy/components/dashboard/settings/web-server/local-server-config.tsx

diff --git a/apps/dokploy/components/dashboard/settings/web-server/local-server-config.tsx b/apps/dokploy/components/dashboard/settings/web-server/local-server-config.tsx
new file mode 100644
index 00000000..fde03ffb
--- /dev/null
+++ b/apps/dokploy/components/dashboard/settings/web-server/local-server-config.tsx
@@ -0,0 +1,154 @@
+import { Button, buttonVariants } from "@/components/ui/button";
+import {
+	Accordion,
+	AccordionContent,
+	AccordionItem,
+	AccordionTrigger,
+} from "@/components/ui/accordion";
+import { Input } from "@/components/ui/input";
+import {
+	FormControl,
+	FormLabel,
+	FormField,
+	FormMessage,
+	FormItem,
+	Form,
+} from "@/components/ui/form";
+import { cn } from "@/lib/utils";
+import { zodResolver } from "@hookform/resolvers/zod";
+import { Settings } from "lucide-react";
+import React from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+import { useTranslation } from "next-i18next";
+
+const Schema = z.object({
+	port: z.number().min(1, "Port must be higher than 0"),
+	username: z.string().min(1, "Username is required"),
+});
+
+type Schema = z.infer<typeof Schema>;
+
+const DEFAULT_LOCAL_SERVER_DATA: Schema = {
+	port: 22,
+	username: "root",
+};
+
+/** Returns local server data for use with local server terminal */
+export const getLocalServerData = () => {
+	try {
+		const localServerData = localStorage.getItem("localServerData");
+		const parsedLocalServerData = localServerData
+			? (JSON.parse(localServerData) as typeof DEFAULT_LOCAL_SERVER_DATA)
+			: DEFAULT_LOCAL_SERVER_DATA;
+
+		return parsedLocalServerData;
+	} catch {
+		return DEFAULT_LOCAL_SERVER_DATA;
+	}
+};
+
+interface Props {
+	onSave: () => void;
+}
+
+const LocalServerConfig = ({ onSave }: Props) => {
+	const { t } = useTranslation("settings");
+
+	const form = useForm<Schema>({
+		defaultValues: getLocalServerData(),
+		resolver: zodResolver(Schema),
+	});
+
+	const onSubmit = (data: Schema) => {
+		localStorage.setItem("localServerData", JSON.stringify(data));
+		form.reset(data);
+		onSave();
+	};
+
+	return (
+		<Accordion collapsible type="single">
+			<AccordionItem value="connectionSettings">
+				<AccordionTrigger
+					className={cn(
+						buttonVariants({ variant: "ghost" }),
+						"hover:no-underline px-1 mb-2 active:hover:transform-none",
+					)}
+				>
+					<div className="flex flex-row items-center gap-2 justify-between w-full">
+						<div className="flex flex-row gap-2 items-center">
+							<Settings className="h-4 w-4" />
+							<span className=" dark:hover:text-white">
+								{t("settings.terminal.connectionSettings")}
+							</span>
+						</div>
+					</div>
+				</AccordionTrigger>
+
+				<AccordionContent className="px-1 flex flex-col gap-2">
+					<Form {...form}>
+						<form
+							id="hook-form-add-server"
+							onSubmit={form.handleSubmit(onSubmit)}
+							className="w-full grid grid-cols-2 gap-4"
+						>
+							<FormField
+								control={form.control}
+								name="port"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>{t("settings.terminal.port")}</FormLabel>
+										<FormControl>
+											<Input
+												{...field}
+												onChange={(e) => {
+													const value = e.target.value;
+													if (value === "") {
+														field.onChange(1);
+													} else {
+														const number = Number.parseInt(value, 10);
+														if (!Number.isNaN(number)) {
+															field.onChange(number);
+														}
+													}
+												}}
+											/>
+										</FormControl>
+
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+
+							<FormField
+								control={form.control}
+								name="username"
+								render={({ field }) => (
+									<FormItem>
+										<FormLabel>{t("settings.terminal.username")}</FormLabel>
+										<FormControl>
+											<Input placeholder="root" {...field} />
+										</FormControl>
+
+										<FormMessage />
+									</FormItem>
+								)}
+							/>
+						</form>
+					</Form>
+
+					<Button
+						form="hook-form-add-server"
+						type="submit"
+						className="ml-auto"
+						disabled={!form.formState.isDirty}
+					>
+						{t("settings.common.save")}
+					</Button>
+				</AccordionContent>
+			</AccordionItem>
+		</Accordion>
+	);
+};
+
+export default LocalServerConfig;
diff --git a/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx
index 5bdba8b8..2bfd00a0 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx
@@ -10,24 +10,38 @@ import { DropdownMenuItem } from "@/components/ui/dropdown-menu";
 import { api } from "@/utils/api";
 import dynamic from "next/dynamic";
 import type React from "react";
+import { useState } from "react";
+import LocalServerConfig from "./local-server-config";
 
 const Terminal = dynamic(() => import("./terminal").then((e) => e.Terminal), {
 	ssr: false,
 });
 
+const getTerminalKey = () => {
+	return `terminal-${Date.now()}`;
+};
+
 interface Props {
 	children?: React.ReactNode;
 	serverId: string;
 }
 
 export const TerminalModal = ({ children, serverId }: Props) => {
+	const [terminalKey, setTerminalKey] = useState<string>(getTerminalKey());
+	const isLocalServer = serverId === "local";
+
 	const { data } = api.server.one.useQuery(
 		{
 			serverId,
 		},
-		{ enabled: !!serverId },
+		{ enabled: !!serverId && !isLocalServer },
 	);
 
+	const handleLocalServerConfigSave = () => {
+		// Rerender Terminal component to reconnect using new component key when saving local server config
+		setTerminalKey(getTerminalKey());
+	};
+
 	return (
 		<Dialog>
 			<DialogTrigger asChild>
@@ -43,12 +57,16 @@ export const TerminalModal = ({ children, serverId }: Props) => {
 				onEscapeKeyDown={(event) => event.preventDefault()}
 			>
 				<DialogHeader className="flex flex-col gap-1">
-					<DialogTitle>Terminal ({data?.name})</DialogTitle>
+					<DialogTitle>Terminal ({data?.name ?? serverId})</DialogTitle>
 					<DialogDescription>Easy way to access the server</DialogDescription>
 				</DialogHeader>
 
-				<div className="flex flex-col gap-4">
-					<Terminal id="terminal" serverId={serverId} />
+				{isLocalServer && (
+					<LocalServerConfig onSave={handleLocalServerConfigSave} />
+				)}
+
+				<div className="flex flex-col gap-4 h-[552px]">
+					<Terminal key={terminalKey} id="terminal" serverId={serverId} />
 				</div>
 			</DialogContent>
 		</Dialog>

From 228d12a61c5f6a1e58e75fc875c4a8a1f90e7a8f Mon Sep 17 00:00:00 2001
From: UndefinedPony <szwabo.dev@gmail.com>
Date: Sun, 22 Dec 2024 19:01:02 +0100
Subject: [PATCH 09/30] refactor: code cleanup

---
 .../settings/web-server/terminal-modal.tsx         |  2 +-
 .../dashboard/settings/web-server/terminal.tsx     |  4 +---
 apps/dokploy/server/wss/terminal.ts                | 14 +++++++-------
 apps/dokploy/server/wss/utils.ts                   |  2 +-
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx b/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx
index 2bfd00a0..7c64ebc0 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/terminal-modal.tsx
@@ -66,7 +66,7 @@ export const TerminalModal = ({ children, serverId }: Props) => {
 				)}
 
 				<div className="flex flex-col gap-4 h-[552px]">
-					<Terminal key={terminalKey} id="terminal" serverId={serverId} />
+					<Terminal id="terminal" key={terminalKey} serverId={serverId} />
 				</div>
 			</DialogContent>
 		</Dialog>
diff --git a/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx b/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
index b6757b9c..e45b73d2 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
@@ -41,12 +41,10 @@ export const Terminal: React.FC<Props> = ({ id, serverId }) => {
 
 		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
 
-		const isLocalServer = serverId === "local";
-
 		const urlParams = new URLSearchParams();
 		urlParams.set("serverId", serverId);
 
-		if (isLocalServer) {
+		if (serverId === "local") {
 			const { port, username } = getLocalServerData();
 			urlParams.set("port", port.toString());
 			urlParams.set("username", username);
diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts
index fa268124..78cda7ac 100644
--- a/apps/dokploy/server/wss/terminal.ts
+++ b/apps/dokploy/server/wss/terminal.ts
@@ -3,7 +3,7 @@ import { findServerById, validateWebSocketRequest } from "@dokploy/server";
 import { publicIpv4, publicIpv6 } from "public-ip";
 import { Client, type ConnectConfig } from "ssh2";
 import { WebSocketServer } from "ws";
-import { getLocalServerPrivateKey } from "./utils";
+import { setupLocalServerSSHKey } from "./utils";
 
 export const getPublicIpWithFallback = async () => {
 	// @ts-ignore
@@ -69,8 +69,8 @@ export const setupTerminalWebSocketServer = (
 				return;
 			}
 
-			ws.send("Getting private SSH key...\n");
-			const privateKey = await getLocalServerPrivateKey();
+			ws.send("Setting up private SSH key...\n");
+			const privateKey = await setupLocalServerSSHKey();
 
 			if (!privateKey) {
 				ws.close();
@@ -92,16 +92,16 @@ export const setupTerminalWebSocketServer = (
 				return;
 			}
 
-			const { ipAddress, port, username, sshKey, sshKeyId } = server;
+			const { ipAddress: host, port, username, sshKey, sshKeyId } = server;
 
 			if (!sshKeyId) {
 				throw new Error("No SSH key available for this server");
 			}
 
 			connectionDetails = {
-				host: ipAddress,
-				port: port,
-				username: username,
+				host,
+				port,
+				username,
 				privateKey: sshKey?.privateKey,
 			};
 		}
diff --git a/apps/dokploy/server/wss/utils.ts b/apps/dokploy/server/wss/utils.ts
index 3172e36e..4971bac2 100644
--- a/apps/dokploy/server/wss/utils.ts
+++ b/apps/dokploy/server/wss/utils.ts
@@ -25,7 +25,7 @@ export const getShell = () => {
 };
 
 /** Returns private SSH key for dokploy local server terminal. Uses already created SSH key or generates a new SSH key, also automatically appends the public key to `authorized_keys`, creating the file if needed. */
-export const getLocalServerPrivateKey = async () => {
+export const setupLocalServerSSHKey = async () => {
 	try {
 		if (!fs.existsSync(LOCAL_SSH_KEY_PATH)) {
 			// Generate new SSH key if it hasn't been created yet

From c3476a1fdf374c155dbd284e88f6d749672867c6 Mon Sep 17 00:00:00 2001
From: 190km <botmiley@gmail.com>
Date: Thu, 26 Dec 2024 00:04:50 +0100
Subject: [PATCH 10/30] refactor: refactored i18n to display real lang name

---
 .../dashboard/settings/appearance-form.tsx    | 19 +++++------
 apps/dokploy/lib/languages.ts                 | 34 +++++++++----------
 2 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/appearance-form.tsx b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
index d5b90182..8fa8dcff 100644
--- a/apps/dokploy/components/dashboard/settings/appearance-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
@@ -38,7 +38,8 @@ const appearanceFormSchema = z.object({
 	theme: z.enum(["light", "dark", "system"], {
 		required_error: "Please select a theme.",
 	}),
-	language: z.nativeEnum(Languages, {
+
+	language: z.enum(Object.values(Languages).map(lang => lang.code), {
 		required_error: "Please select a language.",
 	}),
 });
@@ -48,7 +49,7 @@ type AppearanceFormValues = z.infer<typeof appearanceFormSchema>;
 // This can come from your database or API.
 const defaultValues: Partial<AppearanceFormValues> = {
 	theme: "system",
-	language: Languages.English,
+	language: Languages.english.code,
 };
 
 export function AppearanceForm() {
@@ -173,15 +174,11 @@ export function AppearanceForm() {
 												<SelectValue placeholder="No preset selected" />
 											</SelectTrigger>
 											<SelectContent>
-												{Object.keys(Languages).map((preset) => {
-													const value =
-														Languages[preset as keyof typeof Languages];
-													return (
-														<SelectItem key={value} value={value}>
-															{preset}
-														</SelectItem>
-													);
-												})}
+											{Object.values(Languages).map((language) => (
+												<SelectItem key={language.code} value={language.code}>
+													{language.name}
+												</SelectItem>
+											))}
 											</SelectContent>
 										</Select>
 									</FormItem>
diff --git a/apps/dokploy/lib/languages.ts b/apps/dokploy/lib/languages.ts
index 70c3c558..c559d16d 100644
--- a/apps/dokploy/lib/languages.ts
+++ b/apps/dokploy/lib/languages.ts
@@ -1,19 +1,19 @@
-export enum Languages {
-	English = "en",
-	Polish = "pl",
-	Russian = "ru",
-	French = "fr",
-	German = "de",
-	ChineseTraditional = "zh-Hant",
-	ChineseSimplified = "zh-Hans",
-	Turkish = "tr",
-	Kazakh = "kz",
-	Persian = "fa",
-	Korean = "ko",
-	Portuguese = "pt-br",
-	Italian = "it",
-	Japanese = "ja",
-	Spanish = "es",
-}
+export const Languages = {
+	english: { code: "en", name: "English" },
+	polish: { code: "pl", name: "Polski" },
+	russian: { code: "ru", name: "Русский" },
+	french: { code: "fr", name: "Français" },
+	german: { code: "de", name: "Deutsch" },
+	chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
+	chineseSimplified: { code: "zh-Hans", name: "简体中文" },
+	turkish: { code: "tr", name: "Türkçe" },
+	kazakh: { code: "kz", name: "Қазақ" },
+	persian: { code: "fa", name: "فارسی" },
+	korean: { code: "ko", name: "한국어" },
+	portuguese: { code: "pt-br", name: "Português" },
+	italian: { code: "it", name: "Italiano" },
+	japanese: { code: "ja", name: "日本語" },
+	spanish: { code: "es", name: "Español" },
+};
 
 export type Language = keyof typeof Languages;

From 46348f43f6bfc3cd3d2758adf9a6738e65cf62ef Mon Sep 17 00:00:00 2001
From: 190km <botmiley@gmail.com>
Date: Thu, 26 Dec 2024 01:26:53 +0100
Subject: [PATCH 11/30] chore: lint

---
 .../dashboard/settings/appearance-form.tsx    |  6 ++-
 apps/dokploy/lib/languages.ts                 | 40 ++++++++++---------
 apps/dokploy/pages/_app.tsx                   |  2 +-
 apps/dokploy/utils/hooks/use-locale.ts        |  7 ++--
 apps/dokploy/utils/i18n.ts                    |  2 +-
 5 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/appearance-form.tsx b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
index 8fa8dcff..fde952cc 100644
--- a/apps/dokploy/components/dashboard/settings/appearance-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
@@ -34,14 +34,16 @@ import { useTheme } from "next-themes";
 import { useEffect } from "react";
 import { toast } from "sonner";
 
+
+const languageCodes = Object.values(Languages).map(lang => lang.code) as string[];
 const appearanceFormSchema = z.object({
 	theme: z.enum(["light", "dark", "system"], {
 		required_error: "Please select a theme.",
 	}),
 
-	language: z.enum(Object.values(Languages).map(lang => lang.code), {
+	language: z.enum(languageCodes, {
 		required_error: "Please select a language.",
-	}),
+	})
 });
 
 type AppearanceFormValues = z.infer<typeof appearanceFormSchema>;
diff --git a/apps/dokploy/lib/languages.ts b/apps/dokploy/lib/languages.ts
index c559d16d..0b2fd2c9 100644
--- a/apps/dokploy/lib/languages.ts
+++ b/apps/dokploy/lib/languages.ts
@@ -1,19 +1,21 @@
-export const Languages = {
-	english: { code: "en", name: "English" },
-	polish: { code: "pl", name: "Polski" },
-	russian: { code: "ru", name: "Русский" },
-	french: { code: "fr", name: "Français" },
-	german: { code: "de", name: "Deutsch" },
-	chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
-	chineseSimplified: { code: "zh-Hans", name: "简体中文" },
-	turkish: { code: "tr", name: "Türkçe" },
-	kazakh: { code: "kz", name: "Қазақ" },
-	persian: { code: "fa", name: "فارسی" },
-	korean: { code: "ko", name: "한국어" },
-	portuguese: { code: "pt-br", name: "Português" },
-	italian: { code: "it", name: "Italiano" },
-	japanese: { code: "ja", name: "日本語" },
-	spanish: { code: "es", name: "Español" },
-};
-
-export type Language = keyof typeof Languages;
+export const Languages = {
+	english: { code: "en", name: "English" },
+	polish: { code: "pl", name: "Polski" },
+	russian: { code: "ru", name: "Русский" },
+	french: { code: "fr", name: "Français" },
+	german: { code: "de", name: "Deutsch" },
+	chineseTraditional: { code: "zh-Hant", name: "繁體中文" },
+	chineseSimplified: { code: "zh-Hans", name: "简体中文" },
+	turkish: { code: "tr", name: "Türkçe" },
+	kazakh: { code: "kz", name: "Қазақ" },
+	persian: { code: "fa", name: "فارسی" },
+	korean: { code: "ko", name: "한국어" },
+	portuguese: { code: "pt-br", name: "Português" },
+	italian: { code: "it", name: "Italiano" },
+	japanese: { code: "ja", name: "日本語" },
+	spanish: { code: "es", name: "Español" },
+};
+
+export type Language = keyof typeof Languages;
+export type LanguageCode = (typeof Languages)[keyof typeof Languages]["code"];
+
diff --git a/apps/dokploy/pages/_app.tsx b/apps/dokploy/pages/_app.tsx
index b8891437..7a3ad327 100644
--- a/apps/dokploy/pages/_app.tsx
+++ b/apps/dokploy/pages/_app.tsx
@@ -68,7 +68,7 @@ export default api.withTRPC(
 	appWithTranslation(MyApp, {
 		i18n: {
 			defaultLocale: "en",
-			locales: Object.values(Languages),
+			locales: Object.values(Languages).map(language => language.code),
 			localeDetection: false,
 		},
 		fallbackLng: "en",
diff --git a/apps/dokploy/utils/hooks/use-locale.ts b/apps/dokploy/utils/hooks/use-locale.ts
index de979f7b..5bfb2846 100644
--- a/apps/dokploy/utils/hooks/use-locale.ts
+++ b/apps/dokploy/utils/hooks/use-locale.ts
@@ -1,10 +1,11 @@
-import type { Languages } from "@/lib/languages";
+import { LanguageCode } from "@/lib/languages";
 import Cookies from "js-cookie";
 
 export default function useLocale() {
-	const currentLocale = (Cookies.get("DOKPLOY_LOCALE") ?? "en") as Languages;
+	
+	const currentLocale = (Cookies.get("DOKPLOY_LOCALE") ?? "en") as LanguageCode;
 
-	const setLocale = (locale: Languages) => {
+	const setLocale = (locale: LanguageCode) => {
 		Cookies.set("DOKPLOY_LOCALE", locale, { expires: 365 });
 		window.location.reload();
 	};
diff --git a/apps/dokploy/utils/i18n.ts b/apps/dokploy/utils/i18n.ts
index 47466d1f..171bf892 100644
--- a/apps/dokploy/utils/i18n.ts
+++ b/apps/dokploy/utils/i18n.ts
@@ -17,7 +17,7 @@ export const serverSideTranslations = (
 		keySeparator: false,
 		i18n: {
 			defaultLocale: "en",
-			locales: Object.values(Languages),
+			locales: Object.values(Languages).map(language => language.code),
 			localeDetection: false,
 		},
 	});

From f242f5c65e7756909e6fd71e4a391918f05c2a94 Mon Sep 17 00:00:00 2001
From: 190km <botmiley@gmail.com>
Date: Thu, 26 Dec 2024 01:29:18 +0100
Subject: [PATCH 12/30] chore: lint

---
 apps/dokploy/components/dashboard/settings/appearance-form.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/dokploy/components/dashboard/settings/appearance-form.tsx b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
index fde952cc..316952b0 100644
--- a/apps/dokploy/components/dashboard/settings/appearance-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/appearance-form.tsx
@@ -35,7 +35,8 @@ import { useEffect } from "react";
 import { toast } from "sonner";
 
 
-const languageCodes = Object.values(Languages).map(lang => lang.code) as string[];
+const languageCodes = Object.values(Languages).map(lang => lang.code) as [string, ...string[]]; 
+
 const appearanceFormSchema = z.object({
 	theme: z.enum(["light", "dark", "system"], {
 		required_error: "Please select a theme.",

From c946e3e01b9abde9bb78729e5ccf9c800d7001ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Gabriel?= <joao.tonaco@proton.me>
Date: Fri, 27 Dec 2024 10:50:36 -0300
Subject: [PATCH 13/30] refactor: prevent layout shifting from scrollbar

---
 apps/dokploy/styles/globals.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/dokploy/styles/globals.css b/apps/dokploy/styles/globals.css
index ab6084e1..5550358e 100644
--- a/apps/dokploy/styles/globals.css
+++ b/apps/dokploy/styles/globals.css
@@ -90,6 +90,10 @@
 	}
 }
 
+html {
+	scrollbar-gutter: stable both-edges;
+}
+
 .xterm-viewport {
 	border-radius: 0.75rem /* 12px */ !important;
 }

From d45b55825129c2f82416a68f67baf3fd201fd47a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Gabriel?= <joao.tonaco@proton.me>
Date: Fri, 27 Dec 2024 11:08:55 -0300
Subject: [PATCH 14/30] fix: inconsistent service card height

---
 apps/dokploy/pages/dashboard/project/[projectId].tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/dokploy/pages/dashboard/project/[projectId].tsx b/apps/dokploy/pages/dashboard/project/[projectId].tsx
index 6dcc9b91..f39b57e7 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId].tsx
@@ -236,7 +236,7 @@ const Project = (
 				</header>
 			</div>
 
-			<div className="flex w-full gap-8 ">
+			<div className="flex w-full gap-8">
 				{emptyServices ? (
 					<div className="flex h-[70vh] w-full flex-col items-center justify-center">
 						<FolderInput className="size-10 md:size-28 text-muted" />
@@ -255,7 +255,7 @@ const Project = (
 											`/dashboard/project/${projectId}/services/${service.type}/${service.id}`,
 										);
 									}}
-									className="group relative cursor-pointer bg-transparent transition-colors hover:bg-card h-fit"
+									className="flex flex-col group relative cursor-pointer bg-transparent transition-colors hover:bg-card"
 								>
 									<div className="absolute -right-1 -top-2">
 										<StatusTooltip status={service.status} />
@@ -301,7 +301,7 @@ const Project = (
 											</div>
 										</CardTitle>
 									</CardHeader>
-									<CardFooter className="">
+									<CardFooter className="mt-auto">
 										<div className="space-y-1 text-sm">
 											<DateTooltip date={service.createdAt}>
 												Created

From 81408985d4a2492a86865bc3e2a6b32e55506eee Mon Sep 17 00:00:00 2001
From: 190km <botmiley@gmail.com>
Date: Sun, 29 Dec 2024 01:07:47 +0100
Subject: [PATCH 15/30] feat: swarm overview style

---
 .../servers/show-swarm-overview-modal.tsx     |   6 +-
 .../dashboard/swarm/details/details-card.tsx  | 231 +++++++--------
 .../dashboard/swarm/monitoring-card.tsx       | 271 ++++++++----------
 apps/dokploy/pages/dashboard/swarm.tsx        |   4 +-
 4 files changed, 236 insertions(+), 276 deletions(-)

diff --git a/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx b/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx
index f8acd207..a63c3037 100644
--- a/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx
@@ -39,11 +39,9 @@ export const ShowSwarmOverviewModal = ({ serverId }: Props) => {
 						</p>
 					</div>
 				</DialogHeader>
-
+&
 				<div className="grid w-full gap-1">
-					<div className="flex flex-wrap gap-4 py-4">
-						<SwarmMonitorCard serverId={serverId} />
-					</div>
+					<SwarmMonitorCard serverId={serverId} />
 				</div>
 			</DialogContent>
 		</Dialog>
diff --git a/apps/dokploy/components/dashboard/swarm/details/details-card.tsx b/apps/dokploy/components/dashboard/swarm/details/details-card.tsx
index a499f898..2de0901a 100644
--- a/apps/dokploy/components/dashboard/swarm/details/details-card.tsx
+++ b/apps/dokploy/components/dashboard/swarm/details/details-card.tsx
@@ -1,140 +1,127 @@
 import { Badge } from "@/components/ui/badge";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { Separator } from "@/components/ui/separator";
 import { api } from "@/utils/api";
 import {
-	AlertCircle,
-	CheckCircle,
-	HelpCircle,
-	Loader2,
-	LoaderIcon,
+  Box,
+  Cpu,
+  Database,
+  HardDrive,
+  Loader2,
 } from "lucide-react";
 import { ShowNodeApplications } from "../applications/show-applications";
 import { ShowNodeConfig } from "./show-node-config";
 
 export interface SwarmList {
-	ID: string;
-	Hostname: string;
-	Availability: string;
-	EngineVersion: string;
-	Status: string;
-	ManagerStatus: string;
-	TLSStatus: string;
+  ID: string;
+  Hostname: string;
+  Availability: string;
+  EngineVersion: string;
+  Status: string;
+  ManagerStatus: string;
+  TLSStatus: string;
 }
 
 interface Props {
-	node: SwarmList;
-	serverId?: string;
+  node: SwarmList;
+  serverId?: string;
 }
 
 export function NodeCard({ node, serverId }: Props) {
-	const { data, isLoading } = api.swarm.getNodeInfo.useQuery({
-		nodeId: node.ID,
-		serverId,
-	});
+  const { data, isLoading } = api.swarm.getNodeInfo.useQuery({
+    nodeId: node.ID,
+    serverId,
+  });
 
-	const getStatusIcon = (status: string) => {
-		switch (status) {
-			case "Ready":
-				return <CheckCircle className="h-4 w-4 text-green-500" />;
-			case "Down":
-				return <AlertCircle className="h-4 w-4 text-red-500" />;
-			default:
-				return <HelpCircle className="h-4 w-4 text-yellow-500" />;
-		}
-	};
 
-	if (isLoading) {
-		return (
-			<Card className="w-full bg-transparent">
-				<CardHeader>
-					<CardTitle className="flex items-center justify-between text-lg">
-						<span className="flex items-center gap-2">
-							{getStatusIcon(node.Status)}
-							{node.Hostname}
-						</span>
-						<Badge variant="outline" className="text-xs">
-							{node.ManagerStatus || "Worker"}
-						</Badge>
-					</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<div className="flex items-center justify-center">
-						<Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
-					</div>
-				</CardContent>
-			</Card>
-		);
-	}
+  if (isLoading) {
+    return (
+      <Card className="w-full bg-background">
+        <CardHeader>
+          <CardTitle className="flex items-center justify-between text-lg">
+            <span className="flex items-center gap-2">  
+              {node.Hostname}
+            </span>
+            <Badge variant="green">
+              {node.ManagerStatus || "Worker"}
+            </Badge>
+          </CardTitle>
+        </CardHeader>
+        <CardContent>
+          <div className="flex items-center justify-center">
+            <Loader2 className="h-6 w-6 animate-spin text-muted-foreground" />
+          </div>
+        </CardContent>
+      </Card>
+    );
+  }
 
-	return (
-		<Card className="w-full bg-transparent">
-			<CardHeader>
-				<CardTitle className="flex items-center justify-between">
-					<span className="flex items-center gap-2 text-lg">
-						{getStatusIcon(node.Status)}
-						{node.Hostname}
-					</span>
-					<Badge variant="outline" className="text-xs">
-						{node.ManagerStatus || "Worker"}
-					</Badge>
-				</CardTitle>
-			</CardHeader>
-			<CardContent>
-				<div className="grid gap-2 text-sm">
-					<div className="flex justify-between">
-						<span className="font-medium">Status:</span>
-						<span>{node.Status}</span>
-					</div>
-					<div className="flex justify-between">
-						<span className="font-medium">IP Address:</span>
-						{isLoading ? (
-							<LoaderIcon className="animate-spin" />
-						) : (
-							<span>{data?.Status?.Addr}</span>
-						)}
-					</div>
-					<div className="flex justify-between">
-						<span className="font-medium">Availability:</span>
-						<span>{node.Availability}</span>
-					</div>
-					<div className="flex justify-between">
-						<span className="font-medium">Engine Version:</span>
-						<span>{node.EngineVersion}</span>
-					</div>
-					<div className="flex justify-between">
-						<span className="font-medium">CPU:</span>
-						{isLoading ? (
-							<LoaderIcon className="animate-spin" />
-						) : (
-							<span>
-								{(data?.Description?.Resources?.NanoCPUs / 1e9).toFixed(2)} GHz
-							</span>
-						)}
-					</div>
-					<div className="flex justify-between">
-						<span className="font-medium">Memory:</span>
-						{isLoading ? (
-							<LoaderIcon className="animate-spin" />
-						) : (
-							<span>
-								{(
-									data?.Description?.Resources?.MemoryBytes /
-									1024 ** 3
-								).toFixed(2)}{" "}
-								GB
-							</span>
-						)}
-					</div>
-					<div className="flex justify-between">
-						<span className="font-medium">TLS Status:</span>
-						<span>{node.TLSStatus}</span>
-					</div>
-				</div>
-				<div className="flex gap-2 mt-4">
-					<ShowNodeConfig nodeId={node.ID} serverId={serverId} />
-					<ShowNodeApplications serverId={serverId} />
-				</div>
-			</CardContent>
-		</Card>
-	);
-}
+  return (
+    <Card className="w-full bg-background">
+      <CardHeader>
+        <CardTitle className="text-lg">Node Status</CardTitle>
+      </CardHeader>
+      <CardContent>
+        <div className="space-y-6">
+          <div className="flex flex-wrap items-center justify-between">
+            <div className="flex items-center space-x-4 p-2 rounded-xl border">
+              <div className={`h-2.5 w-2.5 rounded-full ${node.Status === "Ready" ? "bg-green-500" : "bg-red-500"}`} />
+              <div className="font-medium">{node.Hostname}</div>
+              <Badge variant="green">
+                {node.ManagerStatus || "Worker"}
+              </Badge>
+            </div>
+            <div className="flex flex-wrap items-center space-x-4">
+              <Badge variant="green" >
+                TLS Status: {node.TLSStatus}
+              </Badge>
+              <Badge variant="blue">
+                Availability: {node.Availability}
+              </Badge>
+            </div>
+          </div>
+
+          <Separator />
+
+          <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
+            <div className="space-y-2 flex flex-col items-center text-center">
+              <div className="flex items-center text-sm text-muted-foreground">
+                <HardDrive className="mr-2 h-4 w-4" />
+                Engine Version
+              </div>
+              <div>{node.EngineVersion}</div>
+            </div>
+            <div className="space-y-2 flex flex-col items-center text-center">
+              <div className="flex items-center text-sm text-muted-foreground">
+                <Cpu className="mr-2 h-4 w-4" />
+                CPU
+              </div>
+              <div>{data && (data.Description?.Resources?.NanoCPUs / 1e9).toFixed(2)} Core(s)</div>
+            </div>
+            <div className="space-y-2 flex flex-col items-center text-center">
+              <div className="flex items-center text-sm text-muted-foreground">
+                <Database className="mr-2 h-4 w-4" />
+                Memory
+              </div>
+              <div>
+                {data && (data.Description?.Resources?.MemoryBytes / 1024 ** 3).toFixed(2)} GB
+              </div>
+            </div>
+            <div className="space-y-2 flex flex-col items-center text-center">
+              <div className="flex items-center text-sm text-muted-foreground">
+                <Box className="mr-2 h-4 w-4" />
+                IP Address
+              </div>
+              <div>{data?.Status?.Addr}</div>
+            </div>
+          </div>
+
+          <div className="flex justify-end w-full space-x-4">
+		  	<ShowNodeConfig nodeId={node.ID} serverId={serverId} />
+            <ShowNodeApplications serverId={serverId} />
+          </div>
+        </div>
+      </CardContent>
+    </Card>
+  );
+}
\ No newline at end of file
diff --git a/apps/dokploy/components/dashboard/swarm/monitoring-card.tsx b/apps/dokploy/components/dashboard/swarm/monitoring-card.tsx
index e2453dd9..bd8570db 100644
--- a/apps/dokploy/components/dashboard/swarm/monitoring-card.tsx
+++ b/apps/dokploy/components/dashboard/swarm/monitoring-card.tsx
@@ -2,35 +2,35 @@ import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import {
-	Tooltip,
-	TooltipContent,
-	TooltipProvider,
-	TooltipTrigger,
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
 } from "@/components/ui/tooltip";
 import { api } from "@/utils/api";
 import {
-	AlertCircle,
-	CheckCircle,
-	HelpCircle,
-	Loader2,
-	Server,
+  Activity,
+  Loader2,
+  Monitor,
+  Settings,
+  Server,
 } from "lucide-react";
 import { NodeCard } from "./details/details-card";
 
 interface Props {
-	serverId?: string;
+  serverId?: string;
 }
 
 export default function SwarmMonitorCard({ serverId }: Props) {
-	const { data: nodes, isLoading } = api.swarm.getNodes.useQuery({
-		serverId,
-	});
+  const { data: nodes, isLoading } = api.swarm.getNodes.useQuery({
+    serverId,
+  });
 
 	if (isLoading) {
 		return (
 			<div className="w-full max-w-7xl mx-auto">
 				<div className="mb-6 border min-h-[55vh] rounded-lg h-full">
-					<div className="flex items-center justify-center h-full  text-muted-foreground">
+					<div className="flex items-center justify-center h-full text-muted-foreground">
 						<Loader2 className="h-6 w-6 animate-spin" />
 					</div>
 				</div>
@@ -50,139 +50,116 @@ export default function SwarmMonitorCard({ serverId }: Props) {
 		);
 	}
 
-	const totalNodes = nodes.length;
-	const activeNodesCount = nodes.filter(
-		(node) => node.Status === "Ready",
-	).length;
-	const managerNodesCount = nodes.filter(
-		(node) =>
-			node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
-	).length;
+  const totalNodes = nodes.length;
+  const activeNodesCount = nodes.filter((node) => node.Status === "Ready").length;
+  const managerNodesCount = nodes.filter((node) =>node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable").length;
+  const activeNodes = nodes.filter((node) => node.Status === "Ready");
+  const managerNodes = nodes.filter((node) => node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable");
 
-	const activeNodes = nodes.filter((node) => node.Status === "Ready");
-	const managerNodes = nodes.filter(
-		(node) =>
-			node.ManagerStatus === "Leader" || node.ManagerStatus === "Reachable",
-	);
+  return (
+    <div className="min-h-screen">
+      <div className="w-full max-w-7xl mx-auto space-y-6 py-4">
+        <header className="flex items-center justify-between">
+          <div className="space-y-1">
+            <h1 className="text-2xl font-semibold tracking-tight">Docker Swarm Overview</h1>
+            <p className="text-sm text-muted-foreground">Monitor and manage your Docker Swarm cluster</p>
+          </div>
+          {!serverId && (
+            <Button onClick={() => window.location.replace("/dashboard/settings/cluster")}>
+              <Settings className="mr-2 h-4 w-4" />
+              Manage Cluster
+            </Button>
+          )}
+        </header>
 
-	const getStatusIcon = (status: string) => {
-		switch (status) {
-			case "Ready":
-				return <CheckCircle className="h-4 w-4 text-green-500" />;
-			case "Down":
-				return <AlertCircle className="h-4 w-4 text-red-500" />;
-			case "Disconnected":
-				return <AlertCircle className="h-4 w-4 text-red-800" />;
-			default:
-				return <HelpCircle className="h-4 w-4 text-yellow-500" />;
-		}
-	};
+        <div className="grid gap-6 md:grid-cols-3">
+          <Card className="bg-background">
+            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+              <CardTitle className="text-sm font-medium">Total Nodes</CardTitle>
+              <div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
+                <Server className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
+              </div>
+            </CardHeader>
+            <CardContent>
+              <div className="text-2xl font-bold">{totalNodes}</div>
+            </CardContent>
+          </Card>
 
-	return (
-		<div className="w-full max-w-7xl mx-auto">
-			<div className="flex justify-between items-center mb-4">
-				<h1 className="text-xl font-bold">Docker Swarm Overview</h1>
-				{!serverId && (
-					<Button
-						type="button"
-						onClick={() =>
-							window.location.replace("/dashboard/settings/cluster")
-						}
-					>
-						Manage Cluster
-					</Button>
-				)}
-			</div>
-			<Card className="mb-6 bg-transparent">
-				<CardHeader className="flex flex-row items-center justify-between">
-					<CardTitle className="flex items-center gap-2 text-xl">
-						<Server className="size-4" />
-						Monitor
-					</CardTitle>
-				</CardHeader>
-				<CardContent>
-					<div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-						<div className="flex justify-between items-center">
-							<span className="text-sm font-medium">Total Nodes:</span>
-							<Badge variant="secondary">{totalNodes}</Badge>
-						</div>
-						<div className="flex justify-between items-center">
-							<span className="text-sm font-medium">Active Nodes:</span>
-							<TooltipProvider>
-								<Tooltip>
-									<TooltipTrigger>
-										<Badge
-											variant="secondary"
-											className="bg-green-100 dark:bg-green-400 text-black"
-										>
-											{activeNodesCount} / {totalNodes}
-										</Badge>
-									</TooltipTrigger>
-									<TooltipContent>
-										<div className="max-h-48 overflow-y-auto">
-											{activeNodes.map((node) => (
-												<div key={node.ID} className="flex items-center gap-2">
-													{getStatusIcon(node.Status)}
-													{node.Hostname}
-												</div>
-											))}
-										</div>
-									</TooltipContent>
-								</Tooltip>
-							</TooltipProvider>
-						</div>
-						<div className="flex justify-between items-center">
-							<span className="text-sm font-medium">Manager Nodes:</span>
-							<TooltipProvider>
-								<Tooltip>
-									<TooltipTrigger>
-										<Badge
-											variant="secondary"
-											className="bg-blue-100 dark:bg-blue-400 text-black"
-										>
-											{managerNodesCount} / {totalNodes}
-										</Badge>
-									</TooltipTrigger>
-									<TooltipContent>
-										<div className="max-h-48 overflow-y-auto">
-											{managerNodes.map((node) => (
-												<div key={node.ID} className="flex items-center gap-2">
-													{getStatusIcon(node.Status)}
-													{node.Hostname}
-												</div>
-											))}
-										</div>
-									</TooltipContent>
-								</Tooltip>
-							</TooltipProvider>
-						</div>
-					</div>
-					<div className="border-t pt-4 mt-4">
-						<h4 className="text-sm font-semibold mb-2">Node Status:</h4>
-						<ul className="space-y-2">
-							{nodes.map((node) => (
-								<li
-									key={node.ID}
-									className="flex justify-between items-center text-sm"
-								>
-									<span className="flex items-center gap-2">
-										{getStatusIcon(node.Status)}
-										{node.Hostname}
-									</span>
-									<Badge variant="outline" className="text-xs">
-										{node.ManagerStatus || "Worker"}
-									</Badge>
-								</li>
-							))}
-						</ul>
-					</div>
-				</CardContent>
-			</Card>
-			<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-				{nodes.map((node) => (
-					<NodeCard key={node.ID} node={node} serverId={serverId} />
-				))}
-			</div>
-		</div>
-	);
-}
+          <Card className="bg-background">
+            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+              <CardTitle className="text-sm font-medium">
+                Active Nodes
+                <Badge variant="green">
+                  Online
+                </Badge>
+              </CardTitle>
+              <div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
+                <Activity className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
+              </div>
+            </CardHeader>
+            <CardContent>
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <div className="text-2xl font-bold">
+                      {activeNodesCount} / {totalNodes}
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <div className="max-h-48 overflow-y-auto">
+                      {activeNodes.map((node) => (
+                        <div key={node.ID} className="flex items-center gap-2">
+                          {node.Hostname}
+                        </div>
+                      ))}
+                    </div>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </CardContent>
+          </Card>
+
+          <Card className="bg-background">
+            <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
+              <CardTitle className="text-sm font-medium">
+                Manager Nodes
+                <Badge variant="green">
+                  Online
+                </Badge>
+              </CardTitle>
+              <div className="p-2 bg-emerald-600/20 text-emerald-600 rounded-md">
+                <Monitor className="h-4 w-4 text-muted-foreground dark:text-emerald-600" />
+              </div>
+            </CardHeader>
+            <CardContent>
+              <TooltipProvider>
+                <Tooltip>
+                  <TooltipTrigger>
+                    <div className="text-2xl font-bold">
+                      {managerNodesCount} / {totalNodes}
+                    </div>
+                  </TooltipTrigger>
+                  <TooltipContent>
+                    <div className="max-h-48 overflow-y-auto">
+                      {managerNodes.map((node) => (
+                        <div key={node.ID} className="flex items-center gap-2">
+                          {node.Hostname}
+                        </div>
+                      ))}
+                    </div>
+                  </TooltipContent>
+                </Tooltip>
+              </TooltipProvider>
+            </CardContent>
+          </Card>
+        </div>
+
+        <div className="flex flex-row gap-4">
+          {nodes.map((node) => (
+            <NodeCard key={node.ID} node={node} serverId={serverId} />
+          ))}
+        </div>
+      </div>
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/apps/dokploy/pages/dashboard/swarm.tsx b/apps/dokploy/pages/dashboard/swarm.tsx
index 15a7d793..f36de68e 100644
--- a/apps/dokploy/pages/dashboard/swarm.tsx
+++ b/apps/dokploy/pages/dashboard/swarm.tsx
@@ -10,9 +10,7 @@ import superjson from "superjson";
 const Dashboard = () => {
 	return (
 		<>
-			<div className="flex flex-wrap gap-4 py-4">
-				<SwarmMonitorCard />
-			</div>
+			<SwarmMonitorCard />
 		</>
 	);
 };

From 0c2a38254140650cea6e91bae6d630be62356c43 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sat, 28 Dec 2024 19:29:51 -0600
Subject: [PATCH 16/30] Update
 apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx

---
 .../dashboard/settings/servers/show-swarm-overview-modal.tsx     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx b/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx
index a63c3037..1bb6fe5a 100644
--- a/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/show-swarm-overview-modal.tsx
@@ -39,7 +39,6 @@ export const ShowSwarmOverviewModal = ({ serverId }: Props) => {
 						</p>
 					</div>
 				</DialogHeader>
-&
 				<div className="grid w-full gap-1">
 					<SwarmMonitorCard serverId={serverId} />
 				</div>

From 2af8d6f565ca6042f19ef83442bc837da0e2038f Mon Sep 17 00:00:00 2001
From: Dom <jurgenjocubeit@gmail.com>
Date: Sun, 29 Dec 2024 22:34:57 +1000
Subject: [PATCH 17/30] Spelling and grammar corrections

---
 .../cluster/modify-swarm-settings.tsx         |  2 +-
 .../cluster/show-cluster-settings.tsx         |  2 +-
 .../advanced/general/add-command.tsx          |  2 +-
 .../application/advanced/ports/add-port.tsx   |  2 +-
 .../advanced/ports/delete-port.tsx            |  4 ++--
 .../advanced/ports/update-port.tsx            |  2 +-
 .../advanced/redirects/add-redirect.tsx       |  2 +-
 .../advanced/redirects/delete-redirect.tsx    |  4 ++--
 .../advanced/redirects/update-redirect.tsx    |  2 +-
 .../advanced/security/add-security.tsx        |  2 +-
 .../advanced/security/delete-security.tsx     |  4 ++--
 .../advanced/security/update-security.tsx     |  2 +-
 .../show-application-advanced-settings.tsx    |  2 +-
 .../traefik/update-traefik-config.tsx         |  2 +-
 .../advanced/volumes/add-volumes.tsx          |  6 ++---
 .../advanced/volumes/delete-volume.tsx        |  4 ++--
 .../advanced/volumes/update-volume.tsx        |  6 ++---
 .../dashboard/application/build/show.tsx      |  2 +-
 .../application/deployments/refresh-token.tsx |  2 +-
 .../application/domains/add-domain.tsx        |  4 ++--
 .../application/domains/delete-domain.tsx     |  4 ++--
 .../application/environment/show.tsx          |  2 +-
 .../general/deploy-application.tsx            |  4 ++--
 .../generic/save-bitbucket-provider.tsx       |  2 +-
 .../general/generic/save-docker-provider.tsx  |  2 +-
 .../general/generic/save-drag-n-drop.tsx      |  2 +-
 .../general/generic/save-git-provider.tsx     |  2 +-
 .../general/generic/save-github-provider.tsx  |  2 +-
 .../general/generic/save-gitlab-provider.tsx  |  2 +-
 .../application/general/reset-application.tsx |  2 +-
 .../dashboard/application/general/show.tsx    |  2 +-
 .../add-preview-domain.tsx                    |  4 ++--
 .../application/rebuild-application.tsx       |  2 +-
 .../application/start-application.tsx         |  4 ++--
 .../application/stop-application.tsx          |  4 ++--
 .../application/update-application.tsx        |  4 ++--
 .../compose/advanced/add-command.tsx          |  2 +-
 .../deployments/refresh-token-compose.tsx     |  2 +-
 .../dashboard/compose/domains/add-domain.tsx  |  4 ++--
 .../{enviroment => environment}/show.tsx      |  2 +-
 .../dashboard/compose/general/actions.tsx     |  2 +-
 .../compose/general/compose-file-editor.tsx   |  2 +-
 .../compose/general/deploy-compose.tsx        |  2 +-
 .../save-bitbucket-provider-compose.tsx       |  2 +-
 .../generic/save-git-provider-compose.tsx     |  2 +-
 .../generic/save-github-provider-compose.tsx  |  2 +-
 .../generic/save-gitlab-provider-compose.tsx  |  2 +-
 .../compose/general/randomize-compose.tsx     |  4 ++--
 .../compose/general/rebuild-compose.tsx       |  2 +-
 .../general/show-converted-compose.tsx        |  2 +-
 .../compose/general/stop-compose.tsx          |  4 ++--
 .../dashboard/compose/start-compose.tsx       |  4 ++--
 .../dashboard/compose/stop-compose.tsx        |  4 ++--
 .../dashboard/compose/update-compose.tsx      |  4 ++--
 .../dashboard/database/backups/add-backup.tsx |  2 +-
 .../database/backups/delete-backup.tsx        |  4 ++--
 .../database/backups/update-backup.tsx        |  2 +-
 .../file-system/show-traefik-file.tsx         |  2 +-
 .../show-mariadb-advanced-settings.tsx        |  2 +-
 .../advanced/show-mariadb-resources.tsx       |  2 +-
 .../mariadb/backups/show-backup-mariadb.tsx   |  2 +-
 .../environment/show-mariadb-environment.tsx  |  2 +-
 .../mariadb/general/deploy-mariadb.tsx        |  4 ++--
 .../mariadb/general/reset-mariadb.tsx         |  2 +-
 .../show-external-mariadb-credentials.tsx     |  2 +-
 .../mariadb/general/stop-mariadb.tsx          |  4 ++--
 .../dashboard/mariadb/start-mariadb.tsx       |  4 ++--
 .../dashboard/mariadb/update-mariadb.tsx      |  4 ++--
 .../advanced/show-mongo-advanced-settings.tsx |  2 +-
 .../mongo/advanced/show-mongo-resources.tsx   |  2 +-
 .../mongo/backups/show-backup-mongo.tsx       |  2 +-
 .../environment/show-mongo-environment.tsx    |  2 +-
 .../dashboard/mongo/general/deploy-mongo.tsx  |  4 ++--
 .../dashboard/mongo/general/reset-mongo.tsx   |  2 +-
 .../show-external-mongo-credentials.tsx       |  2 +-
 .../dashboard/mongo/general/stop-mongo.tsx    |  4 ++--
 .../dashboard/mongo/start-mongo.tsx           |  4 ++--
 .../dashboard/mongo/update-mongo.tsx          |  4 ++--
 .../advanced/show-mysql-advanced-settings.tsx |  2 +-
 .../mysql/advanced/show-mysql-resources.tsx   |  2 +-
 .../mysql/backups/show-backup-mysql.tsx       |  2 +-
 .../environment/show-mysql-environment.tsx    |  2 +-
 .../dashboard/mysql/general/deploy-mysql.tsx  |  4 ++--
 .../dashboard/mysql/general/reset-mysql.tsx   |  2 +-
 .../show-external-mysql-credentials.tsx       |  2 +-
 .../dashboard/mysql/general/stop-mysql.tsx    |  4 ++--
 .../dashboard/mysql/start-mysql.tsx           |  4 ++--
 .../dashboard/mysql/update-mysql.tsx          |  4 ++--
 .../show-postgres-advanced-settings.tsx       |  2 +-
 .../advanced/show-postgres-resources.tsx      |  2 +-
 .../postgres/backups/show-backup-postgres.tsx |  2 +-
 .../environment/show-postgres-environment.tsx |  2 +-
 .../postgres/general/deploy-postgres.tsx      |  4 ++--
 .../postgres/general/reset-postgres.tsx       |  2 +-
 .../show-external-postgres-credentials.tsx    |  2 +-
 .../postgres/general/stop-postgres.tsx        |  4 ++--
 .../dashboard/postgres/start-postgres.tsx     |  4 ++--
 .../dashboard/postgres/update-postgres.tsx    |  4 ++--
 .../dashboard/project/add-application.tsx     |  6 ++---
 .../dashboard/project/add-compose.tsx         |  6 ++---
 .../dashboard/project/add-database.tsx        |  2 +-
 .../dashboard/project/add-template.tsx        |  6 ++---
 .../components/dashboard/projects/add.tsx     |  2 +-
 ...enviroment.tsx => project-environment.tsx} | 12 +++++-----
 .../components/dashboard/projects/show.tsx    |  8 +++----
 .../components/dashboard/projects/update.tsx  |  6 ++---
 .../advanced/show-redis-advanced-settings.tsx |  2 +-
 .../redis/advanced/show-redis-resources.tsx   |  2 +-
 .../environment/show-redis-environment.tsx    |  2 +-
 .../dashboard/redis/general/deploy-redis.tsx  |  4 ++--
 .../dashboard/redis/general/reset-redis.tsx   |  2 +-
 .../show-external-redis-credentials.tsx       |  2 +-
 .../dashboard/redis/general/stop-redis.tsx    |  4 ++--
 .../dashboard/redis/start-redis.tsx           |  4 ++--
 .../dashboard/redis/update-redis.tsx          |  4 ++--
 .../settings/certificates/add-certificate.tsx |  2 +-
 .../certificates/delete-certificate.tsx       |  4 ++--
 .../cluster/nodes/workers/delete-worker.tsx   |  4 ++--
 .../cluster/registry/add-docker-registry.tsx  |  4 ++--
 .../cluster/registry/delete-registry.tsx      |  2 +-
 .../registry/update-docker-registry.tsx       |  4 ++--
 .../settings/destination/add-destination.tsx  |  6 ++---
 .../destination/delete-destination.tsx        |  4 ++--
 .../destination/update-destination.tsx        |  6 ++---
 .../git/bitbucket/edit-bitbucket-provider.tsx |  2 +-
 .../git/github/edit-github-provider.tsx       |  2 +-
 .../git/gitlab/edit-gitlab-provider.tsx       |  2 +-
 .../settings/git/remove-git-provider.tsx      |  4 ++--
 .../notifications/add-notification.tsx        |  4 ++--
 .../notifications/delete-notification.tsx     |  4 ++--
 .../notifications/update-notification.tsx     |  4 ++--
 .../settings/profile/disable-2fa.tsx          |  2 +-
 .../dashboard/settings/profile/enable-2fa.tsx |  2 +-
 .../settings/profile/profile-form.tsx         |  2 +-
 .../servers/actions/show-storage-actions.tsx  | 12 +++++-----
 .../servers/actions/show-traefik-actions.tsx  |  2 +-
 .../dashboard/settings/servers/add-server.tsx |  2 +-
 .../settings/servers/show-servers.tsx         |  2 +-
 .../settings/servers/update-server.tsx        |  2 +-
 .../servers/welcome-stripe/create-server.tsx  |  2 +-
 .../settings/ssh-keys/add-ssh-key.tsx         |  4 ++--
 .../settings/ssh-keys/delete-ssh-key.tsx      |  2 +-
 .../settings/ssh-keys/update-ssh-key.tsx      |  2 +-
 .../settings/users/add-permissions.tsx        |  2 +-
 .../dashboard/settings/users/add-user.tsx     |  2 +-
 .../dashboard/settings/users/delete-user.tsx  |  4 ++--
 .../dashboard/settings/web-domain.tsx         |  2 +-
 .../settings/web-server/edit-traefik-env.tsx  |  2 +-
 .../web-server/remove-ssh-private-key.tsx     |  4 ++--
 .../settings/web-server/update-server-ip.tsx  |  2 +-
 .../pages/api/deploy/[refreshToken].ts        |  6 ++---
 .../api/deploy/compose/[refreshToken].ts      |  6 ++---
 apps/dokploy/pages/api/deploy/github.ts       |  2 +-
 .../pages/dashboard/project/[projectId].tsx   |  8 +++----
 .../services/compose/[composeId].tsx          |  2 +-
 apps/dokploy/pages/index.tsx                  |  2 +-
 apps/dokploy/pages/invitation.tsx             |  2 +-
 apps/dokploy/pages/register.tsx               |  4 ++--
 apps/dokploy/pages/reset-password.tsx         |  4 ++--
 apps/dokploy/pages/send-reset-password.tsx    |  2 +-
 apps/dokploy/reset-password.ts                |  2 +-
 apps/dokploy/server/api/routers/admin.ts      |  4 ++--
 .../dokploy/server/api/routers/application.ts |  4 ++--
 apps/dokploy/server/api/routers/auth.ts       |  6 ++---
 apps/dokploy/server/api/routers/backup.ts     | 14 +++++------
 apps/dokploy/server/api/routers/bitbucket.ts  |  2 +-
 apps/dokploy/server/api/routers/cluster.ts    |  2 +-
 apps/dokploy/server/api/routers/compose.ts    |  2 +-
 .../dokploy/server/api/routers/destination.ts |  4 ++--
 apps/dokploy/server/api/routers/domain.ts     |  2 +-
 .../server/api/routers/git-provider.ts        |  4 ++--
 apps/dokploy/server/api/routers/gitlab.ts     | 12 +++++-----
 apps/dokploy/server/api/routers/mariadb.ts    | 20 ++++++++--------
 apps/dokploy/server/api/routers/mongo.ts      |  4 ++--
 apps/dokploy/server/api/routers/mysql.ts      | 24 +++++++++----------
 .../server/api/routers/notification.ts        | 24 +++++++++----------
 apps/dokploy/server/api/routers/port.ts       |  2 +-
 apps/dokploy/server/api/routers/postgres.ts   | 24 +++++++++----------
 apps/dokploy/server/api/routers/project.ts    |  2 +-
 apps/dokploy/server/api/routers/redis.ts      | 20 ++++++++--------
 apps/dokploy/server/api/routers/registry.ts   |  2 +-
 apps/dokploy/server/api/routers/server.ts     |  2 +-
 apps/dokploy/server/api/routers/settings.ts   |  2 +-
 apps/dokploy/server/api/routers/ssh-key.ts    | 10 ++++----
 apps/dokploy/server/db/reset.ts               |  2 +-
 apps/dokploy/server/wss/terminal.ts           |  4 ++--
 apps/dokploy/setup.ts                         |  2 +-
 packages/server/src/db/reset.ts               |  2 +-
 packages/server/src/services/admin.ts         |  2 +-
 packages/server/src/services/application.ts   |  6 ++---
 packages/server/src/services/auth.ts          |  4 ++--
 packages/server/src/services/backup.ts        |  2 +-
 packages/server/src/services/bitbucket.ts     |  2 +-
 packages/server/src/services/compose.ts       |  4 ++--
 packages/server/src/services/deployment.ts    | 18 +++++++-------
 packages/server/src/services/github.ts        |  2 +-
 packages/server/src/services/gitlab.ts        |  2 +-
 packages/server/src/services/mount.ts         |  8 +++----
 .../server/src/services/preview-deployment.ts |  4 ++--
 packages/server/src/services/project.ts       |  2 +-
 packages/server/src/services/redirect.ts      |  8 +++----
 packages/server/src/services/registry.ts      |  4 ++--
 packages/server/src/services/security.ts      |  8 +++----
 packages/server/src/services/server.ts        |  2 +-
 packages/server/src/services/ssh-key.ts       |  2 +-
 .../server/src/utils/access-log/handler.ts    |  2 +-
 .../server/src/utils/filesystem/directory.ts  |  8 +++----
 packages/server/src/wss/utils.ts              |  4 ++--
 208 files changed, 397 insertions(+), 397 deletions(-)
 rename apps/dokploy/components/dashboard/compose/{enviroment => environment}/show.tsx (98%)
 rename apps/dokploy/components/dashboard/projects/{project-enviroment.tsx => project-environment.tsx} (92%)

diff --git a/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
index 6750527d..9b71a042 100644
--- a/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/cluster/modify-swarm-settings.tsx
@@ -259,7 +259,7 @@ export const AddSwarmSettings = ({ applicationId }: Props) => {
 				refetch();
 			})
 			.catch(() => {
-				toast.error("Error to update the swarm settings");
+				toast.error("Error updating the swarm settings");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx
index d8d32e19..cf7314cf 100644
--- a/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/cluster/show-cluster-settings.tsx
@@ -94,7 +94,7 @@ export const ShowClusterSettings = ({ applicationId }: Props) => {
 				});
 			})
 			.catch(() => {
-				toast.error("Error to update the command");
+				toast.error("Error updating the command");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx b/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx
index 979660bc..f9e70b42 100644
--- a/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/general/add-command.tsx
@@ -71,7 +71,7 @@ export const AddCommand = ({ applicationId }: Props) => {
 				});
 			})
 			.catch(() => {
-				toast.error("Error to update the command");
+				toast.error("Error updating the command");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx b/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx
index 1b613704..1fc34cac 100644
--- a/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/ports/add-port.tsx
@@ -86,7 +86,7 @@ export const AddPort = ({
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to create the port");
+				toast.error("Error creating the port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx b/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx
index cc2c7776..e1723f6e 100644
--- a/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/ports/delete-port.tsx
@@ -47,10 +47,10 @@ export const DeletePort = ({ portId }: Props) => {
 										applicationId: data?.applicationId,
 									});
 
-									toast.success("Port delete succesfully");
+									toast.success("Port delete successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the port");
+									toast.error("Error deleting the port");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx b/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx
index a9f7f32d..e37a3c5b 100644
--- a/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/ports/update-port.tsx
@@ -93,7 +93,7 @@ export const UpdatePort = ({ portId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the port");
+				toast.error("Error updating the port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx
index 8ce547a2..abeb2108 100644
--- a/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/redirects/add-redirect.tsx
@@ -124,7 +124,7 @@ export const AddRedirect = ({
 				onDialogToggle(false);
 			})
 			.catch(() => {
-				toast.error("Error to create the redirect");
+				toast.error("Error creating the redirect");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx
index 08d1f3e0..49f289b2 100644
--- a/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/redirects/delete-redirect.tsx
@@ -50,10 +50,10 @@ export const DeleteRedirect = ({ redirectId }: Props) => {
 									utils.application.readTraefikConfig.invalidate({
 										applicationId: data?.applicationId,
 									});
-									toast.success("Redirect delete succesfully");
+									toast.success("Redirect delete successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the redirect");
+									toast.error("Error deleting the redirect");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx
index 52ff310d..c4125846 100644
--- a/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/redirects/update-redirect.tsx
@@ -88,7 +88,7 @@ export const UpdateRedirect = ({ redirectId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the redirect");
+				toast.error("Error updating the redirect");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx b/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx
index aeaebb92..56a1a6a4 100644
--- a/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/security/add-security.tsx
@@ -75,7 +75,7 @@ export const AddSecurity = ({
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to create the security");
+				toast.error("Error creating security");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx b/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx
index 1a63c234..b44b2ff8 100644
--- a/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/security/delete-security.tsx
@@ -50,10 +50,10 @@ export const DeleteSecurity = ({ securityId }: Props) => {
 									utils.application.readTraefikConfig.invalidate({
 										applicationId: data?.applicationId,
 									});
-									toast.success("Security delete succesfully");
+									toast.success("Security delete successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the security");
+									toast.error("Error deleting the security");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx b/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx
index 1e5af95f..cec1db0d 100644
--- a/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/security/update-security.tsx
@@ -83,7 +83,7 @@ export const UpdateSecurity = ({ securityId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the security");
+				toast.error("Error updating the security");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
index e77be2d1..507fb50a 100644
--- a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
@@ -72,7 +72,7 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx b/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx
index 2c2437a1..f563f1ab 100644
--- a/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/traefik/update-traefik-config.tsx
@@ -105,7 +105,7 @@ export const UpdateTraefikConfig = ({ applicationId }: Props) => {
 				form.reset();
 			})
 			.catch(() => {
-				toast.error("Error to update the traefik config");
+				toast.error("Error updating the Traefik config");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx b/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx
index 5c6b95ca..718f98b7 100644
--- a/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/volumes/add-volumes.tsx
@@ -107,7 +107,7 @@ export const AddVolumes = ({
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to create the Bind mount");
+					toast.error("Error creating the Bind mount");
 				});
 		} else if (data.type === "volume") {
 			await mutateAsync({
@@ -122,7 +122,7 @@ export const AddVolumes = ({
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to create the Volume mount");
+					toast.error("Error creating the Volume mount");
 				});
 		} else if (data.type === "file") {
 			await mutateAsync({
@@ -138,7 +138,7 @@ export const AddVolumes = ({
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to create the File mount");
+					toast.error("Error creating the File mount");
 				});
 		}
 
diff --git a/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx b/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx
index 020a6c36..4945bb4b 100644
--- a/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/volumes/delete-volume.tsx
@@ -45,10 +45,10 @@ export const DeleteVolume = ({ mountId, refetch }: Props) => {
 							})
 								.then(() => {
 									refetch();
-									toast.success("Mount deleted succesfully");
+									toast.success("Mount deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the mount");
+									toast.error("Error deleting the mount");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx b/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx
index 80cc97ad..55ea2120 100644
--- a/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/volumes/update-volume.tsx
@@ -139,7 +139,7 @@ export const UpdateVolume = ({
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to update the Bind mount");
+					toast.error("Error updating the Bind mount");
 				});
 		} else if (data.type === "volume") {
 			await mutateAsync({
@@ -153,7 +153,7 @@ export const UpdateVolume = ({
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to update the Volume mount");
+					toast.error("Error updating the Volume mount");
 				});
 		} else if (data.type === "file") {
 			await mutateAsync({
@@ -168,7 +168,7 @@ export const UpdateVolume = ({
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to update the File mount");
+					toast.error("Error updating the File mount");
 				});
 		}
 		refetch();
diff --git a/apps/dokploy/components/dashboard/application/build/show.tsx b/apps/dokploy/components/dashboard/application/build/show.tsx
index edfb38ae..ad83f456 100644
--- a/apps/dokploy/components/dashboard/application/build/show.tsx
+++ b/apps/dokploy/components/dashboard/application/build/show.tsx
@@ -126,7 +126,7 @@ export const ShowBuildChooseForm = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the build type");
+				toast.error("Error saving the build type");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx b/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx
index 88d5beee..c268e6d5 100644
--- a/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx
+++ b/apps/dokploy/components/dashboard/application/deployments/refresh-token.tsx
@@ -47,7 +47,7 @@ export const RefreshToken = ({ applicationId }: Props) => {
 									toast.success("Refresh updated");
 								})
 								.catch(() => {
-									toast.error("Error to update the refresh token");
+									toast.error("Error updating the refresh token");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/domains/add-domain.tsx b/apps/dokploy/components/dashboard/application/domains/add-domain.tsx
index 38180114..22eaf1d3 100644
--- a/apps/dokploy/components/dashboard/application/domains/add-domain.tsx
+++ b/apps/dokploy/components/dashboard/application/domains/add-domain.tsx
@@ -105,8 +105,8 @@ export const AddDomain = ({
 	const dictionary = {
 		success: domainId ? "Domain Updated" : "Domain Created",
 		error: domainId
-			? "Error to update the domain"
-			: "Error to create the domain",
+			? "Error updating the domain"
+			: "Error creating the domain",
 		submit: domainId ? "Update" : "Create",
 		dialogDescription: domainId
 			? "In this section you can edit a domain"
diff --git a/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx b/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx
index 5933a99a..3d4425df 100644
--- a/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx
+++ b/apps/dokploy/components/dashboard/application/domains/delete-domain.tsx
@@ -57,10 +57,10 @@ export const DeleteDomain = ({ domainId }: Props) => {
 										});
 									}
 
-									toast.success("Domain delete succesfully");
+									toast.success("Domain delete successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete Domain");
+									toast.error("Error deleting the Domain");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/environment/show.tsx b/apps/dokploy/components/dashboard/application/environment/show.tsx
index c7b8d4bb..ec555804 100644
--- a/apps/dokploy/components/dashboard/application/environment/show.tsx
+++ b/apps/dokploy/components/dashboard/application/environment/show.tsx
@@ -51,7 +51,7 @@ export const ShowEnvironment = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/deploy-application.tsx b/apps/dokploy/components/dashboard/application/general/deploy-application.tsx
index 252894dd..c1ab8457 100644
--- a/apps/dokploy/components/dashboard/application/general/deploy-application.tsx
+++ b/apps/dokploy/components/dashboard/application/general/deploy-application.tsx
@@ -51,7 +51,7 @@ export const DeployApplication = ({ applicationId }: Props) => {
 								applicationId,
 							})
 								.then(async () => {
-									toast.success("Application deployed succesfully");
+									toast.success("Application deployed successfully");
 									await refetch();
 									router.push(
 										`/dashboard/project/${data?.projectId}/services/application/${applicationId}?tab=deployments`,
@@ -59,7 +59,7 @@ export const DeployApplication = ({ applicationId }: Props) => {
 								})
 
 								.catch(() => {
-									toast.error("Error to deploy Application");
+									toast.error("Error deploying the Application");
 								});
 
 							await refetch();
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx
index d6dfa20e..a487452b 100644
--- a/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx
+++ b/apps/dokploy/components/dashboard/application/general/generic/save-bitbucket-provider.tsx
@@ -137,7 +137,7 @@ export const SaveBitbucketProvider = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the Bitbucket provider");
+				toast.error("Error saving the Bitbucket provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx
index b4e33719..fcc4f824 100644
--- a/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx
+++ b/apps/dokploy/components/dashboard/application/general/generic/save-docker-provider.tsx
@@ -68,7 +68,7 @@ export const SaveDockerProvider = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the Docker provider");
+				toast.error("Error saving the Docker provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx
index 4ed9df16..3732860d 100644
--- a/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx
+++ b/apps/dokploy/components/dashboard/application/general/generic/save-drag-n-drop.tsx
@@ -56,7 +56,7 @@ export const SaveDragNDrop = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the deployment");
+				toast.error("Error saving the deployment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx
index 58fd1973..218e004d 100644
--- a/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx
+++ b/apps/dokploy/components/dashboard/application/general/generic/save-git-provider.tsx
@@ -84,7 +84,7 @@ export const SaveGitProvider = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the Git provider");
+				toast.error("Error saving the Git provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx
index 5c432e6a..f5da9ceb 100644
--- a/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx
+++ b/apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx
@@ -131,7 +131,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the github provider");
+				toast.error("Error saving the github provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx b/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx
index 2d498bfd..d190180e 100644
--- a/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx
+++ b/apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx
@@ -144,7 +144,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the gitlab provider");
+				toast.error("Error saving the gitlab provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/application/general/reset-application.tsx b/apps/dokploy/components/dashboard/application/general/reset-application.tsx
index cc338658..5be2a185 100644
--- a/apps/dokploy/components/dashboard/application/general/reset-application.tsx
+++ b/apps/dokploy/components/dashboard/application/general/reset-application.tsx
@@ -56,7 +56,7 @@ export const ResetApplication = ({ applicationId, appName }: Props) => {
 									toast.success("Service Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the service");
+									toast.error("Error reloading the service");
 								});
 							await refetch();
 						}}
diff --git a/apps/dokploy/components/dashboard/application/general/show.tsx b/apps/dokploy/components/dashboard/application/general/show.tsx
index 65c99e9b..46f185d5 100644
--- a/apps/dokploy/components/dashboard/application/general/show.tsx
+++ b/apps/dokploy/components/dashboard/application/general/show.tsx
@@ -69,7 +69,7 @@ export const ShowGeneralApplication = ({ applicationId }: Props) => {
 										await refetch();
 									})
 									.catch(() => {
-										toast.error("Error to update Auto Deploy");
+										toast.error("Error updating Auto Deploy");
 									});
 							}}
 							className="flex flex-row gap-2 items-center"
diff --git a/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx b/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx
index 875a93d4..3a33bbed 100644
--- a/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx
+++ b/apps/dokploy/components/dashboard/application/preview-deployments/add-preview-domain.tsx
@@ -105,8 +105,8 @@ export const AddPreviewDomain = ({
 	const dictionary = {
 		success: domainId ? "Domain Updated" : "Domain Created",
 		error: domainId
-			? "Error to update the domain"
-			: "Error to create the domain",
+			? "Error updating the domain"
+			: "Error creating the domain",
 		submit: domainId ? "Update" : "Create",
 		dialogDescription: domainId
 			? "In this section you can edit a domain"
diff --git a/apps/dokploy/components/dashboard/application/rebuild-application.tsx b/apps/dokploy/components/dashboard/application/rebuild-application.tsx
index 0284ab8f..66ed3397 100644
--- a/apps/dokploy/components/dashboard/application/rebuild-application.tsx
+++ b/apps/dokploy/components/dashboard/application/rebuild-application.tsx
@@ -63,7 +63,7 @@ export const RedbuildApplication = ({ applicationId }: Props) => {
 									});
 								})
 								.catch(() => {
-									toast.error("Error to rebuild the application");
+									toast.error("Error rebuilding the application");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/start-application.tsx b/apps/dokploy/components/dashboard/application/start-application.tsx
index d65997ed..9a65397b 100644
--- a/apps/dokploy/components/dashboard/application/start-application.tsx
+++ b/apps/dokploy/components/dashboard/application/start-application.tsx
@@ -49,10 +49,10 @@ export const StartApplication = ({ applicationId }: Props) => {
 									await utils.application.one.invalidate({
 										applicationId,
 									});
-									toast.success("Application started succesfully");
+									toast.success("Application started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Application");
+									toast.error("Error starting the Application");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/stop-application.tsx b/apps/dokploy/components/dashboard/application/stop-application.tsx
index 5eb873f4..ea052fab 100644
--- a/apps/dokploy/components/dashboard/application/stop-application.tsx
+++ b/apps/dokploy/components/dashboard/application/stop-application.tsx
@@ -49,10 +49,10 @@ export const StopApplication = ({ applicationId }: Props) => {
 									await utils.application.one.invalidate({
 										applicationId,
 									});
-									toast.success("Application stopped succesfully");
+									toast.success("Application stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Application");
+									toast.error("Error stopping the Application");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/application/update-application.tsx b/apps/dokploy/components/dashboard/application/update-application.tsx
index f40a0020..8f8b63fe 100644
--- a/apps/dokploy/components/dashboard/application/update-application.tsx
+++ b/apps/dokploy/components/dashboard/application/update-application.tsx
@@ -76,14 +76,14 @@ export const UpdateApplication = ({ applicationId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("Application updated succesfully");
+				toast.success("Application updated successfully");
 				utils.application.one.invalidate({
 					applicationId: applicationId,
 				});
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the application");
+				toast.error("Error updating the Application");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx b/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx
index 6d1b455f..1bbd3820 100644
--- a/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx
+++ b/apps/dokploy/components/dashboard/compose/advanced/add-command.tsx
@@ -82,7 +82,7 @@ export const AddCommandCompose = ({ composeId }: Props) => {
 				});
 			})
 			.catch(() => {
-				toast.error("Error to update the command");
+				toast.error("Error updating the command");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx b/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx
index 66d690e7..95fafaab 100644
--- a/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/deployments/refresh-token-compose.tsx
@@ -47,7 +47,7 @@ export const RefreshTokenCompose = ({ composeId }: Props) => {
 									toast.success("Refresh Token updated");
 								})
 								.catch(() => {
-									toast.error("Error to update the refresh token");
+									toast.error("Error updating the refresh token");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx b/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx
index 6ea38237..b9ae9a2e 100644
--- a/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx
+++ b/apps/dokploy/components/dashboard/compose/domains/add-domain.tsx
@@ -127,8 +127,8 @@ export const AddDomainCompose = ({
 	const dictionary = {
 		success: domainId ? "Domain Updated" : "Domain Created",
 		error: domainId
-			? "Error to update the domain"
-			: "Error to create the domain",
+			? "Error updating the domain"
+			: "Error creating the domain",
 		submit: domainId ? "Update" : "Create",
 		dialogDescription: domainId
 			? "In this section you can edit a domain"
diff --git a/apps/dokploy/components/dashboard/compose/enviroment/show.tsx b/apps/dokploy/components/dashboard/compose/environment/show.tsx
similarity index 98%
rename from apps/dokploy/components/dashboard/compose/enviroment/show.tsx
rename to apps/dokploy/components/dashboard/compose/environment/show.tsx
index 4e9b2dfd..8fa1f444 100644
--- a/apps/dokploy/components/dashboard/compose/enviroment/show.tsx
+++ b/apps/dokploy/components/dashboard/compose/environment/show.tsx
@@ -70,7 +70,7 @@ export const ShowEnvironmentCompose = ({ composeId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/general/actions.tsx b/apps/dokploy/components/dashboard/compose/general/actions.tsx
index 43966966..215e7e42 100644
--- a/apps/dokploy/components/dashboard/compose/general/actions.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/actions.tsx
@@ -83,7 +83,7 @@ export const ComposeActions = ({ composeId }: Props) => {
 								await refetch();
 							})
 							.catch(() => {
-								toast.error("Error to update Auto Deploy");
+								toast.error("Error updating Auto Deploy");
 							});
 					}}
 					className="flex flex-row gap-2 items-center"
diff --git a/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx b/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx
index 90bf6e30..b368aafc 100644
--- a/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/compose-file-editor.tsx
@@ -77,7 +77,7 @@ export const ComposeFileEditor = ({ composeId }: Props) => {
 				});
 			})
 			.catch((e) => {
-				toast.error("Error to update the compose config");
+				toast.error("Error updating the Compose config");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx b/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx
index 25b59cc7..2c6f13e0 100644
--- a/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/deploy-compose.tsx
@@ -57,7 +57,7 @@ export const DeployCompose = ({ composeId }: Props) => {
 									);
 								})
 								.catch(() => {
-									toast.error("Error to deploy Compose");
+									toast.error("Error deploying Compose");
 								});
 
 							await refetch();
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx
index cf5a7d5b..2a083666 100644
--- a/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/generic/save-bitbucket-provider-compose.tsx
@@ -139,7 +139,7 @@ export const SaveBitbucketProviderCompose = ({ composeId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the Bitbucket provider");
+				toast.error("Error saving the Bitbucket provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx
index c05dc7ed..e42f6d55 100644
--- a/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/generic/save-git-provider-compose.tsx
@@ -83,7 +83,7 @@ export const SaveGitProviderCompose = ({ composeId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the Git provider");
+				toast.error("Error saving the Git provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx
index bd5e8874..af1a61d4 100644
--- a/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/generic/save-github-provider-compose.tsx
@@ -133,7 +133,7 @@ export const SaveGithubProviderCompose = ({ composeId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the github provider");
+				toast.error("Error saving the Github provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx b/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx
index c0a871c0..5f28b342 100644
--- a/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/generic/save-gitlab-provider-compose.tsx
@@ -146,7 +146,7 @@ export const SaveGitlabProviderCompose = ({ composeId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the gitlab provider");
+				toast.error("Error saving the Gitlab provider");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx
index 2c6184c8..59233acf 100644
--- a/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/randomize-compose.tsx
@@ -90,7 +90,7 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 				toast.success("Compose updated");
 			})
 			.catch(() => {
-				toast.error("Error to randomize the compose");
+				toast.error("Error randomizing the compose");
 			});
 	};
 
@@ -105,7 +105,7 @@ export const RandomizeCompose = ({ composeId }: Props) => {
 				toast.success("Compose randomized");
 			})
 			.catch(() => {
-				toast.error("Error to randomize the compose");
+				toast.error("Error randomizing the compose");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx b/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx
index 199d4f93..c2f50414 100644
--- a/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/rebuild-compose.tsx
@@ -62,7 +62,7 @@ export const RedbuildCompose = ({ composeId }: Props) => {
 									});
 								})
 								.catch(() => {
-									toast.error("Error to rebuild the compose");
+									toast.error("Error rebuilding the compose");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx b/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx
index ec441e02..8a2186d9 100644
--- a/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/show-converted-compose.tsx
@@ -73,7 +73,7 @@ export const ShowConvertedCompose = ({ composeId }: Props) => {
 									toast.success("Fetched source type");
 								})
 								.catch((err) => {
-									toast.error("Error to fetch source type", {
+									toast.error("Error fetching source type", {
 										description: err.message,
 									});
 								});
diff --git a/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx b/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx
index 2bb3cdeb..f405481b 100644
--- a/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/general/stop-compose.tsx
@@ -53,10 +53,10 @@ export const StopCompose = ({ composeId }: Props) => {
 									await utils.compose.one.invalidate({
 										composeId,
 									});
-									toast.success("Compose stopped succesfully");
+									toast.success("Compose stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the compose");
+									toast.error("Error stopping the compose");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/compose/start-compose.tsx b/apps/dokploy/components/dashboard/compose/start-compose.tsx
index 20f990bb..fae978e2 100644
--- a/apps/dokploy/components/dashboard/compose/start-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/start-compose.tsx
@@ -49,10 +49,10 @@ export const StartCompose = ({ composeId }: Props) => {
 									await utils.compose.one.invalidate({
 										composeId,
 									});
-									toast.success("Compose started succesfully");
+									toast.success("Compose started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Compose");
+									toast.error("Error starting the Compose");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/compose/stop-compose.tsx b/apps/dokploy/components/dashboard/compose/stop-compose.tsx
index 3080e755..da3e3412 100644
--- a/apps/dokploy/components/dashboard/compose/stop-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/stop-compose.tsx
@@ -49,10 +49,10 @@ export const StopCompose = ({ composeId }: Props) => {
 									await utils.compose.one.invalidate({
 										composeId,
 									});
-									toast.success("Compose stopped succesfully");
+									toast.success("Compose stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Compose");
+									toast.error("Error stopping the Compose");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/compose/update-compose.tsx b/apps/dokploy/components/dashboard/compose/update-compose.tsx
index 5991c03d..807f5b26 100644
--- a/apps/dokploy/components/dashboard/compose/update-compose.tsx
+++ b/apps/dokploy/components/dashboard/compose/update-compose.tsx
@@ -76,14 +76,14 @@ export const UpdateCompose = ({ composeId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("Compose updated succesfully");
+				toast.success("Compose updated successfully");
 				utils.compose.one.invalidate({
 					composeId: composeId,
 				});
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the Compose");
+				toast.error("Error updating the Compose");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/database/backups/add-backup.tsx b/apps/dokploy/components/dashboard/database/backups/add-backup.tsx
index 94f072e7..5f349b24 100644
--- a/apps/dokploy/components/dashboard/database/backups/add-backup.tsx
+++ b/apps/dokploy/components/dashboard/database/backups/add-backup.tsx
@@ -125,7 +125,7 @@ export const AddBackup = ({ databaseId, databaseType, refetch }: Props) => {
 				refetch();
 			})
 			.catch(() => {
-				toast.error("Error to create a backup");
+				toast.error("Error creating a backup");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx b/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx
index 1a570b54..63c6677d 100644
--- a/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx
+++ b/apps/dokploy/components/dashboard/database/backups/delete-backup.tsx
@@ -46,10 +46,10 @@ export const DeleteBackup = ({ backupId, refetch }: Props) => {
 								.then(() => {
 									refetch();
 
-									toast.success("Backup delete succesfully");
+									toast.success("Backup deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the backup");
+									toast.error("Error deleting the backup");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/database/backups/update-backup.tsx b/apps/dokploy/components/dashboard/database/backups/update-backup.tsx
index 4c60a31b..55754e9d 100644
--- a/apps/dokploy/components/dashboard/database/backups/update-backup.tsx
+++ b/apps/dokploy/components/dashboard/database/backups/update-backup.tsx
@@ -109,7 +109,7 @@ export const UpdateBackup = ({ backupId, refetch }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the backup");
+				toast.error("Error updating the Backup");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx b/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx
index 3dfe9875..fb5fe8f5 100644
--- a/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx
+++ b/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx
@@ -86,7 +86,7 @@ export const ShowTraefikFile = ({ path, serverId }: Props) => {
 				refetch();
 			})
 			.catch(() => {
-				toast.error("Error to update the traefik config");
+				toast.error("Error updating the Traefik config");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx
index 062fffcd..b4c0129d 100644
--- a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-advanced-settings.tsx
@@ -65,7 +65,7 @@ export const ShowAdvancedMariadb = ({ mariadbId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
index 60cdbda0..4708b123 100644
--- a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
@@ -71,7 +71,7 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx
index f3d214e3..cac2820f 100644
--- a/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/backups/show-backup-mariadb.tsx
@@ -144,7 +144,7 @@ export const ShowBackupMariadb = ({ mariadbId }: Props) => {
 																			})
 																			.catch(() => {
 																				toast.error(
-																					"Error to Create the manual backup",
+																					"Error creating the manual backup",
 																				);
 																			});
 																	}}
diff --git a/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx b/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx
index 61f64cd8..418ae001 100644
--- a/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/environment/show-mariadb-environment.tsx
@@ -70,7 +70,7 @@ export const ShowMariadbEnvironment = ({ mariadbId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx
index e3162f00..50bf5819 100644
--- a/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/general/deploy-mariadb.tsx
@@ -55,12 +55,12 @@ export const DeployMariadb = ({ mariadbId }: Props) => {
 									await deploy({
 										mariadbId,
 									}).catch(() => {
-										toast.error("Error to deploy Database");
+										toast.error("Error deploying Database");
 									});
 									await refetch();
 								})
 								.catch((e) => {
-									toast.error(e.message || "Error to deploy Database");
+									toast.error(e.message || "Error deploying Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx
index 3adb3b70..bee3d8ba 100644
--- a/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/general/reset-mariadb.tsx
@@ -55,7 +55,7 @@ export const ResetMariadb = ({ mariadbId, appName }: Props) => {
 									toast.success("Service Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the service");
+									toast.error("Error reloading the service");
 								});
 							await refetch();
 						}}
diff --git a/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx b/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx
index c06cacaa..f2044917 100644
--- a/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/general/show-external-mariadb-credentials.tsx
@@ -72,7 +72,7 @@ export const ShowExternalMariadbCredentials = ({ mariadbId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the external port");
+				toast.error("Error saving the external port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx
index 17eb4bcd..55dc1367 100644
--- a/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/general/stop-mariadb.tsx
@@ -49,10 +49,10 @@ export const StopMariadb = ({ mariadbId }: Props) => {
 									await utils.mariadb.one.invalidate({
 										mariadbId,
 									});
-									toast.success("Application stopped succesfully");
+									toast.success("Application stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Application");
+									toast.error("Error stopping the Application");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx
index dff62cec..4c62f0a0 100644
--- a/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/start-mariadb.tsx
@@ -49,10 +49,10 @@ export const StartMariadb = ({ mariadbId }: Props) => {
 									await utils.mariadb.one.invalidate({
 										mariadbId,
 									});
-									toast.success("Database started succesfully");
+									toast.success("Database started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Database");
+									toast.error("Error starting the Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx b/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx
index 55b7e7e6..9b7c258e 100644
--- a/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/update-mariadb.tsx
@@ -75,13 +75,13 @@ export const UpdateMariadb = ({ mariadbId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("MariaDB updated succesfully");
+				toast.success("MariaDB updated successfully");
 				utils.mariadb.one.invalidate({
 					mariadbId: mariadbId,
 				});
 			})
 			.catch(() => {
-				toast.error("Error to update the Mariadb");
+				toast.error("Error updating the Mariadb");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx
index cbb178f3..d3a308f8 100644
--- a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-advanced-settings.tsx
@@ -65,7 +65,7 @@ export const ShowAdvancedMongo = ({ mongoId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
index c18b54a8..f60b87f1 100644
--- a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
+++ b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
@@ -71,7 +71,7 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx b/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx
index 0f0478c5..bc1b4c61 100644
--- a/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/backups/show-backup-mongo.tsx
@@ -144,7 +144,7 @@ export const ShowBackupMongo = ({ mongoId }: Props) => {
 																			})
 																			.catch(() => {
 																				toast.error(
-																					"Error to Create the manual backup",
+																					"Error creating the manual backup",
 																				);
 																			});
 																	}}
diff --git a/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx b/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx
index 76796796..0aab9c8d 100644
--- a/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx
+++ b/apps/dokploy/components/dashboard/mongo/environment/show-mongo-environment.tsx
@@ -70,7 +70,7 @@ export const ShowMongoEnvironment = ({ mongoId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx
index 0ebda1ca..61f7e5d2 100644
--- a/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/general/deploy-mongo.tsx
@@ -55,12 +55,12 @@ export const DeployMongo = ({ mongoId }: Props) => {
 									await deploy({
 										mongoId,
 									}).catch(() => {
-										toast.error("Error to deploy Database");
+										toast.error("Error deploying Database");
 									});
 									await refetch();
 								})
 								.catch((e) => {
-									toast.error(e.message || "Error to deploy Database");
+									toast.error(e.message || "Error deploying Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx
index 19388bb7..1c297799 100644
--- a/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/general/reset-mongo.tsx
@@ -55,7 +55,7 @@ export const ResetMongo = ({ mongoId, appName }: Props) => {
 									toast.success("Service Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the service");
+									toast.error("Error reloading the service");
 								});
 							await refetch();
 						}}
diff --git a/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx b/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx
index 7cfab289..6dd2e919 100644
--- a/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx
+++ b/apps/dokploy/components/dashboard/mongo/general/show-external-mongo-credentials.tsx
@@ -72,7 +72,7 @@ export const ShowExternalMongoCredentials = ({ mongoId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the external port");
+				toast.error("Error saving the external port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx b/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx
index 09d2c372..f146145f 100644
--- a/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/general/stop-mongo.tsx
@@ -49,10 +49,10 @@ export const StopMongo = ({ mongoId }: Props) => {
 									await utils.mongo.one.invalidate({
 										mongoId,
 									});
-									toast.success("Application stopped succesfully");
+									toast.success("Application stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Application");
+									toast.error("Error stopping the Application");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mongo/start-mongo.tsx b/apps/dokploy/components/dashboard/mongo/start-mongo.tsx
index 3bc30862..56675cb3 100644
--- a/apps/dokploy/components/dashboard/mongo/start-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/start-mongo.tsx
@@ -49,10 +49,10 @@ export const StartMongo = ({ mongoId }: Props) => {
 									await utils.mongo.one.invalidate({
 										mongoId,
 									});
-									toast.success("Database started succesfully");
+									toast.success("Database started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Database");
+									toast.error("Error starting the Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mongo/update-mongo.tsx b/apps/dokploy/components/dashboard/mongo/update-mongo.tsx
index fdfd2639..95ff9e3e 100644
--- a/apps/dokploy/components/dashboard/mongo/update-mongo.tsx
+++ b/apps/dokploy/components/dashboard/mongo/update-mongo.tsx
@@ -76,14 +76,14 @@ export const UpdateMongo = ({ mongoId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("Mongo updated succesfully");
+				toast.success("Mongo updated successfully");
 				utils.mongo.one.invalidate({
 					mongoId: mongoId,
 				});
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update mongo database");
+				toast.error("Error updating mongo database");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx
index 82198a0c..02256967 100644
--- a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-advanced-settings.tsx
@@ -65,7 +65,7 @@ export const ShowAdvancedMysql = ({ mysqlId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
index 07ceeae9..2f5a36b5 100644
--- a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
+++ b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
@@ -71,7 +71,7 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx b/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx
index a760fd92..de443c68 100644
--- a/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/backups/show-backup-mysql.tsx
@@ -144,7 +144,7 @@ export const ShowBackupMySql = ({ mysqlId }: Props) => {
 																			})
 																			.catch(() => {
 																				toast.error(
-																					"Error to Create the manual backup",
+																					"Error creating the manual backup",
 																				);
 																			});
 																	}}
diff --git a/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx b/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx
index 036a63ab..7dfa6aed 100644
--- a/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx
+++ b/apps/dokploy/components/dashboard/mysql/environment/show-mysql-environment.tsx
@@ -70,7 +70,7 @@ export const ShowMysqlEnvironment = ({ mysqlId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx
index a773feff..c56c20d5 100644
--- a/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/general/deploy-mysql.tsx
@@ -55,12 +55,12 @@ export const DeployMysql = ({ mysqlId }: Props) => {
 									await deploy({
 										mysqlId,
 									}).catch(() => {
-										toast.error("Error to deploy Database");
+										toast.error("Error deploying Database");
 									});
 									await refetch();
 								})
 								.catch((e) => {
-									toast.error(e.message || "Error to deploy Database");
+									toast.error(e.message || "Error deploying Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx
index 8b64ca9a..5e989671 100644
--- a/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/general/reset-mysql.tsx
@@ -55,7 +55,7 @@ export const ResetMysql = ({ mysqlId, appName }: Props) => {
 									toast.success("Service Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the service");
+									toast.error("Error reloading the service");
 								});
 							await refetch();
 						}}
diff --git a/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx b/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx
index 009c8c3a..dc1ca3a7 100644
--- a/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx
+++ b/apps/dokploy/components/dashboard/mysql/general/show-external-mysql-credentials.tsx
@@ -72,7 +72,7 @@ export const ShowExternalMysqlCredentials = ({ mysqlId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the external port");
+				toast.error("Error saving the external port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx b/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx
index 3cb0d681..31d4c0f6 100644
--- a/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/general/stop-mysql.tsx
@@ -49,10 +49,10 @@ export const StopMysql = ({ mysqlId }: Props) => {
 									await utils.mysql.one.invalidate({
 										mysqlId,
 									});
-									toast.success("Application stopped succesfully");
+									toast.success("MySQL stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Application");
+									toast.error("Error stopping MySQL");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mysql/start-mysql.tsx b/apps/dokploy/components/dashboard/mysql/start-mysql.tsx
index 60ebc08b..dcf4db22 100644
--- a/apps/dokploy/components/dashboard/mysql/start-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/start-mysql.tsx
@@ -49,10 +49,10 @@ export const StartMysql = ({ mysqlId }: Props) => {
 									await utils.mysql.one.invalidate({
 										mysqlId,
 									});
-									toast.success("Database started succesfully");
+									toast.success("Database started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Database");
+									toast.error("Error starting the Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/mysql/update-mysql.tsx b/apps/dokploy/components/dashboard/mysql/update-mysql.tsx
index 37b71b6c..5c1af50c 100644
--- a/apps/dokploy/components/dashboard/mysql/update-mysql.tsx
+++ b/apps/dokploy/components/dashboard/mysql/update-mysql.tsx
@@ -75,13 +75,13 @@ export const UpdateMysql = ({ mysqlId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("MySQL updated succesfully");
+				toast.success("MySQL updated successfully");
 				utils.mysql.one.invalidate({
 					mysqlId: mysqlId,
 				});
 			})
 			.catch(() => {
-				toast.error("Error to update the MySQL");
+				toast.error("Error updating MySQL");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx
index c8002fa2..d3ad7213 100644
--- a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-advanced-settings.tsx
@@ -65,7 +65,7 @@ export const ShowAdvancedPostgres = ({ postgresId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
index 7f224ee2..4bf14788 100644
--- a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
+++ b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
@@ -71,7 +71,7 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx b/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx
index c5a36a6a..dad55d1e 100644
--- a/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/backups/show-backup-postgres.tsx
@@ -145,7 +145,7 @@ export const ShowBackupPostgres = ({ postgresId }: Props) => {
 																			})
 																			.catch(() => {
 																				toast.error(
-																					"Error to Create the manual backup",
+																					"Error creating the manual backup",
 																				);
 																			});
 																	}}
diff --git a/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx b/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx
index b6677695..c2361831 100644
--- a/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx
+++ b/apps/dokploy/components/dashboard/postgres/environment/show-postgres-environment.tsx
@@ -70,7 +70,7 @@ export const ShowPostgresEnvironment = ({ postgresId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx
index e329d9f8..1d78d17e 100644
--- a/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/general/deploy-postgres.tsx
@@ -55,12 +55,12 @@ export const DeployPostgres = ({ postgresId }: Props) => {
 									await deploy({
 										postgresId,
 									}).catch(() => {
-										toast.error("Error to deploy Database");
+										toast.error("Error deploying Database");
 									});
 									await refetch();
 								})
 								.catch((e) => {
-									toast.error(e.message || "Error to deploy Database");
+									toast.error(e.message || "Error deploying Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx
index 359c2b77..51108f93 100644
--- a/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/general/reset-postgres.tsx
@@ -55,7 +55,7 @@ export const ResetPostgres = ({ postgresId, appName }: Props) => {
 									toast.success("Service Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the service");
+									toast.error("Error reloading the service");
 								});
 							await refetch();
 						}}
diff --git a/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx b/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx
index e1b4369a..e8fff7dc 100644
--- a/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx
+++ b/apps/dokploy/components/dashboard/postgres/general/show-external-postgres-credentials.tsx
@@ -74,7 +74,7 @@ export const ShowExternalPostgresCredentials = ({ postgresId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the external port");
+				toast.error("Error saving the external port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx b/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx
index 9bf1738f..6e2b4557 100644
--- a/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/general/stop-postgres.tsx
@@ -49,10 +49,10 @@ export const StopPostgres = ({ postgresId }: Props) => {
 									await utils.postgres.one.invalidate({
 										postgresId,
 									});
-									toast.success("Application stopped succesfully");
+									toast.success("Postgres stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Application");
+									toast.error("Error stopping Postgres");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/postgres/start-postgres.tsx b/apps/dokploy/components/dashboard/postgres/start-postgres.tsx
index 8d945082..4b1c7475 100644
--- a/apps/dokploy/components/dashboard/postgres/start-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/start-postgres.tsx
@@ -49,10 +49,10 @@ export const StartPostgres = ({ postgresId }: Props) => {
 									await utils.postgres.one.invalidate({
 										postgresId,
 									});
-									toast.success("Database started succesfully");
+									toast.success("Database started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Database");
+									toast.error("Error starting the Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/postgres/update-postgres.tsx b/apps/dokploy/components/dashboard/postgres/update-postgres.tsx
index dcc3e9b1..566fd1d6 100644
--- a/apps/dokploy/components/dashboard/postgres/update-postgres.tsx
+++ b/apps/dokploy/components/dashboard/postgres/update-postgres.tsx
@@ -76,14 +76,14 @@ export const UpdatePostgres = ({ postgresId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("Postgres updated succesfully");
+				toast.success("Postgres updated successfully");
 				utils.postgres.one.invalidate({
 					postgresId: postgresId,
 				});
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the postgres");
+				toast.error("Error updating Postgres");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/project/add-application.tsx b/apps/dokploy/components/dashboard/project/add-application.tsx
index 6d9c5b40..2c30df8d 100644
--- a/apps/dokploy/components/dashboard/project/add-application.tsx
+++ b/apps/dokploy/components/dashboard/project/add-application.tsx
@@ -104,7 +104,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 				});
 			})
 			.catch((e) => {
-				toast.error("Error to create the service");
+				toast.error("Error creating the service");
 			});
 	};
 
@@ -176,7 +176,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 												side="top"
 											>
 												<span>
-													If not server is selected, the application will be
+													If no server is selected, the application will be
 													deployed on the server where the user is logged in.
 												</span>
 											</TooltipContent>
@@ -229,7 +229,7 @@ export const AddApplication = ({ projectId, projectName }: Props) => {
 									<FormLabel>Description</FormLabel>
 									<FormControl>
 										<Textarea
-											placeholder="Description about your service..."
+											placeholder="Description of your service..."
 											className="resize-none"
 											{...field}
 										/>
diff --git a/apps/dokploy/components/dashboard/project/add-compose.tsx b/apps/dokploy/components/dashboard/project/add-compose.tsx
index 4461f3dc..dc753e94 100644
--- a/apps/dokploy/components/dashboard/project/add-compose.tsx
+++ b/apps/dokploy/components/dashboard/project/add-compose.tsx
@@ -108,7 +108,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 				});
 			})
 			.catch(() => {
-				toast.error("Error to create the compose");
+				toast.error("Error creating the compose");
 			});
 	};
 
@@ -183,7 +183,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 												side="top"
 											>
 												<span>
-													If not server is selected, the application will be
+													If no server is selected, the application will be
 													deployed on the server where the user is logged in.
 												</span>
 											</TooltipContent>
@@ -262,7 +262,7 @@ export const AddCompose = ({ projectId, projectName }: Props) => {
 									<FormLabel>Description</FormLabel>
 									<FormControl>
 										<Textarea
-											placeholder="Description about your service..."
+											placeholder="Description of your service..."
 											className="resize-none"
 											{...field}
 										/>
diff --git a/apps/dokploy/components/dashboard/project/add-database.tsx b/apps/dokploy/components/dashboard/project/add-database.tsx
index 665bcab5..fc86d253 100644
--- a/apps/dokploy/components/dashboard/project/add-database.tsx
+++ b/apps/dokploy/components/dashboard/project/add-database.tsx
@@ -270,7 +270,7 @@ export const AddDatabase = ({ projectId, projectName }: Props) => {
 					});
 				})
 				.catch(() => {
-					toast.error("Error to create a database");
+					toast.error("Error creating a database");
 				});
 		}
 	};
diff --git a/apps/dokploy/components/dashboard/project/add-template.tsx b/apps/dokploy/components/dashboard/project/add-template.tsx
index cc37cad4..ae93069a 100644
--- a/apps/dokploy/components/dashboard/project/add-template.tsx
+++ b/apps/dokploy/components/dashboard/project/add-template.tsx
@@ -304,7 +304,7 @@ export const AddTemplate = ({ projectId }: Props) => {
 																				side="top"
 																			>
 																				<span>
-																					If not server is selected, the
+																					If ot server is selected, the
 																					application will be deployed on the
 																					server where the user is logged in.
 																				</span>
@@ -355,10 +355,10 @@ export const AddTemplate = ({ projectId }: Props) => {
 																					projectId,
 																				});
 																				setOpen(false);
-																				return `${template.name} template created succesfully`;
+																				return `${template.name} template created successfully`;
 																			},
 																			error: (err) => {
-																				return `Ocurred an error deploying ${template.name} template`;
+																				return `An error ocurred deploying ${template.name} template`;
 																			},
 																		});
 																	}}
diff --git a/apps/dokploy/components/dashboard/projects/add.tsx b/apps/dokploy/components/dashboard/projects/add.tsx
index bd8f268f..d1b8cebd 100644
--- a/apps/dokploy/components/dashboard/projects/add.tsx
+++ b/apps/dokploy/components/dashboard/projects/add.tsx
@@ -70,7 +70,7 @@ export const AddProject = () => {
 				router.push(`/dashboard/project/${data.projectId}`);
 			})
 			.catch(() => {
-				toast.error("Error to create a project");
+				toast.error("Error creating a project");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/projects/project-enviroment.tsx b/apps/dokploy/components/dashboard/projects/project-environment.tsx
similarity index 92%
rename from apps/dokploy/components/dashboard/projects/project-enviroment.tsx
rename to apps/dokploy/components/dashboard/projects/project-environment.tsx
index 7dd9737c..493813dc 100644
--- a/apps/dokploy/components/dashboard/projects/project-enviroment.tsx
+++ b/apps/dokploy/components/dashboard/projects/project-environment.tsx
@@ -38,7 +38,7 @@ interface Props {
 	children?: React.ReactNode;
 }
 
-export const ProjectEnviroment = ({ projectId, children }: Props) => {
+export const ProjectEnvironment = ({ projectId, children }: Props) => {
 	const [isOpen, setIsOpen] = useState(false);
 	const utils = api.useUtils();
 	const { mutateAsync, error, isError, isLoading } =
@@ -72,11 +72,11 @@ export const ProjectEnviroment = ({ projectId, children }: Props) => {
 			projectId: projectId,
 		})
 			.then(() => {
-				toast.success("Project env updated succesfully");
+				toast.success("Project env updated successfully");
 				utils.project.all.invalidate();
 			})
 			.catch(() => {
-				toast.error("Error to update the env");
+				toast.error("Error updating the env");
 			})
 			.finally(() => {});
 	};
@@ -90,13 +90,13 @@ export const ProjectEnviroment = ({ projectId, children }: Props) => {
 						onSelect={(e) => e.preventDefault()}
 					>
 						<FileIcon className="size-4" />
-						<span>Project Enviroment</span>
+						<span>Project Environment</span>
 					</DropdownMenuItem>
 				)}
 			</DialogTrigger>
 			<DialogContent className="max-h-screen overflow-y-auto sm:max-w-6xl">
 				<DialogHeader>
-					<DialogTitle>Project Enviroment</DialogTitle>
+					<DialogTitle>Project Environment</DialogTitle>
 					<DialogDescription>
 						Update the env Environment variables that are accessible to all
 						services of this project. Use this syntax to reference project-level
@@ -120,7 +120,7 @@ export const ProjectEnviroment = ({ projectId, children }: Props) => {
 									name="env"
 									render={({ field }) => (
 										<FormItem>
-											<FormLabel>Enviroment variables</FormLabel>
+											<FormLabel>Environment variables</FormLabel>
 											<FormControl>
 												<CodeEditor
 													lineWrapping
diff --git a/apps/dokploy/components/dashboard/projects/show.tsx b/apps/dokploy/components/dashboard/projects/show.tsx
index d4d9ac55..59262183 100644
--- a/apps/dokploy/components/dashboard/projects/show.tsx
+++ b/apps/dokploy/components/dashboard/projects/show.tsx
@@ -34,7 +34,7 @@ import {
 import Link from "next/link";
 import { Fragment } from "react";
 import { toast } from "sonner";
-import { ProjectEnviroment } from "./project-enviroment";
+import { ProjectEnvironment } from "./project-environment";
 import { UpdateProject } from "./update";
 
 export const ShowProjects = () => {
@@ -195,7 +195,7 @@ export const ShowProjects = () => {
 															Actions
 														</DropdownMenuLabel>
 														<div onClick={(e) => e.stopPropagation()}>
-															<ProjectEnviroment
+															<ProjectEnvironment
 																projectId={project.projectId}
 															/>
 														</div>
@@ -247,12 +247,12 @@ export const ShowProjects = () => {
 																					})
 																						.then(() => {
 																							toast.success(
-																								"Project delete succesfully",
+																								"Project deleted successfully",
 																							);
 																						})
 																						.catch(() => {
 																							toast.error(
-																								"Error to delete this project",
+																								"Error deleting this project",
 																							);
 																						})
 																						.finally(() => {
diff --git a/apps/dokploy/components/dashboard/projects/update.tsx b/apps/dokploy/components/dashboard/projects/update.tsx
index 06a6c200..79665c71 100644
--- a/apps/dokploy/components/dashboard/projects/update.tsx
+++ b/apps/dokploy/components/dashboard/projects/update.tsx
@@ -76,12 +76,12 @@ export const UpdateProject = ({ projectId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("Project updated succesfully");
+				toast.success("Project updated successfully");
 				utils.project.all.invalidate();
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the project");
+				toast.error("Error updating the Project");
 			})
 			.finally(() => {});
 	};
@@ -136,7 +136,7 @@ export const UpdateProject = ({ projectId }: Props) => {
 											<FormLabel>Description</FormLabel>
 											<FormControl>
 												<Textarea
-													placeholder="Description about your project..."
+													placeholder="Description of your project..."
 													className="resize-none"
 													{...field}
 												/>
diff --git a/apps/dokploy/components/dashboard/redis/advanced/show-redis-advanced-settings.tsx b/apps/dokploy/components/dashboard/redis/advanced/show-redis-advanced-settings.tsx
index 8b595480..ed6cf002 100644
--- a/apps/dokploy/components/dashboard/redis/advanced/show-redis-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/redis/advanced/show-redis-advanced-settings.tsx
@@ -65,7 +65,7 @@ export const ShowAdvancedRedis = ({ redisId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx b/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
index 1e719399..bf6c8e7e 100644
--- a/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
+++ b/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
@@ -71,7 +71,7 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to Update the resources");
+				toast.error("Error updating the resources");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/redis/environment/show-redis-environment.tsx b/apps/dokploy/components/dashboard/redis/environment/show-redis-environment.tsx
index 3c35333a..b8e7ab59 100644
--- a/apps/dokploy/components/dashboard/redis/environment/show-redis-environment.tsx
+++ b/apps/dokploy/components/dashboard/redis/environment/show-redis-environment.tsx
@@ -70,7 +70,7 @@ export const ShowRedisEnvironment = ({ redisId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to add environment");
+				toast.error("Error adding environment");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/redis/general/deploy-redis.tsx b/apps/dokploy/components/dashboard/redis/general/deploy-redis.tsx
index 131af030..e82c8035 100644
--- a/apps/dokploy/components/dashboard/redis/general/deploy-redis.tsx
+++ b/apps/dokploy/components/dashboard/redis/general/deploy-redis.tsx
@@ -55,12 +55,12 @@ export const DeployRedis = ({ redisId }: Props) => {
 									await deploy({
 										redisId,
 									}).catch(() => {
-										toast.error("Error to deploy Database");
+										toast.error("Error deploying Database");
 									});
 									await refetch();
 								})
 								.catch((e) => {
-									toast.error(e.message || "Error to deploy Database");
+									toast.error(e.message || "Error deploying Database");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/redis/general/reset-redis.tsx b/apps/dokploy/components/dashboard/redis/general/reset-redis.tsx
index 6ec4295e..9f411afb 100644
--- a/apps/dokploy/components/dashboard/redis/general/reset-redis.tsx
+++ b/apps/dokploy/components/dashboard/redis/general/reset-redis.tsx
@@ -55,7 +55,7 @@ export const ResetRedis = ({ redisId, appName }: Props) => {
 									toast.success("Service Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the service");
+									toast.error("Error reloading the service");
 								});
 							await refetch();
 						}}
diff --git a/apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx b/apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx
index bcb26267..40ae0574 100644
--- a/apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx
+++ b/apps/dokploy/components/dashboard/redis/general/show-external-redis-credentials.tsx
@@ -73,7 +73,7 @@ export const ShowExternalRedisCredentials = ({ redisId }: Props) => {
 				await refetch();
 			})
 			.catch(() => {
-				toast.error("Error to save the external port");
+				toast.error("Error saving the external port");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/redis/general/stop-redis.tsx b/apps/dokploy/components/dashboard/redis/general/stop-redis.tsx
index 67cc5e35..31ab9992 100644
--- a/apps/dokploy/components/dashboard/redis/general/stop-redis.tsx
+++ b/apps/dokploy/components/dashboard/redis/general/stop-redis.tsx
@@ -49,10 +49,10 @@ export const StopRedis = ({ redisId }: Props) => {
 									await utils.redis.one.invalidate({
 										redisId,
 									});
-									toast.success("Application stopped succesfully");
+									toast.success("Redis stopped successfully");
 								})
 								.catch(() => {
-									toast.error("Error to stop the Application");
+									toast.error("Error stopping Redis");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/redis/start-redis.tsx b/apps/dokploy/components/dashboard/redis/start-redis.tsx
index e0a4aa97..e3735123 100644
--- a/apps/dokploy/components/dashboard/redis/start-redis.tsx
+++ b/apps/dokploy/components/dashboard/redis/start-redis.tsx
@@ -49,10 +49,10 @@ export const StartRedis = ({ redisId }: Props) => {
 									await utils.redis.one.invalidate({
 										redisId,
 									});
-									toast.success("Database started succesfully");
+									toast.success("Redis started successfully");
 								})
 								.catch(() => {
-									toast.error("Error to start the Database");
+									toast.error("Error starting Redis");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/redis/update-redis.tsx b/apps/dokploy/components/dashboard/redis/update-redis.tsx
index fdc08a73..866b2191 100644
--- a/apps/dokploy/components/dashboard/redis/update-redis.tsx
+++ b/apps/dokploy/components/dashboard/redis/update-redis.tsx
@@ -75,13 +75,13 @@ export const UpdateRedis = ({ redisId }: Props) => {
 			description: formData.description || "",
 		})
 			.then(() => {
-				toast.success("Redis updated succesfully");
+				toast.success("Redis updated successfully");
 				utils.redis.one.invalidate({
 					redisId: redisId,
 				});
 			})
 			.catch(() => {
-				toast.error("Error to update the redis");
+				toast.error("Error updating Redis");
 			})
 			.finally(() => {});
 	};
diff --git a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
index 17314123..e72ea39a 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/add-certificate.tsx
@@ -91,7 +91,7 @@ export const AddCertificate = () => {
 				await utils.certificates.all.invalidate();
 			})
 			.catch(() => {
-				toast.error("Error to create the Certificate");
+				toast.error("Error creating the Certificate");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/certificates/delete-certificate.tsx b/apps/dokploy/components/dashboard/settings/certificates/delete-certificate.tsx
index 907b1dc0..6b2c760a 100644
--- a/apps/dokploy/components/dashboard/settings/certificates/delete-certificate.tsx
+++ b/apps/dokploy/components/dashboard/settings/certificates/delete-certificate.tsx
@@ -46,10 +46,10 @@ export const DeleteCertificate = ({ certificateId }: Props) => {
 								.then(async () => {
 									utils.certificates.all.invalidate();
 									utils.auth.get.invalidate();
-									toast.success("Certificate delete succesfully");
+									toast.success("Certificate deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the Certificate");
+									toast.error("Error deleting Certificate");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/delete-worker.tsx b/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/delete-worker.tsx
index ab2d4d77..654c10c7 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/delete-worker.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/nodes/workers/delete-worker.tsx
@@ -46,10 +46,10 @@ export const DeleteWorker = ({ nodeId }: Props) => {
 							})
 								.then(async () => {
 									utils.cluster.getNodes.invalidate();
-									toast.success("Worker deleted succesfully");
+									toast.success("Worker deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the worker");
+									toast.error("Error deleting Worker");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/cluster/registry/add-docker-registry.tsx b/apps/dokploy/components/dashboard/settings/cluster/registry/add-docker-registry.tsx
index 1ee461d2..149ef33a 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/registry/add-docker-registry.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/registry/add-docker-registry.tsx
@@ -103,7 +103,7 @@ export const AddRegistry = () => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to add a registry");
+				toast.error("Error adding a registry");
 			});
 	};
 
@@ -290,7 +290,7 @@ export const AddRegistry = () => {
 												}
 											})
 											.catch(() => {
-												toast.error("Error to test the registry");
+												toast.error("Error testing the registry");
 											});
 									}}
 								>
diff --git a/apps/dokploy/components/dashboard/settings/cluster/registry/delete-registry.tsx b/apps/dokploy/components/dashboard/settings/cluster/registry/delete-registry.tsx
index 952a1831..38ecb7be 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/registry/delete-registry.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/registry/delete-registry.tsx
@@ -48,7 +48,7 @@ export const DeleteRegistry = ({ registryId }: Props) => {
 									toast.success("Registry deleted");
 								})
 								.catch(() => {
-									toast.error("Error to delete the registry");
+									toast.error("Error deleting the registry");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/cluster/registry/update-docker-registry.tsx b/apps/dokploy/components/dashboard/settings/cluster/registry/update-docker-registry.tsx
index 9c5f281e..044f1991 100644
--- a/apps/dokploy/components/dashboard/settings/cluster/registry/update-docker-registry.tsx
+++ b/apps/dokploy/components/dashboard/settings/cluster/registry/update-docker-registry.tsx
@@ -122,7 +122,7 @@ export const UpdateDockerRegistry = ({ registryId }: Props) => {
 				await utils.registry.all.invalidate();
 			})
 			.catch(() => {
-				toast.error("Error to update the registry");
+				toast.error("Error updating the registry");
 			});
 	};
 	return (
@@ -303,7 +303,7 @@ export const UpdateDockerRegistry = ({ registryId }: Props) => {
 											}
 										})
 										.catch(() => {
-											toast.error("Error to test the registry");
+											toast.error("Error testing the registry");
 										});
 								}}
 							>
diff --git a/apps/dokploy/components/dashboard/settings/destination/add-destination.tsx b/apps/dokploy/components/dashboard/settings/destination/add-destination.tsx
index 836bf025..e585bdd1 100644
--- a/apps/dokploy/components/dashboard/settings/destination/add-destination.tsx
+++ b/apps/dokploy/components/dashboard/settings/destination/add-destination.tsx
@@ -89,7 +89,7 @@ export const AddDestination = () => {
 				await utils.destination.all.invalidate();
 			})
 			.catch(() => {
-				toast.error("Error to create the Destination");
+				toast.error("Error creating the Destination");
 			});
 	};
 	return (
@@ -306,7 +306,7 @@ export const AddDestination = () => {
 												toast.success("Connection Success");
 											})
 											.catch((e) => {
-												toast.error("Error to connect the provider", {
+												toast.error("Error connecting the provider", {
 													description: e.message,
 												});
 											});
@@ -334,7 +334,7 @@ export const AddDestination = () => {
 											toast.success("Connection Success");
 										})
 										.catch(() => {
-											toast.error("Error to connect the provider");
+											toast.error("Error connecting the provider");
 										});
 								}}
 							>
diff --git a/apps/dokploy/components/dashboard/settings/destination/delete-destination.tsx b/apps/dokploy/components/dashboard/settings/destination/delete-destination.tsx
index 7069bde7..1380a822 100644
--- a/apps/dokploy/components/dashboard/settings/destination/delete-destination.tsx
+++ b/apps/dokploy/components/dashboard/settings/destination/delete-destination.tsx
@@ -45,10 +45,10 @@ export const DeleteDestination = ({ destinationId }: Props) => {
 							})
 								.then(() => {
 									utils.destination.all.invalidate();
-									toast.success("Destination delete succesfully");
+									toast.success("Destination deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete destination");
+									toast.error("Error deleting Destination");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx b/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
index aba6accb..3ed26fef 100644
--- a/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
+++ b/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
@@ -113,7 +113,7 @@ export const UpdateDestination = ({ destinationId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the Destination");
+				toast.error("Error updating the Destination");
 			});
 	};
 	return (
@@ -335,7 +335,7 @@ export const UpdateDestination = ({ destinationId }: Props) => {
 												toast.success("Connection Success");
 											})
 											.catch(() => {
-												toast.error("Error to connect the provider");
+												toast.error("Error connecting the provider");
 											});
 									}}
 								>
@@ -361,7 +361,7 @@ export const UpdateDestination = ({ destinationId }: Props) => {
 											toast.success("Connection Success");
 										})
 										.catch(() => {
-											toast.error("Error to connect the provider");
+											toast.error("Error connecting the provider");
 										});
 								}}
 							>
diff --git a/apps/dokploy/components/dashboard/settings/git/bitbucket/edit-bitbucket-provider.tsx b/apps/dokploy/components/dashboard/settings/git/bitbucket/edit-bitbucket-provider.tsx
index e7298de1..94bd8378 100644
--- a/apps/dokploy/components/dashboard/settings/git/bitbucket/edit-bitbucket-provider.tsx
+++ b/apps/dokploy/components/dashboard/settings/git/bitbucket/edit-bitbucket-provider.tsx
@@ -89,7 +89,7 @@ export const EditBitbucketProvider = ({ bitbucketId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update Bitbucket");
+				toast.error("Error updating Bitbucket");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/git/github/edit-github-provider.tsx b/apps/dokploy/components/dashboard/settings/git/github/edit-github-provider.tsx
index 455369a2..607fb7b1 100644
--- a/apps/dokploy/components/dashboard/settings/git/github/edit-github-provider.tsx
+++ b/apps/dokploy/components/dashboard/settings/git/github/edit-github-provider.tsx
@@ -77,7 +77,7 @@ export const EditGithubProvider = ({ githubId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update Github");
+				toast.error("Error updating Github");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx b/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx
index 4ed202d8..b9afc2c3 100644
--- a/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx
+++ b/apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx
@@ -90,7 +90,7 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
 				refetch();
 			})
 			.catch(() => {
-				toast.error("Error to update Gitlab");
+				toast.error("Error updating Gitlab");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/git/remove-git-provider.tsx b/apps/dokploy/components/dashboard/settings/git/remove-git-provider.tsx
index 26b3b9b2..d5ca4096 100644
--- a/apps/dokploy/components/dashboard/settings/git/remove-git-provider.tsx
+++ b/apps/dokploy/components/dashboard/settings/git/remove-git-provider.tsx
@@ -70,10 +70,10 @@ export const RemoveGitProvider = ({
 							})
 								.then(async () => {
 									utils.gitProvider.getAll.invalidate();
-									toast.success("Git Provider deleted succesfully.");
+									toast.success("Git Provider deleted successfully.");
 								})
 								.catch(() => {
-									toast.error("Error to delete your git provider.");
+									toast.error("Error deleting Git provider.");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/notifications/add-notification.tsx b/apps/dokploy/components/dashboard/settings/notifications/add-notification.tsx
index 639ea6ea..cc015096 100644
--- a/apps/dokploy/components/dashboard/settings/notifications/add-notification.tsx
+++ b/apps/dokploy/components/dashboard/settings/notifications/add-notification.tsx
@@ -229,7 +229,7 @@ export const AddNotification = () => {
 					await utils.notification.all.invalidate();
 				})
 				.catch(() => {
-					toast.error("Error to create a notification");
+					toast.error("Error creating a notification");
 				});
 		}
 	};
@@ -748,7 +748,7 @@ export const AddNotification = () => {
 									}
 									toast.success("Connection Success");
 								} catch (err) {
-									toast.error("Error to test the provider");
+									toast.error("Error testing the provider");
 								}
 							}}
 						>
diff --git a/apps/dokploy/components/dashboard/settings/notifications/delete-notification.tsx b/apps/dokploy/components/dashboard/settings/notifications/delete-notification.tsx
index 02c95d8b..de4be2a1 100644
--- a/apps/dokploy/components/dashboard/settings/notifications/delete-notification.tsx
+++ b/apps/dokploy/components/dashboard/settings/notifications/delete-notification.tsx
@@ -50,10 +50,10 @@ export const DeleteNotification = ({ notificationId }: Props) => {
 							})
 								.then(() => {
 									utils.notification.all.invalidate();
-									toast.success("Notification delete succesfully");
+									toast.success("Notification deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete notification");
+									toast.error("Error deleting notification");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/notifications/update-notification.tsx b/apps/dokploy/components/dashboard/settings/notifications/update-notification.tsx
index e9909b2b..3d2ee0c4 100644
--- a/apps/dokploy/components/dashboard/settings/notifications/update-notification.tsx
+++ b/apps/dokploy/components/dashboard/settings/notifications/update-notification.tsx
@@ -213,7 +213,7 @@ export const UpdateNotification = ({ notificationId }: Props) => {
 					setIsOpen(false);
 				})
 				.catch(() => {
-					toast.error("Error to update a notification");
+					toast.error("Error updating a notification");
 				});
 		}
 	};
@@ -710,7 +710,7 @@ export const UpdateNotification = ({ notificationId }: Props) => {
 									}
 									toast.success("Connection Success");
 								} catch (err) {
-									toast.error("Error to test the provider");
+									toast.error("Error testing the provider");
 								}
 							}}
 						>
diff --git a/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx b/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx
index faa3a6e2..2850332e 100644
--- a/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx
+++ b/apps/dokploy/components/dashboard/settings/profile/disable-2fa.tsx
@@ -40,7 +40,7 @@ export const Disable2FA = () => {
 									toast.success("2FA Disabled");
 								})
 								.catch(() => {
-									toast.error("Error to disable 2FA");
+									toast.error("Error disabling 2FA");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx b/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
index 8c2a369f..cf5910b8 100644
--- a/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
+++ b/apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx
@@ -71,7 +71,7 @@ export const Enable2FA = () => {
 				utils.auth.get.invalidate();
 			})
 			.catch(() => {
-				toast.error("Error to verify the 2FA");
+				toast.error("Error verifying the 2FA");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx b/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx
index 191c1936..82442900 100644
--- a/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx
+++ b/apps/dokploy/components/dashboard/settings/profile/profile-form.tsx
@@ -107,7 +107,7 @@ export const ProfileForm = () => {
 				form.reset();
 			})
 			.catch(() => {
-				toast.error("Error to Update the profile");
+				toast.error("Error updating the profile");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-storage-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-storage-actions.tsx
index 7163332d..c45c0c8b 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/show-storage-actions.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-storage-actions.tsx
@@ -85,7 +85,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 									toast.success("Cleaned images");
 								})
 								.catch(() => {
-									toast.error("Error to clean images");
+									toast.error("Error cleaning images");
 								});
 						}}
 					>
@@ -103,7 +103,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 									toast.success("Cleaned volumes");
 								})
 								.catch(() => {
-									toast.error("Error to clean volumes");
+									toast.error("Error cleaning volumes");
 								});
 						}}
 					>
@@ -122,7 +122,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 									toast.success("Stopped containers cleaned");
 								})
 								.catch(() => {
-									toast.error("Error to clean stopped containers");
+									toast.error("Error cleaning stopped containers");
 								});
 						}}
 					>
@@ -141,7 +141,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 									toast.success("Cleaned Docker Builder");
 								})
 								.catch(() => {
-									toast.error("Error to clean Docker Builder");
+									toast.error("Error cleaning Docker Builder");
 								});
 						}}
 					>
@@ -158,7 +158,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 										toast.success("Cleaned Monitoring");
 									})
 									.catch(() => {
-										toast.error("Error to clean Monitoring");
+										toast.error("Error cleaning Monitoring");
 									});
 							}}
 						>
@@ -178,7 +178,7 @@ export const ShowStorageActions = ({ serverId }: Props) => {
 									toast.success("Cleaned all");
 								})
 								.catch(() => {
-									toast.error("Error to clean all");
+									toast.error("Error cleaning all");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx
index 72854f93..17a6ae75 100644
--- a/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-traefik-actions.tsx
@@ -72,7 +72,7 @@ export const ShowTraefikActions = ({ serverId }: Props) => {
 									toast.success("Traefik Reloaded");
 								})
 								.catch(() => {
-									toast.error("Error to reload the traefik");
+									toast.error("Error reloading Traefik");
 								});
 						}}
 						className="cursor-pointer"
diff --git a/apps/dokploy/components/dashboard/settings/servers/add-server.tsx b/apps/dokploy/components/dashboard/settings/servers/add-server.tsx
index b8413303..79c7b209 100644
--- a/apps/dokploy/components/dashboard/settings/servers/add-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/add-server.tsx
@@ -105,7 +105,7 @@ export const AddServer = () => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to create a server");
+				toast.error("Error creating a server");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
index d45a3b77..ef63597c 100644
--- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx
@@ -233,7 +233,7 @@ export const ShowServers = () => {
 																	.then(() => {
 																		refetch();
 																		toast.success(
-																			`Server ${server.name} deleted succesfully`,
+																			`Server ${server.name} deleted successfully`,
 																		);
 																	})
 																	.catch((err) => {
diff --git a/apps/dokploy/components/dashboard/settings/servers/update-server.tsx b/apps/dokploy/components/dashboard/settings/servers/update-server.tsx
index 16eb5ba7..7de7a0e2 100644
--- a/apps/dokploy/components/dashboard/settings/servers/update-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/update-server.tsx
@@ -111,7 +111,7 @@ export const UpdateServer = ({ serverId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update a server");
+				toast.error("Error updating a server");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/create-server.tsx b/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/create-server.tsx
index 39edad71..c8f2fe6b 100644
--- a/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/create-server.tsx
+++ b/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/create-server.tsx
@@ -103,7 +103,7 @@ export const CreateServer = ({ stepper }: Props) => {
 				stepper.next();
 			})
 			.catch(() => {
-				toast.error("Error to create a server");
+				toast.error("Error creating a server");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/ssh-keys/add-ssh-key.tsx b/apps/dokploy/components/dashboard/settings/ssh-keys/add-ssh-key.tsx
index 2d7e3d15..973a2004 100644
--- a/apps/dokploy/components/dashboard/settings/ssh-keys/add-ssh-key.tsx
+++ b/apps/dokploy/components/dashboard/settings/ssh-keys/add-ssh-key.tsx
@@ -61,7 +61,7 @@ export const AddSSHKey = ({ children }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to create the SSH key");
+				toast.error("Error creating the SSH key");
 			});
 	};
 
@@ -74,7 +74,7 @@ export const AddSSHKey = ({ children }: Props) => {
 				form.setValue("publicKey", data.publicKey);
 			})
 			.catch(() => {
-				toast.error("Error to generate the SSH Key");
+				toast.error("Error generating the SSH Key");
 			});
 
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/ssh-keys/delete-ssh-key.tsx b/apps/dokploy/components/dashboard/settings/ssh-keys/delete-ssh-key.tsx
index 698bae94..eb6c32ae 100644
--- a/apps/dokploy/components/dashboard/settings/ssh-keys/delete-ssh-key.tsx
+++ b/apps/dokploy/components/dashboard/settings/ssh-keys/delete-ssh-key.tsx
@@ -48,7 +48,7 @@ export const DeleteSSHKey = ({ sshKeyId }: Props) => {
 									toast.success("SSH Key delete successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete SSH key");
+									toast.error("Error deleting SSH key");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/ssh-keys/update-ssh-key.tsx b/apps/dokploy/components/dashboard/settings/ssh-keys/update-ssh-key.tsx
index e763ee92..36cf4ef2 100644
--- a/apps/dokploy/components/dashboard/settings/ssh-keys/update-ssh-key.tsx
+++ b/apps/dokploy/components/dashboard/settings/ssh-keys/update-ssh-key.tsx
@@ -73,7 +73,7 @@ export const UpdateSSHKey = ({ children, sshKeyId = "" }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the SSH key");
+				toast.error("Error updating the SSH key");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx b/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx
index 3684c814..bb82c982 100644
--- a/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx
+++ b/apps/dokploy/components/dashboard/settings/users/add-permissions.tsx
@@ -110,7 +110,7 @@ export const AddUserPermissions = ({ userId }: Props) => {
 				refetch();
 			})
 			.catch(() => {
-				toast.error("Error to update the permissions");
+				toast.error("Error updating the permissions");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/users/add-user.tsx b/apps/dokploy/components/dashboard/settings/users/add-user.tsx
index 1643f37f..6a7b4fac 100644
--- a/apps/dokploy/components/dashboard/settings/users/add-user.tsx
+++ b/apps/dokploy/components/dashboard/settings/users/add-user.tsx
@@ -61,7 +61,7 @@ export const AddUser = () => {
 				await utils.user.all.invalidate();
 			})
 			.catch(() => {
-				toast.error("Error to create the invitation");
+				toast.error("Error creating the invitation");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/users/delete-user.tsx b/apps/dokploy/components/dashboard/settings/users/delete-user.tsx
index e8f708da..795f0b85 100644
--- a/apps/dokploy/components/dashboard/settings/users/delete-user.tsx
+++ b/apps/dokploy/components/dashboard/settings/users/delete-user.tsx
@@ -48,10 +48,10 @@ export const DeleteUser = ({ authId }: Props) => {
 							})
 								.then(async () => {
 									utils.user.all.invalidate();
-									toast.success("User delete succesfully");
+									toast.success("User deleted successfully");
 								})
 								.catch(() => {
-									toast.error("Error to delete the user");
+									toast.error("Error deleting User");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/web-domain.tsx b/apps/dokploy/components/dashboard/settings/web-domain.tsx
index 00f54904..ebdec5dc 100644
--- a/apps/dokploy/components/dashboard/settings/web-domain.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-domain.tsx
@@ -84,7 +84,7 @@ export const WebDomain = () => {
 				toast.success("Domain Assigned");
 			})
 			.catch(() => {
-				toast.error("Error to assign the domain");
+				toast.error("Error assigning the domain");
 			});
 	};
 	return (
diff --git a/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx b/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
index 838ee849..07dc2407 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/edit-traefik-env.tsx
@@ -71,7 +71,7 @@ export const EditTraefikEnv = ({ children, serverId }: Props) => {
 				toast.success("Traefik Env Updated");
 			})
 			.catch(() => {
-				toast.error("Error to update the traefik env");
+				toast.error("Error updating the Traefik env");
 			});
 	};
 
diff --git a/apps/dokploy/components/dashboard/settings/web-server/remove-ssh-private-key.tsx b/apps/dokploy/components/dashboard/settings/web-server/remove-ssh-private-key.tsx
index 8f10537a..31784fde 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/remove-ssh-private-key.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/remove-ssh-private-key.tsx
@@ -38,11 +38,11 @@ export const RemoveSSHPrivateKey = () => {
 						onClick={async () => {
 							await mutateAsync()
 								.then(() => {
-									toast.success("SSH private key deleted succesfully");
+									toast.success("SSH private key deleted successfully");
 									utils.auth.get.invalidate();
 								})
 								.catch(() => {
-									toast.error("Error  to delete the ssh private key");
+									toast.error("Error deleting the SSH private key");
 								});
 						}}
 					>
diff --git a/apps/dokploy/components/dashboard/settings/web-server/update-server-ip.tsx b/apps/dokploy/components/dashboard/settings/web-server/update-server-ip.tsx
index 264b10ac..dd3f81fd 100644
--- a/apps/dokploy/components/dashboard/settings/web-server/update-server-ip.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/update-server-ip.tsx
@@ -85,7 +85,7 @@ export const UpdateServerIp = ({ children, serverId }: Props) => {
 				setIsOpen(false);
 			})
 			.catch(() => {
-				toast.error("Error to update the IP of the server");
+				toast.error("Error updating the IP of the server");
 			});
 	};
 
diff --git a/apps/dokploy/pages/api/deploy/[refreshToken].ts b/apps/dokploy/pages/api/deploy/[refreshToken].ts
index bcedc370..b5fb2197 100644
--- a/apps/dokploy/pages/api/deploy/[refreshToken].ts
+++ b/apps/dokploy/pages/api/deploy/[refreshToken].ts
@@ -106,14 +106,14 @@ export default async function handler(
 				},
 			);
 		} catch (error) {
-			res.status(400).json({ message: "Error To Deploy Application", error });
+			res.status(400).json({ message: "Error deploying Application", error });
 			return;
 		}
 
-		res.status(200).json({ message: "App Deployed Succesfully" });
+		res.status(200).json({ message: "Application deployed successfully" });
 	} catch (error) {
 		console.log(error);
-		res.status(400).json({ message: "Error To Deploy Application", error });
+		res.status(400).json({ message: "Error deploying Application", error });
 	}
 }
 
diff --git a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
index 14a010f2..2f4caecd 100644
--- a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
+++ b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts
@@ -82,13 +82,13 @@ export default async function handler(
 				},
 			);
 		} catch (error) {
-			res.status(400).json({ message: "Error To Deploy Compose", error });
+			res.status(400).json({ message: "Error deploying Compose", error });
 			return;
 		}
 
-		res.status(200).json({ message: "Compose Deployed Succesfully" });
+		res.status(200).json({ message: "Compose deployed successfully" });
 	} catch (error) {
 		console.log(error);
-		res.status(400).json({ message: "Error To Deploy Compose", error });
+		res.status(400).json({ message: "Error deploying Compose", error });
 	}
 }
diff --git a/apps/dokploy/pages/api/deploy/github.ts b/apps/dokploy/pages/api/deploy/github.ts
index 45923762..9cefe4cf 100644
--- a/apps/dokploy/pages/api/deploy/github.ts
+++ b/apps/dokploy/pages/api/deploy/github.ts
@@ -159,7 +159,7 @@ export default async function handler(
 			}
 			res.status(200).json({ message: `Deployed ${totalApps} apps` });
 		} catch (error) {
-			res.status(400).json({ message: "Error To Deploy Application", error });
+			res.status(400).json({ message: "Error deploying Application", error });
 		}
 	} else if (req.headers["x-github-event"] === "pull_request") {
 		const prId = githubBody?.pull_request?.id;
diff --git a/apps/dokploy/pages/dashboard/project/[projectId].tsx b/apps/dokploy/pages/dashboard/project/[projectId].tsx
index f39b57e7..3c459679 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId].tsx
@@ -2,7 +2,7 @@ import { AddApplication } from "@/components/dashboard/project/add-application";
 import { AddCompose } from "@/components/dashboard/project/add-compose";
 import { AddDatabase } from "@/components/dashboard/project/add-database";
 import { AddTemplate } from "@/components/dashboard/project/add-template";
-import { ProjectEnviroment } from "@/components/dashboard/projects/project-enviroment";
+import { ProjectEnvironment } from "@/components/dashboard/projects/project-environment";
 import {
 	MariadbIcon,
 	MongodbIcon,
@@ -204,9 +204,9 @@ const Project = (
 
 					{(auth?.rol === "admin" || user?.canCreateServices) && (
 						<div className="flex flex-row gap-4 flex-wrap">
-							<ProjectEnviroment projectId={projectId}>
-								<Button variant="outline">Project Enviroment</Button>
-							</ProjectEnviroment>
+							<ProjectEnvironment projectId={projectId}>
+								<Button variant="outline">Project Environment</Button>
+							</ProjectEnvironment>
 							<DropdownMenu>
 								<DropdownMenuTrigger asChild>
 									<Button>
diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
index 6b828dc7..e737cf2e 100644
--- a/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
+++ b/apps/dokploy/pages/dashboard/project/[projectId]/services/compose/[composeId].tsx
@@ -3,7 +3,7 @@ import { ShowVolumesCompose } from "@/components/dashboard/compose/advanced/show
 import { DeleteCompose } from "@/components/dashboard/compose/delete-compose";
 import { ShowDeploymentsCompose } from "@/components/dashboard/compose/deployments/show-deployments-compose";
 import { ShowDomainsCompose } from "@/components/dashboard/compose/domains/show-domains";
-import { ShowEnvironmentCompose } from "@/components/dashboard/compose/enviroment/show";
+import { ShowEnvironmentCompose } from "@/components/dashboard/compose/environment/show";
 import { ShowGeneralCompose } from "@/components/dashboard/compose/general/show";
 import { ShowDockerLogsCompose } from "@/components/dashboard/compose/logs/show";
 import { ShowDockerLogsStack } from "@/components/dashboard/compose/logs/show-stack";
diff --git a/apps/dokploy/pages/index.tsx b/apps/dokploy/pages/index.tsx
index ac196ff5..a90f384c 100644
--- a/apps/dokploy/pages/index.tsx
+++ b/apps/dokploy/pages/index.tsx
@@ -88,7 +88,7 @@ export default function Home({ IS_CLOUD }: Props) {
 				if (data.is2FAEnabled) {
 					setTemp(data);
 				} else {
-					toast.success("Signin succesfully", {
+					toast.success("Successfully signed in", {
 						duration: 2000,
 					});
 					router.push("/dashboard/projects");
diff --git a/apps/dokploy/pages/invitation.tsx b/apps/dokploy/pages/invitation.tsx
index adb1cf24..b509aca7 100644
--- a/apps/dokploy/pages/invitation.tsx
+++ b/apps/dokploy/pages/invitation.tsx
@@ -113,7 +113,7 @@ const Invitation = ({ token, invitation, isCloud }: Props) => {
 			token: token,
 		})
 			.then(() => {
-				toast.success("User registration succesfuly", {
+				toast.success("User registered successfuly", {
 					description:
 						"Please check your inbox or spam folder to confirm your account.",
 					duration: 100000,
diff --git a/apps/dokploy/pages/register.tsx b/apps/dokploy/pages/register.tsx
index 30bae7a3..cc563f91 100644
--- a/apps/dokploy/pages/register.tsx
+++ b/apps/dokploy/pages/register.tsx
@@ -95,7 +95,7 @@ const Register = ({ isCloud }: Props) => {
 			password: values.password,
 		})
 			.then(() => {
-				toast.success("User registration succesfuly", {
+				toast.success("User registered successfuly", {
 					duration: 2000,
 				});
 				if (!isCloud) {
@@ -137,7 +137,7 @@ const Register = ({ isCloud }: Props) => {
 						{data?.type === "cloud" && (
 							<AlertBlock type="success" className="mx-4 my-2">
 								<span>
-									Registration succesfuly, Please check your inbox or spam
+									Registered successfully, please check your inbox or spam
 									folder to confirm your account.
 								</span>
 							</AlertBlock>
diff --git a/apps/dokploy/pages/reset-password.tsx b/apps/dokploy/pages/reset-password.tsx
index 227a1d6b..9c598431 100644
--- a/apps/dokploy/pages/reset-password.tsx
+++ b/apps/dokploy/pages/reset-password.tsx
@@ -83,13 +83,13 @@ export default function Home({ token }: Props) {
 			password: values.password,
 		})
 			.then((data) => {
-				toast.success("Password reset succesfully", {
+				toast.success("Password reset successfully", {
 					duration: 2000,
 				});
 				router.push("/");
 			})
 			.catch(() => {
-				toast.error("Error to reset password", {
+				toast.error("Error resetting password", {
 					duration: 2000,
 				});
 			});
diff --git a/apps/dokploy/pages/send-reset-password.tsx b/apps/dokploy/pages/send-reset-password.tsx
index daac30e1..6a8eb5ab 100644
--- a/apps/dokploy/pages/send-reset-password.tsx
+++ b/apps/dokploy/pages/send-reset-password.tsx
@@ -76,7 +76,7 @@ export default function Home() {
 				});
 			})
 			.catch(() => {
-				toast.error("Error to send email", {
+				toast.error("Error sending email", {
 					duration: 2000,
 				});
 			});
diff --git a/apps/dokploy/reset-password.ts b/apps/dokploy/reset-password.ts
index e13c348a..43b11fdf 100644
--- a/apps/dokploy/reset-password.ts
+++ b/apps/dokploy/reset-password.ts
@@ -21,6 +21,6 @@ import { generateRandomPassword } from "@dokploy/server";
 
 		process.exit(0);
 	} catch (error) {
-		console.log("Error to reset password", error);
+		console.log("Error resetting password", error);
 	}
 })();
diff --git a/apps/dokploy/server/api/routers/admin.ts b/apps/dokploy/server/api/routers/admin.ts
index 6029c713..696f3c79 100644
--- a/apps/dokploy/server/api/routers/admin.ts
+++ b/apps/dokploy/server/api/routers/admin.ts
@@ -49,7 +49,7 @@ export const adminRouter = createTRPCRouter({
 				throw new TRPCError({
 					code: "BAD_REQUEST",
 					message:
-						"Error to create this user\ncheck if the email is not registered",
+						"Error creating this user\ncheck if the email is not registered",
 					cause: error,
 				});
 			}
@@ -70,7 +70,7 @@ export const adminRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to delete this user",
+					message: "Error deleting this user",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/application.ts b/apps/dokploy/server/api/routers/application.ts
index b03211c4..13b7c80d 100644
--- a/apps/dokploy/server/api/routers/application.ts
+++ b/apps/dokploy/server/api/routers/application.ts
@@ -90,7 +90,7 @@ export const applicationRouter = createTRPCRouter({
 				}
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the application",
+					message: "Error creating the application",
 					cause: error,
 				});
 			}
@@ -441,7 +441,7 @@ export const applicationRouter = createTRPCRouter({
 			if (!updateApp) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update application",
+					message: "Error updating application",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/auth.ts b/apps/dokploy/server/api/routers/auth.ts
index b02ab617..f8bbfa9b 100644
--- a/apps/dokploy/server/api/routers/auth.ts
+++ b/apps/dokploy/server/api/routers/auth.ts
@@ -79,7 +79,7 @@ export const authRouter = createTRPCRouter({
 				throw new TRPCError({
 					code: "BAD_REQUEST",
 					// @ts-ignore
-					message: `Error: ${error?.code === "23505" ? "Email already exists" : "Error to create admin"}`,
+					message: `Error: ${error?.code === "23505" ? "Email already exists" : "Error creating admin"}`,
 					cause: error,
 				});
 			}
@@ -111,7 +111,7 @@ export const authRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the user",
+					message: "Error creating the user",
 					cause: error,
 				});
 			}
@@ -162,7 +162,7 @@ export const authRouter = createTRPCRouter({
 		} catch (error) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: `Error: ${error instanceof Error ? error.message : "Error to login"}`,
+				message: `Error: ${error instanceof Error ? error.message : "Login error"}`,
 				cause: error,
 			});
 		}
diff --git a/apps/dokploy/server/api/routers/backup.ts b/apps/dokploy/server/api/routers/backup.ts
index c6ae38b6..0b8d7ab1 100644
--- a/apps/dokploy/server/api/routers/backup.ts
+++ b/apps/dokploy/server/api/routers/backup.ts
@@ -69,7 +69,7 @@ export const backupRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the Backup",
+					message: "Error creating the Backup",
 					cause: error,
 				});
 			}
@@ -113,7 +113,7 @@ export const backupRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to update this Backup",
+					message: "Error updating this Backup",
 				});
 			}
 		}),
@@ -135,7 +135,7 @@ export const backupRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to delete this Backup",
+					message: "Error deleting this Backup",
 					cause: error,
 				});
 			}
@@ -152,7 +152,7 @@ export const backupRouter = createTRPCRouter({
 				console.log(error);
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to run manual postgres backup ",
+					message: "Error running manual Postgres backup ",
 					cause: error,
 				});
 			}
@@ -169,7 +169,7 @@ export const backupRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to run manual mysql backup ",
+					message: "Error running manual MySQL backup ",
 					cause: error,
 				});
 			}
@@ -185,7 +185,7 @@ export const backupRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to run manual mariadb backup ",
+					message: "Error running manual Mariadb backup ",
 					cause: error,
 				});
 			}
@@ -201,7 +201,7 @@ export const backupRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to run manual mongo backup ",
+					message: "Error running manual Mongo backup ",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/bitbucket.ts b/apps/dokploy/server/api/routers/bitbucket.ts
index 48b7fdd4..c66716d3 100644
--- a/apps/dokploy/server/api/routers/bitbucket.ts
+++ b/apps/dokploy/server/api/routers/bitbucket.ts
@@ -27,7 +27,7 @@ export const bitbucketRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create this bitbucket provider",
+					message: "Error creating this Bitbucket provider",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/cluster.ts b/apps/dokploy/server/api/routers/cluster.ts
index e42d4b04..7ded632c 100644
--- a/apps/dokploy/server/api/routers/cluster.ts
+++ b/apps/dokploy/server/api/routers/cluster.ts
@@ -35,7 +35,7 @@ export const clusterRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "INTERNAL_SERVER_ERROR",
-					message: "Error to remove the node",
+					message: "Error removing the node",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts
index 5f53752b..dab37e78 100644
--- a/apps/dokploy/server/api/routers/compose.ts
+++ b/apps/dokploy/server/api/routers/compose.ts
@@ -198,7 +198,7 @@ export const composeRouter = createTRPCRouter({
 			} catch (err) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to fetch source type",
+					message: "Error fetching source type",
 					cause: err,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/destination.ts b/apps/dokploy/server/api/routers/destination.ts
index 6374ec45..d13928be 100644
--- a/apps/dokploy/server/api/routers/destination.ts
+++ b/apps/dokploy/server/api/routers/destination.ts
@@ -32,7 +32,7 @@ export const destinationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the destination",
+					message: "Error creating the destination",
 					cause: error,
 				});
 			}
@@ -75,7 +75,7 @@ export const destinationRouter = createTRPCRouter({
 					message:
 						error instanceof Error
 							? error?.message
-							: "Error to connect to bucket",
+							: "Error connecting to bucket",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/domain.ts b/apps/dokploy/server/api/routers/domain.ts
index b0a1000c..f122cf86 100644
--- a/apps/dokploy/server/api/routers/domain.ts
+++ b/apps/dokploy/server/api/routers/domain.ts
@@ -49,7 +49,7 @@ export const domainRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the domain",
+					message: "Error creating the domain",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/git-provider.ts b/apps/dokploy/server/api/routers/git-provider.ts
index e1e8ef8b..abd93392 100644
--- a/apps/dokploy/server/api/routers/git-provider.ts
+++ b/apps/dokploy/server/api/routers/git-provider.ts
@@ -32,14 +32,14 @@ export const gitProviderRouter = createTRPCRouter({
 					// TODO: Remove isCloud in the next versions of dokploy
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You are not allowed to delete this git provider",
+						message: "You are not allowed to delete this Git provider",
 					});
 				}
 				return await removeGitProvider(input.gitProviderId);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to delete this git provider",
+					message: "Error deleting this Git provider",
 				});
 			}
 		}),
diff --git a/apps/dokploy/server/api/routers/gitlab.ts b/apps/dokploy/server/api/routers/gitlab.ts
index c057061f..6d35f4a2 100644
--- a/apps/dokploy/server/api/routers/gitlab.ts
+++ b/apps/dokploy/server/api/routers/gitlab.ts
@@ -30,7 +30,7 @@ export const gitlabRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create this gitlab provider",
+					message: "Error creating this Gitlab provider",
 					cause: error,
 				});
 			}
@@ -43,7 +43,7 @@ export const gitlabRouter = createTRPCRouter({
 				//TODO: Remove this line when the cloud version is ready
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not allowed to access this gitlab provider",
+					message: "You are not allowed to access this Gitlab provider",
 				});
 			}
 			return gitlabProvider;
@@ -82,7 +82,7 @@ export const gitlabRouter = createTRPCRouter({
 				//TODO: Remove this line when the cloud version is ready
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not allowed to access this gitlab provider",
+					message: "You are not allowed to access this Gitlab provider",
 				});
 			}
 			return await getGitlabRepositories(input.gitlabId);
@@ -96,7 +96,7 @@ export const gitlabRouter = createTRPCRouter({
 				//TODO: Remove this line when the cloud version is ready
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not allowed to access this gitlab provider",
+					message: "You are not allowed to access this Gitlab provider",
 				});
 			}
 			return await getGitlabBranches(input);
@@ -113,7 +113,7 @@ export const gitlabRouter = createTRPCRouter({
 					//TODO: Remove this line when the cloud version is ready
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You are not allowed to access this gitlab provider",
+						message: "You are not allowed to access this Gitlab provider",
 					});
 				}
 				const result = await testGitlabConnection(input);
@@ -134,7 +134,7 @@ export const gitlabRouter = createTRPCRouter({
 				//TODO: Remove this line when the cloud version is ready
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not allowed to access this gitlab provider",
+					message: "You are not allowed to access this Gitlab provider",
 				});
 			}
 			if (input.name) {
diff --git a/apps/dokploy/server/api/routers/mariadb.ts b/apps/dokploy/server/api/routers/mariadb.ts
index 6755d647..51b4b876 100644
--- a/apps/dokploy/server/api/routers/mariadb.ts
+++ b/apps/dokploy/server/api/routers/mariadb.ts
@@ -41,7 +41,7 @@ export const mariadbRouter = createTRPCRouter({
 				if (IS_CLOUD && !input.serverId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You need to use a server to create a mariadb",
+						message: "You need to use a server to create a Mariadb",
 					});
 				}
 
@@ -83,7 +83,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (mariadb.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to access this mariadb",
+					message: "You are not authorized to access this Mariadb",
 				});
 			}
 			return mariadb;
@@ -96,7 +96,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (service.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to start this mariadb",
+					message: "You are not authorized to start this Mariadb",
 				});
 			}
 			if (service.serverId) {
@@ -149,7 +149,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (mariadb.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to deploy this mariadb",
+					message: "You are not authorized to deploy this Mariadb",
 				});
 			}
 
@@ -162,7 +162,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (mongo.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to change this mariadb status",
+					message: "You are not authorized to change this Mariadb status",
 				});
 			}
 			await updateMariadbById(input.mariadbId, {
@@ -181,7 +181,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (mongo.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to delete this mariadb",
+					message: "You are not authorized to delete this Mariadb",
 				});
 			}
 
@@ -215,7 +215,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to add environment variables",
+					message: "Error adding environment variables",
 				});
 			}
 
@@ -228,7 +228,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (mariadb.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to reload this mariadb",
+					message: "You are not authorized to reload this Mariadb",
 				});
 			}
 			if (mariadb.serverId) {
@@ -258,7 +258,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (mariadb.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to update this mariadb",
+					message: "You are not authorized to update this Mariadb",
 				});
 			}
 			const service = await updateMariadbById(mariadbId, {
@@ -268,7 +268,7 @@ export const mariadbRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update mariadb",
+					message: "Update: Error updating Mariadb",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/mongo.ts b/apps/dokploy/server/api/routers/mongo.ts
index 49dc5ec2..f6305835 100644
--- a/apps/dokploy/server/api/routers/mongo.ts
+++ b/apps/dokploy/server/api/routers/mongo.ts
@@ -257,7 +257,7 @@ export const mongoRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to add environment variables",
+					message: "Error adding environment variables",
 				});
 			}
 
@@ -281,7 +281,7 @@ export const mongoRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update mongo",
+					message: "Update: Error updating Mongo",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/mysql.ts b/apps/dokploy/server/api/routers/mysql.ts
index 893adb9c..94bc0ace 100644
--- a/apps/dokploy/server/api/routers/mysql.ts
+++ b/apps/dokploy/server/api/routers/mysql.ts
@@ -42,7 +42,7 @@ export const mysqlRouter = createTRPCRouter({
 				if (IS_CLOUD && !input.serverId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You need to use a server to create a mysql",
+						message: "You need to use a server to create a MySQL",
 					});
 				}
 				1;
@@ -74,7 +74,7 @@ export const mysqlRouter = createTRPCRouter({
 				}
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error input: Inserting mysql database",
+					message: "Error input: Inserting MySQL database",
 					cause: error,
 				});
 			}
@@ -89,7 +89,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mysql.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to access this mysql",
+					message: "You are not authorized to access this MySQL",
 				});
 			}
 			return mysql;
@@ -102,7 +102,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (service.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to start this mysql",
+					message: "You are not authorized to start this MySQL",
 				});
 			}
 
@@ -124,7 +124,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mongo.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to stop this mysql",
+					message: "You are not authorized to stop this MySQL",
 				});
 			}
 			if (mongo.serverId) {
@@ -161,7 +161,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mysql.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to deploy this mysql",
+					message: "You are not authorized to deploy this MySQL",
 				});
 			}
 			return deployMySql(input.mysqlId);
@@ -173,7 +173,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mongo.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to change this mysql status",
+					message: "You are not authorized to change this MySQL status",
 				});
 			}
 			await updateMySqlById(input.mysqlId, {
@@ -188,7 +188,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mysql.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to reload this mysql",
+					message: "You are not authorized to reload this MySQL",
 				});
 			}
 			if (mysql.serverId) {
@@ -219,7 +219,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mongo.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to delete this mysql",
+					message: "You are not authorized to delete this MySQL",
 				});
 			}
 
@@ -253,7 +253,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to add environment variables",
+					message: "Error adding environment variables",
 				});
 			}
 
@@ -267,7 +267,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (mysql.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to update this mysql",
+					message: "You are not authorized to update this MySQL",
 				});
 			}
 			const service = await updateMySqlById(mysqlId, {
@@ -277,7 +277,7 @@ export const mysqlRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update mysql",
+					message: "Update: Error updating MySQL",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/notification.ts b/apps/dokploy/server/api/routers/notification.ts
index ba226d45..f8869503 100644
--- a/apps/dokploy/server/api/routers/notification.ts
+++ b/apps/dokploy/server/api/routers/notification.ts
@@ -50,7 +50,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the notification",
+					message: "Error creating the notification",
 					cause: error,
 				});
 			}
@@ -87,7 +87,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to test the notification",
+					message: "Error testing the notification",
 					cause: error,
 				});
 			}
@@ -100,7 +100,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the notification",
+					message: "Error creating the notification",
 					cause: error,
 				});
 			}
@@ -125,7 +125,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to update the notification",
+					message: "Error updating the notification",
 					cause: error,
 				});
 			}
@@ -139,7 +139,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to test the notification",
+					message: "Error testing the notification",
 					cause: error,
 				});
 			}
@@ -152,7 +152,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the notification",
+					message: "Error creating the notification",
 					cause: error,
 				});
 			}
@@ -177,7 +177,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to update the notification",
+					message: "Error updating the notification",
 					cause: error,
 				});
 			}
@@ -200,7 +200,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to test the notification",
+					message: "Error testing the notification",
 					cause: error,
 				});
 			}
@@ -213,7 +213,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the notification",
+					message: "Error creating the notification",
 					cause: error,
 				});
 			}
@@ -237,7 +237,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to update the notification",
+					message: "Error updating the notification",
 					cause: error,
 				});
 			}
@@ -255,7 +255,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to test the notification",
+					message: "Error testing the notification",
 					cause: error,
 				});
 			}
@@ -276,7 +276,7 @@ export const notificationRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to delete this notification",
+					message: "Error deleting this notification",
 				});
 			}
 		}),
diff --git a/apps/dokploy/server/api/routers/port.ts b/apps/dokploy/server/api/routers/port.ts
index 409eb8f0..bfbc9863 100644
--- a/apps/dokploy/server/api/routers/port.ts
+++ b/apps/dokploy/server/api/routers/port.ts
@@ -58,7 +58,7 @@ export const portRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to updating port",
+					message: "Error updating the port",
 				});
 			}
 		}),
diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts
index 14f9d967..4afacd71 100644
--- a/apps/dokploy/server/api/routers/postgres.ts
+++ b/apps/dokploy/server/api/routers/postgres.ts
@@ -40,7 +40,7 @@ export const postgresRouter = createTRPCRouter({
 				if (IS_CLOUD && !input.serverId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You need to use a server to create a postgres",
+						message: "You need to use a server to create a Postgres",
 					});
 				}
 
@@ -71,7 +71,7 @@ export const postgresRouter = createTRPCRouter({
 				}
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error input: Inserting postgresql database",
+					message: "Error input: Inserting Postgres database",
 					cause: error,
 				});
 			}
@@ -87,7 +87,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to access this postgres",
+					message: "You are not authorized to access this Postgres",
 				});
 			}
 			return postgres;
@@ -101,7 +101,7 @@ export const postgresRouter = createTRPCRouter({
 			if (service.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to start this postgres",
+					message: "You are not authorized to start this Postgres",
 				});
 			}
 
@@ -123,7 +123,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to stop this postgres",
+					message: "You are not authorized to stop this Postgres",
 				});
 			}
 			if (postgres.serverId) {
@@ -161,7 +161,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to deploy this postgres",
+					message: "You are not authorized to deploy this Postgres",
 				});
 			}
 			return deployPostgres(input.postgresId);
@@ -173,7 +173,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to change this postgres status",
+					message: "You are not authorized to change this Postgres status",
 				});
 			}
 			await updatePostgresById(input.postgresId, {
@@ -192,7 +192,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to delete this postgres",
+					message: "You are not authorized to delete this Postgres",
 				});
 			}
 
@@ -222,7 +222,7 @@ export const postgresRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to add environment variables",
+					message: "Error adding environment variables",
 				});
 			}
 
@@ -235,7 +235,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to reload this postgres",
+					message: "You are not authorized to reload this Postgres",
 				});
 			}
 			if (postgres.serverId) {
@@ -265,7 +265,7 @@ export const postgresRouter = createTRPCRouter({
 			if (postgres.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to update this postgres",
+					message: "You are not authorized to update this Postgres",
 				});
 			}
 			const service = await updatePostgresById(postgresId, {
@@ -275,7 +275,7 @@ export const postgresRouter = createTRPCRouter({
 			if (!service) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update postgres",
+					message: "Error updating Postgres",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/project.ts b/apps/dokploy/server/api/routers/project.ts
index 81b60004..967b39e3 100644
--- a/apps/dokploy/server/api/routers/project.ts
+++ b/apps/dokploy/server/api/routers/project.ts
@@ -58,7 +58,7 @@ export const projectRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: `Error to create the project: ${error instanceof Error ? error.message : error}`,
+					message: `Error creating the project: ${error instanceof Error ? error.message : error}`,
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/redis.ts b/apps/dokploy/server/api/routers/redis.ts
index fdd2db9c..672b550e 100644
--- a/apps/dokploy/server/api/routers/redis.ts
+++ b/apps/dokploy/server/api/routers/redis.ts
@@ -42,7 +42,7 @@ export const redisRouter = createTRPCRouter({
 				if (IS_CLOUD && !input.serverId) {
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You need to use a server to create a redis",
+						message: "You need to use a server to create a Redis",
 					});
 				}
 
@@ -82,7 +82,7 @@ export const redisRouter = createTRPCRouter({
 			if (redis.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to access this redis",
+					message: "You are not authorized to access this Redis",
 				});
 			}
 			return redis;
@@ -95,7 +95,7 @@ export const redisRouter = createTRPCRouter({
 			if (redis.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to start this redis",
+					message: "You are not authorized to start this Redis",
 				});
 			}
 
@@ -117,7 +117,7 @@ export const redisRouter = createTRPCRouter({
 			if (redis.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to reload this redis",
+					message: "You are not authorized to reload this Redis",
 				});
 			}
 			if (redis.serverId) {
@@ -147,7 +147,7 @@ export const redisRouter = createTRPCRouter({
 			if (redis.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to stop this redis",
+					message: "You are not authorized to stop this Redis",
 				});
 			}
 			if (redis.serverId) {
@@ -184,7 +184,7 @@ export const redisRouter = createTRPCRouter({
 			if (redis.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to deploy this redis",
+					message: "You are not authorized to deploy this Redis",
 				});
 			}
 			return deployRedis(input.redisId);
@@ -196,7 +196,7 @@ export const redisRouter = createTRPCRouter({
 			if (mongo.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to change this redis status",
+					message: "You are not authorized to change this Redis status",
 				});
 			}
 			await updateRedisById(input.redisId, {
@@ -216,7 +216,7 @@ export const redisRouter = createTRPCRouter({
 			if (redis.project.adminId !== ctx.user.adminId) {
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not authorized to delete this redis",
+					message: "You are not authorized to delete this Redis",
 				});
 			}
 
@@ -250,7 +250,7 @@ export const redisRouter = createTRPCRouter({
 			if (!updatedRedis) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to add environment variables",
+					message: "Error adding environment variables",
 				});
 			}
 
@@ -267,7 +267,7 @@ export const redisRouter = createTRPCRouter({
 			if (!redis) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update redis",
+					message: "Error updating Redis",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/registry.ts b/apps/dokploy/server/api/routers/registry.ts
index 8ca4a8a0..2cadce71 100644
--- a/apps/dokploy/server/api/routers/registry.ts
+++ b/apps/dokploy/server/api/routers/registry.ts
@@ -54,7 +54,7 @@ export const registryRouter = createTRPCRouter({
 			if (!application) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Update: Error to update registry",
+					message: "Error updating registry",
 				});
 			}
 
diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts
index 4076d6e9..d01e4638 100644
--- a/apps/dokploy/server/api/routers/server.ts
+++ b/apps/dokploy/server/api/routers/server.ts
@@ -52,7 +52,7 @@ export const serverRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the server",
+					message: "Error creating the server",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/settings.ts b/apps/dokploy/server/api/routers/settings.ts
index 8bec9b52..b40ee95b 100644
--- a/apps/dokploy/server/api/routers/settings.ts
+++ b/apps/dokploy/server/api/routers/settings.ts
@@ -748,7 +748,7 @@ export const settingsRouter = createTRPCRouter({
 					message:
 						error instanceof Error
 							? error.message
-							: "Error to update Traefik ports",
+							: "Error updating Traefik ports",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/api/routers/ssh-key.ts b/apps/dokploy/server/api/routers/ssh-key.ts
index ceb32993..fe2f24f9 100644
--- a/apps/dokploy/server/api/routers/ssh-key.ts
+++ b/apps/dokploy/server/api/routers/ssh-key.ts
@@ -31,7 +31,7 @@ export const sshRouter = createTRPCRouter({
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the ssh key",
+					message: "Error creating the SSH key",
 					cause: error,
 				});
 			}
@@ -45,7 +45,7 @@ export const sshRouter = createTRPCRouter({
 					// TODO: Remove isCloud in the next versions of dokploy
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You are not allowed to delete this ssh key",
+						message: "You are not allowed to delete this SSH key",
 					});
 				}
 
@@ -63,7 +63,7 @@ export const sshRouter = createTRPCRouter({
 				// TODO: Remove isCloud in the next versions of dokploy
 				throw new TRPCError({
 					code: "UNAUTHORIZED",
-					message: "You are not allowed to access this ssh key",
+					message: "You are not allowed to access this SSH key",
 				});
 			}
 			return sshKey;
@@ -89,14 +89,14 @@ export const sshRouter = createTRPCRouter({
 					// TODO: Remove isCloud in the next versions of dokploy
 					throw new TRPCError({
 						code: "UNAUTHORIZED",
-						message: "You are not allowed to update this ssh key",
+						message: "You are not allowed to update this SSH key",
 					});
 				}
 				return await updateSSHKeyById(input);
 			} catch (error) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to update this ssh key",
+					message: "Error updating this SSH key",
 					cause: error,
 				});
 			}
diff --git a/apps/dokploy/server/db/reset.ts b/apps/dokploy/server/db/reset.ts
index 7497bec3..c2229147 100644
--- a/apps/dokploy/server/db/reset.ts
+++ b/apps/dokploy/server/db/reset.ts
@@ -15,7 +15,7 @@ const clearDb = async (): Promise<void> => {
 		console.log(tables);
 		await pg.end();
 	} catch (error) {
-		console.error("Error to clean database", error);
+		console.error("Error cleaning database", error);
 	} finally {
 	}
 };
diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts
index b1ecb908..a3c231aa 100644
--- a/apps/dokploy/server/wss/terminal.ts
+++ b/apps/dokploy/server/wss/terminal.ts
@@ -11,7 +11,7 @@ export const getPublicIpWithFallback = async () => {
 		ip = await publicIpv4();
 	} catch (error) {
 		console.log(
-			"Error to obtain public IPv4 address, falling back to IPv6",
+			"Error obtaining public IPv4 address, falling back to IPv6",
 			// @ts-ignore
 			error.message,
 		);
@@ -19,7 +19,7 @@ export const getPublicIpWithFallback = async () => {
 			ip = await publicIpv6();
 		} catch (error) {
 			// @ts-ignore
-			console.error("Error to obtain public IPv6 address", error.message);
+			console.error("Error obtaining public IPv6 address", error.message);
 			ip = null;
 		}
 	}
diff --git a/apps/dokploy/setup.ts b/apps/dokploy/setup.ts
index e4192ada..5e15db07 100644
--- a/apps/dokploy/setup.ts
+++ b/apps/dokploy/setup.ts
@@ -24,6 +24,6 @@ import {
 		await initializeRedis();
 		await initializePostgres();
 	} catch (e) {
-		console.error("Error to setup dokploy", e);
+		console.error("Error in dokploy setup", e);
 	}
 })();
diff --git a/packages/server/src/db/reset.ts b/packages/server/src/db/reset.ts
index 7497bec3..c2229147 100644
--- a/packages/server/src/db/reset.ts
+++ b/packages/server/src/db/reset.ts
@@ -15,7 +15,7 @@ const clearDb = async (): Promise<void> => {
 		console.log(tables);
 		await pg.end();
 	} catch (error) {
-		console.error("Error to clean database", error);
+		console.error("Error cleaning database", error);
 	} finally {
 	}
 };
diff --git a/packages/server/src/services/admin.ts b/packages/server/src/services/admin.ts
index 2e7c5735..3502395e 100644
--- a/packages/server/src/services/admin.ts
+++ b/packages/server/src/services/admin.ts
@@ -30,7 +30,7 @@ export const createInvitation = async (
 		if (!result) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the user",
+				message: "Error creating the user",
 			});
 		}
 		const expiresIn24Hours = new Date();
diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts
index b8ecb88b..e2ed407f 100644
--- a/packages/server/src/services/application.ts
+++ b/packages/server/src/services/application.ts
@@ -86,7 +86,7 @@ export const createApplication = async (
 		if (!newApplication) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the application",
+				message: "Error creating the application",
 			});
 		}
 
@@ -222,7 +222,7 @@ export const deployApplication = async ({
 			applicationName: application.name,
 			applicationType: "application",
 			// @ts-ignore
-			errorMessage: error?.message || "Error to build",
+			errorMessage: error?.message || "Error building",
 			buildLink,
 			adminId: application.project.adminId,
 		});
@@ -352,7 +352,7 @@ export const deployRemoteApplication = async ({
 			applicationName: application.name,
 			applicationType: "application",
 			// @ts-ignore
-			errorMessage: error?.message || "Error to build",
+			errorMessage: error?.message || "Error building",
 			buildLink,
 			adminId: application.project.adminId,
 		});
diff --git a/packages/server/src/services/auth.ts b/packages/server/src/services/auth.ts
index 598e39e3..65a01c41 100644
--- a/packages/server/src/services/auth.ts
+++ b/packages/server/src/services/auth.ts
@@ -34,7 +34,7 @@ export const createAdmin = async (input: typeof apiCreateAdmin._type) => {
 		if (!newAuth) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the user",
+				message: "Error creating the user",
 			});
 		}
 
@@ -68,7 +68,7 @@ export const createUser = async (input: typeof apiCreateUser._type) => {
 		if (!res) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the user",
+				message: "Error creating the user",
 			});
 		}
 
diff --git a/packages/server/src/services/backup.ts b/packages/server/src/services/backup.ts
index 42cc378a..70e37af4 100644
--- a/packages/server/src/services/backup.ts
+++ b/packages/server/src/services/backup.ts
@@ -19,7 +19,7 @@ export const createBackup = async (input: typeof apiCreateBackup._type) => {
 	if (!newBackup) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the Backup",
+			message: "Error creating the Backup",
 		});
 	}
 
diff --git a/packages/server/src/services/bitbucket.ts b/packages/server/src/services/bitbucket.ts
index 34aa491f..21807156 100644
--- a/packages/server/src/services/bitbucket.ts
+++ b/packages/server/src/services/bitbucket.ts
@@ -28,7 +28,7 @@ export const createBitbucket = async (
 		if (!newGitProvider) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the git provider",
+				message: "Error creating the Bitbucket provider",
 			});
 		}
 
diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts
index ff660351..50459c45 100644
--- a/packages/server/src/services/compose.ts
+++ b/packages/server/src/services/compose.ts
@@ -254,7 +254,7 @@ export const deployCompose = async ({
 			applicationName: compose.name,
 			applicationType: "compose",
 			// @ts-ignore
-			errorMessage: error?.message || "Error to build",
+			errorMessage: error?.message || "Error building",
 			buildLink,
 			adminId: compose.project.adminId,
 		});
@@ -387,7 +387,7 @@ export const deployRemoteCompose = async ({
 			applicationName: compose.name,
 			applicationType: "compose",
 			// @ts-ignore
-			errorMessage: error?.message || "Error to build",
+			errorMessage: error?.message || "Error building",
 			buildLink,
 			adminId: compose.project.adminId,
 		});
diff --git a/packages/server/src/services/deployment.ts b/packages/server/src/services/deployment.ts
index 41adf238..0e55ea32 100644
--- a/packages/server/src/services/deployment.ts
+++ b/packages/server/src/services/deployment.ts
@@ -93,7 +93,7 @@ export const createDeployment = async (
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the deployment",
+				message: "Error creating the deployment",
 			});
 		}
 		return deploymentCreate[0];
@@ -102,7 +102,7 @@ export const createDeployment = async (
 		console.log(error);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the deployment",
+			message: "Error creating the deployment",
 		});
 	}
 };
@@ -159,7 +159,7 @@ export const createDeploymentPreview = async (
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the deployment",
+				message: "Error creating the deployment",
 			});
 		}
 		return deploymentCreate[0];
@@ -170,7 +170,7 @@ export const createDeploymentPreview = async (
 		console.log(error);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the deployment",
+			message: "Error creating the deployment",
 		});
 	}
 };
@@ -221,7 +221,7 @@ echo "Initializing deployment" >> ${logFilePath};
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the deployment",
+				message: "Error creating the deployment",
 			});
 		}
 		return deploymentCreate[0];
@@ -232,7 +232,7 @@ echo "Initializing deployment" >> ${logFilePath};
 		console.log(error);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the deployment",
+			message: "Error creating the deployment",
 		});
 	}
 };
@@ -247,7 +247,7 @@ export const removeDeployment = async (deploymentId: string) => {
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to delete this deployment",
+			message: "Error deleting this deployment",
 		});
 	}
 };
@@ -497,14 +497,14 @@ export const createServerDeployment = async (
 		if (deploymentCreate.length === 0 || !deploymentCreate[0]) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the deployment",
+				message: "Error creating the deployment",
 			});
 		}
 		return deploymentCreate[0];
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the deployment",
+			message: "Error creating the deployment",
 		});
 	}
 };
diff --git a/packages/server/src/services/github.ts b/packages/server/src/services/github.ts
index d60c8353..a5d9d863 100644
--- a/packages/server/src/services/github.ts
+++ b/packages/server/src/services/github.ts
@@ -28,7 +28,7 @@ export const createGithub = async (
 		if (!newGitProvider) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the git provider",
+				message: "Error creating the Git provider",
 			});
 		}
 
diff --git a/packages/server/src/services/gitlab.ts b/packages/server/src/services/gitlab.ts
index 673cf1f1..8e1362c9 100644
--- a/packages/server/src/services/gitlab.ts
+++ b/packages/server/src/services/gitlab.ts
@@ -29,7 +29,7 @@ export const createGitlab = async (
 		if (!newGitProvider) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the git provider",
+				message: "Error creating the Git provider",
 			});
 		}
 
diff --git a/packages/server/src/services/mount.ts b/packages/server/src/services/mount.ts
index f5211599..dd7bd3e9 100644
--- a/packages/server/src/services/mount.ts
+++ b/packages/server/src/services/mount.ts
@@ -52,7 +52,7 @@ export const createMount = async (input: typeof apiCreateMount._type) => {
 		if (!value) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error input: Inserting mount",
+				message: "Error inserting mount",
 			});
 		}
 
@@ -64,7 +64,7 @@ export const createMount = async (input: typeof apiCreateMount._type) => {
 		console.log(error);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the mount",
+			message: "Error creating the mount",
 			cause: error,
 		});
 	}
@@ -88,10 +88,10 @@ export const createFileMount = async (mountId: string) => {
 			await createFile(baseFilePath, mount.filePath || "", mount.content || "");
 		}
 	} catch (error) {
-		console.log(`Error to create the file mount: ${error}`);
+		console.log(`Error creating the file mount: ${error}`);
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the mount",
+			message: "Error creating the mount",
 			cause: error,
 		});
 	}
diff --git a/packages/server/src/services/preview-deployment.ts b/packages/server/src/services/preview-deployment.ts
index 06bf8fb5..ab38c17c 100644
--- a/packages/server/src/services/preview-deployment.ts
+++ b/packages/server/src/services/preview-deployment.ts
@@ -112,7 +112,7 @@ export const removePreviewDeployment = async (previewDeploymentId: string) => {
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to delete this preview deployment",
+			message: "Error deleting this preview deployment",
 		});
 	}
 };
@@ -189,7 +189,7 @@ export const createPreviewDeployment = async (
 	if (!previewDeployment) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the preview deployment",
+			message: "Error creating the preview deployment",
 		});
 	}
 
diff --git a/packages/server/src/services/project.ts b/packages/server/src/services/project.ts
index 47e8ac40..adaa07ea 100644
--- a/packages/server/src/services/project.ts
+++ b/packages/server/src/services/project.ts
@@ -30,7 +30,7 @@ export const createProject = async (
 	if (!newProject) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the project",
+			message: "Error creating the project",
 		});
 	}
 
diff --git a/packages/server/src/services/redirect.ts b/packages/server/src/services/redirect.ts
index 247b18ce..f16dbe42 100644
--- a/packages/server/src/services/redirect.ts
+++ b/packages/server/src/services/redirect.ts
@@ -40,7 +40,7 @@ export const createRedirect = async (
 			if (!redirect) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the redirect",
+					message: "Error creating the redirect",
 				});
 			}
 
@@ -53,7 +53,7 @@ export const createRedirect = async (
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create this redirect",
+			message: "Error creating this redirect",
 			cause: error,
 		});
 	}
@@ -82,7 +82,7 @@ export const removeRedirectById = async (redirectId: string) => {
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to remove this redirect",
+			message: "Error removing this redirect",
 			cause: error,
 		});
 	}
@@ -116,7 +116,7 @@ export const updateRedirectById = async (
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to update this redirect",
+			message: "Error updating this redirect",
 		});
 	}
 };
diff --git a/packages/server/src/services/registry.ts b/packages/server/src/services/registry.ts
index b03c11b9..2bcf3a4a 100644
--- a/packages/server/src/services/registry.ts
+++ b/packages/server/src/services/registry.ts
@@ -71,7 +71,7 @@ export const removeRegistry = async (registryId: string) => {
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to remove this registry",
+			message: "Error removing this registry",
 			cause: error,
 		});
 	}
@@ -114,7 +114,7 @@ export const updateRegistry = async (
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to update this registry",
+			message: "Error updating this registry",
 		});
 	}
 };
diff --git a/packages/server/src/services/security.ts b/packages/server/src/services/security.ts
index d1709b3f..5efca19f 100644
--- a/packages/server/src/services/security.ts
+++ b/packages/server/src/services/security.ts
@@ -41,7 +41,7 @@ export const createSecurity = async (
 			if (!securityResponse) {
 				throw new TRPCError({
 					code: "BAD_REQUEST",
-					message: "Error to create the security",
+					message: "Error creating the security",
 				});
 			}
 			await createSecurityMiddleware(application, securityResponse);
@@ -50,7 +50,7 @@ export const createSecurity = async (
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create this security",
+			message: "Error creating this security",
 			cause: error,
 		});
 	}
@@ -78,7 +78,7 @@ export const deleteSecurityById = async (securityId: string) => {
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to remove this security",
+			message: "Error removing this security",
 		});
 	}
 };
@@ -100,7 +100,7 @@ export const updateSecurityById = async (
 	} catch (error) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to update this security",
+			message: "Error updating this security",
 		});
 	}
 };
diff --git a/packages/server/src/services/server.ts b/packages/server/src/services/server.ts
index 74ba5dd1..081b19fa 100644
--- a/packages/server/src/services/server.ts
+++ b/packages/server/src/services/server.ts
@@ -21,7 +21,7 @@ export const createServer = async (
 	if (!newServer) {
 		throw new TRPCError({
 			code: "BAD_REQUEST",
-			message: "Error to create the server",
+			message: "Error creating the server",
 		});
 	}
 
diff --git a/packages/server/src/services/ssh-key.ts b/packages/server/src/services/ssh-key.ts
index 2bf292c7..392f4ecc 100644
--- a/packages/server/src/services/ssh-key.ts
+++ b/packages/server/src/services/ssh-key.ts
@@ -21,7 +21,7 @@ export const createSshKey = async (input: typeof apiCreateSshKey._type) => {
 		if (!sshKey) {
 			throw new TRPCError({
 				code: "BAD_REQUEST",
-				message: "Error to create the ssh key",
+				message: "Error creating the SSH Key",
 			});
 		}
 		return sshKey;
diff --git a/packages/server/src/utils/access-log/handler.ts b/packages/server/src/utils/access-log/handler.ts
index 33c10e51..b1fd925c 100644
--- a/packages/server/src/utils/access-log/handler.ts
+++ b/packages/server/src/utils/access-log/handler.ts
@@ -111,7 +111,7 @@ class LogRotationManager {
 			);
 			console.log("USR1 Signal send to Traefik");
 		} catch (error) {
-			console.error("Error to send USR1 Signal to Traefik:", error);
+			console.error("Error sending USR1 Signal to Traefik:", error);
 		}
 	}
 	public async getStatus(): Promise<boolean> {
diff --git a/packages/server/src/utils/filesystem/directory.ts b/packages/server/src/utils/filesystem/directory.ts
index 0a28cbac..adf25097 100644
--- a/packages/server/src/utils/filesystem/directory.ts
+++ b/packages/server/src/utils/filesystem/directory.ts
@@ -39,7 +39,7 @@ export const removeFileOrDirectory = async (path: string) => {
 	try {
 		await execAsync(`rm -rf ${path}`);
 	} catch (error) {
-		console.error(`Error to remove ${path}: ${error}`);
+		console.error(`Error removing ${path}: ${error}`);
 		throw error;
 	}
 };
@@ -58,7 +58,7 @@ export const removeDirectoryCode = async (
 			await execAsync(command);
 		}
 	} catch (error) {
-		console.error(`Error to remove ${directoryPath}: ${error}`);
+		console.error(`Error removing ${directoryPath}: ${error}`);
 		throw error;
 	}
 };
@@ -77,7 +77,7 @@ export const removeComposeDirectory = async (
 			await execAsync(command);
 		}
 	} catch (error) {
-		console.error(`Error to remove ${directoryPath}: ${error}`);
+		console.error(`Error removing ${directoryPath}: ${error}`);
 		throw error;
 	}
 };
@@ -96,7 +96,7 @@ export const removeMonitoringDirectory = async (
 			await execAsync(command);
 		}
 	} catch (error) {
-		console.error(`Error to remove ${directoryPath}: ${error}`);
+		console.error(`Error removing ${directoryPath}: ${error}`);
 		throw error;
 	}
 };
diff --git a/packages/server/src/wss/utils.ts b/packages/server/src/wss/utils.ts
index 8c6217a2..9ed75c3a 100644
--- a/packages/server/src/wss/utils.ts
+++ b/packages/server/src/wss/utils.ts
@@ -19,7 +19,7 @@ export const getPublicIpWithFallback = async () => {
 		ip = await publicIpv4();
 	} catch (error) {
 		console.log(
-			"Error to obtain public IPv4 address, falling back to IPv6",
+			"Error obtaining public IPv4 address, falling back to IPv6",
 			// @ts-ignore
 			error.message,
 		);
@@ -27,7 +27,7 @@ export const getPublicIpWithFallback = async () => {
 			ip = await publicIpv6();
 		} catch (error) {
 			// @ts-ignore
-			console.error("Error to obtain public IPv6 address", error.message);
+			console.error("Error obtaining public IPv6 address", error.message);
 			ip = null;
 		}
 	}

From 5d2d4104f0b5dc65766239b13257d7c932e41b10 Mon Sep 17 00:00:00 2001
From: cirlorm <akotosel6@gmail.com>
Date: Sun, 29 Dec 2024 17:46:44 +0000
Subject: [PATCH 18/30] convert email to lower case when loging in

I had an issue signing in to my dashboard only to find out it was because the first letter of my email was in caps.
---
 apps/dokploy/pages/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dokploy/pages/index.tsx b/apps/dokploy/pages/index.tsx
index ac196ff5..762796cc 100644
--- a/apps/dokploy/pages/index.tsx
+++ b/apps/dokploy/pages/index.tsx
@@ -81,7 +81,7 @@ export default function Home({ IS_CLOUD }: Props) {
 
 	const onSubmit = async (values: Login) => {
 		await mutateAsync({
-			email: values.email,
+			email: values.email.toLowerCase(),
 			password: values.password,
 		})
 			.then((data) => {

From 5d8ebd027ec996580375d2e6952f811d10bb9bea Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 13:53:38 -0600
Subject: [PATCH 19/30] fix: parse correctly numbers

---
 .../show-application-advanced-settings.tsx    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
index e77be2d1..c2d2f1ce 100644
--- a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
@@ -172,12 +172,13 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
-														if (
-															value === "" ||
-															/^[0-9]*\.?[0-9]*$/.test(value)
-														) {
-															const float = Number.parseFloat(value);
-															field.onChange(float);
+														if (value === "") {
+															field.onChange(null);
+														} else {
+															const number = Number.parseInt(value, 10);
+															if (!Number.isNaN(number)) {
+																field.onChange(number);
+															}
 														}
 													}}
 												/>
@@ -202,12 +203,13 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
-														if (
-															value === "" ||
-															/^[0-9]*\.?[0-9]*$/.test(value)
-														) {
-															const float = Number.parseFloat(value);
-															field.onChange(float);
+														if (value === "") {
+															field.onChange(null);
+														} else {
+															const number = Number.parseInt(value, 10);
+															if (!Number.isNaN(number)) {
+																field.onChange(number);
+															}
 														}
 													}}
 												/>

From 5558ee3248609e35f3e8beaec515b17b700c5931 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 14:10:41 -0600
Subject: [PATCH 20/30] fix: add tooltip and placeholder values

---
 .../show-application-advanced-settings.tsx    | 86 ++++++++++++++---
 .../advanced/show-mariadb-resources.tsx       | 92 ++++++++++++++----
 .../mongo/advanced/show-mongo-resources.tsx   | 96 +++++++++++++++----
 .../mysql/advanced/show-mysql-resources.tsx   | 92 ++++++++++++++----
 .../advanced/show-postgres-resources.tsx      | 84 ++++++++++++++--
 .../redis/advanced/show-redis-resources.tsx   | 92 ++++++++++++++----
 6 files changed, 450 insertions(+), 92 deletions(-)

diff --git a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
index c2d2f1ce..3d53a170 100644
--- a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
@@ -22,6 +22,13 @@ import React, { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
+import {
+	Tooltip,
+	TooltipContent,
+	TooltipProvider,
+	TooltipTrigger,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 
 const addResourcesApplication = z.object({
 	memoryReservation: z.number().nullable().optional(),
@@ -101,10 +108,25 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 								name="memoryReservation"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Memory Reservation</FormLabel>
+										<div className="flex items-center gap-2">
+											<FormLabel>Memory Reservation</FormLabel>
+											<TooltipProvider>
+												<Tooltip delayDuration={0}>
+													<TooltipTrigger>
+														<InfoIcon className="h-4 w-4 text-muted-foreground" />
+													</TooltipTrigger>
+													<TooltipContent>
+														<p>
+															Memory soft limit in bytes. Example: 256MB =
+															268435456 bytes
+														</p>
+													</TooltipContent>
+												</Tooltip>
+											</TooltipProvider>
+										</div>
 										<FormControl>
 											<Input
-												placeholder="256 MB"
+												placeholder="268435456 (256MB in bytes)"
 												{...field}
 												value={field.value?.toString() || ""}
 												onChange={(e) => {
@@ -120,7 +142,6 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 												}}
 											/>
 										</FormControl>
-
 										<FormMessage />
 									</FormItem>
 								)}
@@ -132,10 +153,25 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Memory Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>Memory Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																Memory hard limit in bytes. Example: 1GB =
+																1073741824 bytes
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1024 MB"}
+													placeholder="1073741824 (1GB in bytes)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
@@ -163,12 +199,26 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU quota in units of 10^-9 CPUs. Example: 2
+																CPUs = 2000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"2"}
+													placeholder="2000000000 (2 CPUs)"
 													{...field}
-													type="number"
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
@@ -194,12 +244,26 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Reservation</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Reservation</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU shares (relative weight). Example: 1 CPU =
+																1000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1"}
+													placeholder="1000000000 (1 CPU)"
 													{...field}
-													type="number"
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
diff --git a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
index 60cdbda0..383aaa40 100644
--- a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
@@ -18,6 +18,13 @@ import {
 import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
+import {
+	TooltipProvider,
+	TooltipTrigger,
+	TooltipContent,
+	Tooltip,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 import React, { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -100,28 +107,40 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 								name="memoryReservation"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Memory Reservation</FormLabel>
+										<div className="flex items-center gap-2">
+											<FormLabel>Memory Reservation</FormLabel>
+											<TooltipProvider>
+												<Tooltip delayDuration={0}>
+													<TooltipTrigger>
+														<InfoIcon className="h-4 w-4 text-muted-foreground" />
+													</TooltipTrigger>
+													<TooltipContent>
+														<p>
+															Memory soft limit in bytes. Example: 256MB =
+															268435456 bytes
+														</p>
+													</TooltipContent>
+												</Tooltip>
+											</TooltipProvider>
+										</div>
 										<FormControl>
 											<Input
-												placeholder="256 MB"
+												placeholder="268435456 (256MB in bytes)"
 												{...field}
 												value={field.value?.toString() || ""}
 												onChange={(e) => {
 													const value = e.target.value;
 													if (value === "") {
-														// Si el campo está vacío, establece el valor como null.
 														field.onChange(null);
 													} else {
 														const number = Number.parseInt(value, 10);
 														if (!Number.isNaN(number)) {
-															// Solo actualiza el valor si se convierte a un número válido.
 															field.onChange(number);
 														}
 													}
 												}}
 											/>
 										</FormControl>
-
 										<FormMessage />
 									</FormItem>
 								)}
@@ -133,21 +152,34 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Memory Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>Memory Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																Memory hard limit in bytes. Example: 1GB =
+																1073741824 bytes
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1024 MB"}
+													placeholder="1073741824 (1GB in bytes)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -166,21 +198,34 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU quota in units of 10^-9 CPUs. Example: 2
+																CPUs = 2000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"2"}
+													placeholder="2000000000 (2 CPUs)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -198,21 +243,34 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Reservation</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Reservation</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU shares (relative weight). Example: 1 CPU =
+																1000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1"}
+													placeholder="1000000000 (1 CPU)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
diff --git a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
index c18b54a8..e42f5a53 100644
--- a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
+++ b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
@@ -19,6 +19,13 @@ import { Input } from "@/components/ui/input";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import React, { useEffect } from "react";
+import {
+	TooltipProvider,
+	TooltipTrigger,
+	TooltipContent,
+	Tooltip,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
 import { z } from "zod";
@@ -89,10 +96,6 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 					the changes.
 				</AlertBlock>
 				<Form {...form}>
-					<AlertBlock type="info">
-						Please remember to click Redeploy after modify the resources to
-						apply the changes.
-					</AlertBlock>
 					<form
 						id="hook-form"
 						onSubmit={form.handleSubmit(onSubmit)}
@@ -104,28 +107,40 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 								name="memoryReservation"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Memory Reservation</FormLabel>
+										<div className="flex items-center gap-2">
+											<FormLabel>Memory Reservation</FormLabel>
+											<TooltipProvider>
+												<Tooltip delayDuration={0}>
+													<TooltipTrigger>
+														<InfoIcon className="h-4 w-4 text-muted-foreground" />
+													</TooltipTrigger>
+													<TooltipContent>
+														<p>
+															Memory soft limit in bytes. Example: 256MB =
+															268435456 bytes
+														</p>
+													</TooltipContent>
+												</Tooltip>
+											</TooltipProvider>
+										</div>
 										<FormControl>
 											<Input
-												placeholder="256 MB"
+												placeholder="268435456 (256MB in bytes)"
 												{...field}
 												value={field.value?.toString() || ""}
 												onChange={(e) => {
 													const value = e.target.value;
 													if (value === "") {
-														// Si el campo está vacío, establece el valor como null.
 														field.onChange(null);
 													} else {
 														const number = Number.parseInt(value, 10);
 														if (!Number.isNaN(number)) {
-															// Solo actualiza el valor si se convierte a un número válido.
 															field.onChange(number);
 														}
 													}
 												}}
 											/>
 										</FormControl>
-
 										<FormMessage />
 									</FormItem>
 								)}
@@ -137,21 +152,34 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Memory Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>Memory Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																Memory hard limit in bytes. Example: 1GB =
+																1073741824 bytes
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1024 MB"}
+													placeholder="1073741824 (1GB in bytes)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -170,21 +198,34 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU quota in units of 10^-9 CPUs. Example: 2
+																CPUs = 2000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"2"}
+													placeholder="2000000000 (2 CPUs)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -202,21 +243,34 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Reservation</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Reservation</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU shares (relative weight). Example: 1 CPU =
+																1000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1"}
+													placeholder="1000000000 (1 CPU)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
diff --git a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
index 07ceeae9..e265139b 100644
--- a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
+++ b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
@@ -20,6 +20,13 @@ import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
 import React, { useEffect } from "react";
 import { useForm } from "react-hook-form";
+import {
+	TooltipProvider,
+	TooltipTrigger,
+	TooltipContent,
+	Tooltip,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 import { toast } from "sonner";
 import { z } from "zod";
 
@@ -100,28 +107,40 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 								name="memoryReservation"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Memory Reservation</FormLabel>
+										<div className="flex items-center gap-2">
+											<FormLabel>Memory Reservation</FormLabel>
+											<TooltipProvider>
+												<Tooltip delayDuration={0}>
+													<TooltipTrigger>
+														<InfoIcon className="h-4 w-4 text-muted-foreground" />
+													</TooltipTrigger>
+													<TooltipContent>
+														<p>
+															Memory soft limit in bytes. Example: 256MB =
+															268435456 bytes
+														</p>
+													</TooltipContent>
+												</Tooltip>
+											</TooltipProvider>
+										</div>
 										<FormControl>
 											<Input
-												placeholder="256 MB"
+												placeholder="268435456 (256MB in bytes)"
 												{...field}
 												value={field.value?.toString() || ""}
 												onChange={(e) => {
 													const value = e.target.value;
 													if (value === "") {
-														// Si el campo está vacío, establece el valor como null.
 														field.onChange(null);
 													} else {
 														const number = Number.parseInt(value, 10);
 														if (!Number.isNaN(number)) {
-															// Solo actualiza el valor si se convierte a un número válido.
 															field.onChange(number);
 														}
 													}
 												}}
 											/>
 										</FormControl>
-
 										<FormMessage />
 									</FormItem>
 								)}
@@ -133,21 +152,34 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Memory Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>Memory Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																Memory hard limit in bytes. Example: 1GB =
+																1073741824 bytes
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1024 MB"}
+													placeholder="1073741824 (1GB in bytes)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -166,21 +198,34 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU quota in units of 10^-9 CPUs. Example: 2
+																CPUs = 2000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"2"}
+													placeholder="2000000000 (2 CPUs)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -198,21 +243,34 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Reservation</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Reservation</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU shares (relative weight). Example: 1 CPU =
+																1000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1"}
+													placeholder="1000000000 (1 CPU)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
diff --git a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
index 7f224ee2..d417edef 100644
--- a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
+++ b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
@@ -21,6 +21,13 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import React, { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
+import {
+	TooltipProvider,
+	TooltipTrigger,
+	TooltipContent,
+	Tooltip,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 import { z } from "zod";
 
 const addResourcesPostgres = z.object({
@@ -100,10 +107,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 								name="memoryReservation"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Memory Reservation</FormLabel>
+										<div className="flex items-center gap-2">
+											<FormLabel>Memory Reservation</FormLabel>
+											<TooltipProvider>
+												<Tooltip delayDuration={0}>
+													<TooltipTrigger>
+														<InfoIcon className="h-4 w-4 text-muted-foreground" />
+													</TooltipTrigger>
+													<TooltipContent>
+														<p>
+															Memory soft limit in bytes. Example: 256MB =
+															268435456 bytes
+														</p>
+													</TooltipContent>
+												</Tooltip>
+											</TooltipProvider>
+										</div>
 										<FormControl>
 											<Input
-												placeholder="256 MB"
+												placeholder="268435456 (256MB in bytes)"
 												{...field}
 												value={field.value?.toString() || ""}
 												onChange={(e) => {
@@ -119,7 +141,6 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 												}}
 											/>
 										</FormControl>
-
 										<FormMessage />
 									</FormItem>
 								)}
@@ -131,10 +152,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Memory Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>Memory Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																Memory hard limit in bytes. Example: 1GB =
+																1073741824 bytes
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1024 MB"}
+													placeholder="1073741824 (1GB in bytes)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
@@ -162,10 +198,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU quota in units of 10^-9 CPUs. Example: 2
+																CPUs = 2000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"2"}
+													placeholder="2000000000 (2 CPUs)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
@@ -192,10 +243,25 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Reservation</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Reservation</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU shares (relative weight). Example: 1 CPU =
+																1000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1"}
+													placeholder="1000000000 (1 CPU)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
diff --git a/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx b/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
index 1e719399..ed26d868 100644
--- a/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
+++ b/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
@@ -21,6 +21,13 @@ import { zodResolver } from "@hookform/resolvers/zod";
 import React, { useEffect } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
+import {
+	TooltipProvider,
+	TooltipTrigger,
+	TooltipContent,
+	Tooltip,
+} from "@/components/ui/tooltip";
+import { InfoIcon } from "lucide-react";
 import { z } from "zod";
 
 const addResourcesRedis = z.object({
@@ -100,28 +107,40 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 								name="memoryReservation"
 								render={({ field }) => (
 									<FormItem>
-										<FormLabel>Memory Reservation</FormLabel>
+										<div className="flex items-center gap-2">
+											<FormLabel>Memory Reservation</FormLabel>
+											<TooltipProvider>
+												<Tooltip delayDuration={0}>
+													<TooltipTrigger>
+														<InfoIcon className="h-4 w-4 text-muted-foreground" />
+													</TooltipTrigger>
+													<TooltipContent>
+														<p>
+															Memory soft limit in bytes. Example: 256MB =
+															268435456 bytes
+														</p>
+													</TooltipContent>
+												</Tooltip>
+											</TooltipProvider>
+										</div>
 										<FormControl>
 											<Input
-												placeholder="256 MB"
+												placeholder="268435456 (256MB in bytes)"
 												{...field}
 												value={field.value?.toString() || ""}
 												onChange={(e) => {
 													const value = e.target.value;
 													if (value === "") {
-														// Si el campo está vacío, establece el valor como null.
 														field.onChange(null);
 													} else {
 														const number = Number.parseInt(value, 10);
 														if (!Number.isNaN(number)) {
-															// Solo actualiza el valor si se convierte a un número válido.
 															field.onChange(number);
 														}
 													}
 												}}
 											/>
 										</FormControl>
-
 										<FormMessage />
 									</FormItem>
 								)}
@@ -133,21 +152,34 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Memory Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>Memory Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																Memory hard limit in bytes. Example: 1GB =
+																1073741824 bytes
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1024 MB"}
+													placeholder="1073741824 (1GB in bytes)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -166,21 +198,34 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Limit</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Limit</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU quota in units of 10^-9 CPUs. Example: 2
+																CPUs = 2000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"2"}
+													placeholder="2000000000 (2 CPUs)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}
@@ -198,21 +243,34 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 								render={({ field }) => {
 									return (
 										<FormItem>
-											<FormLabel>Cpu Reservation</FormLabel>
+											<div className="flex items-center gap-2">
+												<FormLabel>CPU Reservation</FormLabel>
+												<TooltipProvider>
+													<Tooltip delayDuration={0}>
+														<TooltipTrigger>
+															<InfoIcon className="h-4 w-4 text-muted-foreground" />
+														</TooltipTrigger>
+														<TooltipContent>
+															<p className="text-muted-foreground">
+																CPU shares (relative weight). Example: 1 CPU =
+																1000000000
+															</p>
+														</TooltipContent>
+													</Tooltip>
+												</TooltipProvider>
+											</div>
 											<FormControl>
 												<Input
-													placeholder={"1"}
+													placeholder="1000000000 (1 CPU)"
 													{...field}
 													value={field.value?.toString() || ""}
 													onChange={(e) => {
 														const value = e.target.value;
 														if (value === "") {
-															// Si el campo está vacío, establece el valor como null.
 															field.onChange(null);
 														} else {
 															const number = Number.parseInt(value, 10);
 															if (!Number.isNaN(number)) {
-																// Solo actualiza el valor si se convierte a un número válido.
 																field.onChange(number);
 															}
 														}

From 46a5adf793ac2e87cb25b81cc78152c32b181601 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 14:17:15 -0600
Subject: [PATCH 21/30] refactor: remove muted text

---
 .../advanced/show-application-advanced-settings.tsx         | 6 +++---
 .../dashboard/mariadb/advanced/show-mariadb-resources.tsx   | 6 +++---
 .../dashboard/mongo/advanced/show-mongo-resources.tsx       | 6 +++---
 .../dashboard/mysql/advanced/show-mysql-resources.tsx       | 6 +++---
 .../dashboard/postgres/advanced/show-postgres-resources.tsx | 6 +++---
 .../dashboard/redis/advanced/show-redis-resources.tsx       | 6 +++---
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
index 3d53a170..402e6e23 100644
--- a/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
+++ b/apps/dokploy/components/dashboard/application/advanced/show-application-advanced-settings.tsx
@@ -161,7 +161,7 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																Memory hard limit in bytes. Example: 1GB =
 																1073741824 bytes
 															</p>
@@ -207,7 +207,7 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
 																CPUs = 2000000000
 															</p>
@@ -252,7 +252,7 @@ export const ShowApplicationResources = ({ applicationId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU shares (relative weight). Example: 1 CPU =
 																1000000000
 															</p>
diff --git a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
index 383aaa40..7db0555e 100644
--- a/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
+++ b/apps/dokploy/components/dashboard/mariadb/advanced/show-mariadb-resources.tsx
@@ -160,7 +160,7 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																Memory hard limit in bytes. Example: 1GB =
 																1073741824 bytes
 															</p>
@@ -206,7 +206,7 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
 																CPUs = 2000000000
 															</p>
@@ -251,7 +251,7 @@ export const ShowMariadbResources = ({ mariadbId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU shares (relative weight). Example: 1 CPU =
 																1000000000
 															</p>
diff --git a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
index e42f5a53..1c497611 100644
--- a/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
+++ b/apps/dokploy/components/dashboard/mongo/advanced/show-mongo-resources.tsx
@@ -160,7 +160,7 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																Memory hard limit in bytes. Example: 1GB =
 																1073741824 bytes
 															</p>
@@ -206,7 +206,7 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
 																CPUs = 2000000000
 															</p>
@@ -251,7 +251,7 @@ export const ShowMongoResources = ({ mongoId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU shares (relative weight). Example: 1 CPU =
 																1000000000
 															</p>
diff --git a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
index e265139b..78a524dc 100644
--- a/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
+++ b/apps/dokploy/components/dashboard/mysql/advanced/show-mysql-resources.tsx
@@ -160,7 +160,7 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																Memory hard limit in bytes. Example: 1GB =
 																1073741824 bytes
 															</p>
@@ -206,7 +206,7 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
 																CPUs = 2000000000
 															</p>
@@ -251,7 +251,7 @@ export const ShowMysqlResources = ({ mysqlId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU shares (relative weight). Example: 1 CPU =
 																1000000000
 															</p>
diff --git a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
index d417edef..70d36cef 100644
--- a/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
+++ b/apps/dokploy/components/dashboard/postgres/advanced/show-postgres-resources.tsx
@@ -160,7 +160,7 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																Memory hard limit in bytes. Example: 1GB =
 																1073741824 bytes
 															</p>
@@ -206,7 +206,7 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
 																CPUs = 2000000000
 															</p>
@@ -251,7 +251,7 @@ export const ShowPostgresResources = ({ postgresId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU shares (relative weight). Example: 1 CPU =
 																1000000000
 															</p>
diff --git a/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx b/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
index ed26d868..9d3c7a14 100644
--- a/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
+++ b/apps/dokploy/components/dashboard/redis/advanced/show-redis-resources.tsx
@@ -160,7 +160,7 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																Memory hard limit in bytes. Example: 1GB =
 																1073741824 bytes
 															</p>
@@ -206,7 +206,7 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU quota in units of 10^-9 CPUs. Example: 2
 																CPUs = 2000000000
 															</p>
@@ -251,7 +251,7 @@ export const ShowRedisResources = ({ redisId }: Props) => {
 															<InfoIcon className="h-4 w-4 text-muted-foreground" />
 														</TooltipTrigger>
 														<TooltipContent>
-															<p className="text-muted-foreground">
+															<p>
 																CPU shares (relative weight). Example: 1 CPU =
 																1000000000
 															</p>

From d65d050494eac7c7107675302bc9c913a93790fb Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:35:15 -0600
Subject: [PATCH 22/30] fix: add try catch inside of cron jobs

---
 packages/server/src/utils/backups/index.ts | 232 +++++++++++++--------
 1 file changed, 141 insertions(+), 91 deletions(-)

diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts
index 6fec7a31..5f18b2e0 100644
--- a/packages/server/src/utils/backups/index.ts
+++ b/packages/server/src/utils/backups/index.ts
@@ -36,9 +36,12 @@ export const initCronJobs = async () => {
 	for (const server of servers) {
 		const { appName, serverId, enableDockerCleanup } = server;
 		if (enableDockerCleanup) {
+			console.log(
+				`Setting up server cleanup schedule for ${appName} with ID ${serverId}`,
+			);
 			scheduleJob(serverId, "0 0 * * *", async () => {
 				console.log(
-					`SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${appName}`,
+					`SERVER-CLEANUP[${new Date().toLocaleString()}] Running Cleanup ${appName}`,
 				);
 				await cleanUpUnusedImages(serverId);
 				await cleanUpDockerBuilder(serverId);
@@ -65,36 +68,46 @@ export const initCronJobs = async () => {
 			},
 		},
 	});
+
 	for (const pg of pgs) {
 		for (const backup of pg.backups) {
 			const { schedule, backupId, enabled } = backup;
 			if (enabled) {
-				try {
-					scheduleJob(backupId, schedule, async () => {
+				console.log(
+					`Setting up backup schedule for ${pg.name} with ID ${backupId} and schedule ${schedule}`,
+				);
+				scheduleJob(backupId, schedule, async () => {
+					console.log(
+						`PG-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${pg.name}`,
+					);
+					try {
+						await runPostgresBackup(pg, backup);
 						console.log(
-							`PG-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
+							`PG-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
 						);
-						runPostgresBackup(pg, backup);
-					});
-
-					await sendDatabaseBackupNotifications({
-						applicationName: pg.name,
-						projectName: pg.project.name,
-						databaseType: "postgres",
-						type: "success",
-						adminId: pg.project.adminId,
-					});
-				} catch (error) {
-					await sendDatabaseBackupNotifications({
-						applicationName: pg.name,
-						projectName: pg.project.name,
-						databaseType: "postgres",
-						type: "error",
-						// @ts-ignore
-						errorMessage: error?.message || "Error message not provided",
-						adminId: pg.project.adminId,
-					});
-				}
+						await sendDatabaseBackupNotifications({
+							applicationName: pg.name,
+							projectName: pg.project.name,
+							databaseType: "postgres",
+							type: "success",
+							adminId: pg.project.adminId,
+						});
+					} catch (error) {
+						console.error(
+							`PG-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
+							error,
+						);
+						await sendDatabaseBackupNotifications({
+							applicationName: pg.name,
+							projectName: pg.project.name,
+							databaseType: "postgres",
+							type: "error",
+							// @ts-ignore
+							errorMessage: error?.message || "Error message not provided",
+							adminId: pg.project.adminId,
+						});
+					}
+				});
 			}
 		}
 	}
@@ -119,29 +132,46 @@ export const initCronJobs = async () => {
 			const { schedule, backupId, enabled } = backup;
 			if (enabled) {
 				try {
+					console.log(
+						`Setting up backup schedule for ${maria.name} with ID ${backupId} and schedule ${schedule}`,
+					);
 					scheduleJob(backupId, schedule, async () => {
 						console.log(
-							`MARIADB-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
+							`MARIADB-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${maria.name}`,
 						);
-						await runMariadbBackup(maria, backup);
-					});
-					await sendDatabaseBackupNotifications({
-						applicationName: maria.name,
-						projectName: maria.project.name,
-						databaseType: "mariadb",
-						type: "success",
-						adminId: maria.project.adminId,
+						try {
+							await runMariadbBackup(maria, backup);
+							console.log(
+								`MARIADB-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
+							);
+							await sendDatabaseBackupNotifications({
+								applicationName: maria.name,
+								projectName: maria.project.name,
+								databaseType: "mariadb",
+								type: "success",
+								adminId: maria.project.adminId,
+							});
+						} catch (error) {
+							console.error(
+								`MARIADB-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
+								error,
+							);
+							await sendDatabaseBackupNotifications({
+								applicationName: maria.name,
+								projectName: maria.project.name,
+								databaseType: "mariadb",
+								type: "error",
+								// @ts-ignore
+								errorMessage: error?.message || "Error message not provided",
+								adminId: maria.project.adminId,
+							});
+						}
 					});
 				} catch (error) {
-					await sendDatabaseBackupNotifications({
-						applicationName: maria.name,
-						projectName: maria.project.name,
-						databaseType: "mariadb",
-						type: "error",
-						// @ts-ignore
-						errorMessage: error?.message || "Error message not provided",
-						adminId: maria.project.adminId,
-					});
+					console.error(
+						`Failed to schedule backup for ${maria.name} with ID ${backupId}:`,
+						error,
+					);
 				}
 			}
 		}
@@ -166,31 +196,41 @@ export const initCronJobs = async () => {
 		for (const backup of mongo.backups) {
 			const { schedule, backupId, enabled } = backup;
 			if (enabled) {
-				try {
-					scheduleJob(backupId, schedule, async () => {
-						console.log(
-							`MONGO-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
-						);
+				console.log(
+					`Setting up backup schedule for ${mongo.name} with ID ${backupId} and schedule ${schedule}`,
+				);
+				scheduleJob(backupId, schedule, async () => {
+					console.log(
+						`MONGO-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${mongo.name}`,
+					);
+					try {
 						await runMongoBackup(mongo, backup);
-					});
-					await sendDatabaseBackupNotifications({
-						applicationName: mongo.name,
-						projectName: mongo.project.name,
-						databaseType: "mongodb",
-						type: "success",
-						adminId: mongo.project.adminId,
-					});
-				} catch (error) {
-					await sendDatabaseBackupNotifications({
-						applicationName: mongo.name,
-						projectName: mongo.project.name,
-						databaseType: "mongodb",
-						type: "error",
-						// @ts-ignore
-						errorMessage: error?.message || "Error message not provided",
-						adminId: mongo.project.adminId,
-					});
-				}
+						console.log(
+							`MONGO-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
+						);
+						await sendDatabaseBackupNotifications({
+							applicationName: mongo.name,
+							projectName: mongo.project.name,
+							databaseType: "mongodb",
+							type: "success",
+							adminId: mongo.project.adminId,
+						});
+					} catch (error) {
+						console.error(
+							`MONGO-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
+							error,
+						);
+						await sendDatabaseBackupNotifications({
+							applicationName: mongo.name,
+							projectName: mongo.project.name,
+							databaseType: "mongodb",
+							type: "error",
+							// @ts-ignore
+							errorMessage: error?.message || "Error message not provided",
+							adminId: mongo.project.adminId,
+						});
+					}
+				});
 			}
 		}
 	}
@@ -214,31 +254,41 @@ export const initCronJobs = async () => {
 		for (const backup of mysql.backups) {
 			const { schedule, backupId, enabled } = backup;
 			if (enabled) {
-				try {
-					scheduleJob(backupId, schedule, async () => {
-						console.log(
-							`MYSQL-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
-						);
+				console.log(
+					`Setting up backup schedule for ${mysql.name} with ID ${backupId} and schedule ${schedule}`,
+				);
+				scheduleJob(backupId, schedule, async () => {
+					console.log(
+						`MYSQL-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${mysql.name}`,
+					);
+					try {
 						await runMySqlBackup(mysql, backup);
-					});
-					await sendDatabaseBackupNotifications({
-						applicationName: mysql.name,
-						projectName: mysql.project.name,
-						databaseType: "mysql",
-						type: "success",
-						adminId: mysql.project.adminId,
-					});
-				} catch (error) {
-					await sendDatabaseBackupNotifications({
-						applicationName: mysql.name,
-						projectName: mysql.project.name,
-						databaseType: "mysql",
-						type: "error",
-						// @ts-ignore
-						errorMessage: error?.message || "Error message not provided",
-						adminId: mysql.project.adminId,
-					});
-				}
+						console.log(
+							`MYSQL-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
+						);
+						await sendDatabaseBackupNotifications({
+							applicationName: mysql.name,
+							projectName: mysql.project.name,
+							databaseType: "mysql",
+							type: "success",
+							adminId: mysql.project.adminId,
+						});
+					} catch (error) {
+						console.error(
+							`MYSQL-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
+							error,
+						);
+						await sendDatabaseBackupNotifications({
+							applicationName: mysql.name,
+							projectName: mysql.project.name,
+							databaseType: "mysql",
+							type: "error",
+							// @ts-ignore
+							errorMessage: error?.message || "Error message not provided",
+							adminId: mysql.project.adminId,
+						});
+					}
+				});
 			}
 		}
 	}

From 84ad9a5bb3b1694bda7ec8fe46397b3e15706198 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:45:54 -0600
Subject: [PATCH 23/30] refactor: revert notifications

---
 packages/server/src/utils/backups/index.ts | 166 +++------------------
 1 file changed, 21 insertions(+), 145 deletions(-)

diff --git a/packages/server/src/utils/backups/index.ts b/packages/server/src/utils/backups/index.ts
index 5f18b2e0..922232a0 100644
--- a/packages/server/src/utils/backups/index.ts
+++ b/packages/server/src/utils/backups/index.ts
@@ -7,7 +7,6 @@ import {
 	cleanUpSystemPrune,
 	cleanUpUnusedImages,
 } from "../docker/utils";
-import { sendDatabaseBackupNotifications } from "../notifications/database-backup";
 import { sendDockerCleanupNotifications } from "../notifications/docker-cleanup";
 import { runMariadbBackup } from "./mariadb";
 import { runMongoBackup } from "./mongo";
@@ -34,21 +33,18 @@ export const initCronJobs = async () => {
 	const servers = await getAllServers();
 
 	for (const server of servers) {
-		const { appName, serverId, enableDockerCleanup } = server;
+		const { serverId, enableDockerCleanup, name } = server;
 		if (enableDockerCleanup) {
-			console.log(
-				`Setting up server cleanup schedule for ${appName} with ID ${serverId}`,
-			);
 			scheduleJob(serverId, "0 0 * * *", async () => {
 				console.log(
-					`SERVER-CLEANUP[${new Date().toLocaleString()}] Running Cleanup ${appName}`,
+					`SERVER-BACKUP[${new Date().toLocaleString()}] Running Cleanup ${name}`,
 				);
 				await cleanUpUnusedImages(serverId);
 				await cleanUpDockerBuilder(serverId);
 				await cleanUpSystemPrune(serverId);
 				await sendDockerCleanupNotifications(
 					admin.adminId,
-					`Docker cleanup for Server ${appName}`,
+					`Docker cleanup for Server ${name} (${serverId})`,
 				);
 			});
 		}
@@ -56,7 +52,6 @@ export const initCronJobs = async () => {
 
 	const pgs = await db.query.postgres.findMany({
 		with: {
-			project: true,
 			backups: {
 				with: {
 					destination: true,
@@ -68,45 +63,18 @@ export const initCronJobs = async () => {
 			},
 		},
 	});
-
 	for (const pg of pgs) {
 		for (const backup of pg.backups) {
-			const { schedule, backupId, enabled } = backup;
+			const { schedule, backupId, enabled, database } = backup;
 			if (enabled) {
 				console.log(
-					`Setting up backup schedule for ${pg.name} with ID ${backupId} and schedule ${schedule}`,
+					`[Backup] Postgres DB ${pg.name} for ${database} Activated`,
 				);
 				scheduleJob(backupId, schedule, async () => {
 					console.log(
-						`PG-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${pg.name}`,
+						`PG-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
 					);
-					try {
-						await runPostgresBackup(pg, backup);
-						console.log(
-							`PG-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
-						);
-						await sendDatabaseBackupNotifications({
-							applicationName: pg.name,
-							projectName: pg.project.name,
-							databaseType: "postgres",
-							type: "success",
-							adminId: pg.project.adminId,
-						});
-					} catch (error) {
-						console.error(
-							`PG-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
-							error,
-						);
-						await sendDatabaseBackupNotifications({
-							applicationName: pg.name,
-							projectName: pg.project.name,
-							databaseType: "postgres",
-							type: "error",
-							// @ts-ignore
-							errorMessage: error?.message || "Error message not provided",
-							adminId: pg.project.adminId,
-						});
-					}
+					runPostgresBackup(pg, backup);
 				});
 			}
 		}
@@ -114,7 +82,6 @@ export const initCronJobs = async () => {
 
 	const mariadbs = await db.query.mariadb.findMany({
 		with: {
-			project: true,
 			backups: {
 				with: {
 					destination: true,
@@ -129,57 +96,23 @@ export const initCronJobs = async () => {
 
 	for (const maria of mariadbs) {
 		for (const backup of maria.backups) {
-			const { schedule, backupId, enabled } = backup;
+			const { schedule, backupId, enabled, database } = backup;
 			if (enabled) {
-				try {
+				console.log(
+					`[Backup] MariaDB DB ${maria.name} for ${database} Activated`,
+				);
+				scheduleJob(backupId, schedule, async () => {
 					console.log(
-						`Setting up backup schedule for ${maria.name} with ID ${backupId} and schedule ${schedule}`,
+						`MARIADB-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
 					);
-					scheduleJob(backupId, schedule, async () => {
-						console.log(
-							`MARIADB-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${maria.name}`,
-						);
-						try {
-							await runMariadbBackup(maria, backup);
-							console.log(
-								`MARIADB-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
-							);
-							await sendDatabaseBackupNotifications({
-								applicationName: maria.name,
-								projectName: maria.project.name,
-								databaseType: "mariadb",
-								type: "success",
-								adminId: maria.project.adminId,
-							});
-						} catch (error) {
-							console.error(
-								`MARIADB-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
-								error,
-							);
-							await sendDatabaseBackupNotifications({
-								applicationName: maria.name,
-								projectName: maria.project.name,
-								databaseType: "mariadb",
-								type: "error",
-								// @ts-ignore
-								errorMessage: error?.message || "Error message not provided",
-								adminId: maria.project.adminId,
-							});
-						}
-					});
-				} catch (error) {
-					console.error(
-						`Failed to schedule backup for ${maria.name} with ID ${backupId}:`,
-						error,
-					);
-				}
+					await runMariadbBackup(maria, backup);
+				});
 			}
 		}
 	}
 
 	const mongodbs = await db.query.mongo.findMany({
 		with: {
-			project: true,
 			backups: {
 				with: {
 					destination: true,
@@ -196,40 +129,12 @@ export const initCronJobs = async () => {
 		for (const backup of mongo.backups) {
 			const { schedule, backupId, enabled } = backup;
 			if (enabled) {
-				console.log(
-					`Setting up backup schedule for ${mongo.name} with ID ${backupId} and schedule ${schedule}`,
-				);
+				console.log(`[Backup] MongoDB DB ${mongo.name} Activated`);
 				scheduleJob(backupId, schedule, async () => {
 					console.log(
-						`MONGO-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${mongo.name}`,
+						`MONGO-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
 					);
-					try {
-						await runMongoBackup(mongo, backup);
-						console.log(
-							`MONGO-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
-						);
-						await sendDatabaseBackupNotifications({
-							applicationName: mongo.name,
-							projectName: mongo.project.name,
-							databaseType: "mongodb",
-							type: "success",
-							adminId: mongo.project.adminId,
-						});
-					} catch (error) {
-						console.error(
-							`MONGO-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
-							error,
-						);
-						await sendDatabaseBackupNotifications({
-							applicationName: mongo.name,
-							projectName: mongo.project.name,
-							databaseType: "mongodb",
-							type: "error",
-							// @ts-ignore
-							errorMessage: error?.message || "Error message not provided",
-							adminId: mongo.project.adminId,
-						});
-					}
+					await runMongoBackup(mongo, backup);
 				});
 			}
 		}
@@ -237,7 +142,6 @@ export const initCronJobs = async () => {
 
 	const mysqls = await db.query.mysql.findMany({
 		with: {
-			project: true,
 			backups: {
 				with: {
 					destination: true,
@@ -254,40 +158,12 @@ export const initCronJobs = async () => {
 		for (const backup of mysql.backups) {
 			const { schedule, backupId, enabled } = backup;
 			if (enabled) {
-				console.log(
-					`Setting up backup schedule for ${mysql.name} with ID ${backupId} and schedule ${schedule}`,
-				);
+				console.log(`[Backup] MySQL DB ${mysql.name} Activated`);
 				scheduleJob(backupId, schedule, async () => {
 					console.log(
-						`MYSQL-SERVER[${new Date().toLocaleString()}] Starting Backup ${backupId} for database ${mysql.name}`,
+						`MYSQL-SERVER[${new Date().toLocaleString()}] Running Backup ${backupId}`,
 					);
-					try {
-						await runMySqlBackup(mysql, backup);
-						console.log(
-							`MYSQL-SERVER[${new Date().toLocaleString()}] Backup completed successfully for ${backupId}`,
-						);
-						await sendDatabaseBackupNotifications({
-							applicationName: mysql.name,
-							projectName: mysql.project.name,
-							databaseType: "mysql",
-							type: "success",
-							adminId: mysql.project.adminId,
-						});
-					} catch (error) {
-						console.error(
-							`MYSQL-SERVER[${new Date().toLocaleString()}] Backup failed for ${backupId}:`,
-							error,
-						);
-						await sendDatabaseBackupNotifications({
-							applicationName: mysql.name,
-							projectName: mysql.project.name,
-							databaseType: "mysql",
-							type: "error",
-							// @ts-ignore
-							errorMessage: error?.message || "Error message not provided",
-							adminId: mysql.project.adminId,
-						});
-					}
+					await runMySqlBackup(mysql, backup);
 				});
 			}
 		}

From 2c258c84eb729d845e483d523d4996903f91df7b Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 15:56:30 -0600
Subject: [PATCH 24/30] fix: add provider value in edit destination

---
 .../dashboard/settings/destination/update-destination.tsx       | 2 ++
 packages/server/src/db/schema/destination.ts                    | 1 +
 2 files changed, 3 insertions(+)

diff --git a/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx b/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
index 3ed26fef..71f87aad 100644
--- a/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
+++ b/apps/dokploy/components/dashboard/settings/destination/update-destination.tsx
@@ -92,6 +92,7 @@ export const UpdateDestination = ({ destinationId }: Props) => {
 				name: data.name,
 				region: data.region,
 				secretAccessKey: data.secretAccessKey,
+				provider: data.provider || "",
 			});
 		}
 	}, [form, form.reset, data]);
@@ -105,6 +106,7 @@ export const UpdateDestination = ({ destinationId }: Props) => {
 			region: data.region,
 			secretAccessKey: data.secretAccessKey,
 			destinationId,
+			provider: data.provider || "",
 		})
 			.then(async () => {
 				toast.success("Destination Updated");
diff --git a/packages/server/src/db/schema/destination.ts b/packages/server/src/db/schema/destination.ts
index 320a3d7c..7d7be614 100644
--- a/packages/server/src/db/schema/destination.ts
+++ b/packages/server/src/db/schema/destination.ts
@@ -82,6 +82,7 @@ export const apiUpdateDestination = createSchema
 		endpoint: true,
 		secretAccessKey: true,
 		destinationId: true,
+		provider: true,
 	})
 	.required()
 	.extend({

From ac8c180ba6efdfc50abd6b3a95b3f8637b341b25 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 16:13:06 -0600
Subject: [PATCH 25/30] refactor: add fallback ipv4

---
 packages/server/src/setup/server-setup.ts | 47 ++++++++++++++++++-----
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/packages/server/src/setup/server-setup.ts b/packages/server/src/setup/server-setup.ts
index 57aa7cc3..4fa46c33 100644
--- a/packages/server/src/setup/server-setup.ts
+++ b/packages/server/src/setup/server-setup.ts
@@ -270,20 +270,49 @@ export const setupSwarm = () => `
 		else
 			# Get IP address
 			get_ip() {
-				# Try to get IPv4
-				local ipv4=\$(curl -4s https://ifconfig.io 2>/dev/null)
+				local ip=""
+				
+				# Try IPv4 with multiple services
+				# First attempt: ifconfig.io
+				ip=\$(curl -4s --connect-timeout 5 https://ifconfig.io 2>/dev/null)
+				
+				# Second attempt: icanhazip.com
+				if [ -z "\$ip" ]; then
+					ip=\$(curl -4s --connect-timeout 5 https://icanhazip.com 2>/dev/null)
+				fi
+				
+				# Third attempt: ipecho.net
+				if [ -z "\$ip" ]; then
+					ip=\$(curl -4s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null)
+				fi
 
-				if [ -n "\$ipv4" ]; then
-					echo "\$ipv4"
-				else
-					# Try to get IPv6
-					local ipv6=\$(curl -6s https://ifconfig.io 2>/dev/null)
-					if [ -n "\$ipv6" ]; then
-						echo "\$ipv6"
+				# If no IPv4, try IPv6 with multiple services
+				if [ -z "\$ip" ]; then
+					# Try IPv6 with ifconfig.io
+					ip=\$(curl -6s --connect-timeout 5 https://ifconfig.io 2>/dev/null)
+					
+					# Try IPv6 with icanhazip.com
+					if [ -z "\$ip" ]; then
+						ip=\$(curl -6s --connect-timeout 5 https://icanhazip.com 2>/dev/null)
+					fi
+					
+					# Try IPv6 with ipecho.net
+					if [ -z "\$ip" ]; then
+						ip=\$(curl -6s --connect-timeout 5 https://ipecho.net/plain 2>/dev/null)
 					fi
 				fi
+
+				if [ -z "\$ip" ]; then
+					echo "Error: Could not determine server IP address automatically (neither IPv4 nor IPv6)." >&2
+					echo "Please set the ADVERTISE_ADDR environment variable manually." >&2
+					echo "Example: export ADVERTISE_ADDR=<your-server-ip>" >&2
+					exit 1
+				fi
+
+				echo "\$ip"
 			}
 			advertise_addr=\$(get_ip)
+			echo "Advertise address: \$advertise_addr"
 
 			# Initialize Docker Swarm
 			docker swarm init --advertise-addr \$advertise_addr

From 1d02d4308f404c8fd1867b441d7429bb3800225e Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 17:19:17 -0600
Subject: [PATCH 26/30] feat: add unifi template

---
 apps/dokploy/public/templates/unifi.webp      | Bin 0 -> 19004 bytes
 apps/dokploy/templates/templates.ts           |  15 ++++++
 .../templates/unifi/docker-compose.yml        |  48 ++++++++++++++++++
 apps/dokploy/templates/unifi/index.ts         |  27 ++++++++++
 4 files changed, 90 insertions(+)
 create mode 100644 apps/dokploy/public/templates/unifi.webp
 create mode 100644 apps/dokploy/templates/unifi/docker-compose.yml
 create mode 100644 apps/dokploy/templates/unifi/index.ts

diff --git a/apps/dokploy/public/templates/unifi.webp b/apps/dokploy/public/templates/unifi.webp
new file mode 100644
index 0000000000000000000000000000000000000000..ffe1f244084de7041d4db222e77687ada7254acf
GIT binary patch
literal 19004
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

literal 0
HcmV?d00001

diff --git a/apps/dokploy/templates/templates.ts b/apps/dokploy/templates/templates.ts
index 917184c5..48840a32 100644
--- a/apps/dokploy/templates/templates.ts
+++ b/apps/dokploy/templates/templates.ts
@@ -1151,4 +1151,19 @@ export const templates: TemplateData[] = [
 		tags: ["self-hosted", "development"],
 		load: () => import("./onedev/index").then((m) => m.generate),
 	},
+	{
+		id: "unifi",
+		name: "Unifi Network",
+		version: "11.6.6",
+		description:
+			"Unifi Network is an open-source enterprise network management platform for wireless networks.",
+		logo: "unifi.webp",
+		links: {
+			github: "https://github.com/ubiquiti",
+			website: "https://www.ui.com/",
+			docs: "https://help.ui.com/hc/en-us/articles/360012282453-Self-Hosting-a-UniFi-Network-Server",
+		},
+		tags: ["self-hosted", "networking"],
+		load: () => import("./unifi/index").then((m) => m.generate),
+	},
 ];
diff --git a/apps/dokploy/templates/unifi/docker-compose.yml b/apps/dokploy/templates/unifi/docker-compose.yml
new file mode 100644
index 00000000..ee531f67
--- /dev/null
+++ b/apps/dokploy/templates/unifi/docker-compose.yml
@@ -0,0 +1,48 @@
+services:
+  unifi-network-application:
+    image: lscr.io/linuxserver/unifi-network-application:latest
+    environment:
+      - PUID=1000 # User ID
+      - PGID=1000 # Group ID
+      - TZ=Etc/UTC # Timezone
+      - MONGO_HOST=unifi-db
+      - MONGO_USER=unifi
+      - MONGO_PASS=unifi_password
+      - MONGO_PORT=27017
+      - MONGO_DBNAME=unifi
+      - MEM_LIMIT=1024
+      - MEM_STARTUP=1024
+      - MONGO_TLS= #optional  # MongoDB TLS setting
+      - MONGO_AUTHSOURCE= #optional  # MongoDB authentication source
+    volumes: # Volumes to mount in the container
+      - ../files/config:/config # Map host directory to container directory
+    ports:
+      - 8443:8443 # HTTPS portal
+      # - 3478:3478/udp # STUN service
+      # - 10001:10001/udp # UniFi AP discovery
+      # - 8080:8080 # HTTP portal
+      # - 1900:1900/udp #optional  # For DLNA
+      # - 8843:8843 #optional  # HTTPS guest portal
+      # - 8880:8880 #optional  # HTTP guest portal
+      # - 6789:6789 #optional  # Mobile speed test port
+      # - 5514:5514/udp #optional  # Remote syslog port
+    restart: unless-stopped
+    depends_on:
+      - unifi-db
+    networks:
+      - dokploy-network
+
+  unifi-db:
+    image: mongo:4.4
+    volumes:
+      - ../files/db/data:/data/db
+      - ../files/init-mongo.sh:/docker-entrypoint-initdb.d/init-mongo.sh:ro
+    ports:
+      - 27017
+    restart: unless-stopped
+    networks:
+      - dokploy-network
+
+networks:
+  dokploy-network:
+    external: true
diff --git a/apps/dokploy/templates/unifi/index.ts b/apps/dokploy/templates/unifi/index.ts
new file mode 100644
index 00000000..975ce63d
--- /dev/null
+++ b/apps/dokploy/templates/unifi/index.ts
@@ -0,0 +1,27 @@
+import type { Schema, Template } from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mounts: Template["mounts"] = [
+		{
+			filePath: "init-mongo.sh",
+			content: `
+			#!/bin/bash
+			mongo <<EOF
+			use unifi
+			db.createUser({
+			user: "unifi",
+			pwd: "unifi_password",
+			roles: [
+				{ db: "unifi", role: "dbOwner" },
+				{ db: "unifi_stat", role: "dbOwner" }
+			]
+			})
+			EOF
+`,
+		},
+	];
+
+	return {
+		mounts,
+	};
+}

From efd3ad410228278a428496971784d0c75feb802f Mon Sep 17 00:00:00 2001
From: 190km <botmiley@gmail.com>
Date: Mon, 30 Dec 2024 00:30:57 +0100
Subject: [PATCH 27/30] fix: missing norwegian lang in select

---
 apps/dokploy/lib/languages.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/dokploy/lib/languages.ts b/apps/dokploy/lib/languages.ts
index 4074e531..2530fe81 100644
--- a/apps/dokploy/lib/languages.ts
+++ b/apps/dokploy/lib/languages.ts
@@ -14,6 +14,7 @@ export const Languages = {
 	italian: { code: "it", name: "Italiano" },
 	japanese: { code: "ja", name: "日本語" },
 	spanish: { code: "es", name: "Español" },
+	norwegian: { code: "no", name: "Norsk" }, 
 };
 
 export type Language = keyof typeof Languages;

From 0f1b911236cd8d6a4222fdb7640b6a963471d7cf Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:08:20 -0600
Subject: [PATCH 28/30] chore: bump version

---
 apps/dokploy/package.json           | 2 +-
 apps/dokploy/server/wss/terminal.ts | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
index fb7f012d..f7ec4566 100644
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "dokploy",
-	"version": "v0.16.0",
+	"version": "v0.16.1",
 	"private": true,
 	"license": "Apache-2.0",
 	"type": "module",
diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts
index 7ca7d13d..7b08893c 100644
--- a/apps/dokploy/server/wss/terminal.ts
+++ b/apps/dokploy/server/wss/terminal.ts
@@ -12,7 +12,7 @@ export const getPublicIpWithFallback = async () => {
 		ip = await publicIpv4();
 	} catch (error) {
 		console.log(
-			"Error obtaining public IPv4 address, falling back to IPv6",
+			"Error to obtain public IPv4 address, falling back to IPv6",
 			// @ts-ignore
 			error.message,
 		);
@@ -20,7 +20,7 @@ export const getPublicIpWithFallback = async () => {
 			ip = await publicIpv6();
 		} catch (error) {
 			// @ts-ignore
-			console.error("Error obtaining public IPv6 address", error.message);
+			console.error("Error to obtain public IPv6 address", error.message);
 			ip = null;
 		}
 	}
@@ -84,7 +84,6 @@ export const setupTerminalWebSocketServer = (
 				privateKey,
 			};
 		} else {
-			ws.send("Getting server data...\n");
 			const server = await findServerById(serverId);
 
 			if (!server) {
@@ -162,7 +161,7 @@ export const setupTerminalWebSocketServer = (
 						`Authentication failed: Unauthorized ${isLocalServer ? "" : "private SSH key or "}username.\n❌  Error: ${err.message} ${err.level}`,
 					);
 				} else {
-					ws.send(`SSH connection error: ${err.message}`);
+					ws.send(`SSH connection error: ${err.message} ❌ `);
 				}
 				conn.end();
 			})

From 75e0d0ba78fb187fbae99ac737e2c57f30a89d42 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:14:32 -0600
Subject: [PATCH 29/30] refactor: add is cloud validation

---
 apps/dokploy/server/wss/terminal.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/dokploy/server/wss/terminal.ts b/apps/dokploy/server/wss/terminal.ts
index 7b08893c..8c661c8a 100644
--- a/apps/dokploy/server/wss/terminal.ts
+++ b/apps/dokploy/server/wss/terminal.ts
@@ -1,5 +1,9 @@
 import type http from "node:http";
-import { findServerById, validateWebSocketRequest } from "@dokploy/server";
+import {
+	findServerById,
+	IS_CLOUD,
+	validateWebSocketRequest,
+} from "@dokploy/server";
 import { publicIpv4, publicIpv6 } from "public-ip";
 import { Client, type ConnectConfig } from "ssh2";
 import { WebSocketServer } from "ws";
@@ -60,7 +64,7 @@ export const setupTerminalWebSocketServer = (
 
 		const isLocalServer = serverId === "local";
 
-		if (isLocalServer) {
+		if (isLocalServer && !IS_CLOUD) {
 			const port = Number(url.searchParams.get("port"));
 			const username = url.searchParams.get("username");
 

From 638fbe17a6ca85e968e8329876fe5147272c29e7 Mon Sep 17 00:00:00 2001
From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com>
Date: Sun, 29 Dec 2024 18:23:07 -0600
Subject: [PATCH 30/30] refactor: update paths

---
 apps/dokploy/server/wss/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dokploy/server/wss/utils.ts b/apps/dokploy/server/wss/utils.ts
index 4971bac2..9c78869d 100644
--- a/apps/dokploy/server/wss/utils.ts
+++ b/apps/dokploy/server/wss/utils.ts
@@ -1,4 +1,4 @@
-import { execAsync } from "@dokploy/server/utils/process/execAsync";
+import { execAsync } from "@dokploy/server";
 import os from "node:os";
 import path from "node:path";
 import fs from "node:fs";