From fe3165100178ad49ba0070f85b24f359b812cfdb Mon Sep 17 00:00:00 2001
From: Krylov Sergey <ksv741@mail.ru>
Date: Fri, 9 Apr 2021 22:38:02 +0500
Subject: [PATCH] refactor

---
 gulp/tasks/styles.js                    | 46 ++++++++++---------------
 php/wordpress/styles.php                | 28 +++++++--------
 src/sass/pages/about.scss               |  2 ++
 src/sass/pages/certificates.scss        |  5 +++
 src/sass/pages/contacts.scss            |  3 ++
 src/sass/pages/form.scss                |  9 +++--
 src/sass/pages/gallery.scss             |  4 +++
 src/sass/pages/holiday.scss             |  9 +++--
 src/sass/pages/home.scss                |  7 ++--
 src/sass/pages/price.scss               |  3 +-
 src/sass/pages/quests.scss              |  5 ++-
 src/sass/pages/sales.scss               |  3 ++
 src/sass/pages/single-quest.scss        |  5 ++-
 src/sass/parts/callback-modal.scss      |  2 +-
 src/sass/parts/entertainments.scss      |  2 ++
 src/sass/parts/header.scss              |  2 +-
 src/sass/parts/holiday-photos.scss      |  2 +-
 src/sass/parts/order.scss               |  2 ++
 src/sass/parts/packages.scss            |  8 ++---
 src/sass/parts/page-header.scss         | 14 +++-----
 src/sass/parts/quest-single-slider.scss |  5 ---
 src/sass/parts/quests-slider.scss       |  2 +-
 src/sass/parts/variants.scss            |  4 +--
 src/sass/style.scss                     |  2 +-
 templates/holiday.php                   |  1 -
 25 files changed, 94 insertions(+), 81 deletions(-)

diff --git a/gulp/tasks/styles.js b/gulp/tasks/styles.js
index 881d6e8..e45b010 100644
--- a/gulp/tasks/styles.js
+++ b/gulp/tasks/styles.js
@@ -13,40 +13,32 @@ import gcmq from 'gulp-group-css-media-queries';
 import concat from 'gulp-concat';
 import minifyCss from 'gulp-minify-css';
 
-// export const stylesBuild = () => {
-//   return gulp.src(`${pathConfig.src.sass}/**/*.scss`, {
-//     ignore: pathConfig.isProd && [`${pathConfig.src.sass}/parts/*.scss`]
-//   })
-
-//     .pipe(newer('*'))
-//     .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init()))
-//     .pipe(sass.sync().on('error', sass.logError))
-//     .pipe(gulpif(pathConfig.isProd, gcmq()))
-//     .pipe(gulpif(pathConfig.isProd, autoprefixer()))
-//     .pipe(gulpif(pathConfig.isProd, cleanCSS({ level: 2 })))
-//     .pipe(gulpif(pathConfig.isDevelop, sourcemaps.write('./')))
-//     .pipe(gulp.dest(pathConfig.assets.css))
-
-//     .pipe(browser.reload({stream: true}));
-// }
-
 export const stylesBuild = () => {
-  return gulp.src(`${pathConfig.src.sass}/**/*.scss`)
+  return gulp.src(`${pathConfig.src.sass}/**/*.scss`, {
+    ignore: pathConfig.isProd && [`${pathConfig.src.sass}/parts/*.scss`]
+  })
+
+    .pipe(newer('*'))
     .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init()))
     .pipe(sass.sync().on('error', sass.logError))
-    .pipe(concat("bundle.css"))
+    .pipe(gulpif(pathConfig.isProd, gcmq()))
+    .pipe(gulpif(pathConfig.isProd, autoprefixer()))
+    .pipe(gulpif(pathConfig.isProd, cleanCSS({ level: 2 })))
     .pipe(gulpif(pathConfig.isDevelop, sourcemaps.write('./')))
     .pipe(gulp.dest(pathConfig.assets.css))
 
-  // return sass(`${pathConfig.src.sass}/**/*.scss`)
-  // .pipe(sourcemaps.write())
-  // .pipe(sourcemaps.init({loadMaps: true}))
-  // .pipe(minifyCss({}))
-  // .pipe(sourcemaps.init({loadMaps: true}))
-  // .pipe(concat("app.min.css"))
-  // .pipe(sourcemaps.write())
-  // .pipe(gulp.dest( './build' ));
+    .pipe(browser.reload({stream: true}));
 }
 
