Merge branch 'dev'

README.md

@@ -20,9 +20,9 @@
 
 ## Production
 - build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
-- build new image `docker build -t biuro/web:0.0.32 .` (update version number)
+- build new image `docker build -t biuro/web:1.0.0 .` (update version number)
 - login to biuro docker account  `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
-- push image to docker repository - `docker push biuro/web:0.0.32`
+- push image to docker repository - `docker push biuro/web:1.0.0`
 
 ## Production
 - update biuro/web image version in .env file (staging or www)
@@ -67,10 +67,14 @@
 
 ### Plugins
 #### Akismet Anti-Spam
-#### Cookies warning
-#### Data controller
-#### Jobs importer
-#### Permalink Manager Lite
+#### Biuro Contacts
+#### Biuro Feedbacks
+#### Biuro HTML
+#### Biuro Sections
+#### Biuro Services
+#### Cookies Warning
+#### Data Controller
+#### Jobs Importer
 #### Pods - Custom Content Types and Fields
 #### Polylang
 #### Yoast SEO
@@ -107,6 +111,10 @@ Can't share C drive
 
 
 
+## After release do:
+- check biuro.lv && biuro.ee job descriptions
+- check if tag manager is loaded
+
 ## Other (Commands)
 - docker-compose up -d
 - docker-compose start

package.json

 {
   "name": "biuro",
-  "version": "0.0.0",
-  "description": "Our WP progressive web app theme",
+  "version": "1.0.0",
+  "description": "Biuro WP theme",
   "scripts": {
     "dev": "gulp --require @babel/register --gulpfile tasks",
     "build": "SET NODE_ENV=production & gulp build --require @babel/register --gulpfile tasks"
   },
-  "author": "Simon",
+  "private": true,
+  "author": "Biuro",
   "devDependencies": {
-    "@babel/core": "^7.3.4",
+    "@babel/core": "^7.4.4",
     "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-    "@babel/plugin-transform-runtime": "^7.3.4",
-    "@babel/preset-env": "^7.3.4",
+    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/preset-env": "^7.4.4",
     "@babel/preset-react": "^7.0.0",
-    "@babel/register": "^7.0.0",
-    "@babel/runtime": "^7.3.4",
-    "autoprefixer": "^9.4.10",
-    "babel-loader": "^8.0.5",
-    "browser-sync": "^2.24.6",
+    "@babel/register": "^7.4.4",
+    "@babel/runtime": "^7.4.4",
+    "autoprefixer": "^9.5.1",
+    "babel-loader": "^8.0.6",
+    "browser-sync": "^2.26.5",
     "connect-modrewrite": "^0.10.2",
     "css-mqpacker": "^7.0.0",
     "cssnano": "^4.1.10",
-    "del": "^3.0.0",
+    "del": "^4.1.1",
+    "eslint": "^5.16.0",
     "eslint-config-standard": "^12.0.0",
     "eslint-config-standard-preact": "^1.1.6",
-    "eslint-plugin-import": "^2.16.0",
-    "eslint-plugin-node": "^8.0.1",
-    "eslint-plugin-promise": "^4.0.1",
+    "eslint-plugin-import": "^2.17.2",
+    "eslint-plugin-node": "^9.0.1",
+    "eslint-plugin-promise": "^4.1.1",
     "eslint-plugin-standard": "^4.0.0",
-    "glob": "^7.1.3",
-    "gulp": "^4.0.0",
+    "glob": "^7.1.4",
+    "gulp": "^4.0.2",
     "gulp-cached": "^1.1.1",
     "gulp-html-tag-include": "^1.0.1",
     "gulp-htmlmin": "^5.0.1",
@@ -40,22 +42,22 @@
     "gulp-rev": "^9.0.0",
     "gulp-sourcemaps": "^2.6.5",
     "http2": "^3.3.7",
-    "postcss": "^7.0.14",
-    "postcss-browser-reporter": "^0.5.0",
-    "postcss-critical-split": "^2.5.1",
-    "postcss-custom-media": "^7.0.7",
+    "postcss": "^7.0.16",
+    "postcss-browser-reporter": "^0.6.0",
+    "postcss-critical-split": "^2.5.3",
+    "postcss-custom-media": "^7.0.8",
     "postcss-extend": "^1.0.5",
     "postcss-import": "^12.0.1",
     "postcss-nested": "^4.1.2",
     "postcss-preset-env": "^6.6.0",
     "postcss-reporter": "^6.0.1",
     "precss": "^4.0.0",
-    "stylelint": "^9.10.1",
-    "stylelint-config-standard": "^18.2.0",
-    "webpack": "^4.29.6",
-    "webpack-bundle-analyzer": "^3.1.0",
-    "webpack-dev-middleware": "^3.6.1",
-    "webpack-hot-middleware": "^2.22.3",
+    "stylelint": "^10.0.1",
+    "stylelint-config-standard": "^18.3.0",
+    "webpack": "^4.31.0",
+    "webpack-bundle-analyzer": "^3.3.2",
+    "webpack-dev-middleware": "^3.6.2",
+    "webpack-hot-middleware": "^2.24.4",
     "write-file-webpack-plugin": "^4.3.2"
   },
   "dependencies": {

wp-content/plugins/biuro-feedbacks/biuro-feedbacks.php

@@ -127,7 +127,7 @@ class Biuro_Feedbacks extends WP_Widget {
                                 echo '<div class="c-feedbacks--section-inner">';
 
                                 if ( ${'img' . $i} != "" ) {
-                                    echo '<img src="/wp-content/themes/biuro/i/feedbacks/' . ${'img' . $i} . '" class="c-feedbacks--img" width="85px" height="83px"/>';
+                                    echo '<img src="/wp-content/themes/biuro/i/feedbacks/' . ${'img' . $i} . '" class="c-feedbacks--img" width="85px" height="83px" alt="' . ${'name' . $i} . '"/>';
                                 }
 
                                 if ( ${'feedback' . $i} != "" ) {

wp-content/themes/biuro/css/02-tools/_tools--font-face.css

 /* ------------- Tools: font face ------------- */
+
+/*
+- move to local host
+- https://medium.com/clio-calliope/making-google-fonts-faster-aadf3c02a36d
+*/
+
 @font-face {
-    font-family: 'PT Sans Narrow';
-    src: url('../fonts/pt_sans_narrow.woff2') format('woff2'),
-        url('../fonts/pt_sans_narrow.woff') format('woff');
-    font-weight: 400;
+  font-family: 'Roboto';
   font-style: normal;
+  font-weight: 300;
+  font-display: swap;
+  src: local('Roboto Light'), local('Roboto-Light'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-300.woff2') format('woff2'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-300.woff') format('woff');
+}
+
+@font-face {
+  font-family: 'Roboto';
+  font-style: normal;
+  font-weight: 400;
   font-display: swap;
+  src: local('Roboto'), local('Roboto-Regular'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2') format('woff2'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff') format('woff');
 }
 
 @font-face {
-    font-family: 'PT Sans Narrow';
-    src: url('../fonts/pt_sans_narrow_bold.woff2') format('woff2'),
-        url('../fonts/pt_sans_narrow_bold.woff') format('woff');
-    font-weight: 600;
+  font-family: 'Roboto';
   font-style: normal;
+  font-weight: 500;
   font-display: swap;
+  src: local('Roboto Medium'), local('Roboto-Medium'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-500.woff2') format('woff2'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-500.woff') format('woff');
 }
 
 @font-face {
-    font-family: 'Bebas Neue';
-    src: url('../fonts/bebas-neue.woff2') format('woff2'),
-        url('../fonts/bebas-neue.woff') format('woff');
-    font-weight: normal;
+  font-family: 'Roboto';
   font-style: normal;
+  font-weight: 700;
   font-display: swap;
+  src: local('Roboto Bold'), local('Roboto-Bold'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2') format('woff2'),
+       url('/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-700.woff') format('woff');
 }

wp-content/themes/biuro/css/05-layout/_layout--section.css

@@ -2,19 +2,19 @@
 
 /* critical:start */
 
-.l-section { padding: 20px 0; background-repeat: no-repeat; background-position: 50% 50%; background-size: cover;
+.l-section { padding: 20px 0;
     @media (--min--medium) {
          padding: 30px 0;
     }
 }
 
-.l-section--search-page { background-color: #111d1e; background-image: url(/wp-content/themes/biuro/i/search-page.png) }
+.l-section--search-page { background-color: #111d1e; }
 
-.l-section--vdb { background-color: #086335; background-image: url(/wp-content/themes/biuro/i/vdb/section.png); }
+.l-section--vdb { background-color: #086335; }
 
-.l-section--front-page { background: url(/wp-content/themes/biuro/i/front-page.png) no-repeat 50% 50%; background-size: cover; margin-bottom: 2px;
+.l-section--front-page { margin-bottom: 2px;
     @media (--max--medium) {
-        height: 244px; margin-bottom: 120px
+        height: 179px; margin-bottom: 185px
     }
     @media (--min--medium) {
          height: 380px; margin-bottom: 92px;
@@ -22,7 +22,7 @@
     .l-section--inner { max-width: 870px; padding-right: 20px; padding-left: 20px; }
 }
 
-.l-section--sales-page { background: url(/wp-content/themes/biuro/i/sales-page.png) no-repeat 50% 50%; background-size: cover;
+.l-section--sales-page {
     @media (--min--medium) {
          height: 380px;
     }
@@ -35,3 +35,20 @@
 
 
 /* critical:end */
+
+.l-section { background-repeat: no-repeat; background-position: 50% 50%; background-size: cover; }
+
+.l-section--search-page { background-image: url(/wp-content/themes/biuro/i/search-page.png); }
+
+.l-section--vdb { background-image: url(/wp-content/themes/biuro/i/vdb/section.png); }
+
+.l-section--front-page { background-image: url(/wp-content/themes/biuro/i/front-page.png); background-size: 200%;
+    @media (--min--small) {
+        background-size: 150%;
+    }
+    @media (--min--medium) {
+         background-size: cover;
+    }
+}
+
+.l-section--sales-page { background-image: url(/wp-content/themes/biuro/i/sales-page.png); }

wp-content/themes/biuro/css/07-components/_component--cookies-warning.css

@@ -6,7 +6,7 @@
 
 /* critical:end */
 
-.c-cookies-warning { position: fixed; left: 0px; right: 0; bottom: 0px; padding: 15px 20px 10px; background: #f6f6f6;  overflow: hidden; z-index: 100; font-size: 14px; line-height: 15px;
+.c-cookies-warning { position: fixed; left: 0px; right: 0; bottom: 0px; padding: 15px 0 10px; background: #f6f6f6;  overflow: hidden; z-index: 100; font-size: 14px; line-height: 15px;
     .bu-action              { margin-top: 10px; }
     .bu-action--alt     { float: right; }
 }

wp-content/themes/biuro/footer.php

@@ -65,11 +65,16 @@
     if ( is_active_sidebar( 'append_area' ) ) :
         dynamic_sidebar( 'append_area' );
     endif;
-  ?>
+?>
+
     <script>
         !function(n){"use strict";n.loadCSS||(n.loadCSS=function(){});var o=loadCSS.relpreload={};if(o.support=function(){var e;try{e=n.document.createElement("link").relList.supports("preload")}catch(t){e=!1}return function(){return e}}(),o.bindMediaToggle=function(t){var e=t.media||"all";function a(){t.addEventListener?t.removeEventListener("load",a):t.attachEvent&&t.detachEvent("onload",a),t.setAttribute("onload",null),t.media=e}t.addEventListener?t.addEventListener("load",a):t.attachEvent&&t.attachEvent("onload",a),setTimeout(function(){t.rel="stylesheet",t.media="only x"}),setTimeout(a,3e3)},o.poly=function(){if(!o.support())for(var t=n.document.getElementsByTagName("link"),e=0;e<t.length;e++){var a=t[e];"preload"!==a.rel||"style"!==a.getAttribute("as")||a.getAttribute("data-loadcss")||(a.setAttribute("data-loadcss",!0),o.bindMediaToggle(a))}},!o.support()){o.poly();var t=n.setInterval(o.poly,500);n.addEventListener?n.addEventListener("load",function(){o.poly(),n.clearInterval(t)}):n.attachEvent&&n.attachEvent("onload",function(){o.poly(),n.clearInterval(t)})}"undefined"!=typeof exports?exports.loadCSS=loadCSS:n.loadCSS=loadCSS}("undefined"!=typeof global?global:this);
     </script>
 
+<?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>
 
@@ -79,7 +84,11 @@
     '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
     })(window,document,'script','dataLayer','GTM-THF42F');</script>
 
+<?php
+    endif;
+?>
     <script src="/wp-content/themes/biuro/js/main-63c39ea0.min.js" async></script>
+
     <?php wp_footer(); ?>
 </body>
 </html>

wp-content/themes/biuro/functions.php

@@ -616,6 +616,94 @@ function template_include($template) {
 }
 
 
+// Redirect to single job page by LIVAS Job ID
+function livas_job_id_redirect() {
+    global $query_string;
+
+    wp_parse_str( $query_string, $searchQuery );
+
+    if ($searchQuery['name'] == 'livas-id' && is_numeric($searchQuery['page'])):
+
+        $jobs = pods( 'job', array(
+            'where' => 'livas-id.meta_value = "' . $searchQuery['page'] . '"',
+            'limit'   => 1
+        ));
+
+        if ( 0 < $jobs->total() ):
+            while ( $jobs->fetch() ) :
+                wp_redirect( get_post_permalink( $jobs->display( 'ID' ) ) );
+                die;
+            endwhile;
+        endif;
+
+    endif;
+}
+add_action( 'template_redirect', 'livas_job_id_redirect' );
+
+
+
+// Add LIVAS ID column
+function jobs_columns_head($defaults) {
+    $defaults['livas_id'] = 'LIVAS ID';
+    return $defaults;
+}
+
+// Show LIVAS ID
+function jobs_columns_content($column_name, $post_ID) {
+    if ($column_name == 'livas_id') {
+        $pod = pods( 'job', $post_ID );
+
+        if ($pod->field( 'livas-id' )):
+            echo $pod->field( 'livas-id' );
+        else:
+            echo '-';
+        endif;
+    }
+}
+
+function jobs_livas_id_search( $wp ) {
+    global $pagenow;
+
+    // If it's not the post listing return
+    if( 'edit.php' != $pagenow )
+        return;
+
+    // If it's not a search return
+    if( !isset( $wp->query_vars['s'] ) )
+        return;
+
+    // If it's a search but there's no prefix, return
+    if( '#' != substr( $wp->query_vars['s'], 0, 1 ) )
+        return;
+
+    // Validate the numeric value
+    $livasId = absint( substr( $wp->query_vars['s'], 1 ) );
+    if( !$livasId )
+        return; // Return if no ID, absint returns 0 for invalid values
+
+    // If we reach here, all criteria is fulfilled, unset search and select by ID instead
+    unset( $wp->query_vars['s'] );
+
+    $params = [
+        'limit' => 1,
+        'where' => 'livas-id.meta_value = "' . (int) $livasId . '"',
+    ];
+
+    $pod = pods('job', $params);
+
+    $ids = [];
+    while ( $pod->fetch() ) {
+
+        $ids[] = $pod->id();
+    }
+
+    $wp->query_vars['p'] = implode(',', $ids);
+}
+
+add_filter('manage_job_posts_columns', 'jobs_columns_head', 10);
+add_action('manage_job_posts_custom_column', 'jobs_columns_content', 10, 2);
+add_action('parse_request', 'jobs_livas_id_search' );
+
 $positionsPage = '';
 
 $positionsQuery = new WP_Query( array(

wp-content/themes/biuro/header.php

@@ -21,18 +21,24 @@
 <?php
     get_template_part( 'template-parts/meta/canonical');
 ?>
-    <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700" rel="stylesheet">
 
-    <style><?php include 'css/core-c7abebb5d4.min.css'; ?></style>
+    <style><?php include 'css/core-1064aec6fe.min.css'; ?></style>
 
-    <link rel="preload" href="/wp-content/themes/biuro/css/main-5c7f0fe5d1.min.css" as="style" onload="this.rel='stylesheet'">
+    <link rel="preload" href="/wp-content/themes/biuro/css/main-8fd8d5e9f3.min.css" as="style" onload="this.rel='stylesheet'">
 
-    <link rel="preload" href="/wp-content/themes/biuro/fonts/pt_sans_narrow.woff2" as="font" type="font/woff2" crossorigin>
-    <link rel="preload" href="/wp-content/themes/biuro/fonts/pt_sans_narrow_bold.woff2" as="font" type="font/woff2" crossorigin>
-    <link rel="preload" href="/wp-content/themes/biuro/fonts/bebas-neue.woff2" as="font" type="font/woff2" crossorigin>
+    <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-500.woff2">
+    <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2">
+    <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-300.woff2">
+    <link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2">
+
+    <link rel="preconnect" href="https://px.ads.linkedin.com/" crossorigin>
+    <link rel="preconnect" href="https://snap.licdn.com/" crossorigin>
+    <link rel="preconnect" href="https://connect.facebook.net/" crossorigin>
+    <link rel="preconnect" href="https://sjs.bizographics.com/" crossorigin>
+    <link rel="preconnect" href="https://www.google-analytics.com/" crossorigin>
 
     <noscript>
-        <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-5c7f0fe5d1.min.css">
+        <link rel="stylesheet" href="/wp-content/themes/biuro/css/main-8fd8d5e9f3.min.css">
     </noscript>
 
     <?php wp_head(); ?>

wp-content/themes/biuro/template-parts/jobs/jobs-list.php

@@ -12,31 +12,39 @@
 global $jobs;
 
 ?>
-
     <table cellspacing="0" cellpadding="0" class="c-jobs--table">
-<?php /*
-            <tr>
-                <th class="c-jobs--head"><?php _e('Position', 'biuro'); ?></th>
-                <th class="c-jobs--head"><?php _e('Location', 'biuro'); ?></th>
-                <th class="c-jobs--head"><?php _e('Valid till', 'biuro'); ?></th>
-            </tr>
-*/ ?>
-
     <?php
         $i = 0;
         while ( $jobs->fetch() ) :
             $ID =  $jobs->display( 'ID' );
+
+            //Primary city id
+            $primaryCities = get_post_meta($ID, '_yoast_wpseo_primary_city');
+
             $i++;
-        ?>
+?>
         <tr <?php if ( $i % 2 != 0 ) { echo 'class="c-jobs--row-odd"'; } ?>>
             <td class="c-jobs--col c-jobs--col-position">
                 <a class="c-jobs--anchor" href="<?php echo get_post_permalink( $ID ); ?>" title="<?php echo $jobs->display( 'name' ); ?>"><?php echo $jobs->display( 'name' ); ?></a>
             </td>
             <td class="c-jobs--col c-jobs--col-city">
-        <?php
+<?php
                 $cities = $jobs->field( 'city');
                 $count = 0;
 
+                //Sort by primary city (put it first)
+                uasort($cities, function($a, $b) use ($primaryCities) {
+                    if (count($primaryCities) == 0) :
+                        return 0;
+                    endif;
+
+                    if ($a['term_id'] == $primaryCities[0]) :
+                        return -1;
+                    endif;
+
+                    return 1;
+                });
+
                 foreach($cities as $city):
                     if ($count):
                         echo  ', ';
@@ -46,21 +54,19 @@ global $jobs;
 
                     $count++;
                 endforeach;
-
-                    // echo $jobs->display( 'city' );
-        ?>
+?>
             </td>
             <td class="c-jobs--col c-jobs--col-valid">
                 <?php echo date_i18n( get_option( 'date_format' ), strtotime( $jobs->field( 'valid' ) ) ); ?>
             </td>
         </tr>
 
-        <?php
+<?php
         endwhile;
-        ?>
+?>
     </table>
 
-    <?php
+<?php
 
     if ( !is_front_page() ):
         echo $jobs->pagination( array(
@@ -70,4 +76,4 @@ global $jobs;
         ) );
     endif;
 
-    ?>
+?>