Merge from git

2021-11-01 11:21:39 +00:00
parent adcff32d73
commit d94b3b3e5a
210 changed files with 69742 additions and 3359 deletions
@@ -1,5 +1,6 @@
 import Document, { Html, Head, Main, NextScript } from "next/document";
 import SkipLink from "../components/skiplink";
+import { Tracking, TrackingNoScript } from "../components/tracking";
 //import basicAuthMiddleware from "nextjs-basic-auth-middleware";

 class MyDocument extends Document {
@@ -19,13 +20,19 @@ class MyDocument extends Document {
    //   }

    render() {
+        const googleTagManagerID = process.env.GOOGLE_TAG_MANAGER || null;
+
        return (
            <Html lang="en">
-                <Head />
+                <Head>
+                    <Tracking googleTagManagerID={googleTagManagerID} />
+                </Head>
                <body className="js-enabled">
+                    <TrackingNoScript googleTagManagerID={googleTagManagerID} />
+
                    {!process.browser && (
                        <script>
-                            window.apiRoot = `{process.env.API_ROOT}`
+                            window.switchDomain = `{process.env.I18N_DOMAIN}`
                        </script>
                    )}
                    <SkipLink />