beyond_canvas 0.1.0.pre → 0.2.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 065b4cc184018b0a41cfb7bb63ecc93003050d75df117d49010bfc57ccc1282d
-  data.tar.gz: c249481c868a9de71728c6e02f08905ea71d9adb357970076ef6cc7f2215698a
+  metadata.gz: 49a9a385d6f781b4a883067f73b0d7e901d2d4a46b070966e02d53e4959f7fcf
+  data.tar.gz: 78feebc3949210d672dc4cb4f07664cacb7d1cf7c18f91fb369e5f1691abeb1b
 SHA512:
-  metadata.gz: 7db8400076fc278cda8e852011989f7337ca02408cba731f56928983ef94f61703f0a3f66805aae8ff00ed34b87d43c9276b844b96eef13b1e947e158b95acf5
-  data.tar.gz: 9b364f193d29260ba2c2e9c5e8b4c54aeb9c11e8706a4d59e5b3c50c65bead504c174f435f199369671a8bc87d86f83eddc545cdb89ccb918dc24a21567dcd9c
+  metadata.gz: 1a0826bcd50861074e3d80a4d600230e07a1d26628072b672ea206bc6847da4f448212f1a44fce8ca8ca641f8336cef120febe2a1f918b29044804be3c29e3db
+  data.tar.gz: e886eaca919fc7ae5e4fb3173b97d648d72f0d4621b2368a359da74861ec9ace25ace69ce189c6700dd2a370f9d614e7c8c8916d6022b7d3d0ae2f0a892a1d1a

data/app/assets/stylesheets/components/_buttons.sass

@@ -15,6 +15,7 @@
 @mixin button-transparent($background)
   @if $button-box-shadow != 0
     box-shadow: $button-box-shadow darken($background, 10%)
+  background-color: transparent
   border: 1px solid $background
   color: $background
 

data/app/assets/stylesheets/components/_cards.sass

@@ -1,11 +1,26 @@
-%card
+.card
   background: $white
   border-radius: $card-border-radius
   box-shadow: $card-box-shadow
 
-.card
+  &:not(:last-child)
+    margin-bottom: $card-margin
+
+  &--relative
+    position: relative
 
   &--padding
-    @extend %card
     +padding($card-padding)
     box-sizing: border-box
