2 files changed, 42 insertions, 31 deletions

diff --git a/src/core/components/layouts/BasicLayout.jsx b/src/core/components/layouts/BasicLayout.jsx
index b6e2c59f..fa41a8ed 100644
--- a/src/core/components/layouts/BasicLayout.jsx
+++ b/src/core/components/layouts/BasicLayout.jsx
@@ -1,8 +1,9 @@
 import dynamic from 'next/dynamic';
 import Image from 'next/image';
-import { useEffect, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 
 import { useProductContext } from '@/contexts/ProductContext';
+import odooApi from '@/core/api/odooApi';
 import whatsappUrl from '@/core/utils/whatsappUrl';
 import { useRouter } from 'next/router';
 
@@ -41,20 +42,28 @@ const BasicLayout = ({ children }) => {
     }
   }, [product, router]);
 
-  // useEffect(() => {
-  //   const getIP = async () => {
-  //     const ip = await odooApi('GET', '/api/ip-address');
-  //     const data = {
-  //       page_title: document.title,
-  //       url: window.location.href,
-  //       ip: ip,
-  //     };
-  //     axios.get(
-  //       `/api/user-activity?page_title=${data.page_title}&url=${data.url}&ip=${data.ip}`
-  //     );
-  //   };
-  //   getIP();
-  // }, []);
+  const recordActivity = useCallback(async () => {
+    const recordedPath = [
+      '/shop/product/[slug]',
+      '/shop/product/variant/[slug]',
+    ];
+
+    if (!recordedPath.includes(router.pathname)) return;
+
+    const ip = await odooApi('GET', '/api/ip-address');
+    const data = new URLSearchParams({
+      page_title: document.title,
+      url: window.location.href,
+      ip,
+    });
+
+    fetch(`/api/user-activity?${data.toString()}`);
+  }, [router.pathname]);
+
+  useEffect(() => {
+    recordActivity();
+  }, [recordActivity]);
+
   return (
     <>
       <Navbar />
diff --git a/src/core/utils/slug.js b/src/core/utils/slug.js
index e91bcf83..19c7b115 100644
--- a/src/core/utils/slug.js
+++ b/src/core/utils/slug.js
@@ -1,4 +1,4 @@
-import toTitleCase from './toTitleCase'
+import toTitleCase from './toTitleCase';
 
 /**
  * Creates a slug from input parameters by converting the name and appending it with an ID.
@@ -10,19 +10,20 @@ import toTitleCase from './toTitleCase'
  * @returns {string} - The generated slug with the prefix, name, and ID.
  */
 const createSlug = (prefix, name, id, withHost = false) => {
+  name ||= '';
   let slug =
     name
       ?.trim()
       .replace(new RegExp(/[^A-Za-z0-9]/, 'g'), '-')
       .toLowerCase() +
     '-' +
-    id
-  let splitSlug = slug.split('-')
-  let filterSlugFromEmptyChar = splitSlug.filter((x) => x != '')
-  slug = prefix + filterSlugFromEmptyChar.join('-')
-  if (withHost) slug = process.env.NEXT_PUBLIC_SELF_HOST + slug
-  return slug
-}
+    id;
+  let splitSlug = slug.split('-');
+  let filterSlugFromEmptyChar = splitSlug.filter((x) => x != '');
+  slug = prefix + filterSlugFromEmptyChar.join('-');
+  if (withHost) slug = process.env.NEXT_PUBLIC_SELF_HOST + slug;
+  return slug;
+};
 
 /**
  * Extracts the ID from a slug.
@@ -32,9 +33,9 @@ const createSlug = (prefix, name, id, withHost = false) => {
  * @returns {string} - The extracted ID from the slug.
  */
 const getIdFromSlug = (slug) => {
-  let id = slug.split('-')
-  return id[id.length - 1]
-}
+  let id = slug.split('-');
+  return id[id.length - 1];
+};
 
 /**
  * Extracts the name from a slug.
@@ -45,9 +46,10 @@ const getIdFromSlug = (slug) => {
  * @returns {string} - The extracted name from the slug in title case.
  */
 const getNameFromSlug = (slug) => {
-  let name = slug.split('-')
-  name.pop()
-  return toTitleCase(name.join(' '))
-}
+  let name = slug.split('-');
+  name.pop();
+  return toTitleCase(name.join(' '));
+};
+
+export { createSlug, getIdFromSlug, getNameFromSlug };
 
-export { createSlug, getIdFromSlug, getNameFromSlug }