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.

Sign up for GitHub

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

Jump to bottom

Sk new user fields #10

Open
wants to merge 67 commits into
base: master
Choose a base branch
from
Open

Sk new user fields #10

wants to merge 67 commits into from

Conversation

RedSquirrelious
Copy link

No description provided.

Trishthedish and others added 30 commits October 18, 2016 15:39
@Trishthedish
Fixed gem file errors. Created orders controller
bfec8fe
@ellevargas
Merge pull request #1 from mayawang/tg_controllers
9018356 
Fixed gem file errors. Created orders controller
@Trishthedish
Created sessions controller
b77bd77
@Trishthedish
Created products controller, sessions controller, user controller
6b98d1c
@ellevargas
Merge pull request #2 from mayawang/tg_controllers
3c419b7 
Controllers for users, sessions, products
@Trishthedish
Creatd homepages controller
3d17e19
@ellevargas
Merge pull request #3 from mayawang/tg_controllers
9d8883d 
Created homepages controller
@RedSquirrelious
added user and product models
3b33a9e
@RedSquirrelious
added order, order_item, and review models
c003f25
@Trishthedish
Created homepages routes rooting to index page.
9e9c4d4
Merge pull request #4 from mayawang/other-models
f7ad12c 
added order, order_item, and review models
@ellevargas
Merge pull request #5 from mayawang/tg_homepages_routes
d13f987 
Created homepages routes rooting to index page.
@RedSquirrelious
added authentication gems: 'omniauth','omniauth-github', 'dotenv-rail…
afecb66 
…s'; debugging gems: 'pry', 'better-errors'; viewing gem 'awesome_print'
@RedSquirrelious
Merge pull request #6 from mayawang/add_error_gems
355e7bf 
added authentication gems: 'omniauth','omniauth-github', 'dotenv-rail…
@Trishthedish
not sure where this change is coming from
c0eb9c4
@Trishthedish
Simply added h1 tags for different catagories in the homepage. As I c…
66d56cd 
…reated them, realized we might need a seperate index page for each catagory?
completed model relationships
eb09d06
@Trishthedish
Created routes for orders, finished building logic for orders control…
8bd33cf 
…ler.
run db:migrate on model generation
3e3f729
@Trishthedish
Created order table. Anticipated that we'd use foundations. Things re…
280e7e2 
…ndering but not dynamically.
@RedSquirrelious
more detailed gitignore, includes .env - among other things
2c7b2df
@RedSquirrelious
tell rails to use omniauth for authentication
fe2a043
@RedSquirrelious
fleshes out create and destroy methods
47aeea3
@RedSquirrelious
requires minitest reporters and awesome print, defines omniauth setup…
7d20d94 
… method
@RedSquirrelious
detailed tests and helper method (login_a_user method, can create use…
a1ac757 
…r and user logs in twice wo creating 2nd user tests)
@RedSquirrelious
includes tests to only allow users to see own products-orders and to …
d847eba 
…not see other people's -- and to only see own if logged in
completed homepage index and show_catagory mvc logic
f2f8f0d
completed product index show mvc logic (include show average review)
14698ec
working on Browse products by seller. Completed controller&router, de…
fc52224 
…signing views(search?drop_box+list?)
changed .select to .wherein homepages controller and product controll…
a9de5aa 
…er. also in product model
Trishthedish and others added 28 commits October 19, 2016 14:12
@Trishthedish
Deleted stupid betsy files
0723743
@RedSquirrelious
Merge pull request #11 from mayawang/tg_product_controller
c1f03a7 
Tg product controller
resolved merge conflits on mw_products_controller
276631b
second merge conlict resolved
451fc66
Merge branch 'mw_products_controller'
f87a1b2
merged route AGAIN
e31d55d
@RedSquirrelious
finalized routing, added actions, HTTP verbs, nicknames
20826fc
@Trishthedish
Added Foundations.css to our file. I used @import to use it.
6358a6d
@ellevargas
Merge pull request #13 from mayawang/sk_fix_routes
473e1a2 
finalized routing, added actions, HTTP verbs, nicknames
@RedSquirrelious
fixed index routing
9e2217e
@RedSquirrelious
changed method names to RESTful names, show_products to show
e6ff50c
@RedSquirrelious
fixed routing typos
9a17c97
@ellevargas
Merge pull request #15 from mayawang/sk_route_index
894e00e 
Sk route index
@ellevargas
hopefully this destroyed the betsy files
2e2e1b1
@RedSquirrelious
Merge pull request #14 from mayawang/tg_foundations
1da99fd 
Added Foundations.css to our file. I used @import to use it.
@ellevargas
updated two index and show product routes
4c33e1c
@ellevargas
Merge pull request #16 from mayawang/ev_routesupdate
0fa6bf2 
updated two index and show product routes
@Trishthedish
fixing the route so that it pointed correctly to :id, istead of id:.
e7e7867
@Trishthedish
Changed file name and changed the view so product could render
41344aa
@Trishthedish
added another method that is using same naming convention as route.
28f5fbc
@Trishthedish
Fixed things so the products show page is rendering mostly properly
f52a220
Merge pull request #17 from mayawang/fix_product_show
3a444d8 
Fix product show
fix bugs on previous built features
e639eb9
fixed bugs on review feature
9766915
fixed bugs on review views
2f7e4c5
improved layout on homepages and product controller
0a93b71
@RedSquirrelious
Merge pull request #18 from mayawang/product_controller_cont
5a0810c 
Fixed bugs on homepages and product controller
@RedSquirrelious
new fields for user
0f51064
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@RedSquirrelious @kariabancroft @Trishthedish @ellevargas