diff --git a/Gemfile b/Gemfile index 4bfb083..1436c42 100644 --- a/Gemfile +++ b/Gemfile @@ -12,6 +12,7 @@ gem 'omniauth' gem 'puma', '>= 5.0' gem 'rails', '~> 7.1.4' gem 'redis', '>= 4.0.1' +gem 'simple_form' gem 'sprockets-rails' gem 'sqlite3', '>= 1.4' gem 'stimulus-rails' diff --git a/Gemfile.lock b/Gemfile.lock index 284c0b4..db1c8f7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -315,6 +315,9 @@ GEM rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) + simple_form (5.3.1) + actionpack (>= 5.2) + activemodel (>= 5.2) sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) @@ -409,6 +412,7 @@ DEPENDENCIES redis (>= 4.0.1) rspec-rails selenium-webdriver + simple_form sprockets-rails sqlite3 (>= 1.4) stimulus-rails diff --git a/app/controllers/tools_controller.rb b/app/controllers/tools_controller.rb index ed29fb7..8d2e99c 100644 --- a/app/controllers/tools_controller.rb +++ b/app/controllers/tools_controller.rb @@ -4,4 +4,29 @@ class ToolsController < ApplicationController def index @tools = Tool.all end + + def new + return redirect_to new_user_session_path, status: :see_other unless current_user.present? + + @tool = Tool.new + end + + def create + return redirect_to tools_path unless current_user.present? + + @tool = Tool.new(tool_params) + @tool.user = current_user + + if @tool.save + redirect_to tools_path + else + render :new, status: :unprocessable_entity + end + end + + private + + def tool_params + params.require(:tool).permit(:name, :brand_name) + end end diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 302144f..7ef8c69 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -1,11 +1,16 @@
-
-

- Welcome to the Hudson Valley Tool Library -

-

- These are the current tools that we have available -

+
+
+

+ Welcome to the Hudson Valley Tool Library +

+

+ These are the current tools that we have available +

+
+
+ <%= link_to '+ Add Tool', new_tool_path %> +
<%= turbo_frame_tag :tools_index, src: tools_path %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index a76bb6b..20d2b6a 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,17 +3,14 @@
<%= link_to root_path do %>
-

Hudson Valley

-

Tool Share

+

Catskill Community Tools

<% end %> -
- <% if current_user.present? %> <%= link_to "Log Out", destroy_user_session_path, data: { turbo_method: :delete }, class: "text-zinc-300" %> <% else %> diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1e401e6..80b95e1 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -6,12 +6,10 @@ <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %> - <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %> <%= javascript_importmap_tags %> - - + <%= render "layouts/header" %>
<%= yield %> diff --git a/app/views/tools/new.html.erb b/app/views/tools/new.html.erb new file mode 100644 index 0000000..df7b131 --- /dev/null +++ b/app/views/tools/new.html.erb @@ -0,0 +1,9 @@ +
+ <%= simple_form_for @tool do |f| %> +
+ <%= f.input :name, label: 'Tool Name', input_html: {class: 'block'} %> + <%= f.input :brand_name, label: 'Tool Brand', input_html: {class: 'block'} %> + <%= f.submit class: 'w-3/5 btn' %> +
+ <% end %> +
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb new file mode 100644 index 0000000..d268784 --- /dev/null +++ b/config/initializers/simple_form.rb @@ -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/heartcombo/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 overridden + # 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 = false + + # 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 diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml new file mode 100644 index 0000000..2374383 --- /dev/null +++ b/config/locales/simple_form.en.yml @@ -0,0 +1,31 @@ +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/spec/controllers/tools_controller_spec.rb b/spec/controllers/tools_controller_spec.rb index 1e7e011..da9c78b 100644 --- a/spec/controllers/tools_controller_spec.rb +++ b/spec/controllers/tools_controller_spec.rb @@ -20,4 +20,41 @@ expect(response.body).to have_content tool.user.email end end + + describe '#new' do + it 'works if you are a user' do + user = create(:user, :confirmed) + + sign_in user + + get new_tool_path + + expect(response).to be_successful + end + + it 'redirects if you are not logged in' do + get new_tool_path + + expect(response).to be_redirect + end + end + + describe '#create' do + subject { post tools_path, params: params } + let(:params) do + { + tool: { + name: 'Screwdrive', + brand_name: 'Makita' + } + } + end + + it 'creates a new tool if you are logged in' do + sign_in(create(:user, :confirmed)) + + expect { subject }.to change { Tool.count }.by 1 + expect(response).to be_redirect + end + end end diff --git a/spec/factories.rb b/spec/factories.rb index 8b4f041..c691e92 100644 --- a/spec/factories.rb +++ b/spec/factories.rb @@ -4,6 +4,10 @@ factory :user do email { 'finch@keating.com' } password { 'catnip' } + + trait :confirmed do + confirmed_at { 1.week.ago } + end end factory(:tool) do diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 886b07e..5ea004f 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -66,6 +66,10 @@ # have_content etc... config.include Capybara::RSpecMatchers, type: :request + # devise test helpers + config.include Devise::Test::IntegrationHelpers, type: :request + config.include Warden::Test::Helpers + # Filter lines from Rails gems in backtraces. config.filter_rails_from_backtrace! # arbitrary gems may also be filtered via: diff --git a/spec/system/user/adds_tool_spec.rb b/spec/system/user/adds_tool_spec.rb new file mode 100644 index 0000000..fbbdc48 --- /dev/null +++ b/spec/system/user/adds_tool_spec.rb @@ -0,0 +1,21 @@ +require 'rails_helper' + +RSpec.describe 'User adds tools', type: :system do + it 'allows a user to add a new tool' do + user = create(:user, :confirmed) + login_as(user) + visit root_path + + click_on '+ Add Tool' + + fill_in 'Tool Name', with: 'Impact Driver' + fill_in 'Tool Brand', with: 'Makita' + + click_on 'Create Tool' + + expect(page).to have_content 'Impact Drive' + end + + it 'redirects you to session new if you are not logged in' do + end +end