RubyGems - beyond_canvas - Versions diffs - 0.13.1.pre → 0.14.0.pre - Mend

beyond_canvas 0.13.1.pre → 0.14.0.pre

Files changed (101) hide show

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

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

	@@ -0,0 +1 @@
1	+

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

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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>

data/app/views/beyond_canvas/shared/_logo.html.erb ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ <% logo = BeyondCanvas.configuration.site_logo %>
2	+ <%= logo_image_tag(logo) unless logo.nil? %>

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

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<%= render 'beyond_canvas/shared/head' %>
+<body class="body--public">
+  <main class="main <%= params[:controller].gsub(/[\/_]/, "-") %>--<%= params[:action] %>">
+    <%= render 'beyond_canvas/shared/flash' %>
+    <%= render 'beyond_canvas/locales/edit' %>
+    <div class="main-wrapper">
+      <%= render 'beyond_canvas/shared/logo' %>
+      <%= yield %>
+    </div>
+  </main>
+</body>
+</html>

data/config/initializers/beyond_canvas/filter_parameter_logging.rb CHANGED Viewed

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 # Filter app installation parameters
-Rails.application.config.filter_parameters += [
-  :access_token_url,
-  :code,
-  :return_url,
-  :signature
+Rails.application.config.filter_parameters += %i[
+  access_token_url
+  code
+  return_url
+  signature
 ]

data/lib/beyond_canvas.rb CHANGED Viewed

@@ -4,32 +4,27 @@ require 'beyond_canvas/engine'
 require 'colorize'
+require 'jquery-rails'
 require 'bourbon'
-require 'slim-rails'
+require 'sassc-rails'
 require 'inline_svg'
 require 'http/accept'
 require 'premailer/rails'
 require 'beyond_api'
-module BeyondCanvas
-  class << self
-    attr_accessor :configuration
-  end
+module BeyondCanvas # :nodoc:
+  autoload :AssetRegistration, 'beyond_canvas/asset_registration'
+  autoload :Configuration,     'beyond_canvas/configuration'
-  def self.setup
-    self.configuration ||= Configuration.new
-    yield configuration
-  end
-  class Configuration
-    attr_accessor :public_logo, :stylesheet_link_tag, :javascript_include_tag
+  class << self
+    def configuration
+      @configuration ||= ::BeyondCanvas::Configuration.new
+    end
-    def initialize
-      @public_logo = nil
-      @stylesheet_link_tag = 'application'
-      @javascript_include_tag = 'application'
+    def setup
+      configuration.setup!
+      yield configuration
     end
   end
 end

data/lib/beyond_canvas/asset_registration.rb ADDED Viewed

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+module BeyondCanvas
+  module AssetRegistration # :nodoc:
+    def register_stylesheet(path, options = {})
+      stylesheets[path] = options
+    end
+    def stylesheets
+      @stylesheets ||= {}
+    end
+    def clear_stylesheets!
+      stylesheets.clear
+    end
+    def register_javascript(name)
+      javascripts.add name
+    end
+    def javascripts
+      @javascripts ||= Set.new
+    end
+    def clear_javascripts!
+      javascripts.clear
+    end
+  end
+end

data/lib/beyond_canvas/configuration.rb ADDED Viewed

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+module BeyondCanvas
+  class Configuration # :nodoc:
+    attr_accessor :site_title, :site_logo, :favicon, :skip_webpacker
+    include AssetRegistration
+    def initialize
+      @site_title = ::Rails.application.class.name.split('::').first.humanize
+      @site_logo = nil
+      @favicon = nil
+      @skip_webpacker = false
+    end
+    def setup!
+      register_default_assets
+    end
+    private
+    def register_default_assets
+      register_stylesheet 'beyond_canvas.css', media: 'screen'
+      register_javascript 'beyond_canvas.js'
+    end
+  end
+end

data/lib/beyond_canvas/engine.rb CHANGED Viewed

@@ -1,9 +1,18 @@
 # frozen_string_literal: true
 module BeyondCanvas
-  class Engine < ::Rails::Engine
+  class Engine < ::Rails::Engine # :nodoc:
     isolate_namespace BeyondCanvas
+    initializer 'beyond_canvas.assets.precompile' do |app|
+      BeyondCanvas.configuration.stylesheets.each do |path, _|
+        app.config.assets.precompile << path
+      end
+      BeyondCanvas.configuration.javascripts.each do |path|
+        app.config.assets.precompile << path
+      end
+    end
     config.before_initialize do
       ActiveSupport.on_load :action_controller do
         include ::BeyondCanvas::LocaleManagement

data/lib/beyond_canvas/version.rb CHANGED Viewed

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

data/lib/generators/beyond_canvas/assets/assets_generator.rb ADDED Viewed

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module BeyondCanvas
+  module Generators
+    class AssetsGenerator < Rails::Generators::Base # :nodoc:
+      source_root File.expand_path('templates', __dir__)
+      def install_assets
+        template 'beyond_canvas.js', 'app/assets/javascripts/beyond_canvas.js'
+        template 'beyond_canvas.scss', 'app/assets/stylesheets/beyond_canvas.scss'
+      end
+    end
+  end
+end

data/lib/generators/beyond_canvas/assets/templates/beyond_canvas.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ //= require beyond_canvas/base

data/lib/generators/beyond_canvas/assets/templates/beyond_canvas.scss ADDED Viewed

	@@ -0,0 +1 @@
1	+ @import "beyond_canvas/base";

data/lib/generators/beyond_canvas/{install_generator.rb → beyond_api/beyond_api_generator.rb} RENAMED Viewed

@@ -2,13 +2,7 @@
 module BeyondCanvas
   module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __dir__)