+// export const stylesBuild = () => {
+//   return gulp.src(`${pathConfig.src.sass}/**/*.scss`)
+//     .pipe(gulpif(pathConfig.isDevelop, sourcemaps.init()))
+//     .pipe(sass.sync().on('error', sass.logError))
+//     .pipe(concat("bundle.css"))
+//     .pipe(gulpif(pathConfig.isDevelop, sourcemaps.write('./')))
+//     .pipe(gulp.dest(pathConfig.assets.css))
+//
+// }
+
 
 export const stylesDevelop = () => gulp.watch(`${pathConfig.src.sass}/**/*.scss`, stylesBuild).on('change', browser.reload.bind(null, {stream: true}));
diff --git a/php/wordpress/styles.php b/php/wordpress/styles.php
index 86463f6..982ad7f 100644
--- a/php/wordpress/styles.php
+++ b/php/wordpress/styles.php
@@ -23,21 +23,21 @@
 
 
       // Common styles
-    // wp_enqueue_style('armanty_style', $css . '/style.css', array(), $styleVersion);
-    wp_enqueue_style('bundle', $css . '/bundle.css', array(), $styleVersion);
+     wp_enqueue_style('armanty_style', $css . '/style.css', array(), $styleVersion);
+//    wp_enqueue_style('bundle', $css . '/bundle.css', array(), $styleVersion);
 
     // Pages styles
-    // if (is_page_template('templates/about.php')) wp_enqueue_style('armanty_about', $pagesStyle . '/about.css', array(), $styleVersion);
-    // if (is_page_template('templates/certificates.php')) wp_enqueue_style('armanty_certificates', $pagesStyle . '/certificates.css', array(), $styleVersion);
-    // if (is_page_template('templates/contacts.php')) wp_enqueue_style('armanty_contacts', $pagesStyle . '/contacts.css', array(), $styleVersion);
-    // if (is_page_template('templates/form.php')) wp_enqueue_style('armanty_form', $pagesStyle . '/form.css', array(), $styleVersion);
-    // if (is_page_template('templates/gallery.php')) wp_enqueue_style('armanty_gallery', $pagesStyle . '/gallery.css', array(), $styleVersion);
-    // if (is_page_template('templates/graduation.php')) wp_enqueue_style('armanty_graduation', $pagesStyle . '/graduation.css', array(), $styleVersion);
-    // if (is_page_template('templates/holiday.php')) wp_enqueue_style('armanty_holiday', $pagesStyle . '/holiday.css', array(), $styleVersion);
-    // if (is_page_template('templates/home.php')) wp_enqueue_style('armanty_home', $pagesStyle . '/home.css', array(), $styleVersion);
-    // if (is_page_template('templates/price.php')) wp_enqueue_style('armanty_price', $pagesStyle . '/price.css', array(), $styleVersion);
-    // if (is_page_template('templates/quests.php')) wp_enqueue_style('armanty_quests', $pagesStyle . '/quests.css', array(), $styleVersion);
-    // if (is_page_template('templates/sales.php')) wp_enqueue_style('armanty_sales', $pagesStyle . '/sales.css', array(), $styleVersion);
-    // if (is_page_template('templates/single-quest.php')) wp_enqueue_style('armanty_single-quest', $pagesStyle . '/single-quest.css', array(), $styleVersion);
+     if (is_page_template('templates/about.php')) wp_enqueue_style('armanty_about', $pagesStyle . '/about.css', array(), $styleVersion);
+     if (is_page_template('templates/certificates.php')) wp_enqueue_style('armanty_certificates', $pagesStyle . '/certificates.css', array(), $styleVersion);
+     if (is_page_template('templates/contacts.php')) wp_enqueue_style('armanty_contacts', $pagesStyle . '/contacts.css', array(), $styleVersion);
+     if (is_page_template('templates/form.php')) wp_enqueue_style('armanty_form', $pagesStyle . '/form.css', array(), $styleVersion);
+     if (is_page_template('templates/gallery.php')) wp_enqueue_style('armanty_gallery', $pagesStyle . '/gallery.css', array(), $styleVersion);
+     if (is_page_template('templates/graduation.php')) wp_enqueue_style('armanty_graduation', $pagesStyle . '/graduation.css', array(), $styleVersion);
+     if (is_page_template('templates/holiday.php')) wp_enqueue_style('armanty_holiday', $pagesStyle . '/holiday.css', array(), $styleVersion);
+     if (is_page_template('templates/home.php')) wp_enqueue_style('armanty_home', $pagesStyle . '/home.css', array(), $styleVersion);
+     if (is_page_template('templates/price.php')) wp_enqueue_style('armanty_price', $pagesStyle . '/price.css', array(), $styleVersion);
+     if (is_page_template('templates/quests.php')) wp_enqueue_style('armanty_quests', $pagesStyle . '/quests.css', array(), $styleVersion);
+     if (is_page_template('templates/sales.php')) wp_enqueue_style('armanty_sales', $pagesStyle . '/sales.css', array(), $styleVersion);
+     if (is_page_template('templates/single-quest.php')) wp_enqueue_style('armanty_single-quest', $pagesStyle . '/single-quest.css', array(), $styleVersion);
   }
 ?>
