Skip to content

D
dev.biuro
Commit f0f6c4a8 authored by Simon's avatar Simon
Browse files
Options

Merge branch 'release-1.2.0' into dev

parents a63dcfa0 286a0fda
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 378 additions and 1143 deletions
README.md
View file @ f0f6c4a8
......@@ -20,9 +20,9 @@
## Production
- build CSS & JS assets - `C:\web\dev.biuro\ npm run build`
- build new image `docker build -t biuro/web:1.1.1 .` (update version number)
- build new image `docker build -t biuro/web:1.2.0 .` (update version number)
- login to biuro docker account `docker login --username=biuro --password=9Ndtjd2vKsLvGuFOeFq1KdJs`
- push image to docker repository - `docker push biuro/web:1.1.1`
- push image to docker repository - `docker push biuro/web:1.2.0`
## Production
- update biuro/web image version in .env file (staging or www)
......
wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employees--step-1.php
View file @ f0f6c4a8
......@@ -77,7 +77,17 @@ if ( ! defined( 'WPINC' ) ) die;
<div class="c-form--row">
<div class="c-form--submit-wrap">
<?php
if (isset($attr['page']) && $attr['page'] == 'landing-1'):
?>
<button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="1" onclick="ga('send', 'event', 'ContactFormLanding1', 'Button', 'SendContactFormLanding1');"><?php _e('Get a job offer', 'biuro'); ?></button>
<?php
else:
?>
<button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="1" onclick="ga('send', 'event', 'ContactFormEmployee', 'Button', 'SendContactFormEmployee');"><?php _e('Submit', 'biuro-contacts'); ?></button>
<?php
endif;
?>
</div>
</div><!-- .c-form--row -->
......
wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employees--step-2.php
View file @ f0f6c4a8
......@@ -42,6 +42,19 @@ if ( ! defined( 'WPINC' ) ) die;
<div class="c-form--row">
<div class="c-form--submit-wrap">
<button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="2" onclick="ga('send', 'event', 'ContactFormEmployee', 'Button', 'UpdateContactFormEmployee');"><?php _e('Submit', 'biuro-contacts'); ?></button>
<?php
if (isset($attr['page']) && $attr['page'] == 'landing-1'):
?>
<button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="2" onclick="ga('send', 'event', 'ContactFormLanding1', 'Button', 'UpdateContactFormLanding1');"><?php _e('Submit', 'biuro-contacts'); ?></button>
<?php
else:
?>
<button type="submit" class="o-btn c-btn--main c-btn--fill" name="s" value="2" onclick="ga('send', 'event', 'ContactFormEmployee', 'Button', 'UpdateContactFormEmployee');"><?php _e('Submit', 'biuro-contacts'); ?></button>
<?php
endif;
?>
</div>
</div><!-- .c-form--row -->
wp-content/plugins/biuro-contacts/public/partials/biuro-contacts-public--employees.php
View file @ f0f6c4a8
......@@ -60,8 +60,22 @@ if ( ! defined( 'WPINC' ) ) die;
</div>
<script>
window.dataLayer = window.dataLayer || [];
</script>
<?php
if (isset($attr['page']) && $attr['page'] == 'landing-1'):
?>
<script>
dataLayer.push({'event': 'b2c_form_submit_success_validated', 'label': 'Landing page 1'});
</script>
<?php
else:
?>
<script>
dataLayer.push({'event': 'b2c_form_submit_success_validated', 'label': 'Contact page'});
</script>
<?php
endif;
?>
<?php
unset($_SESSION['employees--s']);
}
......@@ -93,9 +107,22 @@ if ( ! defined( 'WPINC' ) ) die;
</div>
<script>
window.dataLayer = window.dataLayer || [];
</script>
<?php
if (isset($attr['page']) && $attr['page'] == 'landing-1'):
?>
<script>
dataLayer.push({'event': 'b2c_form_update_success_validated', 'label': 'Landing page 1'});
</script>
<?php
else:
?>
<script>
dataLayer.push({'event': 'b2c_form_update_success_validated', 'label': 'Contact page'});
</script>
<?php
endif;
?>
<?php
unset($_SESSION['employees--s']);
}
......
wp-content/plugins/biuro-html/biuro-html.php
View file @ f0f6c4a8
......@@ -37,7 +37,7 @@ class Biuro_HTML extends WP_Widget {
</p>
<p>
<label for="<?php echo esc_attr( $this->get_field_id( 'content' ) ); ?>"><?php _e( 'Content:', 'biuro' ); ?></label>
<textarea class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'content' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'content' ) ); ?>" rows="12"><?php echo wp_kses_post( $content ); ?></textarea>
<textarea class="widefat" id="<?php echo esc_attr( $this->get_field_id( 'content' ) ); ?>" name="<?php echo esc_attr( $this->get_field_name( 'content' ) ); ?>" rows="12"><?php echo $content; ?></textarea>
</p>
<?php }
......@@ -46,7 +46,7 @@ class Biuro_HTML extends WP_Widget {
public function update( $new_instance, $old_instance ) {
$instance = $old_instance;
$instance['title'] = isset( $new_instance['title'] ) ? wp_strip_all_tags( $new_instance['title'] ) : '';
$instance['content'] = isset( $new_instance['content'] ) ? wp_kses_post( $new_instance['content'] ) : '';
$instance['content'] = isset( $new_instance['content'] ) ? $new_instance['content'] : '';
return $instance;
}
......
wp-content/themes/biuro/css/05-layout/__layout.css
View file @ f0f6c4a8
......@@ -5,6 +5,7 @@ Layout styles (e.g. container, header, main, footer, grid systems etc)
l-: layout classes
========================================================================== */
@import '_layout--body.css';
@import '_layout--inner.css';
@import '_layout--header.css';
@import '_layout--content.css';
......@@ -14,6 +15,3 @@ l-: layout classes
@import '_layout--map.css';
@import '_layout--nav.css';
@import '_layout--section.css';
wp-content/themes/biuro/css/05-layout/_layout--body.css 0 → 100644
View file @ f0f6c4a8
/* ------------- Layout: body ------------- */
/* critical:start */
.l-body--langing { padding-top: 0 !important;
.u-fill--logo { fill: #fff !important; }
}
/* critical:end */
wp-content/themes/biuro/css/05-layout/_layout--content.css
View file @ f0f6c4a8
......@@ -19,9 +19,9 @@
}
&:before { content: ''; position: absolute; top: 0; left: 0; height: 244px; width: 100%; background: linear-gradient(358.45deg, #3C7E9E 0%, #1FB299 100%); }
}
.l-content--position-inner { position: relative; max-width: 970px; margin: 0 auto; border-radius: 3px; background-color: #FFFFFF;
.l-content--position-inner { position: relative; max-width: 970px; margin: 0 auto; border-radius: 3px; background-color: #FFFFFF; box-shadow: 0 1px 31px -23px #6A7481;
@media (--min--medium) {
display: flex; margin: 0 auto 140px; box-shadow: 0 1px 47px 0 #ECF5FF;
display: flex; margin: 0 auto 140px;
}
.l-main { padding: 20px;
......
wp-content/themes/biuro/css/05-layout/_layout--header.css
View file @ f0f6c4a8
......@@ -11,4 +11,10 @@
.l-header { position: fixed; top: 0; left: 0; width: 100%; z-index: 300; }
.l-header--langing { position: fixed; top: 0; left: 0; width: 100%; height: 70px; z-index: 300; }
/* critical:end */
.l-header {
.customize-support & { top: 32px; }
}
wp-content/themes/biuro/css/05-layout/_layout--section.css
View file @ f0f6c4a8
......@@ -31,11 +31,18 @@
.l-section--inner { max-width: 1030px; margin: 0 auto; }
.l-section--inner { width: 100%; max-width: 1030px; margin: 0 auto; }
.l-section--landing-1 { display: flex; align-items: flex-end; padding: 0 !important; background-color: #515e70; height: 240px;
@media (--min--medium) {
height: 348px;
}
}
/* 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); }
......@@ -65,39 +72,9 @@
.l-section--sales-page { background-image: url(/wp-content/themes/biuro/i/sales-page.webp); }
}
/*@supports (background-image: -webkit-image-set(url(/wp-content/themes/biuro/i/front-page.webp) 1x)) {
.l-section--search-page { background-image: url(/wp-content/themes/biuro/i/search-page.webp); }
.l-section--vdb { background-image: url(/wp-content/themes/biuro/i/vdb/section.webp); }
.l-section--front-page { background-image: url(/wp-content/themes/biuro/i/front-page.webp); }
.l-section--sales-page { background-image: url(/wp-content/themes/biuro/i/sales-page.webp); }
}*/
/*
.l-section--search-page { background-image: url(/wp-content/themes/biuro/i/search-page.png); }
@supports (background-image: -webkit-image-set(url(/wp-content/themes/biuro/i/search-page.webp) 1x)) {
.l-section--search-page { background-image: url(/wp-content/themes/biuro/i/search-page.webp); }
.l-section--landing-1 { background-image: url(/wp-content/themes/biuro/i/sections/landing-1.jpg); background-position: 0 50%; }
@supports (background-image: -webkit-image-set(url(/wp-content/themes/biuro/i/sections/landing-1.webp) 1x)) {
.l-section--landing-1 { background-image: url(/wp-content/themes/biuro/i/sections/landing-1.webp); }
}
.l-section--vdb { background-image: url(/wp-content/themes/biuro/i/vdb/section.png); }
@supports (background-image: -webkit-image-set(url(/wp-content/themes/biuro/i/vdb/section.webp) 1x)) {
.l-section--vdb { background-image: url(/wp-content/themes/biuro/i/vdb/section.webp); }
}
.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;
}
}
@supports (background-image: -webkit-image-set(url(/wp-content/themes/biuro/i/front-page.webp) 1x)) {
.l-section--front-page { background-image: url(/wp-content/themes/biuro/i/front-page.webp);
}
.l-section--sales-page { background-image: url(/wp-content/themes/biuro/i/sales-page.png); }
@supports (background-image: -webkit-image-set(url(/wp-content/themes/biuro/i/sales-page.webp) 1x)) {
.l-section--sales-page { background-image: url(/wp-content/themes/biuro/i/sales-page.webp); }
}
*/
wp-content/themes/biuro/css/07-components/__components.css
View file @ f0f6c4a8
......@@ -13,6 +13,7 @@ c-: Signify that something is a Component. This is a concrete, implementation-sp
@import '_component--btn.css';
@import '_component--cookies-warning.css';
@import '_component--contact.css';
@import '_component--contact-landing-1.css';
@import '_component--copyright.css';
@import '_component--data-controller.css';
@import '_component--divisions.css';
......
wp-content/themes/biuro/css/07-components/_component--contact-landing-1.css 0 → 100644
View file @ f0f6c4a8
/* ------------- Component: contact section ------------- */
/* critical:start */
.c-contact-landing-1 { padding: 10px 0;
@media (--max--medium) {
max-width: 440px; margin: 0 auto;
}
@media (--min--medium) {
padding: 30px 0 40px;
}
}
.c-contact-landing-1--inner { max-width: 1000px; padding: 0 10px ;margin: 0 auto;
@media (--min--medium) {
display: flex; justify-content: space-between;
}
}
.c-contact-landing-1--content { color: #2A3644; font-weight: 500; line-height: 29px; padding: 15px 0 20px 15px;
@media (--min--medium) {
flex: 1 1 40%; max-width: 500px; padding: 0 0 0 90px;
}
img { max-width: 100%; height: auto; }
}
.c-contact-landing-1--img { margin-top: 40px; }
.c-contact-landing-1--form { max-width: 420px;
@media (--min--medium) {
flex: 1 1 40%; margin-top: -200px;
}
}
/* critical:end */
wp-content/themes/biuro/css/07-components/_component--heading.css
View file @ f0f6c4a8
......@@ -33,4 +33,20 @@
}
}
.c-heading--landing-1 {
h1 { max-width: 230px; color: #fff; font-size: 21px; line-height: 32px; padding: 0 20px;
@media (--min--medium) {
max-width: 500px; font-size: 31px; line-height: 45px;
/*max-width: 117px; color: #fff;*/
}
}
@media (--max--medium) {
max-width: 440px; margin: 0 auto;
}
@media (--min--medium) {
padding-left: 110px;
}
}
/* critical:end */
wp-content/themes/biuro/css/07-components/_component--ico.css
View file @ f0f6c4a8
......@@ -16,4 +16,12 @@
.c-ico--filter { float: left; margin: 3px 15px 0 3px; }
.c-ico--time { float: left; margin: 2px 20px 0 0; }
.c-ico--offer { float: left; margin: 1px 23px 0 0; }
.c-ico--easy { float: left; margin: 0 21px 0 0; }
/* critical:end */
wp-content/themes/biuro/css/10-trumps/_utils-fill.css
View file @ f0f6c4a8
......@@ -13,6 +13,8 @@
.u-fill--inherit { fill: currentColor; }
.u-fill--logo { fill: #149A83; }
/* critical:end */
/*
......
wp-content/themes/biuro/css/core-bc59262ec6.min.css 0 → 100644
View file @ f0f6c4a8
This diff is collapsed.
wp-content/themes/biuro/css/core.min.css deleted 100644 → 0
View file @ a63dcfa0
This source diff could not be displayed because it is too large. You can view the blob instead.
wp-content/themes/biuro/css/main-8758766c96.min.css 0 → 100644
View file @ f0f6c4a8
This diff is collapsed.
wp-content/themes/biuro/css/main.min.css deleted 100644 → 0
View file @ a63dcfa0
This diff is collapsed.
wp-content/themes/biuro/css/main.min.css.map deleted 100644 → 0
View file @ a63dcfa0
This diff is collapsed.
wp-content/themes/biuro/employees-langing-page-1.php 0 → 100644
View file @ f0f6c4a8
<?php
/**
* Template Name: Employees Landing Page I
*
* The employees landing page template file
* Learn more: https://codex.wordpress.org/Template_Hierarchy
*
* @package WordPress
* @subpackage Biuro
* @since 1.0
* @version 1.0
*/
get_header('langing');
?>
<div class="l-section l-section--landing-1">
<div class="l-section--inner">
<?php
while ( have_posts() ) :
?>
<div class="c-heading--landing-1">
<?php
the_post();
the_content();
?>
</div>
<?php
endwhile;
?>
</div>
</div>
<div id="content">
<main id="main" class="l-main">
<div class="c-contact-landing-1">
<div class="c-contact-landing-1--inner">
<div class="c-contact-landing-1--content">
<?php
if ( is_active_sidebar( 'landing_page_employees_1' ) ) :
dynamic_sidebar( 'landing_page_employees_1' );
endif;
?>
<?php
/*
<p>
<svg width="24px" height="24px" class="c-ico--time">
<use xlink:href="#ico--time"></use>
</svg> Kandidatuok per 30 sekundžių
</p>
<p>
<svg width="23px" height="21px" class="c-ico--offer">
<use xlink:href="#ico--offer"></use>
</svg> Gauk darbo pasiūlymą
</p>
<p>
<svg width="23px" height="23px" class="c-ico--easy">
<use xlink:href="#ico--easy"></use>
</svg> Greita, paprasta ir patogu
</p>
*/
?>
<div class="c-contact-landing-1--img">
<picture>
<source srcset="/wp-content/themes/biuro/i/contact.webp" type="image/jpeg">
<img src="/wp-content/themes/biuro/i/contact.png" alt="" width="328" height="95">
</picture>
</div>
</div>
<div class="c-contact-landing-1--form">
<?php
echo do_shortcode('[biuro-contacts--employees page="landing-1"]');
?>
</div>
</div><!-- .c-contact-landing-1--inner -->
</div><!-- .c-contact-landing-1 -->
<?php
if ( is_active_sidebar( 'front_page_feedbacks' ) ) :
dynamic_sidebar( 'front_page_feedbacks' );
endif;
?>
</main><!-- .l-main -->
</div><!-- #content -->
<?php get_footer();
wp-content/themes/biuro/footer.php
View file @ f0f6c4a8
......@@ -88,7 +88,7 @@
<?php
endif;
?>
<script src="/wp-content/themes/biuro/js/main.min.js" async></script>
<script src="/wp-content/themes/biuro/js/main-ef4b0946.min.js" async></script>
<?php
// global $time_start;
......
wp-content/themes/biuro/front-page.php
View file @ f0f6c4a8
......@@ -128,9 +128,4 @@
</main><!-- .l-main -->
</div><!-- #content -->
<?php
// global $time_start;
// delog((microtime(true) - $time_start), 'Lorem ipsum');
?>
<?php get_footer();
wp-content/themes/biuro/functions.php
View file @ f0f6c4a8
......@@ -223,6 +223,24 @@ function biuro_widger_areas() {
'before_title' => '',
'after_title' => '',
) );
register_sidebar( array(
'name' => 'Landing page: Employees 1',
'id' => 'landing_page_employees_1',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
) );
register_sidebar( array(
'name' => 'Landing page: Employees 2',
'id' => 'landing_page_employees_2',
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
'after_title' => '',
) );
}
add_action( 'widgets_init', 'biuro_widger_areas' );
......
wp-content/themes/biuro/header-langing.php 0 → 100644
View file @ f0f6c4a8
<?php
// global $time_start;
// $time_start = microtime(true);
?><!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>">
<meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<title><?php wp_title(''); ?> | Biuro</title>
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#006957">
<meta name="msapplication-TileColor" content="#ffffff">
<meta name="theme-color" content="#ffffff">
<meta name="google-site-verification" content="Xlpzg6WVpXXrivwjXrOaEzjxZQcPP2x0oCoUizYyCDM" />
<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');
?>
<link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-500.woff2" crossorigin="anonymous" >
<link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-regular.woff2" crossorigin="anonymous" >
<style><?php include 'css/core-bc59262ec6.min.css'; ?></style>
<link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-300.woff2" crossorigin="anonymous" >
<link rel="preload" as="font" type="font/woff2" href="/wp-content/themes/biuro/fonts/roboto-v19-cyrillic_latin_cyrillic-ext_latin-ext-700.woff2" crossorigin="anonymous" >
<link rel="preload" href="/wp-content/themes/biuro/css/main-8758766c96.min.css" as="style" onload="this.rel='stylesheet'">
<noscript>
<link rel="stylesheet" href="/wp-content/themes/biuro/css/main-8758766c96.min.css">
</noscript>
<?php wp_head(); ?>
</head>
<body class="l-body--langing">
<?php include 'template-parts/svg/icons.php'; ?>
<header class="l-header--langing">
<div class="l-inner l-inner--header">
<a href="<?php echo pll_home_url(); ?>" class="c-logo" title="<?php echo get_the_title( get_option('page_on_front') ); ?>">
<svg width="82px" height="49px" class="c-logo--svg">
<use xlink:href="#biuro-logo"></use>
</svg>
</a>
</div>
</header>
wp-content/themes/biuro/header.php
View file @ f0f6c4a8
This diff is collapsed.
wp-content/themes/biuro/js/main-ef4b0946.min.js 0 → 100644
View file @ f0f6c4a8
This source diff could not be displayed because it is too large. You can view the blob instead.
wp-content/themes/biuro/js/main.js
View file @ f0f6c4a8
......@@ -285,8 +285,9 @@ function initDivisionsMap (node, data) {
})(window);
const swiper = new Swiper('.c-feedbacks--inner', {
speed: 900,
autoplay: {
delay: 4000,
delay: 6000,
disableOnInteraction: false
},
grabCursor: true,
......
wp-content/themes/biuro/js/main.min.js deleted 100644 → 0
View file @ a63dcfa0
This diff is collapsed.
wp-content/themes/biuro/searchform.php
View file @ f0f6c4a8
......@@ -8,9 +8,6 @@
* @version 1.0
*/
// global $time_start;
// delog((microtime(true) - $time_start), 'Lorem ipsum');
global $query_string;
wp_parse_str( $query_string, $searchQuery );
......
wp-content/themes/biuro/template-parts/svg/icons.php 0 → 100644
View file @ f0f6c4a8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment