diff --git a/Gemfile.lock b/Gemfile.lock index 72989ad..d5f5e1b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -131,6 +131,8 @@ GEM nio4r (2.5.8) nokogiri (1.13.8-arm64-darwin) racc (~> 1.4) + nokogiri (1.13.8-x86_64-linux) + racc (~> 1.4) orm_adapter (0.5.0) popper_js (2.11.6) public_suffix (5.0.0) @@ -206,6 +208,7 @@ GEM activesupport (>= 5.2) sprockets (>= 3.0.0) sqlite3 (1.5.2-arm64-darwin) + sqlite3 (1.5.2-x86_64-linux) thor (1.2.1) tilt (2.0.11) timeout (0.3.0) @@ -222,6 +225,7 @@ GEM PLATFORMS arm64-darwin-21 + x86_64-linux DEPENDENCIES bootstrap (~> 5.2.1) diff --git a/app/controllers/product_categories_controller.rb b/app/controllers/product_categories_controller.rb deleted file mode 100644 index 180bc41..0000000 --- a/app/controllers/product_categories_controller.rb +++ /dev/null @@ -1,21 +0,0 @@ -class ProductCategoriesController < ApplicationController - def create - ProductCategory.create!(name: params.require(:product_category).permit(:name)) - redirect_to products_path, notice: 'Categoria cadastrada' - end - - def search - nome_a_buscar = params[:busca] - ProductCategory.where("name LIKE :param_busca OR outro_campo LIKE :param_busca OR mais_um_campo LIKE :param_busca ", - { param_busca: "%#{nome_a_buscar}%" } ) - - @transports = find_available_transports - - end - - private - - def find_available_transports() - FreightageFinder.new(transports, order).find() - end -end \ No newline at end of file diff --git a/app/controllers/products_controller.rb b/app/controllers/products_controller.rb index 039a826..8051780 100644 --- a/app/controllers/products_controller.rb +++ b/app/controllers/products_controller.rb @@ -1,61 +1,27 @@ class ProductsController < ApplicationController - before_action :set_product, only: %i[ show edit update destroy ] - - # GET /products - def index + def index @products = Product.all - @product = Product.new - @product_category = ProductCategory.new - @product_categories = ProductCategory.all - end - - # GET /products/1 - def show end - # GET /products/new def new @product = Product.new + @product_categories = ProductCategory.all end - # GET /products/1/edit - def edit - end - - # POST /products - def create - @product = Product.new(product_params) - - if @product.save - redirect_to @product, notice: "Product was successfully created." - else - render :new, status: :unprocessable_entity - end - end - - # PATCH/PUT /products/1 - def update - if @product.update(product_params) - redirect_to @product, notice: "Product was successfully updated." - else - render :edit, status: :unprocessable_entity + def create + @product = Product.new new_product_params + if @product.save + return redirect_to root_url, notice: 'Produto cadastrado com sucesso.' end + flash.notice = 'Produto não cadastrado' + render :new end - # DELETE /products/1 - def destroy - @product.destroy - redirect_to products_url, notice: "Product was successfully destroyed." - end - - private - # Use callbacks to share common setup or constraints between actions. - def set_product - @product = Product.find(params[:id]) - end + private - # Only allow a list of trusted parameters through. - def product_params - params.require(:product).permit(:name, :price, :product_category_id) + def new_product_params + params.require(:product).permit( + :name, :price, :product_category_id + ) end -end +end \ No newline at end of file diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb deleted file mode 100644 index 73ff2dc..0000000 --- a/app/controllers/welcome_controller.rb +++ /dev/null @@ -1,9 +0,0 @@ -class WelcomeController < ApplicationController - - - def index - - end - - -end \ No newline at end of file diff --git a/app/models/product_category.rb b/app/models/product_category.rb index 282738c..d95f936 100644 --- a/app/models/product_category.rb +++ b/app/models/product_category.rb @@ -1,3 +1,4 @@ class ProductCategory < ApplicationRecord validates :name, presence: true + has_many :products end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index c557d62..48665ca 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -11,46 +11,8 @@ - - -
- <%= notice %> - <%= yield %> -
+

Estoque de Produto

+ <%= notice %> + <%= yield %> diff --git a/app/views/product_categories/_product_category.html.erb b/app/views/product_categories/_product_category.html.erb deleted file mode 100644 index e216369..0000000 --- a/app/views/product_categories/_product_category.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= product_category.name %> \ No newline at end of file diff --git a/app/views/products/_form.html.erb b/app/views/products/_form.html.erb deleted file mode 100644 index a2a1d8e..0000000 --- a/app/views/products/_form.html.erb +++ /dev/null @@ -1,27 +0,0 @@ -<%= form_with(model: product) do |form| %> - <% if product.errors.any? %> -
-

<%= pluralize(product.errors.count, "error") %> prohibited this product from being saved:

- - -
- <% end %> - -
- <%= form.label :name, style: "display: block" %> - <%= form.text_field :name %> -
- -
- <%= form.label :price, style: "display: block" %> - <%= form.text_field :price %> -
- -
- <%= form.submit %> -
-<% end %> diff --git a/app/views/products/_product.html.erb b/app/views/products/_product.html.erb deleted file mode 100644 index 19ca353..0000000 --- a/app/views/products/_product.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -
-

- Name: - <%= product.name %> -

- -

- Price: - <%= product.price %> -

- -
diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb deleted file mode 100644 index 90cb860..0000000 --- a/app/views/products/edit.html.erb +++ /dev/null @@ -1,10 +0,0 @@ -

Editing product

- -<%= render "form", product: @product %> - -
- -
- <%= link_to "Show this product", @product %> | - <%= link_to "Back to products", products_path %> -
diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb index a84a004..86843aa 100644 --- a/app/views/products/index.html.erb +++ b/app/views/products/index.html.erb @@ -1,50 +1,14 @@ -

