Merge branch 'develop' into production

TYPO3 · Jul 11, 2022 · b0b42dd · b0b42dd
2 parents 2a83b31 + af2bbbe
commit b0b42dd
Show file tree

Hide file tree

Showing 7 changed files with 73 additions and 43 deletions.
diff --git a/.env b/.env
@@ -40,3 +40,7 @@ CORS_ALLOW_ORIGIN=^https?://(get\.typo3\.org)(:[0-9]+)?$
 # todo: reduce to APP_DOMAIN
 BASE_URL=https://get.typo3.org
 APP_DOMAIN=typo3.org
+
+###> t3g/symfony-usercentrics-bundle ###
+USERCENTRICS_ID="R9wBKTwzv"
+###< t3g/symfony-usercentrics-bundle ###
diff --git a/composer.json b/composer.json
@@ -82,7 +82,8 @@
         "symfony/validator": "5.4.*",
         "symfony/web-link": "5.4.*",
         "symfony/yaml": "5.4.*",
-        "t3g/symfony-template-bundle": "^3.3.6 || dev-bugfix/reintroduce-form-elements-class-support@dev",
+        "t3g/symfony-template-bundle": "^3.4",
+        "t3g/symfony-usercentrics-bundle": "^1.0",
         "twig/extra-bundle": "^2.12 || ^3.0",
         "twig/twig": "^2.12 || ^3.0"
     },
@@ -122,12 +123,6 @@
     "conflict": {
         "symfony/symfony": "*"
     },
-    "repositories": {
-        "template-bundle": {
-            "type": "vcs",
-            "url": "https://github.com/gilbertsoft/symfony-template-bundle"
-        }
-    },
     "prefer-stable": true,
     "autoload": {
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/config/bundles.php b/config/bundles.php
@@ -20,4 +20,5 @@
     T3G\Bundle\TemplateBundle\TemplateBundle::class => ['all' => true],
     Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true],
+    T3G\Bundle\UsercentricsBundle\UsercentricsBundle::class => ['all' => true],
 ];
diff --git a/config/packages/usercentrics.yaml b/config/packages/usercentrics.yaml
@@ -0,0 +1,2 @@
+usercentrics:
+  id: '%env(USERCENTRICS_ID)%'
diff --git a/symfony.lock b/symfony.lock
@@ -599,6 +599,9 @@
     "t3g/symfony-template-bundle": {
         "version": "2.15.0"
     },
+    "t3g/symfony-usercentrics-bundle": {
+        "version": "1.0.1"
+    },
     "tecnickcom/tcpdf": {
         "version": "6.4.4"
     },

diff --git a/templates/layout.html.twig b/templates/layout.html.twig
@@ -5,7 +5,14 @@
     <link rel="stylesheet" href="{{ asset('assets/Css/additions.css') }}">
 {% endblock %}
 {% block javascripts %}
-    {{ parent() }}
+    {{ usercentrics() }}
+    {{ usercentrics('Google Analytics', {async: true, src: 'https://www.googletagmanager.com/gtag/js?id=G-JTSKLNF4S0'}) }}
+    {{ usercentrics('Google Analytics', {}, '
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag(\'js\', new Date());
+        gtag(\'config\', \'G-JTSKLNF4S0\');
+    ') }}
 {% endblock %}
 {% block footer %}
     {% frame with { color: 'primary' } %}