Trish add favicon - #23

Open

Trishthedish wants to merge 352 commits into

Ada-C6:masterfrom

mayawang:trish_add_favicon

This pull request is big! We're only showing the most recent 250 commits

Commits on Oct 21, 2016

added link to github auth
RedSquirrelious
committed
9d6d6d5
uncommented the git sessions routes
RedSquirrelious
committed
e203d4a
Merge pull request #21 from mayawang/ev_styling
ellevargas
authored
eaa92b0
changed auth_hash['id'] to auth_hash['uid'] and the like
RedSquirrelious
committed
daad4ac
commented out most methods
RedSquirrelious
committed
d8aca65
fixed typos
RedSquirrelious
committed
18b09ae
fixed typos
RedSquirrelious
committed
f1af9c7
fixed typos, fixed through to join table
RedSquirrelious
committed
1837152
fixed typos
RedSquirrelious
committed
4a53879
commented out has_secure_password, uncommented validators and build by github
RedSquirrelious
committed
687a305
moved and commented out create test
RedSquirrelious
committed
f13c901
added true test, added options for other controller tests
RedSquirrelious
committed
8a90d51
fixed odd rails references _id_id thing
RedSquirrelious
committed
396ebc0
fixed odd rails references _id_id thing
RedSquirrelious
committed
8ba1893
fixed odd rails references _id_id thing
RedSquirrelious
committed
5110007
changed id to uid
RedSquirrelious
committed
a513e74
new schema version, add provider and uid columns
RedSquirrelious
committed
6ad529c
added default status to provider column
RedSquirrelious
committed
d17736e
added scaffolding-infrastructure for simple_form gem
RedSquirrelious
committed
e445ac0
added uid column to help with omniauth
RedSquirrelious
committed
34381c5
resolved conflicts
RedSquirrelious
committed
25a5d47
Merge pull request #25 from mayawang/sk_re_omniauth
RedSquirrelious
authored
8f21879
rake db migrated
ellevargas
committed
b698f11
added photos to specific categories and did basic styling
ellevargas
committed
f0c324a
Merge pull request #26 from mayawang/ev_fix_photos
ellevargas
authored
8671aeb
added card class etc.
RedSquirrelious
committed
0c508c6
Merge pull request #27 from mayawang/sk_css_categories
ellevargas
authored
9ab9317
completed add new order to cart mvc logic. not save order info yet.
Maya Wang
committed
4c1bc8d

Commits on Oct 22, 2016

Fix show_seller_products
Maya Wang
committed
94f0869
Fix user_id_id
Maya Wang
committed
eb68832
Show seller first_name and last_name
Maya Wang
committed
83a1201
tolerate product with no seller
Maya Wang
committed
e35721a
Merge pull request #29 from mayawang/products_controller_debugging
ellevargas
authored
21d4d91
added users.csv and migrated integer limit so phone numbers could have enough characters
ellevargas
committed
b5cbe91

Commits on Oct 23, 2016

Merge pull request #30 from mayawang/ev_csvusers
ellevargas
authored
35e2a17
authentication party
ellevargas
committed
51e3b0c
tried tog et button working to add new product to homepage for oauth users
ellevargas
committed
9f539d2
resolved conflict
Maya Wang
committed
63148e7
Finding implementatin is hard. I think its because I dont knot where to put things. Switching back to fixtures.
Trishthedish
committed
04f08a2
add quantity and add to cart button on products/show page
Maya Wang
committed
169587c

Commits on Oct 24, 2016

