Merge pull request #95 from ameyrupji-com/release/v1-7-1

v1.7.1

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 

src/js/footer.js

@@ -4,17 +4,26 @@ site.footer = (function ($) {
   var Model = {
   },
   View = {
-    feedbackLink: '#feedback-link'
+    feedbackLink: '#feedback-link',
+    oldVersionLinks: '.old-version-links'
   },
   Controller = {
     initializeFeedbackLink: function initializeFeedbackLink() {
         $(View.feedbackLink).on('click', 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()
     }
   }
 

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",

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",

src/view/partials/footer.hbs

@@ -29,44 +29,53 @@
                     <li class="list-heading">Share <span class="list-heading-strong">website</span></li>
                     {{#each footer.share-links}}
                     <li>
-                        <a class="btn btn-link sharer" href="#" id="{{this.id}}" data-sharer="{{this.data-sharer}}" data-title="{{this.data-title}}" data-url="{{app.app_url}}">
-                        <i class="{{this.icon-class}}"></i>
-                        {{this.text}}
+                        <a class="btn btn-link sharer" href="#" id="{{this.id}}" data-sharer="{{this.data-sharer}}"
+                            data-title="{{this.data-title}}" data-url="{{app.app_url}}">
+                            <i class="{{this.icon-class}}"></i>
+                            {{this.text}}
                     </li>
                     {{/each}}
                 </ul>
             </div>
             <div class="col-md-6 col-lg-3 col-xl-3 col-6">
                 <ul class="footer-no-icons-list">
                     <li class="list-heading">Website <span class="list-heading-strong">License</span></li>
-                    <li>The code of this website is Open Sourced. This website is protected under GNU General Public License.</li>
+                    <li>The code of this website is Open Sourced. This website is protected under GNU General Public
+                        License.</li>
                     <li>&nbsp;</li>
-                    </li><a href="{{app.license-link.href}}" id="{{app.license-link.id}}">{{app.license-link.text}} <span id="{{app.license-link.id}}-span"></span></a></li>
+                    </li><a href="{{app.license-link.href}}" id="{{app.license-link.id}}">{{app.license-link.text}}
+                        <span id="{{app.license-link.id}}-span"></span></a></li>
                 </ul>
             </div>
         </div>
-        <hr/>
+        <hr />
         <div class="row">
             <div class="col-md-12 col-lg-12 col-xl-12 col-12">
                 <ul class="footer-no-icons-flat-list">
                     {{#each app.policy_links}}
-                    <li><a href="{{this.href}}" id="{{this.id}}">{{this.text}} <span id="{{this.id}}-span"></span></a></li>
+                    <li><a href="{{this.href}}" id="{{this.id}}">{{this.text}} <span id="{{this.id}}-span"></span></a>
+                    </li>
                     {{/each}}
 
                     {{#if app.old-versions.length}}
                     <div class="btn-group dropup" id="versions">
-                        <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            <span>Version: {{app.active-version}}</span>
+                        <button type="button" class="btn btn-link dropdown-toggle" data-toggle="dropdown"
+                            aria-haspopup="true" aria-expanded="false">
+                            <span><i class="fas fa-info-circle" data-toggle="tooltip" data-placement="top"
+                                    title="Version selection will only work form the latest version. Please come back here to select and view different old version of this site."></i>
+                                Version: {{app.active-version}}</span>
                         </button>
                         <div class="dropdown-menu" x-placement="top-start">
                             <h6 class="dropdown-header">Older Versions:</h6>
                             {{#each app.old-versions}}
-                            <a class="dropdown-item" href="{{app.app_url}}/{{this.href}}">{{this.text}}</a>
+                            <a class="dropdown-item old-version-links"
+                                href="{{app.app_url}}/{{this.href}}">{{this.text}}</a>
                             {{/each}}
                         </div>
                     </div>
                     {{else}}
-                        <li><a href="#image-back-main" id="{{this.id}}">Version: {{app.active-version}} <span id="{{this.id}}-span"></span></a></li>
+                    <li><a href="#image-back-main" id="{{this.id}}">Version: {{app.active-version}} <span
+                                id="{{this.id}}-span"></span></a></li>
                     {{/if}}
                 </ul>
             </div>