Sk new user fields - #10

Open

RedSquirrelious wants to merge 67 commits into

Ada-C6:masterfrom

mayawang:sk_new_user_fields

Commits on Oct 18, 2016

Fixed gem file errors. Created orders controller
Trishthedish
committed
bfec8fe
Merge pull request #1 from mayawang/tg_controllers
ellevargas
authored
9018356
Created sessions controller
Trishthedish
committed
b77bd77
Created products controller, sessions controller, user controller
Trishthedish
committed
6b98d1c
Merge pull request #2 from mayawang/tg_controllers
ellevargas
authored
3c419b7
Creatd homepages controller
Trishthedish
committed
3d17e19
Merge pull request #3 from mayawang/tg_controllers
ellevargas
authored
9d8883d
added user and product models
RedSquirrelious
committed
3b33a9e
added order, order_item, and review models
RedSquirrelious
committed
c003f25
Created homepages routes rooting to index page.
Trishthedish
committed
9e9c4d4
Merge pull request #4 from mayawang/other-models
Maya Wang
authored
f7ad12c
Merge pull request #5 from mayawang/tg_homepages_routes
ellevargas
authored
d13f987
added authentication gems: 'omniauth','omniauth-github', 'dotenv-rails'; debugging gems: 'pry', 'better-errors'; viewing gem 'awesome_print'
RedSquirrelious
committed
afecb66
Merge pull request #6 from mayawang/add_error_gems
RedSquirrelious
authored
355e7bf
not sure where this change is coming from
Trishthedish
committed
c0eb9c4

Commits on Oct 19, 2016

Simply added h1 tags for different catagories in the homepage. As I created them, realized we might need a seperate index page for each catagory?
Trishthedish
committed
66d56cd
completed model relationships
Maya Wang
committed
eb09d06
Created routes for orders, finished building logic for orders controller.
Trishthedish
committed
8bd33cf
run db:migrate on model generation
Maya Wang
committed
3e3f729
Created order table. Anticipated that we'd use foundations. Things rendering but not dynamically.
Trishthedish
committed
280e7e2
more detailed gitignore, includes .env - among other things
RedSquirrelious
committed
2c7b2df
tell rails to use omniauth for authentication
RedSquirrelious
committed
fe2a043
fleshes out create and destroy methods
RedSquirrelious
committed
47aeea3
requires minitest reporters and awesome print, defines omniauth setup method
RedSquirrelious
committed
7d20d94
detailed tests and helper method (login_a_user method, can create user and user logs in twice wo creating 2nd user tests)
RedSquirrelious
committed
a1ac757
includes tests to only allow users to see own products-orders and to not see other people's -- and to only see own if logged in
RedSquirrelious
committed
d847eba
completed homepage index and show_catagory mvc logic
Maya Wang
committed
f2f8f0d
completed product index show mvc logic (include show average review)
Maya Wang
committed
14698ec
working on Browse products by seller. Completed controller&router, designing views(search?drop_box+list?)
Maya Wang
committed
fc52224
changed .select to .wherein homepages controller and product controller. also in product model
Maya Wang
committed
a9de5aa
Delete .ruby-gemset
ellevargas
authored
dd25b14
Delete .ruby-version
ellevargas
authored
d7f64a7
everything got all donked up but Chris has approved this version
ellevargas
committed
b86fee6
Merge pull request #7 from mayawang/sk_sessions_environment_controller_testing
ellevargas
authored
95be5a4
Deleted betsy dev
Trishthedish
committed
69b8027
Merge pull request #9 from mayawang/tg_homepage_cat
RedSquirrelious
authored
f3e4649
Merge pull request #10 from mayawang/tg_homepages_routes
RedSquirrelious
authored
a874fb3
Deletd betsy dev
Trishthedish
committed
87b956b
Merge branch 'tg_product_controller' of https://github.com/mayawang/Vampazon into tg_product_controller
Trishthedish
committed
b881675
Deleted stupid betsy files
Trishthedish
committed
0723743
Merge pull request #11 from mayawang/tg_product_controller
RedSquirrelious
authored
c1f03a7
resolved merge conflits on mw_products_controller
Maya Wang
committed
276631b
second merge conlict resolved
Maya Wang
committed
451fc66
Merge branch 'mw_products_controller'
Maya Wang
committed
f87a1b2
merged route AGAIN
Maya Wang
committed
e31d55d
finalized routing, added actions, HTTP verbs, nicknames
RedSquirrelious
committed
20826fc
Added Foundations.css to our file. I used @import to use it.
Trishthedish
committed
6358a6d
Merge pull request #13 from mayawang/sk_fix_routes
ellevargas
authored
473e1a2
fixed index routing
RedSquirrelious
committed
9e2217e
changed method names to RESTful names, show_products to show
RedSquirrelious
committed
e6ff50c
fixed routing typos
RedSquirrelious
committed
9a17c97
Merge pull request #15 from mayawang/sk_route_index
ellevargas
authored
894e00e
hopefully this destroyed the betsy files
ellevargas
committed
2e2e1b1
Merge pull request #14 from mayawang/tg_foundations
RedSquirrelious
authored
1da99fd
updated two index and show product routes
ellevargas
committed
4c33e1c
Merge pull request #16 from mayawang/ev_routesupdate
ellevargas
authored
0fa6bf2

Commits on Oct 20, 2016

fixing the route so that it pointed correctly to :id, istead of id:.
Trishthedish
committed
e7e7867
Changed file name and changed the view so product could render
Trishthedish
committed
41344aa
added another method that is using same naming convention as route.
Trishthedish
committed
28f5fbc
Fixed things so the products show page is rendering mostly properly
Trishthedish
committed
f52a220
Merge pull request #17 from mayawang/fix_product_show
Maya Wang
authored
3a444d8
fix bugs on previous built features
Maya Wang
committed
e639eb9
fixed bugs on review feature
Maya Wang
committed
9766915
fixed bugs on review views
Maya Wang
committed
2f7e4c5
improved layout on homepages and product controller
Maya Wang
committed
0a93b71
Merge pull request #18 from mayawang/product_controller_cont
RedSquirrelious
authored
5a0810c
new fields for user
RedSquirrelious
committed
0f51064