Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Traverse - [b]Etsy #6

Open
wants to merge 262 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
262 commits
Select commit Hold shift + click to select a range
49689a2
Fix typo in orders controller;
sophiabaldonado May 5, 2016
6bb31b5
Add index and show views for orders;
sophiabaldonado May 5, 2016
425be45
Add order_number column to orders table and generate random order num…
sophiabaldonado May 5, 2016
ba216cd
Update orders views to display order_number;
sophiabaldonado May 5, 2016
7c78eee
Add order_number column to orders table and generate random order num…
sophiabaldonado May 5, 2016
7f734dd
Added views for products and home controller;
sophiabaldonado May 5, 2016
1589aa3
Merge branch 'orders_setup'
sophiabaldonado May 5, 2016
11b575a
Merge branch 'master' into homepage
mcarson1111 May 5, 2016
a499244
Exploring git merges! ;
sophiabaldonado May 5, 2016
5486f55
testing git
mcarson1111 May 5, 2016
9ea4df3
we resolved the merge conflict in home index
mcarson1111 May 5, 2016
06c3193
CT - added a product, categories, and product categories bridge. migr…
May 5, 2016
852feb3
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 5, 2016
037fef3
Added not null migrations for orders and order_items;
sophiabaldonado May 5, 2016
ae0a35a
created the billing and review models
mcarson1111 May 5, 2016
1b9eedd
added ability to see a featured product's image through randomizing h…
mcarson1111 May 5, 2016
d46b25a
adding products model
May 5, 2016
53e6a6c
CT finished up with product, categories, and bridge model validations.
May 5, 2016
adb10df
Add validations for Orders and OrderItems models;
sophiabaldonado May 5, 2016
fe34a49
making changes on home view
mcarson1111 May 5, 2016
29c2fd8
merge conflict
mcarson1111 May 5, 2016
b110001
resolving conflict
mcarson1111 May 5, 2016
dc9d601
Merge branch 'homepage'
mcarson1111 May 5, 2016
113cd41
Resolving merge conflict, changed schema version;
sophiabaldonado May 5, 2016
8944f75
completed the user new and user show page
yordanosd May 5, 2016
48a0da2
Merge branch 'master' of github.com:sophiabaldonado/betsy
yordanosd May 5, 2016
d6dc1b4
adding changes to helper and home index
mcarson1111 May 5, 2016
571d838
Weird not null fix for products;
sophiabaldonado May 5, 2016
434f5cd
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 5, 2016
a9b5e63
changed the seed file to match our naming schemes
May 5, 2016
671f882
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 5, 2016
ce5a641
Setting upstream;
sophiabaldonado May 5, 2016
aba25ed
CartItems model and validations and seed data;
sophiabaldonado May 5, 2016
41273b6
Resolved merge conflict, kept Cristal's changes to seeds.rb;
sophiabaldonado May 5, 2016
27818e0
Change cc seed to string;
sophiabaldonado May 5, 2016
d490fe5
working on reseeding and fixing the schema
mcarson1111 May 5, 2016
3b0ae58
Fixed db:seed issue;
sophiabaldonado May 5, 2016
b35e804
Worked on new and create action for Orders controller;
sophiabaldonado May 6, 2016
2f2d0ca
added seed data for product category to test to see if bridge works.
May 6, 2016
2839419
Merge branch 'ProductIndex'
May 6, 2016
17e9b0f
the freaking many to many relationship works for product and categori…
May 6, 2016
2a2ff94
Working on update quantity form for cart items in orders new NOT WORK…
sophiabaldonado May 6, 2016
a0012ec
made a add to cart button and method.
May 6, 2016
7532e98
Added a div with class container to layout for bootstrappiness;
sophiabaldonado May 6, 2016
2811e79
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 6, 2016
6f1333e
Added cart update route; Added update submit button to cart item quan…
sophiabaldonado May 6, 2016
692c59f
Resolved merge confilct in routes, application layout, and products c…
sophiabaldonado May 6, 2016
37133ce
changed the show method to include an or for product
May 6, 2016
4630e45
Resolve merge conflict in routes;
sophiabaldonado May 6, 2016
cbb0a3b
changed the show method to include an or for product
May 6, 2016
df4529a
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 6, 2016
9adedc6
changed route. mebbe.
May 6, 2016
9abaaba
Working on getting cart item quantity to update;
sophiabaldonado May 6, 2016
97f17a4
trying to get form_tag to actually add to the cart. it's not. damn it.
May 6, 2016
a749623
Merge branch 'master' into orders_controller
sophiabaldonado May 6, 2016
03e92bc
fixed the form tag. the problem was with how I defined the params in …
May 6, 2016
b85e82b
Merge branch 'master' into orders_controller
sophiabaldonado May 6, 2016
c422882
Update cart item quantity mostly works now;
sophiabaldonado May 6, 2016
9efded0
Order of cart_items on order/new is descending;
sophiabaldonado May 6, 2016
b31b0d7
Added proceed to checkout button and boostrap classes;
sophiabaldonado May 6, 2016
2a5a60b
Changed inventory of one product in seed file;
sophiabaldonado May 6, 2016
4cfc746
Order create subtracts the correct quantity from inventory;
sophiabaldonado May 6, 2016
c2bda60
added nav bar with links, working on the logic for the sign in/up log…
mcarson1111 May 6, 2016
20eac35
Order item price is created with the correct value now;
sophiabaldonado May 6, 2016
69d0590
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 6, 2016
aa5647b
Merge branch 'orders_controller'
sophiabaldonado May 6, 2016
a653d8b
fixing product images with bootstrap and shady css
May 6, 2016
007bfae
fixed the conflicts from show html in products to be able to add a ce…
May 6, 2016
4807cac
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 6, 2016
57ef69b
fixed nav bar
mcarson1111 May 6, 2016
7c12a87
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 6, 2016
ae47181
Take params out of views;
sophiabaldonado May 6, 2016
03102aa
working on cart button
mcarson1111 May 6, 2016
3f78188
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 6, 2016
a3e48bc
added a link to the picture to look at product details
May 6, 2016
8e5d2f4
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 6, 2016
e39e23a
added shopping cart
mcarson1111 May 6, 2016
2a6035e
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 6, 2016
b79c8b7
Delete shopping cart items when they've been added to an order;
sophiabaldonado May 8, 2016
ec3c9c3
Started sessions;
sophiabaldonado May 8, 2016
922c0b6
Fixed order_number to be a helper method;
sophiabaldonado May 8, 2016
278d5c7
CartItems get assigned a session_id and user_id when added to cart; I…
sophiabaldonado May 8, 2016
a1951ba
CartItems persist with users; cart_count finds the correct cart_items…
sophiabaldonado May 8, 2016
3b04e34
added log in and log ou capabilitiest
mcarson1111 May 9, 2016
90c35ee
added before action to login and also added skip before actions. Then…
May 10, 2016
7f09a1e
added flash message for login and link to sign up for the login view
yordanosd May 10, 2016
a578772
added skip before action in the session controller that will allow us…
yordanosd May 10, 2016
9e80a13
Only show orders on orders#index that have items you sold;
sophiabaldonado May 10, 2016
1175f35
Merge branch 'master' into orders_controller
sophiabaldonado May 10, 2016
4b7698a
fixed the products category views
May 10, 2016
955911f
user can now create new products
yordanosd May 10, 2016
a89d0ba
Show content in Orders index and show based on user or merchant fulfi…
sophiabaldonado May 10, 2016
c0d9541
Fix orders path and add a method to see if order item is complete;
sophiabaldonado May 10, 2016
171c32d
created shared folder for products/categoryproducts, products/index a…
yordanosd May 10, 2016
c5d60b5
Format date and currenct better for orders;
sophiabaldonado May 10, 2016
9bdf76d
Update checkbox on OrderItem in Orders#index to mark s shipped;
sophiabaldonado May 11, 2016
b414bba
boostrap submit button on shipped checkbox lol;
sophiabaldonado May 11, 2016
f910faf
Merge branch 'orders_controller'
sophiabaldonado May 11, 2016
812f591
Fixed the products and categories page. Added crazy CSS to the checko…
May 11, 2016
196670b
The order fullfilment page can render orders based on a status;
sophiabaldonado May 11, 2016
61545bf
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 11, 2016
6749acb
Merge branch 'master' into orders_controller
sophiabaldonado May 11, 2016
8fab843
got reviews working
mcarson1111 May 11, 2016
b08b7a4
added reviews'
mcarson1111 May 11, 2016
41938c1
Idk how i accidentally deleted a line;
sophiabaldonado May 11, 2016
3762ce5
a lot of user stuff
yordanosd May 12, 2016
d9f5d95
merge stuff
yordanosd May 12, 2016
d130a7b
started billing
mcarson1111 May 12, 2016
8e93580
fixing merging conflict
mcarson1111 May 12, 2016
66a091c
Proceed to Checkout button from /checkout works;
sophiabaldonado May 12, 2016
acbf6e2
fixed the destroy/delete method in the checkout page.
May 12, 2016
b5f3e9b
fixed the conflicts in the routes. removed a duplicate.
May 12, 2016
e13b4c7
allow guests to view user account page
yordanosd May 12, 2016
b440578
Update stats on order fulfillment page base on status; only show orde…
sophiabaldonado May 12, 2016
f92701b
Merge branch 'master' into orders_controller
sophiabaldonado May 12, 2016
f1df0fd
git merge conflict
yordanosd May 12, 2016
11db4dc
Merge branch 'master' into orders_controller
sophiabaldonado May 12, 2016
736908d
got billings working, yay ^_^
mcarson1111 May 12, 2016
e5516eb
fixed merge conflict
mcarson1111 May 12, 2016
57bde7d
Order fulfillment page shows shipped if already shipped;
sophiabaldonado May 12, 2016
095ffc7
fixed a merge conflict in products show. guests were not being able t…
May 12, 2016
0965408
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 12, 2016
f1ea688
no actual merge conflicts with sophia. just spacing issues.
May 12, 2016
b24a2e1
jk there was an extra end in sophias merge.. so I deleted it. product…
May 12, 2016
7ea82da
jk it wasn't actually fixed, I was logged in so it was working. had t…
May 12, 2016
05eb039
removed the error messages that did not allow users to view other mer…
yordanosd May 12, 2016
42092bc
git conflict in views/products/categoryproduct
yordanosd May 12, 2016
8970be9
fixed the proceed to checkout button
mcarson1111 May 12, 2016
b2ef764
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 12, 2016
8a24a85
added back in the params userid can't be nil statement into yo's code…
May 12, 2016
8872f8d
created a merchantproducts and accountproducts file in the products v…
yordanosd May 12, 2016
8474de5
changed the category db to have a photourl. changed some css and litt…
May 12, 2016
e4160b6
added the destroy method to be useable before require login. so a gue…
May 12, 2016
38610f3
added the updatecart method to be useable before require login. so a …
May 12, 2016
35e684f
changed columns in billings
mcarson1111 May 12, 2016
0effb4e
fixed merge conflict
mcarson1111 May 12, 2016
b976caa
Extracted methods out of orders controller and views; only let mercha…
sophiabaldonado May 12, 2016
1bc4ff4
Order show page shows customer info if you're the merchant;
sophiabaldonado May 12, 2016
e6ce810
Fix seed data that broke with merge; Add column to categories for pho…
sophiabaldonado May 12, 2016
ad05444
removed yes no merchant on yo's sign up page.
May 12, 2016
840129b
fixed a merge conflict in schema
May 12, 2016
ee1b96a
restoring files to history
mcarson1111 May 12, 2016
3c12da9
Resolve merge conflict in product new page;
sophiabaldonado May 12, 2016
180cb07
Add required total column to Orders table;
sophiabaldonado May 12, 2016
19af8b3
changed the product controller so that different page render dependin…
yordanosd May 12, 2016
2e1f94c
removed a test file that was not needed
yordanosd May 12, 2016
2e48fde
fixed merge conflict in views/products/categoryproducts
yordanosd May 12, 2016
49c702b
added the radiobutton back. my b
May 12, 2016
6adf32c
fixed the checkout error
mcarson1111 May 13, 2016
b587635
Merge branch 'master' into style
mcarson1111 May 13, 2016
a50dc71
Shopping cart shows items based on user correctly;
sophiabaldonado May 13, 2016
b23dd37
Fix merge conflict in orders controller, used correct billings new path;
sophiabaldonado May 13, 2016
3e7e018
Fixed total revenue method for Order create;
sophiabaldonado May 13, 2016
37632a0
Fixed Orders show page syntax errors;
sophiabaldonado May 13, 2016
6e4233a
can check out as a guest
mcarson1111 May 13, 2016
ef7b2b5
Styling for orders index;
sophiabaldonado May 13, 2016
a428643
adjusted the profile menu bar and the retired button
yordanosd May 13, 2016
860157a
git conflict with merge file
yordanosd May 13, 2016
6463be9
Home page images show %>
sophiabaldonado May 13, 2016
a323ebd
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 13, 2016
194a809
testing for billing
mcarson1111 May 13, 2016
84fcf90
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
d95e4c0
fixed an issue with displaying a products page. it won't allow a user…
May 13, 2016
20a4b49
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 13, 2016
a21cdbe
now when you edit a product, it'll actually save it. Additionally it …
May 13, 2016
ed9c9ef
allow users to retire all of their products if they choose to no long…
yordanosd May 13, 2016
a624306
removed the products.each loop from the accountproducts view page for…
yordanosd May 13, 2016
d17a09e
added the ability to add categories to each product. used checkboxes …
May 13, 2016
bc83289
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 13, 2016
09242de
changed user profile so that bio is included in the side bar
yordanosd May 13, 2016
d52828b
Merge changes;
sophiabaldonado May 13, 2016
a60f389
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 13, 2016
bd89a0d
did some testing
mcarson1111 May 13, 2016
4505769
Nav bar indicates active page;
sophiabaldonado May 13, 2016
6b68908
messing with the style
mcarson1111 May 13, 2016
78d4e8d
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
9cdceea
merged
mcarson1111 May 13, 2016
4d4e073
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
294e79d
Merge branch 'master' into style
mcarson1111 May 13, 2016
87849a9
made a new and post page route for adding a new category. Also added …
May 13, 2016
7263f43
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 13, 2016
838cbd1
added a carousel header
mcarson1111 May 13, 2016
d01c524
added more photos
mcarson1111 May 13, 2016
ecffb32
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
3c85f54
Boostrapify buttons;
sophiabaldonado May 13, 2016
97967ca
added more photos for carousel
mcarson1111 May 13, 2016
05203f7
Merge branch 'style'
mcarson1111 May 13, 2016
f9decd3
styled the product view
yordanosd May 13, 2016
0f950bb
Resize header images;
sophiabaldonado May 13, 2016
6ac0ade
added footer to the shared pages. and fixed some buggy stuff.
May 13, 2016
6d5f884
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 13, 2016
5f77a29
local git conflict
yordanosd May 13, 2016
53b1d41
local git conflict
yordanosd May 13, 2016
373e387
Add footer on every page;
sophiabaldonado May 13, 2016
2c2c41b
bootrap class on dropdown;
sophiabaldonado May 13, 2016
4442718
redid seed data
mcarson1111 May 13, 2016
14a0cd0
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 13, 2016
dc5f438
Merge branch 'master' into orders_controller
sophiabaldonado May 13, 2016
ddc9a1a
styled homepage kind of
mcarson1111 May 13, 2016
4373a5f
Style user account products page;
sophiabaldonado May 13, 2016
d0dae19
Merge branch 'orders_controller'
sophiabaldonado May 13, 2016
67b18fd
fixed the billings to render the page instead of refreshing it.
May 13, 2016
3ef70aa
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 13, 2016
e1c5207
Reviews css template;
sophiabaldonado May 13, 2016
2933e55
Merge branch 'master' of github.com:sophiabaldonado/betsy
sophiabaldonado May 13, 2016
844fedb
made the homepage pics links
mcarson1111 May 13, 2016
e9e67c0
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
7cd8bdc
Account products pages styling;
sophiabaldonado May 13, 2016
307b4a5
Merge branch 'orders_controller'
sophiabaldonado May 13, 2016
3aab773
fixed the orders bugs. the link to products wasn't working correctly.…
May 13, 2016
a7fcc06
removed the conflicts and used sophias rendering to a partial view
May 13, 2016
7589b48
Started styling reviews;
sophiabaldonado May 13, 2016
485a951
styled the product page
mcarson1111 May 13, 2016
b36b78b
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
52ec9ab
changed font size
mcarson1111 May 13, 2016
38c17c1
Reviews styling;
sophiabaldonado May 13, 2016
df0ae83
did ipsums for merchant bios
mcarson1111 May 13, 2016
17660a7
Merge branch 'master' of github.com:sophiabaldonado/betsy
mcarson1111 May 13, 2016
ac588f3
css for products show pages
May 13, 2016
92c16b1
didn't see a conflict
May 13, 2016
89c4ecf
added photos for merchants
mcarson1111 May 13, 2016
ec6208e
added photo url to seed
May 13, 2016
5c8bfa1
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 13, 2016
3d7a3d7
Final styles;
sophiabaldonado May 13, 2016
ea90d59
yes;
sophiabaldonado May 13, 2016
7d5f5b2
finish;
sophiabaldonado May 13, 2016
e789843
yaml file for products up in hur.
May 14, 2016
1ac03cc
added users in fixtures for testing
yordanosd May 14, 2016
c69679a
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 14, 2016
135a046
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 14, 2016
111f3e9
edited the user test file
yordanosd May 14, 2016
f16ff21
local git conflict
yordanosd May 14, 2016
6d4576d
trying out a test in product_test.rb. It keeps throwing a no method e…
May 14, 2016
f885456
added 'fixtures :all' in the test_helper.rb file
yordanosd May 14, 2016
7172963
added simplecov gem and changed the fixture requirement in the text_h…
yordanosd May 14, 2016
6b53080
commiting product_test.rb before merging
May 14, 2016
8ae2220
fixed the merge conflict
May 14, 2016
ed526dc
finished testing for product and categories
May 14, 2016
964aeda
completed 100% test coverage for users, reviews and billings
yordanosd May 14, 2016
3836509
resloved conflict issues with coverage files
yordanosd May 14, 2016
2c00b5b
Merging tests;
sophiabaldonado May 14, 2016
59d4551
added cart_items coverage.
May 14, 2016
540834c
Orders test;
sophiabaldonado May 14, 2016
32075e9
Add coverage to gitignore;
sophiabaldonado May 14, 2016
6ee175c
added cart_items coverage.
May 14, 2016
60a1767
Merge branch 'master' of github.com:sophiabaldonado/betsy
May 14, 2016
21cf08a
Debugging tests;
sophiabaldonado May 14, 2016
198c84f
merge conflict in testhelper;
sophiabaldonado May 14, 2016
5e9570b
Finish orders tests;
sophiabaldonado May 14, 2016
f1ee943
fixed the second image in the carousel. missing .jpg extension
sophiabaldonado May 14, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
/tmp