\ No newline at end of file
diff --git a/src/sass/pages/about.scss b/src/sass/pages/about.scss
index 6460b23..9086678 100644
--- a/src/sass/pages/about.scss
+++ b/src/sass/pages/about.scss
@@ -1,4 +1,6 @@
 @import '../constansts';
+@import '../parts/header';
+@import '../parts/footer';
 
 .about {
   &-text {
diff --git a/src/sass/pages/certificates.scss b/src/sass/pages/certificates.scss
index 2e22537..188972a 100644
--- a/src/sass/pages/certificates.scss
+++ b/src/sass/pages/certificates.scss
@@ -1,3 +1,8 @@
+@import '../parts/header';
+@import '../parts/footer';
+@import '../parts/compound';
+@import '../parts/page-header';
+
 .cert {
   &-text {
     margin-top: 50px;
diff --git a/src/sass/pages/contacts.scss b/src/sass/pages/contacts.scss
index 0feddd2..c3d09c8 100644
--- a/src/sass/pages/contacts.scss
+++ b/src/sass/pages/contacts.scss
@@ -1,4 +1,7 @@
 @import '../constansts';
+@import '../parts/header';
+@import '../parts/page-header';
+@import '../parts/footer';
 
 .contacts {
   padding-bottom: 30px;
diff --git a/src/sass/pages/form.scss b/src/sass/pages/form.scss
index 16e7ce2..6a98561 100644
--- a/src/sass/pages/form.scss
+++ b/src/sass/pages/form.scss
@@ -1,10 +1,12 @@
 @import '../constansts';
-@import '../parts/order';
 
 @import '../../libs/bootstrap_datetimepicker/css/bootstrap-datetimepicker.min.css';
 @import '../../libs/bootstrap_datetimepicker/css/bootstrap.min.css';
 @import '../../libs/bootstrap-select/bootstrap-select.min.css';
 
+@import '../parts/header';
+@import '../parts/order-modal';
+@import '../parts/footer';
 
 .form-block {
   padding-bottom: 10px;
@@ -195,10 +197,11 @@
 }
 
 .cheque-sum {
-  padding:5px 10px;
+  padding: 5px 10px;
 }
+
 .cheque-info {
-  padding:5px 10px;
+  padding: 5px 10px;
 }
 
 @media screen and (max-width: 1200px) {
diff --git a/src/sass/pages/gallery.scss b/src/sass/pages/gallery.scss
index 25b3de6..5d50a6c 100644
--- a/src/sass/pages/gallery.scss
+++ b/src/sass/pages/gallery.scss
@@ -1,3 +1,7 @@
+@import '../parts/header';
+@import '../parts/page-header';
+@import '../parts/footer';
+
 .gallery_box_single {
   width: 100%;
 }
diff --git a/src/sass/pages/holiday.scss b/src/sass/pages/holiday.scss
index 776af5b..4cb8942 100644
--- a/src/sass/pages/holiday.scss
+++ b/src/sass/pages/holiday.scss
@@ -1,8 +1,13 @@
-@import '../parts/adding-service';
+@import '../parts/header';
 @import '../parts/entertainments';
 @import '../parts/places';
+@import '../parts/adding-service';
 @import '../parts/order';
-@import '../pages/gallery';
+@import '../parts/holiday-photos';
+@import '../parts/packages';
+@import '../parts/variants';
+@import '../parts/compound';
+@import '../parts/footer';
 
 .holiday {
   &-block {
diff --git a/src/sass/pages/home.scss b/src/sass/pages/home.scss
index e6deb2b..091d208 100644
--- a/src/sass/pages/home.scss
+++ b/src/sass/pages/home.scss
@@ -1,9 +1,10 @@
+@import '../parts/header';
+@import '../parts/main-block';
 @import '../parts/entertainments';
+@import '../parts/order';
+@import '../parts/places';
 @import '../parts/discounts';
 @import '../parts/present';
 @import '../parts/principals';
-
-
-@import '../parts/header';
 @import '../parts/callback-modal';
 @import '../parts/footer';
diff --git a/src/sass/pages/price.scss b/src/sass/pages/price.scss
index a2ac174..fc8c0fa 100644
--- a/src/sass/pages/price.scss
+++ b/src/sass/pages/price.scss
@@ -1,5 +1,6 @@
 @import '../constansts';
-@import '../parts/main-block';
+@import '../parts/header';
+@import '../parts/footer';
 
 .prices {
   padding-top: 30px;
diff --git a/src/sass/pages/quests.scss b/src/sass/pages/quests.scss
index 184d9c9..428bd60 100644
--- a/src/sass/pages/quests.scss
+++ b/src/sass/pages/quests.scss
@@ -1,4 +1,8 @@
+@import '../parts/header';
+@import '../parts/page-header';
+@import '../parts/quests-list';
 @import '../parts/compound';
+@import '../parts/footer';
 
 .quests {
   position: relative;
@@ -6,5 +10,4 @@
   margin-top: 30px;
   background-size: cover;
   font-family: 'PT Sans', sans-serif;
-
 }
diff --git a/src/sass/pages/sales.scss b/src/sass/pages/sales.scss
index a658fe1..e91c949 100644
--- a/src/sass/pages/sales.scss
+++ b/src/sass/pages/sales.scss
@@ -1,4 +1,7 @@
+@import '../parts/header';
+@import '../parts/page-header';
 @import '../parts/discounts';
+@import '../parts/footer';
 
 .sales-block {
   display: flex;
diff --git a/src/sass/pages/single-quest.scss b/src/sass/pages/single-quest.scss
index 9b6df73..77dcadb 100644
--- a/src/sass/pages/single-quest.scss
+++ b/src/sass/pages/single-quest.scss
@@ -1,3 +1,7 @@
+@import '../parts/header';
+@import '../parts/quest-single-slider';
+@import '../parts/footer';
+
 .quest__booking {
   padding-bottom: 10px;
 
@@ -9,7 +13,6 @@
 }
 
 
-
 .quest-description {
   margin-top: 40px;
   margin-bottom: 40px;
diff --git a/src/sass/parts/callback-modal.scss b/src/sass/parts/callback-modal.scss
index 5db018d..c2ec921 100644
--- a/src/sass/parts/callback-modal.scss
+++ b/src/sass/parts/callback-modal.scss
@@ -50,4 +50,4 @@
       font-size: 18px !important;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/parts/entertainments.scss b/src/sass/parts/entertainments.scss
index 700671d..424fb1a 100644
--- a/src/sass/parts/entertainments.scss
+++ b/src/sass/parts/entertainments.scss
@@ -1,3 +1,5 @@
+@import './quests-slider';
+
 .quest-description__icons_main {
   display: flex;
   flex-direction: row;
diff --git a/src/sass/parts/header.scss b/src/sass/parts/header.scss
index 9f554ab..2fac6df 100644
--- a/src/sass/parts/header.scss
+++ b/src/sass/parts/header.scss
@@ -285,8 +285,8 @@
 
 .header-phone-number-block {
   justify-content: center;
-  border-right: 1px solid #fff;
   height: 100%;
+  border-right: 1px solid #ffffff;
 }
 
 .popover {
diff --git a/src/sass/parts/holiday-photos.scss b/src/sass/parts/holiday-photos.scss
index 5f56fa9..901fa43 100644
--- a/src/sass/parts/holiday-photos.scss
+++ b/src/sass/parts/holiday-photos.scss
@@ -22,4 +22,4 @@
     margin-bottom: 30px;
     padding-top: 0;
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/parts/order.scss b/src/sass/parts/order.scss
index 7ec362a..7ec7cf5 100644
--- a/src/sass/parts/order.scss
+++ b/src/sass/parts/order.scss
@@ -1,4 +1,6 @@
 @import '../constansts';
+@import "./order-modal";
+
 
 .order {
   position: relative;
diff --git a/src/sass/parts/packages.scss b/src/sass/parts/packages.scss
index d088140..d57f1e9 100644
--- a/src/sass/parts/packages.scss
+++ b/src/sass/parts/packages.scss
@@ -1,17 +1,15 @@
 .package-currency {
-  font-size: 16px !important
+  font-size: 16px !important;
 }
 
-
 @media screen and (max-width: 576px) {
   .packages-item {
     padding: 25px 23px !important;
   }
 }
+
 @media screen and (max-width: 480px) {
-
-
   .packages-item {
     width: 255px;
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/parts/page-header.scss b/src/sass/parts/page-header.scss
index efdfa28..04ce2fe 100644
--- a/src/sass/parts/page-header.scss
+++ b/src/sass/parts/page-header.scss
@@ -6,8 +6,8 @@
   align-items: center;
   justify-content: center;
   height: 408px;
-  color: #ffffff;
   background-size: cover;
+  color: #ffffff;
   box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.5);
   text-align: center;
 
@@ -72,6 +72,8 @@
   .page {
     &__header {
       box-shadow: 0 5px 8px 0 rgba(0, 0, 0, 0.5);
+      font-size: 28px;
+      line-height: 1.2;
 
       h1 {
         font-size: 28px;
@@ -84,14 +86,6 @@
       }
     }
   }
-
-
-  .page__header {
-    h1 {
-      font-size: 28px;
-      line-height: 1.2;
-    }
-  }
 }
 
 @media screen and (max-width: 800px) {
@@ -99,4 +93,4 @@
     height: 200px;
     background-position: top center !important;
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/parts/quest-single-slider.scss b/src/sass/parts/quest-single-slider.scss
index 0b5d147..ca3410b 100644
--- a/src/sass/parts/quest-single-slider.scss
+++ b/src/sass/parts/quest-single-slider.scss
@@ -1,8 +1,3 @@
-.quest__slider {
-  max-height: 600px;
-  position: relative;
-}
-
 .quest__slider {
   position: relative;
   max-height: 600px;
diff --git a/src/sass/parts/quests-slider.scss b/src/sass/parts/quests-slider.scss
index a869dcd..225f687 100644
--- a/src/sass/parts/quests-slider.scss
+++ b/src/sass/parts/quests-slider.scss
@@ -116,4 +116,4 @@
 
 quests-container__quest {
   background-size: cover;
-}
\ No newline at end of file
+}
diff --git a/src/sass/parts/variants.scss b/src/sass/parts/variants.scss
index 11481c7..5f738a4 100644
--- a/src/sass/parts/variants.scss
+++ b/src/sass/parts/variants.scss
@@ -131,12 +131,10 @@
 }
 
 @media screen and (max-width: 576px) {
-
-
   .var-item {
     img {
       max-width: 100%;
       height: auto;
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/sass/style.scss b/src/sass/style.scss
index a7ef49d..a4e2802 100644
--- a/src/sass/style.scss
+++ b/src/sass/style.scss
@@ -316,4 +316,4 @@ body {
   .wave > div {
     background: #ffffff;
   }
-}
\ No newline at end of file
+}
diff --git a/templates/holiday.php b/templates/holiday.php
index 51c23fc..59104fc 100644
--- a/templates/holiday.php
+++ b/templates/holiday.php
@@ -17,7 +17,6 @@
       get_template_part('parts/holiday/photos');
       get_template_part('parts/holiday/packages');
       get_template_part('parts/holiday/var');
-      get_template_part('parts/home/principals');
     ?>
   </div>