ama_layout 10.2.0 → 11.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73978f07a8d61a3fba94acf5992e67550c0f2cf5de1cc631c8c77a683c57073d
-  data.tar.gz: e3a091b1fe12892692030978d6177b82b2f97e7b9d74dd194d6ef16bf4393dd8
+  metadata.gz: bdce42e1e72479fb3eaf186229427db6769f7b589851cb6e9b4ba3300242a919
+  data.tar.gz: 39938fcb52b8df2c49a5a6fafa59a5c6776574869a2def36f73c71471cbf890c
 SHA512:
-  metadata.gz: 72527275f72c009638c64245e007afaa0d09ba60a290e7443ef705d7c0c50ca941ef221120068d2541a822fd0247669adeb35a0e5a9b582eb63cc65473c9bef2
-  data.tar.gz: 14ad982d3feebf69f7d0c4797f26c5b10a8dc24d31076f863248adf785fab7e0d0192c86e14f5e49100243164fb28c4c9f7f609ac355397fd3dc9b77d77dfdb7
+  metadata.gz: 0ac9377df0287eec02b6b475083e6930d73d6ac711ddac7304a1a820b25a9654d9a31e66e5312c743c39d11e57fa1dd0dcb53b160272fdcf821ccc27584ea188
+  data.tar.gz: 005cf0cee9e64b64159b08f0dc6c30e21258ae2a5ecbce31493311e7bc577a95f7de4dff0f955f8dc14a3862666f791e0a23c643abb8a493db59149a70e5eef2

data/.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: CI
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        image: redis
+        ports:
+          - '6379:6379'
+        options: --entrypoint redis-server
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js 10.13.0
+      uses: actions/setup-node@v1
+      with:
+        node-version: '10.13.0'
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+    - name: Install Bundler
+      run: gem install bundler
+    - name: Install Danger
+      run: gem install danger -v 7.0.1
+    - name: Execute Danger
+      env:
+        DANGER_GITHUB_API_TOKEN: ${{ secrets.DANGER_GITHUB_API_TOKEN }}
+      run: danger
+    - name: Install sqlite3
+      run: sudo apt-get install libsqlite3-dev
+    - name: Install Ruby Dependencies
+      run: |
+        bundle --version
+        bundle config set path 'vendor/bundle'
+        bundle install --jobs 4 --retry 3
+    - name: Run Tests
+      run: bundle exec rake

data/Dangerfile

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+unless github.pr_author.include?('dependabot')
+  # Link to any relevant VSTS tickets(old or new domain) or OpsGenie alerts
+  urls = %w[
+    https://amaabca.visualstudio.com
+    https://dev.azure.com
+    https://app.opsgenie.com
+  ]
+  unless urls.any? { |url| github.pr_body.include?(url) }
+    fail 'Please provide a VSTS, ADO link or OPSGENIE link in the Pull Request description 💩'
+  end
+
+  # Do not let 'binding.pry' get into master by accident
+  fail 'A binding.pry was committed 💩' if system 'grep -r binding.pry . --exclude=Dangerfile --exclude-dir=vendor'
+
+  # Do not let 'debugger' get into master by accident
+  fail 'A debugger was committed 💩' if system 'grep -r debugger . --exclude=Dangerfile --exclude-dir=vendor'
+end

data/README.md

@@ -98,9 +98,9 @@ Custom Navigation yaml file used to set all navigation:
       "Renew":
         link: "<%= Rails.configuration.youraccount_site %>/renew"
       "Help":
-        link: "<%= Rails.configuration.youraccount_site %>/help"
+        link: "<%= Rails.configuration.amaabca_site %>/help"
       "Contact Us":
-        link: "<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information"
+        link: "<%= Rails.configuration.amaabca_site %>/contact"
         target: "_blank"
 
 

data/ama_layout.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
   spec.add_dependency 'browser', '~> 2.0'
   spec.add_dependency 'foundation-rails', '<= 6.4.3.0'
-  spec.add_dependency 'rails', '>= 4.2'
+  spec.add_dependency 'rails', '>= 4.2', '< 6.1'
   spec.add_dependency 'redis-rails'
-  spec.add_development_dependency 'bundler', '~> 1.17.3'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'combustion'
   spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'pry'

data/app/assets/javascripts/ama_layout/desktop/foundation-custom.js

@@ -8,6 +8,7 @@
 //= require foundation.util.timer.js
 //= require foundation.util.triggers.js
 //= require foundation.abide.js
+//= require foundation.accordionMenu.js
 //= require foundation.accordion.js
 //= require foundation.drilldown.js
 //= require foundation.dropdown.js

data/app/assets/javascripts/ama_layout/mailcheck/email_suggestion.coffee