changed Order status attribute datatype from boolean to string
Maya Wang
committed
56a9d73
mvc logic completed for add_to_carts and cart
Maya Wang
committed
8fbbebc
added devise gem to Gemfile and created devise.rb initializer
ellevargas
committed
0873387
Successfully, created factories for product and written tests for product model.
Trishthedish
committed
72f3496
add subtotal order price in cart, fixed duplicated order_items show in cart bug
Maya Wang
committed
3a7ac40
completed change order_item's quantity in cart feature
Maya Wang
committed
0f1a145
added create button to homepage for oauth users and created form for new products
ellevargas
committed
314dccb
Created tests for order_test
Trishthedish
committed
22ad8e5
completed delete each order_item
Maya Wang
committed
1171a6d
added a checkout page for continue coding
Maya Wang
committed
dec61a4
added $ symbol for order_item price in cart on cart view
Maya Wang
committed
79fb808
still looking for connection between user id passing through new product - looks like something to do with show seller products
ellevargas
committed
92672b6
make order_item name link to product detail page in cart
Maya Wang
committed
9ae4e76
worked with Maya to get new oauth product working - still trying to get new user to show on their product
ellevargas
committed
91b121d
forgot to save file
ellevargas
committed
c74087d
added a cart link on application.html the navigation bar
Maya Wang
committed
71ff372
add payment attributes to order: cc_number: integer, exp_month:integer, exp_year:integer, cvc:integer
Maya Wang
committed
3a3fdc9
completed checkout page show order_items, shipping address and payment form
Maya Wang
committed
2d41e8a
change phone datatype in Order model and User model limit to 10
Maya Wang
committed
09fb7c5
completed order conformation page and create order mvc logic. Also addcheck for product inventory before payment, reduce inventory accordingly after payment
Maya Wang
committed
1a48cb7
add on order confirmation view: order creation time; current status of order; each item's inline-item subtotal
Maya Wang
committed
a1b03ea
Merge pull request #31 from mayawang/mw_cart_feature_completed
ellevargas
authored
f1d8bff
Merge pull request #32 from mayawang/mw_purchase_feature
ellevargas
authored
af4a7a6
Added several articles and links explantions on how to use factories. Super helpful in testing! More testing to come.
Trishthedish
committed
6dfa49c
added line about env hash to sessions controller
ellevargas
committed
ebc5cde
Merge pull request #34 from mayawang/trish_factory_girl
ellevargas
authored
8df5493
added partial to show random photos from each category
RedSquirrelious
committed
94eb72f
partial with logic to greet authenticated users by name
RedSquirrelious
committed
c78df6d
added private random_photo self model that delivers random photos by category
RedSquirrelious
committed
d558bc2
includes call to partials
RedSquirrelious
committed
9295ed2
includes styling for photos
RedSquirrelious
committed
5bfd2f4
rudimentary success with foundation
RedSquirrelious
committed
a5d97d8
removed first name and last name from products, sessions, updated schema, and users csv
ellevargas
committed
45e66d2
adding comment-sections in stylesheet to help with readability
RedSquirrelious
committed
4729888
updated user ymls to use only one name and corrected call error in user rb
ellevargas
committed
2318b69
removed Devise gem
ellevargas
committed
53124f4
There is now a search box rendering on the front index page. You can search all products. It will return all the ones that match your query. If none exist that match, it will render a picture of Th…
Trishthedish
committed
44ad921
includes oauth routing
RedSquirrelious
committed
953a8b1
includes routing for oauth
RedSquirrelious
committed
79c2b76
cleaned up sessions routing
RedSquirrelious
committed
991f362
fixed conflicts
ellevargas
committed
456c9e2
fixed merge commits
ellevargas
committed
8f921ad
Merge pull request #35 from mayawang/ev_add_product
ellevargas
authored
38c0ced
Merge branch 'master' of github.com:mayawang/Vampazon
ellevargas
committed
e969d62
fixed login link
RedSquirrelious
committed
b64a496
fixed login route
RedSquirrelious
committed
60709a1
Resolved conflicts
Trishthedish
committed
30f6a7e
Merge pull request #36 from mayawang/search_box_test
Trishthedish
authored
7bfdeeb
Merge branch 'master' of github.com:mayawang/Vampazon
ellevargas
committed
0cd2534
bundle install, rake db reset and rake db migrate
ellevargas
committed
da7138d
includes partial views and a button to add new products
RedSquirrelious
committed
96831cb
fixed conflicts
RedSquirrelious
committed
ceacd7f
fixed mild conflicts. Merge branch 'sk-moar-foundation'
RedSquirrelious
committed
0b16a27
push damn you
ellevargas
committed
fda8ad9
Merge pull request #39 from mayawang/ev_edit_products
ellevargas
authored
ba34220
created user account mvc logic, and display user basic info on user account view
Maya Wang
committed
e509bd7
working on making prettier forms
RedSquirrelious
committed
d1c7a4f
made the links up top work
RedSquirrelious
committed
cbd012f
Merge pull request #40 from mayawang/sk-prettier-form
RedSquirrelious
authored
6f71ae3
save it all
RedSquirrelious
committed
f1cda35
cleaned up address form for orders
ellevargas
committed
2c68488
added product category lookup to application helper, now top bar menu of categories goes to category pages
RedSquirrelious
committed
d23fabd
add mvc logic for show buyer_manage and seller_manage button on user_account view
Maya Wang
committed
dc6e5bf
Merge pull request #41 from mayawang/sk-fix-menu-button
RedSquirrelious
authored
5159380
why isn't this all going up/?'
RedSquirrelious
committed
c01e5e9
Merge pull request #42 from mayawang/sk-fix-menu-button
RedSquirrelious
authored
02f1dc7
removed extra first and last names from orders stuff
ellevargas
committed
2fc4025
removed auth from scratch methods to help with readability
RedSquirrelious
committed
d8c6f6e
removed auth from scratch from create method to improve readability
RedSquirrelious
committed
869ea2b
added random_photo logic to show category photos on homepage (index)
RedSquirrelious
committed
c7db62f
narrowed orders in schema down to just name
ellevargas
committed
25a2bd7
moved all logic to homepage index view
RedSquirrelious
committed
ec61e01
Merge pull request #43 from mayawang/ev_consolidate_names
ellevargas
authored
861293d
Merge pull request #44 from mayawang/sk-photos-on-homepage
ellevargas
authored
0bdaa15
working on buyer_manage page. Show order in different status. backup before home
Maya Wang
committed
831a1c8
still working on tests
Trishthedish
committed
855f17a

