ama_layout 9.5.2 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 84220110a5b888a5c01c1a83169a43f57ad7be13
-  data.tar.gz: 699a5bce414a34cd877026e0a27d51307495ec3e
+SHA256:
+  metadata.gz: 2380a06aed2f7aa03a93d129962439dcb40e36dbd29870b356b4308b8ef8d1df
+  data.tar.gz: 181133840c55714b18ed396c428e88b093cb297b394513e66023a8aab0e5553b
 SHA512:
-  metadata.gz: b139b2cace77d4c676ed42f229179bcf5f3987aa6ba37a19338dc52d2f0fee13a695560539063c9cda202f5a1a6a7b34834cb7c4876715b0d8d94ad7923c3139
-  data.tar.gz: 0c334f4e6218016621ee0310f531323e42516b98e6addac9868939c71584ac02f6190f606f96090e41168304e9622fc48a3b07a9805fac98e99e9ea3070c8661
+  metadata.gz: 98282959ce339f20eacebc6a175b811ffa992e08f5ebdcd64dbd680c9abc43a11f006b56eda955fcc93aa0ebedcc253f9132fe0f39c3f4869b21713d4031b93a
+  data.tar.gz: c29d771ba792377d347f70b2aad220be5860f0ab7c6d278698e1fb4142137e2f2786c777bdeb2c7b5ae51d8d3278916de04acb76cdf2f0b1ce0b069347533859

data/.github/workflows/ci.yml

@@ -0,0 +1,45 @@
+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 2.5
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '2.5.1'
+        bundler: '1.17.3'
+    - name: Install Bundler
+      run: gem install bundler -v '~> 1.17.3'
+    - 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 _1.17.3_ --version
+        bundle _1.17.3_ config set path 'vendor/bundle'
+        bundle _1.17.3_ install --jobs 4 --retry 3
+    - name: Run Tests
+      run: bundle _1.17.3_ exec rake

data/.ruby-version

@@ -0,0 +1 @@
+2.5.5

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/ama_layout.gemspec

@@ -1,35 +1,50 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ama_layout/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'ama_layout'
-  spec.version       = AmaLayout::VERSION
-  spec.authors       = ['Michael van den Beuken', 'Ruben Estevez', 'Jordan Babe', 'Mathieu Gilbert', 'Ryan Jones', 'Darko Dosenovic', 'Jonathan Weyermann', 'Adam Melnyk', 'Kayt Campbell', 'Kathleen Robertson', 'Jesse Doyle']
-  spec.email         = ['michael.beuken@gmail.com', 'ruben.a.estevez@gmail.com', 'jorbabe@gmail.com', 'mathieu.gilbert@ama.ab.ca', 'ryan.michael.jones@gmail.com', 'darko.dosenovic@ama.ab.ca', 'jonathan.weyermann@ama.ab.ca', 'adam.melnyk@ama.ab.ca', 'kayt.campbell@ama.ab.ca', 'kathleen.robertson@ama.ab.ca', 'jesse.doyle@ama.ab.ca']
-  spec.summary       = %q{.ama.ab.ca site layouts}
-  spec.description   = %q{.ama.ab.ca site layouts}
-  spec.homepage      = 'https://github.com/amaabca/ama_layout'
-  spec.license       = 'MIT'
+  spec.name = 'ama_layout'
+  spec.version = AmaLayout::VERSION
+  spec.authors = [
+    'Darko Dosenovic',
+    'Jesse Doyle',
+    'Kayt Wilson',
+    'Michael van den Beuken',
+    'Sinead Errity',
+    'Zoie Carnegie'
+  ]
+  spec.email = [
+    'darko.dosenovic@ama.ab.ca',
+    'jesse.doyle@ama.ab.ca',
+    'kayt.wilson@ama.ab.ca',
+    'michael.beuken@gmail.com',
+    'sinead.errity@ama.ab.ca',
+    'zoie.carnegie@ama.ab.ca'
+  ]
+  spec.summary = '.ama.ab.ca site layouts'
+  spec.description = '.ama.ab.ca site layouts'
+  spec.homepage = 'https://github.com/amaabca/ama_layout'
+  spec.license = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
+  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 'browser', '~> 2.0'
-  spec.add_dependency 'breadcrumbs_on_rails', '>= 3'
   spec.add_dependency 'redis-rails'
-  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'bundler'
+  spec.add_development_dependency 'combustion'
+  spec.add_development_dependency 'factory_bot'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake', '>= 11.0'
   spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'factory_bot'
   spec.add_development_dependency 'simplecov'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'combustion'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'timecop'
 end

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/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/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/_member_links.html.erb

@@ -0,0 +1,6 @@
+<li class="small-text">
+  <%= link_to 'Update Address', "#{Rails.configuration.youraccount_site}/membership_update/new" %>
+</li>
+<li class="small-text">
+  <%= link_to 'Manage Credit Cards', "#{Rails.configuration.gatekeeper_site}/members/credit_cards" %>
+</li>

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/{_sign_out_link.html.erb → v2/_sign_out_link.html.erb}

@@ -1,3 +1,3 @@
-<li class="side-nav__item">
+<li>
   <a class="side-nav__link" href="/logout">Sign Out</a>
 </li>

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

@@ -0,0 +1,16 @@
+<li class="has-submenu">
+  <%= link_to navigation.display_name_text, '#', class: 'link--no-underline' %>
+  <ul class="submenu menu vertical">
+    <li class="bold">
+      <%= link_to 'Account Settings', "#{Rails.configuration.gatekeeper_site}/account_settings" %>
+    </li>
+    <li class="small-text">
+      <%= link_to 'Change Email/Password', "#{Rails.configuration.gatekeeper_site}/user/edit" %>
+    </li>
+    <li class="small-text">
+      <%= link_to 'Email Subscriptions', "#{Rails.configuration.youraccount_site}/subscriptions" %>
+    </li>
+    <%= navigation.member_links %>
+    <%= navigation.sign_out_link %>
+  </ul>
+</li>

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/_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", "https://ama.ab.ca/about-ama/", 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", "https://ama.ab.ca/about-ama/contact-us/", 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" %>
+        </li>
+        <li class="link-list__item">
+          <%= link_to "Social Media", "https://ama.ab.ca/about-ama/social-media/", 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", "https://ama.ab.ca/blog/", 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" %>
+        </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" %>
+        </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", "https://ama.ab.ca/about-ama/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" %>
+        </li>
+      </ul>
+    </div>
+  </div>
+  <div class="racetrack"></div>
+</footer>