ama_layout 6.3.0.pre → 6.10.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: deb2b6ac040de520ac3ff4d6e203bf19c1e25f65
-  data.tar.gz: f1ea2726a83942149deff0ba04478c4b443bfccd
+  metadata.gz: d916fc4391d6da9e16396a302ffd07345566779b
+  data.tar.gz: 85c756a461a179396cd619ba12a38e1b53b998e6
 SHA512:
-  metadata.gz: 9dc341790258bed5cebf3da1f889adab7b2a0fecfd851e412535cd3fff12a9e8d5fb00147352c1f19d66d7d7a78cfacec8fd321a21abbb699bce713125e28def
-  data.tar.gz: 7f0ea969256317b13dc1321f3a45303e38454143d530c4ae92fa66bf4cf431f4777c2083d7ac286200399253a6ac156473a5d9f8f4e1f3698d4774de3b5ac66f
+  metadata.gz: 722d5c576646f4d9e1959e2c647446d271a64c34b34e11e3999b4694a14a69f81512287123f25ca2f894cad93ce96afd4eec6382981f4e73775e543f0da32996
+  data.tar.gz: 67e035cda98f69a883ecbdbc2f4229d3d750b4fa2a4f7e82c0bc8e52b0c72c28b5bbd558c013b69fa1172ef1740bfc51bdcb73cc1ad7ceec6d84247ca3cea23d

data/.travis.yml

@@ -2,3 +2,5 @@ language: ruby
 rvm:
   - 2.2.2
 sudo: false
+services:
+  - redis-server

data/ama_layout.gemspec

@@ -4,31 +4,33 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ama_layout/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "ama_layout"
+  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.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      = ""
-  spec.license       = "MIT"
+  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.require_paths = ["lib"]
-  spec.add_dependency "foundation-rails", "~> 6.3.1.0"
-  spec.add_dependency "rails", ">= 5.0"
-  spec.add_dependency "activemodel-serializers-xml"
-  spec.add_dependency "draper", "3.0.0.pre1"
-  spec.add_dependency "browser", "~> 2.0"
-  spec.add_dependency "breadcrumbs_on_rails", "~> 3.0.1"
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 11.0"
-  spec.add_development_dependency "rspec-rails"
-  spec.add_development_dependency "factory_girl"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "combustion"
-  spec.add_development_dependency "sqlite3"
+  spec.require_paths = ['lib']
+  spec.add_dependency 'foundation-rails', '>= 6.4.1.2'
+  spec.add_dependency 'rails', '>= 5.0'
+  spec.add_dependency 'activemodel-serializers-xml'
+  spec.add_dependency 'draper', '>= 3.0.0'
+  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 'rake', '>= 11.0'
+  spec.add_development_dependency 'rspec-rails'
+  spec.add_development_dependency 'factory_girl'
+  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

@@ -1,10 +1,20 @@
 //= require foundation.core.js
+//= require foundation.util.box.js
+//= require foundation.util.imageLoader.js
+//= require foundation.util.keyboard.js
+//= require foundation.util.mediaQuery.js
+//= require foundation.util.motion.js
+//= require foundation.util.nest.js
+//= require foundation.util.timer.js
+//= require foundation.util.timerAndImageLoader.js
+//= require foundation.util.triggers.js
 //= require foundation.abide.js
 //= require foundation.accordion.js
 //= require foundation.drilldown.js
 //= require foundation.dropdown.js
 //= require foundation.dropdownMenu.js
 //= require foundation.equalizer.js
+//= require foundation.interchange.js
 //= require foundation.offcanvas.js
 //= require foundation.responsiveMenu.js
 //= require foundation.responsiveToggle.js
@@ -12,11 +22,3 @@
 //= require foundation.tabs.js
 //= require foundation.toggler.js
 //= require foundation.tooltip.js
