fix conflict

.env.example

@@ -13,7 +13,7 @@ KV_REST_API_URL=ffffffffffffffffffffffffff
 SYLLABUS="full-stack,web-development"
 
 # Users will by this plan if no other has been specified
-BASE_PLAN=sample-plan
+BASE_PLAN=basic
 
 TAG_MANAGER_KEY=GTM-XXXXXXX
 GOOGLE_GEO_KEY=A101012nEx4MpL3k3Y011010

package.json

@@ -126,7 +126,7 @@
     "remark-react": "9.0.1",
     "remark-toc": "8.0.1",
     "remark-variables": "1.4.9",
-    "rigobot-chat-bubble": "^0.0.59",
+    "rigobot-chat-bubble": "^0.0.63",
     "sharp": "^0.32.1",
     "socket.io-client": "^4.6.1",
     "styled-components": "5.3.10",

public/locales/en/course.json

@@ -38,7 +38,8 @@
     "description": "4Geeks.com is the first platform designed to maximize learning at your own pace. Join live sessions whenever you can, get help immediately with AI, and ask for one-on-one mentorships. All our content is fully interactive and video-enabled.",
     "button": "Try Rigobot for free",
     "link": "https://codespaces.new/breatheco-de/exercise-postcard",
-    "message": "Is there anything you want to know about the {{title}} program?"
+    "message": "Is there anything you want to know about the {{title}} program?",
+    "payment-methods": "- Credit Card. - Contact support for other options"
   },
   "featured-bullets": [
     {
@@ -97,19 +98,16 @@
       {
         "type": "lesson",
         "title": "Readings and videos",
-        "qty": 45,
         "icon": "book"
       },
       {
         "type": "exercise",
         "title": "Interactive Exercises",
-        "qty": 584,
         "icon": "strength"
       },
       {
         "type": "project",
         "title": "Interactive Projects",
-        "qty": 28,
         "icon": "laptop-code"
       },
       {

public/locales/en/footer.json

@@ -97,10 +97,10 @@
       "href": "/bootcamp/full-stack-development"
     },
     {
-      "title": "Start coding using Python",
+      "title": "Deep Dive into Python",
       "icon": "python",
       "text": "Get started in coding with the world's most popular language. Build your first projects and practice with more than 300 exercises.",
-      "href": "/bootcamp/start-coding-using-python"
+      "href": "/bootcamp/deep-dive-into-python"
     },
     {
       "title": "Data Science and ML",

public/locales/es/course.json

@@ -39,7 +39,8 @@
     "description": "4Geeks.com es la primera plataforma diseñada para maximizar el aprendizaje a tu propio ritmo. Únete a sesiones en vivo cuando tu puedas, obtén ayuda de forma inmediata con IA y pide mentorías uno a uno. Todo nuestro contenido es totalmente interactivo y con videos.",
     "button": "Prueba Rigobot gratis",
     "link": "https://codespaces.new/breatheco-de/exercise-postcard",
-    "message": "¿Hay algo que quieras saber sobre el programa {{title}}?"
+    "message": "¿Hay algo que quieras saber sobre el programa {{title}}?",
+    "payment-methods": "- Tarjeta de crédito. - Contacta a soporte para mas opciones"
   },
   "featured-bullets": [
     {

public/locales/es/footer.json

@@ -97,10 +97,10 @@
       "href": "/es/bootcamp/full-stack-development"
     },
     {
-      "title": "Empieza a programar con Python",
+      "title": "Profundiza con Python",
       "icon": "python",
       "text": "Empieza a programar utilizando el lenguaje más popular del mundo, Python. Construye tus primeros proyectos y accede a más de 300 ejercicios para practicar.",
-      "href": "/es/bootcamp/start-coding-using-python"
+      "href": "/es/bootcamp/deep-dive-into-python"
     },
     {
       "title": "Data Science y Machine Learning",

public/locales/es/signup.json

@@ -123,7 +123,7 @@
     "free-trial-period": "Prueba gratuita por {{qty}} {{period}}",
     "trial": "Prueba por 1 mes",
     "trial-week": "Prueba por 1 semana",
-    "monthly": "Mensual",
+    "monthly": "Un mes",
     "one-time-payment": "un solo pago",
     "one-time-connector": "Un solo pago de ${{value}} dólares",
     "installments": "Cuotas",

public/locales/es/syllabus.json

@@ -29,8 +29,8 @@
   "next-page": "Siguiente",
   "back-to-top": "Volver arriba",
   "back-to-program": "Volver al programa",
-  "back-to-previous": "volver al módulo anterior",
-  "start-next": "Comenzar siguiente module:",
+  "back-to-previous": "Volver al módulo anterior",
+  "start-next": "Comenzar siguiente modulo:",
   "no-traduction-found": "No se encontró traducción",
   "no-traduction-found-description": ">Lo sentimos, no se encontró una traducción para este contenido. Estamos trabajando constantemente para ofrecer nuestros módulos en varios idiomas. Apreciamos tu paciencia y si deseas contribuir con traducciones, por favor visita nuestro repositorio en Github. Mientras tanto, puedes intentar acceder al contenido en otro idioma disponible o volver más tarde para verificar si la traducción ha sido agregada.",
   "no-content-found": "No se encontró contenido",

public/sitemap.xml

@@ -2,26 +2,26 @@
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
   <sitemap>
     <loc>https://4geeks.com/pages-sitemap.xml</loc>
-    <lastmod>2024-11-29T09:15:51.552Z</lastmod>
+    <lastmod>2024-12-12T14:11:44.258Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/howto-sitemap.xml</loc>
-    <lastmod>2024-11-29T09:15:51.552Z</lastmod>
+    <lastmod>2024-12-12T14:11:44.258Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/lessons-sitemap.xml</loc>
-    <lastmod>2024-11-29T09:15:51.552Z</lastmod>
+    <lastmod>2024-12-12T14:11:44.258Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/projects-sitemap.xml</loc>
-    <lastmod>2024-11-29T09:15:51.552Z</lastmod>
+    <lastmod>2024-12-12T14:11:44.258Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/exercises-sitemap.xml</loc>
-    <lastmod>2024-11-29T09:15:51.552Z</lastmod>
+    <lastmod>2024-12-12T14:11:44.258Z</lastmod>
   </sitemap>
   <sitemap>
     <loc>https://4geeks.com/technologies-sitemap.xml</loc>
-    <lastmod>2024-11-29T09:15:51.552Z</lastmod>
+    <lastmod>2024-12-12T14:11:44.258Z</lastmod>
   </sitemap>
 </sitemapindex>

public/syllabus.json

@@ -1 +1 @@
-"[\n    {\"label\": \"Web Developer\", \"href\": \"/read/web-development\"},{\"label\": \"Full-Stack Software Developer - 16w\", \"href\": \"/read/full-stack\"}\n  ]"
+"[\n {\"label\": \"Web Developer\", \"href\": \"/read/web-development\"},{\"label\": \"Full-Stack Software Developer - 16w\", \"href\": \"/read/full-stack\"}\n ]"

src/common/components/ShowPrices.jsx

@@ -10,7 +10,6 @@ import Heading from './Heading';
 import Text from './Text';
 import useSignup from '../store/actions/signupAction';
 import useStyle from '../hooks/useStyle';
-import useRigo from '../hooks/useRigo';
 
 function PlanCard({ item, handleSelect, selectedId, isCouponAvailable }) {
   const { hexColor, backgroundColor2 } = useStyle();
@@ -83,7 +82,6 @@ function ShowPrices({
   const { t } = useTranslation('profile');
   const { hexColor, fontColor, disabledColor, featuredColor } = useStyle();
   const router = useRouter();
-  const { isRigoInitialized, rigo } = useRigo();
   const { getPriceWithDiscount, state } = useSignup();
   const { selfAppliedCoupon } = state;
 
@@ -133,13 +131,6 @@ function ShowPrices({
     if (dataList.length === 1) {
       handleSelect(dataList[0]);
     }
-    if (isRigoInitialized) {
-      const context = document.body.innerText;
-
-      rigo.updateOptions({
-        context,
-      });
-    }
   }, []);
 
   const handleSelectFinance = (index) => {

src/common/context/RigoContext.jsx

@@ -21,7 +21,7 @@ function RigoProvider({ children }) {
       }}
     >
       <Script
-        src="https://unpkg.com/[email protected].59/dist/main.js"
+        src="https://unpkg.com/[email protected].63/dist/main.js"
         onLoad={() => {
           window.rigo.init(process.env.RIGOBOT_HASH, {
             context: '',

src/js_modules/profile/Subscriptions/index.jsx

@@ -89,10 +89,10 @@ function Subscriptions({ cohorts }) {
           return mentRes.data.mentorship_services;
         });
 
-        const promiseEvents = data.mentorship_service_sets.map(async (elem) => {
-          const mentRes = await bc.payment().getEventTypeSet(elem.id);
+        const promiseEvents = data.event_type_sets.map(async (elem) => {
+          const evRes = await bc.payment().getEventTypeSet(elem.id);
 
-          return mentRes.data.event_types;
+          return evRes.data.event_types;
         });
         const resMentorships = await Promise.all(promiseMentorship);
         const resWorkshops = await Promise.all(promiseEvents);