Merge branch 'master' into create-dare-to-leap-section

canopas · Nov 24, 2023 · 2a12608 · 2a12608
2 parents 7952e03 + 3e3ed85
commit 2a12608
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 53 deletions.
diff --git a/nuxt-frontend/pages/about.vue b/nuxt-frontend/pages/about.vue
@@ -8,9 +8,9 @@
       <AboutusVirtue />
       <WithCanopasSection ref="withcanopas" />
       <ClientReviewSection />
-      <CTASection />
+      <CTASection ref="cta" />
     </div>
-    <NewFooter ref="footer" />
+    <NewFooter />
   </div>
 </template>
 
@@ -43,7 +43,7 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const withcanopas = ref(null);
-const footer = ref(null);
+const cta = ref(null);
 
 const seoData = config.ABOUT_SEO_META_DATA;
 useSeoMeta({
@@ -58,13 +58,13 @@ useSeoMeta({
 let event = "";
 let events = {
   withcanopas: "view_about_phases",
-  footer: "view_about_footer",
+  cta: "view_about_cta",
 };
 let elements;
 onMounted(() => {
   elements = ref({
     withcanopas: withcanopas,
-    footer: footer,
+    cta: cta,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_about_page");

diff --git a/nuxt-frontend/pages/android-app-development.vue b/nuxt-frontend/pages/android-app-development.vue
@@ -11,8 +11,8 @@
     <BlackCtaSection />
     <BlogSection />
     <FaqSection />
-    <CtaSection />
-    <NewFooter ref="footer" />
+    <CtaSection ref="cta" />
+    <NewFooter />
   </div>
 </template>
 
@@ -53,7 +53,7 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const casestudy = ref(null);
-const footer = ref(null);
+const cta = ref(null);
 
 const seoData = config.ANDRIOD_APP_DEVELOPMENT_SEO_META_DATA;
 useSeoMeta({
@@ -68,15 +68,15 @@ useSeoMeta({
 let event = "";
 let events = {
   casestudy: "view_android_development_casestudy_sections",
-  footer: "view_android_development_footer",
+  cta: "view_android_development_cta",
 };
 
 let elements;
 
 onMounted(() => {
   elements = ref({
     casestudy: casestudy,
-    footer: footer,
+    cta: cta,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_android_development_page");

diff --git a/nuxt-frontend/pages/contributions.vue b/nuxt-frontend/pages/contributions.vue
@@ -13,9 +13,9 @@
       <AnimatedCreation />
       <UnitTest class="md:overflow-hidden" />
       <DevOps />
-      <ExploreDesign class="overflow-hidden" />
+      <ExploreDesign class="overflow-hidden" ref="design" />
     </div>
-    <NewFooter ref="footer" />
+    <NewFooter />
   </div>
 </template>
 
@@ -54,7 +54,7 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const favourite = ref(null);
-const footer = ref(null);
+const design = ref(null);
 
 const seoData = config.CONTRIBUTION_SEO_META_DATA;
 useSeoMeta({
@@ -69,15 +69,15 @@ useSeoMeta({
 let event = "";
 let events = {
   favourite: "view_favourite_contribution",
-  footer: "view_contribution_footer",
+  design: "view_design_contribution",
 };
 
 let elements;
 
 onMounted(() => {
   elements = ref({
     favourite: favourite,
-    footer: footer,
+    design: design,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_contribution_page");

diff --git a/nuxt-frontend/pages/jobs/index.vue b/nuxt-frontend/pages/jobs/index.vue
@@ -14,8 +14,8 @@
       v-on:add-animation="handleAnimationOnScroll"
     />
     <Career id="career" />
-    <FaqSection v-on:add-animation="handleAnimationOnScroll" />
-    <NewFooter ref="footer" />
+    <FaqSection v-on:add-animation="handleAnimationOnScroll" ref="faq" />
+    <NewFooter />
   </div>
 </template>
 
@@ -53,12 +53,7 @@ const NewFooter = defineAsyncComponent(
 
 const { $mixpanel } = useNuxtApp();
 
-const landingview = ref(null);
-const virtue = ref(null);
-const life = ref(null);
 const perks = ref(null);
-const whycanopas = ref(null);
-const joblist = ref(null);
 const faq = ref(null);
 
 const seoData = config.JOBS_SEO_META_DATA;
@@ -74,19 +69,14 @@ useSeoMeta({
 let event = "";
 let events = {
   perks: "view_perks_benefits",
-  footer: "view_jobs_footer",
+  faq: "view_jobs_faq",
 };
 
 let elements;
 
 onMounted(() => {
   elements = ref({
-    landingview: landingview,
-    virtue: virtue,
-    life: life,
     perks: perks,
-    whycanopas: whycanopas,
-    joblist: joblist,
     faq: faq,
   });
   window.addEventListener("scroll", sendEvent);

diff --git a/nuxt-frontend/pages/jobs/thank-you/index.vue b/nuxt-frontend/pages/jobs/thank-you/index.vue
@@ -6,8 +6,8 @@
     <VirtueView />
     <LifeAtCanopasVue ref="lifeatcanopas" />
     <LatestBlog />
-    <ContributionSection />
-    <NewFooter ref="footer" />
+    <ContributionSection ref="contribution" />
+    <NewFooter />
   </div>
 </template>
 <script setup>
@@ -37,7 +37,7 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const lifeatcanopas = ref(null);
-const footer = ref(null);
+const contribution = ref(null);
 
 const seoData = config.JOBS_THANKYOU_SEO_META_DATA;
 useSeoMeta({
@@ -53,14 +53,14 @@ let applicantName = "";
 let event = "";
 let events = {
   lifeatcanopas: "view_jobs_thankyou_lifeatcanopas_section",
-  footer: "view_jobs_thankyou_footer",
+  contribution: "view_jobs_thankyou_contribution_section",
 };
 let elements;
 
 onMounted(() => {
   elements = ref({
     lifeatcanopas: lifeatcanopas,
-    footer: footer,
+    contribution: contribution,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_jobs_thankyou_page");

diff --git a/nuxt-frontend/pages/mobile-app-development.vue b/nuxt-frontend/pages/mobile-app-development.vue
@@ -11,10 +11,10 @@
       <DevelopmentProcess ref="developmentprocess" />
       <div class="bg-black-core/[0.85]">
         <ClientReview />
-        <CTASection2 />
+        <CTASection2 ref="cta" />
       </div>
     </div>
-    <NewFooter ref="footer" class="mt-[-15px] md:mt-auto" />
+    <NewFooter class="mt-[-15px] md:mt-auto" />
   </div>
 </template>
 
@@ -48,7 +48,7 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const developmentprocess = ref(null);
-const footer = ref(null);
+const cta = ref(null);
 
 const seoData = config.MOBILE_APP_DEVELOPMENT_SEO_META_DATA;
 useSeoMeta({
@@ -63,15 +63,15 @@ useSeoMeta({
 let event = "";
 let events = {
   developmentprocess: "view_mobileapp_development_developmentprocess_section",
-  footer: "view_mobileapp_development_footer",
+  cta: "view_mobileapp_development_cta",
 };
 
 let elements;
 
 onMounted(() => {
   elements = ref({
     developmentprocess: developmentprocess,
-    footer: footer,
+    cta: cta,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_mobileapp_development_page");

diff --git a/nuxt-frontend/pages/portfolio/index.vue b/nuxt-frontend/pages/portfolio/index.vue
@@ -6,8 +6,8 @@
       ref="userReview"
       class="pb-0 sm:pb-10 md:pb-8 lg:pb-20 sm:top-10"
     />
-    <CTASection />
-    <NewFooter ref="footer" />
+    <CTASection ref="cta" />
+    <NewFooter />
   </div>
 </template>
 
@@ -30,7 +30,7 @@ const NewFooter = defineAsyncComponent(
 const { $mixpanel } = useNuxtApp();
 
 const userReview = ref(null);
-const footer = ref(null);
+const cta = ref(null);
 
 const seoData = config.PORTFOLIO_SEO_META_DATA;
 useSeoMeta({
@@ -45,15 +45,15 @@ useSeoMeta({
 let event = "";
 let events = {
   userReview: "view_portfolio_user_review_section",
-  footer: "view_portfolio_footer_section",
+  cta: "view_portfolio_cta_section",
 };
 
 let elements;
 
 onMounted(() => {
   elements = ref({
     userReview: userReview,
-    footer: footer,
+    cta: cta,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_portfolio_page");

diff --git a/nuxt-frontend/pages/services.vue b/nuxt-frontend/pages/services.vue
@@ -5,7 +5,7 @@
       <LandingSection />
       <WhatWeOfferMobile class="block lg:hidden" />
       <WhatWeOfferDesktop class="hidden lg:block" />
-      <CTASection class="!mt-24 xl:!mt-40" ref="cta" />
+      <CTASection class="!mt-24 xl:!mt-40" />
       <TechnologyStack />
       <BlogSection ref="blogs" />
       <ContributionSection class="hidden lg:block" />

diff --git a/nuxt-frontend/pages/thank-you.vue b/nuxt-frontend/pages/thank-you.vue
@@ -5,11 +5,12 @@
       <LandingSection :name="clientName" />
       <BenefitSection
         class="overflow-y-hidden 2xl:overflow-y-visible 3xl:overflow-y-hidden"
+        ref="benefits"
       />
-      <HappyClientSection ref="clientreview" />
-      <ScheduleMeeting />
+      <HappyClientSection />
+      <ScheduleMeeting ref="meeting" />
     </div>
-    <NewFooter ref="footer" />
+    <NewFooter />
   </div>
 </template>
 
@@ -20,6 +21,7 @@ import Header from "@/components/partials/NewHeader.vue";
 import LandingSection from "@/components/contact/thank-you/LandingSection.vue";
 import BenefitSection from "@/components/contact/thank-you/BenefitSection.vue";
 import { elementInViewPort } from "@/utils.js";
+
 const HappyClientSection = defineAsyncComponent(
   () => import("@/components/contact/thank-you/HappyClient.vue"),
 );
@@ -29,10 +31,11 @@ const ScheduleMeeting = defineAsyncComponent(
 const NewFooter = defineAsyncComponent(
   () => import("@/components/partials/NewFooter.vue"),
 );
+
 const { $mixpanel } = useNuxtApp();
 
-const clientreview = ref(null);
-const footer = ref(null);
+const benefits = ref(null);
+const meeting = ref(null);
 
 const seoData = config.CLIENT_THANKYOU_SEO_META_DATA;
 useSeoMeta({
@@ -47,22 +50,25 @@ useSeoMeta({
 let clientName = "";
 let event = "";
 let events = {
-  clientreview: "view_thankyou_clientreview_section",
-  footer: "view_thankyou_footer",
+  benefits: "view_thankyou_benefits_section",
+  meeting: "view_thankyou_schedule_meeting_section",
 };
+
 let elements;
 
 onMounted(() => {
   elements = ref({
-    clientreview: clientreview,
-    footer: footer,
+    benefits: benefits,
+    meeting: meeting,
   });
   window.addEventListener("scroll", sendEvent);
   $mixpanel.track("view_thankyou_page");
 });
+
 onUnmounted(() => {
   window.removeEventListener("scroll", sendEvent);
 });
+
 onBeforeMount(() => {
   let cName = localStorage.getItem("client-name");
   if (cName) {