diff --git a/Gemfile b/Gemfile index 5e461b4..f4a9c65 100644 --- a/Gemfile +++ b/Gemfile @@ -86,7 +86,5 @@ end gem 'high_voltage', '~> 2.4.0' -gem 'simple_form' - # Errors on errbit gem 'airbrake' diff --git a/Gemfile.lock b/Gemfile.lock index 8f0edc5..8ee9fb8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -234,9 +234,6 @@ GEM select2-rails (3.5.9.3) thor (~> 0.14) sexp_processor (4.6.0) - simple_form (3.1.1) - actionpack (~> 4.0) - activemodel (~> 4.0) simplecov (0.10.0) docile (~> 1.1.0) json (~> 1.8) @@ -308,7 +305,6 @@ DEPENDENCIES sass-rails (~> 5.0) sdoc (~> 0.4.0) select2-rails - simple_form spring sqlite3 turbolinks diff --git a/app/views/transactions/new.html.haml b/app/views/transactions/new.html.haml index bd46894..bb10e56 100644 --- a/app/views/transactions/new.html.haml +++ b/app/views/transactions/new.html.haml @@ -1,5 +1,5 @@ = render 'partials/form_errors', object: @transaction -= simple_form_for @transaction do |f| += form_for @transaction do |f| - if current_user.penning = f.collection_select :debtor, User.all, :name, :name, { selected: @transaction.debtor.try(:name) || current_user.name }, { class: 'select2-selector'} @@ -7,7 +7,7 @@ = f.hidden_field :debtor, value: current_user.name = f.collection_select :creditor, User.all, :name, :name, { selected: @transaction.creditor.try(:name) || User.zeus.name }, { class: 'select2-selector' } - = f.input :message, required: true - = f.input :euros, input_html: { value: @transaction.amount/100} + = f.text_field :message, required: true + = f.number_field :euros, value: @transaction.amount/100 .pure-controls - = f.button :submit, "Send it!" + = f.submit "Send it!" diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb deleted file mode 100644 index bdf2171..0000000 --- a/config/initializers/simple_form.rb +++ /dev/null @@ -1,165 +0,0 @@ -# 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 pure-control-group", - hint_class: :field_with_hint, error_class: :field_with_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 - b.optional :maxlength - - # 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 :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 = 'pure-button pure-button-primary' - - # 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' - - # ID to add for error notification helper. - # config.error_notification_id = nil - - # 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 = "pure-form" - - # 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 = false - - # Collection of methods to detect if a file type was given. - # config.file_methods = [ :mounted_as, :file?, :public_filename ] - - # 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' -end diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml deleted file mode 100644 index 2374383..0000000 --- a/config/locales/simple_form.en.yml +++ /dev/null @@ -1,31 +0,0 @@ -en: - simple_form: - "yes": 'Yes' - "no": 'No' - required: - text: 'required' - mark: '*' - # You can uncomment the line below if you need to overwrite the whole required html. - # When using html, text and mark won't be used. - # html: '*' - error_notification: - default_message: "Please review the problems below:" - # Examples - # labels: - # defaults: - # password: 'Password' - # user: - # new: - # email: 'E-mail to sign in.' - # edit: - # email: 'E-mail.' - # hints: - # defaults: - # username: 'User name to sign in.' - # password: 'No special characters, please.' - # include_blanks: - # defaults: - # age: 'Rather not say' - # prompts: - # defaults: - # age: 'Select your age' diff --git a/lib/templates/haml/scaffold/_form.html.haml b/lib/templates/haml/scaffold/_form.html.haml deleted file mode 100644 index 705b47a..0000000 --- a/lib/templates/haml/scaffold/_form.html.haml +++ /dev/null @@ -1,10 +0,0 @@ -= simple_form_for(@<%= singular_table_name %>) do |f| - = f.error_notification - - .form-inputs - <%- attributes.each do |attribute| -%> - = f.<%= attribute.reference? ? :association : :input %> :<%= attribute.name %> - <%- end -%> - - .pure-controlls - = f.button :submit