@@ -49,6 +49,7 @@ class AMALayout.EmailSuggestion
 
   setupEvents: ->
     $('[type="email"]').on 'blur', (e) =>
+      return if $(e.originalEvent.target).data('skip-email-suggestion')
       $(e.originalEvent.target).mailcheck
         domains: @domains
         secondLevelDomains: @secondLevelDomains

data/app/helpers/ama_layout_breadcrumb_helper.rb

@@ -1,5 +1,11 @@
+# frozen_string_literal: true
+
+require_relative 'ama_layout_partial_helper'
+
 module AmaLayoutBreadcrumbHelper
+  include AmaLayoutPartialHelper
+
   def show_breadcrumbs
-    render partial: 'ama_layout/breadcrumbs'
+    render partial: ama_layout_partial('breadcrumbs')
   end
 end

data/app/helpers/ama_layout_content_helper.rb

@@ -1,10 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'ama_layout_partial_helper'
+
 module AmaLayoutContentHelper
+  include AmaLayoutPartialHelper
+
   def greeting
-    cookies["logged_in_meta"]
+    cookies['logged_in_meta']
   end
 
   def utm_source
-    Rails.configuration.site_name.downcase.gsub(/\W/, "")
+    Rails.configuration.site_name.downcase.gsub(/\W/, '')
   end
 
   def active_section(nav_item)
@@ -14,47 +20,52 @@ module AmaLayoutContentHelper
   end
 
   def active_page(*path)
-    "activepage" if path.include?(request.fullpath) || path.include?(request.url)
+    'activepage' if path.include?(request.fullpath) || path.include?(request.url)
   end
 
   def active_domain(domain)
-    "active" if request.url.include?(domain)
+    'active' if request.url.include?(domain)
   end
 
   def renew_or_join_path(logged_in)
-    return "" if logged_in
-    link_to("Become a Member", "http://www.ama.ab.ca/membership/join-ama-online", target: "_blank")
+    return '' if logged_in
+
+    link_to('Become a Member', 'http://www.ama.ab.ca/membership/join-ama-online', target: '_blank')
   end
 
   def gift_or_pricing_path(logged_in)
-    return "" if logged_in
-    link_to("Gift Membership", "http://www.ama.ab.ca/membership-rewards/ama-gift-membership", target: "_blank")
+    return '' if logged_in
+
+    link_to('Gift Membership', 'http://www.ama.ab.ca/membership-rewards/ama-gift-membership', target: '_blank')
   end
 
   def dropdown_menu(logged_in, greeting)
-    return "" unless logged_in
-    render partial: "ama_layout/dropdown_menu", locals: { logged_in: logged_in, greeting: greeting }
+    return '' unless logged_in
+
+    render partial: ama_layout_partial('dropdown_menu'), locals: { logged_in: logged_in, greeting: greeting }
   end
 
   def tablet_menu(logged_in, greeting)
-    return "" unless logged_in
-    render partial: "ama_layout/tablet_menu", locals: { logged_in: logged_in, greeting: greeting }
+    return '' unless logged_in
+
+    render partial: ama_layout_partial('tablet_menu'), locals: { logged_in: logged_in, greeting: greeting }
   end
 
   def tablet_signout(logged_in)
-    return "" unless logged_in
-    render "ama_layout/tablet_signout"
+    return '' unless logged_in
+
+    render ama_layout_partial('tablet_signout')
   end
 
   def notice(notice)
-    render partial: "ama_layout/notice", locals: { message: notice } if notice
+    render partial: ama_layout_partial('notice'), locals: { message: notice } if notice
   end
 
   def alert(alert)
-    render partial: "ama_layout/alert", locals: { message: alert } if alert
+    render partial: ama_layout_partial('alert'), locals: { message: alert } if alert
   end
 
   def success_message(success)
-    render partial: "ama_layout/success", locals: { message: success } if success
+    render partial: ama_layout_partial('success'), locals: { message: success } if success
   end
 end

data/app/helpers/ama_layout_partial_helper.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module AmaLayoutPartialHelper
+  def ama_layout_partial(partial)
+    "ama_layout/#{ama_layout_partial_version}/#{partial}"
+  end
+
+  def ama_layout_partial_version
+    @ama_layout_partial_version ||= Rails.configuration.stylesheet_resolver.version
+  end
+end

data/app/views/ama_layout/agent/_siteheader.html.erb

@@ -10,7 +10,7 @@
     <div class="top-bar-right">
       <ul class="menu" data-responsive-menu="drilldown medium-dropdown">
         <li>
-          <a href="<%= Rails.configuration.amaabca_site %>/knowledge-base/articles" target="_blank">Help</a>
+          <a href="<%= Rails.configuration.amaabca_site %>/help" target="_blank">Help</a>
         </li>
         <%= navigation.top_nav %>
       </ul>