Commits on Oct 25, 2016

working on making the photos the right size
RedSquirrelious
committed
0bafd87
limited max-height to one class of photos
RedSquirrelious
committed
b9b497b
trying to use the equalizer
RedSquirrelious
committed
1985bd4
Still working on fixing testins in model order test.
Trishthedish
committed
8171ec5
fixed typo, added import app.css
RedSquirrelious
committed
54b7f80
replaced weird stylesheet links with the right one
RedSquirrelious
committed
6ae64fa
fixed class tag to standardize - product_img to product_photo
RedSquirrelious
committed
9dcb1ae
standardized photo class tag
RedSquirrelious
committed
33d866a
more movement
RedSquirrelious
committed
295f91f
completed cancel order mvc logic in buyer_manage view
Maya Wang
committed
bbc02ac
resytled all buttons on order controller
Maya Wang
committed
0540cc5
add user model relation to orders model
Maya Wang
committed
28b3605
completed mvc logic for buyer manage in user account session. show buyer's orders by order's status
Maya Wang
committed
3301d43
new styling
RedSquirrelious
committed
1fca07c
styling for home page
RedSquirrelious
committed
90ae545
show item not working that great, needs help
RedSquirrelious
committed
c278698
puts wrapper around greeting
RedSquirrelious
committed
66036c1
added class, added h2 heading to name
RedSquirrelious
committed
5976108
broken show product, needs help
RedSquirrelious
committed
8c08ea6
Merge pull request #45 from mayawang/sk-right-size-photos
RedSquirrelious
authored
909b8b6
resolved merge conflicts
Maya Wang
committed
08b5213
fixed @order.name bug on confirmation page
Maya Wang
committed
ac46977
added pending_orders/paid_orders/cancelled_orders/completed_orders/cancel_order into authentication_user only
Maya Wang
committed
a3bb673
Merge pull request #46 from mayawang/mw_user_manage_account
Maya Wang
authored
18e8309
Uncommented tests and pair wrote validations with Sassa. Tests are passing and looking good.
Trishthedish
committed
dc159a6
fixed cart form - checkout now works
ellevargas
committed
2826dde
fixed bug on checkout page, confirmation path(@order.id)
Maya Wang
committed
9c9521e
fixed typo managment to management
Maya Wang
committed
5241d17
Merge pull request #48 from mayawang/mw_user_manage_account
Maya Wang
authored
de9e0b1
fixed conflicts
ellevargas
committed
d1e4acf
pushed error code for research
ellevargas
committed
7a9bc60
working edit and update methods
RedSquirrelious
committed
7beab54
make form generic for new and edit; added cancel button
RedSquirrelious
committed
b76ae93
fixed bugs on checkout form
Maya Wang
committed
85eaaba
link to form partial
RedSquirrelious
committed
f631b88
add buttons for edit and view all the stuff
RedSquirrelious
committed
7939783
Merge pull request #47 from mayawang/ev_fix_form
ellevargas
authored
4d560ef
added delete button, need to work on routing when a product is deleted
RedSquirrelious
committed
b6a2f8f
cancel button routes to root path, show seller route breaks
RedSquirrelious
committed
53fd1a0
oauth logic with edit and delete buttons
RedSquirrelious
committed
2af2cee
Finished with product_test model
Trishthedish
committed
a232f6f
may want to adjust the show method so it returns nil, Product.find maybe /?
RedSquirrelious
committed
0fa80db
better cancel button'
RedSquirrelious
committed
ab86652

