Merge branch 'main' into 772-feature/prevent-content-flash

Author: VitalyyP

.cursor/rules/common

@@ -1,6 +1,6 @@
 # This is a CODEOWNERS file for the repository
-# @killev will be requested for review when someone opens a pull request
+# @killev and @vasilyyaremchuk will be requested for review when someone opens a pull request
 # affecting any file in the repository
 
 # Default owner for everything in the repo
-*       @killev
+*       @killev @vasilyyaremchuk

.github/CODEOWNERS

@@ -144,3 +144,6 @@ website/public/apos-frontend
 dump.archive
 .prettierrc
 aposUsersSafe.json
+
+# Temporary files directory
+tmp/

.gitignore

@@ -34,7 +34,9 @@ function createAposConfig() {
           },
         },
       },
-
+      // Enable local SEO module with GTM integration
+      '@apostrophecms/seo': {},
+      '@apostrophecms/global': {},
       // Make getEnv function available to templates
       '@apostrophecms/template': {
         options: {

website-pages

@@ -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/app.js

@@ -0,0 +1,35 @@
+const gtmUtils = require('./lib/gtm-utils');
+
+module.exports = {
+  options: {
+    googleTagManager: {
+      id: process.env.GOOGLE_TAG_MANAGER_ID,
+    },
+  },
+  // No init hook required (layout renders components explicitly).
+  components(self) {
+    const getGtmId = (req) => gtmUtils.resolveGtmId(req, self.options);
+    return {
+      tagManagerBody(req, data) {
+        if (!req?.data?.page) {
+          return {};
+        }
+        const gtmId = getGtmId(req);
+        if (gtmId) {
+          return { gtmId };
+        }
+        return {};
+      },
+      tagManagerHead(req, data) {
+        if (!req?.data?.page) {
+          return {};
+        }
+        const gtmId = getGtmId(req);
+        if (gtmId) {
+          return { gtmId };
+        }
+        return {};
+      },
+    };
+  },
+};

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

@@ -0,0 +1,21 @@
+const sanitizeGtmId = function (id) {
+  const value = String(id || '')
+    .trim()
+    .toUpperCase();
+  // Strict GTM container format, e.g., "GTM-XXXXXXX"
+  if (/^GTM-[\dA-Z]+$/u.test(value)) {
+    return value;
+  }
+  return '';
+};
+
+const resolveGtmId = function (req, options) {
+  const fromGlobal = req?.data?.global?.seoGoogleTagManager;
+  const fromOptions = options?.googleTagManager?.id;
+  const candidate =
+    (fromGlobal && String(fromGlobal).trim()) ||
+    (fromOptions && String(fromOptions).trim());
+  return sanitizeGtmId(candidate);
+};
+
+module.exports = { sanitizeGtmId, resolveGtmId };

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

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

website/modules/@apostrophecms/seo/lib/gtm-utils.js

@@ -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 %}