in progress

README.md

@@ -73,19 +73,19 @@ Restart docker (sometimes PC restart may be required)
 
 - docker ps
 
-- docker update --restart=no mysql
-- docker update --restart=no nginx
-- docker update --restart=no wordpress
+- docker update --restart=no dev-biuro-mysql
+- docker update --restart=no dev-biuro-nginx
+- docker update --restart=no dev-biuro-wordpress
 
 - docker system prune --all
 
-- docker stop mysql
-- docker stop nginx
-- docker stop wordpress
+- docker stop dev-biuro-mysql
+- docker stop dev-biuro-nginx
+- docker stop dev-biuro-wordpress
 
-- docker restart mysql
-- docker restart nginx
-- docker restart wordpress
+- docker restart dev-biuro-mysql
+- docker restart dev-biuro-nginx
+- docker restart dev-biuro-wordpress
 
 - docker push simoncereska/ourdemo
 

nginx/dev-biuro.conf

@@ -52,6 +52,12 @@ server {
 
     access_log /var/log/nginx/access.log;
     error_log /var/log/nginx/error.log;
+
+    # 301 redirects
+    include /etc/nginx/conf.d/redirects/biuro.lt.conf;
+# https://biuro.lt/employers/staf-search-and-selection-in-lithuania/
+
+
 #
     gzip on;
     gzip_comp_level 5;

nginx/redirects/biuro.lt.conf

+# ----------------------------------------------------------------------
+# 301 biuro.lt redirects
+# ----------------------------------------------------------------------
+
+# Lithuanian ----------------------------------------------------------
+rewrite ^/darbo-pasiulymai$ / permanent;
+rewrite ^/darbo-pasiulymai/(.*)$ /? permanent;
+
+#ToDo: structure changes (kontaktai etc.)
+
+# English -------------------------------------------------------------
+
+# rewrite ^/employers/staf-search-and-selection-in-lithuania$ /employers/staff-search-and-selection-in-lithuania/ permanent;
+rewrite ^/employers/staf-search-and-selection-in-lithuania/?$ /employers/staff-search-and-selection-in-lithuania/ permanent;
+
+
+
+
+
+# Biuro SEO issues
+# https://docs.google.com/spreadsheets/d/1dXP0dh_v2sFajrcwR2_9HONMadCdZQW4Y2dVXvhxG3E/edit?ts=5b5eaa6b#gid=0
+#
+# https://biuro.lt/darbo-paieska/uzsidirbtilietuvoje  https://biuro.lt/darbo-paieska/laikinas-darbas/ LT
+rewrite ^/darbo-paieska/uzsidirbtilietuvoje/?$ /darbo-paieska/laikinas-darbas/ permanent;
+
+# https://biuro.lt/contacts/course-agentures/ https://biuro.lt/contacts/job-seekers/  LT
+rewrite ^/contacts/course-agentures/?$ /contacts/job-seekers/ permanent;
+
+# https://biuro.lt/darbo-paieska/atvesk-drauga-gauk-dovanu/   https://biuro.lt/darbo-paieska/laikinas-darbas/ LT
+rewrite ^/darbo-paieska/atvesk-drauga-gauk-dovanu/?$ /darbo-paieska/laikinas-darbas/ permanent;
+
+# Intertnal ex 302
+rewrite ^/employers/?$ /employers/temporary-employees-in-lithuania/ permanent;
+rewrite ^/personalo-nuoma/?$ /personalo-nuoma/laikinas-idarbinimas/ permanent;
+#ToDo: complete

tasks/server.js

@@ -49,17 +49,17 @@ export function server () {
             key: conf.certs.key,
             cert: conf.certs.cert
         },
-        // files: [
-        //     `wp-content/themes/${conf.name}/**/*.php`,
-        //     `wp-content/themes/${conf.name}/css/main.min.css`
-        // ],
+        files: [
+            `wp-content/themes/${conf.name}/**/*.php`,
+            `wp-content/themes/${conf.name}/css/main.min.css`
+        ],
         open: false,
         port: 2000,
         server: false,
-        serveStatic: [
-            `wp-content/themes/${conf.name}/css/`,
-            `wp-content/themes/${conf.name}/js/`
-        ],
+        // serveStatic: [
+        //     `wp-content/themes/${conf.name}/css/`,
+        //     `wp-content/themes/${conf.name}/js/`
+        // ],
         ui: false,
         middleware: [
             webpackDevMiddleware(bundler, { /* options */ }),
@@ -72,18 +72,31 @@ export function server () {
         ]
     });
 
-    gulp.watch('wp-content/content/**/*.*').on('change', () => {
-        serveContent();
+    const reload = (done) => {
         bs.reload();
-    });
+        done();
+    };
+
+    gulp.watch(['wp-content/content/**/*.*'], { delay: 0 }, gulp.series(serveContent, reload));
+
+    gulp.watch([`wp-content/themes/${conf.name}/css/**/*.css`, `!wp-content/themes/${conf.name}/css/**/*.min.css`], { delay: 0 }, gulp.parallel(serveCoreCSS, serveMainCSS));
+
+    gulp.watch([`wp-content/themes/${conf.name}/css/core.min.css`], { delay: 0 }, gulp.series(reload));
+
+    gulp.watch([`wp-content/themes/${conf.name}/**/*.php`], { delay: 0 }, gulp.series(reload));
+
+    // gulp.watch('wp-content/content/**/*.*').on('change', () => {
+    //     serveContent();
+    //     bs.reload();
+    // });
 