data/app/views/ama_layout/v2/_font.html.erb

@@ -0,0 +1 @@
+<link href="//fonts.googleapis.com/css?family=Open+Sans:400italic,400,700" rel="stylesheet" type="text/css">

data/app/views/ama_layout/v2/_font_awesome_pro_kit.html.erb

@@ -0,0 +1,3 @@
+<!-- Font Awesome Pro Kit -->
+<script src="https://kit.fontawesome.com/9e8388a4d5.js" crossorigin="anonymous"></script>
+<!-- End Font Awesome Pro Kit -->

data/app/views/ama_layout/{_footer.html.erb → v2/_footer.html.erb}

@@ -6,7 +6,7 @@
       </div>
       <ul class="link-list">
         <li class="link-list__item">
-          <%= link_to "About AMA", "https://ama.ab.ca/about-ama/", class: "link-list__link--white" %>
+          <%= link_to "About AMA", "#{Rails.configuration.amaabca_site}/about", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
           <%= link_to "Careers", "http://careers.ama.ab.ca/", class: "link-list__link--white" %>
@@ -22,13 +22,13 @@
       </div>
       <ul class="link-list">
         <li class="link-list__item">
-          <%= link_to "Contact Us", "https://ama.ab.ca/about-ama/contact-us/", class: "link-list__link--white" %>
+          <%= link_to "Contact Us", "#{Rails.configuration.amaabca_site}/contact", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
-          <%= link_to "Locations", "https://ama.ab.ca/centre-locations-hours/", class: "link-list__link--white" %>
+          <%= link_to "Locations", "#{Rails.configuration.amaabca_site}/centres", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
-          <%= link_to "Social Media", "https://ama.ab.ca/about-ama/social-media/", class: "link-list__link--white" %>
+          <%= link_to "Social Media", "#{Rails.configuration.amaabca_site}/contact", class: "link-list__link--white" %>
         </li>
       </ul>
     </div>
@@ -38,16 +38,16 @@
       </div>
       <ul class="link-list">
         <li class="link-list__item">
-          <%= link_to "Blog", "https://ama.ab.ca/blog/", class: "link-list__link--white" %>
+          <%= link_to "Blog", "#{Rails.configuration.amaabca_site}/help", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
-          <%= link_to "Knowledge Base", "https://ama.ab.ca/knowledge-base/", class: "link-list__link--white" %>
+          <%= link_to "Knowledge Base", "#{Rails.configuration.amaabca_site}/help", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
           <%= link_to "Email Newsletters", "https://youraccount.ama.ab.ca/subscriptions", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
-          <%= link_to "Site Map", "https://ama.ab.ca/about-ama/site-map/", class: "link-list__link--white" %>
+          <%= link_to "Site Map", "#{Rails.configuration.amaabca_site}/sitemap", class: "link-list__link--white" %>
         </li>
       </ul>
     </div>
@@ -57,10 +57,10 @@
       </div>
       <ul class="link-list">
         <li class="link-list__item">
-          <%= link_to "Privacy Policy", "https://ama.ab.ca/about-ama/privacy-policy/", class: "link-list__link--white" %>
+          <%= link_to "Privacy Policy", "#{Rails.configuration.amaabca_site}/privacy-policy", class: "link-list__link--white" %>
         </li>
         <li class="link-list__item">
-          <%= link_to "Terms & Conditions", "https://ama.ab.ca/about-ama/terms-conditions/", class: "link-list__link--white" %>
+          <%= link_to "Terms & Conditions", "#{Rails.configuration.amaabca_site}/terms-conditions", class: "link-list__link--white" %>
         </li>
       </ul>
     </div>

data/app/views/ama_layout/{_mobile_links.html.erb → v2/_mobile_links.html.erb}

@@ -12,10 +12,10 @@
         <a class="side-nav__link" href="http://amaroadreports.ca/">AMA Road Reports</a>
       </li>
       <li class="side-nav__item">
-        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>/knowledge-base/articles" target="_blank">Help</a>
+        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>/help" target="_blank">Help</a>
       </li>
       <li class="side-nav__item">
-        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
+        <a class="side-nav__link" href="<%= Rails.configuration.amaabca_site %>/contact">Contact Us</a>
       </li>
     </ul>
   </div>

data/app/views/ama_layout/{_notification_sidebar.html.erb → v2/_notification_sidebar.html.erb}

@@ -8,7 +8,7 @@
   <div class="row column">
     <%= navigation.notifications_heading %>
   </div>
-  <%= render partial: 'ama_layout/notification', collection: notifications %>
+  <%= render partial: ama_layout_partial('notification'), collection: notifications %>
   <div class="row column">
     <p class="mt1">Did You Know?</p>
     <div class="section-content">

