From 350615dfc080b4f9008bd0487a85fead6356d1c2 Mon Sep 17 00:00:00 2001 From: Amey Rupji Date: Sun, 8 Nov 2020 14:06:54 -0600 Subject: [PATCH 1/3] Initial commit to fix version links for secure website! --- scripts/README.md | 17 +++++++++++++++++ src/js/footer.js | 11 ++++++++++- src/package-lock.json | 6 +++--- src/view/partials/footer.hbs | 31 ++++++++++++++++++++----------- 4 files changed, 50 insertions(+), 15 deletions(-) create mode 100644 scripts/README.md diff --git a/scripts/README.md b/scripts/README.md new file mode 100644 index 0000000..5b70031 --- /dev/null +++ b/scripts/README.md @@ -0,0 +1,17 @@ +# Commands to be run to create the favicons for this website + + +## Both Environments: +``` +./icons.sh -i ../src/images/icon-styleguide-white.png.png -o ../src/images/icons +``` + +## Copy and rename Prod +``` +cp ../src/images/icons/favicon-64x64.png ../src/favicon.ico +``` + + +## Reference Links: +- https://realfavicongenerator.net/api/#.XM4ABC-ZPUJ +- https://www.npmjs.com/package/icon-gen \ No newline at end of file diff --git a/src/js/footer.js b/src/js/footer.js index 73026b3..d909c81 100644 --- a/src/js/footer.js +++ b/src/js/footer.js @@ -4,7 +4,8 @@ site.footer = (function ($) { var Model = { }, View = { - feedbackLink: '#feedback-link' + feedbackLink: '#feedback-link', + oldVersionLinks: '.old-version-links' }, Controller = { initializeFeedbackLink: function initializeFeedbackLink() { @@ -12,9 +13,17 @@ site.footer = (function ($) { site.contact.changeReason('feedback') }) }, + updateVersionLink: function initializeFeedbackLink() { + $(View.oldVersionLinks).each(function () { + var oldUrl = $(this).attr("href"); + var newUrl = oldUrl + "/index.html"; + $(this).attr("href", newUrl); + }); + }, init: function init() { console.log('In footer:init()') Controller.initializeFeedbackLink() + Controller.updateVersionLink() } } diff --git a/src/package-lock.json b/src/package-lock.json index 83ebe45..1f9e177 100644 --- a/src/package-lock.json +++ b/src/package-lock.json @@ -4474,9 +4474,9 @@ } }, "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==" + "version": "4.17.20", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "lodash._reinterpolate": { "version": "3.0.0", diff --git a/src/view/partials/footer.hbs b/src/view/partials/footer.hbs index 27bcf72..e2d5c68 100644 --- a/src/view/partials/footer.hbs +++ b/src/view/partials/footer.hbs @@ -29,9 +29,10 @@
  • Share website
    • {{#each footer.share-links}}
  • - - - {{this.text}} + + + {{this.text}}
    • {{/each}} @@ -39,34 +40,42 @@
    -
    +
    From 6cd51af55968649d254c85b0762c82dd1a523151 Mon Sep 17 00:00:00 2001 From: Amey Rupji Date: Sun, 8 Nov 2020 14:16:29 -0600 Subject: [PATCH 2/3] Updating version to v1.7.1 - Beta --- src/view/data/beta/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/view/data/beta/app.json b/src/view/data/beta/app.json index 0ae02ec..4e124a4 100644 --- a/src/view/data/beta/app.json +++ b/src/view/data/beta/app.json @@ -1,11 +1,15 @@ { "app_name": "Amey Rupji - Beta", "app_url": "http://beta.ameyrupji.com/", - "active-version": "v1.7.0 - Beta", + "active-version": "v1.7.1 - Beta", "old-versions": [ { "text": "v1.6.0", "href": "feature/v1-6-0" + }, + { + "text": "v1.7.0", + "href": "feature/v1-7-0" } ], "icons_folder": "beta-icons", From 5102919f2c2d12673ad855eae0768cc0e254a35b Mon Sep 17 00:00:00 2001 From: Amey Rupji Date: Sun, 8 Nov 2020 14:24:51 -0600 Subject: [PATCH 3/3] Updating version to v1.7.1 --- src/view/data/prod/app.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/view/data/prod/app.json b/src/view/data/prod/app.json index ef21ea6..b989705 100644 --- a/src/view/data/prod/app.json +++ b/src/view/data/prod/app.json @@ -1,7 +1,7 @@ { "app_name": "Amey Rupji", "app_url": "http://ameyrupji.com/", - "active-version": "v1.7.0", + "active-version": "v1.7.1", "old-versions": [ { "text": "v1.2.0", @@ -22,6 +22,10 @@ { "text": "v1.6.0", "href": "release/v1-6-0" + }, + { + "text": "v1.7.0", + "href": "release/v1-7-0" } ], "icons_folder": "icons",