Merge pull request #567 from Dokploy/canary

v0.10.1
Dokploy · Oct 19, 2024 · df9fad0 · df9fad0
2 parents 2644b63 + 7d5a660
commit df9fad0
Show file tree

Hide file tree

Showing 21 changed files with 801 additions and 60 deletions.
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1 @@
+npx commitlint --edit "$1"
diff --git a/.husky/install.mjs 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
@@ -0,0 +1,2 @@
+pnpm run check
+git add .
diff --git 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
@@ -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
@@ -178,7 +178,7 @@ export default function Home() {
 							<div className="mt-4 text-sm flex flex-row justify-center gap-2">
 								<Link
 									className="hover:underline text-muted-foreground"
-									href="https://docs.dokploy.com/get-started/reset-password"
+									href="https://docs.dokploy.com/docs/core/get-started/reset-password"
 									target="_blank"
 								>
 									Lost your password?

diff --git 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
@@ -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({
 			<GoogleAnalytics />
 			<body className="flex h-full flex-col">
 				<NextIntlClientProvider messages={messages}>
+					<Header />
 					{children}
+					<Footer />
 				</NextIntlClientProvider>
 			</body>
 		</html>

diff --git a/apps/website/app/[locale]/page.tsx b/apps/website/app/[locale]/page.tsx
@@ -1,24 +1,19 @@
 import { CallToAction } from "@/components/CallToAction";
 import { Faqs } from "@/components/Faqs";
-import { Footer } from "@/components/Footer";
-import { Header } from "@/components/Header";
 import { Hero } from "@/components/Hero";
 import { PrimaryFeatures } from "@/components/PrimaryFeatures";
 import { SecondaryFeatures } from "@/components/SecondaryFeatures";
-import { Testimonials } from "../../components/Testimonials";
 
 export default function Home() {
 	return (
 		<div>
-			<Header />
 			<main>
 				<Hero />
 				<PrimaryFeatures />
 				<SecondaryFeatures />
 				<CallToAction />
 				{/* <Testimonials /> */}
 				<Faqs />
-				<Footer />
 			</main>
 		</div>
 	);

diff --git a/apps/website/app/[locale]/pricing/page.tsx b/apps/website/app/[locale]/pricing/page.tsx
@@ -0,0 +1,9 @@
+import { Pricing } from "@/components/pricing";
+
+export default function Home() {
+	return (
+		<div className="w-full">
+			<Pricing />
+		</div>
+	);
+}
diff --git a/apps/website/app/[locale]/privacy/page.tsx b/apps/website/app/[locale]/privacy/page.tsx
@@ -0,0 +1,111 @@
+export default function Home() {
+	return (
+		<div className="flex flex-col gap-4 w-full max-w-4xl mx-auto">
+			<h1 className="text-3xl font-bold text-center mb-6">Privacy</h1>
+
+			<section className="flex flex-col gap-2">
+				<p>
+					At Dokploy, we are committed to protecting your privacy. This Privacy
+					Policy explains how we collect, use, and safeguard your personal
+					information when you use our website and services.
+				</p>
+				<p>
+					By using Dokploy, you agree to the collection and use of information
+					in accordance with this Privacy Policy. If you do not agree with these
+					practices, please do not use our services.
+				</p>
+				<h2 className="text-2xl font-semibold mb-4">
+					1. Information We Collect
+				</h2>
+				<p className="">
+					We only collect limited, non-personal data through Umami Analytics, a
+					privacy-focused analytics tool. No personal identifying information
+					(PII) is collected. The data we collect includes:
+				</p>
+				<ul className="list-disc list-inside mb-4">
+					<li>Website usage statistics (e.g., page views, session duration)</li>
+					<li>Anonymized IP addresses</li>
+					<li>Referring websites</li>
+					<li>Browser and device type</li>
+				</ul>
+			</section>
+
+			<section className="">
+				<h2 className="text-2xl font-semibold mb-4">
+					2. How We Use the Information
+				</h2>
+				<p className="mb-4">
+					The information we collect is used solely for improving the
+					functionality and user experience of our platform. Specifically, we
+					use it to:
+				</p>
+				<ul className="list-disc list-inside mb-4">
+					<li>Monitor traffic and website performance</li>
+					<li>Optimize the user experience</li>
+					<li>Understand how users interact with our platform</li>
+				</ul>
+				<p>
+					Additionally, we use a single cookie to manage user sessions, which is
+					necessary for the proper functioning of the platform.
+				</p>
+			</section>
+
+			<section className="flex flex-col gap-2">
+				<h2 className="text-2xl font-semibold mb-4">3. Data Security</h2>
+				<p className="">
+					We take reasonable precautions to protect your data. Since we do not
+					collect personal information, the risk of data misuse is minimized.
+					Umami Analytics is privacy-friendly and does not rely on cookies or
+					store PII.
+				</p>
+			</section>
+
+			<section className="">
+				<h2 className="text-2xl font-semibold mb-4">4. Third-Party Services</h2>
+
+				<p>
+					We do not share your data with any third-party services other than
+					Umami Analytics. We do not sell, trade, or transfer your data to
+					outside parties.
+				</p>
+			</section>
+
+			<section className="">
+				<h2 className="text-2xl font-semibold mb-4">5. Cookies</h2>
+				<p className="mb-4">
+					Dokploy does not use cookies to track user activity. Umami Analytics
+					is cookie-free and does not require any tracking cookies for its
+					functionality.
+				</p>
+			</section>
+
+			<section className="flex flex-col gap-2">
+				<h2 className="text-2xl font-semibold mb-4">
+					6. Changes to This Privacy Policy
+				</h2>
+				<p className="">
+					We may update this Privacy Policy from time to time. Any changes will
+					be posted on this page, and it is your responsibility to review this
+					policy periodically.
+				</p>
+			</section>
+
+			<section className="">
+				<h2 className="text-2xl font-semibold mb-4">12. Contact Information</h2>
+				<p className="mb-4">
+					If you have any questions or concerns regarding these Privacy Policy,
+					please contact us at:
+				</p>
+				<p className="mb-4">
+					Email:
+					<a
+						href="mailto:[email protected]"
+						className="text-blue-500 hover:underline"
+					>
+						[email protected]
+					</a>
+				</p>
+			</section>
+		</div>
+	);
+}