Merge branch '604-update-footer-with-links-and-email' of https://github.com/speedandfunction/website into 604-update-footer-with-links-and-email

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: Anton-88

website/app.js

@@ -34,7 +34,15 @@ function createAposConfig() {
           },
         },
       },
-
+      // GTM setup and dependencies
+      '@apostrophecms/seo': {
+        options: {
+          googleTagManager: {
+            id: process.env.GOOGLE_TAG_MANAGER_ID,
+          },
+        },
+      },
+      '@apostrophecms/global': {},
       // Make getEnv function available to templates
       '@apostrophecms/template': {
         options: {

website/modules/@apostrophecms/global/index.js

@@ -120,6 +120,12 @@ module.exports = {
           },
         },
       },
+      // SEO fields
+      seoGoogleTagManager: {
+        label: 'Google Tag Manager ID',
+        type: 'string',
+        help: 'Enter your GTM container ID (e.g., GTM-XXXXXXX)',
+      },
     },
     group: {
       navs: {
@@ -130,6 +136,10 @@ module.exports = {
         label: 'Footer',
         fields: ['comAddress', 'footerLinks', 'socialMediaLinks', 'footerForm'],
       },
+      seo: {
+        label: 'SEO & Analytics',
+        fields: ['seoGoogleTagManager'],
+      },
     },
   },
 };

website/modules/@apostrophecms/seo/index.js

@@ -0,0 +1,59 @@
+module.exports = {
+  improve: '@apostrophecms/seo',
+  init(self) {
+    // Ensure SEO components are injected into the template
+    self.apos.template.prepend('body', '@apostrophecms/seo:tagManagerBody');
+    self.apos.template.append('head', '@apostrophecms/seo:tagManagerHead');
+    self.apos.template.prepend('head', '@apostrophecms/seo:metaHead');
+  },
+  components(self) {
+    /*
+     * Resolve GTM ID from global override or module options and validate it
+     */
+    const sanitizeGtmId = (id) => {
+      const value = String(id || '').trim();
+      if (/^gtm-[\da-z]+$/iu.test(value)) {
+        return value.toUpperCase();
+      }
+      return '';
+    };
+    const resolveGtmId = (req) => {
+      const fromGlobal = req?.data?.global?.seoGoogleTagManager;
+      const fromOptions = self.options?.googleTagManager?.id;
+      const candidate =
+        (fromGlobal && String(fromGlobal).trim()) ||
+        (fromOptions && String(fromOptions).trim());
+      return sanitizeGtmId(candidate);
+    };
+
+    return {
+      metaHead(req, data) {
+        // Only on front-end page requests
+        if (!req?.data?.page) {
+          return {};
+        }
+        return {};
+      },
+      tagManagerBody(req, data) {
+        if (!req?.data?.page) {
+          return {};
+        }
+        const gtmId = resolveGtmId(req);
+        if (gtmId) {
+          return { gtmId };
+        }
+        return {};
+      },
+      tagManagerHead(req, data) {
+        if (!req?.data?.page) {
+          return {};
+        }
+        const gtmId = resolveGtmId(req);
+        if (gtmId) {
+          return { gtmId };
+        }
+        return {};
+      },
+    };
+  },
+};

website/modules/@apostrophecms/seo/views/metaHead.html

@@ -0,0 +1 @@
+{# Meta head template for SEO - placeholder for other meta tags #}

website/modules/@apostrophecms/seo/views/tagManagerBody.html

@@ -0,0 +1,6 @@
+{% if data.gtmId %}
+<!-- Google Tag Manager (noscript) -->
+<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ data.gtmId }}"
+height="0" width="0" style="display:none;visibility:hidden" title="Google Tag Manager"></iframe></noscript>
+<!-- End Google Tag Manager (noscript) -->
+{% endif %}

website/modules/@apostrophecms/seo/views/tagManagerHead.html

@@ -0,0 +1,9 @@
+{% if data.gtmId %}
+<!-- Google Tag Manager -->
+<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+})(window,document,'script','dataLayer','{{ data.gtmId }}');</script>
+<!-- End Google Tag Manager -->
+{% endif %}

website/package-lock.json

@@ -40,6 +40,7 @@
   "dependencies": {
     "@apostrophecms/form": "^1.4.2",
     "@apostrophecms/import-export": "^3.2.0",
+    "@apostrophecms/seo": "^1.3.1",
     "@barba/core": "^2.10.3",
     "abort-controller": "^3.0.0",
     "apostrophe": "^4.17.0",
@@ -51,8 +52,8 @@
     "jest-environment-jsdom": "^30.0.0-beta.3",
     "lodash": "^4.17.21",
     "lozad": "^1.16.0",
-    "node-fetch": "^2.6.7",
     "mongodb": "^6.17.0",
+    "node-fetch": "^2.6.7",
     "normalize.css": "^8.0.1",
     "postmark": "^4.0.5",
     "swiper": "^11.2.6",