Commits on Oct 26, 2016

not needed after all, per TA
RedSquirrelious
committed
0511378
this is the one
RedSquirrelious
committed
644da19
Merge pull request #49 from mayawang/sk_tg_product_controller
RedSquirrelious
authored
133c02c
Created several tests more to go.
Trishthedish
committed
76d2500
added name, description, category, price, inventory validations
RedSquirrelious
committed
3503078
changed stylesheet link in head from application.css to application.scss because we are using SASS
RedSquirrelious
committed
54969ea
interpolating the seller's name was breaking tests. changed it to 'seller'
RedSquirrelious
committed
d70794b
filled in blank tests, update test still not working
RedSquirrelious
committed
c848ec4
filled in some blanks, commented out tests not appropriate to our controller
RedSquirrelious
committed
c5119fc
because we use some sass, tests required us to have allstylesheet extensions be scss rather than css.
RedSquirrelious
committed
1a6f51b
set up for simplecov
RedSquirrelious
committed
e84a284
bug fix: inventory checking before checkout, and prevent empty checking out, add order item status to OrderItem model and refactored order item status
Maya Wang
committed
5d6e723
Show flash message on global template
Maya Wang
committed
c93aae9
Update README.md
Maya Wang
authored
0fd5aa5
Update README.md
Maya Wang
authored
fef18ba
Update README.md
Maya Wang
authored
94963a9
Update README.md
Maya Wang
authored
9d468fe
Update README.md
Maya Wang
authored
56e7681
completed mvc logic for total_revenue and revenue_by_status on seller management
Maya Wang
committed
6be08e5
completed mvc logic for total order count and order count by status on seller management
Maya Wang
committed
2be1b1a
Merge pull request #50 from mayawang/mw_flash_message
RedSquirrelious
authored
38e9509
Merge branch 'master' of https://github.com/mayawang/Vampazon into mw_seller_manage_account
Maya Wang
committed
94bccd7
Merge pull request #51 from mayawang/trish_testing3
RedSquirrelious
authored
88acf75
fixed typo
RedSquirrelious
committed
2e4bbc1
turned back, fixed mistake/?
RedSquirrelious
committed
305eaaf
resolved testing merge, master had more tests, so went with master
RedSquirrelious
committed
2072fd4
Merge pull request #52 from mayawang/sk-testing-use-simplecov
RedSquirrelious
authored
87b7d9c
fixed typo that broke the css
RedSquirrelious
committed
d546b94
Merge pull request #53 from mayawang/sk-fix-typo-on-application-css
RedSquirrelious
authored
7ac081e
Started to make logic within the product controller.Hope to switch it into a review controller.
Trishthedish
committed
8e8baed
Merge remote-tracking branch 'origin' into mw_seller_manage_account
Maya Wang
committed
5f0f6d4
Reviews are working from the show product path page. They are quite messily displayed.
Trishthedish
committed
2b88286
removed extra class that caused the freaky 3 columns
RedSquirrelious
committed
8e29bf1
Worked on adding a add review button. Also now retaining review. The review can only be deleted by the seller.
Trishthedish
committed
6250949
Merge pull request #54 from mayawang/sk-fix-product-show-page
RedSquirrelious
authored
f738b3f

Commits on Oct 27, 2016

