Merge branch 'canary' into template-erpnext

2025-06-26 18:27:59 +00:00 · 2025-01-26 15:20:30 -06:00
parent 829e77a6b8 8a971072e4
commit 4105353109
22 changed files with 520 additions and 104 deletions
--- a/apps/dokploy/components/dashboard/project/add-template.tsx
+++ b/apps/dokploy/components/dashboard/project/add-template.tsx
@@ -308,7 +308,7 @@ export const AddTemplate = ({ projectId }: Props) => {
 										{/* Create Button */}
 										<div
 											className={cn(
-												"flex-none px-6 pb-6 pt-3 mt-auto",
+												"flex-none px-6 py-3 mt-auto",
 												viewMode === "detailed"
 													? "flex items-center justify-between bg-muted/30 border-t"
 													: "flex justify-center",
--- a/apps/dokploy/components/dashboard/projects/show.tsx
+++ b/apps/dokploy/components/dashboard/projects/show.tsx
@@ -23,8 +23,10 @@ import {
 import {
 	DropdownMenu,
 	DropdownMenuContent,
+	DropdownMenuGroup,
 	DropdownMenuItem,
 	DropdownMenuLabel,
+	DropdownMenuSeparator,
 	DropdownMenuTrigger,
 } from "@/components/ui/dropdown-menu";
 import { Input } from "@/components/ui/input";
@@ -149,14 +151,91 @@ export const ShowProjects = () => {
 														href={`/dashboard/project/${project.projectId}`}
 													>
 														<Card className="group relative w-full h-full bg-transparent transition-colors hover:bg-border">
-															<Button
-																className="absolute -right-3 -top-3 size-9 translate-y-1 rounded-full p-0 opacity-0 transition-all duration-200 group-hover:translate-y-0 group-hover:opacity-100"
-																size="sm"
-																variant="default"
-															>
-																<ExternalLinkIcon className="size-3.5" />
-															</Button>
-
+															{project.applications.length > 0 ||
+															project.compose.length > 0 ? (
+																<DropdownMenu>
+																	<DropdownMenuTrigger asChild>
+																		<Button
+																			className="absolute -right-3 -top-3 size-9 translate-y-1 rounded-full p-0 opacity-0 transition-all duration-200 group-hover:translate-y-0 group-hover:opacity-100"
+																			size="sm"
+																			variant="default"
+																		>
+																			<ExternalLinkIcon className="size-3.5" />
+																		</Button>
+																	</DropdownMenuTrigger>
+																	<DropdownMenuContent
+																		className="w-[200px] space-y-2 overflow-y-auto max-h-[400px]"
+																		onClick={(e) => e.stopPropagation()}
+																	>
+																		{project.applications.length > 0 && (
+																			<DropdownMenuGroup>
+																				<DropdownMenuLabel>
+																					Applications
+																				</DropdownMenuLabel>
+																				{project.applications.map((app) => (
+																					<div key={app.applicationId}>
+																						<DropdownMenuSeparator />
+																						<DropdownMenuGroup>
+																							<DropdownMenuLabel className="font-normal capitalize text-xs">
+																								{app.name}
+																							</DropdownMenuLabel>
+																							<DropdownMenuSeparator />
+																							{app.domains.map((domain) => (
+																								<DropdownMenuItem
+																									key={domain.domainId}
+																									asChild
+																								>
+																									<Link
+																										className="space-x-4 text-xs cursor-pointer justify-between"
+																										target="_blank"
+																										href={`${domain.https ? "https" : "http"}://${domain.host}${domain.path}`}
+																									>
+																										<span>{domain.host}</span>
+																										<ExternalLinkIcon className="size-4 shrink-0" />
+																									</Link>
+																								</DropdownMenuItem>
+																							))}
+																						</DropdownMenuGroup>
+																					</div>
+																				))}
+																			</DropdownMenuGroup>
+																		)}
+																		{project.compose.length > 0 && (
+																			<DropdownMenuGroup>
+																				<DropdownMenuLabel>
+																					Compose
+																				</DropdownMenuLabel>
+																				{project.compose.map((comp) => (
+																					<div key={comp.composeId}>
+																						<DropdownMenuSeparator />
+																						<DropdownMenuGroup>
+																							<DropdownMenuLabel className="font-normal capitalize text-xs">
+																								{comp.name}
+																							</DropdownMenuLabel>
+																							<DropdownMenuSeparator />
+																							{comp.domains.map((domain) => (
+																								<DropdownMenuItem
+																									key={domain.domainId}
+																									asChild
+																								>
+																									<Link
+																										className="space-x-4 text-xs cursor-pointer justify-between"
+																										target="_blank"
+																										href={`${domain.https ? "https" : "http"}://${domain.host}${domain.path}`}
+																									>
+																										<span>{domain.host}</span>
+																										<ExternalLinkIcon className="size-4 shrink-0" />
+																									</Link>
+																								</DropdownMenuItem>
+																							))}
+																						</DropdownMenuGroup>
+																					</div>
+																				))}
+																			</DropdownMenuGroup>
+																		)}
+																	</DropdownMenuContent>
+																</DropdownMenu>
+															) : null}
 															<CardHeader>
 																<CardTitle className="flex items-center justify-between gap-2">
 																	<span className="flex flex-col gap-1.5">
@@ -182,7 +261,10 @@ export const ShowProjects = () => {
 																					<MoreHorizontalIcon className="size-5" />
 																				</Button>
 																			</DropdownMenuTrigger>
-																			<DropdownMenuContent className="w-[200px] space-y-2">
+																			<DropdownMenuContent
+																				className="w-[200px] space-y-2 overflow-y-auto max-h-[280px]"
+																				onClick={(e) => e.stopPropagation()}
+																			>
 																				<DropdownMenuLabel className="font-normal">
 																					Actions
 																				</DropdownMenuLabel>
--- a/apps/dokploy/components/dashboard/settings/ssh-keys/handle-ssh-keys.tsx
+++ b/apps/dokploy/components/dashboard/settings/ssh-keys/handle-ssh-keys.tsx
@@ -22,7 +22,7 @@ import { Textarea } from "@/components/ui/textarea";
 import { sshKeyCreate, type sshKeyType } from "@/server/db/validations";
 import { api } from "@/utils/api";
 import { zodResolver } from "@hookform/resolvers/zod";
-import { PenBoxIcon, PlusIcon } from "lucide-react";
+import { DownloadIcon, PenBoxIcon, PlusIcon } from "lucide-react";
 import { useEffect, useState } from "react";
 import { useForm } from "react-hook-form";
 import { toast } from "sonner";
@@ -111,6 +111,26 @@ export const HandleSSHKeys = ({ sshKeyId }: Props) => {
 				toast.error("Error generating the SSH Key");
 			});

+	const downloadKey = (
+		content: string,
+		defaultFilename: string,
+		keyType: "private" | "public",
+	) => {
+		const keyName = form.watch("name");
+		const filename = keyName
+			? `${keyName}${sshKeyId ? `_${sshKeyId}` : ""}_${keyType}_${defaultFilename}`
+			: `${keyType}_${defaultFilename}`;
+		const blob = new Blob([content], { type: "text/plain" });
+		const url = window.URL.createObjectURL(blob);
+		const a = document.createElement("a");
+		a.href = url;
+		a.download = filename;
+		document.body.appendChild(a);
+		a.click();
+		document.body.removeChild(a);
+		window.URL.revokeObjectURL(url);
+	};
+
 	return (
 		<Dialog open={isOpen} onOpenChange={setIsOpen}>
 			<DialogTrigger className="" asChild>
@@ -245,7 +265,41 @@ export const HandleSSHKeys = ({ sshKeyId }: Props) => {
 								</FormItem>
 							)}
 						/>
-						<DialogFooter>
+						<DialogFooter className="flex items-center justify-between">
+							<div className="flex items-center gap-4">
+								{form.watch("privateKey") && (
+									<Button
+										type="button"
+										variant="outline"
+										size="default"
+										onClick={() =>
+											downloadKey(form.watch("privateKey"), "id_rsa", "private")
+										}
+										className="flex items-center gap-2"
+									>
+										<DownloadIcon className="h-4 w-4" />
+										Private Key
+									</Button>
+								)}
+								{form.watch("publicKey") && (
+									<Button
+										type="button"
+										variant="outline"
+										size="default"
+										onClick={() =>
+											downloadKey(
+												form.watch("publicKey"),
+												"id_rsa.pub",
+												"public",
+											)
+										}
+										className="flex items-center gap-2"
+									>
+										<DownloadIcon className="h-4 w-4" />
+										Public Key
+									</Button>
+								)}
+							</div>
 							<Button isLoading={isLoading} type="submit">
 								{sshKeyId ? "Update" : "Create"}
 							</Button>
--- a/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
+++ b/apps/dokploy/components/dashboard/settings/web-server/terminal.tsx
@@ -4,6 +4,7 @@ import { useEffect, useRef } from "react";
 import { FitAddon } from "xterm-addon-fit";
 import "@xterm/xterm/css/xterm.css";
 import { AttachAddon } from "@xterm/addon-attach";
+import { ClipboardAddon } from "@xterm/addon-clipboard";
 import { useTheme } from "next-themes";
 import { getLocalServerData } from "./local-server-config";

@@ -37,6 +38,7 @@ export const Terminal: React.FC<Props> = ({ id, serverId }) => {
 				foreground: "currentColor",
 			},
 		});
+
 		const addonFit = new FitAddon();

 		const protocol = window.location.protocol === "https:" ? "wss:" : "ws:";
@@ -54,6 +56,8 @@ export const Terminal: React.FC<Props> = ({ id, serverId }) => {

 		const ws = new WebSocket(wsUrl);
 		const addonAttach = new AttachAddon(ws);
+		const clipboardAddon = new ClipboardAddon();
+		term.loadAddon(clipboardAddon);

 		// @ts-ignore
 		term.open(termRef.current);
@@ -68,7 +72,7 @@ export const Terminal: React.FC<Props> = ({ id, serverId }) => {

 	return (
 		<div className="flex flex-col gap-4">
-			<div className="w-full h-full bg-transparent border rounded-lg p-2 ">
+			<div className="w-full h-full bg-transparent border rounded-lg p-2">
 				<div id={id} ref={termRef} className="rounded-xl" />
 			</div>
 		</div>
--- a/apps/dokploy/components/layouts/side.tsx
+++ b/apps/dokploy/components/layouts/side.tsx
@@ -783,7 +783,7 @@ export default function Page({ children }: Props) {
 									</SidebarMenuButton>
 								</SidebarMenuItem>
 							))}
-							{!isCloud && (
+							{!isCloud && auth?.rol === "admin" && (
 								<SidebarMenuItem>
 									<SidebarMenuButton asChild>
 										<UpdateServerButton />
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -75,6 +75,7 @@
 		"@uiw/react-codemirror": "^4.22.1",
 		"@xterm/addon-attach": "0.10.0",
 		"@xterm/xterm": "^5.4.0",
+		"@xterm/addon-clipboard": "0.1.0",
 		"adm-zip": "^0.5.14",
 		"bcrypt": "5.1.1",
 		"bullmq": "5.4.2",
--- a/apps/dokploy/pages/api/deploy/github.ts
+++ b/apps/dokploy/pages/api/deploy/github.ts
@@ -182,8 +182,9 @@ export default async function handler(
 		}
 	} else if (req.headers["x-github-event"] === "pull_request") {
 		const prId = githubBody?.pull_request?.id;
+		const action = githubBody?.action;

-		if (githubBody?.action === "closed") {
+		if (action === "closed") {
 			const previewDeploymentResult =
 				await findPreviewDeploymentsByPullRequestId(prId);

@@ -201,79 +202,86 @@ export default async function handler(
 			res.status(200).json({ message: "Preview Deployment Closed" });
 			return;
 		}
+
 		// opened or synchronize or reopened
-		const repository = githubBody?.repository?.name;
-		const deploymentHash = githubBody?.pull_request?.head?.sha;
-		const branch = githubBody?.pull_request?.base?.ref;
-		const owner = githubBody?.repository?.owner?.login;
+		if (
+			action === "opened" ||
+			action === "synchronize" ||
+			action === "reopened"
+		) {
+			const repository = githubBody?.repository?.name;
+			const deploymentHash = githubBody?.pull_request?.head?.sha;
+			const branch = githubBody?.pull_request?.base?.ref;
+			const owner = githubBody?.repository?.owner?.login;

-		const apps = await db.query.applications.findMany({
-			where: and(
-				eq(applications.sourceType, "github"),
-				eq(applications.repository, repository),
-				eq(applications.branch, branch),
-				eq(applications.isPreviewDeploymentsActive, true),
-				eq(applications.owner, owner),
-			),
-			with: {
-				previewDeployments: true,
-			},
-		});
-
-		const prBranch = githubBody?.pull_request?.head?.ref;
-
-		const prNumber = githubBody?.pull_request?.number;
-		const prTitle = githubBody?.pull_request?.title;
-		const prURL = githubBody?.pull_request?.html_url;
-
-		for (const app of apps) {
-			const previewLimit = app?.previewLimit || 0;
-			if (app?.previewDeployments?.length > previewLimit) {
-				continue;
-			}
-			const previewDeploymentResult =
-				await findPreviewDeploymentByApplicationId(app.applicationId, prId);
-
-			let previewDeploymentId =
-				previewDeploymentResult?.previewDeploymentId || "";
-
-			if (!previewDeploymentResult) {
-				const previewDeployment = await createPreviewDeployment({
-					applicationId: app.applicationId as string,
-					branch: prBranch,
-					pullRequestId: prId,
-					pullRequestNumber: prNumber,
-					pullRequestTitle: prTitle,
-					pullRequestURL: prURL,
-				});
-				previewDeploymentId = previewDeployment.previewDeploymentId;
-			}
-
-			const jobData: DeploymentJob = {
-				applicationId: app.applicationId as string,
-				titleLog: "Preview Deployment",
-				descriptionLog: `Hash: ${deploymentHash}`,
-				type: "deploy",
-				applicationType: "application-preview",
-				server: !!app.serverId,
-				previewDeploymentId,
-			};
-
-			if (IS_CLOUD && app.serverId) {
-				jobData.serverId = app.serverId;
-				await deploy(jobData);
-				return true;
-			}
-			await myQueue.add(
-				"deployments",
-				{ ...jobData },
-				{
-					removeOnComplete: true,
-					removeOnFail: true,
+			const apps = await db.query.applications.findMany({
+				where: and(
+					eq(applications.sourceType, "github"),
+					eq(applications.repository, repository),
+					eq(applications.branch, branch),
+					eq(applications.isPreviewDeploymentsActive, true),
+					eq(applications.owner, owner),
+				),
+				with: {
+					previewDeployments: true,
 				},
-			);
+			});
+
+			const prBranch = githubBody?.pull_request?.head?.ref;
+
+			const prNumber = githubBody?.pull_request?.number;
+			const prTitle = githubBody?.pull_request?.title;
+			const prURL = githubBody?.pull_request?.html_url;
+
+			for (const app of apps) {
+				const previewLimit = app?.previewLimit || 0;
+				if (app?.previewDeployments?.length > previewLimit) {
+					continue;
+				}
+				const previewDeploymentResult =
+					await findPreviewDeploymentByApplicationId(app.applicationId, prId);
+
+				let previewDeploymentId =
+					previewDeploymentResult?.previewDeploymentId || "";
+
+				if (!previewDeploymentResult) {
+					const previewDeployment = await createPreviewDeployment({
+						applicationId: app.applicationId as string,
+						branch: prBranch,
+						pullRequestId: prId,
+						pullRequestNumber: prNumber,
+						pullRequestTitle: prTitle,
+						pullRequestURL: prURL,
+					});
+					previewDeploymentId = previewDeployment.previewDeploymentId;
+				}
+
+				const jobData: DeploymentJob = {
+					applicationId: app.applicationId as string,
+					titleLog: "Preview Deployment",
+					descriptionLog: `Hash: ${deploymentHash}`,
+					type: "deploy",
+					applicationType: "application-preview",
+					server: !!app.serverId,
+					previewDeploymentId,
+				};
+
+				if (IS_CLOUD && app.serverId) {
+					jobData.serverId = app.serverId;
+					await deploy(jobData);
+					continue;
+				}
+				await myQueue.add(
+					"deployments",
+					{ ...jobData },
+					{
+						removeOnComplete: true,
+						removeOnFail: true,
+					},
+				);
+			}
+			return res.status(200).json({ message: "Apps Deployed" });
 		}
-		return res.status(200).json({ message: "Apps Deployed" });
 	}

 	return res.status(400).json({ message: "No Actions matched" });
--- a/apps/dokploy/public/locales/ru/settings.json
+++ b/apps/dokploy/public/locales/ru/settings.json
@@ -1,5 +1,6 @@
 {
 	"settings.common.save": "Сохранить",
+	"settings.common.enterTerminal": "Открыть терминал",
 	"settings.server.domain.title": "Домен сервера",
 	"settings.server.domain.description": "Установите домен для вашего серверного приложения Dokploy.",
 	"settings.server.domain.form.domain": "Домен",
@@ -7,18 +8,26 @@
 	"settings.server.domain.form.certificate.label": "Сертификат",
 	"settings.server.domain.form.certificate.placeholder": "Выберите сертификат",
 	"settings.server.domain.form.certificateOptions.none": "Нет",
-	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt (По умолчанию)",
+	"settings.server.domain.form.certificateOptions.letsencrypt": "Let's Encrypt",

 	"settings.server.webServer.title": "Веб-сервер",
 	"settings.server.webServer.description": "Перезагрузка или очистка веб-сервера.",
-	"settings.server.webServer.server.label": "Сервер",
-	"settings.server.webServer.traefik.label": "Traefik",
-	"settings.server.webServer.storage.label": "Дисковое пространство",
 	"settings.server.webServer.actions": "Действия",
 	"settings.server.webServer.reload": "Перезагрузить",
 	"settings.server.webServer.watchLogs": "Просмотр логов",
 	"settings.server.webServer.updateServerIp": "Изменить IP адрес",
+	"settings.server.webServer.server.label": "Сервер",
+	"settings.server.webServer.traefik.label": "Traefik",
 	"settings.server.webServer.traefik.modifyEnv": "Изменить переменные окружения",
+	"settings.server.webServer.traefik.managePorts": "Назначение портов",
+	"settings.server.webServer.traefik.managePortsDescription": "Добавить или удалить дополнительные порты для Traefik",
+	"settings.server.webServer.traefik.targetPort": "Внутренний порт",
+	"settings.server.webServer.traefik.publishedPort": "Внешний порт",
+	"settings.server.webServer.traefik.addPort": "Добавить порт",
+	"settings.server.webServer.traefik.portsUpdated": "Порты успешно обновлены",
+	"settings.server.webServer.traefik.portsUpdateError": "Не удалось обновить порты",
+	"settings.server.webServer.traefik.publishMode": "Режим сопоставления",
+	"settings.server.webServer.storage.label": "Дисковое пространство",
 	"settings.server.webServer.storage.cleanUnusedImages": "Очистить неиспользуемые образы",
 	"settings.server.webServer.storage.cleanUnusedVolumes": "Очистить неиспользуемые тома",
 	"settings.server.webServer.storage.cleanStoppedContainers": "Очистить остановленные контейнеры",
@@ -40,5 +49,10 @@
 	"settings.appearance.themes.dark": "Темная",
 	"settings.appearance.themes.system": "Системная",
 	"settings.appearance.language": "Язык",
-	"settings.appearance.languageDescription": "Select a language for your dashboard"
+	"settings.appearance.languageDescription": "Выберите язык для панели управления",
+
+	"settings.terminal.connectionSettings": "Настройки подключения",
+	"settings.terminal.ipAddress": "IP адрес",
+	"settings.terminal.port": "Порт",
+	"settings.terminal.username": "Имя пользователя"
 }
--- a/apps/dokploy/public/templates/alist.svg
+++ b/apps/dokploy/public/templates/alist.svg
@@ -0,0 +1,10 @@
+<svg width="1252" height="1252" xmlns="http://www.w3.org/2000/svg" version="1.1">
+ <g>
+  <g id="#70c6beff">
+   <path id="svg_2" d="m634.37,138.38c11.88,-1.36 24.25,1.3 34.18,8.09c14.96,9.66 25.55,24.41 34.49,39.51c40.59,68.03 81.45,135.91 122.02,203.96c54.02,90.99 108.06,181.97 161.94,273.06c37.28,63 74.65,125.96 112.18,188.82c24.72,41.99 50.21,83.54 73.84,126.16c10.18,17.84 15.77,38.44 14.93,59.03c-0.59,15.92 -3.48,32.28 -11.84,46.08c-11.73,19.46 -31.39,33.2 -52.71,40.36c-11.37,4.09 -23.3,6.87 -35.43,6.89c-132.32,-0.05 -264.64,0.04 -396.95,0.03c-11.38,-0.29 -22.95,-1.6 -33.63,-5.72c-7.81,-3.33 -15.5,-7.43 -21.61,-13.42c-10.43,-10.32 -17.19,-24.96 -15.38,-39.83c0.94,-10.39 3.48,-20.64 7.76,-30.16c4.15,-9.77 9.99,-18.67 15.06,-27.97c22.13,-39.47 45.31,-78.35 69.42,-116.65c7.72,-12.05 14.44,-25.07 25.12,-34.87c11.35,-10.39 25.6,-18.54 41.21,-19.6c12.55,-0.52 24.89,3.82 35.35,10.55c11.8,6.92 21.09,18.44 24.2,31.88c4.49,17.01 -0.34,34.88 -7.55,50.42c-8.09,17.65 -19.62,33.67 -25.81,52.18c-1.13,4.21 -2.66,9.52 0.48,13.23c3.19,3 7.62,4.18 11.77,5.22c12,2.67 24.38,1.98 36.59,2.06c45,-0.01 90,0 135,0c8.91,-0.15 17.83,0.3 26.74,-0.22c6.43,-0.74 13.44,-1.79 18.44,-6.28c3.3,-2.92 3.71,-7.85 2.46,-11.85c-2.74,-8.86 -7.46,-16.93 -12.12,-24.89c-119.99,-204.91 -239.31,-410.22 -360.56,-614.4c-3.96,-6.56 -7.36,-13.68 -13.03,-18.98c-2.8,-2.69 -6.95,-4.22 -10.77,-3.11c-3.25,1.17 -5.45,4.03 -7.61,6.57c-5.34,6.81 -10.12,14.06 -14.51,21.52c-20.89,33.95 -40.88,68.44 -61.35,102.64c-117.9,198.43 -235.82,396.85 -353.71,595.29c-7.31,13.46 -15.09,26.67 -23.57,39.43c-7.45,10.96 -16.49,21.23 -28.14,27.83c-13.73,7.94 -30.69,11.09 -46.08,6.54c-11.23,-3.47 -22.09,-9.12 -30.13,-17.84c-10.18,-10.08 -14.69,-24.83 -14.17,-38.94c0.52,-14.86 5.49,-29.34 12.98,-42.1c71.58,-121.59 143.62,-242.92 215.93,-364.09c37.2,-62.8 74.23,-125.69 111.64,-188.36c37.84,-63.5 75.77,-126.94 113.44,-190.54c21.02,-35.82 42.19,-71.56 64.28,-106.74c6.79,-11.15 15.58,-21.15 26.16,-28.85c8.68,-5.92 18.42,-11 29.05,-11.94z" fill="#70c6be"/>
+  </g>
+  <g id="#1ba0d8ff">
+   <path id="svg_3" d="m628.35,608.38c17.83,-2.87 36.72,1.39 51.5,11.78c11.22,8.66 19.01,21.64 21.26,35.65c1.53,10.68 0.49,21.75 -3.44,31.84c-3.02,8.73 -7.35,16.94 -12.17,24.81c-68.76,115.58 -137.5,231.17 -206.27,346.75c-8.8,14.47 -16.82,29.47 -26.96,43.07c-7.37,9.11 -16.58,16.85 -27.21,21.89c-22.47,11.97 -51.79,4.67 -68.88,-13.33c-8.66,-8.69 -13.74,-20.63 -14.4,-32.84c-0.98,-12.64 1.81,-25.42 7.53,-36.69c5.03,-10.96 10.98,-21.45 17.19,-31.77c30.22,-50.84 60.17,-101.84 90.3,-152.73c41.24,-69.98 83.16,-139.55 124.66,-209.37c4.41,-7.94 9.91,-15.26 16.09,-21.9c8.33,-8.46 18.9,-15.3 30.8,-17.16z" fill="#1ba0d8"/>
+  </g>
+ </g>
+</svg>
--- a/apps/dokploy/public/templates/maybe.svg
+++ b/apps/dokploy/public/templates/maybe.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="147" height="24" fill="none">
+    <path
+        d="M30.827 24h5.224a2.24 2.24 0 0 0 2.241-2.238 2.24 2.24 0 0 0-2.24-2.239h-5.225a2.24 2.24 0 0 0-2.241 2.239A2.24 2.24 0 0 0 30.826 24zM7.465 24H2.241A2.24 2.24 0 0 1 0 21.762a2.24 2.24 0 0 1 2.24-2.239h5.225a2.24 2.24 0 1 1 0 4.477zm13.792-.014h-4.253a2.24 2.24 0 1 1 0-4.477h4.253a2.24 2.24 0 1 1 0 4.477z"
+        fill="#F23E94" />
+    <path
+        d="M28.796 17.558h5.03a2.24 2.24 0 1 0 0-4.477h-5.03a2.24 2.24 0 1 0 0 4.477zm-19.387 0H4.38a2.24 2.24 0 1 1 0-4.477h5.03a2.24 2.24 0 1 1 0 4.477zm13.466-.014h-7.486a2.24 2.24 0 0 1-2.24-2.239 2.24 2.24 0 0 1 2.24-2.239h7.486a2.24 2.24 0 0 1 0 4.477z"
+        fill="#6927DA" />
+    <path
+        d="M22.657 10.92h8.94a2.24 2.24 0 1 0 0-4.477h-8.94a2.24 2.24 0 1 0 0 4.477zm-6.497 0H6.608a2.24 2.24 0 1 1 0-4.477h9.552a2.24 2.24 0 1 1 0 4.477z"
+        fill="#1570EF" />
+    <path
+        d="M29.448 4.477h-5.041a2.24 2.24 0 0 1-2.241-2.238A2.24 2.24 0 0 1 24.407 0h5.041a2.24 2.24 0 1 1 0 4.477zm-15.656 0H8.751A2.24 2.24 0 1 1 8.75 0h5.041a2.24 2.24 0 1 1 0 4.477z"
+        fill="#2CE" />
+    <path
+        d="M73.648 10.81v6.455h-4.49v-5.753c0-1.97-.878-2.632-2.694-2.632-1.698 0-3.142.663-3.142 2.632v5.753h-4.49v-5.753c0-1.97-.878-2.632-2.694-2.632-1.698 0-3.142.663-3.142 2.632v5.753h-4.49v-11.7h4.49v2.067c1.249-1.521 2.889-2.457 5.153-2.457 2.069 0 3.943.858 4.743 3.003 1.308-1.833 3.045-3.003 5.583-3.003 2.772 0 5.173 1.54 5.173 5.635zm13.918 2.945v-.897c-1.503-.215-3.163-.39-4.666-.39-1.971 0-2.713.253-2.713.955 0 .663.586.917 2.264.917 1.406 0 3.826-.37 5.115-.585zm4.49-2.477v5.987h-4.49v-1.56c-2.089 1.287-4.666 1.755-6.657 1.755-3.064 0-5.407-.956-5.407-3.725 0-3.198 3.514-3.997 6.735-3.997 1.99 0 3.806.273 5.329.585-.117-1.619-1.582-2.028-3.631-2.028-2.089 0-4.08.292-6.852.936l-.624-3.062c2.537-.565 5.27-.994 8.315-.994 4.9 0 7.242 1.638 7.281 6.103zm13.976-5.713h4.548l-5.505 11.407c-1.639 3.393-3.416 5.363-7.027 5.363-1.288 0-2.928-.254-4.431-.683V18.24c1.737.39 2.967.585 3.767.585 1.503 0 2.147-.117 2.967-1.56h-2.108l-5.602-11.7h4.548l4.412 9.204 4.431-9.204zm17.744 5.85c0-1.716-1.191-2.535-3.572-2.535-2.382 0-3.573.819-3.573 2.535 0 1.716 1.191 2.535 3.573 2.535 2.381 0 3.572-.82 3.572-2.535zm4.685 0c0 4.719-3.377 6.24-6.403 6.24-2.128 0-4.236-.663-5.427-2.477v2.087h-4.489v-15.6h4.489v5.986c1.191-1.813 3.299-2.476 5.427-2.476 3.026 0 6.403 1.52 6.403 6.24zm6.461-1.482h7.32c-.508-1.346-1.757-1.833-3.69-1.833-1.893 0-3.142.487-3.63 1.833zm7.476 3.14h4.392c-.781 2.905-3.143 4.582-8.062 4.582-5.27 0-8.511-2.106-8.511-6.24s3.455-6.24 8.335-6.24c5.017 0 8.336 2.223 8.336 6.98h-12.123c.313 1.697 1.777 2.185 4.139 2.185 2.206 0 3.104-.507 3.494-1.268z"
+        fill="#141414" />
+</svg>
--- a/apps/dokploy/public/templates/spacedrive.png
+++ b/apps/dokploy/public/templates/spacedrive.png
--- a/apps/dokploy/styles/globals.css
+++ b/apps/dokploy/styles/globals.css
@@ -4,6 +4,7 @@

@layer base {
 	:root {
+		--terminal-paste: rgba(0, 0, 0, 0.2);
 		--background: 0 0% 100%;
 		--foreground: 240 10% 3.9%;

@@ -51,6 +52,7 @@
 	}

 	.dark {
+		--terminal-paste: rgba(255, 255, 255, 0.2);
 		--background: 0 0% 0%;
 		--foreground: 0 0% 98%;

@@ -235,3 +237,8 @@
 		background-color: hsl(var(--muted-foreground) / 0.5);
 	}
 }
+
+.xterm-bg-257.xterm-fg-257 {
+	background-color: var(--terminal-paste) !important;
+	color: currentColor !important;
+}
--- a/apps/dokploy/templates/alist/docker-compose.yml
+++ b/apps/dokploy/templates/alist/docker-compose.yml
@@ -0,0 +1,14 @@
+version: '3.3'
+services:
+  alist:
+    image: xhofe/alist:v3.41.0
+    volumes:
+      - alist-data:/opt/alist/data
+    environment:
+      - PUID=0
+      - PGID=0
+      - UMASK=022
+    restart: unless-stopped
+
+volumes:
+  alist-data:
--- a/apps/dokploy/templates/alist/index.ts
+++ b/apps/dokploy/templates/alist/index.ts
@@ -0,0 +1,22 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 5244,
+			serviceName: "alist",
+		},
+	];
+
+	return {
+		domains,
+	};
+}
--- a/apps/dokploy/templates/maybe/docker-compose.yml
+++ b/apps/dokploy/templates/maybe/docker-compose.yml
@@ -0,0 +1,37 @@
+services:
+  app:
+    image: ghcr.io/maybe-finance/maybe:sha-68c570eed8810fd59b5b33cca51bbad5eabb4cb4
+    restart: unless-stopped
+    volumes:
+      - ../files/uploads:/app/uploads
+    environment:
+      DATABASE_URL: postgresql://maybe:maybe@db:5432/maybe
+      SECRET_KEY_BASE: ${SECRET_KEY_BASE}
+      SELF_HOSTED: true
+      SYNTH_API_KEY: ${SYNTH_API_KEY}
+      RAILS_FORCE_SSL: "false"
+      RAILS_ASSUME_SSL: "false"
+      GOOD_JOB_EXECUTION_MODE: async
+    depends_on:
+      db:
+        condition: service_healthy
+
+  db:
+    image: postgres:16
+    restart: always
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
+    networks:
+      - dokploy-network
+    volumes:
+      - db-data:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: maybe
+      POSTGRES_USER: maybe
+      POSTGRES_PASSWORD: maybe
+
+volumes:
+  db-data:
--- a/apps/dokploy/templates/maybe/index.ts
+++ b/apps/dokploy/templates/maybe/index.ts
@@ -0,0 +1,43 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generateBase64,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const mainDomain = generateRandomDomain(schema);
+	const secretKeyBase = generateBase64(64);
+	const synthApiKey = generateBase64(32);
+
+	const domains: DomainSchema[] = [
+		{
+			host: mainDomain,
+			port: 3000,
+			serviceName: "app",
+		},
+	];
+
+	const envs = [
+		`SECRET_KEY_BASE=${secretKeyBase}`,
+		"SELF_HOSTED=true",
+		`SYNTH_API_KEY=${synthApiKey}`,
+		"RAILS_FORCE_SSL=false",
+		"RAILS_ASSUME_SSL=false",
+		"GOOD_JOB_EXECUTION_MODE=async",
+	];
+
+	const mounts: Template["mounts"] = [
+		{
+			filePath: "./uploads",
+			content: "This is where user uploads will be stored",
+		},
+	];
+
+	return {
+		envs,
+		mounts,
+		domains,
+	};
+}
--- a/apps/dokploy/templates/spacedrive/docker-compose.yml
+++ b/apps/dokploy/templates/spacedrive/docker-compose.yml
@@ -0,0 +1,9 @@
+services:
+  server:
+    image: ghcr.io/spacedriveapp/spacedrive/server:latest
+    ports:
+      - 8080
+    environment:
+      - SD_AUTH=${SD_USERNAME}:${SD_PASSWORD}
+    volumes:
+      - /var/spacedrive:/var/spacedrive
--- a/apps/dokploy/templates/spacedrive/index.ts
+++ b/apps/dokploy/templates/spacedrive/index.ts
@@ -0,0 +1,28 @@
+import {
+	type DomainSchema,
+	type Schema,
+	type Template,
+	generatePassword,
+	generateRandomDomain,
+} from "../utils";
+
+export function generate(schema: Schema): Template {
+	const randomDomain = generateRandomDomain(schema);
+	const secretKey = generatePassword();
+	const randomUsername = "admin"; // Default username
+
+	const domains: DomainSchema[] = [
+		{
+			host: randomDomain,
+			port: 8080,
+			serviceName: "server",
+		},
+	];
+
+	const envs = [`SD_USERNAME=${randomUsername}`, `SD_PASSWORD=${secretKey}`];
+
+	return {
+		envs,
+		domains,
+	};
+}
--- a/apps/dokploy/templates/superset/docker-compose.yml
+++ b/apps/dokploy/templates/superset/docker-compose.yml
@@ -13,8 +13,11 @@ services:
    image: amancevice/superset
    restart: always
    depends_on:
-      - db
-      - redis
+      - superset_postgres
+      - superset_redis
+    volumes:
+      # This superset_config.py can be edited in Dokploy's UI Advanced -> Volume Mount
+      - ../files/superset/superset_config.py:/etc/superset/superset_config.py
    environment:
      SECRET_KEY: ${SECRET_KEY}
      MAPBOX_API_KEY: ${MAPBOX_API_KEY}
@@ -22,11 +25,11 @@ services:
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
      REDIS_PASSWORD: ${REDIS_PASSWORD}
-    volumes:
-      # Note: superset_config.py can be edited in Dokploy's UI Volume Mount
-      - ../files/superset/superset_config.py:/etc/superset/superset_config.py
+      # Ensure the hosts matches your service names below.
+      POSTGRES_HOST: superset_postgres
+      REDIS_HOST: superset_redis

-  db:
+  superset_postgres:
    image: postgres
    restart: always
    environment:
@@ -34,7 +37,7 @@ services:
      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
      POSTGRES_DB: ${POSTGRES_DB}
    volumes:
-      - postgres:/var/lib/postgresql/data
+      - superset_postgres_data:/var/lib/postgresql/data
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
      interval: 30s
@@ -43,11 +46,11 @@ services:
    networks:
      - dokploy-network

-  redis:
+  superset_redis:
    image: redis
    restart: always
    volumes:
-      - redis:/data
+      - superset_redis_data:/data
    command: redis-server --requirepass ${REDIS_PASSWORD}
    healthcheck:
      test: ["CMD-SHELL", "pg_isready -U $${POSTGRES_USER} -d $${POSTGRES_DB}"]
@@ -58,5 +61,5 @@ services:
      - dokploy-network

 volumes:
-  postgres:
-  redis:
+  superset_postgres_data:
+  superset_redis_data:
--- a/apps/dokploy/templates/superset/index.ts
+++ b/apps/dokploy/templates/superset/index.ts
@@ -47,13 +47,13 @@ CACHE_CONFIG = {
  "CACHE_REDIS_HOST": "redis",
  "CACHE_REDIS_PORT": 6379,
  "CACHE_REDIS_DB": 1,
-  "CACHE_REDIS_URL": f"redis://:{os.getenv('REDIS_PASSWORD')}@redis:6379/1",
+  "CACHE_REDIS_URL": f"redis://:{os.getenv('REDIS_PASSWORD')}@{os.getenv('REDIS_HOST')}:6379/1",
 }

 FILTER_STATE_CACHE_CONFIG = {**CACHE_CONFIG, "CACHE_KEY_PREFIX": "superset_filter_"}
 EXPLORE_FORM_DATA_CACHE_CONFIG = {**CACHE_CONFIG, "CACHE_KEY_PREFIX": "superset_explore_form_"}

-SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{os.getenv('POSTGRES_USER')}:{os.getenv('POSTGRES_PASSWORD')}@db:5432/{os.getenv('POSTGRES_DB')}"
+SQLALCHEMY_DATABASE_URI = f"postgresql+psycopg2://{os.getenv('POSTGRES_USER')}:{os.getenv('POSTGRES_PASSWORD')}@{os.getenv('POSTGRES_HOST')}:5432/{os.getenv('POSTGRES_DB')}"
 SQLALCHEMY_TRACK_MODIFICATIONS = True
 			`.trim(),
 		},
--- a/apps/dokploy/templates/templates.ts
+++ b/apps/dokploy/templates/templates.ts
@@ -538,7 +538,7 @@ export const templates: TemplateData[] = [
 			website: "https://filebrowser.org/",
 			docs: "https://filebrowser.org/",
 		},
-		tags: ["file", "manager"],
+		tags: ["file-manager", "storage"],
 		load: () => import("./filebrowser/index").then((m) => m.generate),
 	},
 	{
@@ -834,7 +834,7 @@ export const templates: TemplateData[] = [
 			website: "https://nextcloud.com/",
 			docs: "https://docs.nextcloud.com/",
 		},
-		tags: ["file", "sync"],
+		tags: ["file-manager", "sync"],
 		load: () => import("./nextcloud-aio/index").then((m) => m.generate),
 	},
 	{
@@ -1363,4 +1363,49 @@ export const templates: TemplateData[] = [
 		],
 		load: () => import("./erpnext/index").then((m) => m.generate),
 	},
+	{
+		id: "maybe",
+		name: "Maybe",
+		version: "latest",
+		description:
+			"Maybe is a self-hosted finance tracking application designed to simplify budgeting and expenses.",
+		logo: "maybe.svg",
+		links: {
+			github: "https://github.com/maybe-finance/maybe",
+			website: "https://maybe.finance/",
+			docs: "https://docs.maybe.finance/",
+		},
+		tags: ["finance", "self-hosted"],
+		load: () => import("./maybe/index").then((m) => m.generate),
+	},
+	{
+		id: "spacedrive",
+		name: "Spacedrive",
+		version: "latest",
+		description:
+			"Spacedrive is a cross-platform file manager. It connects your devices together to help you organize files from anywhere. powered by a virtual distributed filesystem (VDFS) written in Rust. Organize files across many devices in one place.",
+		links: {
+			github: "https://github.com/spacedriveapp/spacedrive",
+			website: "https://spacedrive.com/",
+			docs: "https://www.spacedrive.com/docs/product/getting-started/introduction",
+		},
+		logo: "spacedrive.png",
+		tags: ["file-manager", "vdfs", "storage"],
+		load: () => import("./spacedrive/index").then((m) => m.generate),
+	},
+	{
+		id: "alist",
+		name: "AList",
+		version: "v3.41.0",
+		description:
+			"🗂️A file list/WebDAV program that supports multiple storages, powered by Gin and Solidjs.",
+		logo: "alist.svg",
+		links: {
+			github: "https://github.com/AlistGo/alist",
+			website: "https://alist.nn.ci",
+			docs: "https://alist.nn.ci/guide/install/docker.html",
+		},
+		tags: ["file", "webdav", "storage"],
+		load: () => import("./alist/index").then((m) => m.generate),
+	},
 ];
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -217,6 +217,9 @@ importers:
      '@xterm/addon-attach':
        specifier: 0.10.0
        version: 0.10.0(@xterm/xterm@5.5.0)
+      '@xterm/addon-clipboard':
+        specifier: 0.1.0
+        version: 0.1.0(@xterm/xterm@5.5.0)
      '@xterm/xterm':
        specifier: ^5.4.0
        version: 5.5.0
@@ -3503,6 +3506,11 @@ packages:
    peerDependencies:
      '@xterm/xterm': ^5.0.0

+  '@xterm/addon-clipboard@0.1.0':
+    resolution: {integrity: sha512-zdoM7p53T5sv/HbRTyp4hY0kKmEQ3MZvAvEtiXqNIHc/JdpqwByCtsTaQF5DX2n4hYdXRPO4P/eOS0QEhX1nPw==}
+    peerDependencies:
+      '@xterm/xterm': ^5.4.0
+
  '@xterm/xterm@5.5.0':
    resolution: {integrity: sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==}

@@ -5011,6 +5019,9 @@ packages:
    resolution: {integrity: sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw==}
    engines: {node: '>=10'}

+  js-base64@3.7.7:
+    resolution: {integrity: sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==}
+
  js-beautify@1.15.1:
    resolution: {integrity: sha512-ESjNzSlt/sWE8sciZH8kBF8BPlwXPwhR6pWKAw8bw4Bwj+iZcnKW6ONWUutJ7eObuBZQpiIb8S7OYspWrKt7rA==}
    engines: {node: '>=14'}
@@ -9894,6 +9905,11 @@ snapshots:
    dependencies:
      '@xterm/xterm': 5.5.0

+  '@xterm/addon-clipboard@0.1.0(@xterm/xterm@5.5.0)':
+    dependencies:
+      '@xterm/xterm': 5.5.0
+      js-base64: 3.7.7
+
  '@xterm/xterm@5.5.0': {}

  '@xtuc/ieee754@1.2.0': {}
@@ -11410,6 +11426,8 @@ snapshots:

  joycon@3.1.1: {}

+  js-base64@3.7.7: {}
+
  js-beautify@1.15.1:
    dependencies:
      config-chain: 1.1.13