refactor(dokploy): add umami and update favicon

.github/workflows/deploy.yml

@@ -74,7 +74,8 @@ jobs:
           platforms: linux/amd64
           build-args: |
             NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=${{ github.ref_name == 'main' && 'pk_live_51QAm7bF3cxQuHeOzMpfNfJIch6oLif8rS32pRE392CdTbBf0MYBdbapAxarQGspqJBWT2nVOxu8e6ZHrHB4NhVHG008DE2A90d' || 'pk_test_51QAm7bF3cxQuHeOz0xg04o9teeyTbbNHQPJ5Tr98MlTEan9MzewT3gwh0jSWBNvrRWZ5vASoBgxUSF4gPWsJwATk00Ir2JZ0S1' }}
-
+            NEXT_PUBLIC_UMAMI_HOST="https://umami.dokploy.com/script.js"
+            NEXT_PUBLIC_UMAMI_WEBSITE_ID="ef083745-e111-4bac-9fe6-c549807adefe"
   build-and-push-schedule-image:
     runs-on: ubuntu-latest
 

Dockerfile.cloud

@@ -14,8 +14,15 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm --filter=@dokploy/server
 
 
 # Deploy only the dokploy app
+ARG NEXT_PUBLIC_UMAMI_HOST
+ENV NEXT_PUBLIC_UMAMI_HOST=$NEXT_PUBLIC_UMAMI_HOST
+
+ARG NEXT_PUBLIC_UMAMI_WEBSITE_ID
+ENV NEXT_PUBLIC_UMAMI_WEBSITE_ID=$NEXT_PUBLIC_UMAMI_WEBSITE_ID
+
 ARG NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
 ENV NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=$NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY
+
 ENV NODE_ENV=production
 RUN pnpm --filter=@dokploy/server switch:prod
 RUN pnpm --filter=@dokploy/server build

apps/docs/app/[lang]/layout.tsx

@@ -63,6 +63,13 @@ export default function Layout({
 			className={inter.className}
 			suppressHydrationWarning
 		>
+			<head>
+				<script
+					defer
+					src="https://umami.dokploy.com/script.js"
+					data-website-id="6ad2aa56-6d38-4f39-97a8-1a8fcdda8d51"
+				/>
+			</head>
 			<GoogleAnalytics />
 			<body>
 				<I18nProvider

apps/dokploy/pages/_app.tsx

@@ -7,6 +7,7 @@ import { ThemeProvider } from "next-themes";
 import type { AppProps } from "next/app";
 import { Inter } from "next/font/google";
 import Head from "next/head";
+import Script from "next/script";
 import type { ReactElement, ReactNode } from "react";
 
 const inter = Inter({ subsets: ["latin"] });
@@ -35,6 +36,14 @@ const MyApp = ({
       `}</style>
 			<Head>
 				<title>Dokploy</title>
+				{process.env.NEXT_PUBLIC_UMAMI_HOST &&
+					process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID && (
+						<Script
+							defer
+							src={process.env.NEXT_PUBLIC_UMAMI_HOST}
+							data-website-id={process.env.NEXT_PUBLIC_UMAMI_WEBSITE_ID}
+						/>
+					)}
 			</Head>
 			<ThemeProvider
 				attribute="class"

apps/dokploy/pages/_document.tsx

@@ -3,8 +3,9 @@ import { Head, Html, Main, NextScript } from "next/document";
 export default function Document() {
 	return (
 		<Html lang="en" className="font-sans">
-			<Head />
+			<Head>
-
+				<link rel="icon" href="/icon.svg" />
+			</Head>
 			<body className="flex h-full flex-col font-sans">
 				<Main />
 				<NextScript />

apps/website/app/[locale]/layout.tsx

@@ -1,8 +1,6 @@
 import clsx from "clsx";
 import { Inter, Lexend } from "next/font/google";
 import "@/styles/tailwind.css";
-import GoogleAnalytics from "@/components/analitycs/google";
-
 import { NextIntlClientProvider } from "next-intl";
 import { getMessages } from "next-intl/server";
 
@@ -88,7 +86,14 @@ export default async function RootLayout({
 			lang={locale}
 			className={clsx("h-full scroll-smooth", inter.variable, lexend.variable)}
 		>
-			<GoogleAnalytics />
+			<head>
+				<script
+					defer
+					src="https://umami.dokploy.com/script.js"
+					data-website-id="7d1422e4-3776-4870-8145-7d7b2075d470"
+				/>
+			</head>
+			{/* <GoogleAnalytics /> */}
 			<body className="flex h-full flex-col">
 				<NextIntlClientProvider messages={messages}>
 					<Header />

pnpm-lock.yaml

@@ -13454,7 +13454,7 @@ snapshots:
       eslint: 8.45.0
       eslint-import-resolver-node: 0.3.9
       eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]([email protected]))([email protected])
-      eslint-plugin-import: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
+      eslint-plugin-import: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]([email protected]))([email protected]))([email protected])
       eslint-plugin-jsx-a11y: 6.9.0([email protected])
       eslint-plugin-react: 7.35.0([email protected])
       eslint-plugin-react-hooks: 5.0.0-canary-7118f5dd7-20230705([email protected])
@@ -13478,7 +13478,7 @@ snapshots:
       enhanced-resolve: 5.17.1
       eslint: 8.45.0
       eslint-module-utils: 2.8.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]([email protected]))([email protected]))([email protected])
-      eslint-plugin-import: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected])
+      eslint-plugin-import: 2.29.1(@typescript-eslint/[email protected]([email protected])([email protected]))([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]([email protected]))([email protected]))([email protected])
       fast-glob: 3.3.2
       get-tsconfig: 4.7.5
       is-core-module: 2.15.0
@@ -13500,7 +13500,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]):
+  [email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected](@typescript-eslint/[email protected]([email protected])([email protected]))([email protected])([email protected]([email protected]))([email protected]))([email protected]):
     dependencies:
       array-includes: 3.1.8
       array.prototype.findlastindex: 1.2.5