swedbank-pay-design-guide-jekyll-theme 1.6.1.pre.PullRequest0137.pre.0064 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42888091ccc955f38fa0242da4b03d4175f99e449b4aa238b48e97f6fead244c
-  data.tar.gz: 1c55a8d051cbcff4d2d7aff5998713d4146a865b7e520e31ae3f94234ff83ad7
+  metadata.gz: 4baacc614edb524f53a8b0a23788382fba5ec477f10f08888adf08fcbde24998
+  data.tar.gz: 0cb1ef91541ba25c94708789ab05379ea92fc94ea0a7a62c336182f108a62544
 SHA512:
-  metadata.gz: ffcd2a6b3d6e0ae90b56cd7945eca08a1ab61cabb93fe7fb35e42d4e48eb9d72e46d1e104c356c071c850a0a4a7aede9fb84150319a116992b9123aa261cb25a
-  data.tar.gz: a04785e165d25dfccb851beb20397abd6aa7fed6855587b1a1c0769d95a84cb6d23c4bc079322dc52ea76c0d2549179d8c728e7baf08631c0130d1614978c13f
+  metadata.gz: 0bf78e21de260346ee939876981e7cfeb2558e74a2d492217a07c4a23bde14018eb746225e7ad5f23420cacf89c2c82e07dc8c008a2ed588e7a5a9934ea2862f
+  data.tar.gz: bba4b0c952ee13e087c0e6f38c738d3999874e0670a3881e053b2b7fc58ae5e39ec748af3d64e3548c45efe79e9984539f193340ebaf73263e10ebddcdbe74e4

data/_includes/sidebar.html

@@ -19,7 +19,7 @@ Original creator: https://sebnitu.com/2016/10/13/dynamic-menus-in-jekyll/
       {% endif %}
 
       <ul class="main-nav-ul">
-          {% assign pages = site.pages | sort: 'menu-order' %}
+          {% assign pages = site.pages | sort: 'menu_order' %}
           {% for node in pages %}
           {% assign node_parts = node.url | split: '/' %}
           {% assign node_depth = node_parts | size %}
@@ -113,4 +113,3 @@ Original creator: https://sebnitu.com/2016/10/13/dynamic-menus-in-jekyll/
       </ul>
   </nav>
 </div>
-

data/_layouts/default.html

@@ -1,5 +1,4 @@
 {%- assign title = page.title | default: "PayEx Design Guide theme for Jekyll" -%}
-{%- assign front_page = page.front_page | default: false -%}
 {%- assign description = page.opengraph.description | default: site.opengraph.description -%}
 {%- assign image = page.opengraph.image | default: site.opengraph.image -%}
 {%- assign github_branch = site.github.branch | default : "develop" -%}
@@ -80,14 +79,14 @@
                     </div>
 
                     <main class="doc-view col-xxl-10 col-lg-9">
-                        {% if front_page != true %}
+                        {% if page.layout != 'front-page' %}
                         {% assign title_lead = title | split: '–' | first %}
                         {% assign title_main = title | split: '–' | last %}
                         {% assign description = page.description %}
                         {% assign estimated_read = page.estimated_read %}
                         <div class="title-header">
                             <div class="title-header-container
-                                    {% if page.card_overview%} max-width-card-overview
+                                    {% if page.card_overview %} max-width-card-overview
                                     {% else %} max-width
                                     {% endif %}">
                                 {% if title_lead != title_main %}
@@ -106,8 +105,8 @@
                             </div>
                         </div>
                         {% endif %}
-                        <div class="doc-container{% if front_page == true %} no-padding
-                            {% elsif page.card_overview%} normal-padding max-width-card-overview
+                        <div class="doc-container{% if page.layout == 'front-page' %} no-padding
+                            {% elsif page.card_overview %} normal-padding max-width-card-overview
                             {% else %} normal-padding max-width
                             {% endif %}">
                             <article>

data/_layouts/front-page.html

