Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

💄 Replace Formtastic with Simple Form (closes #86) #88

Merged
merged 1 commit into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ gem 'jquery-rails'
gem 'haml-rails'
gem 'gravatar_image_tag'
gem 'paperclip'
gem 'formtastic', '~> 3.1'
gem 'formtastic-bootstrap'
gem 'simple_form'
gem 'favicon_maker'
gem 'mini_magick'
gem 'puma'
Expand Down
10 changes: 4 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ GEM
favicon_maker (1.3.1)
docile (~> 1.1)
ffi (1.15.0)
formtastic (3.1.5)
actionpack (>= 3.2.13)
formtastic-bootstrap (3.1.1)
formtastic (>= 3.0)
git_rev (0.1.0)
globalid (0.4.2)
activesupport (>= 4.2.0)
Expand Down Expand Up @@ -208,6 +204,9 @@ GEM
sentry-raven (3.1.1)
faraday (>= 1.0)
sexp_processor (4.15.2)
simple_form (5.1.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
simplecov (0.13.0)
docile (~> 1.1.0)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -248,8 +247,6 @@ DEPENDENCIES
coffee-rails
faker
favicon_maker
formtastic (~> 3.1)
formtastic-bootstrap
git_rev
gravatar_image_tag
haml-rails
Expand All @@ -265,6 +262,7 @@ DEPENDENCIES
ruby-prof
sassc-rails
sentry-raven
simple_form
spring
sqlite3
uglifier
Expand Down
1 change: 0 additions & 1 deletion app/assets/stylesheets/application.css.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import "bootswatch/slate/variables";
@import "bootstrap";
@import "formtastic-bootstrap";
@import "bootswatch/slate/bootswatch";

// make room for navigation bar
Expand Down
10 changes: 5 additions & 5 deletions app/views/barcodes/_form.html.haml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
= semantic_form_for @barcode, :html => { :class => 'form-horizontal' } do |f|
= f.semantic_errors
= f.inputs do
= simple_form_for @barcode, :html => { :class => 'form-horizontal' } do |f|
= f.error_notification
.form-inputs
= f.input :id, hint: 'the label says…', input_html: { :autofocus => true }
= f.input :drink, hint: 'If you edit a drink and click on "add barcode" this will be prefilled for you.', as: "select", collection: @drinks
= f.actions do
= f.action :submit
.form-actions
= f.button :submit, class: 'btn-primary'
12 changes: 6 additions & 6 deletions app/views/drinks/_form.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
%li
= link_to 'delete drink', @drink, method: :delete, :data => {confirm: "Really delete drink #{@drink.name}?"}

= semantic_form_for @drink, :html => { :class => 'form-horizontal' } do |f|
= f.semantic_errors
= f.inputs do
= simple_form_for @drink, :html => { :class => 'form-horizontal' } do |f|
= f.error_notification
.form-inputs
= f.input :name, hint:'the label says…'
= f.input :price, as: :number, hint:'e.g. 1.50; locked due to vandalism', :input_html => { :disabled => true }
= f.input :price, as: :decimal, hint:'e.g. 1.50; locked due to vandalism', :input_html => { :disabled => true }
= f.input :bottle_size, hint: '0.5 or 0.33?'
= f.input :caffeine, hint: 'in mg/100 ml'
= f.input :logo, hint: 'make it look pretty'
= f.input :active
= f.actions do
= f.action :submit
.form-actions
= f.button :submit, class: 'btn-primary'
= link_to 'Add a barcode', new_barcode_path(:drink => @drink.id), :class => 'btn'
12 changes: 6 additions & 6 deletions app/views/users/_form.html.haml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
= semantic_form_for @user, :html => { :class => 'form-horizontal' } do |f|
= f.semantic_errors
= f.inputs do
= simple_form_for @user, :html => { :class => 'form-horizontal' } do |f|
= f.error_notification
.form-inputs
= f.input :name, hint: 'your nickname'
= f.input :email, hint: 'your eMail address. Only used to fetch your avatar from gravatar.com.'
= f.input :balance, :as => :number, hint: 'just in case you need to correct this'
= f.input :balance, :as => :decimal, hint: 'just in case you need to correct this'
= f.input :active
= f.input :audit, hint: 'This will create detailed logs about what you buy and deposit. If you uncheck this box, all records will be deleted.'
= f.input :redirect, hint: "Redirect after buying a drink?"
= f.actions do
= f.action :submit
.form-actions
= f.button :submit, class: 'btn-primary'

%style .user { display: initial!important; }
76 changes: 0 additions & 76 deletions config/initializers/formtastic.rb

This file was deleted.

176 changes: 176 additions & 0 deletions config/initializers/simple_form.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
# frozen_string_literal: true
#
# Uncomment this and change the path if necessary to include your own
# components.
# See https://github.com/plataformatec/simple_form#custom-components to know
# more about custom components.
# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
#
# Use this setup block to configure all options available in SimpleForm.
SimpleForm.setup do |config|
# Wrappers are used by the form builder to generate a
# complete input. You can remove any component from the
# wrapper, change the order or even add your own to the
# stack. The options given below are used to wrap the
# whole input.
config.wrappers :default, class: :input,
hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
## Extensions enabled by default
# Any of these extensions can be disabled for a
# given input by passing: `f.input EXTENSION_NAME => false`.
# You can make any of these extensions optional by
# renaming `b.use` to `b.optional`.

# Determines whether to use HTML5 (:email, :url, ...)
# and required attributes
b.use :html5

# Calculates placeholders automatically from I18n
# You can also pass a string as f.input placeholder: "Placeholder"
b.use :placeholder

## Optional extensions
# They are disabled unless you pass `f.input EXTENSION_NAME => true`
# to the input. If so, they will retrieve the values from the model
# if any exists. If you want to enable any of those
# extensions by default, you can change `b.optional` to `b.use`.

# Calculates maxlength from length validations for string inputs
# and/or database column lengths
b.optional :maxlength

# Calculate minlength from length validations for string inputs
b.optional :minlength

# Calculates pattern from format validations for string inputs
b.optional :pattern

# Calculates min and max from length validations for numeric inputs
b.optional :min_max

# Calculates readonly automatically from readonly attributes
b.optional :readonly

## Inputs
# b.use :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid'
b.use :label_input
b.use :hint, wrap_with: { tag: :span, class: :hint }
b.use :error, wrap_with: { tag: :span, class: :error }

## full_messages_for
# If you want to display the full error message for the attribute, you can
# use the component :full_error, like:
#
# b.use :full_error, wrap_with: { tag: :span, class: :error }
end

# The default wrapper to be used by the FormBuilder.
config.default_wrapper = :default

# Define the way to render check boxes / radio buttons with labels.
# Defaults to :nested for bootstrap config.
# inline: input + label
# nested: label > input
config.boolean_style = :nested

# Default class for buttons
config.button_class = 'btn'

# Method used to tidy up errors. Specify any Rails Array method.
# :first lists the first message for each field.
# Use :to_sentence to list all errors for each field.
# config.error_method = :first

# Default tag used for error notification helper.
config.error_notification_tag = :div

# CSS class to add for error notification helper.
config.error_notification_class = 'error_notification'

# Series of attempts to detect a default label method for collection.
# config.collection_label_methods = [ :to_label, :name, :title, :to_s ]

# Series of attempts to detect a default value method for collection.
# config.collection_value_methods = [ :id, :to_s ]

# You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
# config.collection_wrapper_tag = nil

# You can define the class to use on all collection wrappers. Defaulting to none.
# config.collection_wrapper_class = nil

# You can wrap each item in a collection of radio/check boxes with a tag,
# defaulting to :span.
# config.item_wrapper_tag = :span

# You can define a class to use in all item wrappers. Defaulting to none.
# config.item_wrapper_class = nil

# How the label text should be generated altogether with the required text.
# config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }

# You can define the class to use on all labels. Default is nil.
# config.label_class = nil

# You can define the default class to be used on forms. Can be overriden
# with `html: { :class }`. Defaulting to none.
# config.default_form_class = nil

# You can define which elements should obtain additional classes
# config.generate_additional_classes_for = [:wrapper, :label, :input]

# Whether attributes are required by default (or not). Default is true.
# config.required_by_default = true

# Tell browsers whether to use the native HTML5 validations (novalidate form option).
# These validations are enabled in SimpleForm's internal config but disabled by default
# in this configuration, which is recommended due to some quirks from different browsers.
# To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
# change this configuration to true.
config.browser_validations = true

# Custom mappings for input types. This should be a hash containing a regexp
# to match as key, and the input type that will be used when the field name
# matches the regexp as value.
# config.input_mappings = { /count/ => :integer }

# Custom wrappers for input types. This should be a hash containing an input
# type as key and the wrapper that will be used for all inputs with specified type.
# config.wrapper_mappings = { string: :prepend }

# Namespaces where SimpleForm should look for custom input classes that
# override default inputs.
# config.custom_inputs_namespaces << "CustomInputs"

# Default priority for time_zone inputs.
# config.time_zone_priority = nil

# Default priority for country inputs.
# config.country_priority = nil

# When false, do not use translations for labels.
# config.translate_labels = true

# Automatically discover new inputs in Rails' autoload path.
# config.inputs_discovery = true

# Cache SimpleForm inputs discovery
# config.cache_discovery = !Rails.env.development?

# Default class for inputs
# config.input_class = nil

# Define the default class of the input wrapper of the boolean input.
config.boolean_label_class = 'checkbox'

# Defines if the default input wrapper class should be included in radio
# collection wrappers.
# config.include_default_input_wrapper_class = true

# Defines which i18n scope will be used in Simple Form.
# config.i18n_scope = 'simple_form'

# Defines validation classes to the input_field. By default it's nil.
# config.input_field_valid_class = 'is-valid'
# config.input_field_error_class = 'is-invalid'
end
Loading