+
+  &__separator
+    +margin($card-separator-spacing null)
+    border-bottom: 1px solid $card-separator-color
+    left: -#{$card-padding}
+    position: relative
+    width: calc(100% + 2 * #{$card-padding})
+
+  &__headline
+    color: $card-title-color
+    font-size: 20px
+    margin-bottom: 50px

data/app/assets/stylesheets/components/_inputs.sass

@@ -23,3 +23,20 @@
     color: $hint-color
     font-size: 13px
     margin-top: 1px
+
+  &__with-error
+    border-left: 2px solid $input-errors-color
+
+  &__errors
+    +padding(5px 7px)
+    +position(absolute, calc(100% + 8px) null null 0)
+    background-color: $input-errors-color
+    border-radius: 3px
+    color: $white
+    font-size: 13px
+    z-index: 1
+
+    &::before
+      +position(absolute, null null 100% 8px)
+      +triangle('up', 12px, 6px, $input-errors-color)
+      content: ''

data/app/assets/stylesheets/components/_links.sass

@@ -1,5 +1,8 @@
 .link
 
+  &__icon
+    margin-right: 10px
+
   &--primary
     +color-darken($link-primary-color, 10%)
 

data/app/assets/stylesheets/components/_main.sass

@@ -10,6 +10,19 @@
     width: 94%
 
     .logo
-      +margin($logo-margin-top-public auto 34px)
+      +margin($logo-margin-top-public auto $logo-margin-bottom-public)
       display: block
-      width: $logo-width-public
+      width: 238px
+
+.body--single-page
+  @extend %body
+
+  .main-wrapper
+    +margin(32px auto)
+    max-width: 876px
+    width: 94%
+
+    .logo
+      +margin($logo-margin-top-public auto $logo-margin-bottom-public)
+      display: block
+      width: 238px

data/app/assets/stylesheets/settings/_variables.sass

@@ -53,15 +53,19 @@ $card-border-radius:          3px !default
 $card-box-shadow:             0 2px 7px rgba($black, .2) !default
 $card-padding:                40px !global
 $card-margin:                 30px !global
+$card-separator-color:        rgb(222, 222, 222) !default
+$card-separator-spacing:      50px !global
+$card-title-color:            rgb(247, 133, 96) !default
 
 // Labels
 
 $label-color:                 rgb(128, 128, 128) !default
 
-// Text inputs
+// Inputs
 
 $input-border-color:          rgb(217, 216, 195) !default
 $input-border-color-focus:    $palette-primary !default
+$input-errors-color:          $palette-danger !default
 
 // Hints
 
@@ -69,5 +73,5 @@ $hint-color:                  rgb(158, 158, 158) !default
 
 // Logo
 
-$logo-width-public:           238px !default
 $logo-margin-top-public:      0 !default
+$logo-margin-bottom-public:   34px !default

data/app/form_builders/beyond_form_builder.rb

@@ -1,12 +1,19 @@
 class BeyondFormBuilder < ActionView::Helpers::FormBuilder
   def field_wrapper(attribute, args, &block)
     label = args[:label].present? ? args[:label] : attribute.to_s.humanize
+
+    if self.object.respond_to?(:errors) && self.object.errors.include?(attribute)
+      errors = self.object.errors[attribute].join(", ")
+    end
+
     @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
+        block.call +
+
+        (@template.content_tag(:label, errors, class: "input__errors") unless errors.blank?)
       end +
-      (@template.content_tag(:div, args[:hint], class: 'input__hint') if args[:hint].present?)
+      (@template.content_tag(:div, args[:hint].html_safe, class: 'input__hint') if args[:hint].present?)
     end
   end
 

data/app/helpers/beyond_canvas_helper.rb

@@ -0,0 +1,15 @@
+module BeyondCanvasHelper
+  def link_to_with_icon(name = nil, options = nil, fa_icon_class = nil, html_options = nil)
+    options ||= {}
+
+    html_options = convert_options_to_data_attributes(options, html_options)
+
+    url = url_for(options)
+    html_options["href".freeze] ||= url
+
+    content_tag("a".freeze, name || url, html_options) do
+      (fa_icon_class.nil? ? "" : content_tag("i".freeze, nil, class: ["link__icon " + fa_icon_class])) +
+      name
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ html
   head
     = csrf_meta_tags
     meta content='width=device-width, initial-scale=1.0' name='viewport' /
+    link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" rel="stylesheet" /
     = render 'beyond_canvas/custom/public_head'
 
   body.body--public

data/app/views/layouts/beyond_canvas/single_page.html.slim

@@ -0,0 +1,19 @@
+doctype html
+
+html
+  head
+    = csrf_meta_tags
+    meta content='width=device-width, initial-scale=1.0' name='viewport' /
+    link crossorigin="anonymous" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" rel="stylesheet" /
+    = render 'beyond_canvas/custom/public_head'
+
+  body.body--single-page
+    main.main class=("#{params[:controller].gsub(/[\/_]/, "-")}--#{params[:action]}")
+      .main-wrapper
+        - logo = Dir["app/assets/images/logo.*"].first
+        - unless logo.nil?
+          - if File.extname(logo) == '.svg'
+            = inline_svg File.basename(logo), class: 'logo'
+          - else
+            = image_tag File.basename(logo), class: 'logo'
+        = yield

data/lib/beyond_canvas/version.rb

@@ -1,3 +1,3 @@
 module BeyondCanvas
-  VERSION = "0.1.0.pre"
+  VERSION = "0.2.0.pre"
 end

data/lib/generators/beyond_canvas/form_utils/install_generator.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module BeyondCanvas
+  module FormUtils
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
+        source_root File.expand_path("../../../templates", __FILE__)
+
+        def copy_initializer
+          template "beyond_canvas_form_utils.rb", "config/initializers/beyond_canvas_form_utils.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/templates/beyond_canvas_form_utils.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  if html_tag =~ /<(input|textarea|select)/
+    error_class = "form__error"
+
+    doc = Nokogiri::XML(html_tag)
+    doc.children.each do |field|
+      unless field["type"] == "hidden"
+        unless field["class"] =~ /\berror\b/
+          field["class"] = "#{field['class']} #{error_class}".strip
+        end
+      end
+    end
+
+    doc.to_html.html_safe
+  else
+    html_tag
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beyond_canvas
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre
+  version: 0.2.0.pre
 platform: ruby
 authors:
 - Unai Abrisketa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-18 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bourbon
@@ -92,11 +92,15 @@ files:
 - app/assets/stylesheets/settings/_variables.sass
 - app/assets/stylesheets/utilities/_mixins.sass
 - app/form_builders/beyond_form_builder.rb
+- app/helpers/beyond_canvas_helper.rb
 - app/views/beyond_canvas/custom/_public_head.html.slim
 - app/views/layouts/beyond_canvas/public.html.slim
+- app/views/layouts/beyond_canvas/single_page.html.slim
 - beyond_canvas.gemspec
 - lib/beyond_canvas.rb
 - lib/beyond_canvas/version.rb
+- lib/generators/beyond_canvas/form_utils/install_generator.rb
+- lib/generators/templates/beyond_canvas_form_utils.rb
 homepage: https://github.com/ePages-de/beyond_canvas
 licenses:
 - MIT