beyond_canvas 0.22.0.pre → 0.23.0.pre

data/app/javascript/beyond_canvas/base.js

@@ -1,5 +1,4 @@
 import 'jquery';
-
 import './initializers/buttons';
 import './initializers/collapse';
 import './initializers/flash';

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

@@ -23,13 +23,15 @@ const BUTTON_SELECTORS = '[class^="button"]';
     });
   };
 
-  $(document).on('confirm:complete', function ()  {
+  $(document).on('confirm:complete', function () {
     $.restoreActionElements();
   });
 
-  $(document).on('click', BUTTON_SELECTORS, function () {
+  $(document).on('click', BUTTON_SELECTORS, function (e) {
     var button = $(this);
 
+    if(e.target.attributes.getNamedItem('target')?.value === '_blank') return;
+
     $.disableActionElements();
 
     if (!button.hasClass('button--no-spinner')) {
@@ -38,10 +40,15 @@ const BUTTON_SELECTORS = '[class^="button"]';
   });
 
   $(document).on('ready page:load turbolinks:load', onDOMReady);
+
+  $(document).on('beforeunload turbolinks:before-visit', function () {
+    $.restoreActionElements();
+  });
 })(jQuery);
 
 $.extend({
   restoreActionElements: function () {
+    setTimeout(function () {
     // Hide spinners
     $(BUTTON_SELECTORS).each(function (_, button) {
       setTimeout(function () {
@@ -56,6 +63,7 @@ $.extend({
     $('a, input[type="submit"], input[type="button"], input[type="reset"], button').each(function () {
       $(this).removeClass('actions--disabled');
     });
+    }, 100);
   },
   disableActionElements: function () {
     $('a, input[type="submit"], input[type="button"], input[type="reset"], button').each(function () {

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

@@ -10,17 +10,39 @@
   };
 
   $(document).on('click', '.flash__close', function () {
-    closeAlert();
+    $.closeAlert();
   });
 
-  $(document).on('ready page:load turbolinks:load', onDOMReady);
+  $(document).on('ready page:load turbolinks:load bc.flash.shown', onDOMReady);
 })(jQuery);
 
-function closeAlert() {
-  $('.flash')
-    .removeClass('flash--shown')
-    .delay(700)
-    .queue(function () {
-      $(this).remove();
-    });
-}
+$.extend({
+  showFlash: function(status, message) {
+    const flash = `
+        <div class="flash">
+          <div class="flash__icon flash__icon--${status}">
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M12 2c5.514 0 10 4.486 10 10s-4.486 10-10 10-10-4.486-10-10 4.486-10 10-10zm0-2c-6.627 0-12 5.373-12 12s5.373 12 12 12 12-5.373 12-12-5.373-12-12-12zm6 16.538l-4.592-4.548 4.546-4.587-1.416-1.403-4.545 4.589-4.588-4.543-1.405 1.405 4.593 4.552-4.547 4.592 1.405 1.405 4.555-4.596 4.591 4.55 1.403-1.416z"></path></svg>
+          </div>
+          <div class="flash__message">
+            ${message}
+          </div>
+          <div class="flash__close">
+            <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M24 20.188l-8.315-8.209 8.2-8.282-3.697-3.697-8.212 8.318-8.31-8.203-3.666 3.666 8.321 8.24-8.206 8.313 3.666 3.666 8.237-8.318 8.285 8.203z"></path></svg>
+          </div>
+        </div>`;
+
+    $(document).trigger('bc.flash.show');
+    $('#flash').html(flash);
+    $(document).trigger('bc.flash.shown');
+  },
+  closeAlert: function() {
+    $(document).trigger('bc.flash.hide');
+    $('.flash')
+      .removeClass('flash--shown')
+      .delay(700)
+      .queue(function () {
+        $(this).remove();
+      });
+    $(document).trigger('bc.flash.hidden');
+  }
+});

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

@@ -1,15 +1,15 @@
 (function ($) {
   const onDOMReady = function () {
     $('input[type="file"]').each(function () {
-      var $input = $(this),
+      const $input = $(this),
         $label = $(`.input__file__text.${$input.attr('id')}`),
         labelVal = $label.html();
 
       $input.on('change', function (e) {
-        var fileName = '';
+        let fileName = '';
 
         if (this.files && this.files.length > 1)
-          fileName = (this.getAttribute('data-multiple-caption') || '').replace(
+          fileName = (this.getAttribute('data-multiple-caption') || '{count} files selected').replace(
             '{count}',
             this.files.length
           );
@@ -33,5 +33,10 @@
     });
   };
 
-  $(document).on('ready page:load turbolinks:load', onDOMReady);
+  $(document).on('ready page:load turbolinks:load', () => {
+    const observer = new MutationObserver(() => onDOMReady());
+
+    onDOMReady();
+    observer.observe(document.body, { childList: true, subtree: true });
+  });
 })(jQuery);

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

@@ -1,14 +1,50 @@
-$.extend({
-  displayModal: function (content, options = {}) {
-    $('#modal').find('#modal__content').html(content);
-    $('#modal').css('display', 'flex');
+(function ($) {
+  const onDOMReady = function () {
+    $('.modal').each(function () {
+      $(this).hide().css('visibility', 'visible');
+    });
+  };
+
+  $(document).on('click', '[data-toggle="modal"]', function (e) {
+    e.preventDefault();
+
+    const dataTarget = $(this).attr('data-target');
+
     $.restoreActionElements();
-    $(document).trigger('modal:opened', options['extraEventParameters']);
+    $(dataTarget).showModal();
+  });
+
+  $(document).on('click', '[data-dismiss="modal"]', function (e) {
+    e.preventDefault();
+
+    const dataTarget = $(this).closest('.modal');
+
+    $.restoreActionElements();
+    $(dataTarget).hideModal();
+  });
+
+  $(document).on('ready page:load turbolinks:load', onDOMReady);
+})(jQuery);
+
+$.fn.extend({
+  showModal: function () {
+    const modal = $(this);
+
+    modal.trigger('bc.modal.show');
+
+    $.restoreActionElements();
+    modal.css('display', 'flex');
+
+    modal.trigger('bc.modal.shown');
   },
-  closeModal: function () {
-    $('#modal').find('#modal__content').empty();
-    $('#modal').css('display', 'none');
+  hideModal: function () {
+    const modal = $(this);
+
+    modal.trigger('bc.modal.hide');
+
     $.restoreActionElements();
-    $(document).trigger('modal:closed');
-  }
+    modal.hide();
+
+    modal.trigger('bc.modal.hidden');
+  },
 });

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.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;" %>
+    <% if BeyondCanvas.configuration.email_logo.present? %>
+      <%= image_tag BeyondCanvas.configuration.email_logo, width: "200", height: "50", 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

@@ -2,21 +2,25 @@
 
   <% flash.each do |key, value| %>
 
-    <div class="flash">
+    <% unless value.blank? %>
 
-      <div class="flash__icon flash__icon--<%= key %>">
-        <%= get_flash_icon(key) %>
-      </div>
+      <div class="flash">
 
-      <div class="flash__message">
-        <%= value %>
-      </div>
+        <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 class="flash__close">
-        <%= inline_svg_tag 'icons/flash_close.svg' %>
       </div>
 
-    </div>
+    <% end %>
 
   <% end %>
 

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

@@ -16,6 +16,10 @@
     <% end %>
   <% end %>
 
+  <% if BeyondCanvas.configuration.cockpit_app %>
+      <%= stylesheet_link_tag cookies[:custom_styles_url] %>
+  <% end %>
+
   <% BeyondCanvas.configuration.javascripts.each do |path| %>
     <% if BeyondCanvas.configuration.skip_webpacker %>
       <%= javascript_include_tag path %>

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

@@ -1,5 +1,5 @@
 <% if show_locale_switch? && !is_cockpit_app? %>
-  <%= form_for :system, url: beyond_canvas.update_locale_path, method: :put do |f| %>
+  <%= form_for :system, url: 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',

data/app/views/layouts/beyond_canvas/application.html.erb

@@ -11,7 +11,6 @@
 
     <%= render 'beyond_canvas/shared/flash' %>
     <%= render 'beyond_canvas/shared/locales' %>
-    <%= render 'beyond_canvas/shared/modal' %>
     <%= render 'beyond_canvas/shared/menu' %>
     <%= render 'beyond_canvas/shared/action_bar' %>
 

data/app/views/layouts/beyond_canvas/public.html.erb

@@ -3,7 +3,7 @@
 <html>
 <%= render 'beyond_canvas/shared/head' %>
 
-<body class="body--public">
+<body class="beyond-canvas body--public">
 
   <main class="main <%= params[:controller].gsub(/[\/_]/, "-") %>--<%= params[:action] %>">
 

data/config/initializers/beyond_canvas/constants.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+if BeyondCanvas.configuration.cockpit_app == true && !Rails.env.development?
+  COOKIES_ATTRIBUTES = {
+    expires: 1.year.from_now,
+    same_site: :none,
+    secure: true
+  }.freeze
+else
+  COOKIES_ATTRIBUTES = {
+    expires: 1.year.from_now
+  }.freeze
+end

data/config/initializers/beyond_canvas/session_store.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+if BeyondCanvas.configuration.cockpit_app == true && !Rails.env.development?
+  Rails.application.config.session_store :cookie_store, {
+    secure: true,
+    same_site: :none
+  }
+end

data/lib/beyond_canvas/configuration.rb

@@ -3,26 +3,30 @@
 module BeyondCanvas
   class Configuration # :nodoc:
     attr_accessor :site_title, :site_logo, :favicon, :skip_webpacker, :encryption_key, :namespace, :cockpit_app,
-                  :open_app_url, :preinstalled, :debug_mode
+                  :open_app_url, :preinstalled, :debug_mode, :webhook_site_url, :email_logo, :client_credentials
 
     include AssetRegistration
     include MenuItemRegistration
+    include WebhookEventRegistration
 
     def initialize
       @cockpit_app = false
       @debug_mode = false
+      @client_credentials = false
       @encryption_key = nil
       @favicon = nil
       @namespace = '/'
       @open_app_url = nil
       @preinstalled = false
       @site_logo = nil
+      @email_logo = nil
       @site_title = ::Rails.application.class.name.split('::').first.humanize
       @skip_webpacker = false
     end
 
     def setup!
       register_default_assets
+      register_default_webhook_events
     end
 
     private
@@ -31,5 +35,9 @@ module BeyondCanvas
       register_stylesheet 'beyond_canvas.css', media: 'screen'
       register_javascript 'beyond_canvas.js'
     end
+
+    def register_default_webhook_events
+      register_webhook_event('app.uninstalled')
+    end
   end
 end

data/lib/beyond_canvas/engine.rb

@@ -21,6 +21,7 @@ module BeyondCanvas
       ActiveSupport.on_load :action_controller do
         include ::BeyondCanvas::LocaleManagement
         include ::BeyondCanvas::RequestValidation
+        include ::BeyondCanvas::CustomStyles
         include ::BeyondCanvas::StatusCodes
         include ::BeyondCanvas::AuthenticationsHelper
         include ::BeyondCanvas::DebugHelper
@@ -29,5 +30,11 @@ module BeyondCanvas
         ::ActionController::Base.helper BeyondCanvas::Engine.helpers
       end
     end
+
+    config.after_initialize do
+      ActiveSupport.on_load :action_controller do
+        include ::BeyondCanvas::AddBlockerCheck
+      end
+    end
   end
 end

data/lib/beyond_canvas/rails/routes.rb

@@ -3,18 +3,38 @@
 module ActionDispatch
   module Routing
     class Mapper # :nodoc:
-      def beyond_canvas_routes(options = nil)
-        mount BeyondCanvas::Engine => BeyondCanvas.configuration.namespace
+      def beyond_canvas_routes(*resources)
+        scope BeyondCanvas.configuration.namespace do
+          put 'locale', to: 'beyond_canvas/system#update_locale', as: :update_locale
+        end
+
+        resources = resources.extract_options!
+
+        beyond_canvas_for_controllers(resources[:controllers] || {})
+      end
 
-        BeyondCanvas.use_rails_app_controller = options.present? && options[:custom_controller].present?
+      protected
 
-        set_routes if BeyondCanvas.use_rails_app_controller
+      def beyond_canvas_for_controllers(controllers)
+        [:authentications, :webhooks].each do |method|
+          controllers.key?(method) ? send("set_#{method}_routes", controllers[method]) : send("set_#{method}_routes")
+        end
+      end
+
+      def set_webhooks_routes(controller = 'beyond_canvas/webhooks')
+        scope BeyondCanvas.configuration.namespace do
+          resources :shops, only: [] do
+            member do
+              post :beyond_webhook, controller: controller, action: :webhook
+            end
+          end
+        end
       end
 
-      def set_routes
+      def set_authentications_routes(controller = 'beyond_canvas/authentications')
         scope BeyondCanvas.configuration.namespace do
-          get  'callback', controller: :authentications, action: :new
-          post 'callback', controller: :authentications, action: :install
+          get  'callback', controller: controller, action: :new
+          post 'callback', controller: controller, action: :install
         end
       end
     end

data/lib/beyond_canvas/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BeyondCanvas
-  VERSION = '0.22.0.pre'
+  VERSION = '0.23.0.pre'
 end

data/lib/beyond_canvas/webhook_event_registration.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module WebhookEventRegistration # :nodoc:
+    def register_webhook_event(event)
+      event.is_a?(Array) ? webhook_events.merge(event) : webhook_events.add(event)
+    end
+
+    def webhook_events
+      @webhook_events ||= Set.new
+    end
+
+    def clear_webhook_events!
+      webhook_events.clear
+    end
+
+    alias register_webhook_events register_webhook_event
+  end
+end

data/lib/beyond_canvas.rb

@@ -16,10 +16,11 @@ require 'beyond_api'
 require 'attr_encrypted'
 
 module BeyondCanvas # :nodoc:
-  autoload :AssetRegistration,    'beyond_canvas/asset_registration'
-  autoload :Configuration,        'beyond_canvas/configuration'
-  autoload :MenuItemRegistration, 'beyond_canvas/menu_item_registration'
-  autoload :ParameterSanitizer,   'beyond_canvas/parameter_sanitizer'
+  autoload :AssetRegistration,        'beyond_canvas/asset_registration'
+  autoload :Configuration,            'beyond_canvas/configuration'
+  autoload :MenuItemRegistration,     'beyond_canvas/menu_item_registration'
+  autoload :ParameterSanitizer,       'beyond_canvas/parameter_sanitizer'
+  autoload :WebhookEventRegistration, 'beyond_canvas/webhook_event_registration'
 
   module Models # :nodoc:
     autoload :Shop, 'models/shop'
@@ -27,6 +28,7 @@ module BeyondCanvas # :nodoc:
     module Concerns
       autoload :Authentication, 'models/concerns/authentication'
       autoload :Utils,          'models/concerns/utils'
+      autoload :Webhook,        'models/concerns/webhook'
     end
   end