@@ -0,0 +1,112 @@
+---
+layout: default
+---
+
+{% assign show_merchants_bar = page.front_page.show_merchants_bar | default: false %}
+{% assign front_page_title = page.front_page.title | default: 'developer portal' %}
+{% assign front_page_hero = page.front_page.hero | default: "Welcome to the Swedbank Pay" %}
+{% assign front_page_ingress = page.front_page.ingress | default: "Our developer portal gives you the full tool box for integrating our payment instruments and getting started with easy, flexible and safe payments on your e-commerce website." %}
+{% assign front_page_start_heading = page.front_page.start_heading | default: "Start your integration" %}
+
+<div class="front-page">
+    <div class="front-page-container">
+        <div class="front-page-top">
+            <div class="front-page-hero">
+                <h3>{{ front_page_hero }}</h3>
+                <div class="front-page-hero-name">
+                    {<span>{{ front_page_title }}</span>}
+                </div>
+                <p>{{ front_page_ingress }}</p>
+            </div>
+            <div class="front-page-intro-cards">
+                <h2 id="front-page-start" class="heading-line heading-line-white">{{ front_page_start_heading }}</h2>
+                {% contentblock start %}
+            </div>
+        </div>
+        {% if show_merchants_bar == true %}
+        <div class="front-page-merchants">
+            <h6>Trusted by</h6>
+            <div class="merchants-container justify-content-xxl-between">
+                <a class="merchant-link">
+                    {% include img/merchants/logo-schibsted.svg %}
+                </a>
+                <a class="merchant-link">
+                    {% include img/merchants/logo-ica.svg %}
+                </a>
+                <a class="merchant-link">
+                    {% include img/merchants/logo-elkjop.svg %}
+                </a>
+                <a class="merchant-link">
+                    {% include img/merchants/logo-synsam.svg %}
+                </a>
+                <a class="merchant-link">
+                    {% include img/merchants/logo-coop.svg %}
+                </a>
+                <a class="merchant-link">
+                    {% include img/merchants/logo-svenskaspel.svg %}
+                </a>
+                <a class="merchant-link">
+                    {% include img/merchants/logo-skanetrafiken.svg %}
+                </a>
+            </div>
+        </div>
+    </div>
+    {% endif %}
+    <a href="https://ecom.externalintegration.payex.com/pspdemoshop" class="front-page-demoshop">
+        <span class="front-page-demoshop-text">
+            <span class="h2">Try our Demoshop<span>.</span></span>
+            <span class="demoshop-text-description">
+                Unsure about how it all works? See how our checkout and payment methods are used
+                in practice!
+            </span>
+        </span>
+        <span class="front-page-demoshop-link">
+            <span class="h3">Go to the demoshop</span>
+            <i class="material-icons">arrow_forward</i>
+            <span class="demoshop-link-img">
+                <img class="demoshop-link-img-mobile d-md-none d-lg-flex d-xl-none d-xxl-flex"
+                    src="/assets/img/demoshop-mobile.svg" alt="demoshop-mobile" />
+                <img class="demoshop-link-img-mobile d-none d-md-none d-lg-flex d-xl-none"
+                    src="/assets/img/demoshop-mobile2.svg" alt="demoshop-mobile2" />
+                <img class="demoshop-link-img-web d-none d-sm-none d-md-flex d-lg-none d-xl-flex"
+                    src="/assets/img/demoshop-web.svg" alt="demoshop-web" />
+            </span>
+        </span>
+    </a>
+
+    <div class="front-page-container">
+        <div class="front-page-cards-sdk">
+            {% contentblock sdks %}
+        </div>
+
+        <div class="front-page-cards-module">
+            {% contentblock modules %}
+        </div>
+
+        <div class="front-page-release-notes">
+            {% contentblock release_notes %}
+        </div>
+
+        <div class="front-page-cards-extra">
+            {% contentblock extras %}
+        </div>
+
+        <div class="front-page-contact">
+            <div class="front-page-contact-content">
+                <div class="row">
+                    <div class="col-xl-7">
+                        <h2 id="front-page-contact" class="heading-line heading-line-long">Can't find what you are
+                            looking for?</h2>
+                        <p>
+                            We are always trying to make the developer portal as
+                            good as it can be please don’t hesitate to contact us.
+                        </p>
+                    </div>
+                    <div class="col-xl-5 d-flex align-items-center justify-content-center">
+                        <button class="btn">Contact us here</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>

data/_plugins/sidebar.rb

@@ -1,2 +1,3 @@
 # frozen_string_literal: false
-require_relative '../lib/sidebar.rb'
+
+require_relative '../lib/sidebar'

data/lib/gem_version.rb

@@ -4,7 +4,7 @@ module Gem
   # Gem Specification
   class Specification
     def self.gem_version
-      '1.6.1-PullRequest0137-0064'
+      '1.9.0'
     end
   end
 end

data/lib/safe_merge.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+# The Hash class
+class Hash
+  # Safely merges the current Hash with an 'other' Hash.
+  def safe_merge(other)
+    all_keys = keys | other.keys
+    result_hash = {}
+
+    all_keys.each do |key|
+      hash_value = {}
+
+      if key? key
+        value = self[key]
+        hash_value = value unless value.nil?
+      end
+
+      if other.key? key
+        value = other[key]
+        hash_value = hash_value.merge(value) unless value.nil?
+      end
+
+      result_hash[key] = hash_value
+    end
+
+    result_hash
+  end
+end

