mod-build 3.6.0-beta.1 → 3.6.1--beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.5.7
+
+- Making `maxRecursion` for our file include plugin in template.js a lot higher
+
 ## 3.5.6
 
 - Adding `inc` handlebars helper to template.js to increment a certain value by 1

package/gulp-tasks/grab-cdn.js

@@ -21,7 +21,7 @@ function streamToDestination(gulp, siteSettings, inputPath, destPath, fileName)
 module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	return function() {
 		const { nodeEnv, isLocal } = siteSettings;
-		const { isQSPage, isWhiteLabel, includeFaqLink, domain } = siteData;
+		const { isQSPage, isWhiteLabel, domain } = siteData;
 		const isModWhiteLabel = isWhiteLabel && !isQSPage
 		const domainHasModernize = domain.indexOf('modernize') > -1;
 

package/gulp-tasks/templates.js

@@ -12,7 +12,9 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	var qsFooterData = require('../src/data/components/qs-footer.js');
 	var quoteFooterData = require('../src/data/components/quote-footer.js');
 
-	var templatesData = Object.assign(commonData(), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
+	var makeSeasonalUpdates = require('../src/scripts/components/check-for-seasonal-updates.js');
+
+	var templatesData = Object.assign(commonData(), makeSeasonalUpdates(siteData), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
 
 	// This is helper function to evaluate JS expressions
 	// in Handlebars, e.g. for conditions
@@ -131,7 +133,7 @@ module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 			'!' + siteSettings.srcFolder + '/' + siteSettings.templatesSubfolder + '/_partials/**/*.html'
 		])
 			.pipe(gulpPlugins.handlebarsFileInclude(templatesData, {
-				maxRecursion: 125,
+				maxRecursion: 500,
 				handlebarsHelpers: handlebarsHelpers
 			}))
 			.pipe(gulp.dest(siteSettings.tmpFolder));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.0-beta.1",
+  "version": "3.6.1--beta.1",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/scripts/components/make-seasonal-updates.js

@@ -0,0 +1,17 @@
+/**
+ * Set Default Season Range
+ * @returns {Boolean} - if true = update verbiage
+*/
+
+var makeSeasonalUpdates = function(siteData) {
+	const trade = siteData.primary_trade;
+	const today = new Date();
+	const year = today.getFullYear();
+	if (trade === 'HVAC') {
+		/* Default Hightlight Cooling Services; Highlight Heating Services from September 25 to March 14 */
+		const springDate = new Date(`03-14-${year}`);
+		const fallDate = new Date(`09-25-${year}`);
+	
+		return !(today > springDate && today < fallDate);		
+	}
+}

package/src/scripts/components/contact-us.js

@@ -1,122 +0,0 @@
-/* exported contactUs */
-
-var contactUs = {
-	$form: $('.contact-us__form'),
-	$thankyou: $('.contact-us__thankyou'),
-	url: 'https://contact.formfetch.com/v2_submit',
-	getFormData: function() {
-		const date = new Date();
-		const data = {};
-		this.$form.serializeArray().forEach(function(input) {
-			data[input.name] = input.value;
-		});
-
-		data.time = date.toLocaleTimeString();
-		data.date = date.toLocaleDateString();
-		return data;
-	},
-	validateData: function(data) {
-		const _this = this;
-		var isFormValid = true;
-		const emailPattern = /^([\w\+-]+(?:\.[\w\+-]+)*)(@((?:[\w-]+\.)*\w[\w-]{0,66})\.([a-z]{2,6}(?:\.[a-z]{2})?)$)/i;
-
-		Object.keys(data).forEach(function(key) {
-			var isValid = true;
-			const value = data[key];
-			switch (key) {
-			case 'email':
-				isValid = emailPattern.test(value);
-				break;
-			default:
-				isValid = value !== '';
-				break;
-			}
-
-			if (!isValid) {
-				_this.markFieldAsInvalid(key);
-				isFormValid = false;
-			}
-		});
-
-		return isFormValid;
-	},
-	markFieldAsInvalid: function(fieldName) {
-		this.$form.find('#' + fieldName).parent().addClass('has-error');
-	},
-	submit: function() {
-		this.$form.addClass('form--loading');
-
-		const _this = this;
-		const data = this.getFormData();
-		const isFormValid = this.validateData(data);
-
-		if (isFormValid) {
-			// Submit
-			$.ajax({
-				url: _this.url,
-				dataType: 'json',
-				type: 'post',
-				crossDomain: true,
-				data: data,
-				success: function(response) {
-					if (response.success) {
-						_this.$form.hide();
-						_this.$thankyou.show();
-					} else {
-						_this.$form.removeClass('form--loading');
-						$('.step__error').html(response.message);
-					}
-				}
-			});
-		} else {
-			_this.$form.removeClass('form--loading');
-		}
-	},
-	changeStep: function(direction) {
-		const $activeStep = this.$form.find('.step--active');
-		const $nextStep = $activeStep.next();
-		const $prevStep = $activeStep.prev();
-
-		$activeStep.removeClass('step--active');
-		if (direction === 'next') {
-			$nextStep.addClass('step--active');
-		} else {
-			$prevStep.addClass('step--active');
-		}
-	},
-	watch: function() {
-		const _this = this;
-
-		// Watch form submission
-		_this.$form.on('submit', function(e) {
-			e.preventDefault();
-			if (!$(this).hasClass('form--loading')) {
-				_this.submit();
-			}
-		});
-
-		// Watch radio click
-		$('input[type="radio"]').on('change', function() {
-			_this.changeStep('next');
-		});
-
-		// Watch back button
-		_this.$form.find('.btn-back').on('click', function() {
-			_this.changeStep('prev');
-		});
-
-		// Remove error state when input/textarea changes
-		_this.$form.find('input, textarea').on('change', function() {
-			$(this).parent().removeClass('has-error');
-		});
-	},
-	init: function() {
-		this.watch();
-	}
-};
-
-(function($) {
-	$(document).ready(function() {
-		contactUs.init();
-	});
-})(jQuery);