beyond_canvas 0.11.2.pre → 0.15.0.pre

data/app/controllers/concerns/beyond_canvas/request_validation.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module RequestValidation # :nodoc:
+    extend ActiveSupport::Concern
+
+    private
+
+    def validate_app_installation_request!
+      bad_request unless app_installation_params? && valid_signature?(params[:signature],
+                                                                      app_installation_data,
+                                                                      BeyondApi.configuration.client_secret)
+    end
+
+    def app_installation_params?
+      if params[:code].nil? ||
+         params[:signature].nil? ||
+         params[:return_url].nil? ||
+         params[:api_url].nil? ||
+         params[:access_token_url].nil?
+        false
+      else
+        true
+      end
+    end
+
+    def app_installation_data
+      "#{params[:code]}:#{params[:access_token_url]}"
+    end
+
+    def valid_signature?(signature, data, secret)
+      digest = OpenSSL::Digest.new('SHA1')
+      hmac = OpenSSL::HMAC.digest(digest, secret, data)
+      signature == Base64.encode64(hmac).chop
+    end
+  end
+end

data/app/controllers/concerns/beyond_canvas/status_codes.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module StatusCodes # :nodoc:
+    extend ActiveSupport::Concern
+
+    private
+
+    def bad_request
+      raise ActionController::BadRequest, 'Bad Request'
+    end
+
+    def not_found
+      raise ActionController::RoutingError, 'Not Found'
+    end
+  end
+end

data/app/form_builders/beyond_canvas/form_builder.rb

@@ -1,23 +1,44 @@
 # frozen_string_literal: true
 
 module BeyondCanvas
-  class FormBuilder < ActionView::Helpers::FormBuilder
+  class FormBuilder < ActionView::Helpers::FormBuilder # :nodoc:
+    ############################################################################
+    # Wrappers
+    ############################################################################
+
     def field_wrapper(attribute, args, &block)
-      label = args[:label].present? ? args[:label] : attribute.to_s.humanize
+      label = args[:label] == false ? nil : args[:label].presence || attribute.to_s.humanize
 
       errors = object.errors[attribute].join(', ') if object.respond_to?(:errors) && object.errors.include?(attribute)
 
       @template.content_tag(:div, class: 'form__row') do
         @template.content_tag(:label, label, class: 'input__label') +
-          @template.content_tag(:div, class: 'relative') do
-            block.call +
-              (@template.content_tag(:label, errors, class: 'input__error') unless errors.blank?)
-          end +
-          (@template.content_tag(:div, args[:hint].html_safe, class: 'input__hint') if args[:hint].present?)
+        @template.content_tag(:div, class: 'relative') do
+          block.call +
+            (@template.content_tag(:label, errors, class: 'input__error') if errors.present?)
+        end +
+        (@template.content_tag(:div, args[:hint].html_safe, class: 'input__hint') if args[:hint].present?)
       end
     end
 
-    [:email, :text, :password, :file].each do |method|
+    def inline_wrapper(attribute, args, &block)
+      label = args[:label] == false ? nil : args[:label].presence || attribute.to_s.humanize
+
+      errors = object.errors[attribute].join(', ') if object.respond_to?(:errors) && object.errors.include?(attribute)
+
+      @template.content_tag(:div, class: 'form__row') do
+        @template.content_tag(:div, class: 'relative', style: 'display: flex; align-items: center;') do
+          block.call +
+            @template.content_tag(:div) do
+              @template.content_tag(:label, label, class: 'input__label') +
+              (@template.content_tag(:div, args[:hint].html_safe, class: 'input__hint') if args[:hint].present?)
+            end +
+            (@template.content_tag(:label, errors, class: 'input__error') if errors.present?)
+        end
+      end
+    end
+
+    %i[email text number password].each do |method|
       define_method :"#{method}_field" do |attribute, args = {}|
         field_wrapper(attribute, args) do
           super(attribute, args)
@@ -25,9 +46,39 @@ module BeyondCanvas
       end
     end
 