-//= require foundation.util.box.js
-//= require foundation.util.keyboard.js
-//= require foundation.util.mediaQuery.js
-//= require foundation.util.motion.js
-//= require foundation.util.nest.js
-//= require foundation.util.timerAndImageLoader.js
-//= require foundation.util.triggers.js
-//= require foundation.interchange.js

data/app/assets/javascripts/ama_layout/desktop/index.js

@@ -5,3 +5,4 @@
 //= require ./cookie.ready
 //= require ../mailcheck/index
 //= require ../real_date_picker
+//= require ../notifications

data/app/assets/javascripts/ama_layout/notifications.coffee

@@ -0,0 +1,17 @@
+class AMALayout.Notifications
+  constructor: () ->
+    $(document).on 'click', '[data-notifications-toggle]', (event) =>
+      event.preventDefault();
+      badge = event.currentTarget
+      if $(badge).find('[data-notification-count]').remove().size()
+        @request()
+
+  request: () ->
+    $.ajax(
+      type: 'DELETE',
+      url: '/ama_layout/api/v1/notifications',
+      timeout: 10000
+    )
+
+$(document).ready ->
+  window.AMALayout.notifications = new AMALayout.Notifications()

data/app/controllers/ama_layout/api/v1/notifications_controller.rb

@@ -0,0 +1,18 @@
+module AmaLayout
+  module Api
+    module V1
+      class NotificationsController < ApplicationController
+        before_action :require_login
+
+        # DELETE /api/v1/notifications
+        # Dismiss all user notifications
+        def dismiss_all
+          notifications = current_user.notifications
+          notifications.each(&:dismiss!)
+          notifications.save
+          head :no_content
+        end
+      end
+    end
+  end
+end

data/app/helpers/ama_layout_path_helper.rb

@@ -7,10 +7,6 @@ module AmaLayoutPathHelper
     "#{Rails.configuration.youraccount_site}/dashboard"
   end
 
-  def youraccount_help_path
-    "#{Rails.configuration.youraccount_site}/help"
-  end
-
   def youraccount_billing_path
     "#{Rails.configuration.youraccount_site}/billing"
   end
@@ -63,6 +59,10 @@ module AmaLayoutPathHelper
     "#{Rails.configuration.membership_site}/reward_cards"
   end
 
+  def membership_renew_path
+    "#{Rails.configuration.membership_site}/renews/new"
+  end
+
   def driveredonline_path
     Rails.configuration.driveredonline_site
   end

data/app/views/ama_layout/_notification.html.erb

@@ -0,0 +1,10 @@
+<div class="row <%= notification.active_class %>">
+  <div class="small-2 column">
+    <%= notification.icon %>
+  </div>
+  <div class="small-10 column">
+    <p class="bold"><%= notification.header %></p>
+    <p><%= sanitize notification.content, scrubber: AmaLayout::NotificationScrubber.new %></p>
+    <p class="micetype"><%= notification.created_at %></p>
+  </div>
+</div>

data/app/views/ama_layout/_notification_sidebar.html.erb

@@ -0,0 +1,22 @@
+<div class="off-canvas position-right right-sidebar" id="offCanvasRight" data-off-canvas>
+  <div class="row column right-sidebar__header">
+    <h2 class="mt1">Notification Centre</h2>
+    <button class="close-button" aria-label="Close menu" type="button" data-close>
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="row column">
+    <%= navigation.notifications_heading %>
+  </div>
+  <%= render partial: 'ama_layout/notification', collection: notifications %>
+  <div class="row column">
+    <p class="mt1">Did You Know?</p>
+    <div class="section-content">
+      <p class="bold">Sign up for Vehicle Registration Auto-Renew</p>
+      <p>
+        We'll process your payment and mail you a new registration certificate and licence plate sticker. It's that simple!
+      </p>
+      <%= link_to 'Sign up now', "#{Rails.configuration.registries_site}/order/registrations/new", class: 'button--right button--expand-small-down' %>
+    </div>
+  </div>
+</div>

data/app/views/ama_layout/_notifications.html.erb