.DS_Store
coverage/
12 changes: 11 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ gem 'jbuilder', '~> 2.0'
gem 'sdoc', '~> 0.4.0', group: :doc

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'bcrypt', '~> 3.1.7'

gem 'simplecov', :require => false, :group => :test

# Use Unicorn as the app server
# gem 'unicorn'
Expand All @@ -43,5 +45,13 @@ group :development do

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'better_errors'
gem 'pry-rails'
gem 'erd'
gem 'bootstrap-sass', '~>3.2.0'
gem 'autoprefixer-rails'
end

group :production do
gem 'rails_12factor'
end
52 changes: 51 additions & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,21 @@ GEM
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
arel (6.0.3)
autoprefixer-rails (6.3.6)
execjs
bcrypt (3.1.11)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
builder (3.2.2)
byebug (8.2.5)
choice (0.2.0)
coderay (1.1.1)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
Expand All @@ -50,6 +61,10 @@ GEM
coffee-script-source (1.10.0)
concurrent-ruby (1.0.1)
debug_inspector (0.0.2)
docile (1.1.5)
erd (0.4.0)
nokogiri
rails-erd (>= 0.4.5)
erubis (2.7.0)
execjs (2.6.0)
globalid (0.3.6)
Expand All @@ -67,6 +82,7 @@ GEM
nokogiri (>= 1.5.9)
mail (2.6.4)
mime-types (>= 1.16, < 4)
method_source (0.8.2)
mime-types (3.0)
mime-types-data (~> 3.2015)
mime-types-data (3.2016.0221)
Expand All @@ -76,6 +92,12 @@ GEM
nokogiri (1.6.7.2)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
pry (0.10.3)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-rails (0.3.4)
pry (>= 0.9.10)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
Expand All @@ -96,8 +118,18 @@ GEM
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-erd (1.4.7)
activerecord (>= 3.2)
activesupport (>= 3.2)
choice (~> 0.2.0)
ruby-graphviz (~> 1.2)
rails-html-sanitizer (1.0.3)
loofah (~> 2.0)
rails_12factor (0.0.3)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (4.2.6)
actionpack (= 4.2.6)
activesupport (= 4.2.6)
Expand All @@ -106,6 +138,7 @@ GEM
rake (11.1.2)
rdoc (4.2.2)
json (~> 1.4)
ruby-graphviz (1.2.2)
sass (3.4.22)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
Expand All @@ -116,6 +149,12 @@ GEM
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
simplecov (0.11.2)
docile (~> 1.1.0)
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
slop (3.6.0)
spring (1.7.1)
sprockets (3.6.0)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -143,18 +182,29 @@ PLATFORMS
ruby

