From 6027f8d927fd2ae39f6626e69d02844ea603b5f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:23:11 -0500 Subject: [PATCH 1/7] Update .editorconfig Co-authored-by: Chauncey McAskill --- .editorconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.editorconfig b/.editorconfig index 29ce05e..a9a4801 100644 --- a/.editorconfig +++ b/.editorconfig @@ -12,9 +12,5 @@ trim_trailing_whitespace = true [*.{md,markdown}] trim_trailing_whitespace = false -[{*.yml,*.json}] -indent_size = 4 -indent_style = space - [*.{ms,mustache}] insert_final_newline = false From 31c803d14d203bfea9c7bf9e2bbf26edfc7ac754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:23:22 -0500 Subject: [PATCH 2/7] Update README.md Co-authored-by: Chauncey McAskill --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 43e6d89..cd0da53 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,10 @@ ## Requirements -| Name | Version | -| ---------- | ------- | +| Name | Version | +| ---------- | -------- | | [Node] | > 14.15 | + [Node]: https://nodejs.org/en/ You can use [nvm](https://github.com/nvm-sh/nvm) to install the node version in `.nvmrc`. From ad01d00751f27efed2bbc3df2ff69406934804d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:23:32 -0500 Subject: [PATCH 3/7] Update assets/scripts/modules/Load.js Co-authored-by: Chauncey McAskill --- assets/scripts/modules/Load.js | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/scripts/modules/Load.js b/assets/scripts/modules/Load.js index 1a01cda..903f471 100644 --- a/assets/scripts/modules/Load.js +++ b/assets/scripts/modules/Load.js @@ -7,7 +7,6 @@ export default class extends module { } init() { - const load = new modularLoad({ enterDelay: 0, transitions: { From 11b9fa7a7dd0bed4e0946601c16e776ab64ff945 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:23:45 -0500 Subject: [PATCH 4/7] Update assets/scripts/modules/Scroll.js Co-authored-by: Chauncey McAskill --- assets/scripts/modules/Scroll.js | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/scripts/modules/Scroll.js b/assets/scripts/modules/Scroll.js index 30f0e33..c8c4e56 100644 --- a/assets/scripts/modules/Scroll.js +++ b/assets/scripts/modules/Scroll.js @@ -7,7 +7,6 @@ export default class extends module { } init() { - this.scroll = new LocomotiveScroll({ el: this.el, smooth: true From 718feed2c7a4e415cd0baee59187c09797a2f1bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:23:55 -0500 Subject: [PATCH 5/7] Update build/concat.js Co-authored-by: Chauncey McAskill --- build/concat.js | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/build/concat.js b/build/concat.js index c911278..6824577 100644 --- a/build/concat.js +++ b/build/concat.js @@ -9,18 +9,14 @@ export function concatVendors() { // Get all files in scripts/vendors/ const files = fs.readdirSync(paths.scripts.vendors.src); - // Extract no-JS files - var jsFiles = files.filter((f)=>{ - if(f.includes('.js')) { - return true; - } else { - return false; - } + // Exclude files that are not JavaScript + var jsFiles = files.filter((file) => { + return file.includes('.js'); }); - // Add absolute path - jsFiles = jsFiles.map((f) => { - return `${paths.scripts.vendors.src + f}`; + // Prepend absolute path + jsFiles = jsFiles.map((file) => { + return `${paths.scripts.vendors.src + file}`; }); From 5f20fe0e43e87269e78f6870a3cf036446fc3ae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:24:04 -0500 Subject: [PATCH 6/7] Update build/svgs.js Co-authored-by: Chauncey McAskill --- build/svgs.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/build/svgs.js b/build/svgs.js index 6732182..b67d20a 100644 --- a/build/svgs.js +++ b/build/svgs.js @@ -7,10 +7,14 @@ export function generateSpriteSVG() { console.time('Sprite generated in'); // Write sprite content on disk - mixer([paths.svgs.src + '*.svg'], {spriteConfig: { usages: false }}) - .then((result) => { + mixer([ + paths.svgs.src + '*.svg' + ], { + spriteConfig: { + usages: false + } + }).then((result) => { result.write(paths.svgs.dest + 'sprite.svg'); message('SVG Sprite generated', 'success', 'Sprite generated in'); - }); } From bddbaaed1ca760bbaf6e0e7034bad818c4359dce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Quentin=20Hocd=C3=A9?= Date: Fri, 5 Mar 2021 09:24:18 -0500 Subject: [PATCH 7/7] Update build/utils/message.js Co-authored-by: Chauncey McAskill --- build/utils/message.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/build/utils/message.js b/build/utils/message.js index ef35bd7..ce41cd9 100644 --- a/build/utils/message.js +++ b/build/utils/message.js @@ -2,19 +2,16 @@ import kleur from 'kleur'; export default function message(text, type, timerId) { - - if(type === 'success') { + if (type === 'success') { console.log(kleur.bgGreen().black(`${text} ✅`)); - if(timerId !== undefined) { + if (timerId !== undefined) { console.timeEnd(timerId) } } else if (type === 'error') { console.log(kleur.red().underline(`${text} ❌`)); - } else if (type === 'waiting') { - - console.log(kleur.blue().italic(`${text} ⏱ `)); + console.log(kleur.blue().italic(`${text} ⏱`)); } else { console.log(text); }