Merge pull request #2033 from breatheco-de/main

Merge main to dev

Author: tommygonzaleza

public/locales/es/navbar.json

@@ -83,7 +83,7 @@
           "description": "",
           "subMenu": [
             {
-              "href": "es/beyond-the-resume",
+              "href": "/es/beyond-the-resume",
               "label": "Más allá del currículum"
             }
           ]

src/pages/api/robots.js

@@ -6,6 +6,8 @@ export default function handler(req, res) {
   if (vercelEnv === 'production') {
     res.end(`User-agent: *
 Allow: /
+Disallow: /ask.4geeks.com/
+Disallow: /ask2.4geeks.com/
 Disallow: /static/
 Disallow: /_next/
 Disallow: /*.json$

src/pages/bootcamp/[course_slug].jsx

@@ -283,19 +283,8 @@ function CoursePage() {
                               {allDiscounts.length > 0 && '🔥'}
                               {featurePrice}
                             </Text>
-                            {!featuredPlanToEnroll?.isFreeTier && (
-                              <Flex alignItems="center" marginTop="5px" gap="5px" justifyContent="center">
-                                <Icon icon="shield" color="#ffffff" secondColor={courseColor || '#00b765'} width="23px" />
-                                <Text fontSize="13px" fontWeight="medium" paddingTop="2px">
-                                  {t('common:money-back-guarantee-no-link')}
-                                </Text>
-                              </Flex>
-                            )}
                           </Flex>
                         </Button>
-                        {!featuredPlanToEnroll?.isFreeTier && (
-                          <Text fontSize="11px" color="gray.500" textAlign="center" marginTop="6px" dangerouslySetInnerHTML={{ __html: t('common:money-back-guarantee-conditions-link') }} />
-                        )}
                         {isAuthenticated ? (
                           <Text size="13px" padding="4px 8px" borderRadius="4px" background={featuredColor}>
                             {t('signup:switch-user-connector', { name: user?.first_name })}

src/pages/bootcamp/useBootcamp.js

@@ -145,9 +145,9 @@ export const useBootcamp = () => {
         },
       });
       setIsFetching(true);
-      bc.cohort().join(cohortId)
+      bc.admissions().joinCohort(cohortId)
         .then(async (resp) => {
-          const dataRequested = await resp.json();
+          const dataRequested = await resp.data;
           if (dataRequested?.status === 'ACTIVE') {
             setReadyToRefetch(true);
           }
@@ -174,7 +174,8 @@ export const useBootcamp = () => {
             router.push('#pricing');
           }
         })
-        .catch(() => {
+        .catch((err) => {
+          console.log(err);
           setTimeout(() => {
             setIsFetching(false);
           }, 600);

src/pages/checkout/index.jsx

@@ -351,17 +351,7 @@ function Checkout() {
                             </Flex>
                           )}
                         </Flex>
-                        {!originalPlan?.isTrial && (
-                          <Flex flexDirection="column" alignItems="flex-start" marginTop="5px" gap="5px">
-                            <Flex alignItems="center" gap="5px">
-                              <Icon icon="shield" width="23px" />
-                              <Text fontSize="13px" fontWeight="medium" paddingTop="2px" color="green.400" lineHeight="normal">
-                                {t('common:money-back-guarantee-no-link')}
-                              </Text>
-                            </Flex>
-                            <Text fontSize="11px" color="gray.500" marginLeft="28px" marginTop="2px" dangerouslySetInnerHTML={{ __html: t('common:money-back-guarantee-conditions-link') }} />
-                          </Flex>
-                        )}
+
                       </Flex>
                     </Flex>
                     <Divider borderBottomWidth="2px" />

src/utils/cohorts.js

@@ -189,7 +189,7 @@ export const getActiveCohorts = (cohorts) => cohorts.filter((cohort) => {
     'NOT_COMPLETING',
   ].includes(programCohortStage);
 
-  const cohortIsAvailable = showCohort && !hasEnded;
+  const cohortIsAvailable = (showCohort && !hasEnded) || educationalStatus === 'NOT_COMPLETING';
   const isNotHiddenOnPrework = programCohortStage === 'PREWORK'
     && cohort.is_hidden_on_prework === false
     && !hasEnded;