Ada-C4 · kedevlin · Dec 14, 2015 · Dec 14, 2015 · Dec 14, 2015 · Dec 14, 2015
diff --git a/.rspec b/.rspec
@@ -0,0 +1,2 @@
+--color
+--require spec_helper
diff --git a/Gemfile b/Gemfile
@@ -29,6 +29,10 @@ gem 'bootstrap-sass', '~> 3.3.5'
 
 gem 'simplecov', :require => false, :group => :test
 
+gem 'will_paginate'
+
+gem "font-awesome-rails"
+
 # Use Unicorn as the app server
 # gem 'unicorn'
 
@@ -40,6 +44,11 @@ group :production do
   gem "pg"
 end
 
+group :test do
+  gem 'shoulda-matchers', '~> 3.0'
+  gem "factory_girl_rails", "~> 4.0"
+end
+
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
@@ -59,5 +68,7 @@ group :development do
   gem "binding_of_caller"
 
   # Use sqlite3 as the database for Active Record
-    gem 'sqlite3'
+  gem 'sqlite3'
+
+  gem 'bullet'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,6 +51,9 @@ GEM
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
     builder (3.2.2)
+    bullet (4.14.10)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.9.0)
     byebug (8.2.1)
     coderay (1.1.0)
     coffee-rails (4.1.0)
@@ -66,6 +69,13 @@ GEM
     docile (1.1.5)
     erubis (2.7.0)
     execjs (2.6.0)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
+    font-awesome-rails (4.5.0.0)
+      railties (>= 3.2, < 5.0)
     globalid (0.3.6)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
@@ -151,6 +161,8 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
+    shoulda-matchers (3.0.1)
+      activesupport (>= 4.0.0)
     simplecov (0.11.1)
       docile (~> 1.1.0)
       json (~> 1.8)
@@ -176,11 +188,13 @@ GEM
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
+    uniform_notifier (1.9.0)
     web-console (2.2.1)
       activemodel (>= 4.0)
       binding_of_caller (>= 0.7.2)
       railties (>= 4.0)
       sprockets-rails (>= 2.0, < 4.0)
+    will_paginate (3.0.7)
 
 PLATFORMS
   ruby
@@ -190,8 +204,11 @@ DEPENDENCIES
   better_errors
   binding_of_caller
   bootstrap-sass (~> 3.3.5)
+  bullet
   byebug
   coffee-rails (~> 4.1.0)
+  factory_girl_rails (~> 4.0)
+  font-awesome-rails
   jbuilder (~> 2.0)
   jquery-rails
   pg
@@ -200,12 +217,14 @@ DEPENDENCIES
   rspec-rails
   sass-rails (~> 5.0)
   sdoc (~> 0.4.0)
+  shoulda-matchers (~> 3.0)
   simplecov
   spring
   sqlite3
   turbolinks
   uglifier (>= 1.3.0)
   web-console (~> 2.0)
+  will_paginate
 
 BUNDLED WITH
