added analytics

frontend/src/components/shared/ReactHelmet.jsx

@@ -6,7 +6,6 @@ import { useEffect } from 'react';
 const api_url = process.env.REACT_APP_API_URL;
 
 const ReactHelmet = ({ seo }) => {
-  //console.log(seo);
   return (
     <Helmet>
       <title>{seo.metaTitle}</title>
@@ -15,18 +14,18 @@ const ReactHelmet = ({ seo }) => {
       <meta name="keywords" content={seo.keywords} />
       <meta name="viewport" content={seo.metaViewport} />
       <meta name="robots" content={seo.metaRobots} />
-      <meta property="og:title" content={seo.metaSocial[0].title} />
+      <meta property="og:title" content={seo.metaSocial[0]?.title} />
       <meta
         property="og:image"
-        content={`${api_url}${seo.metaSocial[0].image.data.attributes.url}`}
+        content={`${api_url}${seo.metaSocial[0]?.image?.data?.attributes?.url}`}
       />
-      <meta property="og:description" content={seo.metaSocial[0].description} />
-      <meta property="twitter:title" content={seo.metaSocial[1].title} />
+      <meta property="og:description" content={seo.metaSocial[0]?.description} />
+      <meta property="twitter:title" content={seo.metaSocial[1]?.title} />
       <meta
         property="twitter:image"
-        content={`${api_url}${seo.metaSocial[1].image.data.attributes.url}`}
+        content={`${api_url}${seo.metaSocial[1]?.image?.data?.attributes?.url}`}
       />
-      <meta property="twitter:description" content={seo.metaSocial[1].description} />
+      <meta property="twitter:description" content={seo.metaSocial[1]?.description} />
     </Helmet>
   );
 };

frontend/src/pages/About.jsx

@@ -49,7 +49,7 @@ export default function About() {
 
   const [{ data, isLoading, isError }, doFetch] = useDataApi(strapi);
 
-  useAnalytics('About page');
+  useAnalytics('About Us');
 
   useEffect(() => {
     document.title = 'About Us';
@@ -68,7 +68,7 @@ export default function About() {
 
   return (
     <PageLayout>
-      {(data && data.SEO) ? <ReactHelmet seo={data.SEO} /> : null}
+      {data && data.SEO && <ReactHelmet seo={data.SEO} />}
       <div className="bg-white dark:bg-dg-primary-1700 w-full pt-32">
         {/* Heading Section */}
         {data ? (

frontend/src/pages/ArticlePage.jsx

@@ -46,8 +46,6 @@ export default function ArticlePage() {
 
   const [{ data, isLoading, isError }, doFetch] = useFetchCollections(strapi);
 
-  console.log(data);
-
   useAnalytics('');
 
   useEffect(() => {

frontend/src/pages/Blog.jsx

@@ -55,7 +55,7 @@ export default function Blog() {
   } else {
     return (
       <PageLayout>
-        {data && data.SEO ? <ReactHelmet seo={data.SEO} /> : null}
+        {data && data.SEO && <ReactHelmet seo={data.SEO} />}
         <div className="mt-[80px] md:mt-[180px]">
           <Wrapper padding={' py-[48px]'}>
             {data ? (

frontend/src/pages/Careers.jsx

@@ -153,18 +153,12 @@ export default function Careers({ forwardedRef }) {
 
   const [{ data, isLoading, isError }, doFetch] = useDataApi(strapi);
 
-  //console.log(data);
-
   useEffect(() => {
     document.title = 'Careers';
   }, []);
 
   useAnalytics('Careers');
 
-  const link = useNavigate();
-
-  //useEffect(() => { vidRef.current.play(); },[]);
-
   if (isLoading) {
     return (
       <div className="z-50 w-full h-screen bg-white dark:bg-dg-primary-1700 dark:text-white flex items-center justify-center text-3xl font-semibold">
@@ -178,9 +172,10 @@ export default function Careers({ forwardedRef }) {
 
   return (
     <PageLayout>
+      {data && data.SEO && <ReactHelmet seo={data.SEO} />}
       {data ? (
         <div className="bg-white dark:bg-dg-primary-1700 w-full md:pt-90p overflow-hidden">
-          {data.SEO ? <ReactHelmet seo={data.SEO} /> : null}
+          
           {/* Diligent Life */}
           <Wrapper padding={' py-90p'}>
             <PageTitle

frontend/src/pages/Culture.jsx

@@ -76,8 +76,6 @@ export default function Culture({ forwardedRef }) {
     document.title = 'Culture';
   }, []);
 
-  //console.log(data);
-
   if (isLoading) {
     return (
       <div className="z-50 w-full h-screen bg-white dark:bg-dg-primary-1700 dark:text-white flex items-center justify-center text-3xl font-semibold">
@@ -91,7 +89,7 @@ export default function Culture({ forwardedRef }) {
 
   return (
     <PageLayout>
-      {/* {data && data.SEO ? <ReactHelmet seo={data.SEO} /> : null} */}
+      {data && data.SEO && <ReactHelmet seo={data.SEO} />}
       <div className="bg-white dark:bg-dg-primary-1700 w-full pt-32p md:pt-90p overflow-hidden">
         {/* Our Philosophy */}
         {data && data.Heading && data.HeadingParagraph && (

frontend/src/pages/Home.jsx

@@ -75,7 +75,7 @@ export default function Home({ forwardedRef }) {
   const [{ data, isLoading, isError }, doFetch] = useDataApi(strapi);
 
 
-  useAnalytics('Home page');
+  useAnalytics('Home');
 
   useEffect(() => {
     document.title = 'Diligent Software';

frontend/src/pages/Portfolio.jsx

@@ -113,7 +113,7 @@ export default function Portfolio() {
 
   return (
     <PageLayout>
-      {cnt.SEO && <ReactHelmet seo={cnt.SEO} />}
+      {cnt && cnt.SEO && <ReactHelmet seo={cnt.SEO} />}
       <div className="flex flex-col gap-90p pt-32">
         <Wrapper>
           <h1 className="hidden">Our Work - Case Studies</h1>

frontend/src/pages/ProcessPage.jsx

@@ -62,7 +62,7 @@ const ProcessPage = () => {
   } else {
     return (
       <PageLayout>
-        {data && data.SEO ? <ReactHelmet seo={data.SEO} /> : null}
+        {data && data.SEO && <ReactHelmet seo={data.SEO} />}
         <div className="pt-32">
           <Wrapper>
             {data ? (

frontend/src/pages/WorkWithUs.jsx

@@ -96,7 +96,7 @@ const WorkWithUs = () => {
   } else {
     return (
       <PageLayout>
-        {data && data.SEO ? <ReactHelmet seo={data.SEO} /> : null}
+        {data && data.SEO && <ReactHelmet seo={data.SEO} />}
         <div className="mt-[80px] md:mt-[180px]">
           <Wrapper padding={' py-[48px]'}>
             {data ? (