diff --git a/.husky/commit-msg b/.husky/commit-msg new file mode 100644 index 000000000..c3c62bfc0 --- /dev/null +++ b/.husky/commit-msg @@ -0,0 +1 @@ +npx commitlint --edit "$1" \ No newline at end of file diff --git a/.husky/install.mjs b/.husky/install.mjs new file mode 100644 index 000000000..9b13ce1f9 --- /dev/null +++ b/.husky/install.mjs @@ -0,0 +1,6 @@ +// Skip Husky install in production and CI +if (process.env.NODE_ENV === "production" || process.env.CI === "true") { + process.exit(0); +} +const husky = (await import("husky")).default; +console.log(husky()); diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 000000000..fef815e96 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,2 @@ +pnpm run check +git add . \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cbf916f5..dbb79c89b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,6 +71,12 @@ Run the command that will spin up all the required services and files. pnpm run dokploy:setup ``` +Build the server package (If you make any changes after in the packages/server folder, you need to rebuild and run this command) + +```bash +pnpm run server:build +``` + Now run the development server. ```bash diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json index 79da59e34..ea39b503e 100644 --- a/apps/dokploy/package.json +++ b/apps/dokploy/package.json @@ -1,6 +1,6 @@ { "name": "dokploy", - "version": "v0.10.0", + "version": "v0.10.1", "private": true, "license": "Apache-2.0", "type": "module", diff --git a/apps/dokploy/pages/index.tsx b/apps/dokploy/pages/index.tsx index 1f669d3f3..c86efec94 100644 --- a/apps/dokploy/pages/index.tsx +++ b/apps/dokploy/pages/index.tsx @@ -178,7 +178,7 @@ export default function Home() {
Lost your password? diff --git a/apps/dokploy/setup.ts b/apps/dokploy/setup.ts index c4c9a372c..d22eba4cd 100644 --- a/apps/dokploy/setup.ts +++ b/apps/dokploy/setup.ts @@ -2,14 +2,16 @@ import { createDefaultMiddlewares, createDefaultServerTraefikConfig, createDefaultTraefikConfig, - initializeNetwork, - initializePostgres, - initializeRedis, - initializeSwarm, initializeTraefik, - setupDirectories, -} from "@dokploy/server"; +} from "@dokploy/server/dist/setup/traefik-setup"; +import { setupDirectories } from "@dokploy/server/dist/setup/config-paths"; +import { initializePostgres } from "@dokploy/server/dist/setup/postgres-setup"; +import { initializeRedis } from "@dokploy/server/dist/setup/redis-setup"; +import { + initializeNetwork, + initializeSwarm, +} from "@dokploy/server/dist/setup/setup"; (async () => { try { setupDirectories(); diff --git a/apps/website/app/[locale]/layout.tsx b/apps/website/app/[locale]/layout.tsx index 89e15a9b0..04f359e54 100644 --- a/apps/website/app/[locale]/layout.tsx +++ b/apps/website/app/[locale]/layout.tsx @@ -6,6 +6,8 @@ import GoogleAnalytics from "@/components/analitycs/google"; import { NextIntlClientProvider } from "next-intl"; import { getMessages } from "next-intl/server"; +import { Footer } from "@/components/Footer"; +import { Header } from "@/components/Header"; import type { Metadata } from "next"; export const metadata: Metadata = { @@ -89,7 +91,9 @@ export default async function RootLayout({ +
{children} +