mod-build 3.6.1 → 3.6.2--beta.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.6.2
+
+- Adding `check-seasonal-variations` to grab seasons json; loop through the siteData for `seasonalVariations: {}`; find any active seasons; merge the json objects and adjust json content accordingly;
+
 ## 3.5.7
 
 - Making `maxRecursion` for our file include plugin in template.js a lot higher

package/gulp-tasks/cache-bust.js

@@ -3,7 +3,11 @@ module.exports = function(gulp, gulpPlugins, siteSettings) {
 		return gulp.src(siteSettings.distFolder + '/**')
 			.pipe(gulpPlugins.revAll.revision({
 				dontRenameFile: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g],
-				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g]
+				dontUpdateReference: [/^\/favicon.ico$/g, '.html', '.txt', /modlogo([\w|\s|-])*\.(?:svg)/g],
+				transformFilename: function (file, hash) {
+					var ext = path.extname(file.path);
+					return path.basename(file.path, ext) + ext + "?v" + hash.substr(0, 8); // filename.ext?v099e1583
+				}
 			}))
 			.pipe(gulpPlugins.revDeleteOriginal())
 			.pipe(gulp.dest(siteSettings.distFolder))

package/gulp-tasks/check-seasonal-variations.js

@@ -0,0 +1,21 @@
+function getActiveSeasons() {
+	var seasons = require(`../src/data/seasons.js`);
+	const today = new Date();
+	const year = today.getFullYear();
+	let activeSeason = [];
+	
+	for (const key in seasons) {
+		var seasonName = key;
+		var dateRanges = seasons[key];
+		var startDate = new Date(`${Object.values(dateRanges)[0]}-${year}`);
+		var endDate = new Date(`${Object.values(dateRanges)[1]}-${year}`);
+
+		if (startDate < today && today < endDate) {
+			activeSeason.push(seasonName)
+		}
+	}
+
+	return activeSeason;
+}
+
+module.exports = getActiveSeasons;

package/gulp-tasks/templates.js

@@ -1,3 +1,5 @@
+var merge = require('lodash.merge');
+
 module.exports = function(gulp, gulpPlugins, siteSettings, siteData) {
 	// Merge site's data with shared data
 	/* eslint brace-style: 0 */
@@ -12,6 +14,19 @@ 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');
 
+	// Checking for seasonal variations in the template.js + updating content
+	var checkSeasonalVariations = require('./check-seasonal-variations.js');
+	const activeSeason = checkSeasonalVariations();
+	if (activeSeason.length !== 0){
+		if (siteData.seasonalVariations) {
+			activeSeason.forEach(season => {
+				if (season in siteData.seasonalVariations) {
+					siteData = merge(siteData, siteData.seasonalVariations[season]);
+				}
+			});
+		}
+	}
+
 	var templatesData = Object.assign(commonData(), qsFooterData(siteData), quoteFooterData(siteData), siteData, { isLocal, nodeEnv, assetsPath, buildPath });
 
 	// This is helper function to evaluate JS expressions

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mod-build",
-  "version": "3.6.1",
+  "version": "3.6.2--beta.2",
   "description": "Share components for S3 sites.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -51,6 +51,7 @@
     "imagemin-webp": "^5.1.0",
     "jquery": "^3.2.1",
     "lodash": "^4.17.15",
+    "lodash.merge": "^4.6.2",
     "nouislider": "^10.1.0",
     "request": "^2.88.0",
     "run-sequence": "^2.2.1",

package/src/data/seasons.js

@@ -0,0 +1,8 @@
+var seasons = {
+	"warmerWeather": {
+		"firstDay": "03-14",
+		"lastDay": "09-25"
+	}
+}
+
+module.exports = seasons;

package/src/scripts/thankyou.js

@@ -1,58 +0,0 @@
-/* global modUtils locationStr */
-
-/**
- * Link this file into a TY page to render generic TYP and fire pixels
- */
-
-var thankyouPage = (function($) {
-	var getVars = modUtils.getUrlParamsToObject(),
-		apiUrl = modUtils.getApiDomain() + '/v1/';
-
-	/**
-	 * Starts TY page
-	 */
-	var init = function() {
-		// Personalized intro copy (/thankyou page)
-		if (getVars.fName && getVars.lName) {
-			$('#intro').text(getVars.fName + ' ' + getVars.lName + ', thanks for your request.');
-		}
-
-		// Location
-		if (getVars.city && getVars.state) {
-			locationStr = getVars.city + ', ' + getVars.state;
-		}
-		if (locationStr) {
-			$('[data-bind="location"]').text(locationStr);
-		}
-
-		// leadToken
-		if (getVars.leadToken) {
-			$('#leadid_token').val(getVars.leadToken);
-		}
-
-		// Grab and fire the affiliate pixel if one exists and not a duplicate.
-		if (getVars.projectId && !getVars.isDupe) {
-			$.ajax({
-				url: apiUrl + 'tracking/get-typ-pixel/' + getVars.projectId,
-				type: 'GET',
-				dataType: 'json',
-				crossDomain: true,
-				success: function(response) {
-					if (!response || !response.data.pixel) {
-						return;
-					}
-
-					$('body').append(response.data.pixel);
-				}
-			});
-		}
-	};
-
-	return {
-		init: init
-	};
-})(jQuery);
-
-$(document).ready(function() {
-	thankyouPage.init();
-});