beyond_canvas 0.14.0.pre → 0.16.0.pre

data/app/assets/stylesheets/beyond_canvas/settings/_breakpoints.scss

@@ -0,0 +1,6 @@
+$mobile-s:  321px !global;
+$mobile-m:  376px !global;
+$mobile-l:  426px !global;
+$tablet:    769px !global;
+$laptop:   1025px !global;
+$laptop-l: 1441px !global;

data/app/assets/stylesheets/beyond_canvas/settings/_variables.scss

@@ -70,6 +70,12 @@ $card-separator-color: rgb(222, 222, 222) !default;
 $card-separator-spacing: 50px !global;
 $card-title-color: rgb(247, 133, 96) !default;
 
+// ************************************************************
+// Containers
+// ************************************************************
+
+$container-spacing: 30px !global;
+
 // ************************************************************
 // Labels
 // ************************************************************
@@ -84,6 +90,24 @@ $input-border-color: rgb(217, 216, 195) !default;
 $input-border-color-focus: $palette-primary !default;
 $input-errors-color: $palette-danger !default;
 
+// ************************************************************
+// Checkboxes
+// ************************************************************
+
+$checkbox-checked-color: #97C344 !default;
+$checkbox-checked-background: #ffffff !default;
+$checkbox-unchecked-color: #C2BF9D !default;
+$checkbox-unchecked-background: #ffffff !default;
+
+// ************************************************************
+// Radiobuttons
+// ************************************************************
+
+$radio-checked-color: #97C344 !default;
+$radio-checked-background: #ffffff !default;
+$radio-unchecked-color: #C2BF9D !default;
+$radio-unchecked-background: #ffffff !default;
+
 // ************************************************************
 // Hints
 // ************************************************************

data/app/assets/stylesheets/beyond_canvas/utilities/_functions.scss

@@ -0,0 +1,15 @@
+/// Replace `$search` with `$replace` in `$string`
+/// @author Hugo Giraudel
+/// @param {String} $string - Initial string
+/// @param {String} $search - Substring to replace
+/// @param {String} $replace ('') - New value
+/// @return {String} - Updated string
+@function str-replace($string, $search, $replace: '') {
+  $index: str-index($string, $search);
+
+  @if $index {
+    @return str-slice($string, 1, $index - 1) + $replace + str-replace(str-slice($string, $index + str-length($search)), $search, $replace);
+  }
+
+  @return $string;
+}

data/app/controllers/beyond_canvas/authentications_controller.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_dependency 'beyond_canvas/application_controller'
+
+module BeyondCanvas
+  class AuthenticationsController < ApplicationController # :nodoc:
+    layout 'beyond_canvas/public'
+
+    include ::BeyondCanvas::Authentication
+    include ::BeyondCanvas::ResourceManagement
+
+    before_action :validate_app_installation_request!, only: :new
+
+    def new
+      self.resource = resource_class.new
+    end
+
+    def create
+      # Search for the api url. If there is no record it creates a new record.
+      resource_params = new_resource_params
+      self.resource = resource_class.find_or_create_by(beyond_api_url: resource_params[:api_url])
+      # Assign the attributes to the record
+      raise ActiveRecord::RecordNotSaved unless resource.update(resource_params)
+      # Get and save access_token and refresh_token using the authentication code
+      raise BeyondApi::Error if resource.authenticate.is_a?(BeyondApi::Error)
+
+      redirect_to after_create_path
+    rescue ActiveRecord::RecordNotSaved, BeyondApi::Error, StandardError => e
+      logger.error "[BeyondCanvas] #{e.message}".red
+      send "handle_#{e.class.name.split('::').first.underscore}_exception", e
+    end
+
+    def update
+      create
+    end
+
+    private
+
+    def new_resource_params
+      send "new_#{resource_name}_params"
+    end
+
+    def after_create_path
+      new_resource_params[:return_url]
+    end
+
+    def handle_active_record_exception(_exception)
+      flash[:error] = t('beyond_canvas.authentications.failure')
+      render :new
+    end
+
+    def handle_beyond_api_exception(_exception)
+      flash[:error] = t('beyond_canvas.authentications.failure')
+      render :new
+    end
+
+    def handle_standard_error_exception(_exception)
+      flash[:error] = t('beyond_canvas.authentications.failure')
+      render :new
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module Authentication # :nodoc:
+    extend ActiveSupport::Concern
+    AUTH_RESOURCE = BeyondCanvas.auth_model
+
+    class_eval <<-METHODS, __FILE__, __LINE__ + 1
+      def current_#{AUTH_RESOURCE}
+        instance_variable_get("@#{AUTH_RESOURCE}")
+      end
+
+      def new_#{AUTH_RESOURCE}_params
+        beyond_canvas_parameter_sanitizer.sanitize
+      end
+    METHODS
+
+    private
+
+    def beyond_canvas_parameter_sanitizer
+      @beyond_canvas_parameter_sanitizer ||= BeyondCanvas::ParameterSanitizer.new(AUTH_RESOURCE, params)
+    end
+  end
+end

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