@@ -0,0 +1,6 @@
+<li>
+  <a href="#" class="notification link--no-underline" data-toggle="offCanvasRight" data-notifications-toggle>
+    <i class="fa fa-2x fa-bell"></i>
+    <%= navigation.notification_badge %>
+  </a>
+</li>

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

@@ -2,6 +2,10 @@
   <div class="title-bar" data-responsive-toggle="main-menu" data-hide-for="large">
     <button class="menu-icon" type="button" data-toggle="offCanvasLeft"></button>
     <%= link_to(image_tag("ama-logo.png"), "https://www.ama.ab.ca", class: "title-bar__logo") %>
+    <a href="#" data-toggle="offCanvasRight" data-notifications-toggle>
+      <i class="fa fa-2x fa-bell notification__icon"></i>
+      <%= navigation.notification_badge %>
+    </a>
   </div>
   <div class="top-bar" id="main-menu">
     <div class="top-bar-left">
@@ -9,8 +13,9 @@
     </div>
     <div class="top-bar-right">
       <ul class="menu" data-responsive-menu="drilldown medium-dropdown">
+        <%= navigation.notifications %>
         <li>
-          <a href="<%= Rails.configuration.gatekeeper_site %>/help" target="_blank">Help</a>
+          <a href="https://albertamotorassociation.zendesk.com/hc/en-us" target="_blank">Help</a>
         </li>
         <li>
           <a href="<%= Rails.configuration.amaabca_site %>/membership/contact-us--centre-locations-hours-and-contact-information">Contact Us</a>
@@ -34,7 +39,7 @@
         <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.gatekeeper_site %>/help" target="_blank">Help</a>
+        <a class="side-nav__link" href="https://albertamotorassociation.zendesk.com/hc/en-us" 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>
@@ -43,7 +48,7 @@
     </ul>
   </div>
 </div>
-
+<%= navigation.notification_sidebar %>
 <div class="javascript_errors error_notification" hidden></div>
 <noscript>
   <div class="mt1 large-12 columns text-center error_notification">

data/config/routes.rb

@@ -0,0 +1,9 @@
+AmaLayout::Engine.routes.draw do
+  scope module: 'ama_layout' do
+    namespace :api do
+      namespace :v1 do
+        delete :notifications, to: 'notifications#dismiss_all'
+      end
+    end
+  end
+end

data/lib/ama_layout.rb

@@ -1,25 +1,32 @@
-require "ama_layout/version"
-require "rails/all"
-require "foundation-rails"
-require "draper"
-require "browser"
-require "breadcrumbs_on_rails"
-require "ama_layout/breadcrumb_builder"
-require "ama_layout/moneris"
-require "ama_layout/navigation"
-require "ama_layout/navigation_item"
-require "ama_layout/decorators/moneris_decorator"
-require "ama_layout/decorators/navigation_decorator"
-require "ama_layout/decorators/navigation_item_decorator"
-require "ama_layout/controllers/action_controller"
+require 'ama_layout/version'
+require 'rails/all'
+require 'foundation-rails'
+require 'draper'
+require 'browser'
+require 'breadcrumbs_on_rails'
+require 'redis-rails'
+require 'ama_layout/breadcrumb_builder'
+require 'ama_layout/moneris'
+require 'ama_layout/navigation'
+require 'ama_layout/navigation_item'
+require 'ama_layout/navigation_helper'
+require 'ama_layout/decorators/moneris_decorator'
+require 'ama_layout/decorators/navigation_decorator'
+require 'ama_layout/decorators/navigation_item_decorator'
+require 'ama_layout/controllers/action_controller'
+require 'ama_layout/notifications/abstract_store'
+require 'ama_layout/notifications/redis_store'
+require 'ama_layout/notification'
+require 'ama_layout/decorators/notification_decorator'
+require 'ama_layout/notification_scrubber'
+require 'ama_layout/notification_set'
+require 'ama_layout/notifications'
 
 module AmaLayout