-      def copy_initializer
-        template 'beyond_canvas.rb', 'config/initializers/beyond_canvas.rb'
-      end
+    class BeyondApiGenerator < Rails::Generators::Base # :nodoc:
       def install_beyond_api
         require 'beyond_api'

data/lib/generators/beyond_canvas/{custom_styles_generator.rb → custom_styles/custom_styles_generator.rb} RENAMED Viewed

@@ -2,8 +2,8 @@
 module BeyondCanvas
   module Generators
-    class CustomStylesGenerator < Rails::Generators::Base
-      source_root File.expand_path('../templates', __dir__)
+    class CustomStylesGenerator < Rails::Generators::Base # :nodoc:
+      source_root File.expand_path('templates', __dir__)
       def copy_initializer
         template 'beyond_canvas_custom_styles.sass', 'app/assets/stylesheets/_beyond_canvas_custom_styles.sass'

data/lib/generators/{templates → beyond_canvas/custom_styles/templates}/beyond_canvas_custom_styles.sass RENAMED Viewed

File without changes

data/lib/generators/beyond_canvas/install/install_generator.rb ADDED Viewed

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module BeyondCanvas
+  module Generators
+    class InstallGenerator < Rails::Generators::Base # :nodoc:
+      desc 'Installs Beyond Canvas and generates the necessary files'
+      class_option :skip_webpacker, type: :boolean, default: false, desc: 'Use Sprockets assets instead of Webpacker'
+      source_root File.expand_path('templates', __dir__)
+      def copy_initializer
+        @skip_webpacker = options[:skip_webpacker]
+        template 'beyond_canvas.rb.erb', 'config/initializers/beyond_canvas.rb'
+      end
+      def setup_routes
+        route "mount BeyondCanvas::Engine => '/'"
+      end
+      def create_assets
+        if options[:skip_webpacker]
+          generate 'beyond_canvas:assets'
+        else
+          generate 'beyond_canvas:webpacker'
+        end
+      end
+      def install_beyond_api
+        generate 'beyond_api:install'
+      end
+    end
+  end
+end

data/lib/generators/beyond_canvas/install/templates/beyond_canvas.rb.erb ADDED Viewed

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+BeyondCanvas.setup do |config|
+  # ==> Site configuration
+  # Set the title that is displayed on the main layout..
+  #
+  config.site_title = '<%= Rails.application.class.name.split("::").first.humanize %>'
+  # Set an optional image to be displayed instead of a string. Accepts any
+  # string supported by image_tag's source parameter or a SVG file. Overrides
+  # :site_title.
+  #
+  # config.site_logo = 'logo.png'
+  # Set the favicon of the site.
+  #
+  # config.favicon = 'favicon.ico'
+  # ==> Stylesheets & Javascripts
+  # We recommend using the built in Beyond Canvas layout and loading up your own
+  # stylesheets / javascripts to customize the look and feel.
+  #
+  # To load a stylesheet:
+  #   config.register_stylesheet 'my_stylesheet.css'
+  #
+  # You can provide an options hash for more control, which is passed along to stylesheet_link_tag():
+  #   config.register_stylesheet 'my_print_stylesheet.css', media: :print
+  #
+  # To load a javascript file:
+  #   config.register_javascript 'my_javascript.js'
+  # ==> Webpacker
+  # By default, Active Admin uses Webpacker.
+  # You can switch to using Sprocket's asset pipeline here.
+  #
+  <% unless @skip_webpacker %># <% end %>config.skip_webpacker = <%= @skip_webpacker %>
+end