removed create new product button, moved to user account page
RedSquirrelious
committed
3fed5dd
made user account link visible based on oauth
RedSquirrelious
committed
aa4fa34
put create new product on this page rather than seller management page because fewer clicks
RedSquirrelious
committed
86d0bb5
removed delete method, added notes to unused methods, added find_review private method-controller filter
RedSquirrelious
committed
b813148
removed delete review button, added notes to edit product and delete product buttons
RedSquirrelious
committed
46bde9a
fixed weird column thing
RedSquirrelious
committed
5266681
Merge pull request #56 from mayawang/tg_sk_reviews_controller_no_delete
ellevargas
authored
c2f1fec
Merge pull request #55 from mayawang/sk-add-product-user-account
ellevargas
authored
047682f
added static photos to assets file and created new column for alt id in products
ellevargas
committed
d4f6f22
Started to create readme
Trishthedish
committed
956a563
completed mvp logic for seller management show order items details by status, and ship and fulfillment button. Except order details associated with this order item
Maya Wang
committed
4f5214c
made the vampazon logo image and added alt text to every last one of the products in the seed csv
ellevargas
committed
72b8810
completed mvc logic for link to order details associated with this order item
Maya Wang
committed
90feb46
Merge remote-tracking branch 'origin' into mw_seller_manage_account
Maya Wang
committed
5047b0d
Update README.md
Maya Wang
authored
a5ee634
had deleted this because it broke tests. can fix that. need this. fixed this.
RedSquirrelious
committed
9af9412
fixed color on text on logo image
ellevargas
committed
84944cb
Added a vampire favicon to our page. It renders at top of tab.
Trishthedish
committed
ef1d950
Merge pull request #57 from mayawang/ev_accessible
RedSquirrelious
authored
972154c
resolved merge conflict
Maya Wang
committed
56899a1
Merge pull request #58 from mayawang/mw_seller_manage_account
RedSquirrelious
authored
b10f834
Merge pull request #59 from mayawang/readme
RedSquirrelious
authored
74c6b59
Merge pull request #60 from mayawang/sk-undo-show-page-seller
Maya Wang
authored
f8df9ac
rake db migrate
ellevargas
committed
3d05c05
alt_text now works yay
ellevargas
committed
019443a
Merge pull request #61 from mayawang/ev_oopsiwasonmaster
ellevargas
authored
0a57cd7
fixed sytax error in app.css
Maya Wang
committed
9207636
resolved merge conflict
Maya Wang
committed
6aa4457
Merge pull request #62 from mayawang/mw_css_sytax_fix
ellevargas
authored
f7710b2
Updated Gemfile for heroku
Maya Wang
committed
1e74b1d
comment out line 10 of application.rb
Maya Wang
committed
c8d1d90
missing css syntax
ellevargas
committed
754a46b
fix syntax in application.css
Maya Wang
committed
b8cb297
Remove integer limits for postgres
Maya Wang
committed
981b6ba
Convert types in seeds
Maya Wang
committed
cf0d013
Change phone columns to string
Maya Wang
committed
02a5d0e
Remove unused script tags
Maya Wang
committed
d5ddbf5

Commits on Oct 28, 2016

worked on nav
ellevargas
committed
10d55c0
worked on homepage fruitlessly - switching to basic page formatting
ellevargas
committed
f3ae1a6
Merge branch 'master' of github.com:mayawang/Vampazon
ellevargas
committed
b2f7615
cleaned up css and consolidated a few classes on show category view
ellevargas
committed
230baa5
no more integer limit 4 bs
ellevargas
committed
269307e
show category pages are all synced up as far as styling
ellevargas
committed
4d0cf77
got individual pages working and cleaned up css
ellevargas
committed
b7dd841
omg the all products page looks awesome
ellevargas
committed
01b0a23
standardized forms and user account info
ellevargas
committed
265cd49
Found clever way to fix decimal issues. Things are tested and working.
Trishthedish
committed
478450e
Merge pull request #65 from mayawang/currency_validation
ellevargas
authored
7905710
working on nav bar and homepage now
ellevargas
committed
dd37ee3
still working on nav bar and homepage, but atom almost froze :|
ellevargas
committed
45f3699
added two frontpage photos - will work on this tomorrow morning
ellevargas
committed
04ae252
added dollar signs and minor tweaks
ellevargas
committed
c6fd7e0
fixed conflicts and removed js stuff from application.html.erb
ellevargas
committed
664a4a4
fixed minor change to confirmation page
ellevargas
committed
672add4
Merge pull request #66 from mayawang/ev_yescss
ellevargas
authored
3aa53d9
Fixed favicon conflicts
Trishthedish
committed
e18d1b1