+    def check_box(attribute, args = {})
+      inline_wrapper(attribute, args) do
+        filed_identifyer = filed_identifyer(attribute)
+
+        args.merge!(id: filed_identifyer)
+            .merge!(hidden: true)
+
+        @template.content_tag(:div, class: 'input__checkbox') do
+          super(attribute, args) +
+            @template.content_tag(:label, nil, class: 'input__checkbox__control', for: filed_identifyer)
+        end
+      end
+    end
+
+    def radio_button(attribute, value, args = {})
+      args.merge!(label: value) unless args[:label]
+
+      inline_wrapper(attribute, args) do
+        filed_identifyer = filed_identifyer(attribute)
+
+        args.merge!(id: filed_identifyer)
+            .merge!(hidden: true)
+
+        @template.content_tag(:div, class: 'input__radio') do
+          super(attribute, value, args) +
+            @template.content_tag(:label, nil, class: 'input__radio__control', for: filed_identifyer)
+        end
+      end
+    end
+
     def file_field(attribute, args = {})
       field_wrapper(attribute, args) do
-        filed_identifyer = "#{attribute}_#{(Time.now.to_f * 1000).to_i.to_s}"
+        filed_identifyer = filed_identifyer(attribute)
 
         args.merge!(id: filed_identifyer)
             .merge!(hidden: true)
@@ -37,12 +88,22 @@ module BeyondCanvas
 
         @template.content_tag(:div, class: 'input__file') do
           super(attribute, args) +
-          @template.content_tag(:label, for: filed_identifyer, class: 'input__file__label button__transparent--primary') do
-            args[:data][:button_text] || 'Choose file'
-          end +
-          @template.content_tag(:span, args[:data][:no_file_text] || 'No file chosen', class: "input__file__text #{filed_identifyer}")
+            @template.content_tag(:label,
+                                  for: filed_identifyer,
+                                  class: 'input__file__control button__transparent--primary') do
+              args[:data][:button_text] || 'Choose file'
+            end +
+            @template.content_tag(:span,
+                                  args[:data][:no_file_text] || 'No file chosen',
+                                  class: "input__file__text #{filed_identifyer}")
         end
       end
     end
+
+    private
+
+    def filed_identifyer(attribute)
+      "#{attribute}_#{DateTime.now.strftime('%Q') + rand(10_000).to_s}"
+    end
   end
 end

data/app/helpers/beyond_canvas/application_helper.rb

@@ -1,14 +1,9 @@
 # frozen_string_literal: true
 
 module BeyondCanvas
-  module ApplicationHelper
+  module ApplicationHelper # :nodoc:
     def full_title(page_title = '')
-      if I18n.exists?('app_name')
-        base_title = I18n.t('app_name')
-      else
-        logger.debug "[BeyondCanvas] Missing translation: #{I18n.locale}.app_name".yellow
-        base_title = File.basename(Rails.root).humanize
-      end
+      base_title = BeyondCanvas.configuration.site_title
 
       page_title.empty? ? base_title : page_title + ' | ' + base_title
     end
@@ -27,7 +22,7 @@ module BeyondCanvas
       end
     end
 
-    [:success, :info, :warning, :error].each do |method|
+    %i[success info warning error].each do |method|
       define_method :"notice_#{method}" do |name = nil, html_options = nil, &block|
         notice_render(method, name, html_options, &block)
       end
@@ -45,29 +40,33 @@ module BeyondCanvas
 
     def get_flash_icon(key)
       case key
-      when 'success'
-        'fas fa-check'
+      when 'success', 'notice'
+        inline_svg_tag 'icons/flash_checkbox.svg'
       when 'info'
-        'fas fa-info-circle'
+        inline_svg_tag 'icons/flash_info.svg'
       when 'warning'
-        'fas fa-exclamation-circle'
+        inline_svg_tag 'icons/flash_warning.svg'
       when 'error'
-        'far fa-times-circle'
+        inline_svg_tag 'icons/flash_error.svg'
       else
-        'fas fa-info'
+        inline_svg_tag 'icons/flash_info.svg'
       end
     end
 
     def notice_render(method, name = nil, html_options = nil, &block)
-      html_options, name = name, block if block_given?
+      if block_given?
+        html_options = name
+        name = block
+      end
 
       html_options ||= {}
 