DEPENDENCIES
autoprefixer-rails
bcrypt (~> 3.1.7)
better_errors
bootstrap-sass (~> 3.2.0)
byebug
coffee-rails (~> 4.1.0)
erd
jbuilder (~> 2.0)
jquery-rails
pg (~> 0.15)
pry-rails
rails (= 4.2.6)
rails_12factor
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
simplecov
spring
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)

RUBY VERSION
ruby 2.3.0p0

BUNDLED WITH
1.12.1
1.12.2
Binary file added app/assets/images/african-baskets.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/antler-mirror.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/butterfly-chandelier.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/carousel1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/carousel2.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/carousel3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/carousel4.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/felted-cat-bed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/felted-necklace-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/felted-necklace-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/floral-vases.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/glass-lanterns-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/glass-lanterns.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gold-necklace-and-earrings.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/gourd-birdhouses.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/hammock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/hello world.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/home goods.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/incense-holder-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/incense-holder-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/incense-holders-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/macrame-plant-hangers.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/moroccan-tea-set-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/moroccan-tea-set.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/needle-point-pillow-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images/needle-point-pillows-2.png
Binary file added app/assets/images/pointy-fun-shoes.png
Binary file added app/assets/images/pottery-1.png
Binary file added app/assets/images/pottery-3.png
Binary file added app/assets/images/quartz-knobs.png
Binary file added app/assets/images/skeleton-key-chandelier.png
Binary file added app/assets/images/stained-glass-wind-chime-2.png
Binary file added app/assets/images/welcome.png
3 changes: 3 additions & 0 deletions app/assets/javascripts/billing.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/home.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/orders.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/products.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/reviews.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/sessions.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/users.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
Loading