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

Trish add favicon #23

Open
wants to merge 352 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
352 commits
Select commit Hold shift + click to select a range
9d6d6d5
added link to github auth
RedSquirrelious Oct 21, 2016
e203d4a
uncommented the git sessions routes
RedSquirrelious Oct 21, 2016
eaa92b0
Merge pull request #21 from mayawang/ev_styling
ellevargas Oct 21, 2016
daad4ac
changed auth_hash['id'] to auth_hash['uid'] and the like
RedSquirrelious Oct 21, 2016
d8aca65
commented out most methods
RedSquirrelious Oct 21, 2016
18b09ae
fixed typos
RedSquirrelious Oct 21, 2016
f1af9c7
fixed typos
RedSquirrelious Oct 21, 2016
1837152
fixed typos, fixed through to join table
RedSquirrelious Oct 21, 2016
4a53879
fixed typos
RedSquirrelious Oct 21, 2016
687a305
commented out has_secure_password, uncommented validators and build b…
RedSquirrelious Oct 21, 2016
f13c901
moved and commented out create test
RedSquirrelious Oct 21, 2016
8a90d51
added true test, added options for other controller tests
RedSquirrelious Oct 21, 2016
396ebc0
fixed odd rails references _id_id thing
RedSquirrelious Oct 21, 2016
8ba1893
fixed odd rails references _id_id thing
RedSquirrelious Oct 21, 2016
5110007
fixed odd rails references _id_id thing
RedSquirrelious Oct 21, 2016
a513e74
changed id to uid
RedSquirrelious Oct 21, 2016
6ad529c
new schema version, add provider and uid columns
RedSquirrelious Oct 21, 2016
d17736e
added default status to provider column
RedSquirrelious Oct 21, 2016
e445ac0
added scaffolding-infrastructure for simple_form gem
RedSquirrelious Oct 21, 2016
34381c5
added uid column to help with omniauth
RedSquirrelious Oct 21, 2016
25a5d47
resolved conflicts
RedSquirrelious Oct 21, 2016
8f21879
Merge pull request #25 from mayawang/sk_re_omniauth
RedSquirrelious Oct 21, 2016
b698f11
rake db migrated
ellevargas Oct 21, 2016
f0c324a
added photos to specific categories and did basic styling
ellevargas Oct 21, 2016
8671aeb
Merge pull request #26 from mayawang/ev_fix_photos
ellevargas Oct 21, 2016
0c508c6
added card class etc.
RedSquirrelious Oct 21, 2016
9ab9317
Merge pull request #27 from mayawang/sk_css_categories
ellevargas Oct 21, 2016
4c1bc8d
completed add new order to cart mvc logic. not save order info yet.
Oct 21, 2016
94f0869
Fix show_seller_products
Oct 21, 2016
eb68832
Fix user_id_id
Oct 21, 2016
83a1201
Show seller first_name and last_name
Oct 21, 2016
e35721a
tolerate product with no seller
Oct 22, 2016
21d4d91
Merge pull request #29 from mayawang/products_controller_debugging
ellevargas Oct 22, 2016
b5cbe91
added users.csv and migrated integer limit so phone numbers could hav…
ellevargas Oct 22, 2016
35e2a17
Merge pull request #30 from mayawang/ev_csvusers
ellevargas Oct 23, 2016
51e3b0c
authentication party
ellevargas Oct 23, 2016
9f539d2
tried tog et button working to add new product to homepage for oauth …
ellevargas Oct 23, 2016
63148e7
resolved conflict
Oct 23, 2016
04f08a2
Finding implementatin is hard. I think its because I dont knot where …
Trishthedish Oct 23, 2016
169587c
add quantity and add to cart button on products/show page
Oct 23, 2016
56a9d73
changed Order status attribute datatype from boolean to string
Oct 24, 2016
8fbbebc
mvc logic completed for add_to_carts and cart
Oct 24, 2016
0873387
added devise gem to Gemfile and created devise.rb initializer
ellevargas Oct 24, 2016
72f3496
Successfully, created factories for product and written tests for pro…
Trishthedish Oct 24, 2016
3a7ac40
add subtotal order price in cart, fixed duplicated order_items show i…
Oct 24, 2016
0f1a145
completed change order_item's quantity in cart feature
Oct 24, 2016
314dccb
added create button to homepage for oauth users and created form for …
ellevargas Oct 24, 2016
22ad8e5
Created tests for order_test
Trishthedish Oct 24, 2016
1171a6d
completed delete each order_item
Oct 24, 2016
dec61a4
added a checkout page for continue coding
Oct 24, 2016
79fb808
added $ symbol for order_item price in cart on cart view
Oct 24, 2016
92672b6
still looking for connection between user id passing through new prod…
ellevargas Oct 24, 2016
9ae4e76
make order_item name link to product detail page in cart
Oct 24, 2016
91b121d
worked with Maya to get new oauth product working - still trying to g…
ellevargas Oct 24, 2016
c74087d
forgot to save file
ellevargas Oct 24, 2016
71ff372
added a cart link on application.html the navigation bar
Oct 24, 2016
3a3fdc9
add payment attributes to order: cc_number: integer, exp_month:intege…
Oct 24, 2016
2d41e8a
completed checkout page show order_items, shipping address and paymen…
Oct 24, 2016
09fb7c5
change phone datatype in Order model and User model limit to 10
Oct 24, 2016
1a48cb7
completed order conformation page and create order mvc logic. Also ad…
Oct 24, 2016
a1b03ea
add on order confirmation view: order creation time; current status o…
Oct 24, 2016
f1d8bff
Merge pull request #31 from mayawang/mw_cart_feature_completed
ellevargas Oct 24, 2016
af4a7a6
Merge pull request #32 from mayawang/mw_purchase_feature
ellevargas Oct 24, 2016
6dfa49c
Added several articles and links explantions on how to use factories.…
Trishthedish Oct 24, 2016
ebc5cde
added line about env hash to sessions controller
ellevargas Oct 24, 2016
8df5493
Merge pull request #34 from mayawang/trish_factory_girl
ellevargas Oct 24, 2016
94eb72f
added partial to show random photos from each category
RedSquirrelious Oct 24, 2016
c78df6d
partial with logic to greet authenticated users by name
RedSquirrelious Oct 24, 2016
d558bc2
added private random_photo self model that delivers random photos by …
RedSquirrelious Oct 24, 2016
9295ed2
includes call to partials
RedSquirrelious Oct 24, 2016
5bfd2f4
includes styling for photos
RedSquirrelious Oct 24, 2016
a5d97d8
rudimentary success with foundation
RedSquirrelious Oct 24, 2016
45e66d2
removed first name and last name from products, sessions, updated sch…
ellevargas Oct 24, 2016
4729888
adding comment-sections in stylesheet to help with readability
RedSquirrelious Oct 24, 2016
2318b69
updated user ymls to use only one name and corrected call error in us…
ellevargas Oct 24, 2016
53124f4
removed Devise gem
ellevargas Oct 24, 2016
44ad921
There is now a search box rendering on the front index page. You can …
Trishthedish Oct 24, 2016
953a8b1
includes oauth routing
RedSquirrelious Oct 24, 2016
79c2b76
includes routing for oauth
RedSquirrelious Oct 24, 2016
991f362
cleaned up sessions routing
RedSquirrelious Oct 24, 2016
456c9e2
fixed conflicts
ellevargas Oct 24, 2016
8f921ad
fixed merge commits
ellevargas Oct 24, 2016
38c0ced
Merge pull request #35 from mayawang/ev_add_product
ellevargas Oct 24, 2016
e969d62
Merge branch 'master' of github.com:mayawang/Vampazon
ellevargas Oct 24, 2016
b64a496
fixed login link
RedSquirrelious Oct 24, 2016
60709a1
fixed login route
RedSquirrelious Oct 24, 2016
30f6a7e
Resolved conflicts
Trishthedish Oct 24, 2016
7bfdeeb
Merge pull request #36 from mayawang/search_box_test
Trishthedish Oct 24, 2016
0cd2534
Merge branch 'master' of github.com:mayawang/Vampazon
ellevargas Oct 24, 2016
da7138d
bundle install, rake db reset and rake db migrate
ellevargas Oct 24, 2016
96831cb
includes partial views and a button to add new products
RedSquirrelious Oct 24, 2016
ceacd7f
fixed conflicts
RedSquirrelious Oct 24, 2016
0b16a27
fixed mild conflicts. Merge branch 'sk-moar-foundation'
RedSquirrelious Oct 24, 2016
fda8ad9
push damn you
ellevargas Oct 24, 2016
ba34220
Merge pull request #39 from mayawang/ev_edit_products
ellevargas Oct 24, 2016
e509bd7
created user account mvc logic, and display user basic info on user a…
Oct 24, 2016
d1c7a4f
working on making prettier forms
RedSquirrelious Oct 24, 2016
cbd012f
made the links up top work
RedSquirrelious Oct 24, 2016
6f71ae3
Merge pull request #40 from mayawang/sk-prettier-form
RedSquirrelious Oct 24, 2016
f1cda35
save it all
RedSquirrelious Oct 24, 2016
2c68488
cleaned up address form for orders
ellevargas Oct 24, 2016
d23fabd
added product category lookup to application helper, now top bar menu…
RedSquirrelious Oct 24, 2016
dc6e5bf
add mvc logic for show buyer_manage and seller_manage button on user_…
Oct 24, 2016
5159380
Merge pull request #41 from mayawang/sk-fix-menu-button
RedSquirrelious Oct 24, 2016
c01e5e9
why isn't this all going up/?'
RedSquirrelious Oct 24, 2016
02f1dc7
Merge pull request #42 from mayawang/sk-fix-menu-button
RedSquirrelious Oct 24, 2016
2fc4025
removed extra first and last names from orders stuff
ellevargas Oct 24, 2016
d8c6f6e
removed auth from scratch methods to help with readability
RedSquirrelious Oct 24, 2016
869ea2b
removed auth from scratch from create method to improve readability
RedSquirrelious Oct 24, 2016
c7db62f
added random_photo logic to show category photos on homepage (index)
RedSquirrelious Oct 24, 2016
25a2bd7
narrowed orders in schema down to just name
ellevargas Oct 24, 2016
ec61e01
moved all logic to homepage index view
RedSquirrelious Oct 24, 2016
861293d
Merge pull request #43 from mayawang/ev_consolidate_names
ellevargas Oct 24, 2016
0bdaa15
Merge pull request #44 from mayawang/sk-photos-on-homepage
ellevargas Oct 24, 2016
831a1c8
working on buyer_manage page. Show order in different status. backup …
Oct 24, 2016
855f17a
still working on tests
Trishthedish Oct 24, 2016
0bafd87
working on making the photos the right size
RedSquirrelious Oct 25, 2016
b9b497b
limited max-height to one class of photos
RedSquirrelious Oct 25, 2016
1985bd4
trying to use the equalizer
RedSquirrelious Oct 25, 2016
8171ec5
Still working on fixing testins in model order test.
Trishthedish Oct 25, 2016
54b7f80
fixed typo, added import app.css
RedSquirrelious Oct 25, 2016
6ae64fa
replaced weird stylesheet links with the right one
RedSquirrelious Oct 25, 2016
9dcb1ae
fixed class tag to standardize - product_img to product_photo
RedSquirrelious Oct 25, 2016
33d866a
standardized photo class tag
RedSquirrelious Oct 25, 2016
295f91f
more movement
RedSquirrelious Oct 25, 2016
bbc02ac
completed cancel order mvc logic in buyer_manage view
Oct 25, 2016
0540cc5
resytled all buttons on order controller
Oct 25, 2016
28b3605
add user model relation to orders model
Oct 25, 2016
3301d43
completed mvc logic for buyer manage in user account session. show bu…
Oct 25, 2016
1fca07c
new styling
RedSquirrelious Oct 25, 2016
90ae545
styling for home page
RedSquirrelious Oct 25, 2016
c278698
show item not working that great, needs help
RedSquirrelious Oct 25, 2016
66036c1
puts wrapper around greeting
RedSquirrelious Oct 25, 2016
5976108
added class, added h2 heading to name
RedSquirrelious Oct 25, 2016
8c08ea6
broken show product, needs help
RedSquirrelious Oct 25, 2016
909b8b6
Merge pull request #45 from mayawang/sk-right-size-photos
RedSquirrelious Oct 25, 2016
08b5213
resolved merge conflicts
Oct 25, 2016
ac46977
fixed @order.name bug on confirmation page
Oct 25, 2016
a3bb673
added pending_orders/paid_orders/cancelled_orders/completed_orders/ca…
Oct 25, 2016
18e8309
Merge pull request #46 from mayawang/mw_user_manage_account
Oct 25, 2016
dc159a6
Uncommented tests and pair wrote validations with Sassa. Tests are pa…
Trishthedish Oct 25, 2016
2826dde
fixed cart form - checkout now works
ellevargas Oct 25, 2016
9c9521e
fixed bug on checkout page, confirmation path(@order.id)
Oct 25, 2016
5241d17
fixed typo managment to management
Oct 25, 2016
de9e0b1
Merge pull request #48 from mayawang/mw_user_manage_account
Oct 25, 2016
d1e4acf
fixed conflicts
ellevargas Oct 25, 2016
7a9bc60
pushed error code for research
ellevargas Oct 25, 2016
7beab54
working edit and update methods
RedSquirrelious Oct 25, 2016
b76ae93
make form generic for new and edit; added cancel button
RedSquirrelious Oct 25, 2016
85eaaba
fixed bugs on checkout form
Oct 25, 2016
f631b88
link to form partial
RedSquirrelious Oct 25, 2016
7939783
add buttons for edit and view all the stuff
RedSquirrelious Oct 25, 2016
4d560ef
Merge pull request #47 from mayawang/ev_fix_form
ellevargas Oct 25, 2016
b6a2f8f
added delete button, need to work on routing when a product is deleted
RedSquirrelious Oct 25, 2016
53fd1a0
cancel button routes to root path, show seller route breaks
RedSquirrelious Oct 25, 2016
2af2cee
oauth logic with edit and delete buttons
RedSquirrelious Oct 25, 2016
a232f6f
Finished with product_test model
Trishthedish Oct 25, 2016
0fa80db
may want to adjust the show method so it returns nil, Product.find ma…
RedSquirrelious Oct 25, 2016
ab86652
better cancel button'
RedSquirrelious Oct 25, 2016
0511378
not needed after all, per TA
RedSquirrelious Oct 26, 2016
644da19
this is the one
RedSquirrelious Oct 26, 2016
133c02c
Merge pull request #49 from mayawang/sk_tg_product_controller
RedSquirrelious Oct 26, 2016
76d2500
Created several tests more to go.
Trishthedish Oct 26, 2016
3503078
added name, description, category, price, inventory validations
RedSquirrelious Oct 26, 2016
54969ea
changed stylesheet link in head from application.css to application.s…
RedSquirrelious Oct 26, 2016
d70794b
interpolating the seller's name was breaking tests. changed it to 's…
RedSquirrelious Oct 26, 2016
c848ec4
filled in blank tests, update test still not working
RedSquirrelious Oct 26, 2016
c5119fc
filled in some blanks, commented out tests not appropriate to our con…
RedSquirrelious Oct 26, 2016
1a6f51b
because we use some sass, tests required us to have allstylesheet ext…
RedSquirrelious Oct 26, 2016
e84a284
set up for simplecov
RedSquirrelious Oct 26, 2016
5d6e723
bug fix: inventory checking before checkout, and prevent empty checki…
Oct 26, 2016
c93aae9
Show flash message on global template
Oct 26, 2016
0fd5aa5
Update README.md
Oct 26, 2016
fef18ba
Update README.md
Oct 26, 2016
94963a9
Update README.md
Oct 26, 2016
9d468fe
Update README.md
Oct 26, 2016
56e7681
Update README.md
Oct 26, 2016
6be08e5
completed mvc logic for total_revenue and revenue_by_status on seller…
Oct 26, 2016
2be1b1a
completed mvc logic for total order count and order count by status o…
Oct 26, 2016
38e9509
Merge pull request #50 from mayawang/mw_flash_message
RedSquirrelious Oct 26, 2016
94bccd7
Merge branch 'master' of https://github.com/mayawang/Vampazon into mw…
Oct 26, 2016
88acf75
Merge pull request #51 from mayawang/trish_testing3
RedSquirrelious Oct 26, 2016
2e4bbc1
fixed typo
RedSquirrelious Oct 26, 2016
305eaaf
turned back, fixed mistake/?
RedSquirrelious Oct 26, 2016
2072fd4
resolved testing merge, master had more tests, so went with master
RedSquirrelious Oct 26, 2016
87b7d9c
Merge pull request #52 from mayawang/sk-testing-use-simplecov
RedSquirrelious Oct 26, 2016
d546b94
fixed typo that broke the css
RedSquirrelious Oct 26, 2016
7ac081e
Merge pull request #53 from mayawang/sk-fix-typo-on-application-css
RedSquirrelious Oct 26, 2016
8e8baed
Started to make logic within the product controller.Hope to switch it…
Trishthedish Oct 26, 2016
5f0f6d4
Merge remote-tracking branch 'origin' into mw_seller_manage_account
Oct 26, 2016
2b88286
Reviews are working from the show product path page. They are quite m…
Trishthedish Oct 26, 2016
8e29bf1
removed extra class that caused the freaky 3 columns
RedSquirrelious Oct 26, 2016
6250949
Worked on adding a add review button. Also now retaining review. The …
Trishthedish Oct 26, 2016
f738b3f
Merge pull request #54 from mayawang/sk-fix-product-show-page
RedSquirrelious Oct 26, 2016
3fed5dd
removed create new product button, moved to user account page
RedSquirrelious Oct 27, 2016
aa4fa34
made user account link visible based on oauth
RedSquirrelious Oct 27, 2016
86d0bb5
put create new product on this page rather than seller management pag…
RedSquirrelious Oct 27, 2016
b813148
removed delete method, added notes to unused methods, added find_revi…
RedSquirrelious Oct 27, 2016
46bde9a
removed delete review button, added notes to edit product and delete …
RedSquirrelious Oct 27, 2016
5266681
fixed weird column thing
RedSquirrelious Oct 27, 2016
c2f1fec
Merge pull request #56 from mayawang/tg_sk_reviews_controller_no_delete
ellevargas Oct 27, 2016
047682f
Merge pull request #55 from mayawang/sk-add-product-user-account
ellevargas Oct 27, 2016
d4f6f22
added static photos to assets file and created new column for alt id …
ellevargas Oct 27, 2016
956a563
Started to create readme
Trishthedish Oct 27, 2016
4f5214c
completed mvp logic for seller management show order items details by…
Oct 27, 2016
72b8810
made the vampazon logo image and added alt text to every last one of …
ellevargas Oct 27, 2016
90feb46
completed mvc logic for link to order details associated with this or…
Oct 27, 2016
5047b0d
Merge remote-tracking branch 'origin' into mw_seller_manage_account
Oct 27, 2016
a5ee634
Update README.md
Oct 27, 2016
9af9412
had deleted this because it broke tests. can fix that. need this. …
RedSquirrelious Oct 27, 2016
84944cb
fixed color on text on logo image
ellevargas Oct 27, 2016
ef1d950
Added a vampire favicon to our page. It renders at top of tab.
Trishthedish Oct 27, 2016
972154c
Merge pull request #57 from mayawang/ev_accessible
RedSquirrelious Oct 27, 2016
56899a1
resolved merge conflict
Oct 27, 2016
b10f834
Merge pull request #58 from mayawang/mw_seller_manage_account
RedSquirrelious Oct 27, 2016
74c6b59
Merge pull request #59 from mayawang/readme
RedSquirrelious Oct 27, 2016
f8df9ac
Merge pull request #60 from mayawang/sk-undo-show-page-seller
Oct 27, 2016
3d05c05
rake db migrate
ellevargas Oct 27, 2016
019443a
alt_text now works yay
ellevargas Oct 27, 2016
0a57cd7
Merge pull request #61 from mayawang/ev_oopsiwasonmaster
ellevargas Oct 27, 2016
9207636
fixed sytax error in app.css
Oct 27, 2016
6aa4457
resolved merge conflict
Oct 27, 2016
f7710b2
Merge pull request #62 from mayawang/mw_css_sytax_fix
ellevargas Oct 27, 2016
1e74b1d
Updated Gemfile for heroku
Oct 27, 2016
c8d1d90
comment out line 10 of application.rb
Oct 27, 2016
754a46b
missing css syntax
ellevargas Oct 27, 2016
b8cb297
fix syntax in application.css
Oct 27, 2016
981b6ba
Remove integer limits for postgres
Oct 27, 2016
cf0d013
Convert types in seeds
Oct 27, 2016
02a5d0e
Change phone columns to string
Oct 27, 2016
d5ddbf5
Remove unused script tags
Oct 27, 2016
10d55c0
worked on nav
ellevargas Oct 28, 2016
f3ae1a6
worked on homepage fruitlessly - switching to basic page formatting
ellevargas Oct 28, 2016
b2f7615
Merge branch 'master' of github.com:mayawang/Vampazon
ellevargas Oct 28, 2016
230baa5
cleaned up css and consolidated a few classes on show category view
ellevargas Oct 28, 2016
269307e
no more integer limit 4 bs
ellevargas Oct 28, 2016
4d0cf77
show category pages are all synced up as far as styling
ellevargas Oct 28, 2016
b7dd841
got individual pages working and cleaned up css
ellevargas Oct 28, 2016
01b0a23
omg the all products page looks awesome
ellevargas Oct 28, 2016
265cd49
standardized forms and user account info
ellevargas Oct 28, 2016
478450e
Found clever way to fix decimal issues. Things are tested and working.
Trishthedish Oct 28, 2016
7905710
Merge pull request #65 from mayawang/currency_validation
ellevargas Oct 28, 2016
dd37ee3
working on nav bar and homepage now
ellevargas Oct 28, 2016
45f3699
still working on nav bar and homepage, but atom almost froze :|
ellevargas Oct 28, 2016
04ae252
added two frontpage photos - will work on this tomorrow morning
ellevargas Oct 28, 2016
c6fd7e0
added dollar signs and minor tweaks
ellevargas Oct 28, 2016
664a4a4
fixed conflicts and removed js stuff from application.html.erb
ellevargas Oct 28, 2016
672add4
fixed minor change to confirmation page
ellevargas Oct 28, 2016
3aa53d9
Merge pull request #66 from mayawang/ev_yescss
ellevargas Oct 28, 2016
e18d1b1
Fixed favicon conflicts
Trishthedish Oct 28, 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
Next Next commit
added link to github auth
RedSquirrelious committed Oct 21, 2016
commit 9d6d6d59561b69f194c6ae3080839bdcd8816dcf
4 changes: 4 additions & 0 deletions app/views/layouts/_navigation_links.html.erb
Original file line number Diff line number Diff line change
@@ -4,4 +4,8 @@
<% else %>
<%= link_to 'Login', login_path %>
<% end %>
</p>

<p>
<%= link_to("Log in via Github", "/auth/github/") %>
</p>