data/app/views/ama_layout/{_siteheader.html.erb → v2/_siteheader.html.erb}

@@ -12,10 +12,10 @@
       <ul class="menu" data-responsive-menu="drilldown medium-dropdown">
         <%= navigation.notification_icon %>
         <li>
-          <a href="<%= Rails.configuration.amaabca_site %>/knowledge-base/articles" target="_blank">Help</a>
+          <a href="<%= Rails.configuration.amaabca_site %>/help" target="_blank">Help</a>
         </li>
         <li>
-          <a href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
+          <a href="<%= Rails.configuration.amaabca_site %>/contact">Contact Us</a>
         </li>
         <%= navigation.account_toggle(self) %>
         <%= navigation.top_nav %>

data/app/views/ama_layout/v3/_alert.html.erb

@@ -0,0 +1,5 @@
+<div class="row">
+  <div class="large-12">
+    <div class="error_notification"><span><%= message.html_safe %></span></div>
+  </div>
+</div>

data/app/views/ama_layout/v3/_applogo.html.erb

@@ -0,0 +1,3 @@
+<section class="grid-12">
+  <h2><%= link_to(Rails.configuration.site_name, root_path(utm_campaign: "logged-in-#{logged_in.present?}", utm_source: utm_source, utm_medium: "link")) %></h2>
+</section>

data/app/views/ama_layout/v3/_breadcrumbs.html.erb

@@ -0,0 +1,3 @@
+<ul class="breadcrumbs row column">
+  <%= render_breadcrumbs builder: AmaLayout::BreadcrumbBuilder %>
+</ul>

data/app/views/ama_layout/v3/_custom_sidebar.html.erb

@@ -0,0 +1 @@
+<%= navigation.sidebar %>

data/app/views/ama_layout/v3/_font.html.erb

@@ -0,0 +1,2 @@
+<link href="//fonts.googleapis.com/css?family=Open+Sans:400italic,400,700" rel="stylesheet" type="text/css">
+<link href="//fonts.googleapis.com/css2?family=Lato:wght@400;900&display=swap" rel="stylesheet" type="text/css">

data/app/views/ama_layout/v3/_font_awesome_pro_kit.html.erb

@@ -0,0 +1,3 @@
+<!-- Font Awesome Pro Kit -->
+<script src="https://kit.fontawesome.com/9e8388a4d5.js" crossorigin="anonymous"></script>
+<!-- End Font Awesome Pro Kit -->

data/app/views/ama_layout/v3/_footer.html.erb

@@ -0,0 +1,69 @@
+<footer class="page-footer">
+  <div class="page-footer__container">
+    <div class="page-footer__col">
+      <div class="page-footer__col-header">
+        About Us
+      </div>
+      <ul class="link-list">
+        <li class="link-list__item">
+          <%= link_to "About AMA", "#{Rails.configuration.amaabca_site}/about", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Careers", "http://careers.ama.ab.ca/", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Media Inquiries", "http://news.ama.ab.ca/", class: "link-list__link--white" %>
+        </li>
+      </ul>
+    </div>
+    <div class="page-footer__col">
+      <div class="page-footer__col-header">
+        Get in Touch
+      </div>
+      <ul class="link-list">
+        <li class="link-list__item">
+          <%= link_to "Contact Us", "#{Rails.configuration.amaabca_site}/contact", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Locations", "#{Rails.configuration.amaabca_site}/centres", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Social Media", "#{Rails.configuration.amaabca_site}/contact", class: "link-list__link--white" %>
+        </li>
+      </ul>
+    </div>
+    <div class="page-footer__col">
+      <div class="page-footer__col-header">
+        Quick Links
+      </div>
+      <ul class="link-list">
+        <li class="link-list__item">
+          <%= link_to "Blog", "#{Rails.configuration.amaabca_site}/help", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Knowledge Base", "#{Rails.configuration.amaabca_site}/help", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Email Newsletters", "https://youraccount.ama.ab.ca/subscriptions", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Site Map", "#{Rails.configuration.amaabca_site}/sitemap/", class: "link-list__link--white" %>
+        </li>
+      </ul>
+    </div>
+    <div class="page-footer__col">
+      <div class="page-footer__col-header">
+        Interesting Fine Print
+      </div>
+      <ul class="link-list">
+        <li class="link-list__item">
+          <%= link_to "Privacy Policy", "#{Rails.configuration.amaabca_site}/privacy-policy", class: "link-list__link--white" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Terms & Conditions", "#{Rails.configuration.amaabca_site}/terms-conditions", class: "link-list__link--white" %>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="racetrack"></div>
+</footer>