diff --git a/apps/dokploy/__test__/compose/network/network-root.test.ts b/apps/dokploy/__test__/compose/network/network-root.test.ts index 0d3c841d4..1a6817913 100644 --- a/apps/dokploy/__test__/compose/network/network-root.test.ts +++ b/apps/dokploy/__test__/compose/network/network-root.test.ts @@ -292,7 +292,7 @@ networks: dokploy-network: `; -test("It shoudn't add suffix to dokploy-network", () => { +test("It shouldn't add suffix to dokploy-network", () => { const composeData = parse(composeFile7) as ComposeSpecification; const suffix = generateRandomHash(); diff --git a/apps/dokploy/__test__/compose/network/network-service.test.ts b/apps/dokploy/__test__/compose/network/network-service.test.ts index e07fa1546..073e61615 100644 --- a/apps/dokploy/__test__/compose/network/network-service.test.ts +++ b/apps/dokploy/__test__/compose/network/network-service.test.ts @@ -195,7 +195,7 @@ services: - dokploy-network `; -test("It shoudn't add suffix to dokploy-network in services", () => { +test("It shouldn't add suffix to dokploy-network in services", () => { const composeData = parse(composeFile7) as ComposeSpecification; const suffix = generateRandomHash(); @@ -241,10 +241,10 @@ services: dokploy-network: aliases: - apid - + `; -test("It shoudn't add suffix to dokploy-network in services multiples cases", () => { +test("It shouldn't add suffix to dokploy-network in services multiples cases", () => { const composeData = parse(composeFile8) as ComposeSpecification; const suffix = generateRandomHash(); diff --git a/apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts b/apps/dokploy/__test__/compose/service/service-volumes-from.test.ts similarity index 100% rename from apps/dokploy/__test__/compose/service/sevice-volumes-from.test.ts rename to apps/dokploy/__test__/compose/service/service-volumes-from.test.ts diff --git a/apps/dokploy/__test__/env/stack-environment.test.ts b/apps/dokploy/__test__/env/stack-environment.test.ts index 13f5adb53..773adf3ed 100644 --- a/apps/dokploy/__test__/env/stack-environment.test.ts +++ b/apps/dokploy/__test__/env/stack-environment.test.ts @@ -1,4 +1,4 @@ -import { getEnviromentVariablesObject } from "@dokploy/server/index"; +import { getEnvironmentVariablesObject } from "@dokploy/server/index"; import { describe, expect, it } from "vitest"; const projectEnv = ` @@ -15,7 +15,7 @@ DATABASE_NAME=dev_database SECRET_KEY=env-secret-123 `; -describe("getEnviromentVariablesObject with environment variables (Stack compose)", () => { +describe("getEnvironmentVariablesObject with environment variables (Stack compose)", () => { it("resolves environment variables correctly for Stack compose", () => { const serviceEnv = ` FOO=\${{environment.NODE_ENV}} @@ -23,7 +23,7 @@ BAR=\${{environment.API_URL}} BAZ=test `; - const result = getEnviromentVariablesObject( + const result = getEnvironmentVariablesObject( serviceEnv, projectEnv, environmentEnv, @@ -45,7 +45,7 @@ DATABASE_URL=\${{project.DATABASE_URL}} SERVICE_PORT=4000 `; - const result = getEnviromentVariablesObject( + const result = getEnvironmentVariablesObject( serviceEnv, projectEnv, environmentEnv, @@ -72,7 +72,7 @@ PASSWORD=secret123 DATABASE_URL=postgresql://\${{environment.USERNAME}}:\${{environment.PASSWORD}}@\${{environment.HOST}}:\${{environment.PORT}}/mydb `; - const result = getEnviromentVariablesObject(serviceEnv, "", multiRefEnv); + const result = getEnvironmentVariablesObject(serviceEnv, "", multiRefEnv); expect(result).toEqual({ DATABASE_URL: "postgresql://postgres:secret123@localhost:5432/mydb", @@ -85,7 +85,7 @@ UNDEFINED_VAR=\${{environment.UNDEFINED_VAR}} `; expect(() => - getEnviromentVariablesObject(serviceWithUndefined, "", environmentEnv), + getEnvironmentVariablesObject(serviceWithUndefined, "", environmentEnv), ).toThrow("Invalid environment variable: environment.UNDEFINED_VAR"); }); @@ -95,7 +95,7 @@ NODE_ENV=production API_URL=\${{environment.API_URL}} `; - const result = getEnviromentVariablesObject( + const result = getEnvironmentVariablesObject( serviceOverrideEnv, "", environmentEnv, @@ -115,7 +115,7 @@ SERVICE_NAME=my-service COMPLEX_VAR=\${{SERVICE_NAME}}-\${{environment.NODE_ENV}}-\${{project.ENVIRONMENT}} `; - const result = getEnviromentVariablesObject( + const result = getEnvironmentVariablesObject( complexServiceEnv, projectEnv, environmentEnv, @@ -150,7 +150,7 @@ ENV_VAR=\${{environment.API_URL}} DB_NAME=\${{environment.DATABASE_NAME}} `; - const result = getEnviromentVariablesObject( + const result = getEnvironmentVariablesObject( serviceWithConflicts, conflictingProjectEnv, conflictingEnvironmentEnv, @@ -170,7 +170,7 @@ SERVICE_VAR=test PROJECT_VAR=\${{project.ENVIRONMENT}} `; - const result = getEnviromentVariablesObject( + const result = getEnvironmentVariablesObject( serviceWithEmpty, projectEnv, "", diff --git a/apps/dokploy/__test__/permissions/enterprise-only-resources.test.ts b/apps/dokploy/__test__/permissions/enterprise-only-resources.test.ts index 3138085e3..bb6f5f18b 100644 --- a/apps/dokploy/__test__/permissions/enterprise-only-resources.test.ts +++ b/apps/dokploy/__test__/permissions/enterprise-only-resources.test.ts @@ -1,8 +1,8 @@ -import { describe, it, expect } from "vitest"; import { enterpriseOnlyResources, statements, } from "@dokploy/server/lib/access-control"; +import { describe, expect, it } from "vitest"; const FREE_TIER_RESOURCES = [ "organization", 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 02db06345..95f849480 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 @@ -40,12 +40,12 @@ interface Props { type: "application" | "mariadb" | "mongo" | "mysql" | "postgres" | "redis"; } -const AddRedirectchema = z.object({ +const AddRedirectSchema = z.object({ replicas: z.number().min(1, "Replicas must be at least 1"), registryId: z.string().optional(), }); -type AddCommand = z.infer; +type AddCommand = z.infer; export const ShowClusterSettings = ({ id, type }: Props) => { const queryMap = { @@ -87,7 +87,7 @@ export const ShowClusterSettings = ({ id, type }: Props) => { : {}), replicas: data?.replicas || 1, }, - resolver: zodResolver(AddRedirectchema), + resolver: zodResolver(AddRedirectSchema), }); useEffect(() => { diff --git a/apps/dokploy/components/dashboard/application/advanced/redirects/handle-redirect.tsx b/apps/dokploy/components/dashboard/application/advanced/redirects/handle-redirect.tsx index 172c042f1..683e0ebba 100644 --- a/apps/dokploy/components/dashboard/application/advanced/redirects/handle-redirect.tsx +++ b/apps/dokploy/components/dashboard/application/advanced/redirects/handle-redirect.tsx @@ -37,13 +37,13 @@ import { Separator } from "@/components/ui/separator"; import { Switch } from "@/components/ui/switch"; import { api } from "@/utils/api"; -const AddRedirectchema = z.object({ +const AddRedirectSchema = z.object({ regex: z.string().min(1, "Regex required"), permanent: z.boolean().default(false), replacement: z.string().min(1, "Replacement required"), }); -type AddRedirect = z.infer; +type AddRedirect = z.infer; // Default presets const redirectPresets = [ @@ -110,7 +110,7 @@ export const HandleRedirect = ({ regex: "", replacement: "", }, - resolver: zodResolver(AddRedirectchema), + resolver: zodResolver(AddRedirectSchema), }); useEffect(() => { @@ -149,7 +149,7 @@ export const HandleRedirect = ({ const onDialogToggle = (open: boolean) => { setIsOpen(open); - // commented for the moment because not reseting the form if accidentally closed the dialog can be considered as a feature instead of a bug + // commented for the moment because not resetting the form if accidentally closed the dialog can be considered as a feature instead of a bug // setPresetSelected(""); // form.reset(); }; diff --git a/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx b/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx index 3cecef1ec..ccf2564b0 100644 --- a/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx +++ b/apps/dokploy/components/dashboard/application/deployments/show-deployments.tsx @@ -1,3 +1,4 @@ +import copy from "copy-to-clipboard"; import { ChevronDown, ChevronUp, @@ -11,7 +12,6 @@ import { } from "lucide-react"; import React, { useEffect, useMemo, useState } from "react"; import { toast } from "sonner"; -import copy from "copy-to-clipboard"; import { AlertBlock } from "@/components/shared/alert-block"; import { DateTooltip } from "@/components/shared/date-tooltip"; import { DialogAction } from "@/components/shared/dialog-action"; diff --git a/apps/dokploy/components/dashboard/application/environment/show-enviroment.tsx b/apps/dokploy/components/dashboard/application/environment/show-environment.tsx similarity index 100% rename from apps/dokploy/components/dashboard/application/environment/show-enviroment.tsx rename to apps/dokploy/components/dashboard/application/environment/show-environment.tsx diff --git a/apps/dokploy/components/dashboard/application/logs/show.tsx b/apps/dokploy/components/dashboard/application/logs/show.tsx index cbb6bce09..06b257766 100644 --- a/apps/dokploy/components/dashboard/application/logs/show.tsx +++ b/apps/dokploy/components/dashboard/application/logs/show.tsx @@ -91,7 +91,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => { }, [option, services, containers]); const isLoading = option === "native" ? containersLoading : servicesLoading; - const containersLenght = + const containersLength = option === "native" ? containers?.length : services?.length; return ( @@ -167,7 +167,7 @@ export const ShowDockerLogs = ({ appName, serverId }: Props) => { )} - Containers ({containersLenght}) + Containers ({containersLength}) diff --git a/apps/dokploy/components/dashboard/application/patches/index.ts b/apps/dokploy/components/dashboard/application/patches/index.ts index 1854bd3e5..053e644b7 100644 --- a/apps/dokploy/components/dashboard/application/patches/index.ts +++ b/apps/dokploy/components/dashboard/application/patches/index.ts @@ -1,2 +1,2 @@ -export * from "./show-patches"; export * from "./patch-editor"; +export * from "./show-patches"; diff --git a/apps/dokploy/components/dashboard/application/volume-backups/handle-volume-backups.tsx b/apps/dokploy/components/dashboard/application/volume-backups/handle-volume-backups.tsx index 0d87080d7..f3d60f27f 100644 --- a/apps/dokploy/components/dashboard/application/volume-backups/handle-volume-backups.tsx +++ b/apps/dokploy/components/dashboard/application/volume-backups/handle-volume-backups.tsx @@ -483,7 +483,7 @@ export const HandleVolumeBackups = ({ - Choose the volume to backup, if you dont see the + Choose the volume to backup. If you do not see the volume here, you can type the volume name manually @@ -518,7 +518,7 @@ export const HandleVolumeBackups = ({ - Choose the volume to backup, if you dont see the volume + Choose the volume to backup. If you do not see the volume here, you can type the volume name manually diff --git a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx index 159ab3485..4c3067b15 100644 --- a/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx +++ b/apps/dokploy/components/dashboard/compose/logs/show-stack.tsx @@ -77,7 +77,7 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => { }, [option, services, containers]); const isLoading = option === "native" ? containersLoading : servicesLoading; - const containersLenght = + const containersLength = option === "native" ? containers?.length : services?.length; return ( @@ -152,7 +152,7 @@ export const ShowDockerLogsStack = ({ appName, serverId }: Props) => { )} - Containers ({containersLenght}) + Containers ({containersLength}) diff --git a/apps/dokploy/components/dashboard/database/backups/restore-backup.tsx b/apps/dokploy/components/dashboard/database/backups/restore-backup.tsx index 00647aea7..7b212acb9 100644 --- a/apps/dokploy/components/dashboard/database/backups/restore-backup.tsx +++ b/apps/dokploy/components/dashboard/database/backups/restore-backup.tsx @@ -225,7 +225,7 @@ export const RestoreBackup = ({ resolver: zodResolver(RestoreBackupSchema), }); - const destionationId = form.watch("destinationId"); + const destinationId = form.watch("destinationId"); const currentDatabaseType = form.watch("databaseType"); const metadata = form.watch("metadata"); @@ -240,12 +240,12 @@ export const RestoreBackup = ({ const { data: files = [], isPending } = api.backup.listBackupFiles.useQuery( { - destinationId: destionationId, + destinationId: destinationId, search: debouncedSearchTerm, serverId: serverId ?? "", }, { - enabled: isOpen && !!destionationId, + enabled: isOpen && !!destinationId, }, ); diff --git a/apps/dokploy/components/dashboard/deployments/show-queue-table.tsx b/apps/dokploy/components/dashboard/deployments/show-queue-table.tsx index e46b33a6a..22b132f16 100644 --- a/apps/dokploy/components/dashboard/deployments/show-queue-table.tsx +++ b/apps/dokploy/components/dashboard/deployments/show-queue-table.tsx @@ -1,8 +1,8 @@ "use client"; import type { inferRouterOutputs } from "@trpc/server"; -import Link from "next/link"; import { ArrowRight, ListTodo, Loader2, XCircle } from "lucide-react"; +import Link from "next/link"; import { Badge } from "@/components/ui/badge"; import { Button } from "@/components/ui/button"; import { diff --git a/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx b/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx index 9d4f47c4a..bed5c6f5d 100644 --- a/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx +++ b/apps/dokploy/components/dashboard/docker/logs/terminal-line.tsx @@ -103,7 +103,7 @@ export function TerminalLine({ log, noTimestamp, searchTerm }: LogLineProps) { > {" "}
- {/* Icon to expand the log item maybe implement a colapsible later */} + {/* Icon to expand the log item maybe implement a collapsible later */} {/* */} {tooltip(color, rawTimestamp)} {!noTimestamp && ( diff --git a/apps/dokploy/components/dashboard/docker/show/colums.tsx b/apps/dokploy/components/dashboard/docker/show/columns.tsx similarity index 100% rename from apps/dokploy/components/dashboard/docker/show/colums.tsx rename to apps/dokploy/components/dashboard/docker/show/columns.tsx diff --git a/apps/dokploy/components/dashboard/docker/show/show-containers.tsx b/apps/dokploy/components/dashboard/docker/show/show-containers.tsx index 69b0a0da2..8a19566e8 100644 --- a/apps/dokploy/components/dashboard/docker/show/show-containers.tsx +++ b/apps/dokploy/components/dashboard/docker/show/show-containers.tsx @@ -35,7 +35,7 @@ import { TableRow, } from "@/components/ui/table"; import { api, type RouterOutputs } from "@/utils/api"; -import { columns } from "./colums"; +import { columns } from "./columns"; export type Container = NonNullable< RouterOutputs["docker"]["getContainers"] >[0]; diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/docker-block-chart.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/docker-block-chart.tsx index 718ddafa4..6dc5cd90c 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/docker-block-chart.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/docker-block-chart.tsx @@ -11,11 +11,11 @@ import { import type { DockerStatsJSON } from "./show-free-container-monitoring"; interface Props { - acummulativeData: DockerStatsJSON["block"]; + accumulativeData: DockerStatsJSON["block"]; } -export const DockerBlockChart = ({ acummulativeData }: Props) => { - const transformedData = acummulativeData.map((item, index) => { +export const DockerBlockChart = ({ accumulativeData }: Props) => { + const transformedData = accumulativeData.map((item, index) => { return { time: item.time, name: `Point ${index + 1}`, diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/docker-cpu-chart.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/docker-cpu-chart.tsx index c24a63638..67404268b 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/docker-cpu-chart.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/docker-cpu-chart.tsx @@ -11,11 +11,11 @@ import { import type { DockerStatsJSON } from "./show-free-container-monitoring"; interface Props { - acummulativeData: DockerStatsJSON["cpu"]; + accumulativeData: DockerStatsJSON["cpu"]; } -export const DockerCpuChart = ({ acummulativeData }: Props) => { - const transformedData = acummulativeData.map((item, index) => { +export const DockerCpuChart = ({ accumulativeData }: Props) => { + const transformedData = accumulativeData.map((item, index) => { return { name: `Point ${index + 1}`, time: item.time, diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/docker-disk-chart.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/docker-disk-chart.tsx index 5fe62154c..58cefe6b3 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/docker-disk-chart.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/docker-disk-chart.tsx @@ -11,12 +11,12 @@ import { import type { DockerStatsJSON } from "./show-free-container-monitoring"; interface Props { - acummulativeData: DockerStatsJSON["disk"]; + accumulativeData: DockerStatsJSON["disk"]; diskTotal: number; } -export const DockerDiskChart = ({ acummulativeData, diskTotal }: Props) => { - const transformedData = acummulativeData.map((item, index) => { +export const DockerDiskChart = ({ accumulativeData, diskTotal }: Props) => { + const transformedData = accumulativeData.map((item, index) => { return { time: item.time, name: `Point ${index + 1}`, diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/docker-memory-chart.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/docker-memory-chart.tsx index 34a3913a7..226623fa2 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/docker-memory-chart.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/docker-memory-chart.tsx @@ -12,15 +12,15 @@ import type { DockerStatsJSON } from "./show-free-container-monitoring"; import { convertMemoryToBytes } from "./show-free-container-monitoring"; interface Props { - acummulativeData: DockerStatsJSON["memory"]; + accumulativeData: DockerStatsJSON["memory"]; memoryLimitGB: number; } export const DockerMemoryChart = ({ - acummulativeData, + accumulativeData, memoryLimitGB, }: Props) => { - const transformedData = acummulativeData.map((item, index) => { + const transformedData = accumulativeData.map((item, index) => { return { time: item.time, name: `Point ${index + 1}`, diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/docker-network-chart.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/docker-network-chart.tsx index 5e2414cea..8dafcb465 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/docker-network-chart.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/docker-network-chart.tsx @@ -11,11 +11,11 @@ import { import type { DockerStatsJSON } from "./show-free-container-monitoring"; interface Props { - acummulativeData: DockerStatsJSON["network"]; + accumulativeData: DockerStatsJSON["network"]; } -export const DockerNetworkChart = ({ acummulativeData }: Props) => { - const transformedData = acummulativeData.map((item, index) => { +export const DockerNetworkChart = ({ accumulativeData }: Props) => { + const transformedData = accumulativeData.map((item, index) => { return { time: item.time, name: `Point ${index + 1}`, diff --git a/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx b/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx index 42bb361bb..6e572c224 100644 --- a/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx +++ b/apps/dokploy/components/dashboard/monitoring/free/container/show-free-container-monitoring.tsx @@ -124,7 +124,7 @@ export const ContainerFreeMonitoring = ({ refetchOnWindowFocus: false, }, ); - const [acummulativeData, setAcummulativeData] = useState({ + const [accumulativeData, setAccumulativeData] = useState({ cpu: [], memory: [], block: [], @@ -136,7 +136,7 @@ export const ContainerFreeMonitoring = ({ useEffect(() => { setCurrentData(defaultData); - setAcummulativeData({ + setAccumulativeData({ cpu: [], memory: [], block: [], @@ -155,7 +155,7 @@ export const ContainerFreeMonitoring = ({ network: data.network[data.network.length - 1] ?? currentData.network, disk: data.disk[data.disk.length - 1] ?? currentData.disk, }); - setAcummulativeData({ + setAccumulativeData({ block: data?.block || [], cpu: data?.cpu || [], disk: data?.disk || [], @@ -184,7 +184,7 @@ export const ContainerFreeMonitoring = ({ setCurrentData(data); const MAX_DATA_POINTS = 300; - setAcummulativeData((prevData) => ({ + setAccumulativeData((prevData) => ({ cpu: [...prevData.cpu, data.cpu].slice(-MAX_DATA_POINTS), memory: [...prevData.memory, data.memory].slice(-MAX_DATA_POINTS), block: [...prevData.block, data.block].slice(-MAX_DATA_POINTS), @@ -228,7 +228,7 @@ export const ContainerFreeMonitoring = ({ )} className="w-[100%]" /> - +
@@ -252,7 +252,7 @@ export const ContainerFreeMonitoring = ({ className="w-[100%]" /> @@ -294,7 +294,7 @@ export const ContainerFreeMonitoring = ({ {`Read: ${currentData.block.value.readMb} / Write: ${currentData.block.value.writeMb} `} - + @@ -307,7 +307,7 @@ export const ContainerFreeMonitoring = ({ {`In MB: ${currentData.network.value.inputMb} / Out MB: ${currentData.network.value.outputMb} `} - + diff --git a/apps/dokploy/components/dashboard/settings/destination/handle-destinations.tsx b/apps/dokploy/components/dashboard/settings/destination/handle-destinations.tsx index 25a3a1048..e7ecf92b2 100644 --- a/apps/dokploy/components/dashboard/settings/destination/handle-destinations.tsx +++ b/apps/dokploy/components/dashboard/settings/destination/handle-destinations.tsx @@ -1,3 +1,7 @@ +import { + ADDITIONAL_FLAG_ERROR, + ADDITIONAL_FLAG_REGEX, +} from "@dokploy/server/db/validations/destination"; import { standardSchemaResolver as zodResolver } from "@hookform/resolvers/standard-schema"; import { PenBoxIcon, PlusIcon, Trash2 } from "lucide-react"; import { useEffect, useState } from "react"; @@ -35,10 +39,6 @@ import { } from "@/components/ui/select"; import { cn } from "@/lib/utils"; import { api } from "@/utils/api"; -import { - ADDITIONAL_FLAG_ERROR, - ADDITIONAL_FLAG_REGEX, -} from "@dokploy/server/db/validations/destination"; import { S3_PROVIDERS } from "./constants"; const addDestination = z.object({ diff --git a/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx b/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx index 7c637f5ef..b48f8253b 100644 --- a/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx +++ b/apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx @@ -283,7 +283,7 @@ export const AddGitlabProvider = () => { 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 e48df084b..43c174055 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 @@ -192,7 +192,7 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => { diff --git a/apps/dokploy/components/dashboard/settings/servers/setup-server.tsx b/apps/dokploy/components/dashboard/settings/servers/setup-server.tsx index 0d4d3a44f..570955fc8 100644 --- a/apps/dokploy/components/dashboard/settings/servers/setup-server.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/setup-server.tsx @@ -161,7 +161,7 @@ export const SetupServer = ({ serverId, asButton = false }: Props) => {
  • 1. Add the public SSH Key when you create a server in your - preffered provider (Hostinger, Digital Ocean, Hetzner, + preferred provider (Hostinger, Digital Ocean, Hetzner, etc){" "}
  • 2. Add The SSH Key to Server Manually
    • diff --git a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx index 859098394..1326c554a 100644 --- a/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/show-servers.tsx @@ -48,7 +48,7 @@ import { ShowMonitoringModal } from "./show-monitoring-modal"; import { ShowSchedulesModal } from "./show-schedules-modal"; import { ShowSwarmOverviewModal } from "./show-swarm-overview-modal"; import { ShowTraefikFileSystemModal } from "./show-traefik-file-system-modal"; -import { WelcomeSuscription } from "./welcome-stripe/welcome-suscription"; +import { WelcomeSubscription } from "./welcome-stripe/welcome-subscription"; export const ShowServers = () => { const router = useRouter(); @@ -63,7 +63,7 @@ export const ShowServers = () => { return (
    - {query?.success && isCloud && } + {query?.success && isCloud && }
    diff --git a/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-suscription.tsx b/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-subscription.tsx similarity index 99% rename from apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-suscription.tsx rename to apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-subscription.tsx index 004f79f74..91dce72b9 100644 --- a/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-suscription.tsx +++ b/apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-subscription.tsx @@ -51,7 +51,7 @@ export const { useStepper, steps, Scoped } = defineStepper( { id: "complete", title: "Complete", description: "Checkout complete" }, ); -export const WelcomeSuscription = () => { +export const WelcomeSubscription = () => { const [showConfetti, setShowConfetti] = useState(false); const stepper = useStepper(); const [isOpen, setIsOpen] = useState(true); diff --git a/apps/dokploy/components/dashboard/settings/users/change-role.tsx b/apps/dokploy/components/dashboard/settings/users/change-role.tsx index 2178284b1..dfa35a28d 100644 --- a/apps/dokploy/components/dashboard/settings/users/change-role.tsx +++ b/apps/dokploy/components/dashboard/settings/users/change-role.tsx @@ -153,7 +153,7 @@ export const ChangeRole = ({ memberId, currentRole, userEmail }: Props) => { )}
    - Note: Owner role is intransferible. + Note: Owner role is nontransferable. diff --git a/apps/dokploy/components/dashboard/settings/users/show-users.tsx b/apps/dokploy/components/dashboard/settings/users/show-users.tsx index 75aa839f9..23356dcd4 100644 --- a/apps/dokploy/components/dashboard/settings/users/show-users.tsx +++ b/apps/dokploy/components/dashboard/settings/users/show-users.tsx @@ -122,7 +122,7 @@ export const ShowUsers = () => { // Can change role based on hierarchy: // - Owner: Can change anyone's role (except themselves and other owners) // - Admin: Can only change member/custom roles (not other admins or owners) - // - Owner role is intransferible + // - Owner role is nontransferable const canChangeRole = member.role !== "owner" && member.user.id !== session?.user?.id && diff --git a/apps/dokploy/components/ui/breadcrumb.tsx b/apps/dokploy/components/ui/breadcrumb.tsx index a189f6fa1..8bf95ea32 100644 --- a/apps/dokploy/components/ui/breadcrumb.tsx +++ b/apps/dokploy/components/ui/breadcrumb.tsx @@ -101,7 +101,7 @@ const BreadcrumbEllipsis = ({ More ); -BreadcrumbEllipsis.displayName = "BreadcrumbElipssis"; +BreadcrumbEllipsis.displayName = "BreadcrumbEllipsis"; export { Breadcrumb, diff --git a/apps/dokploy/components/ui/file-tree.tsx b/apps/dokploy/components/ui/file-tree.tsx index e346bf4a6..c1d5dc335 100644 --- a/apps/dokploy/components/ui/file-tree.tsx +++ b/apps/dokploy/components/ui/file-tree.tsx @@ -19,7 +19,7 @@ interface TreeDataItem { type TreeProps = React.HTMLAttributes & { data: TreeDataItem[] | TreeDataItem; - initialSlelectedItemId?: string; + initialSelectedItemId?: string; onSelectChange?: (item: TreeDataItem | undefined) => void; expandAll?: boolean; folderIcon?: LucideIcon; @@ -30,7 +30,7 @@ const Tree = React.forwardRef( ( { data, - initialSlelectedItemId, + initialSelectedItemId, onSelectChange, expandAll, folderIcon, @@ -42,7 +42,7 @@ const Tree = React.forwardRef( ) => { const [selectedItemId, setSelectedItemId] = React.useState< string | undefined - >(initialSlelectedItemId); + >(initialSelectedItemId); const handleSelectChange = React.useCallback( (item: TreeDataItem | undefined) => { @@ -55,7 +55,7 @@ const Tree = React.forwardRef( ); const expandedItemIds = React.useMemo(() => { - if (!initialSlelectedItemId) { + if (!initialSelectedItemId) { return [] as string[]; } @@ -81,9 +81,9 @@ const Tree = React.forwardRef( } } - walkTreeItems(data, initialSlelectedItemId); + walkTreeItems(data, initialSelectedItemId); return ids; - }, [data, initialSlelectedItemId]); + }, [data, initialSelectedItemId]); const { ref: refRoot } = useResizeObserver(); diff --git a/apps/dokploy/lib/auth-client.ts b/apps/dokploy/lib/auth-client.ts index 6d786cc11..864ba1f68 100644 --- a/apps/dokploy/lib/auth-client.ts +++ b/apps/dokploy/lib/auth-client.ts @@ -1,5 +1,5 @@ -import { ssoClient } from "@better-auth/sso/client"; import { apiKeyClient } from "@better-auth/api-key/client"; +import { ssoClient } from "@better-auth/sso/client"; import { adminClient, inferAdditionalFields, diff --git a/apps/dokploy/pages/api/deploy/[refreshToken].ts b/apps/dokploy/pages/api/deploy/[refreshToken].ts index 14b45f3d7..1c57731a7 100644 --- a/apps/dokploy/pages/api/deploy/[refreshToken].ts +++ b/apps/dokploy/pages/api/deploy/[refreshToken].ts @@ -196,7 +196,7 @@ export default async function handler( return; } - const commitedPaths = await extractCommitedPaths( + const committedPaths = await extractCommittedPaths( req.body, application.bitbucket, application.bitbucketRepositorySlug || @@ -206,7 +206,7 @@ export default async function handler( const shouldDeployPaths = shouldDeploy( application.watchPaths, - commitedPaths, + committedPaths, ); if (!shouldDeployPaths) { @@ -538,7 +538,7 @@ export const getProviderByHeader = (headers: any) => { return null; }; -export const extractCommitedPaths = async ( +export const extractCommittedPaths = async ( body: any, bitbucket: Bitbucket | null, repository: string, @@ -548,7 +548,7 @@ export const extractCommitedPaths = async ( const commitHashes = changes .map((change: any) => change.new?.target?.hash) .filter(Boolean); - const commitedPaths: string[] = []; + const committedPaths: string[] = []; const username = bitbucket?.bitbucketWorkspaceName || bitbucket?.bitbucketUsername || ""; for (const commit of commitHashes) { @@ -559,7 +559,7 @@ export const extractCommitedPaths = async ( }); const data = await response.json(); for (const value of data.values) { - if (value?.new?.path) commitedPaths.push(value.new.path); + if (value?.new?.path) committedPaths.push(value.new.path); } } catch (error) { console.error( @@ -571,5 +571,5 @@ export const extractCommitedPaths = async ( } } - return commitedPaths; + return committedPaths; }; diff --git a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts index da3082bb7..640a2531d 100644 --- a/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts +++ b/apps/dokploy/pages/api/deploy/compose/[refreshToken].ts @@ -8,8 +8,8 @@ import { myQueue } from "@/server/queues/queueSetup"; import { deploy } from "@/server/utils/deploy"; import { extractBranchName, - extractCommitedPaths, extractCommitMessage, + extractCommittedPaths, extractHash, getProviderByHeader, } from "../[refreshToken]"; @@ -97,7 +97,7 @@ export default async function handler( return; } - const commitedPaths = await extractCommitedPaths( + const committedPaths = await extractCommittedPaths( req.body, composeResult.bitbucket, composeResult.bitbucketRepositorySlug || @@ -107,7 +107,7 @@ export default async function handler( const shouldDeployPaths = shouldDeploy( composeResult.watchPaths, - commitedPaths, + committedPaths, ); if (!shouldDeployPaths) { diff --git a/apps/dokploy/pages/api/stripe/webhook.ts b/apps/dokploy/pages/api/stripe/webhook.ts index 60468bd2c..deaa5572c 100644 --- a/apps/dokploy/pages/api/stripe/webhook.ts +++ b/apps/dokploy/pages/api/stripe/webhook.ts @@ -174,27 +174,27 @@ export default async function handler( case "invoice.payment_succeeded": { const newInvoice = event.data.object as Stripe.Invoice; - const suscription = await stripe.subscriptions.retrieve( + const subscription = await stripe.subscriptions.retrieve( newInvoice.subscription as string, ); - if (suscription.status !== "active") { + if (subscription.status !== "active") { console.log( - `Skipping invoice.payment_succeeded for subscription ${suscription.id} with status ${suscription.status}`, + `Skipping invoice.payment_succeeded for subscription ${subscription.id} with status ${subscription.status}`, ); break; } const serversQuantity = getSubscriptionServersQuantity( - suscription?.items?.data ?? [], + subscription?.items?.data ?? [], ); await db .update(user) .set({ serversQuantity }) - .where(eq(user.stripeCustomerId, suscription.customer as string)); + .where(eq(user.stripeCustomerId, subscription.customer as string)); const admin = await findUserByStripeCustomerId( - suscription.customer as string, + subscription.customer as string, ); if (!admin) { diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx index 078bf5b6b..781dd7795 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/compose/[composeId].tsx @@ -16,7 +16,7 @@ import { ShowImport } from "@/components/dashboard/application/advanced/import/s import { ShowVolumes } from "@/components/dashboard/application/advanced/volumes/show-volumes"; import { ShowDeployments } from "@/components/dashboard/application/deployments/show-deployments"; import { ShowDomains } from "@/components/dashboard/application/domains/show-domains"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowPatches } from "@/components/dashboard/application/patches/show-patches"; import { ShowSchedules } from "@/components/dashboard/application/schedules/show-schedules"; import { ShowVolumeBackups } from "@/components/dashboard/application/volume-backups/show-volume-backups"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/libsql/[libsqlId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/libsql/[libsqlId].tsx index 6abb53c2b..c9563ebe6 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/libsql/[libsqlId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/libsql/[libsqlId].tsx @@ -10,7 +10,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { type ReactElement, useState } from "react"; import superjson from "superjson"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; import { DeleteService } from "@/components/dashboard/compose/delete-service"; import { ShowBackups } from "@/components/dashboard/database/backups/show-backups"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx index 3e3a7d7de..b54804279 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mariadb/[mariadbId].tsx @@ -10,7 +10,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { type ReactElement, useState } from "react"; import superjson from "superjson"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; import { DeleteService } from "@/components/dashboard/compose/delete-service"; import { ShowBackups } from "@/components/dashboard/database/backups/show-backups"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx index ea6483499..402718625 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mongo/[mongoId].tsx @@ -10,7 +10,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { type ReactElement, useState } from "react"; import superjson from "superjson"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; import { DeleteService } from "@/components/dashboard/compose/delete-service"; import { ShowBackups } from "@/components/dashboard/database/backups/show-backups"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx index ff45c0694..55e1ee6e0 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/mysql/[mysqlId].tsx @@ -10,7 +10,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { type ReactElement, useState } from "react"; import superjson from "superjson"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; import { DeleteService } from "@/components/dashboard/compose/delete-service"; import { ShowBackups } from "@/components/dashboard/database/backups/show-backups"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx index 15e91a0bd..f73ce35cb 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/postgres/[postgresId].tsx @@ -10,7 +10,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { type ReactElement, useState } from "react"; import superjson from "superjson"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; import { DeleteService } from "@/components/dashboard/compose/delete-service"; import { ShowBackups } from "@/components/dashboard/database/backups/show-backups"; diff --git a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx index 05a9e0c91..8847ed891 100644 --- a/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx +++ b/apps/dokploy/pages/dashboard/project/[projectId]/environment/[environmentId]/services/redis/[redisId].tsx @@ -10,7 +10,7 @@ import Link from "next/link"; import { useRouter } from "next/router"; import { type ReactElement, useState } from "react"; import superjson from "superjson"; -import { ShowEnvironment } from "@/components/dashboard/application/environment/show-enviroment"; +import { ShowEnvironment } from "@/components/dashboard/application/environment/show-environment"; import { ShowDockerLogs } from "@/components/dashboard/application/logs/show"; import { DeleteService } from "@/components/dashboard/compose/delete-service"; import { ContainerFreeMonitoring } from "@/components/dashboard/monitoring/free/container/show-free-container-monitoring"; diff --git a/apps/dokploy/pages/dashboard/settings/users.tsx b/apps/dokploy/pages/dashboard/settings/users.tsx index 43c014279..a3bd953d1 100644 --- a/apps/dokploy/pages/dashboard/settings/users.tsx +++ b/apps/dokploy/pages/dashboard/settings/users.tsx @@ -3,10 +3,10 @@ import { createServerSideHelpers } from "@trpc/react-query/server"; import type { GetServerSidePropsContext } from "next"; import type { ReactElement } from "react"; import superjson from "superjson"; -import { DashboardLayout } from "@/components/layouts/dashboard-layout"; -import { ManageCustomRoles } from "@/components/proprietary/roles/manage-custom-roles"; import { ShowInvitations } from "@/components/dashboard/settings/users/show-invitations"; import { ShowUsers } from "@/components/dashboard/settings/users/show-users"; +import { DashboardLayout } from "@/components/layouts/dashboard-layout"; +import { ManageCustomRoles } from "@/components/proprietary/roles/manage-custom-roles"; import { appRouter } from "@/server/api/root"; import { api } from "@/utils/api"; diff --git a/apps/dokploy/server/api/routers/ai.ts b/apps/dokploy/server/api/routers/ai.ts index b46fcf99a..a4527497d 100644 --- a/apps/dokploy/server/api/routers/ai.ts +++ b/apps/dokploy/server/api/routers/ai.ts @@ -17,11 +17,11 @@ import { suggestVariants, } from "@dokploy/server/services/ai"; import { createComposeByTemplate } from "@dokploy/server/services/compose"; -import { findProjectById } from "@dokploy/server/services/project"; import { addNewService, checkServiceAccess, } from "@dokploy/server/services/permission"; +import { findProjectById } from "@dokploy/server/services/project"; import { getProviderHeaders, getProviderName, diff --git a/apps/dokploy/server/api/routers/backup.ts b/apps/dokploy/server/api/routers/backup.ts index ead1ef4b6..c3633b135 100644 --- a/apps/dokploy/server/api/routers/backup.ts +++ b/apps/dokploy/server/api/routers/backup.ts @@ -28,6 +28,7 @@ import { updateBackupById, } from "@dokploy/server"; import { findDestinationById } from "@dokploy/server/services/destination"; +import { checkServicePermissionAndAccess } from "@dokploy/server/services/permission"; import { runComposeBackup } from "@dokploy/server/utils/backups/compose"; import { getS3Credentials, @@ -53,7 +54,6 @@ import { protectedProcedure, withPermission, } from "@/server/api/trpc"; -import { checkServicePermissionAndAccess } from "@dokploy/server/services/permission"; import { audit } from "@/server/api/utils/audit"; import { apiCreateBackup, diff --git a/apps/dokploy/server/api/routers/certificate.ts b/apps/dokploy/server/api/routers/certificate.ts index 0ebd33e7f..e506a846b 100644 --- a/apps/dokploy/server/api/routers/certificate.ts +++ b/apps/dokploy/server/api/routers/certificate.ts @@ -7,8 +7,8 @@ import { import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, withPermission } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiCreateCertificate, apiFindCertificate, diff --git a/apps/dokploy/server/api/routers/compose.ts b/apps/dokploy/server/api/routers/compose.ts index 0d3782eab..6e272a6cc 100644 --- a/apps/dokploy/server/api/routers/compose.ts +++ b/apps/dokploy/server/api/routers/compose.ts @@ -31,13 +31,13 @@ import { updateCompose, updateDeploymentStatus, } from "@dokploy/server"; +import { db } from "@dokploy/server/db"; import { addNewService, checkServiceAccess, checkServicePermissionAndAccess, findMemberByUserId, } from "@dokploy/server/services/permission"; -import { db } from "@dokploy/server/db"; import { type CompleteTemplate, fetchTemplateFiles, @@ -75,8 +75,8 @@ import { } from "@/server/queues/queueSetup"; import { cancelDeployment, deploy } from "@/server/utils/deploy"; import { generatePassword } from "@/templates/utils"; -import { audit } from "../utils/audit"; import { createTRPCRouter, protectedProcedure, publicProcedure } from "../trpc"; +import { audit } from "../utils/audit"; export const composeRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/destination.ts b/apps/dokploy/server/api/routers/destination.ts index 9f528c16c..cf7395a3f 100644 --- a/apps/dokploy/server/api/routers/destination.ts +++ b/apps/dokploy/server/api/routers/destination.ts @@ -1,5 +1,5 @@ import { - createDestintation, + createDestination, execAsync, execAsyncRemote, findDestinationById, @@ -25,7 +25,7 @@ export const destinationRouter = createTRPCRouter({ .input(apiCreateDestination) .mutation(async ({ input, ctx }) => { try { - const result = await createDestintation( + const result = await createDestination( input, ctx.session.activeOrganizationId, ); diff --git a/apps/dokploy/server/api/routers/git-provider.ts b/apps/dokploy/server/api/routers/git-provider.ts index 066e43b1b..5f48ff422 100644 --- a/apps/dokploy/server/api/routers/git-provider.ts +++ b/apps/dokploy/server/api/routers/git-provider.ts @@ -8,12 +8,12 @@ import { db } from "@dokploy/server/db"; import { hasValidLicense } from "@dokploy/server/services/proprietary/license-key"; import { TRPCError } from "@trpc/server"; import { desc, eq, inArray } from "drizzle-orm"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, protectedProcedure, withPermission, } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiRemoveGitProvider, apiToggleShareGitProvider, diff --git a/apps/dokploy/server/api/routers/mongo.ts b/apps/dokploy/server/api/routers/mongo.ts index 47c06f819..de9e1f36f 100644 --- a/apps/dokploy/server/api/routers/mongo.ts +++ b/apps/dokploy/server/api/routers/mongo.ts @@ -17,18 +17,18 @@ import { stopServiceRemote, updateMongoById, } from "@dokploy/server"; +import { db } from "@dokploy/server/db"; import { addNewService, checkServiceAccess, checkServicePermissionAndAccess, findMemberByUserId, } from "@dokploy/server/services/permission"; -import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { and, desc, eq, ilike, or, sql } from "drizzle-orm"; import { z } from "zod"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiChangeMongoStatus, apiCreateMongo, @@ -39,9 +39,10 @@ import { apiSaveEnvironmentVariablesMongo, apiSaveExternalPortMongo, apiUpdateMongo, + environments, mongo as mongoTable, + projects, } from "@/server/db/schema"; -import { environments, projects } from "@/server/db/schema"; import { cancelJobs } from "@/server/utils/backup"; export const mongoRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/mysql.ts b/apps/dokploy/server/api/routers/mysql.ts index 8e1938caa..b834f52c2 100644 --- a/apps/dokploy/server/api/routers/mysql.ts +++ b/apps/dokploy/server/api/routers/mysql.ts @@ -17,18 +17,18 @@ import { stopServiceRemote, updateMySqlById, } from "@dokploy/server"; +import { db } from "@dokploy/server/db"; import { addNewService, checkServiceAccess, checkServicePermissionAndAccess, findMemberByUserId, } from "@dokploy/server/services/permission"; -import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { and, desc, eq, ilike, or, sql } from "drizzle-orm"; import { z } from "zod"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiChangeMySqlStatus, apiCreateMySql, diff --git a/apps/dokploy/server/api/routers/organization.ts b/apps/dokploy/server/api/routers/organization.ts index 2f7d45287..2f9da6d71 100644 --- a/apps/dokploy/server/api/routers/organization.ts +++ b/apps/dokploy/server/api/routers/organization.ts @@ -1,10 +1,10 @@ import { db } from "@dokploy/server/db"; import { IS_CLOUD } from "@dokploy/server/index"; -import { audit } from "@/server/api/utils/audit"; import { TRPCError } from "@trpc/server"; import { and, desc, eq, exists } from "drizzle-orm"; import { nanoid } from "nanoid"; import { z } from "zod"; +import { audit } from "@/server/api/utils/audit"; import { invitation, member, @@ -409,11 +409,11 @@ export const organizationRouter = createTRPCRouter({ }); } - // Owner role is intransferible - cannot change to or from owner + // Owner role is nontransferable - cannot change to or from owner if (target.role === "owner" || input.role === "owner") { throw new TRPCError({ code: "FORBIDDEN", - message: "The owner role is intransferible", + message: "The owner role is nontransferable", }); } diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts index b591726eb..78e0e1284 100644 --- a/apps/dokploy/server/api/routers/postgres.ts +++ b/apps/dokploy/server/api/routers/postgres.ts @@ -18,18 +18,18 @@ import { stopServiceRemote, updatePostgresById, } from "@dokploy/server"; +import { db } from "@dokploy/server/db"; import { addNewService, checkServiceAccess, checkServicePermissionAndAccess, findMemberByUserId, } from "@dokploy/server/services/permission"; -import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { and, desc, eq, ilike, or, sql } from "drizzle-orm"; import { z } from "zod"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiChangePostgresStatus, apiCreatePostgres, @@ -40,9 +40,10 @@ import { apiSaveEnvironmentVariablesPostgres, apiSaveExternalPortPostgres, apiUpdatePostgres, + environments, postgres as postgresTable, + projects, } from "@/server/db/schema"; -import { environments, projects } from "@/server/db/schema"; import { cancelJobs } from "@/server/utils/backup"; export const postgresRouter = createTRPCRouter({ diff --git a/apps/dokploy/server/api/routers/redis.ts b/apps/dokploy/server/api/routers/redis.ts index dfd8e1a87..efc98bf77 100644 --- a/apps/dokploy/server/api/routers/redis.ts +++ b/apps/dokploy/server/api/routers/redis.ts @@ -16,18 +16,18 @@ import { stopServiceRemote, updateRedisById, } from "@dokploy/server"; +import { db } from "@dokploy/server/db"; import { addNewService, checkServiceAccess, checkServicePermissionAndAccess, findMemberByUserId, } from "@dokploy/server/services/permission"; -import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { and, desc, eq, ilike, or, sql } from "drizzle-orm"; import { z } from "zod"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiChangeRedisStatus, apiCreateRedis, @@ -38,9 +38,10 @@ import { apiSaveEnvironmentVariablesRedis, apiSaveExternalPortRedis, apiUpdateRedis, + environments, + projects, redis as redisTable, } from "@/server/db/schema"; -import { environments, projects } from "@/server/db/schema"; export const redisRouter = createTRPCRouter({ create: protectedProcedure .input(apiCreateRedis) diff --git a/apps/dokploy/server/api/routers/registry.ts b/apps/dokploy/server/api/routers/registry.ts index 7e2174419..1b156c069 100644 --- a/apps/dokploy/server/api/routers/registry.ts +++ b/apps/dokploy/server/api/routers/registry.ts @@ -10,6 +10,7 @@ import { import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; +import { audit } from "@/server/api/utils/audit"; import { apiCreateRegistry, apiFindOneRegistry, @@ -19,7 +20,6 @@ import { apiUpdateRegistry, registry, } from "@/server/db/schema"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, withPermission } from "../trpc"; export const registryRouter = createTRPCRouter({ create: withPermission("registry", "create") diff --git a/apps/dokploy/server/api/routers/schedule.ts b/apps/dokploy/server/api/routers/schedule.ts index f3dba1799..144f7c74a 100644 --- a/apps/dokploy/server/api/routers/schedule.ts +++ b/apps/dokploy/server/api/routers/schedule.ts @@ -7,6 +7,7 @@ import { updateScheduleSchema, } from "@dokploy/server/db/schema/schedule"; import { runCommand } from "@dokploy/server/index"; +import { checkServicePermissionAndAccess } from "@dokploy/server/services/permission"; import { createSchedule, deleteSchedule, @@ -18,7 +19,6 @@ import { asc, desc, eq } from "drizzle-orm"; import { z } from "zod"; import { audit } from "@/server/api/utils/audit"; import { removeJob, schedule } from "@/server/utils/backup"; -import { checkServicePermissionAndAccess } from "@dokploy/server/services/permission"; import { createTRPCRouter, protectedProcedure } from "../trpc"; export const scheduleRouter = createTRPCRouter({ create: protectedProcedure diff --git a/apps/dokploy/server/api/routers/server.ts b/apps/dokploy/server/api/routers/server.ts index bfad8836a..785be19b8 100644 --- a/apps/dokploy/server/api/routers/server.ts +++ b/apps/dokploy/server/api/routers/server.ts @@ -21,12 +21,12 @@ import { observable } from "@trpc/server/observable"; import { and, desc, eq, getTableColumns, isNotNull, sql } from "drizzle-orm"; import { z } from "zod"; import { updateServersBasedOnQuantity } from "@/pages/api/stripe/webhook"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, protectedProcedure, withPermission, } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiCreateServer, apiFindOneServer, diff --git a/apps/dokploy/server/api/routers/ssh-key.ts b/apps/dokploy/server/api/routers/ssh-key.ts index 74aeb5e58..68ab14616 100644 --- a/apps/dokploy/server/api/routers/ssh-key.ts +++ b/apps/dokploy/server/api/routers/ssh-key.ts @@ -8,8 +8,8 @@ import { import { db } from "@dokploy/server/db"; import { TRPCError } from "@trpc/server"; import { desc, eq } from "drizzle-orm"; -import { audit } from "@/server/api/utils/audit"; import { createTRPCRouter, withPermission } from "@/server/api/trpc"; +import { audit } from "@/server/api/utils/audit"; import { apiCreateSshKey, apiFindOneSshKey, diff --git a/apps/dokploy/server/api/trpc.ts b/apps/dokploy/server/api/trpc.ts index 486640349..d0b43e76f 100644 --- a/apps/dokploy/server/api/trpc.ts +++ b/apps/dokploy/server/api/trpc.ts @@ -106,7 +106,7 @@ export const createTRPCContext = async (opts: CreateNextContextOptions) => { * 2. INITIALIZATION * * This is where the tRPC API is initialized, connecting the context and transformer. We also parse - * ZodErrors so that you get typesafety on the frontend if your procedure fails due to validation + * ZodErrors so that you get type safety on the frontend if your procedure fails due to validation * errors on the backend. */ diff --git a/apps/dokploy/server/api/utils/audit.ts b/apps/dokploy/server/api/utils/audit.ts index 9f73befbf..64f46dea4 100644 --- a/apps/dokploy/server/api/utils/audit.ts +++ b/apps/dokploy/server/api/utils/audit.ts @@ -1,5 +1,5 @@ -import { createAuditLog } from "@dokploy/server/services/proprietary/audit-log"; import type { AuditAction, AuditResourceType } from "@dokploy/server/db/schema"; +import { createAuditLog } from "@dokploy/server/services/proprietary/audit-log"; interface AuditCtx { user: { id: string; email: string; role: string }; diff --git a/packages/server/auth-schema2.ts b/packages/server/auth-schema2.ts index 9c163c820..cb2202832 100644 --- a/packages/server/auth-schema2.ts +++ b/packages/server/auth-schema2.ts @@ -1,11 +1,11 @@ import { relations } from "drizzle-orm"; import { + boolean, + index, + integer, pgTable, text, timestamp, - boolean, - integer, - index, uniqueIndex, } from "drizzle-orm/pg-core"; diff --git a/packages/server/src/db/schema/index.ts b/packages/server/src/db/schema/index.ts index 7873345ab..a4e613a02 100644 --- a/packages/server/src/db/schema/index.ts +++ b/packages/server/src/db/schema/index.ts @@ -1,7 +1,7 @@ export * from "./account"; export * from "./ai"; -export * from "./audit-log"; export * from "./application"; +export * from "./audit-log"; export * from "./backups"; export * from "./bitbucket"; export * from "./certificate"; diff --git a/packages/server/src/db/schema/volume-backups.ts b/packages/server/src/db/schema/volume-backups.ts index 0a5ecf898..fd3b48253 100644 --- a/packages/server/src/db/schema/volume-backups.ts +++ b/packages/server/src/db/schema/volume-backups.ts @@ -1,6 +1,5 @@ import { relations } from "drizzle-orm"; import { boolean, integer, pgTable, text } from "drizzle-orm/pg-core"; -import { serviceType } from "./mount"; import { createInsertSchema } from "drizzle-zod"; import { nanoid } from "nanoid"; import { z } from "zod"; @@ -11,6 +10,7 @@ import { destinations } from "./destination"; import { libsql } from "./libsql"; import { mariadb } from "./mariadb"; import { mongo } from "./mongo"; +import { serviceType } from "./mount"; import { mysql } from "./mysql"; import { postgres } from "./postgres"; import { redis } from "./redis"; diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts index 22e8872bd..e6fd0ba59 100644 --- a/packages/server/src/index.ts +++ b/packages/server/src/index.ts @@ -121,7 +121,7 @@ export * from "./utils/providers/raw"; export * from "./utils/schedules/index"; export * from "./utils/schedules/utils"; export * from "./utils/servers/remote-docker"; -export * from "./utils/startup/cancell-deployments"; +export * from "./utils/startup/cancel-deployments"; export * from "./utils/tracking/hubspot"; export * from "./utils/traefik/application"; export * from "./utils/traefik/domain"; diff --git a/packages/server/src/services/deployment.ts b/packages/server/src/services/deployment.ts index a9f059465..a5ff57779 100644 --- a/packages/server/src/services/deployment.ts +++ b/packages/server/src/services/deployment.ts @@ -23,7 +23,7 @@ import { } from "@dokploy/server/utils/process/execAsync"; import { TRPCError } from "@trpc/server"; import { format } from "date-fns"; -import { desc, eq, and, inArray, or, sql } from "drizzle-orm"; +import { and, desc, eq, inArray, or, sql } from "drizzle-orm"; import type { z } from "zod"; import { type Application, @@ -177,7 +177,7 @@ export const createDeployment = async ( status: "error", logPath: "", description: deployment.description || "", - errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`, + errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`, startedAt: new Date().toISOString(), finishedAt: new Date().toISOString(), }) @@ -257,7 +257,7 @@ export const createDeploymentPreview = async ( status: "error", logPath: "", description: deployment.description || "", - errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`, + errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`, startedAt: new Date().toISOString(), finishedAt: new Date().toISOString(), }) @@ -334,7 +334,7 @@ echo "Initializing deployment\n" >> ${logFilePath}; status: "error", logPath: "", description: deployment.description || "", - errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`, + errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`, startedAt: new Date().toISOString(), finishedAt: new Date().toISOString(), }) @@ -418,7 +418,7 @@ echo "Initializing backup\n" >> ${logFilePath}; status: "error", logPath: "", description: deployment.description || "", - errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`, + errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`, startedAt: new Date().toISOString(), finishedAt: new Date().toISOString(), }) @@ -493,7 +493,7 @@ export const createDeploymentSchedule = async ( status: "error", logPath: "", description: deployment.description || "", - errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`, + errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`, startedAt: new Date().toISOString(), finishedAt: new Date().toISOString(), }) @@ -578,7 +578,7 @@ export const createDeploymentVolumeBackup = async ( status: "error", logPath: "", description: deployment.description || "", - errorMessage: `An error have occured: ${error instanceof Error ? error.message : error}`, + errorMessage: `An error have occurred: ${error instanceof Error ? error.message : error}`, startedAt: new Date().toISOString(), finishedAt: new Date().toISOString(), }) diff --git a/packages/server/src/services/destination.ts b/packages/server/src/services/destination.ts index fa48d0d15..9cbc9afa3 100644 --- a/packages/server/src/services/destination.ts +++ b/packages/server/src/services/destination.ts @@ -9,7 +9,7 @@ import type { z } from "zod"; export type Destination = typeof destinations.$inferSelect; -export const createDestintation = async ( +export const createDestination = async ( input: z.infer, organizationId: string, ) => { diff --git a/packages/server/src/services/proprietary/audit-log.ts b/packages/server/src/services/proprietary/audit-log.ts index 157e75c9b..8cf4e0055 100644 --- a/packages/server/src/services/proprietary/audit-log.ts +++ b/packages/server/src/services/proprietary/audit-log.ts @@ -1,6 +1,6 @@ import { db } from "@dokploy/server/db"; -import { auditLog } from "@dokploy/server/db/schema"; import type { AuditAction, AuditResourceType } from "@dokploy/server/db/schema"; +import { auditLog } from "@dokploy/server/db/schema"; import { hasValidLicense } from "@dokploy/server/services/proprietary/license-key"; import { and, desc, eq, gte, ilike, lte } from "drizzle-orm"; diff --git a/packages/server/src/services/settings.ts b/packages/server/src/services/settings.ts index 07aaf690c..ecfb7f6de 100644 --- a/packages/server/src/services/settings.ts +++ b/packages/server/src/services/settings.ts @@ -383,12 +383,12 @@ export const readPorts = async ( const seenPorts = new Set(); for (const key in parsedResult) { if (Object.hasOwn(parsedResult, key)) { - const containerPortMapppings = parsedResult[key]; + const containerPortMappings = parsedResult[key]; const protocol = key.split("/")[1]; const targetPort = Number.parseInt(key.split("/")[0] ?? "0", 10); // Take only the first mapping to avoid duplicates (IPv4 and IPv6) - const firstMapping = containerPortMapppings[0]; + const firstMapping = containerPortMappings[0]; if (firstMapping) { const publishedPort = Number.parseInt(firstMapping.HostPort, 10); const portKey = `${targetPort}-${publishedPort}-${protocol}`; diff --git a/packages/server/src/services/user.ts b/packages/server/src/services/user.ts index 83287a3be..ed43f3862 100644 --- a/packages/server/src/services/user.ts +++ b/packages/server/src/services/user.ts @@ -89,7 +89,7 @@ export const canPerformAccessService = async ( return false; }; -export const canPeformDeleteService = async ( +export const canPerformDeleteService = async ( userId: string, serviceId: string, organizationId: string, @@ -215,7 +215,7 @@ export const checkServiceAccess = async ( ); break; case "delete": - hasPermission = await canPeformDeleteService( + hasPermission = await canPerformDeleteService( userId, serviceId, organizationId, diff --git a/packages/server/src/setup/setup.ts b/packages/server/src/setup/setup.ts index 4c01bf6cb..5171063d6 100644 --- a/packages/server/src/setup/setup.ts +++ b/packages/server/src/setup/setup.ts @@ -3,13 +3,13 @@ import { docker } from "../constants"; export const initializeSwarm = async () => { const swarmInitialized = await dockerSwarmInitialized(); if (swarmInitialized) { - console.log("Swarm is already initilized"); + console.log("Swarm is already initialized"); } else { await docker.swarmInit({ AdvertiseAddr: "127.0.0.1", ListenAddr: "0.0.0.0", }); - console.log("Swarm was initilized"); + console.log("Swarm was initialized"); } }; @@ -26,14 +26,14 @@ export const dockerSwarmInitialized = async () => { export const initializeNetwork = async () => { const networkInitialized = await dockerNetworkInitialized(); if (networkInitialized) { - console.log("Network is already initilized"); + console.log("Network is already initialized"); } else { docker.createNetwork({ Attachable: true, Name: "dokploy-network", Driver: "overlay", }); - console.log("Network was initilized"); + console.log("Network was initialized"); } }; diff --git a/packages/server/src/utils/builders/compose.ts b/packages/server/src/utils/builders/compose.ts index ca2b8a6b5..316570626 100644 --- a/packages/server/src/utils/builders/compose.ts +++ b/packages/server/src/utils/builders/compose.ts @@ -6,7 +6,7 @@ import { quote } from "shell-quote"; import { writeDomainsToCompose } from "../docker/domain"; import { encodeBase64, - getEnviromentVariablesObject, + getEnvironmentVariablesObject, prepareEnvironmentVariables, } from "../docker/utils"; @@ -46,17 +46,17 @@ Compose Type: ${composeType} ✅`; set -e { echo "${logBox}"; - + ${newCompose} - + ${envCommand} - + cd "${projectPath}"; ${compose.isolatedDeployment ? `docker network inspect ${compose.appName} >/dev/null 2>&1 || docker network create ${compose.composeType === "stack" ? "--driver overlay" : ""} --attachable ${compose.appName}` : ""} env -i PATH="$PATH" ${exportEnvCommand} docker ${command.split(" ").join(" ")} 2>&1 || { echo "Error: ❌ Docker command failed"; exit 1; } ${compose.isolatedDeployment ? `docker network connect ${compose.appName} $(docker ps --filter "name=dokploy-traefik" -q) >/dev/null 2>&1` : ""} - + echo "Docker Compose Deployed: ✅"; } || { echo "Error: ❌ Script execution failed"; @@ -131,7 +131,7 @@ echo "${encodedContent}" | base64 -d > "${envFilePath}"; const getExportEnvCommand = (compose: ComposeNested) => { if (compose.composeType !== "stack") return ""; - const envVars = getEnviromentVariablesObject( + const envVars = getEnvironmentVariablesObject( compose.env, compose.environment.project.env, compose.environment.env, diff --git a/packages/server/src/utils/builders/docker-file.ts b/packages/server/src/utils/builders/docker-file.ts index ea53a5bff..b20e3f170 100644 --- a/packages/server/src/utils/builders/docker-file.ts +++ b/packages/server/src/utils/builders/docker-file.ts @@ -1,5 +1,5 @@ import { - getEnviromentVariablesObject, + getEnvironmentVariablesObject, prepareEnvironmentVariablesForShell, } from "@dokploy/server/utils/docker/utils"; import { quote } from "shell-quote"; @@ -52,7 +52,7 @@ export const getDockerCommand = (application: ApplicationNested) => { commandArgs.push("--build-arg", arg); } - const secrets = getEnviromentVariablesObject( + const secrets = getEnvironmentVariablesObject( buildSecrets, application.environment.project.env, application.environment.env, @@ -86,12 +86,12 @@ export const getDockerCommand = (application: ApplicationNested) => { command += ` echo "Building ${appName}" ; -cd ${dockerContextPath} || { +cd ${dockerContextPath} || { echo "❌ The path ${dockerContextPath} does not exist" ; exit 1; } -${joinedSecrets} docker ${commandArgs.join(" ")} || { +${joinedSecrets} docker ${commandArgs.join(" ")} || { echo "❌ Docker build failed" ; exit 1; } diff --git a/packages/server/src/utils/docker/utils.ts b/packages/server/src/utils/docker/utils.ts index b2c7e5d7b..dd645cd1b 100644 --- a/packages/server/src/utils/docker/utils.ts +++ b/packages/server/src/utils/docker/utils.ts @@ -434,7 +434,7 @@ export const parseEnvironmentKeyValuePair = ( return [key, valueParts.join("=")]; }; -export const getEnviromentVariablesObject = ( +export const getEnvironmentVariablesObject = ( input: string | null, projectEnv?: string | null, environmentEnv?: string | null, diff --git a/packages/server/src/utils/providers/github.ts b/packages/server/src/utils/providers/github.ts index b32133681..6309cf307 100644 --- a/packages/server/src/utils/providers/github.ts +++ b/packages/server/src/utils/providers/github.ts @@ -5,8 +5,8 @@ import { findGithubById, type Github } from "@dokploy/server/services/github"; import type { InferResultType } from "@dokploy/server/types/with"; import { createAppAuth } from "@octokit/auth-app"; import { TRPCError } from "@trpc/server"; -import type { z } from "zod"; import { Octokit } from "octokit"; +import type { z } from "zod"; export const authGithub = (githubProvider: Github): Octokit => { if (!haveGithubRequirements(githubProvider)) { diff --git a/packages/server/src/utils/providers/gitlab.ts b/packages/server/src/utils/providers/gitlab.ts index a14067fba..02121d346 100644 --- a/packages/server/src/utils/providers/gitlab.ts +++ b/packages/server/src/utils/providers/gitlab.ts @@ -1,7 +1,6 @@ import { join } from "node:path"; import { paths } from "@dokploy/server/constants"; import type { apiGitlabTestConnection } from "@dokploy/server/db/schema"; -import type { z } from "zod"; import { findGitlabById, type Gitlab, @@ -9,6 +8,7 @@ import { } from "@dokploy/server/services/gitlab"; import type { InferResultType } from "@dokploy/server/types/with"; import { TRPCError } from "@trpc/server"; +import type { z } from "zod"; export const refreshGitlabToken = async (gitlabProviderId: string) => { const gitlabProvider = await findGitlabById(gitlabProviderId); diff --git a/packages/server/src/utils/startup/cancell-deployments.ts b/packages/server/src/utils/startup/cancel-deployments.ts similarity index 100% rename from packages/server/src/utils/startup/cancell-deployments.ts rename to packages/server/src/utils/startup/cancel-deployments.ts