Merge branch 'gitroomhq:main' into discord_limit_fix

aryanp-86 · web-flow · commit f72b938d42e2 · 2024-10-27T14:24:40.000+05:30
diff --git a/apps/frontend/src/app/layout.tsx b/apps/frontend/src/app/layout.tsx
@@ -10,10 +10,15 @@ 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';
 
 const chakra = Chakra_Petch({ weight: '400', subsets: ['latin'] });
 
 export default async function AppLayout({ children }: { children: ReactNode }) {
+  const Plausible = !!process.env.STRIPE_PUBLISHABLE_KEY
+    ? PlausibleProvider
+    : Fragment;
+
   return (
     <html className={interClass}>
       <head>
@@ -25,7 +30,9 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
       </head>
       <body className={clsx(chakra.className, 'text-primary dark')}>
         <VariableContextComponent
-          storageProvider={process.env.STORAGE_PROVIDER! as 'local' | 'cloudflare'}
+          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}
@@ -34,11 +41,11 @@ export default async function AppLayout({ children }: { children: ReactNode }) {
           isGeneral={!!process.env.IS_GENERAL}
           uploadDirectory={process.env.NEXT_PUBLIC_UPLOAD_STATIC_DIRECTORY!}
         >
-          <PlausibleProvider
+          <Plausible
             domain={!!process.env.IS_GENERAL ? 'postiz.com' : 'gitroom.com'}
           >
             <LayoutContext>{children}</LayoutContext>
-          </PlausibleProvider>
+          </Plausible>
         </VariableContextComponent>
       </body>
     </html>
diff --git a/apps/frontend/src/components/billing/main.billing.component.tsx b/apps/frontend/src/components/billing/main.billing.component.tsx
@@ -24,6 +24,7 @@ import { useModals } from '@mantine/modals';
 import { AddProviderComponent } from '@gitroom/frontend/components/launches/add.provider.component';
 import { TopTitle } from '@gitroom/frontend/components/launches/helpers/top.title.component';
 import { Textarea } from '@gitroom/react/form/textarea';
+import { useFireEvents } from '@gitroom/helpers/utils/use.fire.events';
 
 export interface Tiers {
   month: Array<{
@@ -156,9 +157,11 @@ export const Features: FC<{
 const Info: FC<{ proceed: (feedback: string) => void }> = (props) => {
   const [feedback, setFeedback] = useState('');
   const modal = useModals();
+  const events = useFireEvents();
 
   const cancel = useCallback(() => {
     props.proceed(feedback);
+    events('cancel_subscription');
     modal.closeAll();
   }, [modal, feedback]);
 
diff --git a/libraries/helpers/src/utils/use.fire.events.ts b/libraries/helpers/src/utils/use.fire.events.ts
@@ -1,9 +1,14 @@
-import {usePlausible} from 'next-plausible'
-import {useCallback} from "react";
+import { usePlausible } from 'next-plausible';
+import { useCallback } from 'react';
+import { useVariables } from '@gitroom/react/helpers/variable.context';
 
 export const useFireEvents = () => {
-    const plausible = usePlausible();
-    return useCallback((name: string, props?: any) => {
-        plausible(name, {props});
-    }, []);
-}
+  const { billingEnabled } = useVariables();
+  const plausible = usePlausible();
+  return useCallback((name: string, props?: any) => {
+    if (!billingEnabled) {
+      return;
+    }
+    plausible(name, { props });
+  }, []);
+};
diff --git a/libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts b/libraries/nestjs-libraries/src/database/prisma/organizations/organization.repository.ts
@@ -149,7 +149,7 @@ export class OrganizationRepository {
       });
 
     if (
-      !process.env.STRIPE_PUBLISHABLE_KEY ||
+      process.env.STRIPE_PUBLISHABLE_KEY &&
       checkForSubscription?.subscription?.subscriptionTier !==
         SubscriptionTier.PRO
     ) {
diff --git a/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts b/libraries/nestjs-libraries/src/integrations/social/tiktok.provider.ts
@@ -78,10 +78,10 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
         `?client_key=${process.env.TIKTOK_CLIENT_ID}` +
         `&redirect_uri=${encodeURIComponent(
           `${
-            process.env.NODE_ENV === 'development' || !process.env.NODE_ENV
-              ? `https://integration.git.sn/integrations/social/tiktok`
-              : `${process.env.FRONTEND_URL}/integrations/social/tiktok`
-          }`
+            process?.env?.FRONTEND_URL?.indexOf('https') === -1
+              ? 'https://redirectmeto.com/'
+              : ''
+          }${process?.env?.FRONTEND_URL}/integrations/social/tiktok`
         )}` +
         `&state=${state}` +
         `&response_type=code` +
@@ -199,7 +199,9 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
             ? `https://www.tiktok.com/@${id}`
             : `https://www.tiktok.com/@${id}/video/` +
               publicaly_available_post_id,
-          id: !publicaly_available_post_id ? publishId : publicaly_available_post_id?.[0],
+          id: !publicaly_available_post_id
+            ? publishId
+            : publicaly_available_post_id?.[0],
         };
       }
 
@@ -210,7 +212,6 @@ export class TiktokProvider extends SocialAbstract implements SocialProvider {
         });
       }
 
-
       await timer(3000);
     }
   }
diff --git a/package-lock.json b/package-lock.json