data/lib/sanitized_filename.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# The String class
+class String
+  # Sanitizes a filename
+  def sanitized
+    match = match(/(?m)(?<=\b_site).*$/)
+    sanitized_filename = match ? match[0] : self
+    sanitized_filename = sanitized_filename.gsub('index.html', '')
+    sanitized_filename.gsub('.html', '')
+  end
+end

data/lib/sidebar.rb

@@ -3,209 +3,46 @@
 require 'jekyll'
 require 'nokogiri'
 require 'json'
-
-module Jekyll
-  class Sidebar
-    attr_accessor :hash_pre_render
-    attr_accessor :filename_with_headers
-
-    def initialize
-      @hash_pre_render = {}
-      @filename_with_headers = {}
-    end
-
-    def pre_render(page)
-      menu_order = page['menu-order'].nil? ? 0 : page['menu-order']
-      hide_from_sidebar = page['hide_from_sidebar'].nil? ? false : page['hide_from_sidebar']
-      url = page['url'].gsub('index.html', '').gsub('.html', '')
-      @hash_pre_render[url] = {
-        title: page['title'],
-        url: page['url'].gsub('.html', ''),
-        name: page['name'],
-        menu_order: menu_order,
-        hide_from_sidebar: hide_from_sidebar
-      }
-    end
-
-    def post_write(site)
-      files = []
-      Dir.glob("#{site.config['destination']}/**/*.html") do |filename|
-        doc = File.open(filename) { |f| Nokogiri::HTML(f) }
-        files.push(doc)
-
-        headers = []
-        doc.xpath('//h2 ').each do |header|
-          next unless header['id']
-
-          child = header.last_element_child
-          header = {
-            id: header['id'],
-            title: header.content.strip,
-            hash: (child['href']).to_s
-          }
-          headers.push(header)
-        end
-        sanitized_filename = sanitize_filename(filename)
-        @filename_with_headers[sanitized_filename] = { headers: headers }
-      end
-
-      Dir.glob("#{site.config['destination']}/**/*.html") do |filename|
-        sanitized_filename = sanitize_filename(filename)
-        sidebar = render(sanitized_filename)
-        file = File.open(filename) { |f| Nokogiri::HTML(f) }
-        file.xpath('//*[@id="dx-sidebar-main-nav-ul"]').each do |location|
-          location.inner_html = sidebar
-        end
-        File.open(filename, 'w') { |f| f.write(file.to_html(encoding: 'UTF-8')) }
-      end
-
-      # File.open('_site/sidebar.html', 'w') { |f| f.write(sidebar) }
-    end
-
-    private
-
-    def sanitize_filename(filename)
-      sanitized_filename = filename.match(/(?m)(?<=\b_site).*$/)[0]
-      sanitized_filename = sanitized_filename.gsub('index.html', '')
-      sanitized_filename.gsub('.html', '')
-    end
-
-    def generateSubgroup(filename, key, value, all_subgroups, level)
-      title = value[:title].split('–').last
-      subsubgroup_list = all_subgroups.select do |subsubgroup_key, _subsubgroup_value|
-        subsubgroup_key.include? key and subsubgroup_key != key and \
-          key.split('/').length > level
-      end
-
-      subgroup = ''
-      has_subgroups = !all_subgroups.empty?
-      if value[:headers].any? || !subsubgroup_list.empty?
-        if has_subgroups
-          url = value[:url]
-          active = active?(filename, url, true)
-          # puts "#{url}, #{filename}, #{key}" if active
-          item_class = active || (url.split('/').length > level && filename.start_with?(url)) ? 'nav-subgroup active' : 'nav-subgroup'
-          subgroup << "<li class=\"#{item_class}\">"
-          subgroup << "<div class=\"nav-subgroup-heading\"><i class=\"material-icons\">arrow_right</i><a href=\"#{url}\">#{title}</a></div>"
-          subgroup << '<ul class="nav-ul">'
-
-          if subsubgroup_list.empty?
-            value[:headers].each do |header|
-              subgroup << "<li class=\"nav-leaf\"><a href=\"#{value[:url]}#{header[:hash]}\">#{header[:title]}</a></li>"
-            end
-          else
-            subgroup_leaf_class = active ? 'nav-leaf nav-subgroup-leaf active' : 'nav-leaf nav-subgroup-leaf'
-            subgroup << "<li class=\"#{subgroup_leaf_class}\"><a href=\"#{value[:url]}\">#{title} overview</a></li>"
-
-            subsubgroup_list.each do |subsubgroup_key, subsubgroup_value|
-              subgroup << generateSubgroup(filename, subsubgroup_key, subsubgroup_value, subsubgroup_list, 3)
-            end
-          end
-
-          subgroup << '</ul>'
-          subgroup << '</li>'
-        else
-          value[:headers].each do |header|
-            subgroup << "<li class=\"nav-leaf\"><a href=\"#{value[:url]}#{header[:hash]}\">#{header[:title]}</a></li>"
-          end
-        end
-      else
-        subgroup << if has_subgroups
-                      "<li class=\"nav-leaf nav-subgroup-leaf\"><a href=\"#{value[:url]}\">#{title}</a></li>"
-                    else
-                      "<li class=\"nav-leaf\"><a href=\"#{value[:url]}\">#{title}</a></li>"
-                    end
-      end
-
-      subgroup
-    end
-
-    def render(filename)
-      sidebar = ''
-
-      merged = merge(@hash_pre_render, @filename_with_headers).sort_by { |_key, value| value[:menu_order] }
-      merged.select { |key, _value| key.split('/').length <= 2 }.each do |key, value|
-        next if value[:title].nil?
-        next if value[:hide_from_sidebar]
-
-        subgroups = merged.select { |subgroup_key, _subgroup_value| subgroup_key.include? key and subgroup_key != key and key != '/' }
-
-        active = active?(filename, key)
-        # puts "#{filename}, #{key}" if active
-        item_class = active ? 'nav-group active' : 'nav-group'
-
-        child = "<li class=\"#{item_class}\">"
-        child << "<div class=\"nav-group-heading\"><i class=\"material-icons\">arrow_right</i><span>#{value[:title].split('–').first}</span></div>"
-
-        child << '<ul class="nav-ul">'
-
-        subgroup = generateSubgroup(filename, key, value, subgroups, 2)
-
-        child << subgroup
-
-        if subgroups.any?
-          subgroups.select { |subgroup_key, _subgroup_value| subgroup_key.split('/').length <= 3 }.each do |subgroup_key, subgroup_value|
-            subgroup = generateSubgroup(filename, subgroup_key, subgroup_value, subgroups, 2)
-            child << subgroup
-          end
-        end
-
-        child << '</ul>'
-        child << '</li>'
-        sidebar << child
+require_relative 'sidebar_page'
+require_relative 'sidebar_parser'
+require_relative 'sidebar_renderer'
+require_relative 'sidebar_tree_builder'
+
+module SwedbankPay
+  # A nice sidebar
+  module Sidebar
+    class << self
+      attr_reader :pages
+
+      def init
+        @pages_hash = {}
       end
 
