beyond_canvas 0.17.0.pre → 0.20.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d68bb535d2ac13479fbf78d65485f4e4d75008ee76b717263460315c6a68fc8b
-  data.tar.gz: 71d0874d34489a4cf68aaac680865b70668fd95ec5acdb3570e1ac7dee5f5971
+  metadata.gz: 546dcb0ade52cea03999f68b2f8866e0d5c34cd714ccda4818f231db0e6996ea
+  data.tar.gz: bb27504cda97798e8b9e47ce98ec7efc73e664d3c727b3685ab5e4d77338b5ff
 SHA512:
-  metadata.gz: 0faf96cabf37ae07a4b4febc069a8b93a257e0341a5b1136dea1735d7d31df93e6c1f007ead4c9d90aa0ddfc28ce7555d672a8562cd4d0cf767c3241b397abe6
-  data.tar.gz: a3f482336565147692c27db3332314d00c290af8ce949028c0d8235f0236ad9d1fa2ea3760ea2b65fa28c26db41ec0d5447af3ce6d9b260f338617bccc89a6fe
+  metadata.gz: a76c13a79e053ff43dddb6d0bbf4d6c87fec754d2cf710b19cd375b89864b09e178665dcda6b9bbad5d6f60ae9abb492d2187eea98ac3a02b2d561ae7fc229ef
+  data.tar.gz: e6ecbdff28acf32f5414998b62f810379cc2d8a8796ad8b501480eca9ef2d93587fe94ef3c44c4baaa9b5da82bf76ff40995b75a30c43143434eaa1c3920be87

data/app/assets/stylesheets/beyond_canvas/base.scss

@@ -8,6 +8,7 @@
 @import "utilities/functions";
 @import "utilities/mixins";
 
+@import "components/action_bar";
 @import "components/actions";
 @import "components/breadcrumbs";
 @import "components/buttons";
@@ -17,19 +18,21 @@
 @import "components/debug";
 @import "components/flash";
 @import "components/forms";
+@import "components/grids";
 @import "components/inputs";
 @import "components/layouts";
 @import "components/links";
 @import "components/main";
 @import "components/margins";
 @import "components/markdown";
-@import "components/action_bar";
+@import "components/menu";
 @import "components/modals";
 @import "components/notices";
 @import "components/relative";
+@import "components/scrollbox";
 @import "components/sidebar";
 @import "components/spinner";
-@import "components/menu";
+@import "components/statuses";
 @import "components/tables";
-@import "components/titles";
 @import "components/texts";
+@import "components/titles";

data/app/assets/stylesheets/beyond_canvas/components/_grids.scss

@@ -0,0 +1,12 @@
+.grid {
+  &__container {
+    display: grid;
+    gap: 40px;
+    grid-template-columns: repeat(auto-fill, 385px);
+  }
+
+  &__item {
+    border: 1px solid #dfdecc;
+    padding: 20px;
+  }
+}

data/app/assets/stylesheets/beyond_canvas/components/_inputs.scss

@@ -29,6 +29,11 @@ select {
   background-repeat: no-repeat;
 }
 
