diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a88c3c9..ddef667 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -79,10 +79,6 @@ class UsersController < ApplicationController end def user_params - if params[:user] - params.require(:user).permit(:avatar) - else - {} - end + params.permit(:user).permit(:avatar) end end diff --git a/db/seeds.rb b/db/seeds.rb index 0d37028..9873c81 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -11,25 +11,88 @@ DEFAULT_PASSWORD = "password" products = [ { - name: 'Fanta', - price: 0.6, - category: 'beverages', - stock: 25, - avatar: File.new('public/seeds/products/fanta.jpg', 'r') + name: "Twix", + price: 0.4, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/1.jpg', 'r') }, { - name: 'Club Mate', - price: 1.2, - category: 'beverages', - stock: 25, - avatar: File.new('public/seeds/products/club_mate.jpg', 'r') + name: "M&M Peanuts", + price: 0.6, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/2.jpg', 'r') }, { - name: 'Kinder Bueno', - price: 0.6, - category: 'food', - stock: 15, - avatar: File.new('public/seeds/products/bueno.jpg', 'r') + name: "Snickers", + price: 0.4, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/3.jpg', 'r') + }, + { + name: "Fanta", + price: 0.6, + category: "beverages", + stock: 0, + avatar: File.new('public/seeds/products/4.jpg', 'r') + }, + { + name: "Ice Tea", + price: 0.7, + category: "beverages", + stock: 0, + avatar: File.new('public/seeds/products/5.jpg', 'r') + }, + { + name: "Cola", + price: 0.6, + category: "beverages", + stock: 0, + avatar: File.new('public/seeds/products/6.jpg', 'r') + }, + { + name: "Abrikozencake", + price: 0.4, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/7.jpg', 'r') + }, + { + name: "Kinder Delice", + price: 0.4, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/8.jpg', 'r') + }, + { + name: "Kinder Bueno", + price: 0.6, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/9.jpg', 'r') + }, + { + name: "Arizona Ice Tea", + price: 1.0, + category: "beverages", + stock: 0, + avatar: File.new('public/seeds/products/10.png', 'r') + }, + { + name: "Dinosauruskoeken", + price: 0.5, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/11.jpg', 'r') + }, + { + name: "Chocolade - melk", + price: 0.7, + category: "food", + stock: 0, + avatar: File.new('public/seeds/products/12.jpg', 'r') } ] diff --git a/public/seeds/products/1.jpg b/public/seeds/products/1.jpg new file mode 100644 index 0000000..2f78ae7 Binary files /dev/null and b/public/seeds/products/1.jpg differ diff --git a/public/seeds/products/10.png b/public/seeds/products/10.png new file mode 100644 index 0000000..a0fb65c Binary files /dev/null and b/public/seeds/products/10.png differ diff --git a/public/seeds/products/11.jpg b/public/seeds/products/11.jpg new file mode 100644 index 0000000..1b12ada Binary files /dev/null and b/public/seeds/products/11.jpg differ diff --git a/public/seeds/products/12.jpg b/public/seeds/products/12.jpg new file mode 100644 index 0000000..73be5da Binary files /dev/null and b/public/seeds/products/12.jpg differ diff --git a/public/seeds/products/2.jpg b/public/seeds/products/2.jpg new file mode 100644 index 0000000..26b042d Binary files /dev/null and b/public/seeds/products/2.jpg differ diff --git a/public/seeds/products/3.jpg b/public/seeds/products/3.jpg new file mode 100644 index 0000000..bcb6d27 Binary files /dev/null and b/public/seeds/products/3.jpg differ diff --git a/public/seeds/products/4.jpg b/public/seeds/products/4.jpg new file mode 100644 index 0000000..be33b77 Binary files /dev/null and b/public/seeds/products/4.jpg differ diff --git a/public/seeds/products/5.jpg b/public/seeds/products/5.jpg new file mode 100644 index 0000000..a8203b8 Binary files /dev/null and b/public/seeds/products/5.jpg differ diff --git a/public/seeds/products/6.jpg b/public/seeds/products/6.jpg new file mode 100644 index 0000000..4665a11 Binary files /dev/null and b/public/seeds/products/6.jpg differ diff --git a/public/seeds/products/7.jpg b/public/seeds/products/7.jpg new file mode 100644 index 0000000..b14a1bf Binary files /dev/null and b/public/seeds/products/7.jpg differ diff --git a/public/seeds/products/8.jpg b/public/seeds/products/8.jpg new file mode 100644 index 0000000..b8b38ae Binary files /dev/null and b/public/seeds/products/8.jpg differ diff --git a/public/seeds/products/9.jpg b/public/seeds/products/9.jpg new file mode 100644 index 0000000..36f3598 Binary files /dev/null and b/public/seeds/products/9.jpg differ diff --git a/public/seeds/products/bueno.jpg b/public/seeds/products/bueno.jpg deleted file mode 100644 index 99d1d5e..0000000 Binary files a/public/seeds/products/bueno.jpg and /dev/null differ diff --git a/public/seeds/products/club_mate.jpg b/public/seeds/products/club_mate.jpg deleted file mode 100644 index 36abe00..0000000 Binary files a/public/seeds/products/club_mate.jpg and /dev/null differ diff --git a/public/seeds/products/fanta.jpg b/public/seeds/products/fanta.jpg deleted file mode 100644 index f4e6848..0000000 Binary files a/public/seeds/products/fanta.jpg and /dev/null differ