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 23ec111a..3dfe9875 100644 --- a/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx +++ b/apps/dokploy/components/dashboard/file-system/show-traefik-file.tsx @@ -13,12 +13,12 @@ import { } from "@/components/ui/form"; import { api } from "@/utils/api"; import { zodResolver } from "@hookform/resolvers/zod"; +import { Loader2 } from "lucide-react"; import { useEffect, useState } from "react"; import { useForm } from "react-hook-form"; import { toast } from "sonner"; import { z } from "zod"; import { validateAndFormatYAML } from "../application/advanced/traefik/update-traefik-config"; -import { Loader2 } from "lucide-react"; const UpdateServerMiddlewareConfigSchema = z.object({ traefikConfig: z.string(), diff --git a/apps/dokploy/components/dashboard/file-system/show-traefik-system.tsx b/apps/dokploy/components/dashboard/file-system/show-traefik-system.tsx index c85fcdf5..7812e05d 100644 --- a/apps/dokploy/components/dashboard/file-system/show-traefik-system.tsx +++ b/apps/dokploy/components/dashboard/file-system/show-traefik-system.tsx @@ -1,10 +1,10 @@ -import React from "react"; +import { AlertBlock } from "@/components/shared/alert-block"; import { Tree } from "@/components/ui/file-tree"; +import { cn } from "@/lib/utils"; import { api } from "@/utils/api"; import { FileIcon, Folder, Loader2, Workflow } from "lucide-react"; -import { cn } from "@/lib/utils"; +import React from "react"; import { ShowTraefikFile } from "./show-traefik-file"; -import { AlertBlock } from "@/components/shared/alert-block"; interface Props { serverId?: string; diff --git a/apps/dokploy/components/dashboard/settings/servers/actions/show-server-actions.tsx b/apps/dokploy/components/dashboard/settings/servers/actions/show-server-actions.tsx index f27fba31..680e543e 100644 --- a/apps/dokploy/components/dashboard/settings/servers/actions/show-server-actions.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/actions/show-server-actions.tsx @@ -1,9 +1,9 @@ +import { CardDescription, CardTitle } from "@/components/ui/card"; import { Dialog, DialogContent, DialogTrigger } from "@/components/ui/dialog"; import { DropdownMenuItem } from "@/components/ui/dropdown-menu"; import { useState } from "react"; -import { ShowTraefikActions } from "./show-traefik-actions"; -import { CardTitle, CardDescription } from "@/components/ui/card"; import { ShowStorageActions } from "./show-storage-actions"; +import { ShowTraefikActions } from "./show-traefik-actions"; import { ToggleDockerCleanup } from "./toggle-docker-cleanup"; interface Props { serverId: string; diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx index 9aa31d49..f1ac64c8 100644 --- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx @@ -24,12 +24,12 @@ import { KeyIcon, MoreHorizontal, ServerIcon } from "lucide-react"; import Link from "next/link"; import { toast } from "sonner"; import { TerminalModal } from "../web-server/terminal-modal"; +import { ShowServerActions } from "./actions/show-server-actions"; import { AddServer } from "./add-server"; import { SetupServer } from "./setup-server"; -import { UpdateServer } from "./update-server"; -import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal"; -import { ShowServerActions } from "./actions/show-server-actions"; import { ShowDockerContainersModal } from "./show-docker-containers-modal"; +import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal"; +import { UpdateServer } from "./update-server"; export const ShowServers = () => { const { data, refetch } = api.server.all.useQuery(); diff --git a/apps/dokploy/components/dashboard/settings/web-server.tsx b/apps/dokploy/components/dashboard/settings/web-server.tsx index 68a0c790..188b3db8 100644 --- a/apps/dokploy/components/dashboard/settings/web-server.tsx +++ b/apps/dokploy/components/dashboard/settings/web-server.tsx @@ -5,14 +5,14 @@ import { CardHeader, CardTitle, } from "@/components/ui/card"; -import React from "react"; -import { api } from "@/utils/api"; -import { UpdateServer } from "./web-server/update-server"; import { cn } from "@/lib/utils"; +import { api } from "@/utils/api"; +import React from "react"; import { ShowDokployActions } from "./servers/actions/show-dokploy-actions"; -import { ShowTraefikActions } from "./servers/actions/show-traefik-actions"; import { ShowStorageActions } from "./servers/actions/show-storage-actions"; +import { ShowTraefikActions } from "./servers/actions/show-traefik-actions"; import { ToggleDockerCleanup } from "./servers/actions/toggle-docker-cleanup"; +import { UpdateServer } from "./web-server/update-server"; interface Props { className?: string; diff --git a/apps/dokploy/server/api/routers/settings.ts b/apps/dokploy/server/api/routers/settings.ts index 1bd5b03e..1c70601a 100644 --- a/apps/dokploy/server/api/routers/settings.ts +++ b/apps/dokploy/server/api/routers/settings.ts @@ -49,6 +49,7 @@ import { scheduleJob, scheduledJobs } from "node-schedule"; import { z } from "zod"; import { appRouter } from "../root"; import { findAdmin, updateAdmin } from "../services/admin"; +import { findServerById, updateServerById } from "../services/server"; import { getDokployImage, getDokployVersion, @@ -57,7 +58,6 @@ import { } from "../services/settings"; import { canAccessToTraefikFiles } from "../services/user"; import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc"; -import { findServerById, updateServerById } from "../services/server"; export const settingsRouter = createTRPCRouter({ reloadServer: adminProcedure.mutation(async () => { diff --git a/apps/dokploy/server/api/services/settings.ts b/apps/dokploy/server/api/services/settings.ts index a1a29939..ae1c275c 100644 --- a/apps/dokploy/server/api/services/settings.ts +++ b/apps/dokploy/server/api/services/settings.ts @@ -2,8 +2,8 @@ import { readdirSync } from "node:fs"; import { join } from "node:path"; import { docker } from "@/server/constants"; import { getServiceContainer } from "@/server/utils/docker/utils"; -import packageInfo from "../../../package.json"; import { execAsyncRemote } from "@/server/utils/process/execAsync"; +import packageInfo from "../../../package.json"; const updateIsAvailable = async () => { try { diff --git a/apps/dokploy/server/setup/traefik-setup.ts b/apps/dokploy/server/setup/traefik-setup.ts index 7d0a25e1..27bc99a4 100644 --- a/apps/dokploy/server/setup/traefik-setup.ts +++ b/apps/dokploy/server/setup/traefik-setup.ts @@ -4,9 +4,9 @@ import type { ContainerTaskSpec, CreateServiceOptions } from "dockerode"; import { dump } from "js-yaml"; import { paths } from "../constants"; import { pullImage, pullRemoteImage } from "../utils/docker/utils"; +import { getRemoteDocker } from "../utils/servers/remote-docker"; import type { FileConfig } from "../utils/traefik/file-types"; import type { MainTraefikConfig } from "../utils/traefik/types"; -import { getRemoteDocker } from "../utils/servers/remote-docker"; const TRAEFIK_SSL_PORT = Number.parseInt(process.env.TRAEFIK_SSL_PORT ?? "", 10) || 443; diff --git a/apps/dokploy/server/utils/backups/index.ts b/apps/dokploy/server/utils/backups/index.ts index 9de083a6..747611d9 100644 --- a/apps/dokploy/server/utils/backups/index.ts +++ b/apps/dokploy/server/utils/backups/index.ts @@ -1,4 +1,5 @@ import { findAdmin } from "@/server/api/services/admin"; +import { getAllServers } from "@/server/api/services/server"; import { scheduleJob } from "node-schedule"; import { db } from "../../db/index"; import { @@ -10,7 +11,6 @@ import { runMariadbBackup } from "./mariadb"; import { runMongoBackup } from "./mongo"; import { runMySqlBackup } from "./mysql"; import { runPostgresBackup } from "./postgres"; -import { getAllServers } from "@/server/api/services/server"; export const initCronJobs = async () => { console.log("Setting up cron jobs...."); diff --git a/apps/dokploy/server/utils/traefik/application.ts b/apps/dokploy/server/utils/traefik/application.ts index d40f447d..c149e2ad 100644 --- a/apps/dokploy/server/utils/traefik/application.ts +++ b/apps/dokploy/server/utils/traefik/application.ts @@ -3,9 +3,9 @@ import path from "node:path"; import type { Domain } from "@/server/api/services/domain"; import { paths } from "@/server/constants"; import { dump, load } from "js-yaml"; +import { encodeBase64 } from "../docker/utils"; import { execAsyncRemote } from "../process/execAsync"; import type { FileConfig, HttpLoadBalancerService } from "./file-types"; -import { encodeBase64 } from "../docker/utils"; export const createTraefikConfig = (appName: string) => { const defaultPort = 3000; diff --git a/apps/dokploy/server/wss/docker-container-terminal.ts b/apps/dokploy/server/wss/docker-container-terminal.ts index c67fa107..a7b72892 100644 --- a/apps/dokploy/server/wss/docker-container-terminal.ts +++ b/apps/dokploy/server/wss/docker-container-terminal.ts @@ -1,11 +1,11 @@ import type http from "node:http"; import { spawn } from "node-pty"; -import { WebSocketServer } from "ws"; -import { validateWebSocketRequest } from "../auth/auth"; -import { getShell } from "./utils"; import { Client } from "ssh2"; -import { readSSHKey } from "../utils/filesystem/ssh"; +import { WebSocketServer } from "ws"; import { findServerById } from "../api/services/server"; +import { validateWebSocketRequest } from "../auth/auth"; +import { readSSHKey } from "../utils/filesystem/ssh"; +import { getShell } from "./utils"; export const setupDockerContainerTerminalWebSocketServer = ( server: http.Server,