Merge branch 'crescents-stack:main' into main

musiur · Jan 20, 2025 · d8f678f · d8f678f
2 parents e79b0b5 + be77d59
commit d8f678f
Show file tree

Hide file tree

Showing 17 changed files with 112 additions and 70 deletions.
diff --git a/src/app/_utils/calendly.tsx b/src/app/_utils/calendly.tsx
@@ -1,8 +1,6 @@
 "use client";
 
 import SectionHead from "@/components/molecule/section-head";
-import Script from "next/script";
-import { InlineWidget } from "react-calendly";
 import NeetoCal from "./neetocal";
 
 const Calendly = () => {

diff --git a/src/app/_utils/herosection.tsx b/src/app/_utils/herosection.tsx
@@ -1,9 +1,5 @@
 "use client";
-import Image from "next/image";
 import { ReactElement } from "react";
-
-import { BrandCarousel } from "@/app/_utils/carousel";
-import VideoPlayer from "@/app/_utils/video-player";
 import GetConsultation from "@/components/molecule/get-consultation";
 import GetAQuote from "@/components/molecule/get-a-quote";
 import ANIM__FadeInOnScroll from "@/components/anims/fadein.anim";

diff --git a/src/app/joining/_utils/google-ads-form.tsx b/src/app/joining/_utils/google-ads-form.tsx
@@ -46,15 +46,15 @@ function GoogleAdsForm() {
 
             DL___FormData(
               data,
-              "joiningGoogleAdsFormSubmission",
-              "joining_google_ads_form_submission"
+              "joiningFormSubmission",
+              "google_ads"
             );
             router.push("/joining/end?type=googleads");
           } else {
             DL___FormData(
               data,
-              "joiningGoogleAdsFormAbandoned",
-              "joining_google_ads_form_abandoned"
+              "joiningFormAbandoned",
+              "google_ads"
             );
           }
         }
@@ -65,8 +65,8 @@ function GoogleAdsForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningGoogleAdsFormProcessing",
-      "joining_google_ads_form_processing"
+      "joiningFormProcessing",
+      "google_ads"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/google-analytics-form.tsx b/src/app/joining/_utils/google-analytics-form.tsx
@@ -46,15 +46,15 @@ function GoogleAnalyticsForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningGoogleAnalyticsFormSubmission",
-              "joining_google_analytics_form_submission"
+              "joiningFormSubmission",
+              "google_analytics"
             );
             router.push("/joining/end?type=googleanalytics");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningGoogleAnalyticsFormAbandoned",
-              "joining_google_analytics_form_abandoned"
+              "joiningFormAbandoned",
+              "google_analytics"
             );
           }
         }
@@ -65,8 +65,8 @@ function GoogleAnalyticsForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningGoogleAnalyticsFormProcessing",
-      "joining_google_analytics_form_processing"
+      "joiningFormProcessing",
+      "google_analytics"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/shopify-development-form.tsx b/src/app/joining/_utils/shopify-development-form.tsx
@@ -46,15 +46,15 @@ function ShopifyDevelopmentForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningShopifyFormSubmission",
-              "joining_shopify_form_submission"
+              "joiningFormSubmission",
+              "shopify"
             );
             router.push("/joining/end?type=shopify");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningShopifyFormAbandoned",
-              "joining_shopify_form_abandoned"
+              "joiningFormAbandoned",
+              "shopify"
             );
           }
         }
@@ -65,8 +65,8 @@ function ShopifyDevelopmentForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningShopifyFormProcessing",
-      "joining_shopify_form_processing"
+      "joiningFormProcessing",
+      "shopify"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/social-media-paid-ads.tsx b/src/app/joining/_utils/social-media-paid-ads.tsx
@@ -49,15 +49,15 @@ function SocialMediaPaidAdsForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningSocialMediaAdsFormSubmission",
-              "joining_social_media_ads_form_submission"
+              "joiningFormSubmission",
+              "social_media_ads"
             );
             router.push("/joining/end?type=socialmediapaidads");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningSocialMediaAdsFormAbandoned",
-              "joining_social_media_ads_form_abandoned"
+              "joiningFormAbandoned",
+              "social_media_ads"
             );
           }
         }
@@ -68,8 +68,8 @@ function SocialMediaPaidAdsForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningSocialMediaAdsFormProcessing",
-      "joining_social_media_ads_form_processing"
+      "joiningFormProcessing",
+      "social_media_ads"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/software-development-form.tsx b/src/app/joining/_utils/software-development-form.tsx
@@ -46,15 +46,15 @@ function SoftwareDevelopmentForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningSoftwareFormSubmission",
-              "joining_software_form_submission"
+              "joiningFormSubmission",
+              "software"
             );
             router.push("/joining/end?type=software");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningSoftwareFormAbandoned",
-              "joining_software_form_abandoned"
+              "joiningFormAbandoned",
+              "software"
             );
           }
         }
@@ -65,8 +65,8 @@ function SoftwareDevelopmentForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningSoftwareFormProcessing",
-      "joining_software_form_processing"
+      "joiningFormProcessing",
+      "software"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/uiux-form.tsx b/src/app/joining/_utils/uiux-form.tsx
@@ -47,15 +47,15 @@ function UiUxForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningUiUxFormSubmission",
-              "joining_uiux_form_submission"
+              "joiningFormSubmission",
+              "uiux"
             );
             router.push("/joining/end?type=uiux");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningUiUxFormAbandoned",
-              "joining_uiux_form_abandoned"
+              "joiningFormAbandoned",
+              "uiux"
             );
           }
         }
@@ -66,8 +66,8 @@ function UiUxForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningUiUxFormProcessing",
-      "joining_ui_ux_form_processing"
+      "joiningFormProcessing",
+      "ui_ux"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/web-development-form.tsx b/src/app/joining/_utils/web-development-form.tsx
@@ -47,15 +47,15 @@ function WebDevelopmentForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningWebFormSubmission",
-              "joining_web_form_submission"
+              "joiningFormSubmission",
+              "web"
             );
             router.push("/joining/end?type=customwebdev");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningWebFormAbandoned",
-              "joining_web_form_abandoned"
+              "joiningFormAbandoned",
+              "web"
             );
           }
         }
@@ -66,8 +66,8 @@ function WebDevelopmentForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningWebFormSubmissionProcessing",
-      "joining_web_form_submission_processing"
+      "joiningFormProcessing",
+      "web"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/joining/_utils/wordpress-development-form.tsx b/src/app/joining/_utils/wordpress-development-form.tsx
@@ -47,15 +47,15 @@ function WordpressDevelopmentForm() {
 
             DL___FormData(
               form.getValues(),
-              "joiningWordpressFormSubmission",
-              "joining_wordpress_form_submission"
+              "joiningFormSubmission",
+              "wordpress"
             );
             router.push("/joining/end?type=wordpress");
           } else {
             DL___FormData(
               form.getValues(),
-              "joiningWordpressFormAbandoned",
-              "joining_Wordpress_form_abandoned"
+              "joiningFormAbandoned",
+              "wordpress"
             );
           }
         }
