RubyGems - beyond_canvas - Versions diffs - 0.16.2.pre → 0.17.0.pre - Mend

beyond_canvas 0.16.2.pre → 0.17.0.pre

Files changed (73) hide show

data/app/views/beyond_canvas/shared/_modal.html.erb ADDED

@@ -0,0 +1,6 @@
+<div class="modal__background" id="modal">
+  <div class="relative card card--padding">
+    <span onClick= "$.closeModal()"><%= inline_svg_tag 'icons/close.svg', class: 'modal__close' %></span>
+    <div id="modal__content"></div>
+  </div>
+</div>

data/app/views/beyond_canvas/shared/_sidebar.html.erb ADDED

@@ -0,0 +1,16 @@
+<% if is_cockpit_app? && Rails.env.development? %>
+  <div class="sidebar">
+    <div class="sidebar__header">
+      <div class="sidebar__logo"></div>
+    </div>
+    <div class="sidebar__item sidebar__item--selected"></div>
+    <div class="sidebar__item"></div>
+    <div class="sidebar__item"></div>
+    <div class="sidebar__item"></div>
+    <div class="sidebar__footer">
+      <div class="sidebar__icon"></div>
+      <div class="sidebar__icon"></div>
+      <div class="sidebar__icon"></div>
+    </div>
+  </div>
+<% end %>

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

@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html>
+<%= render 'beyond_canvas/shared/head' %>
+<body class="body--application"<% if is_cockpit_app? && Rails.env.development? %> style="display: flex;"<% end %>>
+  <%= render 'beyond_canvas/shared/sidebar' %>
+  <main class="main <%= params[:controller].gsub(/[\/_]/, "-") %>--<%= params[:action] %>">
+    <%= 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' %>
+    <div class="main-wrapper<% if action_bar_content? %> main-wrapper--action_bar<% end %>"<% if content_for?(:max_width)%> style="max-width: <%= yield :max_width %>"<% end %>>
+      <%= render 'beyond_canvas/shared/breadcrumbs' %>
+      <%= yield %>
+      <%= debug(params) if debug_mode? %>
+    </div>
+  </main>
+</body>
+</html>

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

@@ -4,15 +4,22 @@
 <%= render 'beyond_canvas/shared/head' %>
 <body class="body--public">
   <main class="main <%= params[:controller].gsub(/[\/_]/, "-") %>--<%= params[:action] %>">
-    <div id="flash">
-      <%= render 'beyond_canvas/shared/flash' %>
-    </div>
-    <%= render 'beyond_canvas/locales/edit' %>
+    <%= render 'beyond_canvas/shared/flash' %>
+    <%= render 'beyond_canvas/shared/locales' %>
     <div class="main-wrapper">
       <%= render 'beyond_canvas/shared/logo' %>
       <%= yield %>
     </div>
+    <%= debug(params) if debug_mode? %>
   </main>
 </body>
 </html>

data/config/locales/en.yml CHANGED

@@ -1,4 +1,9 @@
 en:
   beyond_canvas:
     authentications:
+      new:
+        headline: Install %{app_name} in your shop
+        body: You are about to install %{app_name} in your shop. For continuing with this process, press the install button below.
+        actions:
+          install: Install
       failure: Shop could not be saved

data/config/routes.rb CHANGED

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 BeyondCanvas::Engine.routes.draw do
-  put '/locale', to: 'system#update_locale', as: :update_locale
+  put 'locale', to: 'system#update_locale', as: :update_locale
-  def create_default_routes(resource_name)
-    resources resource_name, controller: 'authentications', except: :destroy
+  def create_default_routes
+    get  'callback', to: 'authentications#new'
+    post 'callback', to: 'authentications#install'
   end
-  create_default_routes(BeyondCanvas.auth_model.pluralize.to_sym) unless BeyondCanvas.use_rails_app_controller
+  create_default_routes unless BeyondCanvas.use_rails_app_controller
 end

data/lib/beyond_canvas.rb CHANGED