-  module Rails
-    class Engine < ::Rails::Engine
-      initializer('ama_layout') do
-        I18n.load_path << File.join(self.root, 'app', 'config', 'locales', 'en.yml')
-        ::ActionController::Base.send :include, AmaLayout::ActionController
-      end
+  class Engine < Rails::Engine
+    initializer('ama_layout') do
+      I18n.load_path << File.join(self.root, 'app', 'config', 'locales', 'en.yml')
+      ::ActionController::Base.send :include, AmaLayout::ActionController
     end
   end
 end

data/lib/ama_layout/decorators/navigation_decorator.rb

@@ -32,5 +32,52 @@ module AmaLayout
     def account_toggle
       h.render partial: "account_toggle"
     end
+
+    def notifications
+      if user
+        h.render 'ama_layout/notifications', notifications: user.notifications, navigation: self
+      end
+    end
+
+    def notification_badge
+      if new_notifications?
+        h.content_tag(
+          :div,
+          active_notification_count,
+          class: 'notification__badge',
+          data: {
+            notification_count: true
+          }
+        )
+      end
+    end
+
+    def notification_sidebar
+      if user
+        h.render 'ama_layout/notification_sidebar', navigation: self, notifications: decorated_notifications
+      end
+    end
+
+    def notifications_heading
+      if user.notifications.any?
+        h.content_tag :p, 'Most Recent Notifications', class: 'mt1'
+      else
+        h.content_tag :p, 'No Recent Notifications', class: 'mt1 italic'
+      end
+    end
+
+    private
+
+    def decorated_notifications
+      AmaLayout::NotificationDecorator.decorate_collection(user.notifications)
+    end
+
+    def active_notification_count
+      user && user.notifications.active.size || 0
+    end
+
+    def new_notifications?
+      active_notification_count > 0
+    end
   end
 end

data/lib/ama_layout/decorators/notification_decorator.rb

@@ -0,0 +1,45 @@
+module AmaLayout
+  class NotificationDecorator < Draper::Decorator
+    delegate_all
+
+    ICONS = {
+      notice: {
+        icon_class: 'fa-info',
+        colour_class: 'right-sidebar__content-icon--blue' # currently not in use
+      },
+      warning: {
+        icon_class: 'fa-exclamation',
+        colour_class: 'right-sidebar__content-icon--orange'
+      },
+      alert: {
+        icon_class: 'fa-exclamation-triangle',
+        colour_class: 'right-sidebar__content-icon--red'
+      }
+    }.freeze
+
+    def created_at
+      "#{time_elapsed} ago".humanize
+    end
+
+    def icon
+      h.content_tag :div, class: icon_data.fetch(:colour_class) do
+        klass = icon_data.fetch(:icon_class)
+        h.content_tag :i, nil, class: "fa #{klass} right-sidebar__notice-icon"
+      end
+    end
+
+    def active_class
+      active? ? 'right-sidebar__content--active' : 'right-sidebar__content--inactive'
+    end
+
+    private
+
+    def icon_data
+      @icon_data ||= ICONS.fetch(type)
+    end
+
+    def time_elapsed
+      h.time_ago_in_words(object.created_at, include_seconds: true)
+    end
+  end
+end

data/lib/ama_layout/navigation.rb

@@ -13,12 +13,15 @@ module AmaLayout
     cattr_accessor :member do
       "member"
     end
+
     cattr_accessor :non_member do
       "non-member"
     end
+
     cattr_accessor :member_in_renewal do
       "member-in-renewal"
     end
+
     cattr_accessor :member_in_renewal_late do
       "member-in-renewal-late"
     end

data/lib/ama_layout/navigation.yml

@@ -81,13 +81,31 @@ non-member:
     link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
     icon: "fa-cogs"
 member-in-renewal:
