Vampazon - Sassa, Elle, Trish, and Maya (parens)

README.md

@@ -1,214 +1,32 @@
-# bEtsy(Vampazon)
-[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.
+== README
+# Vampazon
+Shop till you drop again, at Vampazon! We have a wide array of products to meet all your bloody needs. Minions, Home Decor, dental care, and more! Commence shopping at Vampazon [here](https://vampazon.herokuapp.com/). Vampazon is an e-commerce venue for Vampires and beyond.
 
-## Project Learning Goals
-- Core comprehension of:
-  - Routes
-  - Controllers
-  - Models
-  - Views
-- User based application logic
-- User authentication
-- Agile practices
-- Feature branch management with Git
-- 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
+### Authors
+- [Elle Vargas](https://github.com/ellevargas)
+- [Maya Wang](https://github.com/mayawang)
+- [Sassa Kitka](https://github.com/RedSquirrelious)
+- [Trish Griego](https://github.com/Trishthedish)
 
-### Restrictions
-- Do not use gems for user authentication (such as Devise)
-- You must use oAuth for user authentication.  
+### Contribution
+ All authors are students at [Ada Developers Academy](http://adadevelopersacademy.org/)
 
-## 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. Have one person on your team fork/clone the project master as per usual
-  1. Add all other team members as collaborators
-  1. Each team member should clone the repo to their computer
-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. Review the User Stories below and create Trello tasks to represent them
-1. Slack your team name, app name, and link to your trello board to your Project Manager
+### Versions
+- Rails 4.2.6
+- Ruby 2.3.1p112
 
-## Expectations
-Build an online system for listing, selling, reviewing, and buying a wide variety of products listed by multiple merchants.
+### Built with
+* [Foundation](http://foundation.zurb.com/) - The CSS framework
+* [OAuth](https://github.com/omniauth/omniauth) - OmniAuth is a library that standardizes  authentication for web applications. Project only connected to github authorization.
+* [Rails](http://guides.rubyonrails.org/) - is a server-side web application framework written in Ruby under the MIT License. Rails is a model–view–controller (MVC) framework, providing default structures for a database, a web service, and web pages
+* [factory_girl](https://github.com/thoughtbot/factory_girl/blob/master/GETTING_STARTED.md) - Allows you to create templates for valid and re-usable objects. They were created in response to fixtures. Helpful for creating flexible, semantic tests. Project tester took lots of [notes](notes_on_factory_girl_rails_use.md) on implementation.
 
-### General Requirements
-- Unit tests and/or specs for
-  - Controllers
-  - Models
-  - Routes
-- Test code coverage (using SimpleCov - remember me!)
-  - 90% for all controller and model classes
+### Best Practices/key take aways.
+- More to come!
 
-### User Stories
-#### 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 using OAuth
-    - Every merchant must have a username
-- Sign in to my merchant account using OAuth
+## Assignment Details
 
-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
-
----
-
-**[customized]**
-As a signed-in user, I can see:
-
-- User Account that contains basic User Information;
-- User Account that has Buyer Management and Seller Management Panel;
-- In Buyer Management Panel, a list of all orders of the current logged in User(buyer);
-   - Each order linked to its order confirmation page, with detail information;
-   - Listing order's id#, creation time, total price, a CANCEL button;
-- In Buyer Management Panel, the order can be cancelled. After pushing CANCEL button, the order status changed to "cancel".
-- In Buyer Management Panel, filter orders displayed by status(pending, paid, completed, cancelled)
-
----
-
-**[refactored]**
-- Total Revenue of all order items
-- Total Revenue by status
-- Total number of order items
-- Total number of order items)by status
-- A list of **order items** sold by me:
-   - Filter **order items** displayed by status
-   - Link to each individual order:
-   - 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
-   - The current status of the order item ("pending", "paid", "fulfilled", "cancelled")
-   - A button to transition the order item to marked as "ship", where order item status changed to "fulfilled"
-- The order# that associated with this order item:
-- View the 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:
-
-#### Merchant
-- Username must be present
-- Username must be unique
-- Email Address must be present
-- Email Address must be unique
-
-#### 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, as well as the team name and the names of all members.
-
-## 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
-1. The technical decisions and implementation
-1. Every team member's understanding of the underlying technical structures.
+- Guidelines, Expectations, and learning goals can be found [here](https://github.com/Ada-C6/betsy).
+- Also found within this repo [here](project_guidelines.md)

app/assets/stylesheets/app.css

@@ -58,7 +58,6 @@ img.logo {
   font-size: 1.25rem;
 }
 
-
 img.frontpage {
   float: center;
   display: inline-block;
@@ -107,6 +106,21 @@ img.product_photo {
   list-style: none;
 }
 
-#product-navigation {
-  text-align: center;
+.bat_rating {
+   width: 18%;
+   height: 18%;
+}
+
+.bat_rating_small {
+   width: 10%;
+   height: 10%;
+}
+
+.review_box {
+  border-top-style: double;
+  /*border-bottom-style: double;*/
+}
+
+.review_title{
+  color: darkred;
 }

app/controllers/reviews_controller.rb

@@ -15,11 +15,17 @@ def new
   def create
     @product = Product.find(params[:id])
     @review = Review.create(review_params)
+    @review.title = params[:review][:title]
     @review.description = params[:review][:description]
     @review.rank = params[:review][:rank]
 
+
     @review.product_id = @product.id
-    @review.user_id = session[:user_id]
+
+    if session[:user_id]
+      @review.user_id = session[:user_id]
+      @review.name = User.find(session[:user_id]).name
+    end
 
     if @review.save
       redirect_to show_products_path(@product.id)

app/controllers/users_controller.rb

@@ -110,7 +110,7 @@ def edit
   def update
     @my_user = User.find{ params[:id].to_i }
     @params = params
-    @my_user.fname = params[:user][:name]
+    @my_user.name = params[:user][:name]
     @my_user.email = params[:user][:email]
     @my_user.street_address = params[:user][:street_address]
     @my_user.city = params[:user][:city]

app/helpers/application_helper.rb

@@ -1,5 +1,5 @@
 module ApplicationHelper
 	def get_product_categories
-    Product.uniq.pluck(:category)
-  end
+		Product.uniq.pluck(:category)
+	end
 end

app/models/order.rb

@@ -3,7 +3,12 @@ class Order < ActiveRecord::Base
   belongs_to :user
   has_many :order_items
 
+
+
   def total_price
     return self.order_items.inject(0) {|sum, order_item | sum + order_item.total_price }
   end
+
+
+
 end

app/models/product.rb

@@ -2,15 +2,17 @@ class Product < ActiveRecord::Base
   belongs_to :user
   has_many :orders
   has_many :order_items, through: :orders
+  has_many :reviews
 
   validates :name, :description, :category, presence: true
-  
+
   validates :price, presence: true, numericality: {:greater_than => 0}
-  
+
   validates :inventory, presence: true, numericality: {:greater_than_or_equal_to => 0}
 
 
 
+
   def average_rating
     reviews = Review.where(:product_id => self.id)
     return reviews.average(:rank)

app/models/review.rb

@@ -1,5 +1,9 @@
 class Review < ActiveRecord::Base
+  belongs_to :product
   belongs_to :user
-  # validates :rank, presence: true, only_integer: true, :inclusion => 1..5, message: "only allows integers 1-5"
+  validates :rank, presence: true
+  # , only_integer: true, :inclusion => 1..5 
+  #, message: "only allows integers 1-5"
+
 
 end

app/views/layouts/application.html.erb

@@ -5,6 +5,7 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <%= favicon_link_tag 'vamp_favicon.ico' %>
     <title>Vampazon</title>
     <%= stylesheet_link_tag "application.css" %>
   </head>