@@ -31,7 +31,7 @@ module BeyondCanvas
     def valid_signature?(signature, data, secret)
       digest = OpenSSL::Digest.new('SHA1')
       hmac = OpenSSL::HMAC.digest(digest, secret, data)
-      signature == Base64.encode64(hmac).chop
+      URI.decode(signature) == Base64.encode64(hmac).chop
     end
   end
 end

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module ResourceManagement # :nodoc:
+    extend ActiveSupport::Concern
+
+    included do
+      # Share some methods defined in the controller to make them available for the view
+      if respond_to?(:helper_method)
+        helpers = %w[resource resource_name resource_class]
+        helper_method(*helpers)
+      end
+    end
+
+    protected
+
+    def resource_name
+      BeyondCanvas.auth_model
+    end
+
+    def resource
+      instance_variable_get(:"@#{resource_name}")
+    end
+
+    def resource=(new_resource)
+      instance_variable_set(:"@#{resource_name}", new_resource)
+    end
+
+    def resource_class
+      resource_name.classify.constantize
+    end
+  end
+end

data/app/form_builders/beyond_canvas/form_builder.rb

@@ -2,18 +2,39 @@
 
 module BeyondCanvas
   class FormBuilder < ActionView::Helpers::FormBuilder # :nodoc:
+    ############################################################################
+    # Wrappers
+    ############################################################################
+
     def field_wrapper(attribute, args, &block)
-      label = args[:label].presence || 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') if errors.present?)
-          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
+
+    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
 
@@ -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}"
+        filed_identifyer = filed_identifyer(attribute)
 
         args.merge!(id: filed_identifyer)
             .merge!(hidden: true)
