tag manager & workflow update

README.md

@@ -20,7 +20,7 @@
 
 ## Production
 - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
-- build new image `docker build -t biuro/web:1.2.0 .` (update version number)
+- build new image `docker build -t biuro/web:1.2.1 .` (update version number)
 - login to biuro docker account  `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
 - push image to docker repository - `docker push biuro/web:1.2.0`
 

docker-compose.yml

@@ -161,28 +161,29 @@ services:
                 # wp option update timezone_string "Manual Offsets/UTC+2";
                 # wp option update date_format "Y-m-d";
                 # wp option update time_format "H:i";
-                wp plugin install loco-translate --version=2.3.0 --activate-network;
-                wp plugin install pods --version=2.7.12 --activate-network;
-                wp plugin install polylang --version=2.5.4 --activate-network;
-                wp plugin install wordpress-seo --version=11.3 --activate-network;
+
+                # wp plugin install loco-translate --version=2.3.0 --activate-network;
+                # wp plugin install pods --version=2.7.12 --activate-network;
+                # wp plugin install polylang --version=2.5.4 --activate-network;
+                # wp plugin install wordpress-seo --version=11.3 --activate-network;
                 wp plugin update akismet --version=4.1.2;
                 wp plugin update hello --version=1.7.2;
 
-                wp plugin activate akismet --network;
-                wp plugin activate biuro-contacts --network;
-                wp plugin activate biuro-feedbacks --network;
-                wp plugin activate biuro-html --network;
-                wp plugin activate biuro-sections --network;
-                wp plugin activate biuro-services --network;
-                wp plugin activate biuro-values --network;
-                wp plugin activate cookies-warning --network;
-                wp plugin activate data-controller --network;
-                wp plugin activate jobs-importer --network;
-                wp theme update --all;
-                wp theme activate biuro;
+                # wp plugin activate akismet --network;
+                # wp plugin activate biuro-contacts --network;
+                # wp plugin activate biuro-feedbacks --network;
+                # wp plugin activate biuro-html --network;
+                # wp plugin activate biuro-sections --network;
+                # wp plugin activate biuro-services --network;
+                # wp plugin activate biuro-values --network;
+                # wp plugin activate cookies-warning --network;
+                # wp plugin activate data-controller --network;
+                # wp plugin activate jobs-importer --network;
+                # wp theme update --all;
+                # wp theme activate biuro;
                 wp language core update;
-                wp language theme update --all;
-                wp language plugin update --all;
+                # wp language theme update --all;
+                # wp language plugin update --all;
                 echo "WP CLI done. Ready to use.";
             '
 

docker-entrypoint.sh

@@ -280,13 +280,26 @@ fi
  chown $WEB_USER:$WEB_USER $ROOT_DIR/wp-content
  chown -R $WEB_USER:$WEB_USER $ROOT_DIR/wp-content/uploads
 
+ WP_PLUGINS_DIR=$ROOT_DIR/wordpress/wp-content/plugins
+
  CONTENT_DIR=$ROOT_DIR/wp-content
  THEME_DIR=$CONTENT_DIR/themes
  PLUGIN_DIR=$CONTENT_DIR/plugins
  UPLOADS_DIR=$CONTENT_DIR/uploads
 
+ PLUGIN_LOCO_DIR=$WP_PLUGINS_DIR/loco-translate
+ PLUGIN_PODS_DIR=$WP_PLUGINS_DIR/pods
+ PLUGIN_POLY_DIR=$WP_PLUGINS_DIR/polylang
+ PLUGIN_SEO_DIR=$WP_PLUGINS_DIR/wordpress-seo
+
  cp -r /temp/themes/* $THEME_DIR || true
  cp -r /temp/plugins/* $PLUGIN_DIR || true
+
+ cp -r /temp/plugins/loco-translate* $PLUGIN_LOCO_DIR || true
+ cp -r /temp/plugins/pods* $PLUGIN_PODS_DIR || true
+ cp -r /temp/plugins/polylang* $PLUGIN_POLY_DIR || true
+ cp -r /temp/plugins/wordpress-seo* $PLUGIN_SEO_DIR || true
+
  cp -r /temp/uploads/* $UPLOADS_DIR || true
  cp -r /temp/content/* $ROOT_DIR || true
 

nginx/redirects/biuro.ee.conf

@@ -22,6 +22,8 @@ location ^~ /wp-content/uploads/additional/ {
 # 301 biuro.ee redirects
 # ----------------------------------------------------------------------
 
+rewrite ^/admin/?$ /wp-login.php permanent;
+
 # Biuro SEO issues
 # https://docs.google.com/spreadsheets/d/1dXP0dh_v2sFajrcwR2_9HONMadCdZQW4Y2dVXvhxG3E/edit?ts=5b5eaa6b#gid=0
 # https://docs.google.com/spreadsheets/d/1wFz9wrCsPOwCm0R0NnrImhUMFlF35Y4-vCOL7fyZpmI/edit#gid=280898487

nginx/redirects/biuro.lt.conf

@@ -22,6 +22,8 @@ location ^~ /wp-content/uploads/additional/ {
 # 301 biuro.lt redirects
 # ----------------------------------------------------------------------
 
+rewrite ^/admin/?$ /wp-login.php permanent;
+
 # rewrite ^/darbo-pasiulymai$ / permanent;
 # rewrite ^/darbo-pasiulymai/(.*)$ /? permanent;
 

nginx/redirects/biuro.lv.conf

@@ -22,6 +22,8 @@ location ^~ /wp-content/uploads/additional/ {
 # 301 biuro.lv redirects
 # ----------------------------------------------------------------------
 
+rewrite ^/admin/?$ /wp-login.php permanent;
+
 # Biuro SEO issues
 # https://docs.google.com/spreadsheets/d/1dXP0dh_v2sFajrcwR2_9HONMadCdZQW4Y2dVXvhxG3E/edit?ts=5b5eaa6b#gid=0
 # https://docs.google.com/spreadsheets/d/1wFz9wrCsPOwCm0R0NnrImhUMFlF35Y4-vCOL7fyZpmI/edit#gid=0

wp-content/themes/biuro/footer.php

@@ -31,14 +31,17 @@
 
         $blogID = get_current_blog_id();
 
+        $tagManager = 'GTM-THF42F';
         $facebook_site = 'https://www.facebook.com/biuro.lietuva';
         $linkedin_site = 'http://www.linkedin.com/company/2824948';
 
         if ($blogID == 2):
+            $tagManager = 'GTM-5LX4QZ';
             $facebook_site = 'https://www.facebook.com/biuro.lv';
         endif;
 
         if ($blogID == 3):
+            $tagManager = 'GTM-MLLVP2';
             $facebook_site = 'https://www.facebook.com/biuro.ee';
         endif;
 ?>
@@ -74,21 +77,21 @@
 
 <?php
     if (!in_array(strstr($_SERVER['SERVER_NAME'], '.biuro', true), array('dev', 'staging'))):
+
 ?>
 
-    <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-THF42F"
-    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <noscript><iframe src="//www.googletagmanager.com/ns.html?id=<?php echo $tagManager; ?>"height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
 
     <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=
     '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-    })(window,document,'script','dataLayer','GTM-THF42F');</script>
+    })(window,document,'script','dataLayer','<?php echo $tagManager; ?>');</script>
 
 <?php
     endif;
 ?>
-    <script src="/wp-content/themes/biuro/js/main-5fe88314.min.js" async></script>
+    <script src="/wp-content/themes/biuro/js/main-3a215a69.min.js" async></script>
 
 <?php
 // global $time_start;

wp-content/themes/biuro/js/main.js

@@ -433,3 +433,15 @@ if (document.querySelector('.js-copy-to-clipboard')) {
         }
     }
 })(window);
+
+(global => {
+    document.querySelectorAll('.gtm-share-click').forEach((node) => {
+        node.addEventListener('click', (e) => {
+            window.dataLayer = window.dataLayer || [];
+            window.dataLayer.push({
+                'event': 'shareClick',
+                'shareLabel': node.dataset.label || ''
+            });
+        });
+    });
+})(window);

wp-content/themes/biuro/template-parts/layout/aside-job.php

@@ -56,13 +56,13 @@
         </a>
 */
  ?>
-        <a href="<?php echo $mailto; ?>" class="c-share--option c-share--option-email">
+        <a href="<?php echo $mailto; ?>" class="gtm-share-click c-share--option c-share--option-email" data-label="Email">
             <svg width="17px" height="13px" class="c-ico--share-email">
                 <use xlink:href="#ico--job-email"></use>
             </svg>
         </a>
 
-        <a href="#" class="js-copy-to-clipboard c-share--option c-share--option-copy">
+        <a href="#" class="js-copy-to-clipboard gtm-share-click c-share--option c-share--option-copy" data-label="Copy">
             <svg width="15px" height="18px" class="c-ico--share-copy">
                 <use xlink:href="#ico--job-copy"></use>
             </svg>