-  - text: "Account Dashboard"
+  - text: "My Account Overview"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
-  - text: "Renew"
-    link: "<%= Rails.configuration.youraccount_site %>/renew"
+  - text: "My Membership"
+    link: "<%= Rails.configuration.membership_site %>/membership/overview"
     icon: "fa-credit-card"
-  - text: "Driver Education"
+    sub_nav:
+      - text: "Membership Overview"
+        link: "<%= Rails.configuration.membership_site %>/membership/overview"
+      - text: "Renew Membership"
+        link: "<%= Rails.configuration.membership_site %>/renews/new"
+        icon: "fa-credit-card"
+      - text: "Manage Membership"
+        link: "<%= Rails.configuration.membership_site %>/membership/manage"
+      - text: "Billing Options"
+        link: "<%= Rails.configuration.youraccount_site %>/billing"
+      - text: "Print/Request New Card"
+        link: "<%= Rails.configuration.youraccount_site %>/membership"
+  - text: "My Roadside Assistance"
+    link: "<%= Rails.configuration.automotive_site %>/"
+    icon: "fa-car"
+    sub_nav:
+      - text: "Roadside Assistance Overview"
+        link: "<%= Rails.configuration.automotive_site %>/"
+  - text: "My Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"
     icon: "fa-car"
     sub_nav:
@@ -95,12 +113,46 @@ member-in-renewal:
         link: "<%= Rails.configuration.driveredonline_site %>/"
       - text: "New Driver Online Program"
         link: "<%= Rails.configuration.driveredonline_site %>/dashboard"
+  - text: "My AMA Rewards"
+    link: "<%= Rails.configuration.youraccount_site %>/rewards"
+    icon: "fa-usd"
+    sub_nav:
+      - text: "Rewards Overview"
+        link: "<%= Rails.configuration.youraccount_site %>/rewards"
+      - text: "Gift Cards"
+        link: "<%= Rails.configuration.membership_site %>/reward_cards"
+      - text: "Transaction History"
+        link: "<%= Rails.configuration.youraccount_site %>/reward_dollars"
+      - text: "Pizza 73 Coupon Codes"
+        link: "<%= Rails.configuration.youraccount_site %>/pizza73"
+  - text: "My Registries"
+    link: "<%= Rails.configuration.registries_site %>/"
+    icon: "fa-folder-open"
+    sub_nav:
+      - text: "Registries Overview"
+        link: "<%= Rails.configuration.registries_site %>/"
+      - text: "Vehicle Registration Auto-Renew"
+        link: "<%= Rails.configuration.registries_site %>/order/registrations/new"
+  - text: "My Travel"
+    link: "<%= Rails.configuration.travel_site %>"
+  - text: "My Account Settings"
+    link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+    icon: "fa-cogs"
+    sub_nav:
+      - text: "Change Email/Password"
+        link: "<%= Rails.configuration.gatekeeper_site %>/user/edit"
+      - text: "Email Subscriptions"
+        link: "<%= Rails.configuration.youraccount_site %>/subscriptions"
+      - text: "AMA Insider Magazine"
+        link: "<%= Rails.configuration.youraccount_site %>/amainsider"
+      - text: "Change Address"
+        link: "<%= Rails.configuration.youraccount_site %>/membership_update/new"
 member-in-renewal-late:
   - text: "Account Dashboard"
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Renew"
-    link: "<%= Rails.configuration.youraccount_site %>/renew"
+    link: "<%= Rails.configuration.membership_site %>/renews/new"
     icon: "fa-credit-card"
   - text: "Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"
@@ -115,7 +167,7 @@ member-with-outstanding-balance:
     link: "<%= Rails.configuration.gatekeeper_site %>/"
     icon: "fa-tachometer"
   - text: "Pay Outstanding Balance"
-    link: "<%= Rails.configuration.youraccount_site %>/renew"
+    link: "<%= Rails.configuration.membership_site %>/renews/new"
     icon: "fa-credit-card"
   - text: "Driver Education"
     link: "<%= Rails.configuration.driveredonline_site %>/"