From e50628776bdf54420f4e052723b7808ab1d8e75b Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Mon, 18 Aug 2025 21:50:58 -0400
Subject: [PATCH 1/8] changes to improve cohort dashboard and guided experience

---
 src/components/CohortPanel.jsx                | 56 ++++++++++++++++---
 .../ExerciseGuidedExperience.jsx              | 20 ++++++-
 src/components/Timeline.jsx                   | 34 +++++++++--
 .../[lesson]/[lessonSlug]/index.jsx           | 14 +++++
 4 files changed, 110 insertions(+), 14 deletions(-)

diff --git a/src/components/CohortPanel.jsx b/src/components/CohortPanel.jsx
index 073fa1a46..6323a4193 100644
--- a/src/components/CohortPanel.jsx
+++ b/src/components/CohortPanel.jsx
@@ -93,6 +93,8 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
     modules.forEach((module) => {
       const assignmentsCount = module.content.reduce((acc, curr) => {
         const isApproved = isTaskApproved(curr);
+        const isRejected = curr.revision_status === 'REJECTED';
+        const isPendingProject = curr.task_type === 'PROJECT' && curr.revision_status === 'PENDING' && curr.task_status === 'DONE';
         if (!(curr.task_type in acc)) {
           // Check if any assignment in the module has a pending revision
           const pendingRevisionsCount = module.content.filter((assignment) => pendingRevisions.some((task) => task.associated_slug === assignment.slug && task.task_type === curr.task_type)).length;
@@ -103,11 +105,15 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
             done: curr.task_status === 'DONE' ? 1 : 0,
             pendingRevision: pendingRevisionsCount,
             approved: isApproved ? 1 : 0,
+            rejected: isRejected ? 1 : 0,
+            pending: isPendingProject ? 1 : 0,
           };
         } else {
           acc[curr.task_type].total += 1;
           if (curr.task_status === 'DONE') acc[curr.task_type].done += 1;
           if (isApproved) acc[curr.task_type].approved += 1;
+          if (isRejected) acc[curr.task_type].rejected += 1;
+          if (isPendingProject) acc[curr.task_type].pending += 1;
         }
         return acc;
       }, {});
@@ -115,12 +121,16 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
       const typesPerModule = Object.keys(assignmentsCount);
       const moduleTotalAssignments = typesPerModule.reduce((acc, curr) => assignmentsCount[curr].total + acc, 0);
       const moduleDoneAssignments = typesPerModule.reduce((acc, curr) => assignmentsCount[curr].done + acc, 0);
+      const moduleApprovedAssignments = typesPerModule.reduce((acc, curr) => assignmentsCount[curr].approved + acc, 0);
+      const moduleRejectedAssignments = typesPerModule.reduce((acc, curr) => assignmentsCount[curr].rejected + acc, 0);
       const hasPendingRevisions = typesPerModule.some((taskType) => assignmentsCount[taskType].pendingRevision > 0);
       const isStarted = module.filteredContent.length > 0;
 
       modulesDict[module.id] = {
         moduleTotalAssignments,
         moduleDoneAssignments,
+        moduleApprovedAssignments,
+        moduleRejectedAssignments,
         assignmentsCount,
         hasPendingRevisions,
         isStarted,
@@ -135,16 +145,18 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
 
     const allModules = Object.values(modulesProgress);
     const totalAssignments = allModules.reduce((acc, curr) => curr.moduleTotalAssignments + acc, 0);
-    const doneAssignments = allModules.reduce((acc, curr) => curr.moduleDoneAssignments + acc, 0);
+    const approvedAssignments = allModules.reduce((acc, curr) => curr.moduleApprovedAssignments + acc, 0);
+    const rejectedAssignments = allModules.reduce((acc, curr) => curr.moduleRejectedAssignments + acc, 0);
     const hasPendingRevisions = allModules.some((module) => module.hasPendingRevisions);
 
-    const percentage = cohort.cohort_user.educational_status === 'GRADUATED' ? 100 : Math.floor((doneAssignments * 100) / (totalAssignments || 1));
+    const percentage = cohort.cohort_user.educational_status === 'GRADUATED' ? 100 : Math.ceil((approvedAssignments * 100) / (totalAssignments || 1));
 
     const isCohortStarted = allModules.some((module) => module.isStarted);
 
     return {
       totalAssignments,
-      doneAssignments,
+      approvedAssignments,
+      rejectedAssignments,
       percentage,
       isCohortStarted,
       hasPendingRevisions,
@@ -293,6 +305,8 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
     padding: '16px',
   } : {};
 
+  console.log(modulesProgress);
+
   return (
     <>
       <Accordion index={isExpanded ? 0 : -1} onChange={(index) => setIsExpanded(index === 0)} allowToggle>
@@ -462,7 +476,7 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
                   {modules?.map((module) => {
                     const assignmentsCount = modulesProgress?.[module.id]?.assignmentsCount;
                     const moduleTotalAssignments = modulesProgress?.[module.id]?.moduleTotalAssignments;
-                    const moduleDoneAssignments = modulesProgress?.[module.id]?.moduleDoneAssignments;
+                    const moduleApprovedAssignments = modulesProgress?.[module.id]?.moduleApprovedAssignments;
 
                     const typesPerModule = assignmentsCount ? Object.keys(assignmentsCount) : [];
                     const moduleLabel = getModuleLabel(module);
@@ -492,13 +506,13 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
                                       <Icon icon="play" width="12px" height="12px" color="white" />
                                     </Box>
                                   );
-                                } if (moduleTotalAssignments === moduleDoneAssignments) { // Case 2: Started and Complete
+                                } if (moduleTotalAssignments === moduleApprovedAssignments) { // Case 2: Started and Complete
                                   return (
                                     <Icon icon="verified" width="26px" height="26px" color={hexColor.green} />
                                   );
                                 } // else: Case 3: Started but In Progress (including 0 done)
                                 return (
-                                  <CircularProgress color={hexColor.green} size="26px" value={(moduleDoneAssignments * 100) / (moduleTotalAssignments || 1)} />
+                                  <CircularProgress color={hexColor.green} size="26px" value={(moduleApprovedAssignments * 100) / (moduleTotalAssignments || 1)} />
                                 );
                               })()}
                             </>
@@ -509,7 +523,7 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
                         </Box>
                         <Box display={{ base: 'none', sm: 'flex' }} alignItems="center" gap="16px">
                           {typesPerModule.map((taskType) => {
-                            const { icon, total, done, pendingRevision, approved } = assignmentsCount[taskType];
+                            const { icon, total, done, pendingRevision, approved, rejected, pending } = assignmentsCount[taskType];
                             return (
                               <Box
                                 key={`${moduleLabel}-${taskType}`}
@@ -532,7 +546,33 @@ function CohortPanel({ cohort, modules, mainCohort, certificate, openByDefault,
                                   {total}
                                 </Text>
                                 {approved === total && <Icon icon="checked2" color={hexColor.green} />}
-                                {pendingRevision > 0 && (
+                                {rejected > 0 && (
+                                  <Box border="5px solid" borderColor="danger" borderRadius="100%" color="danger" position="relative">
+                                    <Box
+                                      position="absolute"
+                                      top="50%"
+                                      left="50%"
+                                      transform="translate(-50%, -50%)"
+                                      borderRadius="full"
+                                      border="2px solid"
+                                      borderColor={hexColor.white2}
+                                    />
+                                  </Box>
+                                )}
+                                {pending > 0 && (
+                                  <Box border="5px solid" borderColor="yellow.default" borderRadius="100%" position="relative">
+                                    <Box
+                                      position="absolute"
+                                      top="50%"
+                                      left="50%"
+                                      transform="translate(-50%, -50%)"
+                                      borderRadius="full"
+                                      border="2px solid"
+                                      borderColor={hexColor.white2}
+                                    />
+                                  </Box>
+                                )}
+                                {pendingRevision > 0 && rejected > 0 && (
                                   <Box
                                     position="absolute"
                                     top="18px"
diff --git a/src/components/GuidedExperience/ExerciseGuidedExperience.jsx b/src/components/GuidedExperience/ExerciseGuidedExperience.jsx
index df53746a7..189a94c5e 100644
--- a/src/components/GuidedExperience/ExerciseGuidedExperience.jsx
+++ b/src/components/GuidedExperience/ExerciseGuidedExperience.jsx
@@ -12,7 +12,7 @@ import Heading from '../Heading';
 import Text from '../Text';
 import { reportDatalayer } from '../../utils/requests';
 
-function ExerciseGuidedExperience({ currentTask, currentAsset, handleStartLearnpack, iframeURL, learnpackStart, setLearnpackStart }) {
+function ExerciseGuidedExperience({ currentTask, currentAsset, handleStartLearnpack, iframeURL, learnpackStart, setLearnpackStart, onCloseExercise }) {
   const { t } = useTranslation('syllabus');
   const { colorMode } = useStyle();
   const [telemetryReport, setTelemetryReport] = useState([]);
@@ -121,7 +121,21 @@ function ExerciseGuidedExperience({ currentTask, currentAsset, handleStartLearnp
       {learnpackStart
         ? (
           <>
-            <Button color="white" alignSelf="end" _hover="none" _active="none" background="none" onClick={() => setLearnpackStart(false)}>{t('close-exercise')}</Button>
+            <Button
+              color="white"
+              alignSelf="end"
+              _hover="none"
+              _active="none"
+              background="none"
+              onClick={() => {
+                setLearnpackStart(false);
+                if (onCloseExercise) {
+                  onCloseExercise();
+                }
+              }}
+            >
+              {t('close-exercise')}
+            </Button>
             <Box flexGrow={100}>
               <iframe
                 title="exercise-frame"
@@ -243,6 +257,7 @@ ExerciseGuidedExperience.propTypes = {
   handleStartLearnpack: PropTypes.func,
   setLearnpackStart: PropTypes.func,
   learnpackStart: PropTypes.bool,
+  onCloseExercise: PropTypes.func,
 };
 
 ExerciseGuidedExperience.defaultProps = {
@@ -252,6 +267,7 @@ ExerciseGuidedExperience.defaultProps = {
   handleStartLearnpack: null,
   setLearnpackStart: null,
   learnpackStart: false,
+  onCloseExercise: null,
 };
 
 export default ExerciseGuidedExperience;
diff --git a/src/components/Timeline.jsx b/src/components/Timeline.jsx
index 2a011b8ea..b1b9bb522 100644
--- a/src/components/Timeline.jsx
+++ b/src/components/Timeline.jsx
@@ -77,6 +77,34 @@ function Timeline({
       : (item?.translations?.[lang]?.title || item?.title);
   };
 
+  const getAssignmentStatusIndicator = (item) => {
+    const isProjectPending = item.task_status === 'DONE' && item.revision_status === 'PENDING' && item.task_type === 'PROJECT';
+    const isProjectRejected = item.task_status === 'DONE' && item.revision_status === 'REJECTED' && item.task_type === 'PROJECT';
+
+    if (isProjectPending || isProjectRejected) {
+      return (
+        <Box border="9px solid" borderColor={isProjectPending ? 'yellow.default' : 'danger'} borderRadius="100%" position="relative">
+          <Box
+            position="absolute"
+            top="50%"
+            left="50%"
+            transform="translate(-50%, -50%)"
+            borderRadius="full"
+            border="4px solid"
+            borderColor={hexColor.white2}
+          />
+        </Box>
+      );
+    }
+    if (item.task_status === 'DONE' && item.task_type !== 'PROJECT') {
+      return <Icon icon="checked2" color={hexColor.green} />;
+    }
+    if (item.task_status === 'DONE' && item.revision_status === 'APPROVED' && item.task_type === 'PROJECT') {
+      return <Icon icon="checked2" color={hexColor.green} />;
+    }
+    return null;
+  };
+
   if (variant === 'guided-experience') {
     return (
       <Box display="flex" flexDirection="column" gap="5px" flex="1">
@@ -110,9 +138,7 @@ function Timeline({
                 </Flex>
                 <Text size="sm" fontWeight="400" marginY={0} color={muted ? '#6883B4' : fontColor}>{assignmentTitle}</Text>
               </Box>
-              {item.task_status === 'DONE' && (
-                <Icon icon="checked2" color={hexColor.green} />
-              )}
+              {getAssignmentStatusIndicator(item)}
             </Box>
           );
         }) : (
@@ -216,7 +242,7 @@ Timeline.defaultProps = {
   assignments: [],
   technologies: [],
   width: '100%',
-  onClickAssignment: () => {},
+  onClickAssignment: () => { },
   showPendingTasks: false,
   variant: '',
 };
diff --git a/src/pages/syllabus/[cohortSlug]/[lesson]/[lessonSlug]/index.jsx b/src/pages/syllabus/[cohortSlug]/[lesson]/[lessonSlug]/index.jsx
index 4e5cb1914..15ee56a48 100644
--- a/src/pages/syllabus/[cohortSlug]/[lesson]/[lessonSlug]/index.jsx
+++ b/src/pages/syllabus/[cohortSlug]/[lesson]/[lessonSlug]/index.jsx
@@ -154,6 +154,19 @@ function SyllabusContent() {
     onToggle();
   };
 
+  const handleCloseExercise = async () => {
+    if (currentTask?.id) {
+      try {
+        const { data: updatedTask } = await bc.assignments().getTask(currentTask.id);
+        if (updatedTask) {
+          updateTask(updatedTask, cohortSession);
+        }
+      } catch (error) {
+        console.error('Error updating task telemetry:', error);
+      }
+    }
+  };
+
   useEffect(() => {
     setLearnpackStart(false);
     if (currentAsset?.superseded_by?.slug) {
@@ -960,6 +973,7 @@ function SyllabusContent() {
                 setLearnpackStart={setLearnpackStart}
                 iframeURL={iframeURL}
                 learnpackStart={learnpackStart}
+                onCloseExercise={handleCloseExercise}
               />
             ) : (
               <Box

From 303798008204ef1e6d7676b9284eb2e720aad09d Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Mon, 18 Aug 2025 21:58:00 -0400
Subject: [PATCH 2/8] cta of bootcamcp appears first

---
 .../PrismicComponents/MktHeroSection.jsx      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/PrismicComponents/MktHeroSection.jsx b/src/components/PrismicComponents/MktHeroSection.jsx
index b198ef01a..e30590f10 100644
--- a/src/components/PrismicComponents/MktHeroSection.jsx
+++ b/src/components/PrismicComponents/MktHeroSection.jsx
@@ -202,16 +202,6 @@ function MktHeroSection({
         onClose={handleCloseModal}
         mainImage="/static/images/women-laptop-bubbles.png"
         callToActions={[
-          {
-            title: 'Self-paced courses',
-            titleStyles: {
-              color: 'green.500',
-            },
-            description: 'Build real tech skills at your own pace with 4Geeks: get personalized exercises, 1:1 mentorship, 24/7 feedback from our AI mentor, and full platform support to guide your journey.',
-            buttonText: 'See plan details',
-            titleLeftComponent: <Box p="8px" borderRadius="8px" bg="green.100"><Icon icon="pathToStar" color="#06AB52" /></Box>,
-            action: () => router.replace({ pathname: '/pricing', query: { view: 'self-paced' } }),
-          },
           {
             title: 'Immersive bootcamp',
             titleStyles: {
@@ -222,6 +212,16 @@ function MktHeroSection({
             titleLeftComponent: <Box p="8px" borderRadius="8px" bg="blue.50"><Icon icon="rocketDiagonal" color="#0084FF" /></Box>,
             action: () => router.replace({ pathname: '/pricing', query: { view: 'immersive-bootcamps' } }),
           },
+          {
+            title: 'Self-paced courses',
+            titleStyles: {
+              color: 'green.500',
+            },
+            description: 'Build real tech skills at your own pace with 4Geeks: get personalized exercises, 1:1 mentorship, 24/7 feedback from our AI mentor, and full platform support to guide your journey.',
+            buttonText: 'See plan details',
+            titleLeftComponent: <Box p="8px" borderRadius="8px" bg="green.100"><Icon icon="pathToStar" color="#06AB52" /></Box>,
+            action: () => router.replace({ pathname: '/pricing', query: { view: 'self-paced' } }),
+          },
         ]}
       />
     </Box>

From a8fd48c5db8e6cde0a7100230f4684866360a4f5 Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Tue, 19 Aug 2025 13:22:33 -0400
Subject: [PATCH 3/8] starting ip-api

---
 src/context/SessionContext.jsx |  10 +--
 src/hooks/useGoogleMaps.js     | 105 ---------------------------
 src/hooks/useIPGeolocation.js  | 127 +++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+), 112 deletions(-)
 delete mode 100644 src/hooks/useGoogleMaps.js
 create mode 100644 src/hooks/useIPGeolocation.js

diff --git a/src/context/SessionContext.jsx b/src/context/SessionContext.jsx
index 7f490f6b6..1c6f05e9f 100644
--- a/src/context/SessionContext.jsx
+++ b/src/context/SessionContext.jsx
@@ -3,7 +3,7 @@ import React, { createContext, useEffect, useState } from 'react';
 import { useRouter } from 'next/router';
 import PropTypes from 'prop-types';
 import { isWindow, getQueryString } from '../utils';
-import useGoogleMaps from '../hooks/useGoogleMaps';
+import useIPGeolocation from '../hooks/useIPGeolocation';
 import { error } from '../utils/logging';
 
 const initialUserSession = {
@@ -33,11 +33,7 @@ function SessionProvider({ children }) {
   const router = useRouter();
   const [location, setLocation] = useState(null);
   const [isLoadingLocation, setIsLoadingLocation] = useState(true);
-  const GOOGLE_KEY = process.env.GOOGLE_GEO_KEY;
-  const { gmapStatus, getUserLocation } = useGoogleMaps(
-    GOOGLE_KEY,
-    'places',
-  );
+  const { status, getUserLocation } = useIPGeolocation();
 
   const initLocation = async () => {
     try {
@@ -52,7 +48,7 @@ function SessionProvider({ children }) {
 
   useEffect(() => {
     initLocation();
-  }, [gmapStatus]);
+  }, [status]);
 
   const setConversionUrl = () => {
     if (isWindow) {
diff --git a/src/hooks/useGoogleMaps.js b/src/hooks/useGoogleMaps.js
deleted file mode 100644
index e4c428947..000000000
--- a/src/hooks/useGoogleMaps.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import axios from 'axios';
-import { useState, useEffect } from 'react';
-import { isWindow } from '../utils';
-
-const useGoogleMaps = (apiKey, libraries = 'places') => {
-  const [gmapStatus, setGmapStatus] = useState({
-    loaded: false,
-    error: false,
-  });
-
-  useEffect(() => {
-    if (!window.google) {
-      const script = document.createElement('script');
-      script.type = 'text/javascript';
-      script.src = `https://maps.google.com/maps/api/js?key=${apiKey}&libraries=${libraries}`;
-      const headScript = document.getElementsByTagName('script')[0];
-      headScript.parentNode.insertBefore(script, headScript);
-      script.addEventListener('load', () => {
-        setGmapStatus({
-          loaded: true,
-          error: false,
-        });
-      });
-      script.addEventListener('error', () => {
-        setGmapStatus({
-          loaded: true,
-          error: true,
-        });
-      });
-    } else {
-      setGmapStatus({
-        loaded: true,
-        error: false,
-      });
-    }
-  }, [apiKey, libraries]);
-
-  // geocode expects location: { lat: 123, lng: 321 }
-  const geocode = (request) => {
-    if (isWindow && gmapStatus.loaded) {
-      const { google } = window;
-      const geocoder = new google.maps.Geocoder();
-      return new Promise((resolve, reject) => {
-        geocoder.geocode(request, (result, geocodeStatus) => {
-          if (geocodeStatus === google.maps.GeocoderStatus.OK) {
-            resolve(result);
-          } else {
-            reject(result);
-          }
-        });
-      });
-    }
-    return null;
-  };
-
-  const geolocate = async (key) => {
-    if (gmapStatus.loaded && key) {
-      try {
-        const result = await axios.post(`https://www.googleapis.com/geolocation/v1/geolocate?key=${key}`);
-        return result;
-      } catch (error) {
-        console.error(error);
-      }
-    }
-    return null;
-  };
-
-  const getUserLocation = async (setCoords = () => {}) => {
-    const userLocation = localStorage.getItem('user-location');
-    if (gmapStatus.loaded && apiKey && !userLocation) {
-      const { data } = await geolocate(apiKey);
-      const loc = {};
-      if (data) {
-        setCoords({
-          latitude: data.location.lat,
-          longitude: data.location.lng,
-        });
-        loc.coordinates = {
-          latitude: data.location.lat,
-          longitude: data.location.lng,
-        };
-      }
-
-      const results = await geocode({ location: data.location });
-
-      results[0].address_components.forEach((comp) => {
-        if (comp.types.includes('locality')) loc.city = comp.long_name;
-        if (comp.types.includes('country')) {
-          loc.country = comp.long_name;
-          loc.countryShort = comp.short_name;
-        }
-      });
-      localStorage.setItem('user-location', JSON.stringify(loc));
-
-      return loc;
-    } if (userLocation) {
-      return JSON.parse(userLocation);
-    }
-    return null;
-  };
-
-  return { gmapStatus, geocode, geolocate, getUserLocation };
-};
-
-export default useGoogleMaps;
diff --git a/src/hooks/useIPGeolocation.js b/src/hooks/useIPGeolocation.js
new file mode 100644
index 000000000..b10be9883
--- /dev/null
+++ b/src/hooks/useIPGeolocation.js
@@ -0,0 +1,127 @@
+import axios from 'axios';
+import { useState, useEffect } from 'react';
+import { isWindow } from '../utils';
+
+const useIPGeolocation = () => {
+  const [status, setStatus] = useState({
+    loaded: false,
+    error: false,
+  });
+
+  const IP_API_URL = 'https://pro.ip-api.com/json';
+  const API_KEY = process.env.NEXT_PUBLIC_IP_API_KEY;
+
+  useEffect(() => {
+    if (isWindow) {
+      setStatus({
+        loaded: true,
+        error: false,
+      });
+    }
+  }, []);
+
+  const reverseGeocode = async (coordinates) => {
+    if (isWindow && status.loaded) {
+      try {
+        const response = await axios.get(`${IP_API_URL}?lat=${coordinates.lat}&lon=${coordinates.lng}&key=${API_KEY}`);
+        return response.data;
+      } catch (error) {
+        console.error('Reverse geocoding error:', error);
+        throw error;
+      }
+    }
+    return null;
+  };
+
+  const getCurrentLocation = async () => {
+    if (status.loaded) {
+      try {
+        const response = await axios.get(`${IP_API_URL}?key=${API_KEY}`);
+        return response.data;
+      } catch (error) {
+        console.error('Geolocation error:', error);
+        throw error;
+      }
+    }
+    return null;
+  };
+
+  const getUserLocation = async (setCoords = () => {}) => {
+    const userLocation = localStorage.getItem('user-location');
+
+    if (status.loaded && !userLocation) {
+      try {
+        const data = await getCurrentLocation();
+        const loc = {};
+
+        if (data && data.status === 'success') {
+          setCoords({
+            latitude: data.lat,
+            longitude: data.lon,
+          });
+
+          loc.coordinates = {
+            latitude: data.lat,
+            longitude: data.lon,
+          };
+
+          loc.city = data.city;
+          loc.country = data.country;
+          loc.countryShort = data.countryCode;
+          loc.region = data.regionName;
+          loc.regionShort = data.region;
+          loc.timezone = data.timezone;
+          loc.isp = data.isp;
+          loc.ip = data.query;
+
+          localStorage.setItem('user-location', JSON.stringify(loc));
+          return loc;
+        }
+      } catch (error) {
+        console.error('Error getting user location:', error);
+        setStatus((prev) => ({ ...prev, error: true }));
+      }
+    } else if (userLocation) {
+      return JSON.parse(userLocation);
+    }
+
+    return null;
+  };
+
+  const getLocationByIP = async (ip) => {
+    if (status.loaded && ip) {
+      try {
+        const response = await axios.get(`${IP_API_URL}/${ip}?key=${API_KEY}`);
+        return response.data;
+      } catch (error) {
+        console.error('Error getting location by IP:', error);
+        throw error;
+      }
+    }
+    return null;
+  };
+
+  const getUserIP = async () => {
+    if (status.loaded) {
+      try {
+        const response = await axios.get(`${IP_API_URL}?key=${API_KEY}`);
+        return response.data.query;
+      } catch (error) {
+        console.error('Error getting user IP:', error);
+        throw error;
+      }
+    }
+    return null;
+  };
+
+  return {
+    status,
+    reverseGeocode,
+    getCurrentLocation,
+    getUserLocation,
+    getLocationByIP,
+    getUserIP,
+  };
+};
+
+export default useIPGeolocation;

From 18651cc4fe606800a1928d4d20ec1c16205bda47 Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Tue, 19 Aug 2025 16:17:49 -0400
Subject: [PATCH 4/8] tested geo api and replace google

---
 next.config.js                 |  1 +
 src/context/SessionContext.jsx |  7 +++++--
 src/hooks/useIPGeolocation.js  | 19 +++++++++++++------
 src/utils/variables.js         |  1 +
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/next.config.js b/next.config.js
index 41da52b2c..b825609d8 100644
--- a/next.config.js
+++ b/next.config.js
@@ -168,5 +168,6 @@ module.exports = removeImports(nextTranslate(withBundleAnalyzer({
     DOMAIN_NAME: process.env.DOMAIN_NAME,
     BASE_PLAN: process.env.BASE_PLAN,
     RIGOBOT_HOST: process.env.RIGOBOT_HOST,
+    NEXT_PUBLIC_IP_API_KEY: process.env.NEXT_PUBLIC_IP_API_KEY,
   },
 })));
diff --git a/src/context/SessionContext.jsx b/src/context/SessionContext.jsx
index 1c6f05e9f..ee3cba00e 100644
--- a/src/context/SessionContext.jsx
+++ b/src/context/SessionContext.jsx
@@ -41,14 +41,17 @@ function SessionProvider({ children }) {
       setLocation(loc);
     } catch (e) {
       error('function getUserLocation()', e);
+      setLocation(null);
     } finally {
       setIsLoadingLocation(false);
     }
   };
 
   useEffect(() => {
-    initLocation();
-  }, [status]);
+    if (status.loaded) {
+      initLocation();
+    }
+  }, [status.loaded]);
 
   const setConversionUrl = () => {
     if (isWindow) {
diff --git a/src/hooks/useIPGeolocation.js b/src/hooks/useIPGeolocation.js
index b10be9883..8d4a8fca7 100644
--- a/src/hooks/useIPGeolocation.js
+++ b/src/hooks/useIPGeolocation.js
@@ -1,6 +1,7 @@
 import axios from 'axios';
 import { useState, useEffect } from 'react';
 import { isWindow } from '../utils';
+import { IP_API_KEY } from '../utils/variables';
 
 const useIPGeolocation = () => {
   const [status, setStatus] = useState({
@@ -9,7 +10,6 @@ const useIPGeolocation = () => {
   });
 
   const IP_API_URL = 'https://pro.ip-api.com/json';
-  const API_KEY = process.env.NEXT_PUBLIC_IP_API_KEY;
 
   useEffect(() => {
     if (isWindow) {
@@ -23,7 +23,7 @@ const useIPGeolocation = () => {
   const reverseGeocode = async (coordinates) => {
     if (isWindow && status.loaded) {
       try {
-        const response = await axios.get(`${IP_API_URL}?lat=${coordinates.lat}&lon=${coordinates.lng}&key=${API_KEY}`);
+        const response = await axios.get(`${IP_API_URL}?lat=${coordinates.lat}&lon=${coordinates.lng}&key=${IP_API_KEY}`);
         return response.data;
       } catch (error) {
         console.error('Reverse geocoding error:', error);
@@ -36,7 +36,7 @@ const useIPGeolocation = () => {
   const getCurrentLocation = async () => {
     if (status.loaded) {
       try {
-        const response = await axios.get(`${IP_API_URL}?key=${API_KEY}`);
+        const response = await axios.get(`${IP_API_URL}?key=${IP_API_KEY}`);
         return response.data;
       } catch (error) {
         console.error('Geolocation error:', error);
@@ -80,9 +80,16 @@ const useIPGeolocation = () => {
       } catch (error) {
         console.error('Error getting user location:', error);
         setStatus((prev) => ({ ...prev, error: true }));
+        return null;
       }
     } else if (userLocation) {
-      return JSON.parse(userLocation);
+      try {
+        return JSON.parse(userLocation);
+      } catch (error) {
+        console.error('Error parsing stored location:', error);
+        localStorage.removeItem('user-location');
+        return null;
+      }
     }
 
     return null;
@@ -91,7 +98,7 @@ const useIPGeolocation = () => {
   const getLocationByIP = async (ip) => {
     if (status.loaded && ip) {
       try {
-        const response = await axios.get(`${IP_API_URL}/${ip}?key=${API_KEY}`);
+        const response = await axios.get(`${IP_API_URL}/${ip}?key=${IP_API_KEY}`);
         return response.data;
       } catch (error) {
         console.error('Error getting location by IP:', error);
@@ -104,7 +111,7 @@ const useIPGeolocation = () => {
   const getUserIP = async () => {
     if (status.loaded) {
       try {
-        const response = await axios.get(`${IP_API_URL}?key=${API_KEY}`);
+        const response = await axios.get(`${IP_API_URL}?key=${IP_API_KEY}`);
         return response.data.query;
       } catch (error) {
         console.error('Error getting user IP:', error);
diff --git a/src/utils/variables.js b/src/utils/variables.js
index 76c6455ca..a146315d2 100644
--- a/src/utils/variables.js
+++ b/src/utils/variables.js
@@ -3,6 +3,7 @@ import modifyEnv from '../../modifyEnv';
 export const DOMAIN_NAME = process.env.DOMAIN_NAME || '';
 export const BASE_PLAN = process.env.BASE_PLAN || '';
 export const BASE_COURSE = process.env.BASE_COURSE || '';
+export const IP_API_KEY = process.env.NEXT_PUBLIC_IP_API_KEY || '';
 export const BREATHECODE_HOST = modifyEnv({ queryString: 'host', env: process.env.BREATHECODE_HOST || '' });
 export const RIGOBOT_HOST = modifyEnv({ queryString: 'host_rigo', env: process.env.RIGOBOT_HOST || '' });
 export const WHITE_LABEL_ACADEMY = process.env.WHITE_LABEL_ACADEMY || undefined;

From b7bccd0eb2fdf2eee537c2542e0c21f9f0e4fa03 Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Wed, 20 Aug 2025 13:39:58 -0400
Subject: [PATCH 5/8] doing tests

---
 src/components/Navbar/index.jsx | 1 +
 src/hooks/useIPGeolocation.js   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/components/Navbar/index.jsx b/src/components/Navbar/index.jsx
index 4dc4c1a20..d30be4a9a 100644
--- a/src/components/Navbar/index.jsx
+++ b/src/components/Navbar/index.jsx
@@ -99,6 +99,7 @@ function Navbar({ translations, pageProps }) {
         academy: WHITE_LABEL_ACADEMY,
         country_code: location?.countryShort,
       };
+      console.log('mktQueryString', mktQueryString);
       const response = await bc.marketing(mktQueryString).courses();
 
       const filterByTranslations = response?.data?.filter((item) => {
diff --git a/src/hooks/useIPGeolocation.js b/src/hooks/useIPGeolocation.js
index 8d4a8fca7..d456b0f4b 100644
--- a/src/hooks/useIPGeolocation.js
+++ b/src/hooks/useIPGeolocation.js
@@ -48,10 +48,12 @@ const useIPGeolocation = () => {
 
   const getUserLocation = async (setCoords = () => {}) => {
     const userLocation = localStorage.getItem('user-location');
+    localStorage.clear();
 
     if (status.loaded && !userLocation) {
       try {
         const data = await getCurrentLocation();
+        console.log('data', data);
         const loc = {};
 
         if (data && data.status === 'success') {

From 791676b077a40dabf1599d661e01c0cd24a805e2 Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Wed, 20 Aug 2025 14:47:45 -0400
Subject: [PATCH 6/8] doing tests

---
 src/context/SessionContext.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/context/SessionContext.jsx b/src/context/SessionContext.jsx
index ee3cba00e..c4a0b863d 100644
--- a/src/context/SessionContext.jsx
+++ b/src/context/SessionContext.jsx
@@ -49,6 +49,7 @@ function SessionProvider({ children }) {
 
   useEffect(() => {
     if (status.loaded) {
+      console.log('status.loaded', status.loaded);
       initLocation();
     }
   }, [status.loaded]);

From b89b255ab7c73fc65ead59d54713642185c66045 Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Wed, 20 Aug 2025 15:04:16 -0400
Subject: [PATCH 7/8] test done remved logs

---
 src/components/Navbar/index.jsx | 1 -
 src/context/SessionContext.jsx  | 1 -
 src/hooks/useIPGeolocation.js   | 1 -
 3 files changed, 3 deletions(-)

diff --git a/src/components/Navbar/index.jsx b/src/components/Navbar/index.jsx
index d30be4a9a..4dc4c1a20 100644
--- a/src/components/Navbar/index.jsx
+++ b/src/components/Navbar/index.jsx
@@ -99,7 +99,6 @@ function Navbar({ translations, pageProps }) {
         academy: WHITE_LABEL_ACADEMY,
         country_code: location?.countryShort,
       };
-      console.log('mktQueryString', mktQueryString);
       const response = await bc.marketing(mktQueryString).courses();
 
       const filterByTranslations = response?.data?.filter((item) => {
diff --git a/src/context/SessionContext.jsx b/src/context/SessionContext.jsx
index c4a0b863d..ee3cba00e 100644
--- a/src/context/SessionContext.jsx
+++ b/src/context/SessionContext.jsx
@@ -49,7 +49,6 @@ function SessionProvider({ children }) {
 
   useEffect(() => {
     if (status.loaded) {
-      console.log('status.loaded', status.loaded);
       initLocation();
     }
   }, [status.loaded]);
diff --git a/src/hooks/useIPGeolocation.js b/src/hooks/useIPGeolocation.js
index d456b0f4b..683fe5216 100644
--- a/src/hooks/useIPGeolocation.js
+++ b/src/hooks/useIPGeolocation.js
@@ -48,7 +48,6 @@ const useIPGeolocation = () => {
 
   const getUserLocation = async (setCoords = () => {}) => {
     const userLocation = localStorage.getItem('user-location');
-    localStorage.clear();
 
     if (status.loaded && !userLocation) {
       try {

From 129949079268fd32225cb095bfd7da6223e9cb16 Mon Sep 17 00:00:00 2001
From: lumi-tip <informacionlmdv@gmail.com>
Date: Wed, 20 Aug 2025 15:23:18 -0400
Subject: [PATCH 8/8] better handling couupons

---
 public/locales/en/signup.json | 1 +
 public/locales/es/signup.json | 1 +
 src/pages/checkout/index.jsx  | 5 +++++
 3 files changed, 7 insertions(+)

diff --git a/public/locales/en/signup.json b/public/locales/en/signup.json
index c36a97925..6e17c4f29 100644
--- a/public/locales/en/signup.json
+++ b/public/locales/en/signup.json
@@ -205,6 +205,7 @@
   "compilation-bundle-title": "Compilation bundle",
   "upgrade-a-plan": "Upgrade a plan",
   "take-me-there": "Take me there",
+  "coupon-not-valid": "Coupon {{name}} is not valid",
   "consumables": {
     "already-have-it": "Already have it",
     "consumable-event-not-available": "This event is not available for your subscription",
diff --git a/public/locales/es/signup.json b/public/locales/es/signup.json
index d2cddf400..a05272ec8 100644
--- a/public/locales/es/signup.json
+++ b/public/locales/es/signup.json
@@ -205,6 +205,7 @@
   "upgrade-a-plan": "Mejora un plan",
   "compilation-bundle-title": "Paquete de acceso a compilaciones",
   "take-me-there": "Comprar plan",
+  "coupon-not-valid": "El cupón {{name}} no es válido",
   "consumables": {
     "already-have-it": "Ya lo tienes",
     "consumable-event-not-available": "Este evento no está disponible para tu suscripción",
diff --git a/src/pages/checkout/index.jsx b/src/pages/checkout/index.jsx
index 5219e2e89..293636777 100644
--- a/src/pages/checkout/index.jsx
+++ b/src/pages/checkout/index.jsx
@@ -453,6 +453,11 @@ function Checkout() {
                             )}
                           </Formik>
                         )}
+                        {couponError && (
+                          <Text paddingStart="3px" size="sm" color="red">
+                            {t('coupon-not-valid', { name: discountCode })}
+                          </Text>
+                        )}
 
                         {allCoupons?.length > 0
                           && allCoupons.map((coup) => (