@@ -66,8 +66,8 @@ function WordpressDevelopmentForm() {
   useEffect(() => {
     DL___FormData(
       form.getValues(),
-      "joiningWordpressFormProcessing",
-      "joining_wordpress_form_processing"
+      "joiningFormProcessing",
+      "wordpress"
     );
   }, [form.getValues()]);
 

diff --git a/src/app/meet-with-yeatiq/_utils/components/data-layer-pusher-link.tsx b/src/app/meet-with-yeatiq/_utils/components/data-layer-pusher-link.tsx
@@ -0,0 +1,21 @@
+"use client";
+
+import ShimmerButton from "@/components/magicui/shimmer-button";
+import { useRouter } from "next/navigation";
+
+const DataLayerPusherLink = () => {
+  const router = useRouter();
+  const handleDataLayerPusher = () => {
+    window.dataLayer.push({
+      event: "book_free_strategy_session_button_click",
+    });
+    router.push("/meet-with-yeatiq/#contact");
+  };
+  return (
+    <div onClick={handleDataLayerPusher} className="inline-block">
+      <ShimmerButton>Book Your Free Strategy Session Now!</ShimmerButton>
+    </div>
+  );
+};
+
+export default DataLayerPusherLink;
diff --git a/src/app/meet-with-yeatiq/_utils/components/data-layer-pusher.tsx b/src/app/meet-with-yeatiq/_utils/components/data-layer-pusher.tsx
@@ -0,0 +1,20 @@
+"use client";
+import { Button } from "@/components/ui/button";
+import { useRouter } from "next/navigation";
+
+const DataLayerPusher = () => {
+  const router = useRouter();
+  const handleDataLayerPusher = () => {
+    window.dataLayer.push({
+      event: "free_online_session_button_click",
+    });
+    router.push("/get-a-quote");
+  };
+  return (
+    <Button variant="outline" onClick={handleDataLayerPusher}>
+      Free Online Session
+    </Button>
+  );
+};
+
+export default DataLayerPusher;
diff --git a/src/app/meet-with-yeatiq/_utils/sections/free-online-dialogue.tsx b/src/app/meet-with-yeatiq/_utils/sections/free-online-dialogue.tsx
@@ -3,18 +3,15 @@ import { Button } from "@/components/ui/button";
 import {
   Dialog,
   DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
   DialogTrigger,
 } from "@/components/ui/dialog";
+import DataLayerPusher from "../components/data-layer-pusher";
 
 export function FreeOnlineDialogue() {
   return (
     <Dialog>
       <DialogTrigger asChild>
-        <Button variant="outline">Free Online Session</Button>
+        <DataLayerPusher />
       </DialogTrigger>
       <DialogContent className="sm:max-w-[425px] max-h-[80dvh] overflow-y-auto">
         <ContactForm />

diff --git a/src/app/meet-with-yeatiq/_utils/sections/hero.tsx b/src/app/meet-with-yeatiq/_utils/sections/hero.tsx
@@ -1,7 +1,7 @@
 import ShimmerButton from "@/components/magicui/shimmer-button";
-import { Button } from "@/components/ui/button";
 import Link from "next/link";
 import { FreeOnlineDialogue } from "./free-online-dialogue";
+import DataLayerPusherLink from "../components/data-layer-pusher-link";
 
 const LandingHeroSection = () => {
   return (
@@ -17,9 +17,7 @@ const LandingHeroSection = () => {
           glowing reviews, ready to help your business grow.
         </p>
         <div className="flex items-center flex-wrap gap-4">
-          <Link href="/meet-with-yeatiq/#contact" className="inline-block">
-            <ShimmerButton>Book Your Free Strategy Session Now!</ShimmerButton>
-          </Link>
+          <DataLayerPusherLink />
           <FreeOnlineDialogue />
         </div>
       </div>

diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -12,7 +12,7 @@ import HeroSection from "./_utils/herosection";
 import Faq from "./_utils/faq";
 import { BrandCarousel } from "./_utils/carousel";
 
-const Home = () => {
+const HomePage = () => {
   return (
     <main>
       <HeroSection
@@ -46,4 +46,4 @@ const Home = () => {
   );
 };
 
-export default Home;
+export default HomePage;
diff --git a/src/components/molecule/get-consultation.tsx b/src/components/molecule/get-consultation.tsx
@@ -1,11 +1,23 @@
-import Link from "next/link";
+"use client";
 import { Button } from "../ui/button";
+import { useRouter } from "next/navigation";
 
 const GetConsultation = () => {
+  const router = useRouter();
+  const handleLinkClick = () => {
+    router.push("/#calendly");
+    window.dataLayer.push({
+      event: "get_a_free_consultation_button_click",
+    });
+  };
   return (
-    <Link href={`/#calendly`} aria-label="topTitle" title="topTitle" className="w-full sm:w-auto">
-      <Button variant="outline" className="w-full">Get a Free Consultation</Button>
-    </Link>
+    <Button
+      variant="outline"
+      className="w-full sm:w-auto"
+      onClick={handleLinkClick}
+    >
+      Get a Free Consultation
+    </Button>
   );
 };