<%= notice %>

- -

Products

-
- <% @products.each do |product| %> - <%= render product %> -

- <%= link_to "Show this product", product %> -

- <% end %> -
-
-

Nova Categoria de Produto

-<%= form_with(model: @product_category) do |f| %> - <%= f.label :name %> - <%= f.text_field :name %> - <%= f.submit %> -<% end %> -
- - - -

Novo Produto

-<%= form_with(model: @product) do |form| %> -
- <%= form.label :name, style: "display: block" %> - <%= form.text_field :name %> -
- -
- <%= form.label :price, style: "display: block" %> - <%= form.text_field :price %> -
- -
- <%= form.label :condition_new, 'Produto Novo' %> - <%= form.radio_button :condition, :new %> - - <%= form.label :condition_used, 'Produto Usado' %> - <%= form.radio_button :condition, :used %> -
- -
- <%= form.submit %> -
-<% end %> - - -choose 'Produto Usado' - +
+
+ <%= link_to 'Cadastrar Novo Produto', new_product_path %> +
+
+ <% if @products.any? %> + <% @products.each do |product| %> + Nome: <%= product.name %> + Preço: <%= product.price %> + Categoria de Produto: <%= product.product_category.name %> + <% end %> + <% end %> +
+
\ No newline at end of file diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb index d438e41..953d92a 100644 --- a/app/views/products/new.html.erb +++ b/app/views/products/new.html.erb @@ -1,9 +1,11 @@ -

New product

+

Cadastrando Novo Produto

-<%= render "form", product: @product %> - -
- -
- <%= link_to "Back to products", products_path %> -
+<%= form_with model: @product do |f|%> + <%= f.label :name, 'Nome' %> + <%= f.text_field :name %> + <%= f.label :price, 'Preço' %> + <%= f.number_field :price %> + <%= f.label :product_category_id, 'Categoria de Produto' %> + <%= f.collection_select :product_category_id, @product_categories, :id, :name %> + <%= f.submit 'Salvar' %> +<% end %> \ No newline at end of file diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb deleted file mode 100644 index 7e30dc8..0000000 --- a/app/views/products/show.html.erb +++ /dev/null @@ -1,12 +0,0 @@ -

<%= notice %>

- -<%= render @product %> - -<%= render @product.product_category %> - -
- <%= link_to "Edit this product", edit_product_path(@product) %> | - <%= link_to "Back to products", products_path %> - - <%= button_to "Destroy this product", @product, method: :delete %> -
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb deleted file mode 100644 index 65777a5..0000000 --- a/app/views/welcome/index.html.erb +++ /dev/null @@ -1,42 +0,0 @@ -

<%= translate('.title') %>

- -
-
- <%= image_tag 'delivery.png', class: 'img-fluid' %> -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
#FirstLastHandle
1MarkOtto@mdo
2JacobThornton@fat
3Larry the Bird@twitter
-
-
- - -<%= link_to 'Início', root_path, class: 'btn btn-primary btn-lg' %> diff --git a/config/routes.rb b/config/routes.rb index e23c4d5..d2a0a2c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,8 +1,5 @@ Rails.application.routes.draw do - resources :products - resources :product_categories, only: [:create, :show] do - resources :products, only: [:create] - end - devise_for :users - root 'welcome#index' + root 'products#index' + + resources :products, only: %i[new create] end diff --git a/db/seeds.rb b/db/seeds.rb index fbaf120..e69de29 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,18 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the bin/rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: "Star Wars" }, { name: "Lord of the Rings" }]) -# Character.create(name: "Luke", movie: movies.first) - -User.create(email: user@email.com, password: ) -Company.create(name: , cnpj: ) -Product.create(name: , price: , company: ) - - - - - - -User.create(email: user@email.com, password: ) \ No newline at end of file diff --git a/spec/system/products/user_create_new_product_spec.rb b/spec/system/products/user_create_new_product_spec.rb new file mode 100644 index 0000000..37aefa3 --- /dev/null +++ b/spec/system/products/user_create_new_product_spec.rb @@ -0,0 +1,30 @@ +require 'rails_helper' + +describe 'Usuário cria um novo produto' do + it 'a partir de um formulário' do + + visit root_path + click_on 'Cadastrar Novo Produto' + + expect(page).to have_content 'Cadastrando Novo Produto' + expect(page).to have_field 'Nome' + expect(page).to have_field 'Preço' + expect(page).to have_field 'Categoria de Produto' + expect(page).to have_button 'Salvar' + end + + it 'com sucesso' do + product_category = ProductCategory.create!(name: 'Eletrônicos') + + visit new_product_path + fill_in 'Nome', with: 'TV' + fill_in 'Preço', with: '15000' + select 'Eletrônicos', from: 'Categoria de Produto' + click_on 'Salvar' + + expect(page).to have_content 'Produto cadastrado com sucesso.' + expect(page).to have_content 'Nome: TV' + expect(page).to have_content 'Preço: 15000' + expect(page).to have_content 'Categoria de Produto: Eletrônicos' + end +end \ No newline at end of file diff --git a/spec/system/user_view_home_page_spec.rb b/spec/system/user_view_home_page_spec.rb new file mode 100644 index 0000000..8ba94fb --- /dev/null +++ b/spec/system/user_view_home_page_spec.rb @@ -0,0 +1,10 @@ +require 'rails_helper' + +describe 'Usuário vê a home page' do + it 'com sucesso' do + visit root_path + + expect(page).to have_content 'Estoque de Produto' + expect(page).to have_link 'Cadastrar Novo Produto' + end +end \ No newline at end of file