Merge pull request #184 from AOT-Technologies/main-to-develop-24-04-2024

main to develop
AOT-Technologies · Apr 24, 2024 · 82dab91 · 82dab91
2 parents 351ef1b + 66c36d4
commit 82dab91
Show file tree

Hide file tree

Showing 10 changed files with 217 additions and 47 deletions.
diff --git a/forms-flow-integration/src/components/PremiumSubscription/index.tsx b/forms-flow-integration/src/components/PremiumSubscription/index.tsx
@@ -1,74 +1,77 @@
 import React from "react";
 import { Translation } from "react-i18next";
+import "../../index.scss";
 import Footer from "../Footer/footer";
+import { IntegrationSVG } from "./integrationImage";
+
 
 const PremiumSubscription = () => {
   return (
     <div className="main-container ">
       <div className="container">
         <div className="min-container-height d-flex flex-column align-items-center justify-content-center">
+          <IntegrationSVG
+            className="img-fluid mb-4"
+          />
           <div className="d-flex justify-content-center align-items-center">
-            <svg
-              width="38"
-              height="38"
-              viewBox="0 0 38 38"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M3.9576 14.25H34.0409M15.8326 4.75L12.6659 14.25L18.9993 32.4583L25.3326 14.25L22.1659 4.75M19.9723 32.0823L34.1568 15.0609C34.3972 14.7724 34.5174 14.6282 34.5634 14.4672C34.6039 14.3252 34.6039 14.1748 34.5634 14.0328C34.5174 13.8718 34.3972 13.7276 34.1568 13.4391L27.2957 5.20577C27.1561 5.03824 27.0863 4.95447 27.0008 4.89425C26.9249 4.8409 26.8403 4.80127 26.7508 4.77718C26.6498 4.75 26.5407 4.75 26.3227 4.75H11.6759C11.4578 4.75 11.3488 4.75 11.2477 4.77718C11.1582 4.80127 11.0736 4.8409 10.9978 4.89425C10.9122 4.95447 10.8424 5.03824 10.7028 5.20577L3.84168 13.4391C3.60129 13.7276 3.48109 13.8718 3.43516 14.0328C3.39466 14.1748 3.39466 14.3252 3.43516 14.4672C3.48109 14.6282 3.60129 14.7724 3.84168 15.0609L18.0262 32.0823C18.3604 32.4833 18.5274 32.6838 18.7275 32.7569C18.903 32.8211 19.0955 32.8211 19.271 32.7569C19.4711 32.6838 19.6382 32.4833 19.9723 32.0823Z"
-                stroke="#FEB602"
-                stroke-width="2"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-              />
-            </svg>
+            <span>
+              <i className="fa-solid fa-crown premium"></i>
+            </span>
             <h1 className="fw-bold ms-2">
-              <Translation>{(t) => t("Premium Subscription")}</Translation>
+              <Translation>
+                {(t) => t("Native Integrations Pro")}
+              </Translation>
             </h1>
           </div>
 
-          <h4 className="text-center mt-4 fs-5">
-            <Translation>
-              {(t) =>
-                t(
-                  " For further insights on this exclusive premium feature, kindly connect"
-                )
-              }
-            </Translation>
-            <br />
+          <h4 className="text-center mt-4 fs-5 col-md-10 col-lg-8 col-xl-6">
             <Translation>
-              {(t) =>
-                t(
-                  " with our dedicated marketing team for detailed information."
-                )
-              }
+              {(t) => (
+                <span>
+                  {t("We facilitate hundreds of native integrations via our ")}
+                  <span className="fw-bold">{t("‘Native Integrations Pro’")}</span>
+                  {t(
+                    " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you."
+                  )}
+                </span>
+              )}
             </Translation>
           </h4>
-
-          <div className="mt-5">
+          <div className="mt-5 text-center">
             <a
-              href="https://formsflow.ai/about-us/#contact-us"
-              className="btn btn-primary"
+              href="https://formsflow.ai/integrations"
+              className="btn checkout-btn btn-primary fw-bold"
               target="_blank"
               rel="noopener noreferrer"
             >
               <Translation>
-                {(t) => t("Get Connected With Us Now!")}
+                {(t) => t("Learn more about the feature")}
               </Translation>
             </a>
           </div>
 
           <div className="mt-4">
-            <Translation>{(t) => t("Visit our")}</Translation>{" "}
             <a
-              href="https://formsflow.ai/pricing-plans/"
+              href="https://formsflow.ai/about-us/#contact-us"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <Translation>{(t) => t("Connect with")}</Translation>
+            </a>
+            <a
+              href="https://formsflow.ai/about-us/#contact-us"
               target="_blank"
               rel="noopener noreferrer"
             >
-              <Translation>{(t) => t("Pricing page")}</Translation>
-            </a>{" "}
-            <Translation>{(t) => t("for more details.")}</Translation>
+              <Translation>{(t) => t(" formsflow.ai ")}</Translation>
+            </a>
+            <a
+              href="https://formsflow.ai/about-us/#contact-us"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              <Translation>{(t) => t(" team.")}</Translation>
+            </a>
           </div>
         </div>
         <Footer />

diff --git a/forms-flow-integration/src/components/PremiumSubscription/integrationImage.tsx b/forms-flow-integration/src/components/PremiumSubscription/integrationImage.tsx
diff --git a/forms-flow-integration/src/index.scss b/forms-flow-integration/src/index.scss
@@ -19,4 +19,11 @@ bottom: 0;
 
 .page-item.active .page-link {
     color: #fff !important;
+}
+.premium{
+    font-size: 36px;
+    color: rgb(255,193,7);
+}
+.checkout-btn{
+    padding: 8px 48px !important;
 }
diff --git a/forms-flow-nav/src/Navbar.jsx b/forms-flow-nav/src/Navbar.jsx
@@ -295,6 +295,7 @@ const NavBar = React.memo(({ props }) => {
                           ? "active"
                           : ""
                       }`}
+                      id="forms-nav-link"
                       data-testid="forms-nav-link"
                     >
                       <i className="fa-solid fa-file-lines me-2" />
@@ -312,6 +313,7 @@ const NavBar = React.memo(({ props }) => {
                           ? "active"
                           : ""
                       }`}
+                      id="admin-nav-link"
                       data-testid="admin-nav-link"
                     >
                       <i className="fa-solid fa-user-check me-2" />
@@ -332,6 +334,7 @@ const NavBar = React.memo(({ props }) => {
                               ? "active"
                               : ""
                           }`}
+                          id="processes-nav-link"
                           data-testid="processes-nav-link"
                         >
                           <i className="fa fa-cogs fa-fw me-2" />
@@ -353,10 +356,11 @@ const NavBar = React.memo(({ props }) => {
                               ? "active"
                               : ""
                           }`}
+                          id="integration-nav-link"
                           data-testid="integration-nav-link"
                         >
                           <i className="fa-solid fa-network-wired me-2"></i>
-                          {t("Integration")}
+                          {t("Integrations")}
                           {(ENABLE_INTEGRATION_PREMIUM && <i className="fa-solid fa-crown p-1 text-warning"></i>) || null}
                         </Nav.Link>
                       )
@@ -379,6 +383,7 @@ const NavBar = React.memo(({ props }) => {
                                 ? "active"
                                 : ""
                             }`}
+                            id="applications-nav-link"
                             data-testid="applications-nav-link"
                           >
                             <i className="fa-solid fa-rectangle-list me-2" />
@@ -400,6 +405,7 @@ const NavBar = React.memo(({ props }) => {
                               ? "active"
                               : ""
                           }`}
+                          id="tasks-nav-link"
                           data-testid="tasks-nav-link"
                         >
                           <i className="fa-solid fa-list-check me-2" />
@@ -414,6 +420,7 @@ const NavBar = React.memo(({ props }) => {
                           eventKey={"metrics"}
                           as={Link}
                           to={`${baseUrl}metrics`}
+                          id="dashboards-nav-link"
                           data-testid="dashboards-nav-link"
                           className={`nav-menu-item py-md-3 px-0 mx-2 ${
                             pathname.match(
@@ -478,6 +485,7 @@ const NavBar = React.memo(({ props }) => {
                           ""}
                       </>
                     }
+                    id="user-dropdown"
                     data-testid="user-dropdown"
                   >
                     <NavDropdown.Item data-testid="user-info">

diff --git a/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts b/forms-flow-service/src/resourceBundles/bg/resourceBundles.ts
@@ -637,5 +637,18 @@ export const RESOURCE_BUNDLES_BG = {
   "Connected Apps": "Свързани приложения",
   "Library": "Библиотека",
   "Add group": "Добави група",
-  "Add task label": "Добавяне на етикет за задача"
+  "Add task label": "Добавяне на етикет за задача",
+  "Integrations": "Интеграции",
+  "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.": "Ние улесняваме стотици местни интеграции чрез нашия пакет „Професионални нативни интеграции“.",
+  " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "Тази функция по подразбиране не е налична в 14-дневната проба. Ако вашата проба изисква тази функция, можете да ни информирате, и ние можем да я активираме за вас.",
+  "Upgrade to unlock Native Integrations Pro": "Надстройте, за да отключите Нативни интеграции Pro",
+  "We facilitate hundreds of native integrations via our ": "Ние предлагаме стотици нативни интеграции чрез нашия ",
+  " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "пакет. Тази функционалност не е достъпна по подразбиране в 14-дневната проба. Ако вашата проба изисква тази функция, може да ни уведомите и ние можем да я активираме за вас.",
+  "To learn more about Native Integrations Pro": "За да научите повече за Нативни интеграции Pro",
+  "Check out Integrations Feature": "Проверете функцията Интеграции",
+  "Connect with": "Свържете се с",
+  "team for requests or queries.": "екипа за заявки или въпроси.",
+  "Learn more about the feature": "Научете повече за функцията",
+  "Native Integrations Pro": "Нативни Интеграции Про",
+  " team.": "екип.",
 };
diff --git a/forms-flow-service/src/resourceBundles/de/resourceBundles.ts b/forms-flow-service/src/resourceBundles/de/resourceBundles.ts
@@ -641,5 +641,18 @@ export const RESOURCE_BUNDLES_DE = {
   "Connected Apps": "Verbundene Apps",
   "Library": "Bibliothek",
   "Add group": "Gruppe hinzufügen",
-  "Add task label": "Aufgabenbezeichnung hinzufügen"
+  "Add task label": "Aufgabenbezeichnung hinzufügen",
+  "Integrations": "Integrationen",
+  "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.": "Wir ermöglichen Hunderte von nativen Integrationen über unser Paket „Native Integrations Pro“.",
+  " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "Diese Funktion ist standardmäßig nicht im 14-Tage-Test verfügbar. Wenn Ihr Test diese Funktion erfordert, können Sie uns dies mitteilen, und wir können dies für Sie aktivieren.",
+  "Upgrade to unlock Native Integrations Pro": "Upgrade, um Native Integrations Pro freizuschalten",
+  "We facilitate hundreds of native integrations via our ": "Wir ermöglichen Hunderte von nativen Integrationen über unsere ",
+  "Native Integrations Pro": "Native Integrations Pro",
+  " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "-Paket. Diese Funktion ist standardmäßig nicht in der 14-Tage-Testversion verfügbar. Wenn Ihre Testversion diese Funktion erfordert, können Sie uns dies mitteilen, und wir können sie für Sie aktivieren.",
+  "To learn more about Native Integrations Pro": "Weitere Informationen zu Native Integrations Pro finden Sie unter",
+  "Check out Integrations Feature": "Überprüfen Sie die Integrationen-Funktion",
+  "Connect with": "Wenden Sie sich an",
+  "team for requests or queries.": "das Team für Anfragen oder Fragen.",
+  "Learn more about the feature": "Erfahren Sie mehr über das Feature",
+  " team.": "Team."
 };
diff --git a/forms-flow-service/src/resourceBundles/en/resourceBundles.ts b/forms-flow-service/src/resourceBundles/en/resourceBundles.ts
@@ -639,7 +639,20 @@ export const RESOURCE_BUNDLES_EN = {
   "Connected Apps": "Connected Apps",
   "Library": "Library",
   "Add group": "Add group",
-  "Add task label": "Add task label"
+  "Add task label": "Add task label",
+  "Integrations": "Integrations",
+  "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.": "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.",
+  " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.",
+  "Upgrade to unlock Native Integrations Pro": "Upgrade to unlock Native Integrations Pro",
+  "We facilitate hundreds of native integrations via our ": "We facilitate hundreds of native integrations via our ",
+  "Native Integrations Pro": "Native Integrations Pro",
+  " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": " package. This feature is not available by default in the 14-day trial. If your trial requires this feature, you can let us know, and we can enable this for you.",
+  "To learn more about Native Integrations Pro": "To learn more about Native Integrations Pro",
+  "Check out Integrations Feature": "Check out Integrations Feature",
+  "Connect with": "Connect with",
+  "team for requests or queries.": "team for requests or queries.",
+  "Learn more about the feature": "Learn more about the feature",
+  " team.": "team."
 };
 
 

diff --git a/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts b/forms-flow-service/src/resourceBundles/fr/resourceBundles.ts
@@ -640,7 +640,20 @@ export const RESOURCE_BUNDLES_FR = {
   "Connected Apps": "Applications Connectées",
   "Library": "Bibliothèque",
   "Add group": "Ajouter un groupe",
-  "Add task label": "Ajouter une étiquette de tâche"
+  "Add task label": "Ajouter une étiquette de tâche",
+  "Integrations": "Intégrations",
+  "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.": "Nous facilitons des centaines d'intégrations natives via notre package 'Intégrations Natives Pro'.",
+  " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "Cette fonctionnalité n'est pas disponible par défaut dans l'essai de 14 jours. Si votre essai nécessite cette fonctionnalité, vous pouvez nous le faire savoir et nous pouvons l'activer pour vous.",
+  "Upgrade to unlock Native Integrations Pro": "Mettez à niveau pour débloquer les intégrations natives Pro",
+  "We facilitate hundreds of native integrations via our ": "Nous facilitons des centaines d'intégrations natives via notre ",
+  "Native Integrations Pro": "Intégrations natives Pro",
+  " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": ". Cette fonctionnalité n'est pas disponible par défaut dans l'essai de 14 jours. Si votre essai nécessite cette fonctionnalité, vous pouvez nous le faire savoir et nous pouvons l'activer pour vous.",
+  "To learn more about Native Integrations Pro": "Pour en savoir plus sur Native Integrations Pro",
+  "Check out Integrations Feature": "Découvrez la fonctionnalité Intégrations",
+  "Connect with": "Contactez",
+  "team for requests or queries.": "l'équipe pour toute demande ou question.",
+  "Learn more about the feature": "En savoir plus sur la fonctionnalité",
+  " team.": "équipe."
 };
 
 

diff --git a/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts b/forms-flow-service/src/resourceBundles/pt/resourceBundles.ts
@@ -639,5 +639,18 @@ export const RESOURCE_BUNDLES_PT = {
   "Connected Apps": "Aplicativos Conectados",
   "Library": "Biblioteca",
   "Add group": "Adicionar grupo",
-  "Add task label": "Adicionar rótulo de tarefa"
+  "Add task label": "Adicionar rótulo de tarefa",
+  "Integrations": "Integrações",
+  "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.": "Facilitamos centenas de integrações nativas através do nosso pacote ‘Integrações Nativas Pro’.",
+  " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "Esta funcionalidade não está disponível por padrão no período de 14 dias de avaliação. Se o seu período de avaliação exigir esta funcionalidade, você pode nos informar e podemos ativá-la para você.",
+  "Upgrade to unlock Native Integrations Pro": "Atualize para desbloquear as Integrações Nativas Pro",
+  "We facilitate hundreds of native integrations via our ": "Facilitamos centenas de integrações nativas através do nosso ",
+  "Native Integrations Pro": "Integrações Nativas Pro",
+  " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": ". Esta funcionalidade não está disponível por padrão no teste de 14 dias. Se o seu teste exigir esta funcionalidade, você pode nos informar e podemos ativá-la para você.",
+  "To learn more about Native Integrations Pro": "Para saber mais sobre as Integrações Nativas Pro",
+  "Check out Integrations Feature": "Confira a funcionalidade de Integrações",
+  "Connect with": "Entre em contato com",
+  "team for requests or queries.": "a equipe para solicitações ou dúvidas.",
+  "Learn more about the feature": "Saiba mais sobre o recurso",
+  " team.": "equipe."
 };
diff --git a/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts b/forms-flow-service/src/resourceBundles/zh/resourceBundles.ts
@@ -636,6 +636,19 @@ export const RESOURCE_BUNDLES_ZH = {
   "Connected Apps": "已连接的应用",
   "Library": "库",
   "Add group": "添加组",
-  "Add task label": "添加任务标签"
+  "Add task label": "添加任务标签",
+  "Integrations": "集成",
+  "We facilitate hundreds of native integrations via our ‘Native Integrations Pro’ package.": "我们通过我们的“原生集成专业版”套餐，可以提供数百种本地集成。",
+  " This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "该功能在14天试用期内默认不可用。如果您的试用需要此功能，您可以告诉我们，我们可以为您启用此功能。",
+  "Upgrade to unlock Native Integrations Pro": "升级以解锁原生集成专业版",
+  "We facilitate hundreds of native integrations via our ": "我们通过我们的原生集成专业版 ",
+  "Native Integrations Pro": "原生集成专业版",
+  " package. This feature is not available by default in the 14 day trial. If your trial requires this feature, you can let us know and we can enable this for you.": "包。该功能在14天试用期内默认情况下不可用。如果您的试用需要此功能，请告诉我们，我们可以为您启用。",
+  "To learn more about Native Integrations Pro": "查看原生集成专业版功能",
+  "Check out Integrations Feature": "查看集成功能",
+  "Connect with": "联系",
+  "team for requests or queries.": "团队以获取请求或查询。",
+  "Learn more about the feature": "了解更多功能",
+  " team.": "团队。"
 };