Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
330 commits
Select commit Hold shift + click to select a range
02f382b
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 23, 2018
e93a1a6
application_html fix for user display.
kseastman Apr 23, 2018
1b33364
quick fix user login application.html.erb
kseastman Apr 23, 2018
fe0f5d5
Merge branch 'master' of https://github.com/annehwatson/betsy
kseastman Apr 23, 2018
50ddf2e
new caption for home page
arrriiii Apr 23, 2018
fe703c2
sessions controller fixing after merge error.
kseastman Apr 23, 2018
d50889a
manually merging.
kseastman Apr 23, 2018
101cb71
last bits before post-weekend merge.
kseastman Apr 23, 2018
0a2185c
Parallax fixed
arrriiii Apr 23, 2018
a041681
edit category test
annehwatson Apr 23, 2018
75b363f
updated destroy cartegory to expect redirect instead of success
annehwatson Apr 23, 2018
0617a13
had wrong error message on categories update flash
annehwatson Apr 23, 2018
e38a81b
New root page
arrriiii Apr 23, 2018
7900187
Pushing session controller create
arrriiii Apr 23, 2018
2f26135
coverage to git ignore
arrriiii Apr 23, 2018
acb6c39
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 23, 2018
69e806f
Merge branch 'categories_users'
annehwatson Apr 23, 2018
0ff64b2
trying a different manner, omitting the cart.
kseastman Apr 23, 2018
ee1a65e
New list view for product page
arrriiii Apr 23, 2018
8a1db4e
removing line from session that caused double render error
annehwatson Apr 23, 2018
be2efa5
removing line from session that caused double render error
annehwatson Apr 23, 2018
990ac2e
updates to new in categories controller
annehwatson Apr 23, 2018
cab1b74
Product layout page edit
arrriiii Apr 23, 2018
d645691
update seed files with more images, descriptions, urls
Apr 23, 2018
7cf906d
update seed files with more images, descriptions, urls; fix merge con…
Apr 23, 2018
3900a87
final commit before pull
annehwatson Apr 23, 2018
e90a832
Fixed picture items in product list
arrriiii Apr 23, 2018
bc60f0f
fix merge conflict
annehwatson Apr 23, 2018
c9c5190
fix merge conflict
annehwatson Apr 23, 2018
09d0aa1
changes to cart and order.
kseastman Apr 23, 2018
f8f7d3f
managing merge before push
kseastman Apr 23, 2018
9103309
trying to fix merge conflict
annehwatson Apr 23, 2018
8f1570c
Updated create method in session
arrriiii Apr 23, 2018
6c70cb7
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 23, 2018
0ca6c39
Merge branch 'master' of https://github.com/annehwatson/betsy
kseastman Apr 23, 2018
d05da18
new styling for products
arrriiii Apr 23, 2018
52e8b77
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 23, 2018
a3779bf
last minute things for kari
kseastman Apr 23, 2018
04919c3
minor changes
kseastman Apr 23, 2018
0dcbf98
weirdness with sessions_controller
kseastman Apr 23, 2018
faab6f5
maybe fixed sessions and broke everything else.
kseastman Apr 23, 2018
0eb3526
merging changes
arrriiii Apr 23, 2018
a5c15a2
merging conflicts
arrriiii Apr 23, 2018
6c733a2
controller products view logic.
kseastman Apr 23, 2018
7c0f488
Merge branch 'master' of https://github.com/annehwatson/betsy
kseastman Apr 23, 2018
3bab652
shoppingcart logic further.
kseastman Apr 24, 2018
1d8c559
Merge branch 'ke/shoppingcart_redux'
kseastman Apr 24, 2018
7ba16fe
removed cart model.
kseastman Apr 24, 2018
41085a9
review model validating presence of rating
annehwatson Apr 24, 2018
04fafcd
generate reviews controller
annehwatson Apr 24, 2018
15963be
review params
annehwatson Apr 24, 2018
3f5f3dc
review new action
annehwatson Apr 24, 2018
d38dfe9
create review action
annehwatson Apr 24, 2018
cb786cb
numericality 1-5 review
annehwatson Apr 24, 2018
78aa97c
new review form on products/id/reviews/new path
annehwatson Apr 24, 2018
72a6529
user-product path and view; updated sessions controller
arrriiii Apr 24, 2018
966c7a7
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 24, 2018
9384e98
Merge branch 'master' into ke/shoppingcart_Redux
kseastman Apr 24, 2018
24f3653
fixing merge conflict
annehwatson Apr 24, 2018
a978856
product show page just writing review section
annehwatson Apr 24, 2018
d352798
removed resultset.json
kseastman Apr 24, 2018
649f84b
delete coverage resultset json files to eliminiate merge conflicts
Apr 24, 2018
556f095
ahw added links to products on product index and tried to get new rev…
annehwatson Apr 24, 2018
6734c5c
minor tweaks to products display
kseastman Apr 24, 2018
88338f1
Merge branch 'ke/product_tweaks'
kseastman Apr 24, 2018
71b19d6
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 24, 2018
06f4efd
trying to get rid of nested folder structure
annehwatson Apr 24, 2018
8f60f90
Deleted blank yml data, updated session and user controller tests
arrriiii Apr 24, 2018
72008c5
update validations for product name and price; add product belongs_to…
Apr 24, 2018
9b55064
more details on product show page
annehwatson Apr 24, 2018
b4226e3
changing product.review.rating display to be asterisk for now
annehwatson Apr 24, 2018
f6e430f
messing with show cart view to get update quantity logic.
kseastman Apr 24, 2018
82ec19a
adding product name to new review page
annehwatson Apr 24, 2018
5b28c3e
Updated user and session controller/model test
arrriiii Apr 24, 2018
dbfad98
Fixing merge conficts, new testing for user and sessions
arrriiii Apr 24, 2018
a96656b
trying to implement an icon in the select field for new review but ne…
annehwatson Apr 24, 2018
e3b286b
giving up on stars ratings array for now
annehwatson Apr 24, 2018
b0e7ad4
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 24, 2018
e53ff6f
minor tweaks to shows and controller logic for update quantity logic.
kseastman Apr 24, 2018
07f8b8f
adding existing product partial to product show view
annehwatson Apr 24, 2018
b2f3dd7
updating text on product partial to remember to update these later
annehwatson Apr 24, 2018
8fb16f4
base functionality for shopping cart ready.
kseastman Apr 24, 2018
6495a31
my lie, now it is buggy, but functional.
kseastman Apr 24, 2018
dfc69dc
Delete .env
annehwatson Apr 24, 2018
0950de3
new gitignore file
kseastman Apr 24, 2018
42934b9
Delete .DS_Store
annehwatson Apr 24, 2018
0dbc3f3
master kerfluffle
kseastman Apr 24, 2018
779fc8f
Merge branch 'ke/mergemasterkerfluffle'
kseastman Apr 24, 2018
5148f77
Merge branch 'master' of https://github.com/annehwatson/betsy
kseastman Apr 24, 2018
6ec5d20
stashing before switching
kseastman Apr 24, 2018
835708a
trying to replicate merge at origin
kseastman Apr 25, 2018
e11ceeb
Merge branch 'ke/mergecart'
kseastman Apr 25, 2018
dc3c447
fixed bug in cart.
kseastman Apr 25, 2018
e0103ad
Update _order_products.html.erb
kseastman Apr 25, 2018
de392d6
changes to application controller to fix test errors.
kseastman Apr 25, 2018
2cb9d23
oops, forgot to take out raise.
kseastman Apr 25, 2018
7f503cb
quick fix.
kseastman Apr 25, 2018
ff3c8c1
ignoring ruby basic test files in simplecov and also regenerating ind…
annehwatson Apr 25, 2018
d984c4b
ds store to gitignore
annehwatson Apr 25, 2018
94acffa
initial user seeds
annehwatson Apr 25, 2018
14a5fc1
couple more user seeds
annehwatson Apr 25, 2018
c13e039
remove unnecessary ':user_id' from product_params method
Apr 25, 2018
db368a2
initial cart controller test stubs
annehwatson Apr 25, 2018
08848cd
tweak logic in new, create, find_product and before_action to success…
Apr 25, 2018
95a3f0e
adding skips
annehwatson Apr 25, 2018
ad770e9
add ratings_options method to connect to reviews view
Apr 25, 2018
2f88cfd
clean up redundant routes, add routes for reviews; nested routes for …
Apr 25, 2018
b1bb7cb
Merge branch 'master' of https://github.com/annehwatson/betsy
Apr 25, 2018
c01ae37
merging master into branch- resolves merge conflict
Apr 25, 2018
ea00829
figuring out filter logic.
kseastman Apr 25, 2018
a2e35b0
Merge branch 'master' into ke/testing
kseastman Apr 25, 2018
9168cee
updated stubs
annehwatson Apr 25, 2018
dd969ad
testing modifications to categories, application, products, session, …
kseastman Apr 25, 2018
3486784
added favicon with transparent background.
kseastman Apr 25, 2018
52c20fd
Added regrEtsy instead of Untitled to application.html.erb
kseastman Apr 25, 2018
cb4f291
carts controller stub
annehwatson Apr 25, 2018
bf47c38
merge conflict
annehwatson Apr 25, 2018
2cc67c0
Merge branch 'ke/testing_v2'
kseastman Apr 25, 2018
f0e1927
Updated fixutes and review_controller test
arrriiii Apr 25, 2018
147234e
Updated merge conficts
arrriiii Apr 25, 2018
3d7bd8c
products.yml preliminary
kseastman Apr 25, 2018
20e7b2f
Merge branch 'ke/testing_v2'
kseastman Apr 25, 2018
99ac641
maria's changes to routes.
kseastman Apr 25, 2018
37f3672
update with log and tmp
Apr 25, 2018
358367c
Merge branch 'mv_ratings_fix'
Apr 25, 2018
a82343f
ignoring app/helpers tests
annehwatson Apr 25, 2018
7b45bbe
orderitems and products yml files added/modified.
kseastman Apr 25, 2018
15eb120
changed _product and messed with order test.
kseastman Apr 25, 2018
e5462fd
Merge branch 'ke/testing_v2'
kseastman Apr 25, 2018
61c6923
Removed extra method not found on user controller
arrriiii Apr 25, 2018
2c887f7
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 25, 2018
1bf83bc
reviews_controller updates.
kseastman Apr 25, 2018
3d8cc5d
Merge branch 'ke/testing_v2'
kseastman Apr 25, 2018
840d286
pairing with Anne to fix review display for product#show.
kseastman Apr 25, 2018
d9bb57e
commented out user from orderitems.yml
annehwatson Apr 25, 2018
515409d
updating oiyml
annehwatson Apr 25, 2018
f9ea729
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 25, 2018
8619ce9
Updated relationship changes per discussion
arrriiii Apr 25, 2018
e66fe15
removing require_login.
kseastman Apr 25, 2018
0466b2a
Merge branch 'ke/remove_require_login'
kseastman Apr 25, 2018
1e26641
fixing categories_controller_test to correspond with new unauthorized…
kseastman Apr 25, 2018
1727eae
added relationships for order-user linking.
kseastman Apr 26, 2018
03f0bab
updating product and order view pages
arrriiii Apr 26, 2018
96dfe90
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 26, 2018
d291119
tweak to carts_controller, initial orderitem model testing.
kseastman Apr 26, 2018
5cd7917
updated reference table and views for checkout
arrriiii Apr 26, 2018
53dfc4f
Merge remote-tracking branch 'refs/remotes/origin/master'
arrriiii Apr 26, 2018
afb5ac0
test helper and carts controller tests. need to check yaml
annehwatson Apr 26, 2018
6818a26
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 26, 2018
8b57699
timemachine no bueno
kseastman Apr 26, 2018
bf233b2
more modifications to timemachine.
kseastman Apr 26, 2018
9d37979
timemachine functional order
kseastman Apr 26, 2018
710ceb0
Merge branch 'timemachine' into master-rebase
kseastman Apr 26, 2018
b4ed084
minor tweaks to carts controller and order.
kseastman Apr 26, 2018
34665e7
added back in placekitten yml products.
kseastman Apr 26, 2018
0cf4d03
modifications to session.
kseastman Apr 26, 2018
1297e23
removed user_email method.
kseastman Apr 26, 2018
3bf05e2
change @user in product_controller to match application filter.
kseastman Apr 26, 2018
efb5473
average rating and review to products
annehwatson Apr 26, 2018
339b6df
Merge branch 'reviews_rating_count'
annehwatson Apr 26, 2018
e1e9f76
float in rating
annehwatson Apr 26, 2018
65a49d5
returning to normal after git kerfluffle.
kseastman Apr 26, 2018
387dcec
Merge branch 'master' into ke/kerfluffle_redux
kseastman Apr 26, 2018
692a381
added product to seed
annehwatson Apr 26, 2018
44d7e6f
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 26, 2018
deb3b0f
added rating and review to the other view it's on
annehwatson Apr 26, 2018
6c7f66b
more review seeds
annehwatson Apr 26, 2018
d43a392
more seeds
annehwatson Apr 26, 2018
2f7b2de
fixing reviews redirect after creation
annehwatson Apr 26, 2018
9bf506b
limiting average rating float to 2 decimals
annehwatson Apr 26, 2018
3064511
more comments
annehwatson Apr 26, 2018
b281ba9
foundation_icons
arrriiii Apr 26, 2018
909672e
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 26, 2018
f3efa0f
Added sass foundation rails gem
arrriiii Apr 26, 2018
da590ef
added test for product#retire.
kseastman Apr 26, 2018
7309003
add table for merchant products list; add link to main title going to…
Apr 26, 2018
f73a3f2
Updating review for users
arrriiii Apr 26, 2018
b6219ad
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 26, 2018
31ac5f5
tests and method for retire item.
kseastman Apr 26, 2018
2f614ab
Merge branch 'master' into ke/merchants
kseastman Apr 26, 2018
ada34c6
flash messages
annehwatson Apr 26, 2018
5da1ab5
Users can no longer review their own products
arrriiii Apr 26, 2018
5550f5a
updated merge confict
arrriiii Apr 26, 2018
0ce916f
error messages
annehwatson Apr 26, 2018
b8f338f
added in stock value to product pages
annehwatson Apr 26, 2018
b972c92
product layout changes
arrriiii Apr 27, 2018
71ca854
Add change to reviews display (now tears instead of stars); change gl…
Apr 27, 2018
ef8ebe6
fixing dropdown menu
arrriiii Apr 27, 2018
172f7d6
Updated merge conflicts
arrriiii Apr 27, 2018
9dce188
resolve merge conflicts inside _product.html.erb - both in layouts an…
Apr 27, 2018
be29f9e
logic for hiding a product.
kseastman Apr 27, 2018
46b3bee
Merge branch 'master' into ke/merchants
kseastman Apr 27, 2018
b4e0e44
added validation on orderitem numericality lower range
annehwatson Apr 27, 2018
faa4fa1
product list for each user, and user index.
kseastman Apr 27, 2018
a54c804
Merge branch 'ke/merchants'
kseastman Apr 27, 2018
658ef66
change font to Roboto condensed
Apr 27, 2018
5362651
Merge branch 'master' of https://github.com/annehwatson/betsy
Apr 27, 2018
a683932
embed review page in product.
kseastman Apr 27, 2018
db9c73b
added carts controller tests and logic for buyerdetail rendering corr…
kseastman Apr 27, 2018
9a0ee7b
carts_controller was unsaved last commit.
kseastman Apr 27, 2018
b613559
removed clear_cart path
kseastman Apr 27, 2018
17e99ac
review or reviews wording
annehwatson Apr 27, 2018
09fc4cf
be the first to rate this product
annehwatson Apr 27, 2018
34233b9
removal of link to write a review since it's now inline
annehwatson Apr 27, 2018
b6c5be8
review count as link to product
annehwatson Apr 27, 2018
a2b8824
silly styling for merchant page.
kseastman Apr 27, 2018
6dda703
resized product view page
arrriiii Apr 27, 2018
93a53b8
Removed foundation icons
arrriiii Apr 27, 2018
b3ff015
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 27, 2018
2632a6b
evening changes merging in
kseastman Apr 27, 2018
07c349c
Merge branch 'master' of https://github.com/annehwatson/betsy
kseastman Apr 27, 2018
c268744
Merge branch 'ke/merchants'
kseastman Apr 27, 2018
333ccdb
comment out nonfunctional test
kseastman Apr 27, 2018
3b9e513
application with functional logout
kseastman Apr 27, 2018
7a8b2dc
updated form page
arrriiii Apr 27, 2018
674d1e0
Merge branch 'ke/merchants'
kseastman Apr 27, 2018
c920d1e
changed delete route to get
arrriiii Apr 27, 2018
7af9ec1
Merge branch 'master' of https://github.com/annehwatson/betsy
kseastman Apr 27, 2018
d22b541
adding comment to route to make the choice to use get for logout expl…
kseastman Apr 27, 2018
c59e6b4
trying to undo logout to see if that works on heroku
annehwatson Apr 27, 2018
93286a8
seeds update
annehwatson Apr 27, 2018
741123a
going back to weird get for delete route for heroku
annehwatson Apr 27, 2018
bed2c7d
Updated product list page
arrriiii Apr 27, 2018
c873782
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 27, 2018
0cfbb71
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 27, 2018
213fce8
Merge branch 'master' of https://github.com/annehwatson/betsy
annehwatson Apr 27, 2018
1168ff6
minimum value on quantity form select field
annehwatson Apr 27, 2018
d3e4b72
fixed user-info bleeding off screen.
kseastman Apr 27, 2018
1460a13
Merge branch 'ke/merchants'
kseastman Apr 27, 2018
da43273
fixed the ability to add blank item to cart - need to write test for …
kseastman Apr 27, 2018
3051e93
adding back be the first to rate this product
annehwatson Apr 27, 2018
48ecef3
product layouts revised
arrriiii Apr 27, 2018
eb863bc
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 27, 2018
9eb845f
changes to general theme.
kseastman Apr 27, 2018
7884627
Merge branch 'ke/styling'
kseastman Apr 27, 2018
3a77b9f
new form page for new product
arrriiii Apr 27, 2018
f5d606c
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 27, 2018
2ffba6d
some merchant display functions.
kseastman Apr 27, 2018
9f41687
Merge branch 'ke/categories_page'
kseastman Apr 27, 2018
0c7a637
background images for products
arrriiii Apr 27, 2018
fc395d9
Merge branch 'master' of https://github.com/annehwatson/betsy
arrriiii Apr 27, 2018
b50aded
actually modifying categories page on the categories page branch.
kseastman Apr 27, 2018
8d4218b
Merge branch 'ke/categories_page'
kseastman Apr 27, 2018
3d6e3c3
Merchant show page hotfixes.
kseastman Apr 27, 2018
45626d0
renaming completedcart
annehwatson Apr 27, 2018
aa8514b
new css for merchant
arrriiii Apr 27, 2018
a7fefaf
updated review page
arrriiii Apr 27, 2018
91b5d25
updates to review controller
annehwatson Apr 27, 2018
0136f80
requested changes
kseastman Apr 27, 2018
df820bb
Merge branch 'ke/lastminute'
kseastman Apr 27, 2018
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
30 changes: 30 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep
tmp
log

/node_modules
/yarn-error.log

.byebug_history


.env

/coverage/*

log/
tmp/
.DS_Store
82 changes: 82 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.6'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# OAuth authorization
gem "omniauth"
gem "omniauth-github"

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'
gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'

gem 'seed_dump'
gem 'dotenv-rails'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem 'jquery-turbolinks'
gem 'jquery-rails'
gem 'foundation-rails'
gem 'foundation-icons-sass-rails'
gem 'normalize-rails'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov'
gem 'simplecov-console'
end
Loading