-      File.open('_site/sidebar.html', 'w') { |f| f.write(sidebar) }
-      sidebar
-    end
-
-    def active?(filename, url, exact = false)
-      if filename == '/' || url == '/'
-        if filename == '/' && url == '/'
-          return true
-        else
-          return false
-        end
+      def pre_render(jekyll_page)
+        sidebar_page = SidebarPage.new(jekyll_page)
+        @pages_hash[sidebar_page.path] = sidebar_page
       end
 
-      exact ? filename == url : filename.start_with?(url)
-    end
-
-    def merge(hash1, hash2)
-      all_keys = hash1.keys | hash2.keys
-      result_hash = {}
-
-      all_keys.each do |key|
-        hash_value = {}
-
-        if hash1.key? key
-          value = hash1[key]
-
-          hash_value = value unless value.nil?
-        end
-
-        if hash2.key? key
-          value = hash2[key]
-
-          hash_value = hash_value.merge(value) unless value.nil?
-        end
-
-        result_hash[key] = hash_value
+      def post_write(site)
+        parser = SidebarParser.new(site)
+        pages = parser.parse(@pages_hash)
+        @pages = SidebarTreeBuilder.new(pages)
+        Jekyll.logger.debug("           Sidebar: #{@pages.inspect}")
+        renderer = SidebarRenderer.new
+        renderer.render(@pages)
       end
-
-      result_hash
     end
   end
 end
 
-sidebar = Jekyll::Sidebar.new
+SwedbankPay::Sidebar.init
 
-Jekyll::Hooks.register :site, :pre_render do |site, _payload|
+Jekyll::Hooks.register :site, :pre_render do |site, _|
   site.pages.each do |page|
-    sidebar.pre_render page
+    SwedbankPay::Sidebar.pre_render page
   end
 end
 
 Jekyll::Hooks.register :site, :post_write do |site|
-  sidebar.post_write site
+  SwedbankPay::Sidebar.post_write site
 end