workarea-nvy_theme 1.1.4 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f716ea9b0250c72e2a21686460bc6911650da70df350e658d2ba5ae24efedd4
-  data.tar.gz: 21976a8786868e3827ebd449eb7092af70e1c7d04ecf58763303ff4751c0e9f3
+  metadata.gz: 1b0cfc51aa68943a262519076c0bec65dae7d24c3e97090bbfbb5cd017ec980d
+  data.tar.gz: fa525363ac9f7f676735b3f950973f9d6ea93bed97fa85318c5a9a24bab54a50
 SHA512:
-  metadata.gz: 1cb708aa405b7c7b32f656b77030cb953f97e077da2e8c3034e1dea7b3cbe6120a4860f80c27ce4201432779b814ed1a06135a346f27460a7820af96c02b1382
-  data.tar.gz: cc0b6569b0f3837180275118e740fe734638a86fdca75d35b54f5c8ab2c9bd6f682b2026c5a4bd7d7cccdbfbeb8bc3f3454bb3d73b15b48e2ef29d7ab149159a
+  metadata.gz: 20a63228d992f17fe47d166609d82c10ef60534910774938d0a9c4412eda2267024c2c35cd455fabaefd1e9f5912dbec18dedd72cc7dc76cc433895ae57dff37
+  data.tar.gz: d06b8872df9d4bf4ea947990f1fa610b5fe4ffd7d0384a8902106faa3c29aeea0465d186d0797d7bc33543a5b7dd7bc09944d5f60b133ccbf475e8d9259fa2f9

data/.eslintrc.json

@@ -0,0 +1,35 @@
+{
+    "extends": "eslint:recommended",
+    "rules": {
+      "semi": ["error", "always"],
+      "eqeqeq": ["error", "always"]
+    },
+    "globals": {
+      "window": true,
+      "document": true,
+      "WORKAREA": true,
+      "$": true,
+      "jQuery": true,
+      "_": true,
+      "feature": true,
+      "JST": true,
+      "Turbolinks": true,
+      "I18n": true,
+      "Chart": true,
+      "Dropzone": true,
+      "strftime": true,
+      "Waypoint": true,
+      "wysihtml": true,
+      "LocalTime": true,
+      "describe": true,
+      "after": true,
+      "afterEach": true,
+      "before": true,
+      "beforeEach": true,
+      "it": true,
+      "expect": true,
+      "sinon": true,
+      "fixture": true,
+      "chai": true
+    }
+}

data/.github/workflows/ci.yml

@@ -0,0 +1,60 @@
+name: CI
+on: [push]
+
+jobs:
+  static_analysis:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: workarea-commerce/ci/bundler-audit@v1
+    - uses: workarea-commerce/ci/rubocop@v1
+    - uses: workarea-commerce/ci/eslint@v1
+      with:
+        args: '**/*.js'
+    - uses: workarea-commerce/ci/stylelint@v1
+      with:
+        args: '**/*.scss'
+
+  admin_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:admin
+
+  core_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:core
+
+  storefront_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:storefront
+
+  plugins_tests:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.6.x
+    - uses: workarea-commerce/ci/test@v1
+      with:
+        command: bin/rails app:workarea:test:plugins

data/.gitignore

@@ -20,5 +20,4 @@ test/dummy/log/*.log
 test/dummy/db/*.sqlite3
 test/dummy/db/*.sqlite3-journal
 node_modules
-package.json
-yarn.lock
+.rubocop-http*

data/.rubocop.yml

@@ -1,8 +1,3 @@
-inherit_gem:
-  workarea-ci: rubocop.yml
+inherit_from:
+  - https://raw.githubusercontent.com/workarea-commerce/workarea/master/.rubocop.yml
 
-AllCops:
-  Exclude:
-    - 'test/dummy/**/*'
-    - 'lib/nvy_theme.rb'
-    - 'lib/nvy_theme/**/*'

data/.stylelintrc.json