-    gulp.watch([`wp-content/themes/${conf.name}/css/**/*.css`, `!wp-content/themes/${conf.name}/css/**/*.min.css`], gulp.parallel(serveCoreCSS, serveMainCSS));
+    // gulp.watch([`wp-content/themes/${conf.name}/css/**/*.css`, `!wp-content/themes/${conf.name}/css/**/*.min.css`], gulp.parallel(serveCoreCSS, serveMainCSS));
 
-    gulp.watch(`wp-content/themes/${conf.name}/css/core.min.css`).on('change', bs.reload);
+    // gulp.watch(`wp-content/themes/${conf.name}/css/core.min.css`).on('change', bs.reload);
 
-    // gulp.watch(`wp-content/themes/${conf.name}/**/*.php`).on('change', () => bs.reload());
+    // gulp.watch(`wp-content/themes/${conf.name}/**/*.php`).on('change', bs.reload);
 
-    gulp.watch(`wp-content/themes/${conf.name}/css/main.min.css`).on('change', bs.stream);
+    // gulp.watch(`wp-content/themes/${conf.name}/css/main.min.css`).on('change', bs.stream);
 
 //     `wp-content/themes/${conf.name}/**/*.php`,
 //     `wp-content/themes/${conf.name}/css/main.min.css`

wp-content/themes/biuro/css/07-components/_component--jobs-list.css

@@ -20,15 +20,16 @@
 
 /* critical:end */
 
-.c-jobs-list {  /* width: 100%; margin: 0 0 20px; */
+.c-jobs-list {
+    tr {
+        &:nth-child(even) { background: #F8F8F8; }
+    }
     th,
     td  { vertical-align: top;  }
     a { display: block; }
 }
 
-.c-jobs-list--row-odd   { background: #F8F8F8; }
-
-.c-jobs-list--head {/*  padding:  10px; */ font-weight: 700; text-align: left;
+.c-jobs-list--head { font-weight: 700; text-align: left;
     @media (--max--small) {
         display: none;
     }
@@ -39,20 +40,16 @@
     }
 }
 
-.c-jobs-list--col { /* padding: 0 10px; */
+.c-jobs-list--col {
     @media (--max--xx-small) {
         float: left; width: calc(100% - 20px)
     }
     @media (--min--xx-small) {
-        max-width: 260px; /* padding: 10px; */
+        max-width: 260px;
     }
 }
 
-.c-jobs-list--col-position {
-/*    @media (--max--xx-small) {
-        padding-top: 10px;
-    }*/
-}
+.c-jobs-list--col-position { }
 
 .c-jobs-list--col-city {
     @media (--max--xx-small) {

wp-content/themes/biuro/css/07-components/_component--nav.css

@@ -15,7 +15,7 @@
 
 .c-nav--main-item        { position: relative; margin-right: 10px;
     &:hover                             {
-        ul                                          { display: flex; }
+        ul                                          { display: block; }
     }
 }
 .c-nav--main-anchor   { display: block; padding: 0 0.25em; text-transform: uppercase; }

wp-content/themes/biuro/front-page.php

@@ -14,6 +14,7 @@
 
     get_header();
 ?>
+
 <?php
     // Use for search
     // https://pods.io/docs/code/pods/find/

wp-content/themes/biuro/header.php

@@ -18,6 +18,10 @@
     <link rel="profile" href="http://gmpg.org/xfn/11">
     <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
 
+<?php
+    get_template_part( 'template-parts/meta/canonical');
+?>
+
     <style><?php include 'css/core.min.css'; ?></style>
 
     <link rel="preload" href="/wp-content/themes/biuro/css/main.min.css" as="style" onload="this.rel='stylesheet'">
@@ -62,6 +66,9 @@
 
     <div class="l-inner" style="box-shadow: inset 0 0 0 1px blue; padding: 1em 0;">
 <?php
+/*
+        <h1><?php echo get_post_type(); ?></h1>
+*/
         get_search_form();
 ?>
 <?php

wp-content/themes/biuro/searchform.php

@@ -18,17 +18,38 @@
 <?php
             $cities = get_terms( array(
                 'taxonomy' => 'city',
-                'hide_empty' => false,
+                'orderby' => 'count',
+                'order' => 'DESC'
+                // 'orderby' => array(
+                //     'title' => 'DESC'
+                //     // 'menu_order' => 'ASC'
+                // )
+                // 'hide_empty' => false,
             ));
 
+            debug($cities);
+
             if ( ! empty( $cities ) && ! is_wp_error( $cities ) ):
                 foreach ( $cities as $city ):
                     $name = $city->name;
                     $termID = $city->term_id;
                     $selected = ($cityID == $termID) ? 'selected="selected"' : '';
+
+                    $where = 'valid.meta_value > "' . date('Y-m-d', strtotime('-1 days')) . '" AND city.term_id = ' . $termID;
+
+                    $params = array(
+                        // 'orderby' => 'title DESC',
+                        'where' => $where,
+                        'limit'   => -1
+                    );
+
+                    $jobsIn = pods( 'job', $params );
+
+                    if ( 0 < $jobsIn->total() ):
 ?>
-                    <option value="<?php echo $termID; ?>" <?php echo $selected; ?>><?php echo $name; ?></option>
+                    <option value="<?php echo $termID; ?>" <?php echo $selected; ?>><?php echo $name; ?> (<?php echo $jobsIn->total(); ?>)</option>
 <?php
+                    endif;
                 endforeach;
              endif;
 ?>

wp-content/themes/biuro/template-parts/meta/canonical.php

+<?php
+    $search = get_query_var('s');
+    $cityID = get_query_var('city');
+
+   if ( $cityID && !$search ) :
+        $page = get_term_meta( $cityID, 'page-id', true);
+
+        if ( $page ) :
+?>
+    <link rel="canonical" href="<?php echo get_page_link( $page['ID'] ); ?>" />
+<?
+        endif;
+    endif;