@@ -8,30 +8,30 @@ require 'jquery-rails'
 require 'bourbon'
 require 'sassc-rails'
 require 'inline_svg'
+require 'loaf'
 require 'http/accept'
 require 'premailer/rails'
 require 'beyond_api'
 require 'attr_encrypted'
-require 'blind_index'
 module BeyondCanvas # :nodoc:
-  autoload :AssetRegistration,  'beyond_canvas/asset_registration'
-  autoload :Configuration,      'beyond_canvas/configuration'
+  autoload :AssetRegistration,    'beyond_canvas/asset_registration'
+  autoload :Configuration,        'beyond_canvas/configuration'
+  autoload :MenuItemRegistration, 'beyond_canvas/menu_item_registration'
+  autoload :ParameterSanitizer,   'beyond_canvas/parameter_sanitizer'
   module Models # :nodoc:
-    autoload :Authentication,   'beyond_canvas/models/authentication'
-    autoload :Shop,             'beyond_canvas/models/shop'
-    autoload :Utils,            'beyond_canvas/models/utils'
-  end
+    autoload :Shop, 'models/shop'
-  autoload :ParameterSanitizer, 'beyond_canvas/parameter_sanitizer'
+    module Concerns
+      autoload :Authentication, 'models/concerns/authentication'
+      autoload :Utils,          'models/concerns/utils'
+    end
+  end
   mattr_accessor :use_rails_app_controller
-  @@use_rails_app_controller = false # rubocop:disable Style/ClassVars
-  mattr_accessor :auth_model
-  @@auth_model = 'shop' # rubocop:disable Style/ClassVars
+  @@use_rails_app_controller = false
   class << self
     def configuration

data/lib/beyond_canvas/configuration.rb CHANGED

@@ -2,18 +2,23 @@
 module BeyondCanvas
   class Configuration # :nodoc:
-    attr_accessor :site_title, :site_logo, :favicon, :skip_webpacker, :encryption_key, :blind_index_key, :namespace
+    attr_accessor :site_title, :site_logo, :favicon, :skip_webpacker, :encryption_key, :namespace, :cockpit_app,
+                  :open_app_url, :preinstalled, :debug_mode
     include AssetRegistration
+    include MenuItemRegistration
     def initialize
-      @site_title = ::Rails.application.class.name.split('::').first.humanize
-      @site_logo = nil
-      @favicon = nil
-      @skip_webpacker = false
+      @cockpit_app = false
+      @debug_mode = false
       @encryption_key = nil
-      @blind_index_key = nil
+      @favicon = nil
       @namespace = '/'
+      @open_app_url = nil
+      @preinstalled = false
+      @site_logo = nil
+      @site_title = ::Rails.application.class.name.split('::').first.humanize
+      @skip_webpacker = false
     end
     def setup!

data/lib/beyond_canvas/engine.rb CHANGED

@@ -13,15 +13,17 @@ module BeyondCanvas
       BeyondCanvas.configuration.javascripts.each do |path|
         app.config.assets.precompile << path
       end
+      app.config.assets.precompile << 'beyond_canvas_manifest.js'
     end
     config.before_initialize do
       ActiveSupport.on_load :action_controller do
-        include ::BeyondCanvas::Authentication
         include ::BeyondCanvas::LocaleManagement
-        include ::BeyondCanvas::ResourceManagement
         include ::BeyondCanvas::RequestValidation
         include ::BeyondCanvas::StatusCodes
+        include ::BeyondCanvas::AuthenticationsHelper
+        include ::BeyondCanvas::DebugHelper
         ::ActionController::Base.helper BeyondCanvas::Engine.helpers
       end

data/lib/beyond_canvas/menu_item_registration.rb ADDED

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+module BeyondCanvas
+  module MenuItemRegistration # :nodoc:
+    MenuItem = Struct.new(:name, :url, :options)
+    def register_menu_item(name, url, options = {})
+      menu_items.add MenuItem.new(name, url, options)
+    end
+    def menu_items
+      @menu_items ||= Set.new
+    end
+    def clear_menu_items!
+      menu_items.clear
+    end
+  end
+end