@@ -0,0 +1,8 @@
+{
+  "extends": "stylelint-config-recommended-scss",
+  "rules": {
+    "block-no-empty": null,
+    "no-descending-specificity": null,
+    "property-no-unknown": [true, { "ignoreProperties": ["mso-hide"] }]
+  }
+}

data/Gemfile

@@ -1,5 +1,4 @@
 source 'https://rubygems.org'
-git_source(:github) { |repo| "git@github.com:#{repo}.git" }
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 # Declare your gem's dependencies in nvy_theme.gemspec.

data/README.md

@@ -1,4 +1,5 @@
-# Workarea Nvy Theme
+Workarea Nvy Theme
+================================================================================
 
 Nvy Theme plugin for the Workarea platform.
 
@@ -9,13 +10,15 @@ Nvy Theme plugin for the Workarea platform.
 For bug reports and improvement suggestions create a ticket in the [NVYTHEME jira
 project.](https://jira.tools.weblinc.com/projects/NVYTHEME/issues)
 
-## Browser Support
+Browser Support
+--------------------------------------------------------------------------------
 
 Due to the occasional use of flexbox; NvyTheme only supports IE 10+
 If you need to support older versions of IE you will need to provide alternative styles
 where flexbox is used.
 
-## Optimal Image Sizes
+Optimal Image Sizes
+--------------------------------------------------------------------------------
 
 | Image Type| Optimum size | Note |
 |----------|--------|-------|
@@ -24,7 +27,8 @@ where flexbox is used.
 | Product Images | 944px x 1416px | This size does not account for use of image-zoom, it is recommended to *at least* double this size if your client is likely to want zoom functionality. |
 | Blog thumbnails | 160px x 160px ||
 
-## Out of the box plugin support
+Out of the box plugin support
+--------------------------------------------------------------------------------
 
 The following workarea plugins are supported by NvyTheme, and are dependencies of the plugin.
 
@@ -38,7 +42,26 @@ The following workarea plugins are supported by NvyTheme, and are dependencies o
 * Slick Slider
 * Wish Lists
 
-## Theme Configuration
+Getting Started
+--------------------------------------------------------------------------------
+
+Add the gem to your application's Gemfile:
+
+```ruby
+# ...
+gem 'workarea-nvy_theme'
+# ...
+```
+
+Update your application's bundle.
+
+```bash
+cd path/to/application
+bundle
+```
+
+Theme Configuration
+--------------------------------------------------------------------------------
 
 ### Recommended initializer configuration
 
@@ -84,7 +107,9 @@ more developer friendly. In the meantime you can create a new color scheme by:
 2. Update the color_scheme config to match the name of your new color scheme file.
 
 __Example__
-This will create a sass file called _custom_color_scheme.scss in your host application, please change <your-app-name>
+
+This will create a sass file called `_custom_color_scheme.scss` in your host application, please change \<your-app-name\> in the following command to the directory of your application.
+
 From your ~/src directory, ensure you have workarea-nvy-theme pulled down
 
 ```bash
@@ -121,7 +146,7 @@ I recommend using google fonts where possible, the [googlefonts webfont helper](
 1. Create a new directory in app/assets/fonts/workarea/storefront/<your_font_name_here>
 2. Download woff and woff2 files for the font you want to use.
 3. Place your font files in the directory we created in step 1.
-4. Create a sass file for you @font-face declarations in /app/assets/stylesheets/workarea/storefront/theme_config/fonts/_<your_font_name_here>.scss
+4. Create a sass file for you @font-face declarations in /app/assets/stylesheets/workarea/storefront/theme_config/fonts/`_<your_font_name_here>.scss`
 5. Update your theme initializer, adding a new font_stack and setting either the primary_font_family or secondary_font_family
 
 Example configuration for Calibri font stack used as secondary font family:
@@ -136,50 +161,12 @@ config.theme = config.theme.merge(
 )
 ```
 
----
-
-## Getting Started
-
-This gem contains a rails engine that must be mounted onto a host Rails application.
-
-To access Workarea gems and source code, you must be an employee of WebLinc or a licensed retailer or partner.
-
-Workarea gems are hosted privately at <https://gems.weblinc.com/>.
-You must have individual or team credentials to install gems from this server. Add your gems server credentials to Bundler:
-
-    bundle config gems.weblinc.com my_username:my_password
-
-Or set the appropriate environment variable in a shell startup file:
-
-    export BUNDLE_GEMS__WEBLINC__COM='my_username:my_password'
-
-Then add the gem to your application's Gemfile specifying the source:
-
-    # ...
-    gem 'workarea-nvy_theme', source: 'https://gems.weblinc.com'
-    # ...
-
-Or use a source block:
-
-    # ...
-    source 'https://gems.weblinc.com' do
-      gem 'workarea-nvy_theme'
-    end
-    # ...
-
-Update your application's bundle.
-
-    cd path/to/application
-    bundle
-
----
-
-## Workarea Platform Documentation
-
-See [http://developer.weblinc.com](http://developer.weblinc.com) for Workarea platform documentation.
+Workarea Commerce Documentation
+--------------------------------------------------------------------------------
 
-## Copyright & Licensing
+See [https://developer.workarea.com](https://developer.workarea.com) for Workarea Commerce documentation.
 
-Copyright WebLinc 2018 All rights reserved.
+License
+--------------------------------------------------------------------------------
 
-For licensing, contact sales@workarea.com.
+Workarea NVY Theme is released under the [Business Software License](LICENSE)

data/app/assets/javascripts/workarea/storefront/modules/mobile_filter_buttons.js

@@ -41,12 +41,14 @@ WORKAREA.registerModule('mobileFilterButtons', (function () {
 
         inject = function () {
             var $nav = $('<div class="mobile-filters-nav" id="mobile_filters_nav" />'),
-                $content = $('#aside-content');
+                $content = $('#aside-content').clone(true);
 
             $nav.append($content);
 
             addCloseButton($nav);
 
+            WORKAREA.initModules($nav);
+
             $('body').append($nav);
 
             _.defer(activate, $nav);

data/app/assets/stylesheets/workarea/storefront/blog/components/_blog_entry.scss

@@ -53,12 +53,6 @@ $blog-entry-comment-border-color: $blog-comment-border-color !default;
         margin-bottom: $vertical-margin;
     }
 
-    .blog-entry__share {
-        margin-bottom: $vertical-margin;
-    }
-
-        .blog-entry__share-heading {}
-
     /**
      * Comments
      *

data/app/assets/stylesheets/workarea/storefront/components/_product_list.scss

@@ -13,9 +13,21 @@ $product-list-info-item-margin: $spacing-unit 0 0 !default;
 .product-list {
     @extend %list-reset;
     margin-bottom: $vertical-margin;
+
+    @include respond-to($medium-breakpoint) {
+        display: table;
+        width: 100%;
+        border-spacing: 0;
+        border-collapse: collapse;
+    }
 }
 
-.product-list--narrow {}
+.product-list--narrow {
+    @include respond-to($medium-breakpoint) {
+        display: block;
+        width: auto;
+    }
+}
 
     .product-list__item {
         @extend %clearfix;
@@ -24,12 +36,7 @@ $product-list-info-item-margin: $spacing-unit 0 0 !default;
         border-bottom: $product-list-item-border;
 
         @include respond-to ($medium-breakpoint) {
-            display: table;
-            margin-bottom: $spacing-unit * 3;
-            width: 100%;
-            border: $product-list-item-border;
-            border-spacing:  0;
-            border-collapse: collapse;
+            display: table-row;
         }
 
         .product-list--narrow & {

data/app/views/layouts/workarea/storefront/application.html.haml

@@ -1,5 +1,6 @@
 - add_css(layout_content.css)
 - add_javascript(layout_content.javascript)
+- add_head_content(layout_content.head_content)
 
 !!!
 /
@@ -32,21 +33,13 @@
     = append_partials('storefront.document_head')
     = javascript_include_tag Workarea.config.asset_manifests.storefront_javascript_head
 
-    %script{ type: 'application/ld+json' }
-      :plain
-        {
-          "@context": "http://schema.org",
-          "@type": "WebSite",
-          "url": "#{root_url}",
-          "potentialAction": {
-            "@type": "SearchAction",
-            "target": "#{search_url}?q={search_term_string}",
-            "query-input": "required name=search_term_string"
-          }
-        }
-
-
-  %body{ itemscope: true, itemtype: 'http://schema.org/WebPage' }
+    = render_schema_org(web_site_schema)
+    = render_schema_org(web_page_schema)
+
+    = yield :head_content
+    = yield :javascript_head
+
+  %body
     = append_partials('storefront.body_top')
 
     %nav.accessibility-nav.visually-hidden{ role: 'navigation' }
@@ -88,7 +81,8 @@
           .page-header__search
             = form_tag search_path, method: 'get', class: 'page-header__search-form', role: 'search' do
               .page-header__search-value
-                .value= search_field_tag :q, params[:q], id: 'storefront_search', class: 'text-box text-box--full', title: t('workarea.storefront.searches.search'), aria: { label: t('workarea.storefront.searches.search') }, placeholder: t('workarea.storefront.searches.search'), data: { search_field: '' }
+                .value= search_field_tag :q, params[:q], id: 'storefront_search', class: 'text-box text-box--full', title: t('workarea.storefront.searches.search'), aria: { label: t('workarea.storefront.searches.search') }, placeholder: t('workarea.storefront.searches.search')
+                = append_partials('storefront.page_header_search_value')
               = button_tag value: 'search', class: 'page-header__search-button' do
                 = inline_svg('workarea/storefront/icons/search.svg', class: 'page-header__search-icon', title: t('workarea.storefront.forms.go'))
 
@@ -129,7 +123,7 @@
             .breadcrumbs{ role: 'navigation' }
               %p.breadcrumbs__node-group
                 - @breadcrumbs.each do |taxon|
-                  %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+                  %span.breadcrumbs__node
                     - if taxon.navigable.present?
                       - if @breadcrumbs.last == taxon
                         %span.breadcrumbs__text= taxon.name

data/app/views/layouts/workarea/storefront/checkout.html.haml

@@ -28,7 +28,7 @@
     = append_partials('storefront.document_head')
     = javascript_include_tag Workarea.config.asset_manifests.storefront_javascript_head
 
-  %body{ itemscope: true, itemtype: 'http://schema.org/WebPage' }
+  %body
     = append_partials('storefront.body_top')
 
     %nav.accessibility-nav.visually-hidden

data/app/views/workarea/storefront/blog_entries/show.html.haml

@@ -1,16 +1,25 @@
 - @title = @entry.browser_title
 - @breadcrumbs = @breadcrumbs
 
+- add_css(@entry.css)
+- add_javascript(@entry.javascript)
+
+= render_schema_org(breadcrumb_list_schema([[t('workarea.storefront.layouts.home'), root_url], [@entry.blog.name, blog_url(@entry.blog)], [@entry.name, blog_entry_url(@entry)]]))
+= render_schema_org(blog_posting_schema(@entry))
+
 - content_for :breadcrumbs do
   %p.breadcrumbs__node-group
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to t('workarea.storefront.layouts.home'), root_path, rel: 'home'
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' }
+    %span.breadcrumbs__node
       = link_to @entry.blog.name, blog_path(@entry.blog)
-    %span.breadcrumbs__node{ itemprop: 'breadcrumb' } #{@entry.name}
+    %span.breadcrumbs__node= @entry.name
 
 - content_for :head do
   %link{ href: blog_entry_path(@entry), rel: 'canonical' }
+  %meta{ property: 'og:title', content: @entry.name }
+  %meta{ property: 'og:type', content: 'article' }
+  %meta{ property: 'og:url', content: blog_entry_path(@entry) }
   - if @entry.thumbnail_image.present?
     %meta{ property: 'og:image', content: @entry.thumbnail_image_url }
   %meta{ property: 'global-id', content: @entry.to_global_id.to_param }
@@ -20,32 +29,27 @@
 - content_for :page_aside do
   = render 'workarea/storefront/blogs/blog_navigation', blog: @entry.blog
 
-%article.blog-entry.view{ itemscope: true, itemtype: 'http://schema.org/BlogPosting' }
+%article.blog-entry.view
 
   %heading.blog-entry__header
     - if @entry.content_blocks_for(:blog_header).present?
       != render_content_blocks(@entry.content_blocks_for('blog_header'))
 
-    - if @entry.has_thumbnail_image?
-      %meta{ itemprop: 'image', content: @entry.thumbnail_image_url }
-
-    %h1.blog-entry__title{ itemprop: 'mainEntityOfPage' }
-      %span{ itemprop: 'headline' }= @entry.name
-    %p.blog-entry__author{ itemprop: 'author' }= @entry.author
+    %h1.blog-entry__title
+      %span= @entry.name
+    %p.blog-entry__author= @entry.author
     %p.blog-entry__datetime
-      %meta{ itemprop: 'dateModified', content: @entry.written_at }
-      = local_time(@entry.written_at, format: :long, itemprop: 'datePublished')
-    %p.blog-entry__comment-count{ itemprop: 'commentCount' }= link_to t('workarea.storefront.blogs.comments', count: @entry.comment_count), blog_entry_path(@entry, anchor: 'blog-entry-comments')
-    = render 'workarea/storefront/blog_metadata/publisher'
+      = local_time(@entry.written_at, format: :long)
+    %p.blog-entry__comment-count= link_to t('workarea.storefront.blogs.comments', count: @entry.comment_count), blog_entry_path(@entry, anchor: 'blog-entry-comments')
 
     - if @entry.tags.present?
       .blog-entry__tags
         %p.blog-entry__label= t('workarea.storefront.blogs.tags')
-        %ul.blog-entry__tags-list{ itemprop: 'keywords' }
+        %ul.blog-entry__tags-list
           - @entry.tags.each do |tag|
             %li.blog-entry__tags-list-item= link_to tag, blog_tagged_path(@entry.blog, tag)
 
-  .blog-entry__body{ itemprop: 'articleBody' }
+  .blog-entry__body
     - if @entry.content_blocks_for(:blog_content).present?
       != render_content_blocks(@entry.content_blocks_for('blog_content'))
 
@@ -54,8 +58,10 @@
       %h2.blog-entry__products-heading= t('workarea.storefront.blogs.related_products')
       %ul.grid.grid--auto
         - @entry.products.each do |product|
+          = render_schema_org(product_schema(product))
+
           %li.grid__cell>
-            .product-summary{ itemscope: true, itemtype: 'http://schema.org/Product' }
+            .product-summary
               = render 'workarea/storefront/products/summary', product: product
 
   #blog-entry-comments.blog-entry__comments
@@ -67,13 +73,13 @@
           %p.blog-entry__write-comment-link= link_to t('workarea.storefront.blogs.write_comment'), '#write-comment', class: 'button button--solid'
         %ul.blog-entry__comment-group
           - @entry.comments.each do |comment|
-            %li.blog-entry__comment{ itemprop: 'comment', itemscope: true, itemType: 'http://schema.org/Comment' }
+            %li.blog-entry__comment
               %p.blog-entry__comment-item.blog-entry__comment-item--author
                 = comment.user_info
               %p.blog-entry__comment-item.blog-entry__comment-item--datetime
-                = local_time(comment.created_at, format: :long, itemprop: 'dateCreated');
+                = local_time(comment.created_at, format: :long);
 
-              %p.blog-entry__comment-item.blog-entry__comment-item--body{itemprop: 'text'}
+              %p.blog-entry__comment-item.blog-entry__comment-item--body
                 = comment.body
 
     #write-comment.blog-entry__section{ data: { blog_comment_placeholder: blog_entry_comments_path(@entry) } }