From 8513f093f7daa4e64b51ab7ee0b66163cf5865d8 Mon Sep 17 00:00:00 2001
From: Nevo David <me@nevos.io>
Date: Fri, 16 May 2025 12:44:17 +0700
Subject: [PATCH] feat: remove tracking from extension

---
 .../{ => (app)}/(preview)/p/[id]/layout.tsx   |  0
 .../app/{ => (app)}/(preview)/p/[id]/page.tsx |  0
 .../app/{ => (app)}/(site)/analytics/page.tsx |  0
 .../(site)/billing/lifetime/page.tsx          |  0
 .../app/{ => (app)}/(site)/billing/page.tsx   |  0
 .../src/app/{ => (app)}/(site)/err/page.tsx   |  0
 .../social/[provider]/continue/page.tsx       |  0
 .../integrations/social/[provider]/page.tsx   |  0
 .../(site)/integrations/social/layout.tsx     |  0
 .../app/{ => (app)}/(site)/launches/page.tsx  |  0
 .../src/app/{ => (app)}/(site)/layout.tsx     |  0
 .../(site)/marketplace/buyer/page.tsx         |  0
 .../{ => (app)}/(site)/marketplace/layout.tsx |  0
 .../{ => (app)}/(site)/marketplace/page.tsx   |  0
 .../(site)/marketplace/seller/page.tsx        |  0
 .../{ => (app)}/(site)/messages/[id]/page.tsx |  0
 .../{ => (app)}/(site)/messages/layout.tsx    |  0
 .../app/{ => (app)}/(site)/messages/page.tsx  |  0
 .../src/app/{ => (app)}/(site)/plugs/page.tsx |  0
 .../app/{ => (app)}/(site)/settings/page.tsx  |  0
 .../api/uploads/[[...path]]/route.ts          |  0
 .../{ => (app)}/auth/activate/[code]/page.tsx |  0
 .../app/{ => (app)}/auth/activate/page.tsx    |  0
 .../{ => (app)}/auth/forgot/[token]/page.tsx  |  0
 .../src/app/{ => (app)}/auth/forgot/page.tsx  |  0
 .../src/app/{ => (app)}/auth/layout.tsx       |  0
 .../src/app/{ => (app)}/auth/login/page.tsx   |  0
 .../src/app/{ => (app)}/auth/page.tsx         |  0
 .../{ => (app)}/auth/return.url.component.tsx |  0
 apps/frontend/src/app/{ => (app)}/layout.tsx  |  2 +-
 apps/frontend/src/app/(extension)/layout.tsx  | 53 +++++++++++++++++++
 .../modal/[style]/[platform]/page.tsx         |  0
 .../{(modal) => (extension)/modal}/layout.tsx |  0
 .../src/components/layout/layout.context.tsx  |  2 +-
 34 files changed, 55 insertions(+), 2 deletions(-)
 rename apps/frontend/src/app/{ => (app)}/(preview)/p/[id]/layout.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(preview)/p/[id]/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/analytics/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/billing/lifetime/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/billing/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/err/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/integrations/social/[provider]/continue/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/integrations/social/[provider]/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/integrations/social/layout.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/launches/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/layout.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/marketplace/buyer/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/marketplace/layout.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/marketplace/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/marketplace/seller/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/messages/[id]/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/messages/layout.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/messages/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/plugs/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/(site)/settings/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/api/uploads/[[...path]]/route.ts (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/activate/[code]/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/activate/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/forgot/[token]/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/forgot/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/layout.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/login/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/page.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/auth/return.url.component.tsx (100%)
 rename apps/frontend/src/app/{ => (app)}/layout.tsx (99%)
 create mode 100644 apps/frontend/src/app/(extension)/layout.tsx
 rename apps/frontend/src/app/{(modal) => (extension)}/modal/[style]/[platform]/page.tsx (100%)
 rename apps/frontend/src/app/{(modal) => (extension)/modal}/layout.tsx (100%)

diff --git a/apps/frontend/src/app/(preview)/p/[id]/layout.tsx b/apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/(preview)/p/[id]/layout.tsx
rename to apps/frontend/src/app/(app)/(preview)/p/[id]/layout.tsx
diff --git a/apps/frontend/src/app/(preview)/p/[id]/page.tsx b/apps/frontend/src/app/(app)/(preview)/p/[id]/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(preview)/p/[id]/page.tsx
rename to apps/frontend/src/app/(app)/(preview)/p/[id]/page.tsx
diff --git a/apps/frontend/src/app/(site)/analytics/page.tsx b/apps/frontend/src/app/(app)/(site)/analytics/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/analytics/page.tsx
rename to apps/frontend/src/app/(app)/(site)/analytics/page.tsx
diff --git a/apps/frontend/src/app/(site)/billing/lifetime/page.tsx b/apps/frontend/src/app/(app)/(site)/billing/lifetime/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/billing/lifetime/page.tsx
rename to apps/frontend/src/app/(app)/(site)/billing/lifetime/page.tsx
diff --git a/apps/frontend/src/app/(site)/billing/page.tsx b/apps/frontend/src/app/(app)/(site)/billing/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/billing/page.tsx
rename to apps/frontend/src/app/(app)/(site)/billing/page.tsx
diff --git a/apps/frontend/src/app/(site)/err/page.tsx b/apps/frontend/src/app/(app)/(site)/err/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/err/page.tsx
rename to apps/frontend/src/app/(app)/(site)/err/page.tsx
diff --git a/apps/frontend/src/app/(site)/integrations/social/[provider]/continue/page.tsx b/apps/frontend/src/app/(app)/(site)/integrations/social/[provider]/continue/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/integrations/social/[provider]/continue/page.tsx
rename to apps/frontend/src/app/(app)/(site)/integrations/social/[provider]/continue/page.tsx
diff --git a/apps/frontend/src/app/(site)/integrations/social/[provider]/page.tsx b/apps/frontend/src/app/(app)/(site)/integrations/social/[provider]/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/integrations/social/[provider]/page.tsx
rename to apps/frontend/src/app/(app)/(site)/integrations/social/[provider]/page.tsx
diff --git a/apps/frontend/src/app/(site)/integrations/social/layout.tsx b/apps/frontend/src/app/(app)/(site)/integrations/social/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/integrations/social/layout.tsx
rename to apps/frontend/src/app/(app)/(site)/integrations/social/layout.tsx
diff --git a/apps/frontend/src/app/(site)/launches/page.tsx b/apps/frontend/src/app/(app)/(site)/launches/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/launches/page.tsx
rename to apps/frontend/src/app/(app)/(site)/launches/page.tsx
diff --git a/apps/frontend/src/app/(site)/layout.tsx b/apps/frontend/src/app/(app)/(site)/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/layout.tsx
rename to apps/frontend/src/app/(app)/(site)/layout.tsx
diff --git a/apps/frontend/src/app/(site)/marketplace/buyer/page.tsx b/apps/frontend/src/app/(app)/(site)/marketplace/buyer/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/marketplace/buyer/page.tsx
rename to apps/frontend/src/app/(app)/(site)/marketplace/buyer/page.tsx
diff --git a/apps/frontend/src/app/(site)/marketplace/layout.tsx b/apps/frontend/src/app/(app)/(site)/marketplace/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/marketplace/layout.tsx
rename to apps/frontend/src/app/(app)/(site)/marketplace/layout.tsx
diff --git a/apps/frontend/src/app/(site)/marketplace/page.tsx b/apps/frontend/src/app/(app)/(site)/marketplace/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/marketplace/page.tsx
rename to apps/frontend/src/app/(app)/(site)/marketplace/page.tsx
diff --git a/apps/frontend/src/app/(site)/marketplace/seller/page.tsx b/apps/frontend/src/app/(app)/(site)/marketplace/seller/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/marketplace/seller/page.tsx
rename to apps/frontend/src/app/(app)/(site)/marketplace/seller/page.tsx
diff --git a/apps/frontend/src/app/(site)/messages/[id]/page.tsx b/apps/frontend/src/app/(app)/(site)/messages/[id]/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/messages/[id]/page.tsx
rename to apps/frontend/src/app/(app)/(site)/messages/[id]/page.tsx
diff --git a/apps/frontend/src/app/(site)/messages/layout.tsx b/apps/frontend/src/app/(app)/(site)/messages/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/messages/layout.tsx
rename to apps/frontend/src/app/(app)/(site)/messages/layout.tsx
diff --git a/apps/frontend/src/app/(site)/messages/page.tsx b/apps/frontend/src/app/(app)/(site)/messages/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/messages/page.tsx
rename to apps/frontend/src/app/(app)/(site)/messages/page.tsx
diff --git a/apps/frontend/src/app/(site)/plugs/page.tsx b/apps/frontend/src/app/(app)/(site)/plugs/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/plugs/page.tsx
rename to apps/frontend/src/app/(app)/(site)/plugs/page.tsx
diff --git a/apps/frontend/src/app/(site)/settings/page.tsx b/apps/frontend/src/app/(app)/(site)/settings/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(site)/settings/page.tsx
rename to apps/frontend/src/app/(app)/(site)/settings/page.tsx
diff --git a/apps/frontend/src/app/api/uploads/[[...path]]/route.ts b/apps/frontend/src/app/(app)/api/uploads/[[...path]]/route.ts
similarity index 100%
rename from apps/frontend/src/app/api/uploads/[[...path]]/route.ts
rename to apps/frontend/src/app/(app)/api/uploads/[[...path]]/route.ts
diff --git a/apps/frontend/src/app/auth/activate/[code]/page.tsx b/apps/frontend/src/app/(app)/auth/activate/[code]/page.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/activate/[code]/page.tsx
rename to apps/frontend/src/app/(app)/auth/activate/[code]/page.tsx
diff --git a/apps/frontend/src/app/auth/activate/page.tsx b/apps/frontend/src/app/(app)/auth/activate/page.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/activate/page.tsx
rename to apps/frontend/src/app/(app)/auth/activate/page.tsx
diff --git a/apps/frontend/src/app/auth/forgot/[token]/page.tsx b/apps/frontend/src/app/(app)/auth/forgot/[token]/page.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/forgot/[token]/page.tsx
rename to apps/frontend/src/app/(app)/auth/forgot/[token]/page.tsx
diff --git a/apps/frontend/src/app/auth/forgot/page.tsx b/apps/frontend/src/app/(app)/auth/forgot/page.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/forgot/page.tsx
rename to apps/frontend/src/app/(app)/auth/forgot/page.tsx
diff --git a/apps/frontend/src/app/auth/layout.tsx b/apps/frontend/src/app/(app)/auth/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/layout.tsx
rename to apps/frontend/src/app/(app)/auth/layout.tsx
diff --git a/apps/frontend/src/app/auth/login/page.tsx b/apps/frontend/src/app/(app)/auth/login/page.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/login/page.tsx
rename to apps/frontend/src/app/(app)/auth/login/page.tsx
diff --git a/apps/frontend/src/app/auth/page.tsx b/apps/frontend/src/app/(app)/auth/page.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/page.tsx
rename to apps/frontend/src/app/(app)/auth/page.tsx
diff --git a/apps/frontend/src/app/auth/return.url.component.tsx b/apps/frontend/src/app/(app)/auth/return.url.component.tsx
similarity index 100%
rename from apps/frontend/src/app/auth/return.url.component.tsx
rename to apps/frontend/src/app/(app)/auth/return.url.component.tsx
diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/(app)/layout.tsx
similarity index 99%
rename from apps/frontend/src/app/layout.tsx
rename to apps/frontend/src/app/(app)/layout.tsx
index a275d788..091e70d2 100644
--- a/apps/frontend/src/app/layout.tsx
+++ b/apps/frontend/src/app/(app)/layout.tsx
@@ -1,6 +1,6 @@
 import interClass from '@gitroom/react/helpers/inter.font';
 export const dynamic = 'force-dynamic';
-import './global.scss';
+import '../global.scss';
 import 'react-tooltip/dist/react-tooltip.css';
 import '@copilotkit/react-ui/styles.css';
 
diff --git a/apps/frontend/src/app/(extension)/layout.tsx b/apps/frontend/src/app/(extension)/layout.tsx
new file mode 100644
index 00000000..ad74059f
--- /dev/null
+++ b/apps/frontend/src/app/(extension)/layout.tsx
@@ -0,0 +1,53 @@
+import interClass from '@gitroom/react/helpers/inter.font';
+export const dynamic = 'force-dynamic';
+import '../global.scss';
+import 'react-tooltip/dist/react-tooltip.css';
+import '@copilotkit/react-ui/styles.css';
+
+import LayoutContext from '@gitroom/frontend/components/layout/layout.context';
+import { ReactNode } from 'react';
+import { Chakra_Petch } from 'next/font/google';
+import PlausibleProvider from 'next-plausible';
+import clsx from 'clsx';
+import { VariableContextComponent } from '@gitroom/react/helpers/variable.context';
+import { Fragment } from 'react';
+import UtmSaver from '@gitroom/helpers/utils/utm.saver';
+
+const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'] });
+
+export default async function AppLayout({ children }: { children: ReactNode }) {
+  return (
+    <html className={interClass}>
+      <head>
+        <link rel="icon" href="/favicon.ico" sizes="any" />
+      </head>
+      <body className={clsx(chakra.className, 'dark text-primary !bg-primary')}>
+        <VariableContextComponent
+          storageProvider={
+            process.env.STORAGE_PROVIDER! as 'local' | 'cloudflare'
+          }
+          backendUrl={process.env.NEXT_PUBLIC_BACKEND_URL!}
+          plontoKey={process.env.NEXT_PUBLIC_POLOTNO!}
+          billingEnabled={!!process.env.STRIPE_PUBLISHABLE_KEY}
+          discordUrl={process.env.NEXT_PUBLIC_DISCORD_SUPPORT!}
+          frontEndUrl={process.env.FRONTEND_URL!}
+          isGeneral={!!process.env.IS_GENERAL}
+          genericOauth={!!process.env.POSTIZ_GENERIC_OAUTH}
+          oauthLogoUrl={process.env.NEXT_PUBLIC_POSTIZ_OAUTH_LOGO_URL!}
+          oauthDisplayName={process.env.NEXT_PUBLIC_POSTIZ_OAUTH_DISPLAY_NAME!}
+          uploadDirectory={process.env.NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY!}
+          tolt={process.env.NEXT_PUBLIC_TOLT!}
+          facebookPixel={process.env.NEXT_PUBLIC_FACEBOOK_PIXEL!}
+          telegramBotName={process.env.TELEGRAM_BOT_NAME!}
+          neynarClientId={process.env.NEYNAR_CLIENT_ID!}
+          isSecured={!process.env.NOT_SECURED}
+        >
+          <LayoutContext>
+            <UtmSaver />
+            {children}
+          </LayoutContext>
+        </VariableContextComponent>
+      </body>
+    </html>
+  );
+}
diff --git a/apps/frontend/src/app/(modal)/modal/[style]/[platform]/page.tsx b/apps/frontend/src/app/(extension)/modal/[style]/[platform]/page.tsx
similarity index 100%
rename from apps/frontend/src/app/(modal)/modal/[style]/[platform]/page.tsx
rename to apps/frontend/src/app/(extension)/modal/[style]/[platform]/page.tsx
diff --git a/apps/frontend/src/app/(modal)/layout.tsx b/apps/frontend/src/app/(extension)/modal/layout.tsx
similarity index 100%
rename from apps/frontend/src/app/(modal)/layout.tsx
rename to apps/frontend/src/app/(extension)/modal/layout.tsx
diff --git a/apps/frontend/src/components/layout/layout.context.tsx b/apps/frontend/src/components/layout/layout.context.tsx
index 86145728..c4af5eb4 100644
--- a/apps/frontend/src/components/layout/layout.context.tsx
+++ b/apps/frontend/src/components/layout/layout.context.tsx
@@ -3,7 +3,7 @@
 import { ReactNode, useCallback } from 'react';
 import { FetchWrapperComponent } from '@gitroom/helpers/utils/custom.fetch';
 import { deleteDialog } from '@gitroom/react/helpers/delete.dialog';
-import { useReturnUrl } from '@gitroom/frontend/app/auth/return.url.component';
+import { useReturnUrl } from '@gitroom/frontend/app/(app)/auth/return.url.component';
 import { useVariables } from '@gitroom/react/helpers/variable.context';
 
 export default function LayoutContext(params: { children: ReactNode }) {