+textarea {
+  min-height: 100px;
+  resize: vertical;
+}
+
 #{$all-text-inputs},
 select {
   &.input__error {

data/app/assets/stylesheets/beyond_canvas/components/_margins.scss

@@ -1,4 +1,8 @@
 .margin {
+  &--clear {
+    margin: 0 !important;
+  }
+
   &--top {
     margin-top: 30px;
   }

data/app/assets/stylesheets/beyond_canvas/components/_menu.scss

@@ -15,14 +15,24 @@
     height: $menu-logo-height;
   }
 
+  &--left {
+    display: inherit;
+  }
+
   &--center {
     left: 50%;
     position: absolute;
     transform: translateX(-50%);
+    display: inherit;
+  }
+
+  &--right {
+    display: inherit;
   }
 
   &__item {
     @include margin(0 15px);
+    line-height: 1;
     color: $menu-item-color;
 
     &:hover {

data/app/assets/stylesheets/beyond_canvas/components/_modals.scss

@@ -17,6 +17,14 @@
     }
   }
 
+  &__headline {
+    margin-bottom: 30px;
+    font-size: 24px;
+    font-weight: normal;
+    line-height: 1.2;
+    color: rgb(62, 62, 62);
+  }
+
   &__close {
     @include position(absolute, $modal-padding $modal-padding null null);
     @include size(14px);

data/app/assets/stylesheets/beyond_canvas/components/_scrollbox.scss

@@ -0,0 +1,35 @@
+.scrollbox {
+  max-height: 65vh;
+  overflow: auto;
+  width: 100%;
+
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+
+  background:
+    /* Shadow covers */
+    linear-gradient(white 30%, rgba(255,255,255,0)),
+    linear-gradient(rgba(255,255,255,0), white 70%) 0 100%,
+
+    /* Shadows */
+    radial-gradient(50% 0, farthest-side, rgba(0,0,0,.2), rgba(0,0,0,0)),
+    radial-gradient(50% 100%,farthest-side, rgba(0,0,0,.2), rgba(0,0,0,0)) 0 100%;
+  background:
+    /* Shadow covers */
+    linear-gradient(white 30%, rgba(255,255,255,0)),
+    linear-gradient(rgba(255,255,255,0), white 70%) 0 100%,
+
+    /* Shadows */
+    radial-gradient(farthest-side at 50% 0, rgba(0,0,0,.2), rgba(0,0,0,0)),
+    radial-gradient(farthest-side at 50% 100%, rgba(0,0,0,.2), rgba(0,0,0,0)) 0 100%;
+  background-repeat: no-repeat;
+  background-color: white;
+  background-size: 100% 40px, 100% 40px, 100% 14px, 100% 14px;
+
+  /* Opera doesn’t support this in the shorthand */
+  background-attachment: local, local, scroll, scroll;
+
+  &::-webkit-scrollbar {
+    display: none;
+  }
+}

data/app/assets/stylesheets/beyond_canvas/components/_statuses.scss

@@ -0,0 +1,27 @@
+.status {
+  @include padding(4px 6px);
+  font-size: 12px;
+  border-radius: 3px;
+  line-height: 1.2;
+  font-weight: 500;
+
+  &--good {
+    background-color: $status-good-background;
+    color: $status-good-color;
+  }
+
+  &--warning {
+    background-color: $status-warning-background;
+    color: $status-warning-color;
+  }
+
+  &--danger {
+    background-color: $status-danger-background;
+    color: $status-danger-color;
+  }
+
+  &--neutral {
+    border: 1px solid $status-neutral-background;
+    color: $status-neutral-color;
+  }
+}

data/app/assets/stylesheets/beyond_canvas/components/_texts.scss

@@ -1,7 +1,15 @@
 .text {
   &__align {
+    &--left {
+      text-align: left;
+    }
+
     &--center {
       text-align: center;
     }
+
+    &--right {
+      text-align: right;
+    }
   }
 }

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

@@ -161,6 +161,19 @@ $notice-error-background: rgb(218, 60, 60) !default;
 $notice-border-radius: 4px !default;
 $notice-color: rgb(153, 153, 153) !default;
 
+// ************************************************************
+// Status
+// ************************************************************
+
+$status-good-background: rgb(205,225,165) !default;
+$status-good-color: rgb(85,110,41) !default;
+$status-warning-background: rgb(249,220,166) !default;
+$status-warning-color: rgb(178,120,18) !default;
+$status-danger-background: rgb(247,174,163) !default;
+$status-danger-color: rgb(164,35,34) !default;
+$status-neutral-background: rgb(224,223,205) !default;
+$status-neutral-color: rgb(155,151,100) !default;
+
 // ************************************************************
 // Breadcrums
 // ************************************************************

data/app/controllers/beyond_canvas/application_controller.rb

@@ -7,5 +7,6 @@ module BeyondCanvas
     include ::BeyondCanvas::StatusCodes
     include ::BeyondCanvas::AuthenticationsHelper
     include ::BeyondCanvas::DebugHelper
+    include ::BeyondCanvas::ControllerHelper
   end
 end

data/app/form_builders/beyond_canvas/form_builder.rb

@@ -2,10 +2,6 @@
 
 module BeyondCanvas
   class FormBuilder < ActionView::Helpers::FormBuilder # :nodoc:
-    ############################################################################
-    # Wrappers
-    ############################################################################
-
     def field_wrapper(attribute, args, &block)
       label = args[:label] == false ? nil : args[:label].presence || attribute.to_s.humanize
 
@@ -38,14 +34,20 @@ module BeyondCanvas
       end
     end
 
-    %i[email text number password].each do |method|
-      define_method :"#{method}_field" do |attribute, args = {}|
+    %i[email_field text_field number_field password_field text_area].each do |method|
+      define_method method do |attribute, args = {}|
         field_wrapper(attribute, args) do
           super(attribute, args)
         end
       end
     end
 
+    def select(attribute, choices, options  = {}, args = {})
+      field_wrapper(attribute, args) do
+        super(attribute, choices, options, args)
+      end
+    end
+
     def check_box(attribute, args = {})
       inline_wrapper(attribute, args) do
         filed_identifyer = filed_identifyer(attribute)

data/app/helpers/beyond_canvas/controller_helper.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module ControllerHelper # :nodoc:
+    def beyond_canvas_controller?
+      self.class.const_defined?(:BeyondCanvas)
+    end
+  end
+end

data/app/helpers/beyond_canvas/statuses_helper.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module StatusesHelper # :nodoc:
+    %i[good warning danger neutral].each do |method|
+      define_method :"status_#{method}" do |name = nil, html_options = nil, &block|
+        status_render(method, name, html_options, &block)
+      end
+    end
+
+    private
+
+    def status_render(method, name = nil, html_options = nil, &block)
+      if block_given?
+        html_options = name
+        name = block
+      end
+
+      html_options ||= {}
+
+      html_options.merge!(class: "status status--#{method}") { |_key, old_val, new_val| [new_val, old_val].join(' ') }
+
+      content_tag('span', block_given? ? capture(&name) : name, html_options)
+    end
+  end
+end

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

@@ -16,7 +16,7 @@
 
         <% path = Rails.application.routes.recognize_path(url) %>
 
-        <% options = options.merge(class: 'menu__item--active') { |_key, old_val, new_val| [new_val, old_val].join(' ') if !external_url && path[:controller] == params[:controller] } %>
+        <% options = options.merge(class: 'menu__item--active') { |_key, old_val, new_val| [new_val, old_val].join(' ') } if !external_url && (path[:controller] == params[:controller]) %>
         <% options = options.merge(class: 'menu__item') { |_key, old_val, new_val| [new_val, old_val].join(' ') } %>
 
         <%= link_to name, url, options %>

data/lib/beyond_canvas/engine.rb

@@ -24,13 +24,10 @@ module BeyondCanvas
         include ::BeyondCanvas::StatusCodes
         include ::BeyondCanvas::AuthenticationsHelper
         include ::BeyondCanvas::DebugHelper
+        include ::BeyondCanvas::ControllerHelper
 
         ::ActionController::Base.helper BeyondCanvas::Engine.helpers
       end
-
-      ActiveSupport.on_load :action_mailer do
-        layout 'beyond_canvas/mailer'
-      end
     end
   end
 end

data/lib/beyond_canvas/version.rb

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

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

@@ -1,18 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails/generators/active_record'
-
 module BeyondCanvas
   module Generators
     class ControllerGenerator < Rails::Generators::Base # :nodoc:
       desc 'Creates an inherited Beyond Canvas controller in the app/controllers folder'
 
-      argument :scope, required: true, desc: 'The scope to create the controller, e.g. shops, users'
-
       source_root File.expand_path('templates', __dir__)
 
       def create_controller
-        template 'controller.erb', "app/controllers/#{scope}_controller.rb"
+        template 'shops_controller.rb', "app/controllers/shops_controller.rb"
       end
     end
   end

data/lib/generators/beyond_canvas/controller/templates/{controller.erb → shops_controller.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class <%= scope.camelize %>Controller < BeyondCanvas::AuthenticationsController
+class ShopsController < BeyondCanvas::AuthenticationsController
   # before_action :configure_params, only: [:install]
 
   # def new

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

@@ -7,25 +7,25 @@
   <div class="menu--center">
 
 <%
-=begin
+=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
-%>
+<%
+=end %>
 
   </div>
 
   <div class="menu--right">
 
 <%
-=begin
+=begin %>
     You can also add here some content that will be right-aligned, like a user
     avatar image or a dropdown account menu.
-=end
-%>
+<%
+=end %>
 
   </div>
 

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

@@ -148,6 +148,19 @@
 // $notice-border-radius: 4px;
 // $notice-color: rgb(153, 153, 153);
 
+// ************************************************************
+// Status
+// ************************************************************
+
+// $status-good-background: rgb(205,225,165);
+// $status-good-color: rgb(85,110,41);
+// $status-warning-background: rgb(249,220,166);
+// $status-warning-color: rgb(178,120,18);
+// $status-danger-background: rgb(247,174,163);
+// $status-danger-color: rgb(164,35,34);
+// $status-neutral-background: rgb(224,223,205);
+// $status-neutral-color: rgb(155,151,100);
+
 // ************************************************************
 // Breadcrums
 // ************************************************************

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

@@ -83,7 +83,7 @@ BeyondCanvas.setup do |config|
   #
   <% unless @skip_webpacker %># <% end %>config.skip_webpacker = <%= @skip_webpacker %>
 
-  # ==> Authentication with ePages Beyond API
+  # ==> Database encryption
 
   config.encryption_key = '<%= SecureRandom.hex(32) %>'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beyond_canvas
 version: !ruby/object:Gem::Version
-  version: 0.17.0.pre
+  version: 0.20.0.pre
 platform: ruby
 authors:
 - Unai Abrisketa
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: attr_encrypted
@@ -240,6 +240,7 @@ files:
 - app/assets/stylesheets/beyond_canvas/components/_debug.scss
 - app/assets/stylesheets/beyond_canvas/components/_flash.scss
 - app/assets/stylesheets/beyond_canvas/components/_forms.scss
+- app/assets/stylesheets/beyond_canvas/components/_grids.scss
 - app/assets/stylesheets/beyond_canvas/components/_inputs.scss
 - app/assets/stylesheets/beyond_canvas/components/_layouts.scss
 - app/assets/stylesheets/beyond_canvas/components/_links.scss
@@ -250,8 +251,10 @@ files:
 - app/assets/stylesheets/beyond_canvas/components/_modals.scss
 - app/assets/stylesheets/beyond_canvas/components/_notices.scss
 - app/assets/stylesheets/beyond_canvas/components/_relative.scss
+- app/assets/stylesheets/beyond_canvas/components/_scrollbox.scss
 - app/assets/stylesheets/beyond_canvas/components/_sidebar.scss
 - app/assets/stylesheets/beyond_canvas/components/_spinner.scss
+- app/assets/stylesheets/beyond_canvas/components/_statuses.scss
 - app/assets/stylesheets/beyond_canvas/components/_tables.scss
 - app/assets/stylesheets/beyond_canvas/components/_texts.scss
 - app/assets/stylesheets/beyond_canvas/components/_titles.scss
@@ -273,8 +276,10 @@ files:
 - app/helpers/beyond_canvas/application_helper.rb
 - app/helpers/beyond_canvas/authentications_helper.rb
 - app/helpers/beyond_canvas/cockpit_app_helper.rb
+- app/helpers/beyond_canvas/controller_helper.rb
 - app/helpers/beyond_canvas/debug_helper.rb
 - app/helpers/beyond_canvas/locale_switch_helper.rb
+- app/helpers/beyond_canvas/statuses_helper.rb
 - app/javascript/beyond_canvas/base.js
 - app/javascript/beyond_canvas/initializers/buttons.js
 - app/javascript/beyond_canvas/initializers/flash.js
@@ -315,7 +320,7 @@ files:
 - lib/generators/beyond_canvas/assets/templates/beyond_canvas.scss
 - lib/generators/beyond_canvas/beyond_api/beyond_api_generator.rb
 - lib/generators/beyond_canvas/controller/controller_generator.rb
-- lib/generators/beyond_canvas/controller/templates/controller.erb
+- lib/generators/beyond_canvas/controller/templates/shops_controller.rb
 - lib/generators/beyond_canvas/custom_menu/custom_menu_generator.rb
 - lib/generators/beyond_canvas/custom_menu/templates/beyond_canvas_custom_menu.html.erb
 - lib/generators/beyond_canvas/custom_styles/custom_styles_generator.rb