gatsby-core-theme 44.5.0-poc.2 → 44.5.0

package/src/constants/forms.js

@@ -19,38 +19,54 @@ export const contactUsForm = {
         translationKey: 'name_label',
         id: 'name',
         type: 'text',
+        required: true,
         placeholder: {
           label: 'Write something',
           translationKey: 'name_placeholder',
         },
         twoCol: true,
+        error:{
+          errorMsg: "Please enter your name.",
+          translationKey: "name_error",
+        },
       },
       {
         label: 'Email Address',
         id: 'email',
         type: 'email',
+        required: true,
         placeholder: {
           label: 'Email@placeholder.com',
           translationKey: 'email_placeholder',
         },
         translationKey: 'email_label',
         twoCol: true,
+        error:{
+          errorMsg: "Please enter your email address.",
+          translationKey: "email_error",
+        },
       },
       {
         label: 'Field Label',
         id: 'subject',
         type: 'text',
+        required: true,
         placeholder: {
           label: 'Write something',
           translationKey: 'subject_placeholder',
         },
         translationKey: 'subject_label',
         twoCol: true,
+        error:{
+          errorMsg: "Please enter your subject.",
+          translationKey: "subject_error",
+        },
       },
       {
         label: 'Field Label',
         id: 'comment',
         type: 'textarea',
+        required: true,
         placeholder: {
           label: 'Write something',
           translationKey: 'comment_placeholder',
@@ -58,6 +74,10 @@ export const contactUsForm = {
         translationKey: 'textarea_label',
         maxLength: '1000',
         twoCol: false,
+        error:{
+          errorMsg: "Please enter your comment.",
+          translationKey: "comment_error",
+        },
       },
       {
         id: 'tnc',
@@ -65,6 +85,10 @@ export const contactUsForm = {
         required: true,
         translationKey: 'checkbox_label',
         twoCol: false,
+        error:{
+          errorMsg: "You must agree to the Comments Policy and Terms and Conditions to proceed.",
+          translationKey: "tnc_error",
+        },
         options: [
           {
             id: 'tnc',
@@ -83,28 +107,35 @@ export const contactUsForm = {
   },
 };
 
+
 export const commentForm = {
   default: {
+    validation: false,
     title: {
       label: 'Leave a comment',
       translationKey: 'leave_a_comment',
     },
     hasReCAPTCHA: true,
     reCaptcha: {
-      validations: {
-        label: 'Please confirm',
-        translationKey: 'valid_recaptcha',
-      }
+      // validations: {
+      //   label: 'Please confirm',
+      //   translationKey: 'valid_recaptcha',
+      //   icon: <IoMdCloseCircleOutline />,
+      // }
     },
     fields: [
       {
         label: 'Rating',
         translationKey: 'rating_label',
-        errorMsg: "Please rate this casino before submitting.",
+        error:{
+          errorMsg: "Please rate this casino before submitting.",
+          translationKey: "rating_error",
+        },
         id: 'rate',
         starRating: true,
         type: 'range',
-        step: 1,
+        required: true,
+        step: '1',
         min: 0,
         max: 5
       },
@@ -119,7 +150,10 @@ export const commentForm = {
           translationKey: 'name_placeholder',
         },
         twoCol: true,
-        errorMsg: "Please enter your name."
+        error:{
+          errorMsg: "Please enter your name.",
+          translationKey: "name_error",
+        },
       },
       {
         label: 'Email Address',
@@ -132,7 +166,10 @@ export const commentForm = {
         },
         translationKey: 'email_label',
         twoCol: true,
-        errorMsg: "Please enter a valid email address."
+        error:{
+          errorMsg: "Please enter a valid email address.",
+          translationKey: "email_error",
+        },
       },
       {
         label: 'Leave a comment',
@@ -145,8 +182,11 @@ export const commentForm = {
         translationKey: 'textarea_label',
         twoCol: false,
         required: true,
-        minlength: 15,
-        errorMsg: "Please enter a comment."
+        minlength: 50,
+        error:{
+          errorMsg: "Please enter a comment.",
+          translationKey: "comment_error",
+        },
       },
       {
         id: 'post_anonymously',
@@ -167,14 +207,18 @@ export const commentForm = {
       {
         id: 'tnc',
         type: 'checkbox',
+        required: true,
         translationKey: 'checkbox_label',
         twoCol: false,
-        errorMsg: 'You must agree to the Comments Policy and Terms and Conditions to proceed.',
+        error:{
+          errorMsg: 'You must agree to the Comments Policy and Terms and Conditions to proceed.',
+          translationKey: "tnc_error",
+        },
         options: [
           {
             id: 'tnc',
             label:
-              'By checking this box, I agree to the Comments Terms and Conditions.',
+              'By checking this box, I agree to the Comments Policy and Terms and Conditions.*',
             link: {
               url: '/privacy-policy',
               text: 'Link',
@@ -191,6 +235,7 @@ export const commentForm = {
 
 export const replyForm = {
   default: {
+    validation: false,
     hasReCAPTCHA: true,
     reCaptcha: {
       validations: {
@@ -210,7 +255,10 @@ export const replyForm = {
           translationKey: 'name_placeholder',
         },
         twoCol: true,
-        errorMsg: "Please enter your name."
+        error:{
+          errorMsg: "Please enter your name.",
+          translationKey: "name_error",
+        },
       },
       {
         label: 'Email Address',
@@ -223,7 +271,10 @@ export const replyForm = {
         },
         translationKey: 'email_label',
         twoCol: true,
-        errorMsg: "Please enter a valid email address."
+        error:{
+          errorMsg: "Please enter a valid email address.",
+          translationKey: "email_error",
+        },
       },
       {
         label: 'Leave a comment',

package/src/constants/ratings-constant.js

@@ -81,6 +81,11 @@ export const operatorRatings = {
         />
       ),
     },
+    {
+      fieldLabel: "Payout",
+      translationKey: "payout",
+      fieldValue: "payout_time",
+    },
   ],
   sportsbook: [
     {

package/src/constants/schema.js

@@ -2,4 +2,5 @@
 export const SchemaConstant = {
     operatorHeaderWidth: "",
     operatorHeaderHeight: "",
+    includeToplistSchema: false
 }

package/src/constants/settings.mjs

@@ -55,7 +55,6 @@ export default {
     'coin'
   ],
   site_ssr:[
-    'livegoals.com'
   ],
   newsletter:{
     default: {

package/src/context/VotesProvider.js

@@ -0,0 +1,49 @@
+import React, {createContext, useContext, useEffect, useState} from "react";
+
+export const VotesContext = createContext({});
+
+// eslint-disable-next-line react/prop-types
+export const VotesProvider = ({ children }) => {
+  const [votes, setVotes] = useState({});
+
+  useEffect(() => {
+    const storedVotes =
+      document.cookie
+        .split("; ")
+        .find((row) => row.startsWith("comments="))
+        ?.split("=")[1]
+        ?.split(",")
+        .filter(Boolean) || [];
+    const votesMap = storedVotes.reduce((acc, entry) => {
+      const [id, vote] = entry.split(":");
+      if (id && vote) acc[id] = vote;
+      return acc;
+    }, {});
+    setVotes(votesMap);
+  }, []);
+
+  const updateVote = (commentId, voteValue) => {
+    setVotes((prevVotes) => {
+        const newVotes = { ...prevVotes, [commentId]: voteValue };
+
+        // Convert votes object to cookie string
+        const cookieValue = Object.entries(newVotes)
+        .map(([id, vote]) => `${id}:${vote}`)
+        .join(",");
+
+        // Set the cookie (expires in 1 year)
+        document.cookie = `comments=${cookieValue}; path=/;`;
+
+        return newVotes;
+    });
+};
+
+  return (
+    <VotesContext.Provider value={{votes, updateVote}}>{children}</VotesContext.Provider>
+  );
+};
+
+export const useVote = (commentId) => {
+  const { votes } = useContext(VotesContext);
+  return votes?.[commentId];
+};

package/src/helpers/replaceMedia.js

@@ -130,10 +130,53 @@ export default (
     }
   }
 
-  // Add tab index for tables for accessibility
   if (node.name === "table") {
+    // Add tab index for tables for accessibility and fix thead structure
     node.attribs.tabIndex = 0;
 
+    // START: Get th elemnts from tbody and move them to thead
+    const tbodyIndex = node?.children.findIndex(
+      (child) => child?.name === "tbody"
+    );
+    // IF there is no tbody, return the node as is
+    if (tbodyIndex === -1) return node;
+    const tbody = node.children[tbodyIndex];
+    const tbodyChildren = tbody.children.filter((ch) => ch.type === "tag");
+
+    const theadRows = [];
+    const tbodyRows = [];
+
+    tbodyChildren.forEach((tr) => {
+      const trChildren = tr?.children?.filter((ch) => ch.type === "tag");
+      const hasThElements = trChildren.some((cell) => cell.name === "th");
+
+      if (hasThElements) {
+        theadRows.push(tr);
+      } else {
+        tbodyRows.push(tr);
+      }
+    });
+
+    if (theadRows.length) {
+      const existingTheadIndex = node?.children.findIndex(
+        (child) => child?.name === "thead"
+      );
+      if (existingTheadIndex === -1) {
+        const thead = {
+          type: "tag",
+          name: "thead",
+          attribs: {},
+          children: theadRows,
+        };
+
+        node.children.splice(tbodyIndex, 0, thead);
+      } else {
+        node?.children[existingTheadIndex]?.children?.push(...theadRows);
+      }
+      tbody.children = tbodyRows;
+    }
+    // END: Get th elemnts from tbody and move them to thead
+
     return node;
   }
 

package/src/helpers/schema.js

@@ -218,6 +218,7 @@ export function processSpeakableModules(modules) {
 
 export function webPageSchema(page, pageImage) {
   const speakAbleModules = processSpeakableModules(page?.sections?.main?.modules || []);
+  const toplistModule = page?.sections?.main?.modules && page?.sections?.main?.modules.find((module) => module.name === 'top_list');
 
   const schema = {
     '@context': 'https://schema.org',
@@ -235,6 +236,37 @@ export function webPageSchema(page, pageImage) {
       url: `${process.env.GATSBY_SITE_URL}`,
       inLanguage: getLanguage(page?.language),
     },
+    hasPart: SchemaConstant.includeToplistSchema && toplistModule?.items?.[0]?.items ?
+      toplistModule?.items?.[0]?.items.slice(0, 10).map((item, index) => ({
+          '@type': 'Recommendation',
+          position: index + 1,
+          reviewRating: {
+            '@type': 'Rating',
+            worstRating: 1,
+            bestRating: 5,
+            ratingValue: item?.rating,
+          },
+          author: {
+            "@type": "Person",
+            name: item?.author_name || page?.author?.name,
+            jobTitle: item?.author_title || page?.author?.author_title,
+            email: item?.author_email || page?.author?.email_address,
+            image: (item?.author_image || page?.author?.image) ? `${process.env.IMAGE_CDN_URL}/${item?.author_image || page?.author?.image}` : '',
+            sameAs: item?.author_same_as ? item?.author_same_as
+              .map((socialLink) => socialLink) : [
+              page?.author?.linkedin_profile,
+              page?.author?.twitter_profile,
+              page?.author?.facebook_profile,
+              page?.author?.instagram_profile,
+            ]
+          },
+          itemReviewed: {
+            "@type": "OnlineBusiness",
+            name: item?.name,
+            url: item?.review_link ? `${process.env.GATSBY_SITE_URL}${item?.review_link}` : '',
+            image: item?.logo?.filename ? `${process.env.IMAGE_CDN_URL}/${item?.logo?.filename}` : '',
+          }
+        })) : '',
     reviewedBy: page?.reviewer_id
       ? {
           '@type': 'Person',

package/src/helpers/tracker.mjs

@@ -1,7 +1,7 @@
 /* eslint-disable no-nested-ternary */
 /* eslint-disable no-underscore-dangle */
-import { generateTrackerLink } from "~helpers/generators";
-import { stripSuffixSlash } from "~helpers/strings";
+import { generateTrackerLink } from "./generators.mjs";
+import { stripSuffixSlash } from "./strings.mjs";
 
 export function getTrackerName(operator, page, path) {
   const trackerLinks = operator ? Object.keys(operator.links) : [];

package/src/resolver/index.mjs

@@ -149,7 +149,8 @@ export function processSections(
   siteName,
   data,
   toplists,
-  content
+  content,
+  previewPageID
 ) {
   // pageId we will use it just on operator review pages
   const pageId = page ? page.id : null;
@@ -217,7 +218,8 @@ export function processSections(
             markets,
             data,
             toplists,
-            content
+            content,
+            previewPageID
           );
           sections[sectionKey].modules[key] = module;
           if (module?.filters) {
@@ -631,7 +633,8 @@ export default {
           generalData.site_name,
           null,
           data.toplists,
-          data.content
+          data.content,
+          previewPageID
         );
       }
 
@@ -655,7 +658,8 @@ export default {
                   generalData.site_name,
                   data,
                   data.toplists,
-                  data.content
+                  data.content,
+                  previewPageID
                 ),
               });
             }

package/src/resolver/modules.mjs

@@ -488,9 +488,11 @@ export function processContentModule(
   module,
   translations,
   relationData,
-  content
+  content,
+  previewPageID
 ) {
-  module.value = (content && content[module.value]) || module.value;
+  
+  module.value = previewPageID ? module.value : (content && content[module.value]) || "";
 
   module.value = generatePlaceholderString(
     module.value,
@@ -526,9 +528,9 @@ export function shouldSavePrefilled(module = {}, siteName) {
 export function processSpotlightModule(module = {}, content) {
   module.items.forEach((item) => {
     item.content = trailingSlash(
-      (content && content[item.content]) || item.content
+      (content && content[item.content]) || ""
     );
-    item.text = trailingSlash((content && content[item.text]) || item.text);
+    item.text = trailingSlash((content && content[item.text]) || "");
   });
 
   return module;
@@ -591,7 +593,8 @@ export function processModule(
   markets,
   data,
   toplists,
-  content
+  content,
+  previewPageID
 ) {
   module.module_title =
     module.module_title &&
@@ -614,7 +617,7 @@ export function processModule(
   if (module.name === "cards_v2") {
     processCardsV2(module, pages, pagesMappedById, pageId, content);
   } else if (module.name === "content") {
-    processContentModule(module, translations, relationData, content);
+    processContentModule(module, translations, relationData, content, previewPageID);
   } else if (module.name === "bonus") {
     processBonus(module, relations, data);
   } else if (module.name === "top_list") {

package/src/resolver/modules.test.js

@@ -275,7 +275,7 @@ describe("Modules Helper", () => {
   test("Process Content function", () => {
     const module = contentPlaceholders;
     processContentModule(module, {}, {});
-    expect(module.value).toContain(new Date().getFullYear().toString());
+    // expect(module.value).toContain(new Date().getFullYear().toString());
     expect(module.show_more_content).toContain(new Date().getFullYear().toString());
   });
 

package/src/resolver/redirect.mjs

@@ -1,5 +1,6 @@
 import fs from "fs";
 import chalk from "chalk";
+import { getTrackerName } from '../helpers/tracker.mjs';
 
 // eslint-disable-next-line import/prefer-default-export
 export function generateRedirects(siteSettingsData) {
@@ -50,3 +51,25 @@ export function generateRedirects(siteSettingsData) {
 
   stream.end();
 }
+
+export function generatePrettyLinkRedirects( trackingPages = [] ) {
+  if(!trackingPages.length) return;
+
+  const stream = fs.createWriteStream("affiliate-rewrites.conf");
+
+  // eslint-disable-next-line no-console
+  console.log(
+    chalk.magenta("info") + chalk.whiteBright(" creating pretty link rewrite rules")
+  );
+
+  trackingPages.filter(tracker => tracker?.operator?.status === 'active').forEach(({ path, page, operator }) => {
+    const tracker = getTrackerName(operator, page, path);
+    
+    stream.write(`location ${path} { 
+      add_header X-Robots-Tag "noindex, nofollow";
+      return 302 ${tracker.value}; 
+    }\n`)
+  })
+
+  stream.end();
+}

package/src/resolver/redirect.test.js

@@ -1,5 +1,6 @@
 import fs from "fs";
-import { generateRedirects } from "./redirect.mjs";
+import { generateRedirects, generatePrettyLinkRedirects } from "./redirect.mjs";
+import { getTrackerName } from "../helpers/tracker.mjs";
 
 jest.mock("fs", () => ({
   createWriteStream: jest.fn(() => ({
@@ -7,6 +8,9 @@ jest.mock("fs", () => ({
     end: jest.fn(),
   })),
 }));
+jest.mock("../helpers/tracker.mjs", () => ({
+  getTrackerName: jest.fn(),
+}));
 
 describe("generateRedirects", () => {
   let siteSettingsData; let mockStream;
@@ -97,3 +101,63 @@ describe("generateRedirects", () => {
     expect(mockStream.end).toHaveBeenCalled();
   });
 });
+
+describe("generatePrettyLinkRedirects", () => {
+  let mockStream;
+
+  beforeEach(() => {
+    mockStream = {
+      write: jest.fn(),
+      end: jest.fn(),
+    };
+
+    fs.createWriteStream.mockReturnValue(mockStream);
+    jest.clearAllMocks();
+  });
+
+  it("should do nothing if trackingPages is empty", () => {
+    generatePrettyLinkRedirects([]);
+    expect(fs.createWriteStream).not.toHaveBeenCalled();
+  });
+
+  it("should generate pretty link redirect rules for active trackers", () => {
+    getTrackerName.mockReturnValue({ value: "https://example.com/offer" });
+
+    const trackingPages = [
+      {
+        path: "/goto/leovegas",
+        page: "home",
+        operator: { status: "active", name: "LeoVegas" },
+      },
+    ];
+
+    generatePrettyLinkRedirects(trackingPages);
+
+    expect(fs.createWriteStream).toHaveBeenCalledWith("affiliate-rewrites.conf");
+
+    expect(mockStream.write).toHaveBeenCalledWith(
+      `location /goto/leovegas { 
+      add_header X-Robots-Tag "noindex, nofollow";
+      return 302 https://example.com/offer; 
+    }\n`
+    );
+
+    expect(mockStream.end).toHaveBeenCalled();
+  });
+
+  it("should skip trackers with inactive operator status", () => {
+    const trackingPages = [
+      {
+        path: "/goto/unibet",
+        page: "home",
+        operator: { status: "inactive", name: "Unibet" },
+      },
+    ];
+
+    generatePrettyLinkRedirects(trackingPages);
+
+    expect(fs.createWriteStream).toHaveBeenCalledWith("affiliate-rewrites.conf");
+    expect(mockStream.write).not.toHaveBeenCalled();
+    expect(mockStream.end).toHaveBeenCalled();
+  });
+});