-      html_options.merge!(class: "notice notice--#{method}") { |key, old_val, new_val| [new_val, old_val].join(' ') }
+      html_options.merge!(class: "notice notice--#{method}") { |_key, old_val, new_val| [new_val, old_val].join(' ') }
 
       content_tag('div', html_options) do
-        content_tag('i', nil, class: "notice__icon #{get_flash_icon(method.to_s)}") +
-        content_tag('span', block_given? ? capture(&name) : name, class: 'notice__content')
+        content_tag('div', class: 'notice__icon') do
+          get_flash_icon(method.to_s)
+        end + content_tag('span', block_given? ? capture(&name) : name, class: 'notice__content')
       end
     end
   end

data/app/helpers/beyond_canvas/locale_switch_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module BeyondCanvas
-  module LocaleSwitchHelper
+  module LocaleSwitchHelper # :nodoc:
     def translate_locale(locale)
       if I18n.exists?("locales.#{locale}")
         I18n.t("locales.#{locale}")

data/app/javascript/beyond_canvas/base.js

@@ -0,0 +1,6 @@
+import 'jquery'
+import 'jquery-ujs'
+
+import './initializers/buttons'
+import './initializers/flash'
+import './initializers/inputs'

data/app/{assets/javascripts/beyond_canvas → javascript/beyond_canvas/initializers}/buttons.js

