Merge branch 'master' into refine-ios-page

vue-frontend/src/components/services/WhatWeOfferDesktop.vue

@@ -18,8 +18,8 @@
             <div class="tw-absolute tw-top-[50%] tw-translate-y-[-50%]">
               <div
                 class="tw-py-5"
-                @click="showServices ? openUrl(service.url) : ''"
-                :class="showServices ? 'tw-cursor-pointer' : ''"
+                @click="service.showServices ? openUrl(service.url) : ''"
+                :class="service.showServices ? 'tw-cursor-pointer' : ''"
               >
                 <span
                   class="tw-font-inter-semibold tw-text-[1.5rem] tw-leading-9 md:tw-text-[2.25rem] md:tw-leading-[3.43rem] xl:tw-text-[3.125rem] xl:tw-leading-[4.6875rem]"
@@ -70,7 +70,6 @@ import config from "@/config.js";
 export default {
   data() {
     return {
-      showServices: !config.IS_PROD,
       services: [
         {
           path: [0, 0],
@@ -79,6 +78,7 @@ export default {
           description:
             "Take your business to new heights with an Android app! Tap into a global user base, boost customer engagement, communicate directly, and gather insightful data. Plus, enhance your visibility, add revenue streams, and provide top-notch customer service. With over a decade of expertise in Android app development, our team can help you craft high-quality, user-friendly apps that drive business growth and customer engagement. ",
           url: "/android-app-development",
+          showServices: config.SHOW_ANDROID_APP_DEVELOPMENT_PAGE,
         },
         {
           path: [100, 100],
@@ -87,6 +87,7 @@ export default {
           description:
             "Our seasoned iOS developers specialize in creating aesthetically pleasing, intuitive, and user-friendly apps that seamlessly function across all Apple devices. We leverage the latest iOS technologies to deliver solutions that give you an edge in the competitive Apple app market. Plus, our team follows Human Interface Guidelines defined by Apple to deliver exceptional user experience.",
           url: "/ios-app-development",
+          showServices: config.SHOW_IOS_APP_DEVELOPMENT_PAGE,
         },
         {
           path: [100, 100],
@@ -95,6 +96,7 @@ export default {
           description:
             "Bring your multi-platform app vision to life with our Flutter app development services. We excel in crafting high-quality, stunning applications that work flawlessly on Android, iOS, and the web, all from a single codebase, facilitating faster time to market and cost savings.",
           url: "/flutter-app-development",
+          showServices: config.SHOW_FLUTTER_APP_DEVELOPMENT_PAGE,
         },
         {
           path: [100, 100],

vue-frontend/src/components/services/WhatWeOfferMobile.vue

@@ -25,8 +25,8 @@
         <div :class="service.class" class="tw-px-2.5 sm:tw-px-20">
           <div
             class="tw-py-5 sm:tw-py-6"
-            @click="showServices ? openUrl(service.url) : ''"
-            :class="showServices ? 'tw-cursor-pointer' : ''"
+            @click="service.showServices ? openUrl(service.url) : ''"
+            :class="service.showServices ? 'tw-cursor-pointer' : ''"
           >
             <span
               class="tw-text-center tw-font-inter-semibold tw-text-[1.5rem] tw-leading-9"
@@ -68,7 +68,6 @@ import config from "@/config.js";
 export default {
   data() {
     return {
-      showServices: !config.IS_PROD,
       services: [
         {
           images: [androidApp400w, androidApp800w],
@@ -78,6 +77,7 @@ export default {
           class:
             "tw-bg-gradient-to-b tw-from-[#EBF2FC]  via-[#EBF2FC]  tw-to-white tw-bg-gradient-[180deg] ",
           url: "/android-app-development",
+          showServices: config.SHOW_ANDROID_APP_DEVELOPMENT_PAGE,
         },
         {
           images: [iosApp400w, iosApp800w],
@@ -87,6 +87,7 @@ export default {
           class:
             "tw-bg-gradient-to-b tw-from-[#FADFB7]  via-[#FADFB7]  tw-to-white tw-bg-gradient-[180deg] ",
           url: "/ios-app-development",
+          showServices: config.SHOW_IOS_APP_DEVELOPMENT_PAGE,
         },
         {
           images: [flutterApp400w, flutterApp800w],
@@ -96,6 +97,7 @@ export default {
           class:
             "tw-bg-gradient-to-b tw-from-[#E0EDFF]  via-[#E0EDFF]  tw-to-white tw-bg-gradient-[180deg] ",
           url: "/flutter-app-development",
+          showServices: config.SHOW_FLUTTER_APP_DEVELOPMENT_PAGE,
         },
         {
           images: [uiuxdesign400w, uiuxdesign800w],

vue-frontend/src/config.js

@@ -120,9 +120,9 @@ export default Object.freeze({
     image: "https://dev-stack.canopas.com/apple-touch-icon.png",
   },
   IS_PROD: false,
+  SHOW_ANDROID_APP_DEVELOPMENT_PAGE: true,
   SHOW_FLUTTER_APP_DEVELOPMENT_PAGE: true,
   SHOW_IOS_APP_DEVELOPMENT_PAGE: true,
-  SHOW_ANDROID_APP_DEVELOPMENT_PAGE: true,
   SMILEPLUS_URL: "https://www.udini.ai/products/smile",
   WEBSITE_OPEN_SOURCE_URL: "https://github.com/canopas/canopas-website",
   MIX_PANEL_TOKEN: "acf7239a736ff487ca6058c981a55d7e",

vue-frontend/src/config.prod.js

@@ -120,7 +120,7 @@ export default Object.freeze({
     image: "https://dev-stack.canopas.com/apple-touch-icon.png",
   },
   IS_PROD: true,
-  SHOW_ANDROID_APP_DEVELOPMENT_PAGE: false,
+  SHOW_ANDROID_APP_DEVELOPMENT_PAGE: true,
   SHOW_IOS_APP_DEVELOPMENT_PAGE: false,
   SHOW_FLUTTER_APP_DEVELOPMENT_PAGE: false,
   SMILEPLUS_URL: "https://www.udini.ai/products/smile",

vue-frontend/src/pages/android-app-development.vue

@@ -56,32 +56,9 @@ const NewFooter = defineAsyncComponent(() =>
 );
 
 export default {
-  data() {
-    return {
-      event: "",
-      events: {
-        landing: "view_android_development_landing_section",
-        footer: "view_android_development_footer",
-        development: "view_android_development_section",
-        casestudy: "view_android_development_casestudy_section",
-        faq: "view_android_development_faq_section",
-        successstory: "view_android_development_success_story_section",
-        cta1: "view_android_development_cta_section",
-        cta2: "view_android_development_cta2_section",
-        cta3: "view_android_development_cta3_section",
-      },
-    };
-  },
   setup() {
     var seoData = config.ANDRIOD_APP_DEVELOPMENT_SEO_META_DATA;
     useMeta({
-      meta: [
-        {
-          name: "robots",
-          content: "noindex, nofollow",
-          vmid: "robots",
-        },
-      ],
       title: seoData.title,
       description: seoData.description,
       og: {
@@ -105,24 +82,21 @@ export default {
     CtaSection,
     NewFooter,
   },
-  methods: {
-    sendEvent() {
-      const event = this.events[elementInViewPort(this.$refs)];
-      if (event && this.event !== event) {
-        this.event = event;
-        this.mixpanel.track(event);
-      }
-    },
-  },
-  beforeRouteEnter(to, from, next) {
-    if (!config.SHOW_ANDROID_APP_DEVELOPMENT_PAGE) {
-      next({
-        name: "Error404Page",
-        params: { pathMatch: "/android-app-development" },
-      });
-    } else {
-      next();
-    }
+  data() {
+    return {
+      event: "",
+      events: {
+        landing: "view_android_development_landing_section",
+        footer: "view_android_development_footer",
+        development: "view_android_development_section",
+        casestudy: "view_android_development_casestudy_section",
+        faq: "view_android_development_faq_section",
+        successstory: "view_android_development_success_story_section",
+        cta1: "view_android_development_cta_section",
+        cta2: "view_android_development_cta2_section",
+        cta3: "view_android_development_cta3_section",
+      },
+    };
   },
   inject: ["mixpanel"],
   mounted() {
@@ -132,5 +106,14 @@ export default {
   unmounted() {
     window.removeEventListener("scroll", this.sendEvent);
   },
+  methods: {
+    sendEvent() {
+      const event = this.events[elementInViewPort(this.$refs)];
+      if (event && this.event !== event) {
+        this.event = event;
+        this.mixpanel.track(event);
+      }
+    },
+  },
 };
 </script>