+<% @products_in_category.each do |p| %>
+
+
+
+
<%= link_to(p.name, merchant_product_path(p.merchant_id,p.id)) %>
+
+ <%= link_to image_tag(p.image, alt: 'product photo', size: '200x200', class: "product-photo"), merchant_product_path(p.merchant_id,p.id) %>
+
+<% end %>
+
+<%= link_to("View all Categories", categories_path) %>
diff --git a/app/views/categories/update.html.erb b/app/views/categories/update.html.erb
new file mode 100644
index 0000000000..13b85657ff
--- /dev/null
+++ b/app/views/categories/update.html.erb
@@ -0,0 +1,2 @@
+
Categories#update
+
Find me in app/views/categories/update.html.erb
diff --git a/app/views/guests/create.html.erb b/app/views/guests/create.html.erb
new file mode 100644
index 0000000000..a9738a6655
--- /dev/null
+++ b/app/views/guests/create.html.erb
@@ -0,0 +1,2 @@
+
Guests#create
+
Find me in app/views/guests/create.html.erb
diff --git a/app/views/guests/destroy.html.erb b/app/views/guests/destroy.html.erb
new file mode 100644
index 0000000000..7da417e5ba
--- /dev/null
+++ b/app/views/guests/destroy.html.erb
@@ -0,0 +1,2 @@
+
Guests#destroy
+
Find me in app/views/guests/destroy.html.erb
diff --git a/app/views/guests/edit.html.erb b/app/views/guests/edit.html.erb
new file mode 100644
index 0000000000..1e16d53b01
--- /dev/null
+++ b/app/views/guests/edit.html.erb
@@ -0,0 +1,2 @@
+
Guests#edit
+
Find me in app/views/guests/edit.html.erb
diff --git a/app/views/guests/index.html.erb b/app/views/guests/index.html.erb
new file mode 100644
index 0000000000..e54983b4ca
--- /dev/null
+++ b/app/views/guests/index.html.erb
@@ -0,0 +1,2 @@
+
Guests#index
+
Find me in app/views/guests/index.html.erb
diff --git a/app/views/guests/new.html.erb b/app/views/guests/new.html.erb
new file mode 100644
index 0000000000..ebe92378c8
--- /dev/null
+++ b/app/views/guests/new.html.erb
@@ -0,0 +1,2 @@
+
Guests#new
+
Find me in app/views/guests/new.html.erb
diff --git a/app/views/guests/show.html.erb b/app/views/guests/show.html.erb
new file mode 100644
index 0000000000..a01c0fb8c7
--- /dev/null
+++ b/app/views/guests/show.html.erb
@@ -0,0 +1,2 @@
+
Guests#show
+
Find me in app/views/guests/show.html.erb
diff --git a/app/views/guests/update.html.erb b/app/views/guests/update.html.erb
new file mode 100644
index 0000000000..c95ad0ad75
--- /dev/null
+++ b/app/views/guests/update.html.erb
@@ -0,0 +1,2 @@
+
Guests#update
+
Find me in app/views/guests/update.html.erb
diff --git a/app/views/landing/index.html.erb b/app/views/landing/index.html.erb
new file mode 100644
index 0000000000..4c99c30af0
--- /dev/null
+++ b/app/views/landing/index.html.erb
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+ <% @featured_products.each do |product| %>
+ -
+
+
<%= link_to(product.name, merchant_product_path(product.merchant.id, product.id)) %>
+
<%= link_to(image_tag(product.image, size: "200x275", alt: "Photo of #{product.name}"), merchant_product_path(product.merchant.id, product.id)) %>
+
Price: $<%= '%.2f' % (product.price/100.00) %>
+
Inventory: <%= product.inventory %>
+
<%= product.rating == nil ? "Not Yet Rated!" : star_string(product.rating) %>
+
+ <% end %>
+
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9b70e01c2e..c46ae6aae5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -1,14 +1,95 @@
-
-
-
Betsy
- <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %>
- <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
- <%= csrf_meta_tags %>
-
-
-
-<%= yield %>
-
-
+
+
+
+
+
+
<%= content_for?(:title) ? yield(:title) : "Not Yetsy" %>
+
+ <%= stylesheet_link_tag "application" %>
+ <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
+ <%= csrf_meta_tags %>
+
+
+
+
+
+
+
+
+
+
+
+ <% if flash[:notice] %>
+ <%= flash[:notice] %>
+ <% end %>
+
+
+ <%= greeting %>
+
+ <%= yield %>
+
+
+
+
diff --git a/app/views/merchants/_merchant_partial.html.erb b/app/views/merchants/_merchant_partial.html.erb
new file mode 100644
index 0000000000..f197f74226
--- /dev/null
+++ b/app/views/merchants/_merchant_partial.html.erb
@@ -0,0 +1,14 @@
+<%= form_for @merchant, url: @path do |f| %>
+
+ <%= f.label :name %>
+ <%= f.text_field :name %>
+
+ <%= f.label :email %>
+ <%= f.text_field :email %>
+
+ <%= f.label :password %>
+ <%= f.text_field :password %>
+
+ <%= f.submit %>
+
+<% end %>
diff --git a/app/views/merchants/create.html.erb b/app/views/merchants/create.html.erb
new file mode 100644
index 0000000000..1762feece0
--- /dev/null
+++ b/app/views/merchants/create.html.erb
@@ -0,0 +1,2 @@
+
Merchants#create
+
Find me in app/views/merchants/create.html.erb
diff --git a/app/views/merchants/destroy.html.erb b/app/views/merchants/destroy.html.erb
new file mode 100644
index 0000000000..7378a23230
--- /dev/null
+++ b/app/views/merchants/destroy.html.erb
@@ -0,0 +1,2 @@
+
Merchants#destroy
+
Find me in app/views/merchants/destroy.html.erb
diff --git a/app/views/merchants/edit.html.erb b/app/views/merchants/edit.html.erb
new file mode 100644
index 0000000000..48d1fbdd45
--- /dev/null
+++ b/app/views/merchants/edit.html.erb
@@ -0,0 +1,2 @@
+
Edit your info
+<%= render partial: "merchant_partial", locals: {action_name: "update", params: { id: @merchant.id }} %>
diff --git a/app/views/merchants/index.html.erb b/app/views/merchants/index.html.erb
new file mode 100644
index 0000000000..0ad7977813
--- /dev/null
+++ b/app/views/merchants/index.html.erb
@@ -0,0 +1,2 @@
+
Merchants#index
+
Find me in app/views/merchants/index.html.erb
diff --git a/app/views/merchants/new.html.erb b/app/views/merchants/new.html.erb
new file mode 100644
index 0000000000..06a42ad5fa
--- /dev/null
+++ b/app/views/merchants/new.html.erb
@@ -0,0 +1,3 @@
+
Become a merchant.
+
+<%= render partial: "merchant_partial", locals: {action_name: "create"} %>
diff --git a/app/views/merchants/show.html.erb b/app/views/merchants/show.html.erb
new file mode 100644
index 0000000000..060aca364a
--- /dev/null
+++ b/app/views/merchants/show.html.erb
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+ | Order Number |
+ Items |
+ Order Status |
+
+
+ <% @merchant.customer_orders.each do |order| %>
+ <% order.products.each do |product| %>
+
+ | <%= order.id %> |
+ <%= link_to(product.name, merchant_product_path(@merchant.id, product.id)) %> |
+ <%= order.order_status %> |
+
+ <% end %>
+ <% end %>
+
+
+
+
+
+ Summary
+
+
Revenue
+
Total Revenue for Pending Orders:
+
<%= number_to_currency(@merchant.revenue_pending_orders/100.0) %>
+
Total Revenue for Paid Orders:
+
<%= number_to_currency(@merchant.revenue_paid_orders/100.0) %>
+
Total Revenue for Cancelled Orders:
+
<%= number_to_currency(@merchant.revenue_cancelled_orders/100.0) %>
+
Total Revenue for Completed Orders:
+
<%= number_to_currency(@merchant.revenue_completed_orders/100.0) %>
+
Total Net Revenue:
+
<%= number_to_currency(@merchant.total_revenue/100.0) %>
+
+
Orders
+
Total Pending Orders:
+
<%= @merchant.pending_orders %>
+
Total Cancelled Orders:
+
<%= @merchant.cancelled_orders %>
+
Total Paid Orders:
+
<%= @merchant.paid_orders %>
+
Total Completed Orders:
+
<%= @merchant.completed_orders %>
+
Total Orders:
+
<%= @merchant.total_orders %>
+
diff --git a/app/views/merchants/show_merchant_products.html.erb b/app/views/merchants/show_merchant_products.html.erb
new file mode 100644
index 0000000000..503d9c07bd
--- /dev/null
+++ b/app/views/merchants/show_merchant_products.html.erb
@@ -0,0 +1,2 @@
+
<%= @merchant[:name] %>
+
diff --git a/app/views/merchants/update.html.erb b/app/views/merchants/update.html.erb
new file mode 100644
index 0000000000..48e3f8aed5
--- /dev/null
+++ b/app/views/merchants/update.html.erb
@@ -0,0 +1,2 @@
+
Merchants#update
+
Find me in app/views/merchants/update.html.erb
diff --git a/app/views/orders/cart.html.erb b/app/views/orders/cart.html.erb
new file mode 100644
index 0000000000..c295e57feb
--- /dev/null
+++ b/app/views/orders/cart.html.erb
@@ -0,0 +1,20 @@
+
+
+
+
+<%= form_for @line_items do |f| %>
+
<%= f.label :product.name %>
+ <%= f.text_field :product_id %>
+
+ <%= f.number_field :quantity, order_item.quantity.to_i, class: "form-control", min: 1 %>
+ <%= f.hidden_field :product_id, product.id %>
+
+
+ <%= f.label :description %>
+ <%= f.text_field :description %>
+
+ <%= f.submit %>
+ <% end %>
+
+
diff --git a/app/views/orders/checkout.html.erb b/app/views/orders/checkout.html.erb
new file mode 100644
index 0000000000..b970868285
--- /dev/null
+++ b/app/views/orders/checkout.html.erb
@@ -0,0 +1,40 @@
+
+
+
+
+
+
Total: <%= number_to_currency(current_cart.total_amount/100.0) %>
+
Shipping Information
+<%= form_tag order_path(current_cart.id), method: :patch do %>
+
Name
+<%= text_field_tag :card_name %>
+
Street Address
+<%= text_field_tag :shipping_street %>
+
City
+<%= text_field_tag :shipping_city %>
+
State
+<%= select_tag :state, options_for_select(us_states) %>
+
Zip Code
+<%= text_field_tag :shipping_zip, nil, maxlength: 5 %>
+
+
Billing Information
+
Card Number
+<%= text_field_tag :card_number, nil, maxlength: 16 %>
+
Card Expiration Date
+<%= text_field_tag :card_exp, nil, maxlength: 5 %>
+
Card CVV
+<%= text_field_tag :card_cvv, nil, maxlength: 4%>
+
Zip Code
+
+<%= text_field_tag :billing_zip, nil, maxlength: 5 %>
+<%= submit_tag "Submit Order", class: "btn btn-default button" %>
+
+<%end%>
+
+
+
diff --git a/app/views/orders/create.html.erb b/app/views/orders/create.html.erb
new file mode 100644
index 0000000000..295bd84094
--- /dev/null
+++ b/app/views/orders/create.html.erb
@@ -0,0 +1,2 @@
+
Orders#create
+
Find me in app/views/orders/create.html.erb
diff --git a/app/views/orders/destroy.html.erb b/app/views/orders/destroy.html.erb
new file mode 100644
index 0000000000..d14d0a3508
--- /dev/null
+++ b/app/views/orders/destroy.html.erb
@@ -0,0 +1,2 @@
+
Orders#destroy
+
Find me in app/views/orders/destroy.html.erb
diff --git a/app/views/orders/edit.html.erb b/app/views/orders/edit.html.erb
new file mode 100644
index 0000000000..7de9049bee
--- /dev/null
+++ b/app/views/orders/edit.html.erb
@@ -0,0 +1,2 @@
+
Orders#edit
+
Find me in app/views/orders/edit.html.erb
diff --git a/app/views/orders/index.html.erb b/app/views/orders/index.html.erb
new file mode 100644
index 0000000000..d63a69fb54
--- /dev/null
+++ b/app/views/orders/index.html.erb
@@ -0,0 +1,2 @@
+
Orders#index
+
Find me in app/views/orders/index.html.erb
diff --git a/app/views/orders/new.html.erb b/app/views/orders/new.html.erb
new file mode 100644
index 0000000000..1bc27609ce
--- /dev/null
+++ b/app/views/orders/new.html.erb
@@ -0,0 +1,2 @@
+
Orders#new
+
Find me in app/views/orders/new.html.erb
diff --git a/app/views/orders/show.html.erb b/app/views/orders/show.html.erb
new file mode 100644
index 0000000000..a5fdbc0201
--- /dev/null
+++ b/app/views/orders/show.html.erb
@@ -0,0 +1,44 @@
+
<%= @order_items.count %> <%= @order_items.count == 1 ? "Item" : "Items" %> in Your Cart
+
+<% if @order_items.count == 0 %>
+
+ There are no items in your shopping cart. Please <%= link_to "go back", root_path %> and add some items to your cart.
+
+<% else %>
+
+
+ |
+ Name |
+ Price |
+ Quantity |
+ |
+ Total |
+ |
+
+
+ <% @order_items.each do |item| %>
+
+ | <%= image_tag(item.product.image, class: "cart-thumbnail") %> |
+ <%= link_to "#{item.product.name}", merchant_product_path(merchant_id: item.product.merchant_id, id: item.product.id) %> |
+ <%= number_to_currency(item.product.price/100.0) %> |
+
+ <%= form_tag order_update_qty_path(current_cart.id), method: :post do %>
+ <%= number_field_tag :qty, item.qty.to_i, class: "form_control", min: 1 %> |
+ <%= hidden_field_tag :line_item_id, item.id %>
+ <%= submit_tag "Update Quantity", class: "btn btn-default button" %> |
+
+ <%= number_to_currency(item.subtotal/100.0) %>
+ <%end%>
+ | <%= button_to 'Remove from Cart', {action: "destroy", id: item.id}, class: "button", method: :delete, data: {confirm: "Are you sure?"} %> |
+
+ <% end %>
+
+ |
+ |
+ <%= button_to "Checkout", order_checkout_path(current_cart.id), class: "button", method: :get %> |
+ |
+ |
+ Order Total |
+ <%= number_to_currency(current_cart.total_amount/100.0) %> |
+
+<% end %>
diff --git a/app/views/orders/update.html.erb b/app/views/orders/update.html.erb
new file mode 100644
index 0000000000..248f5bf339
--- /dev/null
+++ b/app/views/orders/update.html.erb
@@ -0,0 +1,2 @@
+
+Your Order #<%=params[:id] %> has been submitted
diff --git a/app/views/products/_productform.html.erb b/app/views/products/_productform.html.erb
new file mode 100644
index 0000000000..7e81e2a91d
--- /dev/null
+++ b/app/views/products/_productform.html.erb
@@ -0,0 +1,33 @@
+<%= @error if @error %>
+<%= form_for @product,
+ method: @post_method,
+ url: @post_path do |f| %>
+
+ <%= f.label :name %>
+ <%= f.text_field :name %>
+
+
+ <%= f.label :description %>
+ <%= f.text_area :description %>
+
+
+ <%= f.label :price %>
+ <%= f.text_field :price %>
+
+
+ <%= f.label :inventory %>
+ <%= f.number_field :inventory %>
+
+
+ <%= f.label :image %>
+ <%= f.text_field :image %>
+
+
+ <%= f.label :categories %>
+ <%= f.collection_check_boxes(:category_ids, Category.all, :id, :name) %>
+
+
+ <%= f.submit class:"button" %>
+
+
+<% end %>
diff --git a/app/views/products/all_products.html.erb b/app/views/products/all_products.html.erb
new file mode 100644
index 0000000000..55568e13dd
--- /dev/null
+++ b/app/views/products/all_products.html.erb
@@ -0,0 +1,14 @@
+
+
+
+ <% @products.each do |product| %>
+
">
+
+
+
<%= link_to product.name, merchant_product_path(product.merchant_id, product.id) %>
+
+ <%= image_tag(product.image, size: "200x300", alt: "Photo of #{product.name}.", class: "product-photo") %>
+
+ <% end %>
+
Products#create
+Find me in app/views/products/create.html.erb
diff --git a/app/views/products/destroy.html.erb b/app/views/products/destroy.html.erb
new file mode 100644
index 0000000000..d5c678b499
--- /dev/null
+++ b/app/views/products/destroy.html.erb
@@ -0,0 +1,2 @@
+Products#destroy
+Find me in app/views/products/destroy.html.erb
diff --git a/app/views/products/edit.html.erb b/app/views/products/edit.html.erb
new file mode 100644
index 0000000000..fdd768f718
--- /dev/null
+++ b/app/views/products/edit.html.erb
@@ -0,0 +1,2 @@
+ Edit Product: <%= @product.name %>
+<%= render partial: 'productform' %>
diff --git a/app/views/products/index.html.erb b/app/views/products/index.html.erb
new file mode 100644
index 0000000000..ca7c199460
--- /dev/null
+++ b/app/views/products/index.html.erb
@@ -0,0 +1,19 @@
+
+
+
+<% @products.each do |product| %>
+
">
+
+
+
<%= link_to product.name, merchant_product_path(@merchant.id, product.id) %>
+
+ <%= image_tag(product.image, size: "200x300", alt: "Photo of #{product.name}.", class: "product-photo") %>
+
+<% end %>
+
<%= link_to "Add New Product", new_merchant_product_path(@merchant.id) %>
+<% end %>
diff --git a/app/views/products/new.html.erb b/app/views/products/new.html.erb
new file mode 100644
index 0000000000..847be15e73
--- /dev/null
+++ b/app/views/products/new.html.erb
@@ -0,0 +1,2 @@
+ Create a New Product
+<%= render partial: 'productform' %>
diff --git a/app/views/products/show.html.erb b/app/views/products/show.html.erb
new file mode 100644
index 0000000000..fe90d3c32a
--- /dev/null
+++ b/app/views/products/show.html.erb
@@ -0,0 +1,71 @@
+
+
+<%= @product.name %>
+
+
+
<%= image_tag(@product.image, size: "200x275", alt: "Photo of #{@product.name}.") %>
+
+
+
Description: <%= @product.description %>
+
+
Price: $<%= '%.2f' % (@product.price/100.00) %>
+
Inventory: <%= @product.inventory %>
+
+
+
Rating: <%= @product.rating == nil ? "Not Yet Rated!" : star_string(@product.rating) %>
+
+ <% if @product.merchant == current_merchant %>
+
+ <% end %>
+
+
+ <%= form_tag(controller: "orders", action: "add_to_cart", class: "button", method: "post") do |f| %>
+
+
+ <%= number_field_tag :qty, 1, class: "form-control", min: 1 %>
+
+
+ <%= hidden_field_tag :product_id, @product.id %>
+ <%= hidden_field_tag :merchant_id, @product.merchant_id %>
+ <%= submit_tag "Add to Cart", class: "btn btn-primary button" %>
+
+ <% end %>
+
+
+
+ <% if @reviews != nil %>
+
Reviews:
+
<%= link_to 'See All Product Reviews', merchant_product_reviews_path(@merchant.id, @product.id) %>
+
+ <% unless @product.merchant == current_merchant %>
+
<%= link_to 'Add A Review', new_merchant_product_review_path(@merchant.id, @product.id) %>
+ <% end %>
+ <% end %>
+
<%= link_to 'See All Products', all_products_path %>
+
+ <% if @reviews != nil %>
+ <% @reviews.each do |review| %>
+
+
+
+
<%= star_string(review.stars) %>
+
<%= "By: #{review.author}" if review.author != '' %>
+
+
<%= review.description %>
+
<%# link_to "Delete Review", merchant_product_review_path(@merchant.id, @product.id, review.id), class: "button", method: :delete, data: {confirm: "Are you sure?"}%>
+
+ <% end %>
+ <% end %>
+
Products#update
+Find me in app/views/products/update.html.erb
diff --git a/app/views/reviews/_reviewform.html.erb b/app/views/reviews/_reviewform.html.erb
new file mode 100644
index 0000000000..e4765bc12c
--- /dev/null
+++ b/app/views/reviews/_reviewform.html.erb
@@ -0,0 +1,20 @@
+<%= @error if @error %>
+<%= form_for @review,
+ method: @post_method,
+ url: @post_path do |f| %>
+
+ <%= f.label :stars %>
+ <%= f.select(:stars, (0..5).map{|index| [star_string(index), index]}, {include_blank: true}) %>
+
+
+ <%= f.label :description %>
+ <%= f.text_area :description %>
+
+
+ <%= f.label :author %>
+ <%= f.text_field :author %>
+
+
+ <%= f.submit class:"button" %>
+
+<% end %>
diff --git a/app/views/reviews/create.html.erb b/app/views/reviews/create.html.erb
new file mode 100644
index 0000000000..44bf11c2ed
--- /dev/null
+++ b/app/views/reviews/create.html.erb
@@ -0,0 +1,2 @@
+Reviews#create
+Find me in app/views/reviews/create.html.erb
diff --git a/app/views/reviews/destroy.html.erb b/app/views/reviews/destroy.html.erb
new file mode 100644
index 0000000000..df58c59d5c
--- /dev/null
+++ b/app/views/reviews/destroy.html.erb
@@ -0,0 +1,2 @@
+Reviews#destroy
+Find me in app/views/reviews/destroy.html.erb
diff --git a/app/views/reviews/edit.html.erb b/app/views/reviews/edit.html.erb
new file mode 100644
index 0000000000..28034f5e02
--- /dev/null
+++ b/app/views/reviews/edit.html.erb
@@ -0,0 +1,2 @@
+Reviews#edit
+Find me in app/views/reviews/edit.html.erb
diff --git a/app/views/reviews/index.html.erb b/app/views/reviews/index.html.erb
new file mode 100644
index 0000000000..52d1af14fc
--- /dev/null
+++ b/app/views/reviews/index.html.erb
@@ -0,0 +1,32 @@
+ All Reviews for <%= @product.name %>
+
+
+ <% if @reviews != nil %>
+
Average: <%= star_string(@product.rating) %>
+ <% unless @product.merchant == current_merchant %>
+
<%= link_to 'Add A Review!', new_merchant_product_review_path(@merchant.id, @product.id) %>
+ <% end %>
+
<%= link_to "Back to Product", merchant_product_path(@merchant.id, @product.id) %>
+ <% else %>
+
This Product has no reviews!
+
<%= link_to "Back to Product", merchant_product_path(@merchant.id, @product.id) %>
+ <% end %>
+
+ <% if @reviews != nil %>
+ <% @reviews.each do |review| %>
+
+
+
+
<%= star_string(review.stars) %>
+
<%= "By: #{review.author}" if review.author != '' %>
+
+
<%= review.description %>
+
+ <% end %>
+ <% end %>
+
Add Review for <%= @product.name %>
+<%= render partial: 'reviewform' %>
diff --git a/app/views/reviews/show.html.erb b/app/views/reviews/show.html.erb
new file mode 100644
index 0000000000..68d8d94c3b
--- /dev/null
+++ b/app/views/reviews/show.html.erb
@@ -0,0 +1,2 @@
+Reviews#show
+Find me in app/views/reviews/show.html.erb
diff --git a/app/views/reviews/update.html.erb b/app/views/reviews/update.html.erb
new file mode 100644
index 0000000000..7d46cbed5c
--- /dev/null
+++ b/app/views/reviews/update.html.erb
@@ -0,0 +1,2 @@
+Reviews#update
+Find me in app/views/reviews/update.html.erb
diff --git a/app/views/sessions/create.html.erb b/app/views/sessions/create.html.erb
new file mode 100644
index 0000000000..c251174fea
--- /dev/null
+++ b/app/views/sessions/create.html.erb
@@ -0,0 +1,2 @@
+Sessions#create
+Find me in app/views/sessions/create.html.erb
diff --git a/app/views/sessions/destroy.html.erb b/app/views/sessions/destroy.html.erb
new file mode 100644
index 0000000000..d75237d982
--- /dev/null
+++ b/app/views/sessions/destroy.html.erb
@@ -0,0 +1,2 @@
+Sessions#destroy
+Find me in app/views/sessions/destroy.html.erb
diff --git a/bin/spring b/bin/spring
index 7fe232c3aa..9bc076b9ea 100755
--- a/bin/spring
+++ b/bin/spring
@@ -7,9 +7,10 @@ unless defined?(Spring)
require 'rubygems'
require 'bundler'
- if (match = Bundler.default_lockfile.read.match(/^GEM$.*?^ (?: )*spring \((.*?)\)$.*?^$/m))
- Gem.paths = { 'GEM_PATH' => [Bundler.bundle_path.to_s, *Gem.path].uniq.join(Gem.path_separator) }
- gem 'spring', match[1]
+ lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
+ if spring = lockfile.specs.detect { |spec| spec.name == "spring" }
+ Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
+ gem 'spring', spring.version
require 'spring/binstub'
end
end
diff --git a/config/database.yml b/config/database.yml
index 04f24be2ba..1c1a37ca8d 100644
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,85 +1,25 @@
-# PostgreSQL. Versions 8.2 and up are supported.
+# SQLite version 3.x
+# gem install sqlite3
#
-# Install the pg driver:
-# gem install pg
-# On OS X with Homebrew:
-# gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On OS X with MacPorts:
-# gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-# gem install pg
-# Choose the win32 build.
-# Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
+# Ensure the SQLite 3 gem is defined in your Gemfile
+# gem 'sqlite3'
#
default: &default
- adapter: postgresql
- encoding: unicode
- # For details on connection pooling, see rails configuration guide
- # http://guides.rubyonrails.org/configuring.html#database-pooling
+ adapter: sqlite3
pool: 5
+ timeout: 5000
development:
<<: *default
- database: betsy_development
-
- # The specified database role being used to connect to postgres.
- # To create additional roles in postgres see `$ createuser --help`.
- # When left blank, postgres will use the default role. This is
- # the same name as the operating system user that initialized the database.
- #username: betsy
-
- # The password associated with the postgres role (username).
- #password:
-
- # Connect on a TCP socket. Omitted by default since the client uses a
- # domain socket that doesn't need configuration. Windows does not have
- # domain sockets, so uncomment these lines.
- #host: localhost
-
- # The TCP port the server listens on. Defaults to 5432.
- # If your server runs on a different port number, change accordingly.
- #port: 5432
-
- # Schema search path. The server defaults to $user,public
- #schema_search_path: myapp,sharedapp,public
-
- # Minimum log levels, in increasing order:
- # debug5, debug4, debug3, debug2, debug1,
- # log, notice, warning, error, fatal, and panic
- # Defaults to warning.
- #min_messages: notice
+ database: db/development.sqlite3
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
- database: betsy_test
+ database: db/test.sqlite3
-# As with config/secrets.yml, you never want to store sensitive information,
-# like your database password, in your source code. If your source code is
-# ever seen by anyone, they now have access to your database.
-#
-# Instead, provide the password as a unix environment variable when you boot
-# the app. Read http://guides.rubyonrails.org/configuring.html#configuring-a-database
-# for a full rundown on how to provide these environment variables in a
-# production deployment.
-#
-# On Heroku and other platform providers, you may have a full connection URL
-# available as an environment variable. For example:
-#
-# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase"
-#
-# You can use this database configuration with:
-#
-# production:
-# url: <%= ENV['DATABASE_URL'] %>
-#
production:
<<: *default
- database: betsy_production
- username: betsy
- password: <%= ENV['BETSY_DATABASE_PASSWORD'] %>
+ database: db/production.sqlite3
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 5c1b32e486..10a93ddf6a 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -29,7 +29,7 @@
# config.assets.css_compressor = :sass
# Do not fallback to assets pipeline if a precompiled asset is missed.
- config.assets.compile = false
+ config.assets.compile = true
# Asset digests allow you to set far-future HTTP expiration dates on all assets,
# yet still be able to expire them through the digest params.
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
new file mode 100644
index 0000000000..fd4416122a
--- /dev/null
+++ b/config/initializers/omniauth.rb
@@ -0,0 +1,3 @@
+Rails.application.config.middleware.use OmniAuth::Builder do
+ provider :github, ENV["GITHUB_CLIENT_ID"], ENV["GITHUB_CLIENT_SECRET"], scope: "user:email"
+end
diff --git a/config/routes.rb b/config/routes.rb
index 3f66539d54..10884a5d00 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,56 +1,40 @@
Rails.application.routes.draw do
+ root to: 'landing#index'
+
+ get 'landing/index' => 'landing#index', as: 'index'
+
+ get "/auth/:provider/callback" => "sessions#create"
+
# 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
+
+ resources :merchants do
+ resources :products do
+ resources :reviews
+ end
+ end
+ delete 'merchants/sessions/destroy' => 'sessions#destroy'
+ resources :categories
+ resources :guests
+ #resources :merchants
+ resources :orders do
+ post 'update_qty'
+ get 'checkout'
+ end
+
+ get 'sessions/create'
+
+ delete 'sessions/destroy' => 'sessions#destroy'
+
+ get 'products/all_products' => 'products#all_products', as: 'all_products'
+ post 'orders/add_to_cart' => 'orders#add_to_cart', as: 'add_to_cart'
+ # get 'orders/view_cart' => 'orders#view_cart', as: view_cart
+
+ # get 'merchants/:id/products' => 'merchants#show_merchant_products', as: 'merchant_products'
+
+
end
diff --git a/config/secrets.yml b/config/secrets.yml
index 6442868fc1..2123fe4437 100644
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -11,10 +11,10 @@
# if you're sharing your code publicly.
development:
- secret_key_base: eaebee6b0ce07b1e5b22743dacf6e6aaec01bf01c88370f9f86c3ae0d8592b4313c5e9da09754cd613eda8d206168bd74d5ed9910230b3957725352c70e2cf80
+ secret_key_base: f7c47456a69cb28cb0b87f8ae0d544dc6d2f549bb24a30e1cb444786fc3daa25bef7f2206d378d3565363842186ae574cb86ec2e062e95f511a19c5d837f3aad
test:
- secret_key_base: f9c5bd6c383573755e5f8cf214402a51eb5ce8c7d0df9860dbf980f03fbd6c508e97412644b6a80d7034774602b05e05988bf7ab8ff594912950fdb590589a4d
+ secret_key_base: 836172d2e7760c87cdc215bb88e54d22100caabe180115828f4d3a78ac73161cac88e56425363b5a635f21f520502936f38061c9a252592061b598e2f276a88e
# Do not keep production secrets in the repository,
# instead read values from the environment.
diff --git a/db/migrate/20161018211906_create_categories.rb b/db/migrate/20161018211906_create_categories.rb
new file mode 100644
index 0000000000..b574669a21
--- /dev/null
+++ b/db/migrate/20161018211906_create_categories.rb
@@ -0,0 +1,9 @@
+class CreateCategories < ActiveRecord::Migration
+ def change
+ create_table :categories do |t|
+ t.string :name
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018211943_create_merchants.rb b/db/migrate/20161018211943_create_merchants.rb
new file mode 100644
index 0000000000..03e9214aeb
--- /dev/null
+++ b/db/migrate/20161018211943_create_merchants.rb
@@ -0,0 +1,11 @@
+class CreateMerchants < ActiveRecord::Migration
+ def change
+ create_table :merchants do |t|
+ t.string :name
+ t.string :email
+ t.string :password
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018212045_create_products.rb b/db/migrate/20161018212045_create_products.rb
new file mode 100644
index 0000000000..53b69f1ecf
--- /dev/null
+++ b/db/migrate/20161018212045_create_products.rb
@@ -0,0 +1,15 @@
+class CreateProducts < ActiveRecord::Migration
+ def change
+ create_table :products do |t|
+ t.string :name
+ t.text :description
+ t.integer :price
+ t.string :image
+ t.integer :merchant_id
+ t.integer :inventory
+ t.float :rating
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018212101_create_guests.rb b/db/migrate/20161018212101_create_guests.rb
new file mode 100644
index 0000000000..16981041e4
--- /dev/null
+++ b/db/migrate/20161018212101_create_guests.rb
@@ -0,0 +1,10 @@
+class CreateGuests < ActiveRecord::Migration
+ def change
+ create_table :guests do |t|
+ t.string :name
+ t.string :email
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018212119_create_reviews.rb b/db/migrate/20161018212119_create_reviews.rb
new file mode 100644
index 0000000000..df019d196d
--- /dev/null
+++ b/db/migrate/20161018212119_create_reviews.rb
@@ -0,0 +1,12 @@
+class CreateReviews < ActiveRecord::Migration
+ def change
+ create_table :reviews do |t|
+ t.text :description
+ t.integer :stars
+ t.string :author
+ t.integer :product_id
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018212351_create_orders.rb b/db/migrate/20161018212351_create_orders.rb
new file mode 100644
index 0000000000..31c523149b
--- /dev/null
+++ b/db/migrate/20161018212351_create_orders.rb
@@ -0,0 +1,20 @@
+class CreateOrders < ActiveRecord::Migration
+ def change
+ create_table :orders do |t|
+ t.integer :total_amount
+ t.integer :guest_id
+ t.integer :merchant_id
+ t.string :card_name
+ t.integer :card_number
+ t.string :card_exp
+ t.integer :card_cvv
+ t.integer :billing_zip
+ t.string :shipping_street
+ t.string :shipping_city
+ t.string :shipping_state
+ t.integer :shipping_zip
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018213324_create_product_orders.rb b/db/migrate/20161018213324_create_product_orders.rb
new file mode 100644
index 0000000000..d5ef81e254
--- /dev/null
+++ b/db/migrate/20161018213324_create_product_orders.rb
@@ -0,0 +1,10 @@
+class CreateProductOrders < ActiveRecord::Migration
+ def change
+ create_table :product_orders do |t|
+ t.references :product, index: true, foreign_key: true
+ t.references :order, index: true, foreign_key: true
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018213348_create_product_categories.rb b/db/migrate/20161018213348_create_product_categories.rb
new file mode 100644
index 0000000000..7d47a00c43
--- /dev/null
+++ b/db/migrate/20161018213348_create_product_categories.rb
@@ -0,0 +1,10 @@
+class CreateProductCategories < ActiveRecord::Migration
+ def change
+ create_table :product_categories do |t|
+ t.references :product, index: true, foreign_key: true
+ t.references :category, index: true, foreign_key: true
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161018224431_make_long_integers_strings.rb b/db/migrate/20161018224431_make_long_integers_strings.rb
new file mode 100644
index 0000000000..13b367f8de
--- /dev/null
+++ b/db/migrate/20161018224431_make_long_integers_strings.rb
@@ -0,0 +1,15 @@
+class MakeLongIntegersStrings < ActiveRecord::Migration
+ def change
+ remove_column :orders, :card_number, :integer
+ add_column :orders, :card_number, :string
+
+ remove_column :orders, :card_cvv, :integer
+ add_column :orders, :card_cvv, :string
+
+ remove_column :orders, :billing_zip, :integer
+ add_column :orders, :billing_zip, :string
+
+ remove_column :orders, :shipping_zip, :integer
+ add_column :orders, :shipping_zip, :string
+ end
+end
diff --git a/db/migrate/20161019000145_add_foreign_keys.rb b/db/migrate/20161019000145_add_foreign_keys.rb
new file mode 100644
index 0000000000..3f23f6de57
--- /dev/null
+++ b/db/migrate/20161019000145_add_foreign_keys.rb
@@ -0,0 +1,15 @@
+class AddForeignKeys < ActiveRecord::Migration
+ def change
+ remove_column :orders, :guest_id, :integer
+ remove_column :orders, :merchant_id, :integer
+
+ add_reference :orders, :guest, index: true, foreign_key: true
+ add_reference :orders, :merchant, index: true, foreign_key: true
+
+ remove_column :products, :merchant_id, :integer
+ add_reference :products, :merchant, index: true, foreign_key: true
+
+ remove_column :reviews, :product_id, :integer
+ add_reference :reviews, :product, index: true, foreign_key: true
+ end
+end
diff --git a/db/migrate/20161019224122_create_line_items.rb b/db/migrate/20161019224122_create_line_items.rb
new file mode 100644
index 0000000000..1119414b66
--- /dev/null
+++ b/db/migrate/20161019224122_create_line_items.rb
@@ -0,0 +1,13 @@
+class CreateLineItems < ActiveRecord::Migration
+ def change
+ create_table :line_items do |t|
+ t.integer :qty
+ t.integer :price
+ t.references :order
+ t.references :product
+ t.references :merchant
+
+ t.timestamps null: false
+ end
+ end
+end
diff --git a/db/migrate/20161019225037_add_order_status_to_order.rb b/db/migrate/20161019225037_add_order_status_to_order.rb
new file mode 100644
index 0000000000..ee918c795f
--- /dev/null
+++ b/db/migrate/20161019225037_add_order_status_to_order.rb
@@ -0,0 +1,5 @@
+class AddOrderStatusToOrder < ActiveRecord::Migration
+ def change
+ add_column(:orders, :order_status, :string)
+ end
+end
diff --git a/db/migrate/20161020232838_add_uid_and_provider_to_merchant.rb b/db/migrate/20161020232838_add_uid_and_provider_to_merchant.rb
new file mode 100644
index 0000000000..315ccf7adc
--- /dev/null
+++ b/db/migrate/20161020232838_add_uid_and_provider_to_merchant.rb
@@ -0,0 +1,6 @@
+class AddUidAndProviderToMerchant < ActiveRecord::Migration
+ def change
+ add_column(:merchants, :uid, :string)
+ add_column(:merchants, :provider, :string)
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
new file mode 100644
index 0000000000..9809e7d64e
--- /dev/null
+++ b/db/schema.rb
@@ -0,0 +1,115 @@
+# 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: 20161020232838) do
+
+ create_table "categories", force: :cascade do |t|
+ t.string "name"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "guests", force: :cascade do |t|
+ t.string "name"
+ t.string "email"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "line_items", force: :cascade do |t|
+ t.integer "qty"
+ t.integer "price"
+ t.integer "order_id"
+ t.integer "product_id"
+ t.integer "merchant_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ create_table "merchants", force: :cascade do |t|
+ t.string "name"
+ t.string "email"
+ t.string "password"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "uid"
+ t.string "provider"
+ end
+
+ create_table "orders", force: :cascade do |t|
+ t.integer "total_amount"
+ t.string "card_name"
+ t.string "card_exp"
+ t.string "shipping_street"
+ t.string "shipping_city"
+ t.string "shipping_state"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.string "card_number"
+ t.string "card_cvv"
+ t.string "billing_zip"
+ t.string "shipping_zip"
+ t.integer "guest_id"
+ t.integer "merchant_id"
+ t.string "order_status"
+ end
+
+ add_index "orders", ["guest_id"], name: "index_orders_on_guest_id"
+ add_index "orders", ["merchant_id"], name: "index_orders_on_merchant_id"
+
+ create_table "product_categories", force: :cascade do |t|
+ t.integer "product_id"
+ t.integer "category_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ add_index "product_categories", ["category_id"], name: "index_product_categories_on_category_id"
+ add_index "product_categories", ["product_id"], name: "index_product_categories_on_product_id"
+
+ create_table "product_orders", force: :cascade do |t|
+ t.integer "product_id"
+ t.integer "order_id"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ end
+
+ add_index "product_orders", ["order_id"], name: "index_product_orders_on_order_id"
+ add_index "product_orders", ["product_id"], name: "index_product_orders_on_product_id"
+
+ create_table "products", force: :cascade do |t|
+ t.string "name"
+ t.text "description"
+ t.integer "price"
+ t.string "image"
+ t.integer "inventory"
+ t.float "rating"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "merchant_id"
+ end
+
+ add_index "products", ["merchant_id"], name: "index_products_on_merchant_id"
+
+ create_table "reviews", force: :cascade do |t|
+ t.text "description"
+ t.integer "stars"
+ t.string "author"
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.integer "product_id"
+ end
+
+ add_index "reviews", ["product_id"], name: "index_reviews_on_product_id"
+
+end
diff --git a/db/seeds.rb b/db/seeds.rb
index 4edb1e857e..4344d04f9f 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,47 @@
#
# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }])
# Mayor.create(name: 'Emanuel', city: cities.first)
+
+require 'csv'
+
+CSV.foreach('seeds_csvs/category.csv') do |csv_obj|
+ Category.create(name: csv_obj[1])
+ end
+
+CSV.foreach('seeds_csvs/guests.csv') do |csv_obj|
+ Guest.create(name: csv_obj[1], email: csv_obj[2])
+end
+
+CSV.foreach('seeds_csvs/merchant.csv') do |csv_obj|
+ Merchant.create(name: csv_obj[1], email: csv_obj[2], password: csv_obj[3])
+end
+
+CSV.foreach('seeds_csvs/orders.csv') do |csv_obj|
+ Order.create(guest_id: csv_obj[1].to_i, total_amount: csv_obj[2].to_f/100, merchant_id: csv_obj[3].to_i, card_name: csv_obj[4], card_number: csv_obj[5], card_exp: csv_obj[6], card_cvv: csv_obj[7], billing_zip: csv_obj[8], shipping_street: csv_obj[9], shipping_city: csv_obj[10], shipping_state: csv_obj[11], shipping_zip: csv_obj[12],order_status: csv_obj[13])
+end
+
+CSV.foreach('seeds_csvs/product_categories.csv') do |csv_obj|
+ ProductCategory.create(category_id: csv_obj[1].to_i, product_id: csv_obj[2])
+end
+
+CSV.foreach('seeds_csvs/products_orders.csv') do |csv_obj|
+ ProductOrder.create(product_id: csv_obj[1].to_i, order_id: csv_obj[2].to_i)
+end
+
+CSV.foreach('seeds_csvs/products.csv') do |csv_obj|
+ Product.create(name: csv_obj[1], description: csv_obj[2], price: csv_obj[3].to_i, image: csv_obj[4], inventory: csv_obj[5].to_i, merchant_id: csv_obj[6].to_i )
+end
+
+CSV.foreach('seeds_csvs/reviews.csv') do |csv_obj|
+ Review.create(product_id: csv_obj[1].to_i, description: csv_obj[2], author: csv_obj[3], stars: csv_obj[4].to_i)
+end
+
+#
+# begin
+# require "pg"
+# array = [Merchant, Product, ProductOrder, Category, Review, Guest, Order, ProductCategory]
+# array.each do |model|
+# ActiveRecord::Base.connection.execute("SELECT setval('#{model.table_name}_id_seq'::regclass,?)", model.count)
+# end
+# rescue LoadError
+# end
diff --git a/seeds_csvs/category.csv b/seeds_csvs/category.csv
new file mode 100644
index 0000000000..1d365f7266
--- /dev/null
+++ b/seeds_csvs/category.csv
@@ -0,0 +1,10 @@
+1,Rainbows
+2,Games and Toys
+3,Moustache
+4,Disguises
+5,Miscellaneous
+6,Naps
+7,Wearables
+8,Decor
+9,Animals
+10,Beauty
diff --git a/seeds_csvs/guests.csv b/seeds_csvs/guests.csv
new file mode 100644
index 0000000000..b0a5348817
--- /dev/null
+++ b/seeds_csvs/guests.csv
@@ -0,0 +1,10 @@
+1,Carlos Howard,choward0@oracle.com
+2,Rose Reid,rreid1@usda.gov
+3,Michael Brown,mbrown2@networksolutions.com
+4,Stephanie Bennett,sbennett3@foxnews.com
+5,Terry Allen,tallen4@nasa.gov
+6,Michelle Phillips,mphillips5@naver.com
+7,Martin Robertson,mrobertson6@spotify.com
+8,Randy Weaver,rweaver7@lulu.com
+9,Annie Harrison,aharrison8@51.la
+10,Sarah King,sking9@spiegel.de
diff --git a/seeds_csvs/merchant.csv b/seeds_csvs/merchant.csv
new file mode 100644
index 0000000000..3492f7430c
--- /dev/null
+++ b/seeds_csvs/merchant.csv
@@ -0,0 +1,10 @@
+1,merchant 1,rgeorge0@adobe.com,A1s5KLpTiyu
+2,merchant 2,dwilson1@gizmodo.com,2kIBWgyznWY
+3,merchant 3,dcastillo2@nsw.gov.au,RYshSYKG
+4,merchant 4,jwatkins3@mediafire.com,f3cQChXEIi
+5,merchant 5,rlane4@examiner.com,gDGVvnjMkix
+6,merchant 6,htorres5@admin.ch,0IMBHc
+7,merchant 7,ascott6@rambler.ru,M1HJAWy
+8,merchant 8,krodriguez7@bluehost.com,HRPnISN
+9,merchant 9,choward8@cpanel.net,gEvbQpHX
+10,merchant 10,smorgan9@google.com.br,Wxbop5c1dNd
diff --git a/seeds_csvs/orders.csv b/seeds_csvs/orders.csv
new file mode 100644
index 0000000000..338b49b849
--- /dev/null
+++ b/seeds_csvs/orders.csv
@@ -0,0 +1,10 @@
+1,Heather Martin,700,3,jcb,3544153313003422,06/16,121,12345,8 Blaine Trail,Milwaukee,Wisconsin,12345,Paid
+2,Ryan King,600,10,jcb,3535790488366570,02/16,221,12345,3421 Atwood Street,Milwaukee,Wisconsin,12345,Pending
+3,Scott Freeman,800,2,visa-electron,4844470197867465,03/16,321,12345,12980 Hudson Hill,Colorado Springs,Colorado,12345,Cancelled
+4,Matthew Mason,400,8,visa-electron,4913634062130046,07/16,212,12345,24351 1st Point,Denver,Colorado,12345,Completed
+5,Lisa Oliver,400,10,jcb,3561305235966635,08/16,211,12345,2063 Pine View Road,Salt Lake City,Utah,12345,Completed
+6,Sarah Cox,500,6,jcb,3541499214835088,10/15,213,12345,56903 American Lane,Beaumont,Texas,12345,Cancelled
+7,Nicole Adams,600,9,diners-club-enroute,201516174929028,06/16,213,12345,5 Dixon Parkway,Charleston,West Virginia,12345,Pending
+8,Amanda West,500,4,visa,4041595386325825,11/15,213,12345,2 Menomonie Terrace,Dallas,Texas,12345,Paid
+9,Douglas Sanchez,500,2,mastercard,5100176740926148,12/15,212,12345,96916 Loomis Crossing,Florence,South Carolina,12345,Pending
+10,James Mendoza,100,7,jcb,3528298798434178,9/16,211,12345,0662 Duke Court,El Paso,Texas,12345,Paid
diff --git a/seeds_csvs/product_categories.csv b/seeds_csvs/product_categories.csv
new file mode 100644
index 0000000000..6e970fbe73
--- /dev/null
+++ b/seeds_csvs/product_categories.csv
@@ -0,0 +1,100 @@
+1,10,1
+2,5,1
+3,5,2
+4,2,2
+5,7,3
+6,9,3
+7,5,3
+8,2,4
+9,5,4
+10,5,5
+11,9,5
+13,8,5
+15,5,6
+16,10,6
+17,7,6
+18,4,6
+19,5,7
+20,8,7
+21,3,8
+22,4,8
+23,5,8
+24,7,8
+25,10,8
+26,9,9
+27,8,9
+28,5,9
+29,5,10
+30,9,11
+31,7,11
+32,5,11
+33,4,11
+34,2,11
+35,1,12
+36,5,12
+37,6,12
+38,5,13
+39,5,14
+40,8,14
+41,9,14
+42,2,15
+43,5,15
+44,1,16
+45,5,16
+46,4,17
+47,5,17
+48,7,17
+49,2,18
+50,5,18
+51,3,19
+52,5,19
+53,5,20
+54,8,20
+55,1,21
+56,5,21
+57,1,22
+58,5,22
+59,5,23
+60,5,24
+61,9,24
+62,2,25
+63,5,25
+64,1,26
+65,5,26
+66,8,26
+67,5,27
+68,2,28
+69,5,28
+70,5,29
+71,9,29
+72,2,30
+73,5,30
+74,6,30
+75,1,31
+76,5,31
+77,1,32
+78,2,32
+79,5,32
+80,9,32
+81,2,33
+82,5,33
+83,5,34
+84,1,35
+85,5,35
+86,7,35
+87,10,35
+88,1,36
+89,4,36
+90,5,36
+91,5,37
+92,9,37
+93,2,37
+94,9,38
+95,2,38
+96,5,38
+97,5,39
+98,9,39
+99,5,40
+100,8,40
+101,5,41
+102,8,41
diff --git a/seeds_csvs/products.csv b/seeds_csvs/products.csv
new file mode 100644
index 0000000000..534b63766f
--- /dev/null
+++ b/seeds_csvs/products.csv
@@ -0,0 +1,41 @@
+1,Bath Bomb,"Literally a bomb for your bath. Desperate times call for desperate measures. The best way to get out of doing your work is to cause an 'accidental' small explosion at your house. Pro Tip: A bath bomb is also a great way to avoid cleaning your shower.",3704,bath_bomb.jpg,10,9
+2,Cards Against Humanity,"Cards Against Humanity is a party game for horrible people. Unlike most of the party games you've played before, Cards Against Humanity is as despicable and awkward as you and your friends.",8838,card_humanity.jpg,13,3
+3,Cat Watch,"As you suspected, this watch doesn't actually tell time. A stylish procrastinator like you needs a sleek and clever looking feline to adorn your wrist, but not actually tell you how much time you've wasted. It's also a great conversation starter if you're trying to charm a hipster. #winning",1171,cat_watch.jpg,5,10
+4,Drunk Stoned or Stupid,"DRUNK STONED OR STUPID is a party game for you and your stupid friends. Each round a card is drawn and the group decides who in the group would be most likely to do really stupid things.",7305,drunk_stoned_or_stupid.jpg,7,1
+5,Baby Elephant Drinking Wine,"You asked and we delivered. Yes, this porcelain baby elephant is LITERALLY drinking wine. You'll find yourself mesmerized by it's lush cuteness.",4857,elephant_wine.jpg,3,1
+6,Eyelash Goggles,"Go scuba diving with style. These sassy lashy goggles take waterproof falsies to a whole new level. Wear them while you're swimming for a wet and sexy look, or wear them when you're not swimming to attract unwanted attention.",739,eyelash_goggles.jpg,2,9
+7,Singing Cardboard Face,"Always wanted a cardboard face? We know. And guess what? This one sings! Our Intelligent Bionic Cardboard Technology will have you guessing whether this is really a piece of art made from recycled boxes or a real human face while it serenades you with 90's boyband songs.",1900,face.jpg,15,8
+8,Fingerstache,"Charm your lover with these sexy fingerstaches. This pack of far too many temporary tattoos will keep you talking in bad accents all night long.",1689,finger_stash.jpg,43,4
+9,Flamingo Lights,"Have your friends screaming 'this pad is lit!' every time they visit with this set of LED flamingo lights. Pro Tip: Cool your Yule and avian your Advent by using these feisty flamingo lights on your Christmas Tree.",5913,flamingo_lights.jpg,9,9
+10,Universe Lollipops,"How many licks does it take to get to the center of the Universe? Help humankind find the answer to this and other rhetorical questions by taking a lick at these yummy universe pops.",4605,galaxy_lollipops.jpg,10,9
+11,Gorgeous Giraffe Mask,"Gee! Golly! A Giraffe! Spend hours frolicking through your local urban jungle wearing this gorgeous giraffe mask. ",1005,giraffe.jpg,10,9
+12,Rainbow Hammock,"Find your pot of gold at the end of your rainbow hammock nap. Don't worry, this hammock doesn't only come out when the sun is shining through the rain.",1575,hamock.jpg,10,9
+13,Hey Girl Tea,"You'll want to take a sick day every day with this tantalizing tea infused with Mucinex and honey.",1334,hey_girl.jpg,10,9
+14,Horse Lamp,"Tired of being Head of the Household? Hand of your responsibilities to this Horse of the Household. She'll lead you and your roommates on the path toward en'light'enment.",10099,horse_lamp.jpg,10,9
+15,Little Wiener Man,"Waste away your day fiddling with this limited edition Little Wiener Man. Collect this and the other Tiny Meat Men: Frank Furt, Brad Wurst, and Kevin Bacon",1643,hotdog_lego.jpg,10,9
+16,Rainbow Knives,"Look like you're doing something productive while you're actually doing nothing at all. These nifty knives are so dull that they'll cut nothing at all. You'll look like you're always chopping vegetables, but with these, we promise it will never get done.",2167,knives.jpg,10,9
+17,Squid Mask,"Haters gonna hate, and you'll make them hate you even more when you wear this knit squid mask. Made with 100% alpaca wool. Hand crafted.",1962,mask.jpg,10,9
+18,Creepy Mermaid Lego,"We just know you'll want to play with this miserable mermaid just as much as we do. She's made of plastic, it's fantastic.",654,mermaid_lego.jpg,10,9
+19,Moustache Clips,"Stache away your favorite passages with these Moustache Clip Page Markers. They come in a variety of lifelike shapes and colors to help you stay organized. These wiry staches are both magnetic and lady magnets.",894,mustache_clips.jpg,10,9
+20,Moustache Outlet Covers,"You've always thought the holes in your outlet looked like a face. Well, why not make that boring outlet face look like your dad's face? These classy mustache stickers will have you and your friends gawking at the resemblance.",458,outlet_stash.jpg,10,9
+21,Tiny Plungers,"These tiny plungers can tackle the tiniest of clogs in the tiniest of toilets. Some assembly required.",1243,party_plungers.jpg,10,9
+22,Procrastinator's Pen Set,"Take forever deciding which color pen you want to use. With more than ten shades of blue to chose from you'll never decide on the perfect one.",2100,pens.jpg,10,9
+23,Frappe Fake Phone Case,"This fancy Frappe Fake Phone Case doesn't fit a single phone in existence. Really. Not one. Just try making your phone fit. We dare you.",654,phone_case.jpg,10,9
+24,Pegg,"Meet Pegg. She's a pig who pukes eggs. Well, egg yolks to be specific. She's the cutest but least efficient way you'll ever find to separate the egg yolks from the whites.",1824,pig_egg.jpg,10,9
+25,Pizza Floatation Device,"Ever wish you could hit the water on your favorite wedge of pizza. This is your chance. Drowning Hazard Warning: Wait twenty minutes after using Pizza Flotation Device before swimming.",2777,pizza_raft.jpg,10,9
+26,Roy G. Biv Rainbow Maker,"Enjoy the entire visible light spectrum from the comfort of your living room. This rainbow maker is the first and only of its kind and is guaranteed to bring you happiness. Warning: Shining a rainbow directly into your eyes could cause vision loss.",8721,rainbow_maker.jpg,10,9
+27,Toast-Its,"You'll love leaving yourself little reminders on paper that looks and smells so much like real toast that you might catch yourself buttering it. Don't worry, we've done it too.",133,sticky_notes.jpg,10,9
+28,Voo-doo Squeez-a-Face,"Seeking revenge on someone who has done you wrong? Look no further. Squeeze this head into whatever ugly expression you desire and your nemesis's face will be permanently stuck that way.",733,stress_balls.jpg,10,9
+29,Tea-Rex,"Still drinking New Age Tea? Pssshh. Time to turn your tea Prehistoric with this Tea-Rex. Also available in Paleozoic Purple and Cambrian Cranberry.",664,tea_infuser.jpg,10,9
+30,Tire Swing,"This tried and true tire swing will keep you twirling your time away day after day.",10123,tire_swing.jpg,10,9
+31,Rainbow Parasol,"Did you know harmful UVRainbows can cause premature aging? Protect your skin from the visible light spectrum with this rainbow parasol. Keep it on hand for those disheartening days when the sun is shining through the rain. ",4233,umbrella.jpg,10,9
+32,Uni the Unicorn,"What's white, gold, and rainbow all over? Uni the Unicorn! You'll love snuggling her plushy bod. Kiss her on the muzzle and you might even catch her smiling at you.",791,unicorn_animal.jpg,10,9
+33,View Master,"The original virtual reality device is back and ready for you to explore distant lands and funny memes with the pull of a trigger. Choose from a variety of film discs including bald cats, tiny apartments, and accidental photos of the floor.",1594,view_master.jpg,10,9
+34,Boxed Water,"Boxed water is better. Don't believe us? Try it for yourself. Drinking water out of cardboard carton will leave you feeling refreshed and oddly nostalgic for your elementary school cafeteria. It's an emotion fusion we guarantee you'll love. Please don't operate heavy machinery after drinking boxed water.",299,water.jpg,10,9
+35,Engagement Ring,"Have your S.O. saying 'Oh Yes' with this 'hue'-tiful rainbow engagement ring. You'll love watching her friends smile and nod politely when they ask to see her ring.",9999,wedding_ring.jpg,10,9
+36,Rainbow Hair,"Win friends and influence people with this psychedelic rainbow wig made from real human hair.",4799,wig.jpg,10,9
+37,Mum Fish and Bone Baby,"You'll love helping this Mum Fish give birth to her smiling Bone Baby. Make Bone Baby swim around or put him back in the birthing canal for more laborious fun.",1799,bone_fish.jpg,10,9
+38,Techie Plush-a-nana,"Get caught in an infinite loop peeling and un-peeling this soft plush banana. You'll find yourself iterating over plush banana mechanics all day long. ",1299,fake_banana.jpg,10,9
+39,Prehistoric Paper Weight,"Keep your documents from blowing away so your job doesn't go extinct. Paleo down your important papers with this Dino-mite glass paper weight. Plus, it'll look 'ptero-rrific' in your cubicle.",2999,glass_dino.jpg,10,9
+40,Take My Hand Statue,"This lifelike hand is always handy when you need a hand, but only when you need a fake hand. We know it's a rare occasion, but it's here. You know, just in case. ",4799,hand.jpg,10,9
+41,Monkey Pizza Cutter,"Pretend you're at the circus at dinner time. This pizza cutter that closely resembles a monkey riding a unicycle will slice your pizza in one fell swoop.",2799,monkey_pizza_cutter.jpg,10,9
diff --git a/seeds_csvs/products_orders.csv b/seeds_csvs/products_orders.csv
new file mode 100644
index 0000000000..e7384e9f6c
--- /dev/null
+++ b/seeds_csvs/products_orders.csv
@@ -0,0 +1,10 @@
+1,2,5
+2,5,7
+3,1,4
+4,5,7
+5,2,6
+6,1,4
+7,6,10
+8,3,6
+9,6,9
+10,7,10
diff --git a/seeds_csvs/reviews.csv b/seeds_csvs/reviews.csv
new file mode 100644
index 0000000000..bf2b81bfc4
--- /dev/null
+++ b/seeds_csvs/reviews.csv
@@ -0,0 +1,10 @@
+1,3,This cat watch is kinda crappy! It tells the time so you'd think that's great. But the cat glasses broke off in the first month. Still pretty cute tho.,Louise Andrews,2
+2,3,OHEMGEE! I LOVE this thing!!!!,Kimberly Stone,5
+3,1,Dare I say it? This is the BOMB.com!! #productpuns,Mark Myers,5
+4,7,This is garbage! It didn't even survive outside during the first rainstorm of the season.,Mark Price,2
+5,9,Perfect ambiance for when I bring my dates back to my place. They even forget that we're in my mom's basement!,3
+6,1,I take nightly baths and this is BY FAR the best bath bomb I'v used! It not only smells amazing but also leave my skin silky smooth. I only give it a three because that's my favorite number,Justin Murphy,3
+7,2,THIS IS SO FUN! I brought it into my 1st grade class room and loved it! One thumb up! (I lost my other in a tire swing accident a few years back),Janice Foster,5
+8,9,Super fun a festive! Great for a back-yard BBQ,Sarah Matthews,5
+9,5,I LOVE the elephant, however be warned, it only holds a normal bottle of wine - not a double - need a grown up elephant for that!,Ann Stanley,3
+10,7,I thought about getting a cardboard moose for my wall but the face is so much more relatable,Gary Ramirez,5
diff --git a/test/controllers/categories_controller_test.rb b/test/controllers/categories_controller_test.rb
new file mode 100644
index 0000000000..6e2267313e
--- /dev/null
+++ b/test/controllers/categories_controller_test.rb
@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class CategoriesControllerTest < ActionController::TestCase
+ test "should get index" do
+ get :index
+ assert_response :success
+ assert_template :index
+ end
+
+ test "should get show" do
+ get :show, {id: categories(:one).id}
+ assert_response :success
+ assert_template :show
+ end
+
+ test "should get new" do
+ get :new
+ assert_response :success
+ end
+
+ test "should be able to create a new category" do
+ post_params = {category: {name: "Harry Potter Things"}}
+ post :create, post_params
+ assert_response :redirect
+ end
+
+ test "creating a category changes the number of categories" do
+
+ assert_difference('Category.count', 1) do
+ post_params = {category: {name: "A Category"}}
+ post :create, post_params
+ end
+ assert_response :redirect
+ end
+
+
+ test "should get destroy" do
+
+ delete :destroy, {id: categories(:one).id}
+ assert_response :redirect
+ end
+
+
+end
diff --git a/test/controllers/guests_controller_test.rb b/test/controllers/guests_controller_test.rb
new file mode 100644
index 0000000000..8cf2becd09
--- /dev/null
+++ b/test/controllers/guests_controller_test.rb
@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class GuestsControllerTest < ActionController::TestCase
+ # test "should get index" do
+ # get :index
+ # assert_response :success
+ # end
+ #
+ # test "should get show" do
+ # get :show
+ # assert_response :success
+ # end
+ #
+ # test "should get new" do
+ # get :new
+ # assert_response :success
+ # end
+ #
+ # test "should get create" do
+ # get :create
+ # assert_response :success
+ # end
+ #
+ # test "should get edit" do
+ # get :edit
+ # assert_response :success
+ # end
+ #
+ # test "should get update" do
+ # get :update
+ # assert_response :success
+ # end
+ #
+ # test "should get destroy" do
+ # get :destroy
+ # assert_response :success
+ # end
+
+end
diff --git a/test/controllers/landing_controller_test.rb b/test/controllers/landing_controller_test.rb
new file mode 100644
index 0000000000..b814ae4ebc
--- /dev/null
+++ b/test/controllers/landing_controller_test.rb
@@ -0,0 +1,9 @@
+require 'test_helper'
+
+class LandingControllerTest < ActionController::TestCase
+ test "should get index" do
+ get :index
+ assert_response :success
+ end
+
+end
diff --git a/test/controllers/merchants_controller_test.rb b/test/controllers/merchants_controller_test.rb
new file mode 100644
index 0000000000..60518e0c28
--- /dev/null
+++ b/test/controllers/merchants_controller_test.rb
@@ -0,0 +1,10 @@
+require 'test_helper'
+
+class MerchantsControllerTest < ActionController::TestCase
+ test "should get index" do
+ get :index
+ assert_response :success
+ assert_template :index
+ end
+
+end
diff --git a/test/controllers/orders_controller_test.rb b/test/controllers/orders_controller_test.rb
new file mode 100644
index 0000000000..f00d72f4ff
--- /dev/null
+++ b/test/controllers/orders_controller_test.rb
@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class OrdersControllerTest < ActionController::TestCase
+ # test "should get index" do
+ # get :index
+ # assert_response :success
+ # end
+ #
+ # test "should get show" do
+ # get :show
+ # assert_response :success
+ # end
+ #
+ # test "should get new" do
+ # get :new
+ # assert_response :success
+ # end
+ #
+ # test "should get create" do
+ # get :create
+ # assert_response :success
+ # end
+ #
+ # test "should get edit" do
+ # get :edit
+ # assert_response :success
+ # end
+ #
+ # test "should get update" do
+ # get :update
+ # assert_response :success
+ # end
+ #
+ # test "should get destroy" do
+ # get :destroy
+ # assert_response :success
+ # end
+
+end
diff --git a/test/controllers/products_controller_test.rb b/test/controllers/products_controller_test.rb
new file mode 100644
index 0000000000..686705b0f4
--- /dev/null
+++ b/test/controllers/products_controller_test.rb
@@ -0,0 +1,59 @@
+require 'test_helper'
+
+class ProductsControllerTest < ActionController::TestCase
+ test "should get index" do
+ get :index, {merchant_id: (products(:glitter).merchant).id}
+ assert_response :success
+ assert_template :index
+ end
+
+ test "should get show" do
+ merchant = products(:glitter).merchant
+
+ get :show, {id: products(:glitter).id, merchant_id: merchant.id }
+ #get merchant_product_path(merchant.id, products(:glitter).id)
+ assert_response :success
+ end
+
+ test "should get new" do
+ get :new, {merchant_id: (products(:glitter).merchant).id}
+ assert_response :success
+ assert_template :new
+ end
+
+ test "should be able to create a new product" do
+ post_params = {name: "Glitter Wand", description: "a glittery wand", price: "15.00", image: 'http://placekitten.com/200/300', merchant_id: 2, inventory: 7, rating: 5}
+
+ post :create, {merchant_id: (products(:glitter).merchant).id, product: post_params}
+ assert_response :redirect
+ end
+
+ test "creating a product changes the number of products" do
+ assert_difference("Product.count",1) do
+ post :create, {merchant_id: (products(:glitter).merchant).id, "product" => {name: "Glitter Wand", description: "a glittery wand", price: "15.00", image: 'http://placekitten.com/200/300', inventory: 7, rating: 5}}
+ end
+ end
+
+ test "should get edit -----!!!!" do
+ product = products(:glitter)
+ get :edit, {id: product.id, merchant_id: products(:glitter).merchant.id }
+ assert_response :success
+ end
+
+ test "should be able to update a product" do
+ put :update, {merchant_id: (products(:glitter).merchant).id, id: products(:glitter).id, product: {name: "Glitter Wand", description: "a glittery wand", price: "15.00", image: 'http://placekitten.com/200/300', merchant_id: 2, inventory: 7, rating: 5}}
+ assert_redirected_to controller: "products", action: "show"
+ end
+
+ test "deleting a product changes the number of products" do
+ assert_difference("Product.count", -1) do
+ delete :destroy, {merchant_id: (products(:glitter).merchant).id, id: products(:glitter).id }
+ end
+ end
+
+ test "responds with error if file isn't found" do
+ delete :destroy, {merchant_id: (products(:glitter).merchant).id, id: 943}
+ assert_response :missing
+ end
+
+end
diff --git a/test/controllers/reviews_controller_test.rb b/test/controllers/reviews_controller_test.rb
new file mode 100644
index 0000000000..0e8a781f61
--- /dev/null
+++ b/test/controllers/reviews_controller_test.rb
@@ -0,0 +1,44 @@
+require 'test_helper'
+
+class ReviewsControllerTest < ActionController::TestCase
+ test "should get index" do
+ get :index, {merchant_id: (products(:glitter).merchant).id, product_id: products(:glitter).id}
+ assert_response :success
+ assert_template :index
+ end
+
+ test "should get show" do
+ get :show, {id: reviews(:glitter_review), product_id: products(:glitter).id, merchant_id: (products(:glitter).merchant).id}
+ assert_response :success
+ end
+
+ test "should get new" do
+ get :new, {merchant_id: (products(:glitter).merchant).id, product_id: products(:glitter).id}
+ assert_response :success
+ assert_template :new
+ end
+
+ test "should be able to create a new product" do
+ post :create, {merchant_id: (products(:glitter).merchant).id, product_id: products(:glitter).id, review: {description: "njefknlsnf", stars: 2, author: "nfs"}}
+ assert_response :redirect
+ # This action will need to change to merchant's create_new_product path
+ end
+
+ test "creating a product changes the number of products" do
+ assert_difference("Review.count",1) do
+ post :create, {merchant_id: (products(:glitter).merchant).id, product_id: products(:glitter).id, review: {description: "njefknlsnf", stars: 2, author: "nfs"}}
+ end
+ end
+
+
+ test "deleting a review changes the number of reviews" do
+ assert_difference("Review.count", -1) do
+ delete :destroy, {merchant_id: (products(:glitter).merchant).id, product_id: products(:glitter).id, id: reviews(:glitter_review).id }
+ end
+ end
+
+ test "redirects and gives flash notice if file isn't found" do
+ delete :destroy, {merchant_id: (products(:glitter).merchant).id, product_id: products(:glitter).id, id: 943}
+ assert_redirected_to merchant_product_path((products(:glitter).merchant).id, products(:glitter).id)
+ end
+end
diff --git a/test/controllers/sessions_controller_test.rb b/test/controllers/sessions_controller_test.rb
new file mode 100644
index 0000000000..9c49242143
--- /dev/null
+++ b/test/controllers/sessions_controller_test.rb
@@ -0,0 +1,41 @@
+require 'test_helper'
+
+class SessionsControllerTest < ActionController::TestCase
+ # test "should get create" do
+ # get :create
+ # assert_response :success
+ # end
+ #
+ # test "should get destroy" do
+ # get :destroy
+ # assert_response :success
+ # end
+
+ # setup do
+ # request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:github]
+ # end
+
+ def login_a_merchant
+ request.env['omniauth.auth'] = OmniAuth.config.mock_auth[:github]
+ get :create, {uid: '12345'}
+ end
+
+ test "Can Create a merchant" do
+ assert_difference('Merchant.count', 1) do
+ login_a_merchant
+ assert_response :redirect
+ assert_redirected_to merchant_path(Merchant.last.id)
+ end
+ end
+
+ test "If a merchant logs in twice it doesn't create a 2nd merchant" do
+ assert_difference('Merchant.count', 1) do
+ login_a_merchant
+ end
+ assert_no_difference('Merchant.count') do
+ login_a_merchant
+ assert_response :redirect
+ assert_redirected_to merchant_path(Merchant.last.id)
+ end
+ end
+end
diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml
new file mode 100644
index 0000000000..56066c68af
--- /dev/null
+++ b/test/fixtures/categories.yml
@@ -0,0 +1,7 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ name: MyString
+
+two:
+ name: MyString
diff --git a/test/fixtures/guests.yml b/test/fixtures/guests.yml
new file mode 100644
index 0000000000..5dc4ddf033
--- /dev/null
+++ b/test/fixtures/guests.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ name: MyString
+ email: MyString
+
+two:
+ name: MyString
+ email: MyString
diff --git a/test/fixtures/line_items.yml b/test/fixtures/line_items.yml
new file mode 100644
index 0000000000..6403f294ab
--- /dev/null
+++ b/test/fixtures/line_items.yml
@@ -0,0 +1,36 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+one:
+ qty: 1
+ price: 300
+ order: orderone
+ product: poop
+
+two:
+ qty: 1
+ price: 200
+ order: two
+ product: poop
+
+three:
+ qty: 1
+ price: 300
+ order: three
+ product: poop
+
+four:
+ qty: 1
+ price: 300
+ order: four
+ product: poop
+
+five:
+ qty: 1
+ price: 300
+ order: five
+ product: poop
+
+six:
+ qty: 1
+ price: 300
+ order: six
+ product: poop
diff --git a/test/fixtures/merchants.yml b/test/fixtures/merchants.yml
new file mode 100644
index 0000000000..ac7eafe484
--- /dev/null
+++ b/test/fixtures/merchants.yml
@@ -0,0 +1,22 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ name: merchant1
+ email: email_merchant1@email.com
+ password: password1234
+
+two:
+ name: merchant2
+ email: email_merchant2@email.com
+ password: password4321
+
+
+three:
+ name: merchant1
+ email: email_merchant1@email.com
+ password: password1234
+
+four:
+ name: merchant2
+ email: email_merchant2@email.com
+ password: password4321
diff --git a/test/fixtures/orders.yml b/test/fixtures/orders.yml
new file mode 100644
index 0000000000..8a5e5ad4c6
--- /dev/null
+++ b/test/fixtures/orders.yml
@@ -0,0 +1,91 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+orderone:
+ total_amount: 300
+ guest_id: 1
+ merchant: one
+ card_name: visa
+ card_number: 123456789012
+ card_exp: 02/16
+ card_cvv: 123
+ billing_zip: 12345
+ shipping_street: "1234 street"
+ shipping_city: City
+ shipping_state: State
+ shipping_zip: 12345
+ order_status: paid
+
+two:
+ total_amount: 200
+ guest_id: 1
+ merchant: one
+ card_name: MyString
+ card_number: 1
+ card_exp: MyString
+ card_cvv: 1
+ billing_zip: 1
+ shipping_street: MyString
+ shipping_city: MyString
+ shipping_state: MyString
+ shipping_zip: 1
+ order_status: paid
+
+three:
+ total_amount: 300
+ guest_id: 1
+ merchant: one
+ card_name: MyString
+ card_number: 1
+ card_exp: MyString
+ card_cvv: 1
+ billing_zip: 1
+ shipping_street: MyString
+ shipping_city: MyString
+ shipping_state: MyString
+ shipping_zip: 1
+ order_status: pending
+
+four:
+ total_amount: 300
+ guest_id: 1
+ merchant: one
+ card_name: MyString
+ card_number: 1
+ card_exp: MyString
+ card_cvv: 1
+ billing_zip: 1
+ shipping_street: MyString
+ shipping_city: MyString
+ shipping_state: MyString
+ shipping_zip: 1
+ order_status: pending
+
+five:
+ total_amount: 300
+ guest_id: 1
+ merchant: one
+ card_name: MyString
+ card_number: 1
+ card_exp: MyString
+ card_cvv: 1
+ billing_zip: 1
+ shipping_street: MyString
+ shipping_city: MyString
+ shipping_state: MyString
+ shipping_zip: 1
+ order_status: completed
+
+six:
+ total_amount: 300
+ guest_id: 1
+ merchant: one
+ card_name: MyString
+ card_number: 1
+ card_exp: MyString
+ card_cvv: 1
+ billing_zip: 1
+ shipping_street: MyString
+ shipping_city: MyString
+ shipping_state: MyString
+ shipping_zip: 1
+ order_status: cancelled
diff --git a/test/fixtures/product_categories.yml b/test/fixtures/product_categories.yml
new file mode 100644
index 0000000000..558460cad7
--- /dev/null
+++ b/test/fixtures/product_categories.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ product_id:
+ category_id:
+
+two:
+ product_id:
+ category_id:
diff --git a/test/fixtures/product_orders.yml b/test/fixtures/product_orders.yml
new file mode 100644
index 0000000000..25ec8737fc
--- /dev/null
+++ b/test/fixtures/product_orders.yml
@@ -0,0 +1,9 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+one:
+ product_id: :poop
+ order_id: :orderone
+
+two:
+ product_id: :poop
+ order_id: :two
diff --git a/test/fixtures/products.yml b/test/fixtures/products.yml
new file mode 100644
index 0000000000..b26c6657b7
--- /dev/null
+++ b/test/fixtures/products.yml
@@ -0,0 +1,36 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+new_shoe:
+ name: "A Shoe!"
+ description: "A beautiful shoe!"
+ price: 300
+ image: 'http://placekitten.com/200/300'
+ merchant: three
+ inventory: 4
+ rating: 3
+
+glitter:
+ name: "Glitter Wand"
+ description: "a glittery wand"
+ price: 1500
+ image: 'http://placekitten.com/200/300'
+ merchant: three
+ inventory: 7
+ rating: 5
+
+no_rating:
+ name: "Glitter Wand"
+ description: "a glittery wand"
+ price: 1500
+ image: 'http://placekitten.com/200/300'
+ merchant: four
+ inventory: 7
+
+poop:
+ name: "A poop!"
+ description: "on your beautiful shoe!"
+ price: 300
+ image: 'http://placekitten.com/200/300'
+ merchant: one
+ inventory: 4
+ rating: 3
diff --git a/test/fixtures/reviews.yml b/test/fixtures/reviews.yml
new file mode 100644
index 0000000000..8165e61b53
--- /dev/null
+++ b/test/fixtures/reviews.yml
@@ -0,0 +1,25 @@
+# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+
+glitter_review:
+ description: "nfjd"
+ stars: 3
+ author: "fndjk"
+ product: glitter
+
+shoe_review:
+ description: "mkd"
+ stars: 1
+ author: "fncdk"
+ product: new_shoe
+
+rating_review_one:
+ description: "nfjds"
+ stars: 5
+ author: "jf"
+ product: no_rating
+
+rating_review_two:
+ description: "mkvd"
+ stars: 3
+ author: "fdjk"
+ product: no_rating
diff --git a/test/models/category_test.rb b/test/models/category_test.rb
new file mode 100644
index 0000000000..acbe3bc842
--- /dev/null
+++ b/test/models/category_test.rb
@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class CategoryTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+
+test "should have the necessary required validators" do
+ category = Category.new
+ assert_not category.valid?
+ assert_equal [:name], category.errors.keys
+end
+end
diff --git a/test/models/guest_test.rb b/test/models/guest_test.rb
new file mode 100644
index 0000000000..848ce58750
--- /dev/null
+++ b/test/models/guest_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class GuestTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/line_item_test.rb b/test/models/line_item_test.rb
new file mode 100644
index 0000000000..f3a35e6b40
--- /dev/null
+++ b/test/models/line_item_test.rb
@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class LineItemTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+ test "subtotal returns what's expected" do
+ assert_equal 300, line_items(:one).subtotal
+ end
+
+end
diff --git a/test/models/merchant_test.rb b/test/models/merchant_test.rb
new file mode 100644
index 0000000000..c425aad66d
--- /dev/null
+++ b/test/models/merchant_test.rb
@@ -0,0 +1,48 @@
+require 'test_helper'
+
+class MerchantTest < ActiveSupport::TestCase
+ test "the truth" do
+ assert true
+ end
+
+ test "paid orders calculate as paid" do
+ assert_equal 500, merchants(:one).revenue_paid_orders
+ end
+
+ test "pending orders calculate correctly" do
+ assert_equal 600, merchants(:one).revenue_pending_orders
+ end
+
+ test "completed orders calculate correctly" do
+ assert_equal 300, merchants(:one).revenue_completed_orders
+ end
+
+ test "cancelled orders calculate correctly" do
+ assert_equal 300, merchants(:one).revenue_cancelled_orders
+ end
+
+ test "total orders calculate correctly" do
+ assert_equal 1400, merchants(:one).total_revenue
+ end
+
+ test "correct number of pending orders" do
+ assert_equal 2, merchants(:one).pending_orders
+ end
+
+ test "correct number of cancelled orders" do
+ assert_equal 1, merchants(:one).cancelled_orders
+ end
+
+ test "correct number of paid orders" do
+ assert_equal 2, merchants(:one).paid_orders
+ end
+
+ test "correct number of completed orders" do
+ assert_equal 1, merchants(:one).completed_orders
+ end
+
+ test "correct number of orders" do
+ assert_equal 5, merchants(:one).total_orders
+ end
+
+end
diff --git a/test/models/order_test.rb b/test/models/order_test.rb
new file mode 100644
index 0000000000..215378c38c
--- /dev/null
+++ b/test/models/order_test.rb
@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class OrderTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+ # test "total_amount returns the total of line items" do
+ # line_items = [{quantity: 3, price: 500}]
+ #
+ # assert_equal 1500, orders(:orderone).total_amount
+ # end
+end
diff --git a/test/models/product_category_test.rb b/test/models/product_category_test.rb
new file mode 100644
index 0000000000..6f788ebac5
--- /dev/null
+++ b/test/models/product_category_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ProductCategoryTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+end
diff --git a/test/models/product_order_test.rb b/test/models/product_order_test.rb
new file mode 100644
index 0000000000..6de041e1b8
--- /dev/null
+++ b/test/models/product_order_test.rb
@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class ProductOrderTest < 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..25f9139d15
--- /dev/null
+++ b/test/models/product_test.rb
@@ -0,0 +1,39 @@
+require 'test_helper'
+
+class ProductTest < ActiveSupport::TestCase
+ test "the truth" do
+ assert true
+ end
+ test "Product must have a name, description, price, inventory and image" do
+
+ assert products(:glitter).valid? "Glitter should be valid" ### WHY IS THIS FAILING???
+
+ products(:glitter).name = nil ## This name removal is local to the test data - it doesn't change the fixture
+ assert_not products(:glitter).valid? "Glitter should no longer be valid"
+
+ products(:new_shoe).price = nil
+ assert_not products(:new_shoe).valid? "New Shoe should no longer be valid"
+ end
+
+ test "Products cannot have a rating less than 0 or greater than 5" do
+ assert products(:glitter).rating = 6
+ assert_not products(:glitter).valid? "Glitter should no longer be valid"
+
+ assert products(:new_shoe).rating = -1
+ assert_not products(:new_shoe).valid? "New Shoe should no longer be valid"
+ end
+
+
+ test "The amount of an product's reviews" do
+ assert_equal products(:glitter).reviews.length, 1
+ assert_equal products(:new_shoe).reviews.length, 1
+ assert_equal products(:no_rating).reviews.length, 2
+
+ end
+
+ test "No_Rating has the correct reviews" do
+ assert_includes products(:no_rating).reviews, reviews(:rating_review_one)
+ assert_includes products(:no_rating).reviews, reviews(:rating_review_two)
+ end
+
+end
diff --git a/test/models/review_test.rb b/test/models/review_test.rb
new file mode 100644
index 0000000000..42fbc4bc0c
--- /dev/null
+++ b/test/models/review_test.rb
@@ -0,0 +1,36 @@
+require 'test_helper'
+
+class ReviewTest < ActiveSupport::TestCase
+ # test "the truth" do
+ # assert true
+ # end
+
+ test "Reviews must have a star rating and a description" do
+ assert reviews(:glitter_review).valid? "Glitter Review should be valid" ### WHY IS THIS FAILING???
+
+ reviews(:glitter_review).stars = nil ## This name removal is local to the test data - it doesn't change the fixture
+ assert_not reviews(:glitter_review).valid? "Glitter Review should no longer be valid"
+
+ reviews(:shoe_review).description = nil
+ assert_not reviews(:shoe_review).valid? "Shoe Review should no longer be valid"
+ end
+
+
+ test "Reviews cannot have a rating less than 0 or greater than 5" do
+ assert reviews(:glitter_review).stars = 6
+ assert_not reviews(:glitter_review).valid? "Glitter Review should no longer be valid"
+
+ assert reviews(:shoe_review).stars = -1
+ assert_not reviews(:shoe_review).valid? "New Shoe Review should no longer be valid"
+ end
+
+
+ test "Each Review has the correct rating" do
+ assert_equal reviews(:glitter_review).product, products(:glitter)
+ assert_equal reviews(:shoe_review).product, products(:new_shoe)
+ assert_equal reviews(:rating_review_one).product, products(:no_rating)
+ assert_equal reviews(:rating_review_two).product, products(:no_rating)
+ end
+
+
+end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 92e39b2d78..b69d44c0ff 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,10 +1,27 @@
ENV['RAILS_ENV'] ||= 'test'
require File.expand_path('../../config/environment', __FILE__)
require 'rails/test_help'
+require "minitest/reporters"
+require "simplecov"
+SimpleCov.start
class ActiveSupport::TestCase
# Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
fixtures :all
+ Minitest::Reporters.use!
# Add more helper methods to be used by all tests here...
+ # /test/test_helper.rb
+ def setup
+ # Once you have enabled test mode, all requests
+ # to OmniAuth will be short circuited to use the mock authentication hash.
+ # A request to /auth/provider will redirect immediately to /auth/provider/callback.
+ OmniAuth.config.test_mode = true
+
+ # The mock_auth configuration allows you to set per-provider (or default) authentication
+ # hashes to return during testing.
+ OmniAuth.config.mock_auth[:github] = OmniAuth::AuthHash.new({
+ provider: 'github', uid: '123545', info: { email: "a@b.com", name: "Ada" }
+ })
+ end
end