@@ -1,13 +1,8 @@
 const SPINNER_ANIMATION_TIMEOUT = 125;
 
 (function($) {
-  $(document).on('click', '[class^="button"]', function() {
-    disableActionElements();
-    showSpinner($(this));
-  });
-
-  $(document).on('ready page:load turbolinks:load', function() {
-    $('button[class^="button"]').each(function() {
+  const onDOMReady = function () {
+    $('button[class^="button"]').each(function () {
       var button = $(this);
 
       // Add width attribute and save old width
@@ -16,25 +11,35 @@ const SPINNER_ANIMATION_TIMEOUT = 125;
 
       // Add the spinner
       button.prepend(`
-      <div class="spinner">
-        <div class="bounce1"></div>
-        <div class="bounce2"></div>
-        <div class="bounce3"></div>
-      </div>`);
+        <div class="spinner">
+          <div class="bounce1"></div>
+          <div class="bounce2"></div>
+          <div class="bounce3"></div>
+        </div>`
+      );
 
       // Bind ajax:success and ajax:error to the form the button belongs to
       button
         .closest('form')
-        .on('ajax:success', function() {
+        .on('ajax:success', function () {
           hideSpinner(button);
           enableActionElements();
         })
-        .on('ajax:error', function() {
+        .on('ajax:error', function () {
           hideSpinner(button);
           enableActionElements();
         });
     });
+  };
+
+  $(document).on('click', '[class^="button"]', function() {
+    disableActionElements();
+    showSpinner($(this));
   });
+
+  $(document)
+    .ready(onDOMReady)
+    .on('ready page:load turbolinks:load', onDOMReady);
 })(jQuery);
 
 function showSpinner(button) {

data/app/{assets/javascripts/beyond_canvas → javascript/beyond_canvas/initializers}/flash.js

@@ -1,17 +1,21 @@
 (function($) {
-  $(document).on('click', '.flash', function() {
-    closeAlert();
-  });
-
-  $(document).on('ready page:load turbolinks:load', function() {
-    $('.flash').each(function() {
+  const onDOMReady = function () {
+    $('.flash').each(function () {
       $(this).css('right', -$(this).width() + 'px');
     });
 
-    setTimeout(function() {
+    setTimeout(function () {
       $('.flash').addClass('flash--shown');
     }, 100);
+  };
+
+  $(document).on('click', '.flash', function() {
+    closeAlert();
   });
+
+  $(document)
+    .ready(onDOMReady)
+    .on('ready page:load turbolinks:load', onDOMReady);
 })(jQuery);
 
 function closeAlert() {

data/app/javascript/beyond_canvas/initializers/inputs.js

@@ -0,0 +1,39 @@
+(function($) {
+  const onDOMReady = function () {
+    $('input[type="file"]').each(function () {
+      var $input = $(this),
+        $label = $(`.input__file__text.${$input.attr('id')}`),
+        labelVal = $label.html();
+
+      $input.on('change', function (e) {
+        var fileName = '';
+
+        if (this.files && this.files.length > 1)
+          fileName = (this.getAttribute('data-multiple-caption') || '').replace(
+            '{count}',
+            this.files.length
+          );
+        else if (e.target.value) fileName = e.target.value.split('\\').pop();
+
+        if (fileName)
+          $label.html(
+            `<svg class="input__file__icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M15 2v5h5v15h-16v-20h11zm1-2h-14v24h20v-18l-6-6z"/></svg>${fileName}`
+          );
+        else $label.html(labelVal);
+      });
+
+      // Firefox bug fix
+      $input
+        .on('focus', function () {
+          $input.addClass('has-focus');
+        })
+        .on('blur', function () {
+          $input.removeClass('has-focus');
+        });
+    });
+  };
+
+  $(document)
+    .ready(onDOMReady)
+    .on('ready page:load turbolinks:load', onDOMReady);
+})(jQuery);

data/app/views/beyond_canvas/custom/_public_head.html.erb

@@ -0,0 +1 @@
+

data/app/views/beyond_canvas/locales/_edit.html.erb

@@ -0,0 +1,8 @@
+<% if defined?(I18n) && I18n.available_locales.count > 1 %>
+  <%= form_for :system, url: beyond_canvas.update_locale_path, method: :put do |f| %>
+      <%= f.select :locale, I18n.available_locales.collect { |l| [translate_locale(l), l] },
+                        { selected: cookies[:locale] },
+                        class: 'select--locale',
+                        onchange: 'this.form.submit()'  %>
+  <% end %>
+<% end %>

data/app/views/beyond_canvas/mailer/_header.html.erb

@@ -1,8 +1,8 @@
 <!-- Email Header : BEGIN -->
 <tr>
   <td style="padding: 20px 0; text-align: center">
-    <% if BeyondCanvas.configuration.public_logo.present? %>
-      <%= image_tag BeyondCanvas.configuration.public_logo, width: "200", height: "50", alt: "alt_text", border: "0", style: "height: auto; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #555555;" %>
+    <% if BeyondCanvas.configuration.site_logo.present? %>
+      <%= image_tag BeyondCanvas.configuration.site_logo, width: "200", height: "50", alt: "alt_text", border: "0", style: "height: auto; font-family: sans-serif; font-size: 15px; line-height: 15px; color: #555555;" %>
     <% end %>
   </td>
 </tr>

data/app/views/beyond_canvas/shared/_flash.html.erb

@@ -0,0 +1,13 @@
+<% flash.each do |key, value| %>
+  <div class="flash">
+    <div class="flash__icon flash__icon--<%= key %>">
+      <%= get_flash_icon(key) %>
+    </div>
+    <div class="flash__message">
+      <%= value %>
+    </div>
+    <div class="flash__close">
+      <%= inline_svg_tag 'icons/flash_close.svg' %>
+    </div>
+  </div>
+<% end %>

data/app/views/beyond_canvas/shared/_head.html.erb

@@ -0,0 +1,29 @@
+<head>
+
+  <%= csrf_meta_tags %>
+
+  <meta content='width=device-width, initial-scale=1.0' name='viewport' />
+
+  <title><%= full_title(yield :title) %></title>
+
+  <%= favicon_link_tag BeyondCanvas.configuration.favicon if BeyondCanvas.configuration.favicon %>
+
+  <% BeyondCanvas.configuration.stylesheets.each do |style, options| %>
+    <% if BeyondCanvas.configuration.skip_webpacker %>
+      <%= stylesheet_link_tag style, options %>
+    <% else %>
+      <%= stylesheet_pack_tag style, options %>
+    <% end %>
+  <% end %>
+
+  <% BeyondCanvas.configuration.javascripts.each do |path| %>
+    <% if BeyondCanvas.configuration.skip_webpacker %>
+      <%= javascript_include_tag path %>
+    <% else %>
+      <%= javascript_pack_tag path %>
+    <% end %>
+  <% end %>
+
+  <%= render 'beyond_canvas/custom/public_head' %>
+
+</head>