@@ -39,7 +90,7 @@ module BeyondCanvas
           super(attribute, args) +
             @template.content_tag(:label,
                                   for: filed_identifyer,
-                                  class: 'input__file__label button__transparent--primary') do
+                                  class: 'input__file__control button__transparent--primary') do
               args[:data][:button_text] || 'Choose file'
             end +
             @template.content_tag(:span,
@@ -48,5 +99,11 @@ module BeyondCanvas
         end
       end
     end
+
+    private
+
+    def filed_identifyer(attribute)
+      "#{attribute}_#{DateTime.now.strftime('%Q') + rand(10_000).to_s}"
+    end
   end
 end

data/app/javascript/beyond_canvas/base.js

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

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

@@ -1,7 +1,21 @@
-const SPINNER_ANIMATION_TIMEOUT = 125;
+import { disableActionElements, enableActionElements, hideSpinner, showSpinner } from './functions';
 
-(function($) {
+(function ($) {
   const onDOMReady = function () {
+    const inputs = $('input, textarea, select').not(':input[type=button], :input[type=submit], :input[type=reset]');
+
+    inputs.each(function () {
+      var input = $(this);
+
+      input.bind('invalid', function (e) {
+        if ($(input).is(':hidden')) {
+          e.preventDefault();
+        }
+        hideSpinner();
+        enableActionElements();
+      });
+    });
+
     $('button[class^="button"]').each(function () {
       var button = $(this);
 
@@ -15,58 +29,26 @@ const SPINNER_ANIMATION_TIMEOUT = 125;
           <div class="bounce1"></div>
           <div class="bounce2"></div>
           <div class="bounce3"></div>
-        </div>`
-      );
+        </div>`);
 
       // Bind ajax:success and ajax:error to the form the button belongs to
       button
         .closest('form')
         .on('ajax:success', function () {
-          hideSpinner(button);
+          hideSpinner();
           enableActionElements();
         })
         .on('ajax:error', function () {
-          hideSpinner(button);
+          hideSpinner();
           enableActionElements();
         });
     });
   };
 
-  $(document).on('click', '[class^="button"]', function() {
+  $(document).on('click', '[class^="button"]', function () {
     disableActionElements();
     showSpinner($(this));
   });
 
-  $(document)
-    .ready(onDOMReady)
-    .on('ready page:load turbolinks:load', onDOMReady);
+  $(document).on('ready page:load turbolinks:load', onDOMReady);
 })(jQuery);
-
-function showSpinner(button) {
-  // Adjust the width of the button
-  button.width(button.width() + $('.spinner').outerWidth(true));
-  // Show the spinner
-  setTimeout(function() {
-    button.find('.spinner').css('display', 'flex');
-  }, SPINNER_ANIMATION_TIMEOUT);
-}
-
-function hideSpinner(button) {
-  setTimeout(function () {
-    // Hide the spinner
-    button.find('.spinner').hide();
-    // Adjust the width of the button
-    button.width(button.data('oldWidth'));
-  }, SPINNER_ANIMATION_TIMEOUT);
-}
-
-function disableActionElements() {
-  $('a, input[type="submit"], input[type="button"], input[type="reset"], button').each(function() {
-    $(this).addClass('actions--disabled');
-  });
-}
-function enableActionElements() {
-  $('a, input[type="submit"], input[type="button"], input[type="reset"], button').each(function() {
-    $(this).removeClass("actions--disabled");
-  });
-}

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

@@ -1,4 +1,6 @@
-(function($) {
+import { closeAlert } from './functions';
+
+(function ($) {
   const onDOMReady = function () {
     $('.flash').each(function () {
       $(this).css('right', -$(this).width() + 'px');
@@ -9,20 +11,9 @@
     }, 100);
   };
 
-  $(document).on('click', '.flash', function() {
+  $(document).on('click', '.flash', function () {
     closeAlert();
   });
 
-  $(document)
-    .ready(onDOMReady)
-    .on('ready page:load turbolinks:load', onDOMReady);
+  $(document).on('ready page:load turbolinks:load', onDOMReady);
 })(jQuery);
-
-function closeAlert() {
-  $('.flash')
-    .removeClass('flash--shown')
-    .delay(700)
-    .queue(function() {
-      $(this).remove();
-    });
-}

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

@@ -0,0 +1,41 @@
+const SPINNER_ANIMATION_TIMEOUT = 125;
+
+export function showSpinner(button) {
+  // Adjust the width of the button
+  button.width(button.width() + $('.spinner').outerWidth(true));
+  // Show the spinner
+  setTimeout(function () {
+    button.find('.spinner').css('display', 'flex');
+  }, SPINNER_ANIMATION_TIMEOUT);
+}
+
+export function hideSpinner() {
+  $('button[class^="button"]').each(function (_, button) {
+    setTimeout(function () {
+      // Hide the spinner
+      $(button).find('.spinner').hide();
+      // Adjust the width of the button
+      $(button).width($(button).data('oldWidth'));
+    }, SPINNER_ANIMATION_TIMEOUT);
+  });
+}
+
+export function disableActionElements() {
+  $('a, input[type="submit"], input[type="button"], input[type="reset"], button').each(function (_, button) {
+    $(button).addClass('actions--disabled');
+  });
+}
+export function enableActionElements() {
+  $('a, input[type="submit"], input[type="button"], input[type="reset"], button').each(function (_, button) {
+    $(button).removeClass('actions--disabled');
+  });
+}
+
+export function closeAlert() {
+  $('.flash')
+    .removeClass('flash--shown')
+    .delay(700)
+    .queue(function () {
+      $(this).remove();
+    });
+}