diff --git a/app/views/users/users_products.html.erb b/app/views/users/users_products.html.erb
new file mode 100644
index 0000000000..df521d48e1
--- /dev/null
+++ b/app/views/users/users_products.html.erb
@@ -0,0 +1,21 @@
+
+
+ <%= @merchant.user_name %>
+
+
+ Products
+
+
+
+ <% @products.each do |product| %>
+ <%=image_tag("#{product.image_url}")%>
+
+
+ Product ID:
+
+ <%= product.id %>
+ <%= link_to product.name, product_path(product.id) %>
+ <%= product.price_in_dollars %>
+
+ <%end%>
+
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 3f66539d54..56d0a0dc95 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,56 +1,38 @@
Rails.application.routes.draw do
- # The priority is based upon order of creation: first created -> highest priority.
- # See how all your routes lay out with "rake routes".
-
- # You can have the root of your site routed with "root"
- # root 'welcome#index'
-
- # Example of regular route:
- # get 'products/:id' => 'catalog#view'
-
- # Example of named route that can be invoked with purchase_url(id: product.id)
- # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase
-
- # Example resource route (maps HTTP verbs to controller actions automatically):
- # resources :products
-
- # Example resource route with options:
- # resources :products do
- # member do
- # get 'short'
- # post 'toggle'
- # end
- #
- # collection do
- # get 'sold'
- # end
- # end
-
- # Example resource route with sub-resources:
- # resources :products do
- # resources :comments, :sales
- # resource :seller
- # end
-
- # Example resource route with more complex sub-resources:
- # resources :products do
- # resources :comments
- # resources :sales do
- # get 'recent', on: :collection
- # end
- # end
-
- # Example resource route with concerns:
- # concern :toggleable do
- # post 'toggle'
- # end
- # resources :posts, concerns: :toggleable
- # resources :photos, concerns: :toggleable
-
- # Example resource route within a namespace:
- # namespace :admin do
- # # Directs /admin/products/* to Admin::ProductsController
- # # (app/controllers/admin/products_controller.rb)
- # resources :products
- # end
+
+ # Creates an empty cart and an order id for guests from session id
+ root 'sessions#create_order'
+
+ get '/complete' => 'orders#show', as: 'complete_order'
+ get '/checkout' => 'orders#new', as: 'checkout'
+
+ post '/checkout' => 'orders#create'
+
+
+ get '/cart' => 'order_item#index', as: 'cart'
+ post '/cart' => 'order_item#create'
+ delete '/cart' => 'order_item#destroy'
+ patch '/cart/:id' => 'order_item#update', as: 'update_cart'
+ get 'dashboard/:id' => 'users#show', :as => 'dashboard'
+ get 'dashboard/orders/:id' => 'users#show_merchant', :as => 'orders_dashboard'
+ get 'dashboard/order_item/:id' => 'order_item#show', :as => 'order_item'
+ patch 'dashboard/order_item/:id' => 'users#update_order_item'
+ get 'dashboard/order/:id' => 'users#show_merchant_order', :as => 'merchant_order'
+ get 'store/:id' => 'products#show_merchant_store', :as => 'merchant_store'
+
+ get '/categories/:category_id/products' => 'products#show_by_category', as: "category_products"
+ delete '/logout' => 'sessions#destroy'
+
+ resources :sessions, :only => [:new, :create, :destroy]
+
+ resources :users, :only => [:new, :create] do
+
+ end
+
+ resources :products do
+ resources :reviews, :only => [:new, :create]
+ end
+
+ resources :categories, :only => [:new, :create]
+
end
diff --git a/db/migrate/20160502230623_create_users.rb b/db/migrate/20160502230623_create_users.rb
new file mode 100644
index 0000000000..cd9c3a2818
--- /dev/null
+++ b/db/migrate/20160502230623_create_users.rb
@@ -0,0 +1,12 @@
+class CreateUsers < ActiveRecord::Migration
+ def change
+ create_table :users do |t|
+ t.text :user_name, null: false
+ t.text :email, null: false
+ t.text :password, null: false
+ t.text :password_confirmation, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160502230640_create_products.rb b/db/migrate/20160502230640_create_products.rb
new file mode 100644
index 0000000000..85dc351ad3
--- /dev/null
+++ b/db/migrate/20160502230640_create_products.rb
@@ -0,0 +1,11 @@
+class CreateProducts < ActiveRecord::Migration
+ def change
+ create_table :products do |t|
+ t.text :name, null: false
+ t.decimal :price_in_dollars, null: false
+ t.integer :user_id, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160502230649_create_orders.rb b/db/migrate/20160502230649_create_orders.rb
new file mode 100644
index 0000000000..1a17cf5af8
--- /dev/null
+++ b/db/migrate/20160502230649_create_orders.rb
@@ -0,0 +1,10 @@
+class CreateOrders < ActiveRecord::Migration
+ def change
+ create_table :orders do |t|
+ t.text :order_item_collecton
+ t.integer :user_id, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160502230707_create_order_items.rb b/db/migrate/20160502230707_create_order_items.rb
new file mode 100644
index 0000000000..b5e1f14fc4
--- /dev/null
+++ b/db/migrate/20160502230707_create_order_items.rb
@@ -0,0 +1,11 @@
+class CreateOrderItems < ActiveRecord::Migration
+ def change
+ create_table :order_items do |t|
+ t.integer :order_id, null: false
+ t.integer :product_id, null: false
+ t.integer :quantity, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160502230715_create_reviews.rb b/db/migrate/20160502230715_create_reviews.rb
new file mode 100644
index 0000000000..ce2d57bdbb
--- /dev/null
+++ b/db/migrate/20160502230715_create_reviews.rb
@@ -0,0 +1,12 @@
+class CreateReviews < ActiveRecord::Migration
+ def change
+ create_table :reviews do |t|
+ t.integer :rating, null: false
+ t.text :review_text
+ t.integer :user_id
+ t.integer :product_id, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160503163352_add_categories_column_to_products.rb b/db/migrate/20160503163352_add_categories_column_to_products.rb
new file mode 100644
index 0000000000..eebe5168f2
--- /dev/null
+++ b/db/migrate/20160503163352_add_categories_column_to_products.rb
@@ -0,0 +1,7 @@
+class AddCategoriesColumnToProducts < ActiveRecord::Migration
+ def change
+ change_table :products do |t|
+ t.text :categories
+ end
+ end
+end
diff --git a/db/migrate/20160503212426_add_password_digest_to_users.rb b/db/migrate/20160503212426_add_password_digest_to_users.rb
new file mode 100644
index 0000000000..fef0b8a730
--- /dev/null
+++ b/db/migrate/20160503212426_add_password_digest_to_users.rb
@@ -0,0 +1,8 @@
+class AddPasswordDigestToUsers < ActiveRecord::Migration
+ def change
+ change_table :users do |t|
+ t.string :password_digest
+ end
+ end
+end
+
diff --git a/db/migrate/20160503221632_add_quantity_column_to_products.rb b/db/migrate/20160503221632_add_quantity_column_to_products.rb
new file mode 100644
index 0000000000..ce2ee4993c
--- /dev/null
+++ b/db/migrate/20160503221632_add_quantity_column_to_products.rb
@@ -0,0 +1,7 @@
+class AddQuantityColumnToProducts < ActiveRecord::Migration
+ def change
+ change_table :products do |t|
+ t.integer :quantity
+ end
+ end
+end
diff --git a/db/migrate/20160503222018_alter_users_to_remove_pass_conf.rb b/db/migrate/20160503222018_alter_users_to_remove_pass_conf.rb
new file mode 100644
index 0000000000..750689d919
--- /dev/null
+++ b/db/migrate/20160503222018_alter_users_to_remove_pass_conf.rb
@@ -0,0 +1,5 @@
+class AlterUsersToRemovePassConf < ActiveRecord::Migration
+ def change
+ remove_column :users, :password_confirmation
+ end
+end
diff --git a/db/migrate/20160503222610_update_users_pass_digest_to_be_not_null.rb b/db/migrate/20160503222610_update_users_pass_digest_to_be_not_null.rb
new file mode 100644
index 0000000000..1845e1ee6b
--- /dev/null
+++ b/db/migrate/20160503222610_update_users_pass_digest_to_be_not_null.rb
@@ -0,0 +1,5 @@
+class UpdateUsersPassDigestToBeNotNull < ActiveRecord::Migration
+ def change
+ change_column :users, :password_digest, :string, null: false
+ end
+end
diff --git a/db/migrate/20160505024127_remove_password_from_users.rb b/db/migrate/20160505024127_remove_password_from_users.rb
new file mode 100644
index 0000000000..b29c880869
--- /dev/null
+++ b/db/migrate/20160505024127_remove_password_from_users.rb
@@ -0,0 +1,5 @@
+class RemovePasswordFromUsers < ActiveRecord::Migration
+ def change
+ remove_column :users, :password
+ end
+end
diff --git a/db/migrate/20160505172421_add_visibility_tracking_and_categories_to_products.rb b/db/migrate/20160505172421_add_visibility_tracking_and_categories_to_products.rb
new file mode 100644
index 0000000000..aa31fa67b1
--- /dev/null
+++ b/db/migrate/20160505172421_add_visibility_tracking_and_categories_to_products.rb
@@ -0,0 +1,7 @@
+class AddVisibilityTrackingAndCategoriesToProducts < ActiveRecord::Migration
+ def change
+ change_table :products do |t|
+ t.boolean :visible
+ end
+ end
+end
diff --git a/db/migrate/20160505173932_add_column_for_picture_url_to_products.rb b/db/migrate/20160505173932_add_column_for_picture_url_to_products.rb
new file mode 100644
index 0000000000..861552d600
--- /dev/null
+++ b/db/migrate/20160505173932_add_column_for_picture_url_to_products.rb
@@ -0,0 +1,7 @@
+class AddColumnForPictureUrlToProducts < ActiveRecord::Migration
+ def change
+ change_table :products do |t|
+ t.text :image_url
+ end
+ end
+end
diff --git a/db/migrate/20160506054520_add_model_for_billing.rb b/db/migrate/20160506054520_add_model_for_billing.rb
new file mode 100644
index 0000000000..bb2865f4cf
--- /dev/null
+++ b/db/migrate/20160506054520_add_model_for_billing.rb
@@ -0,0 +1,15 @@
+class AddModelForBilling < ActiveRecord::Migration
+ def change
+ create_table :billings do |t|
+ t.text :email, null: false
+ t.text :address, null: false
+ t.text :name_on_cc, null: false
+ t.integer :number_on_cc, null: false
+ t.text :security_on_cc, null: false
+ t.datetime :expiration_on_cc, null: false
+ t.integer :zip, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160506154408_add_catagory_table.rb b/db/migrate/20160506154408_add_catagory_table.rb
new file mode 100644
index 0000000000..e3eb2ffa9f
--- /dev/null
+++ b/db/migrate/20160506154408_add_catagory_table.rb
@@ -0,0 +1,9 @@
+class AddCatagoryTable < ActiveRecord::Migration
+ def change
+ create_table :catagory do |t|
+ t.text :name, null: false
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160506154631_alter_products_table_change_catagory_to_array.rb b/db/migrate/20160506154631_alter_products_table_change_catagory_to_array.rb
new file mode 100644
index 0000000000..c5d304ccd8
--- /dev/null
+++ b/db/migrate/20160506154631_alter_products_table_change_catagory_to_array.rb
@@ -0,0 +1,6 @@
+class AlterProductsTableChangeCatagoryToArray < ActiveRecord::Migration
+ def change
+ # change_column :products, :categories, :text, array: true, default: []
+ change_column :products, :categories, :text, array: true, default: [], using: "(string_to_array(categories, ' '))"
+ end
+end
diff --git a/db/migrate/20160506174042_create_categories.rb b/db/migrate/20160506174042_create_categories.rb
new file mode 100644
index 0000000000..20f6143c32
--- /dev/null
+++ b/db/migrate/20160506174042_create_categories.rb
@@ -0,0 +1,8 @@
+class CreateCategories < ActiveRecord::Migration
+ def change
+ create_table :categories do |t|
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20160506175359_remove_misspelled_table.rb b/db/migrate/20160506175359_remove_misspelled_table.rb
new file mode 100644
index 0000000000..2b40f7ee9c
--- /dev/null
+++ b/db/migrate/20160506175359_remove_misspelled_table.rb
@@ -0,0 +1,5 @@
+class RemoveMisspelledTable < ActiveRecord::Migration
+ def change
+ drop_table :catagory
+ end
+end
diff --git a/db/migrate/20160506175411_add_name_column_to_categories.rb b/db/migrate/20160506175411_add_name_column_to_categories.rb
new file mode 100644
index 0000000000..7f8dc9c147
--- /dev/null
+++ b/db/migrate/20160506175411_add_name_column_to_categories.rb
@@ -0,0 +1,8 @@
+class AddNameColumnToCategories < ActiveRecord::Migration
+ def change
+ change_table :categories do |t|
+ t.text :name
+ end
+
+ end
+end
diff --git a/db/migrate/20160506175814_add_description_to_products.rb b/db/migrate/20160506175814_add_description_to_products.rb
new file mode 100644
index 0000000000..ad61861b5f
--- /dev/null
+++ b/db/migrate/20160506175814_add_description_to_products.rb
@@ -0,0 +1,7 @@
+class AddDescriptionToProducts < ActiveRecord::Migration
+ def change
+ change_table :categories do |t|
+ t.text :description, null: false
+ end
+ end
+end
diff --git a/db/migrate/20160506182211_remove_description_from_category.rb b/db/migrate/20160506182211_remove_description_from_category.rb
new file mode 100644
index 0000000000..0d9529810c
--- /dev/null
+++ b/db/migrate/20160506182211_remove_description_from_category.rb
@@ -0,0 +1,5 @@
+class RemoveDescriptionFromCategory < ActiveRecord::Migration
+ def change
+ remove_column :categories, :description
+ end
+end
diff --git a/db/migrate/20160506182233_add_desc_to_products.rb b/db/migrate/20160506182233_add_desc_to_products.rb
new file mode 100644
index 0000000000..36d5ce18e1
--- /dev/null
+++ b/db/migrate/20160506182233_add_desc_to_products.rb
@@ -0,0 +1,6 @@
+class AddDescToProducts < ActiveRecord::Migration
+ def change
+ add_column :products, :description, :string
+ end
+end
+
diff --git a/db/migrate/20160506202957_link_categories_with_products.rb b/db/migrate/20160506202957_link_categories_with_products.rb
new file mode 100644
index 0000000000..9dd99af0d3
--- /dev/null
+++ b/db/migrate/20160506202957_link_categories_with_products.rb
@@ -0,0 +1,6 @@
+class LinkCategoriesWithProducts < ActiveRecord::Migration
+ create_table :categories_products, id: false do |t|
+ t.belongs_to :category, index: true
+ t.belongs_to :product, index: true
+ end
+end
diff --git a/db/migrate/20160506204129_remove_null_from_user_id_on_order_table.rb b/db/migrate/20160506204129_remove_null_from_user_id_on_order_table.rb
new file mode 100644
index 0000000000..3c264e75fa
--- /dev/null
+++ b/db/migrate/20160506204129_remove_null_from_user_id_on_order_table.rb
@@ -0,0 +1,5 @@
+class RemoveNullFromUserIdOnOrderTable < ActiveRecord::Migration
+ def change
+ change_column :orders, :user_id, :integer, null: true
+ end
+end
diff --git a/db/migrate/20160506224928_remove_catagories_from_products.rb b/db/migrate/20160506224928_remove_catagories_from_products.rb
new file mode 100644
index 0000000000..9b7a9b88a5
--- /dev/null
+++ b/db/migrate/20160506224928_remove_catagories_from_products.rb
@@ -0,0 +1,5 @@
+class RemoveCatagoriesFromProducts < ActiveRecord::Migration
+ def change
+ remove_column :products, :categories
+ end
+end
diff --git a/db/migrate/20160510173158_add_billingto_orders.rb b/db/migrate/20160510173158_add_billingto_orders.rb
new file mode 100644
index 0000000000..51eae467b3
--- /dev/null
+++ b/db/migrate/20160510173158_add_billingto_orders.rb
@@ -0,0 +1,10 @@
+class AddBillingtoOrders < ActiveRecord::Migration
+ def change
+ add_column :orders, :emails, :string
+ add_column :orders, :address, :string
+ add_column :orders, :name_on_cc, :string
+ add_column :orders, :security_on_cc, :integer
+ add_column :orders, :expiration_on_cc, :datetime
+ add_column :orders, :zip, :integer
+ end
+end
\ No newline at end of file
diff --git a/db/migrate/20160510174418_remove_column_from_orders.rb b/db/migrate/20160510174418_remove_column_from_orders.rb
new file mode 100644
index 0000000000..abf7b0ad90
--- /dev/null
+++ b/db/migrate/20160510174418_remove_column_from_orders.rb
@@ -0,0 +1,5 @@
+class RemoveColumnFromOrders < ActiveRecord::Migration
+ def change
+ remove_column :orders, :order_item_collecton, :string
+ end
+end
diff --git a/db/migrate/20160510174550_fix_typo_in_orders.rb b/db/migrate/20160510174550_fix_typo_in_orders.rb
new file mode 100644
index 0000000000..bc439362e3
--- /dev/null
+++ b/db/migrate/20160510174550_fix_typo_in_orders.rb
@@ -0,0 +1,6 @@
+class FixTypoInOrders < ActiveRecord::Migration
+ def change
+ remove_column :orders, :emails, :string
+ add_column :orders, :email, :string
+ end
+end
diff --git a/db/migrate/20160510201323_add_status_column_to_orders.rb b/db/migrate/20160510201323_add_status_column_to_orders.rb
new file mode 100644
index 0000000000..50dbfc1250
--- /dev/null
+++ b/db/migrate/20160510201323_add_status_column_to_orders.rb
@@ -0,0 +1,5 @@
+class AddStatusColumnToOrders < ActiveRecord::Migration
+ def change
+ add_column :orders, :status, :string
+ end
+end
diff --git a/db/migrate/20160510205409_add_order_id_column_to_orders.rb b/db/migrate/20160510205409_add_order_id_column_to_orders.rb
new file mode 100644
index 0000000000..36a0bdff6f
--- /dev/null
+++ b/db/migrate/20160510205409_add_order_id_column_to_orders.rb
@@ -0,0 +1,5 @@
+class AddOrderIdColumnToOrders < ActiveRecord::Migration
+ def change
+ add_column :orders, :order_id, :integer
+ end
+end
diff --git a/db/migrate/20160511040111_add_total_column_to_orders.rb b/db/migrate/20160511040111_add_total_column_to_orders.rb
new file mode 100644
index 0000000000..84b0987966
--- /dev/null
+++ b/db/migrate/20160511040111_add_total_column_to_orders.rb
@@ -0,0 +1,5 @@
+class AddTotalColumnToOrders < ActiveRecord::Migration
+ def change
+ add_column :orders, :total, :float
+ end
+end
diff --git a/db/migrate/20160511050101_drop_table_billings.rb b/db/migrate/20160511050101_drop_table_billings.rb
new file mode 100644
index 0000000000..459f93ad11
--- /dev/null
+++ b/db/migrate/20160511050101_drop_table_billings.rb
@@ -0,0 +1,5 @@
+class DropTableBillings < ActiveRecord::Migration
+ def change
+ drop_table :billings
+ end
+end
diff --git a/db/migrate/20160511223657_order_items_add_shipped_column.rb b/db/migrate/20160511223657_order_items_add_shipped_column.rb
new file mode 100644
index 0000000000..c9ab0c88f4
--- /dev/null
+++ b/db/migrate/20160511223657_order_items_add_shipped_column.rb
@@ -0,0 +1,5 @@
+class OrderItemsAddShippedColumn < ActiveRecord::Migration
+ def change
+ add_column :order_items, :shipped, :boolean, :default => false
+ end
+end
diff --git a/db/migrate/20160512161143_add_credit_card_number_to_orders.rb b/db/migrate/20160512161143_add_credit_card_number_to_orders.rb
new file mode 100644
index 0000000000..0c7402959f
--- /dev/null
+++ b/db/migrate/20160512161143_add_credit_card_number_to_orders.rb
@@ -0,0 +1,6 @@
+class AddCreditCardNumberToOrders < ActiveRecord::Migration
+ def change
+
+ add_column :orders, :credit_card_number, :integer
+ end
+end
diff --git a/db/migrate/20160512234333_remove_redundant_order_id_from_order_table.rb b/db/migrate/20160512234333_remove_redundant_order_id_from_order_table.rb
new file mode 100644
index 0000000000..f6b8b7ef0e
--- /dev/null
+++ b/db/migrate/20160512234333_remove_redundant_order_id_from_order_table.rb
@@ -0,0 +1,5 @@
+class RemoveRedundantOrderIdFromOrderTable < ActiveRecord::Migration
+ def change
+ remove_column :orders, :order_id, :integer
+ end
+end
diff --git a/db/migrate/20160513163658_change_expiration_to_string.rb b/db/migrate/20160513163658_change_expiration_to_string.rb
new file mode 100644
index 0000000000..33bdd6efae
--- /dev/null
+++ b/db/migrate/20160513163658_change_expiration_to_string.rb
@@ -0,0 +1,5 @@
+class ChangeExpirationToString < ActiveRecord::Migration
+ def change
+ change_column :orders, :expiration_on_cc, :string
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000000..1579b54b66
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,86 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended that you check this file into your version control system.
+
+ActiveRecord::Schema.define(version: 20160513163658) do
+
+ # These are extensions that must be enabled in order to support this database
+ enable_extension "plpgsql"
+
+ create_table "categories", force: :cascade do |t|
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.text "name"
+ end
+
+ create_table "categories_products", id: false, force: :cascade do |t|
+ t.integer "category_id"
+ t.integer "product_id"
+ end
+
+ add_index "categories_products", ["category_id"], name: "index_categories_products_on_category_id", using: :btree
+ add_index "categories_products", ["product_id"], name: "index_categories_products_on_product_id", using: :btree
+
+ create_table "order_items", force: :cascade do |t|
+ t.integer "order_id", null: false
+ t.integer "product_id", null: false
+ t.integer "quantity", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.boolean "shipped", default: false
+ end
+
+ create_table "orders", force: :cascade do |t|
+ t.integer "user_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "address"
+ t.string "name_on_cc"
+ t.integer "security_on_cc"
+ t.string "expiration_on_cc"
+ t.integer "zip"
+ t.string "email"
+ t.float "total"
+ t.string "status"
+ t.integer "credit_card_number"
+ end
+
+ create_table "products", force: :cascade do |t|
+ t.text "name", null: false
+ t.decimal "price_in_dollars", null: false
+ t.integer "user_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.boolean "visible"
+ t.integer "quantity"
+ t.text "image_url"
+ t.text "description"
+ end
+
+ create_table "reviews", force: :cascade do |t|
+ t.integer "rating", null: false
+ t.text "review_text"
+ t.integer "user_id"
+ t.integer "product_id", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "users", force: :cascade do |t|
+ t.text "user_name", null: false
+ t.text "email", null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "password_digest", null: false
+ end
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 4edb1e857e..f2983b081e 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,35 @@
#
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
+# 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 rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#
+# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
+# Mayor.create(name: 'Emanuel', city: cities.first)
+require 'csv'
+
+PRODUCTS = './seed_csvs/products.csv'
+
+CSV.foreach(PRODUCTS, headers: true) do |row|
+ Product.create(row.to_h)
+end
+
+# ORDERS = './seed_csvs/orders.csv'
+
+# CSV.foreach(ORDERS, headers: true) do |row|
+# Order.create(row.to_h)
+# end
+
+# USERS = './seed_csvs/users.csv'
+
+# CSV.foreach(USERS, headers: true) do |row|
+# User.create(row.to_h)
+# end
+
+# ORDERITEMS = './seed_csvs/orderitems.csv'
+
+# CSV.foreach(ORDERITEMS, headers: true) do |row|
+# OrderItem.create(row.to_h)
+# end
\ No newline at end of file
diff --git a/erd.pdf b/erd.pdf
new file mode 100644
index 0000000000..75cea2b720
Binary files /dev/null and b/erd.pdf differ
diff --git a/seed_csvs/orderitems.csv b/seed_csvs/orderitems.csv
new file mode 100644
index 0000000000..4817a6afb6
--- /dev/null
+++ b/seed_csvs/orderitems.csv
@@ -0,0 +1,11 @@
+order_id,product_id,quantity
+1,1,3
+1,2,1
+1,3,1
+1,4,2
+2,2,2
+2,1,1
+3,1,1
+3,3,1
+4,4,5
+4,1,1
diff --git a/seed_csvs/orders.csv b/seed_csvs/orders.csv
new file mode 100644
index 0000000000..75fb5e4abe
--- /dev/null
+++ b/seed_csvs/orders.csv
@@ -0,0 +1,4 @@
+user_id,created_at,updated_at,address,name_on_cc,security_on_cc,expiration_on_cc,zip,email
+1,2016-05-07 04:35:24,2016-05-07 04:35:24,1234 elmberry lane,Joe Doe,357,2019,89667
+2,2016-05-07 04:35:24,2016-05-07 04:35:24,1234 elmberry lane,Joe Doe,357,2019,89667
+3,2016-05-07 04:35:24,2016-05-07 04:35:24,1234 elmberry lane,Joe Doe,357,2019,89667
\ No newline at end of file
diff --git a/seed_csvs/products.csv b/seed_csvs/products.csv
new file mode 100644
index 0000000000..1419b464bf
--- /dev/null
+++ b/seed_csvs/products.csv
@@ -0,0 +1,12 @@
+name,price_in_dollars,user_id,visible,quantity,image_url
+Wedding Football,400.99,1,true,25,http://i.imgur.com/wQnqFYA.jpg
+Lipstick Heart,25,1,true,20,http://i.imgur.com/YKuk4ew.jpg
+High Heel Rain Boots,80,1,true,8,http://i.imgur.com/yJBBkPY.jpg
+Hairspray Can Top,5.50,2,true,50,http://i.imgur.com/qb1FYlO.jpg
+Women's Toothpaste,15,2,true,10,http://i.imgur.com/hTFtY2d.jpg
+Women's Rogaine,42.99,2,true,15,http://i.imgur.com/vBetXEd.jpg
+Women's Screwdriver,8.50,3,true,22,http://i.imgur.com/tt19AhA.jpg
+Bic Crystal Pens For Her,12,3,true,10,http://i.imgur.com/H4qUDrT.jpg
+Internet Ready Eggs,14,4,true,5,http://i.imgur.com/wQ4zT8m.jpg
+Sleep Pretty in Pink Earplugs,8,4,true,30,http://i.imgur.com/mJzVzq4.jpg
+Digital Fun Dip,3,5,true,35,http://i.imgur.com/qb8zym0.jpg
\ No newline at end of file
diff --git a/seed_csvs/users.csv b/seed_csvs/users.csv
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb
new file mode 100644
index 0000000000..12ca7c1c06
--- /dev/null
+++ b/test/controllers/categories_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class CategoriesControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/order_item_controller_test.rb b/test/controllers/order_item_controller_test.rb
new file mode 100644
index 0000000000..b24dd58b29
--- /dev/null
+++ b/test/controllers/order_item_controller_test.rb
@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class OrderItemControllerTest < ActionController::TestCase
+
+ # test "should get index" do
+ # get :index
+ # assert_response :success
+ # end
+
+end
diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb
new file mode 100644
index 0000000000..0afece19aa
--- /dev/null
+++ b/test/controllers/orders_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class OrdersControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb
new file mode 100644
index 0000000000..c881fa681b
--- /dev/null
+++ b/test/controllers/products_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ProductsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb
new file mode 100644
index 0000000000..9ab3149763
--- /dev/null
+++ b/test/controllers/reviews_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ReviewsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
new file mode 100644
index 0000000000..d30ebc380a
--- /dev/null
+++ b/test/controllers/sessions_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class SessionsControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
new file mode 100644
index 0000000000..d23f182948
--- /dev/null
+++ b/test/controllers/users_controller_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UsersControllerTest < ActionController::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
new file mode 100644
index 0000000000..937a0c002e
--- /dev/null
+++ b/test/fixtures/categories.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/fixtures/order_items.yml b/test/fixtures/order_items.yml
new file mode 100644
index 0000000000..937a0c002e
--- /dev/null
+++ b/test/fixtures/order_items.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml
new file mode 100644
index 0000000000..937a0c002e
--- /dev/null
+++ b/test/fixtures/orders.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml
new file mode 100644
index 0000000000..b263406494
--- /dev/null
+++ b/test/fixtures/products.yml
@@ -0,0 +1,20 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+wedding_football:
+# column: value
+ name: "Wedding Football"
+ price_in_dollars: 240
+ user_id: 1
+ visible: true
+ quantity: 35
+orange_zest:
+# column: value
+ name: "Candied Orange Zest"
+ price_in_dollars: 67
+ user_id: 1
+ visible: true
+ quantity: 18
\ No newline at end of file
diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml
new file mode 100644
index 0000000000..ee2ed0c122
--- /dev/null
+++ b/test/fixtures/reviews.yml
@@ -0,0 +1,20 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+review:
+ rating: 1
+ review_text: yes I love this product
+ user_id: 2
+ product_id: 1
+ created_at: 2016-05-11 22:26:45
+ updated_at: 2016-05-11 22:26:45
+
+order_items:
+ order_id: 1
+ product_id: 1
+ quantity: 1
+ created_at: 2016-05-11 22:26:45
+ updated_at: 2016-05-11 22:26:45
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
new file mode 100644
index 0000000000..937a0c002e
--- /dev/null
+++ b/test/fixtures/users.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+# This model initially had no columns defined. If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
+#
+one: {}
+# column: value
+#
+two: {}
+# column: value
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
new file mode 100644
index 0000000000..8abfb97cb4
--- /dev/null
+++ b/test/models/category_test.rb
@@ -0,0 +1,18 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+ # test "validations: user_name can't be blank" do
+ # category = Category.new
+
+ # assert_not category.valid?
+ # assert category.errors.keys.include?(:user_name), "user_name is not in the errors hash"
+ # end
+end
+
+
+
+ # create_table "categories", force: :cascade do |t|
+ # t.datetime "created_at", null: false
+ # t.datetime "updated_at", null: false
+ # t.text "name"
+ # end
\ No newline at end of file
diff --git a/test/models/order_item_test.rb b/test/models/order_item_test.rb
new file mode 100644
index 0000000000..e473b9e2e1
--- /dev/null
+++ b/test/models/order_item_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class OrderItemTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/order_test.rb b/test/models/order_test.rb
new file mode 100644
index 0000000000..15b8ed1348
--- /dev/null
+++ b/test/models/order_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class OrderTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/product_test.rb b/test/models/product_test.rb
new file mode 100644
index 0000000000..6a66faba71
--- /dev/null
+++ b/test/models/product_test.rb
@@ -0,0 +1,62 @@
+require 'test_helper'
+
+class ProductTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+
+ test "products must have names" do
+ product = Product.new
+
+ assert_not product.valid?
+ assert product.errors.keys.include?(:name), "can't be empty"
+ end
+
+ test "products must have a whole number quantity" do
+ product = Product.new
+ product.name = "wedding football"
+ product.quantity = 0.3
+ product.price_in_dollars = 10
+
+ assert_not product.valid?
+ assert product.errors.keys.include?(:quantity), "is not a number"
+ end
+
+ test "products must have a quantity greater than 0" do
+ product = Product.new
+ product.name = "wedding football"
+ product.quantity = -3
+ product.price_in_dollars = 10
+
+ assert_not product.valid?
+ assert product.errors.keys.include?(:quantity), "is not a number"
+ end
+
+ test "products must have a price in dollars greater than or equal to 1" do
+ product = Product.new
+ product.name = "wedding football"
+ product.quantity = 3
+ product.price_in_dollars = 0.5
+
+ product_two = Product.new
+ product.name = "wedding football"
+ product.quantity = 3
+ product.price_in_dollars = -6
+
+ assert_not product.valid?
+ assert product.errors.keys.include?(:price_in_dollars), "is not a number"
+
+ assert_not product_two.valid?
+ assert product.errors.keys.include?(:price_in_dollars), "is not a number"
+ end
+
+ test "products may take a decimal price in dollars" do
+ product = Product.new
+ product.name = "wedding football"
+ product.quantity = 3
+ product.price_in_dollars = 1.5
+
+ assert product.valid?
+ end
+
+end
diff --git a/test/models/review_test.rb b/test/models/review_test.rb
new file mode 100644
index 0000000000..cb34cc0204
--- /dev/null
+++ b/test/models/review_test.rb
@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class ReviewTest < ActiveSupport::TestCase
+ test "validations: review can't be blank" do
+ review = Review.new
+
+ assert_not review.valid?
+ assert review.errors.keys.include?(:review_text), "title is not in the errors hash"
+ end
+
+end
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
new file mode 100644
index 0000000000..b3f6dacdaa
--- /dev/null
+++ b/test/models/user_test.rb
@@ -0,0 +1,24 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+ test "validations: user_name can't be blank" do
+ user = User.new
+
+ assert_not user.valid?
+ assert user.errors.keys.include?(:user_name), "user_name is not in the errors hash"
+ end
+
+ test "validations: email can't be blank" do
+ user = User.new
+
+ assert_not user.valid?
+ assert user.errors.keys.include?(:email), "email is not in the errors hash"
+ end
+
+ test "user model has secure password" do
+ user = User.new
+
+ assert_respond_to user, :password_digest
+ assert_respond_to user, :authenticate, "User requires has_secure_password"
+ end
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 92e39b2d78..f2d5d2e5b8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,10 +1,16 @@
+require 'simplecov'
+SimpleCov.start 'rails'
+
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
class ActiveSupport::TestCase
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
- fixtures :all
+ # fixtures :all
+ fixtures :products
+ # fixtures :users
+
# Add more helper methods to be used by all tests here...
end