data/lib/beyond_canvas/parameter_sanitizer.rb CHANGED

@@ -2,7 +2,7 @@
 module BeyondCanvas
   class ParameterSanitizer # :nodoc:
-    DEFAULT_PERMITTED_ATTRIBUTES = %i[code signature return_url api_url access_token_url].freeze
+    DEFAULT_PERMITTED_ATTRIBUTES = %i[code signature return_url api_url access_token_url]
     def initialize(resource_name, params)
       @params         = params

data/lib/beyond_canvas/rails/routes.rb CHANGED

@@ -3,18 +3,19 @@
 module ActionDispatch
   module Routing
     class Mapper # :nodoc:
-      def beyond_canvas_for(*resources)
+      def beyond_canvas_routes(options = nil)
         mount BeyondCanvas::Engine => BeyondCanvas.configuration.namespace
-        resource_name, options = resources
-        BeyondCanvas.auth_model = resource_name.to_s.singularize
-        BeyondCanvas.use_rails_app_controller = options.present? && options[:controller].present?
+        BeyondCanvas.use_rails_app_controller = options.present? && options[:custom_controller].present?
-        set_routes(resource_name, options[:controller]) if BeyondCanvas.use_rails_app_controller
+        set_routes if BeyondCanvas.use_rails_app_controller
       end
-      def set_routes(resource_name, controller)
-        resources resource_name, controller: controller
+      def set_routes
+        scope BeyondCanvas.configuration.namespace do
+          get  'callback', controller: :authentications, action: :new
+          post 'callback', controller: :authentications, action: :install
+        end
       end
     end
   end

data/lib/beyond_canvas/version.rb CHANGED

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

data/lib/generators/beyond_canvas/controller/controller_generator.rb CHANGED

@@ -12,8 +12,7 @@ module BeyondCanvas
       source_root File.expand_path('templates', __dir__)
       def create_controller
-        template 'controller.erb',
-                 "app/controllers/#{scope}_controller.rb"
+        template 'controller.erb', "app/controllers/#{scope}_controller.rb"
       end
     end
   end

data/lib/generators/beyond_canvas/controller/templates/controller.erb CHANGED

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 class <%= scope.camelize %>Controller < BeyondCanvas::AuthenticationsController
-  # before_action :configure_params, only: [:create]
+  # before_action :configure_params, only: [:install]
   # def new
   #   super
   # end
-  # def create
+  # def install
   #   super
   # end
@@ -17,21 +17,4 @@ class <%= scope.camelize %>Controller < BeyondCanvas::AuthenticationsController
   # def configure_params
   #   beyond_canvas_parameter_sanitizer.permit(:attribute1, :attribute2)
   # end
-  # The path used after creating the shop in the database
-  # def after_create_path
-  #   resource.return_url
-  # end
-  # def handle_active_record_exception(exception)
-  #   super
-  # end
-  # def handle_beyond_api_exception(exception)
-  #   super
-  # end
-  # def handle_standard_error_exception(exception)
-  #   super
-  # end
 end

data/lib/generators/beyond_canvas/custom_menu/custom_menu_generator.rb ADDED

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+module BeyondCanvas
+  module Generators
+    class CustomMenuGenerator < Rails::Generators::Base # :nodoc:
+      source_root File.expand_path('templates', __dir__)
+      def copy_initializer
+        copy_file 'beyond_canvas_custom_menu.html.erb', 'app/views/beyond_canvas/shared/_menu.html.erb'
+      end
+    end
+  end
+end

data/lib/generators/beyond_canvas/custom_menu/templates/beyond_canvas_custom_menu.html.erb ADDED