-   1.10.6
+   1.11.1
diff --git a/README.md b/README.md
@@ -1,207 +1,23 @@
-[Link to Trello Board](https://trello.com/b/mxIvtRi2/wetsy-planning)
-
-# bEtsy
-[b]Etsy will be an online store where a wide variety of products can be listed and sold by any user. In this project we will focus on reinforcing the major components of Rails, Model Validation, as well as introducing some more complex logic such as user authentication.
-
-#### In this project you will cover
-
-- Core comprehension of:
-  - Routes
-  - Controllers
-  - Models
-  - Views
-- User based application logic
-- User authentication
-- Agile practices
-- Group project ownership
-
-#### Guidelines
-
-- Groups of three or four will collaborate in pairs or individually and will report to their assigned Project Manager (one of the instructors)
-- Use a task manager like [Trello](http://trello.com) to track your team's efforts
-- Build a logical user-flow that moves across multiple controllers and models
-- Use HTML/CSS to style your website
-
-### Restrictions
-
-- Do not use gems for user authentication (such as Devise)
-
-### Getting Started
-
-1. As a group decide on an app name (this may help lead the aesthetic)
-1. As a group decide on a team name (this will amuse your instructors)
-1. Create a branch on the master repo with your team name
-1. Have one person on your team fork/clone the project master as per usual
-  1. Figure out your workflow for the project, re: Git and Task management
-1. Determine who will be the Stand Up Leader and Task Leader for the first week
-1. Create a Trello board and ensure that all team members and instructors have access
-1. Setup a basic Rails application (without using Minitest, but WITH RSpec), and submit a baseline PR with the generated application.
-
-### Expectations
-
-Build an online system for listing, selling, reviewing, and buying a wide variety of products listed by multiple merchants.
-
-#### General Requirements
-- RSpec tests for
-  - Controllers
-  - Models
-  - Routes (optional)
-- Test code coverage (using SimpleCov)
-  - 90% for all controller and model classes
-
-#### Guest User (Unauthenticated)
-
-As a guest to the website (not signed in) I **can**:
-
-- Browse all products
-- Browse products by category
-- Browse products by merchant (users)
-- View any individual product with additional details
-- Leave a review for a product providing:
-    - A Text review
-    - A rating out of 5
-- Add in-stock products to my cart
-- Remove products from my cart
-- Change the quantity of an existing product in my cart
-- Purchase the items in my cart, providing:
-    - Email Address
-    - Mailing Address
-    - Name on credit card
-    - Credit card number
-    - Credit cart expiration
-    - Credit Card CVV (security code)
-    - Billing zip code
-- Purchasing an order makes the following changes:
-    - Reduces the number of inventory for each product
-    - Changes the order state from "pending" to "paid"
-    - Clears the current cart
-- After purchasing an order, I can view a confirmation screen including:
-    - Each item in the order with a quantity and line-item subtotal
-    - A link to the item description page
-    - Order total price
-    - DateTime the order was placed
-    - The current status of the order
-- Sign up to be a merchant, providing:
-    - Email Address
-    - Username
-    - Password (plain text passwords cannot be stored in the database)
-    - Password confirmation
-- Sign in to my merchant account
-
-As a guest I **cannot**:
-
-- Add products to the cart that are out of stock
-- View any link or page to manage any products
-- View any of the account pages
-
-#### Authenticated Users
-
-As a signed-in user, I **can**:
-
-- Do everything a guest user can do except for sign up and sign in
-- Sign out
-- Create new categories (categories are shared between all merchants)
-- Create a new product providing:
-    - name
-    - description
-    - price
-    - photo URL
-    - stock
-- Assign my products to any number of categories
-- Retire a product from being sold, which hides it from browsing
-- View an account page to edit/update my existing products
-- View an account page showing my order fulfillment
-- On the order fulfillment page:
-    - Total Revenue
-    - Total Revenue by status
-    - Total number of orders by status
-    - Filter orders displayed by status
-    - Link to each individual order
-    - A list of orders including at least one of my products:
-        - Each order item sold by me with a quantity and line-item subtotal
-        - A link to the item description page
-        - DateTime the order was placed
-        - Link to transition the order item to marked as shipped
-        - The current status of the order ("pending", "paid", "complete", "cancelled")
-- View an individual order to see the user's:
-    - Name
-    - Email address
-    - Mailing address
-    - Last four digits of their credit card
-    - Credit card expiration date
-
-As a signed-in user, I **cannot**:
-
-- Review my own products
-- View order items from a shared order that belong to another merchant
-- View another users private data (i.e. order fulfillment or product management)
-
-### Model Validations
-
-Many of our models will have attributes that are required for our application to use and display data consistently. Each model will have attributes with requirements for a valid record. The requirements are summarized below:
-
-#### User
-
-- Username must be present
-- Username must be unique
-- Email Address must be present
-- Email Address must be unique
-- Password Confirmation must match Password
-
-#### Product
-
-- Name must be present
-- Name must be unique
-- Price must be present
-- Price must be a number
-- Price must be greater than 0
-- Product must belong to a User
-
-#### Order
-
-- An Order must have one or more Order Items
-
-#### OrderItem
-
-- Must belong to a Product
-- Must belong to an Order
-- Quantity must be present
-- Quantity must be an integer
-- Quantity must be greater than 0
-
-#### Review
-
-- Rating must be present
-- Rating must be an integer
-- Rating must be between 1 and 5
-
-## Submission Guidelines
-Your final project must be deployed to [Heroku](http://heroku.com). Your team will open a single pull request for the entire project. Include the link to your Heroku deployment in the PR's description.
-
-Your `README` file on your Github repo should contain a link to your live site.
-
-## Team Leaders
-Each team will have team leaders who are responsible for keeping track of each team member's contributions. Rotate leader roles at the beginning of each week; every team member should be in at least one leader role during the project.
-
-- Stand Up Leader
-  - Notifies team members about meeting schedule and ensures that everyone is present and ready
-  - Takes notes about each person's daily report in Stand Up
-  - Keeps the meeting moving
-- Task Leader
-  - Leads discussion on task assignment
-    - Decide if a task should be completed alone or in a pair
-    - Assign tasks based on...
-      - Individual comfort
-      - Desire
-      - Ability
-  - Ensures the task list stays up to date
-
-## Stand Up Meetings
-The Project Manager for your team will determine the timing for all Stand Up meetings. Because PMs are managing multiple projects at once this time will be different for each team, and may change from day to day. The meeting schedule will be communicated to the Stand Up Leader as soon as it is determined.
-
-At the end of each day, your team's assigned Project Manager will review the Trello board for all tasks discussed during that day's Stand Up meeting.
-
-## Weekly Demos
-In a real world work environment, a team's success is measured by their product as opposed to each individual's contribution.
-
-Each team will present their progress and respond to questions from their Project Manager each Friday. Every team member will participate in these demos; the PM will ask specific questions regarding 1) the team's progress and plan for completing the project, 2) the technical decisions and implementation, and 3) every team member's understanding of the underlying technical structures.
+# Wetsy
+[w]Etsy is an online store where you can buy or sell any product as long as it has to do with the water. This website was built with Ruby on Rails and a lot of love by Kelly, Tammy, and Jennie. We used Agile practices (stand-up meetings, weekly demos, etc.) to create user stories to complete our project. You can see our [completed Trello board here](https://trello.com/b/mxIvtRi2/wetsy-planning).
+
+# Accessing the website
+You can view the website live at [Wetsy](https://wetsy.herokuapp.com/)
+
+# Setting up
+To set up the project:
+1. Clone the project from github
+2. Run bundle install
+3. Run rake db:seed to seed the database
+4. Run rails server and open the website on your localhost in the browser
+
+# Applying New Concepts
+We did a few new things in this project:
+- model relationships: has_many, through and has_and_belongs_to_many
+- building user authentication from scratch
+- using the session hash to store cart and logged in user information
+- before_action controller filters for determining which users could view which pages
+
+# Fun New Gems We Used
+- [FactoryGirl](https://github.com/thoughtbot/factory_girl)
+- [Bullet](https://github.com/flyerhzm/bullet)
diff --git a/README.rdoc b/README.rdoc
diff --git a/app/assets/images/banner.jpg b/app/assets/images/banner.jpg
diff --git a/app/assets/images/banner2.jpg b/app/assets/images/banner2.jpg
diff --git a/app/assets/images/concrete_seamless.png b/app/assets/images/concrete_seamless.png