@@ -0,0 +1,32 @@
+<div class="menu">
+  <div class="menu--left">
+    <%= render 'beyond_canvas/shared/logo' %>
+  </div>
+  <div class="menu--center">
+<%
+=begin
+    Add here your menu links. You can use `menu__item` as class name and add
+    `menu__item--selected` as secondary class for selected menu item. E.g:
+    <%= link_to 'About us', about_us_path, class: "menu__item #{ 'menu__item--selected' if params[:controller] == 'about_us' }" %>
+    <%= link_to 'Support', support_path, class: "menu__item #{ 'menu__item--selected' if params[:controller] == 'support' }" %>
+=end
+%>
+  </div>
+  <div class="menu--right">
+<%
+=begin
+    You can also add here some content that will be right-aligned, like a user
+    avatar image or a dropdown account menu.
+=end
+%>
+  </div>
+</div>

data/lib/generators/beyond_canvas/custom_styles/custom_styles_generator.rb CHANGED

@@ -6,7 +6,7 @@ module BeyondCanvas
       source_root File.expand_path('templates', __dir__)
       def copy_initializer
-        template 'beyond_canvas_custom_styles.sass', 'app/assets/stylesheets/_beyond_canvas_custom_styles.sass'
+        template 'beyond_canvas_custom_styles.scss', 'app/assets/stylesheets/_beyond_canvas_custom_styles.scss'
       end
     end
   end

data/lib/generators/beyond_canvas/custom_styles/templates/beyond_canvas_custom_styles.scss CHANGED

@@ -11,7 +11,8 @@
 // General styles
 // ************************************************************
-// $main-background: rgb(233, 232, 220);
+// $main-background-public: rgb(233, 232, 220);
+// $main-background-application: rgb(233, 232, 220);
 // ************************************************************
 // Typography
@@ -81,19 +82,19 @@
 // Checkboxes
 // ************************************************************
-// $checkbox-checked-color: #97C344;
-// $checkbox-checked-background: #ffffff;
-// $checkbox-unchecked-color: #C2BF9D;
-// $checkbox-unchecked-background: #ffffff;
+// $checkbox-checked-color: #97C344; // This value MUST be HEX
+// $checkbox-checked-background: #ffffff; // This value MUST be HEX
+// $checkbox-unchecked-color: #C2BF9D; // This value MUST be HEX
+// $checkbox-unchecked-background: #ffffff; // This value MUST be HEX
 // ************************************************************
 // Radiobuttons
 // ************************************************************
-// $radio-checked-color: #97C344;
-// $radio-checked-background: #ffffff;
-// $radio-unchecked-color: #C2BF9D;
-// $radio-unchecked-background: #ffffff;
+// $radio-checked-color: #97C344; // This value MUST be HEX
+// $radio-checked-background: #ffffff; // This value MUST be HEX
+// $radio-unchecked-color: #C2BF9D; // This value MUST be HEX
+// $radio-unchecked-background: #ffffff; // This value MUST be HEX
 // ************************************************************
 // Hints
@@ -147,7 +148,52 @@
 // $notice-border-radius: 4px;
 // $notice-color: rgb(153, 153, 153);
+// ************************************************************
+// Breadcrums
+// ************************************************************
+// $breadcrum-color: rgb(122, 118, 76);
+// $breadcrum-color-current: rgb(61, 149, 137);
+// ************************************************************
+// Titles
+// ************************************************************
+// $title-color: rgb(122, 118, 76);
+// ************************************************************
+// Menu
+// ************************************************************
+// $menu-background: #1c3445;
+// $menu-height: 60px;
+// $menu-logo-height: 30px;
+// $menu-item-color: #9ab5c6;
+// $menu-item-hover-color: lighten($menu-item-color, 13%);
+// $menu-item-selected-color: #4eb7a8;
+// $menu-item-selected-hover-color: lighten($menu-item-selected-color, 13%);
+// ************************************************************
+// Action bar
+// ************************************************************
+// $action-bar-background: rgb(255, 255, 255);
+// $action-bar-shadow: 1px solid rgba(0, 0, 0, 0.2);
+// $action-bar-height: 73px;
 // ************************************************************
 // Markdown
 // ************************************************************
+// ************************************************************
+// Sidebar
+// ************************************************************
+// ************************************************************
+// Modals
+// ************************************************************
+// $modal-close-icon-color: #8b8b8b;
+// $modal-background-color: rgba(0, 0, 0, 0.5);