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

Soulsearchers/India/Olga/Li/Taylor #85

Open
wants to merge 222 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
222 commits
Select commit Hold shift + click to select a range
e570656
Initail Rails setup
TaylorMililani Nov 16, 2020
40feefd
ERD.drawio
nerdyistrendy Nov 16, 2020
633318d
draft.drawio
nerdyistrendy Nov 17, 2020
4c5e447
seed file
TaylorMililani Nov 17, 2020
2110b92
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
TaylorMililani Nov 17, 2020
3ffafe8
seeds csv
nerdyistrendy Nov 17, 2020
fee373d
added seeds csv and edited seeds.rb
nerdyistrendy Nov 17, 2020
f6f7f1c
created merchant controller and model
indiakato Nov 17, 2020
0a26b7e
Created a product model
OlgaSe Nov 17, 2020
8ae6d6d
review controller + model
TaylorMililani Nov 17, 2020
fd98bde
generated order controller and model
nerdyistrendy Nov 17, 2020
74175c9
added .idea too .gitignore file
OlgaSe Nov 17, 2020
e54d848
Merge branch 'master' into MerchantController
indiakato Nov 17, 2020
acb4849
Merge pull request #1 from TaylorMililani/MerchantController
indiakato Nov 17, 2020
1fb61f7
outlined tests for review
TaylorMililani Nov 17, 2020
eafff02
Merge pull request #2 from TaylorMililani/review
TaylorMililani Nov 17, 2020
bb09dc3
Pull and merge
OlgaSe Nov 18, 2020
dffc6b8
updated order schema
nerdyistrendy Nov 18, 2020
b42d5ad
Remove .idea from the repository
OlgaSe Nov 18, 2020
be16239
update order schema
nerdyistrendy Nov 18, 2020
528ca51
updated seeds.rb
nerdyistrendy Nov 18, 2020
686cf4e
added routes for orders
nerdyistrendy Nov 18, 2020
40d75f0
changed order columns and model validations for the columns
nerdyistrendy Nov 18, 2020
d8d85c6
created form template
nerdyistrendy Nov 18, 2020
d0617e2
updated form template and schema
nerdyistrendy Nov 18, 2020
560fa43
added basic view pages
nerdyistrendy Nov 18, 2020
e3fa133
added presence validation and credit card validation
nerdyistrendy Nov 18, 2020
04f2f07
added default status
nerdyistrendy Nov 18, 2020
7e6327a
schema changed
indiakato Nov 18, 2020
96f3e3f
renamed merchant controller and model to user
indiakato Nov 18, 2020
bf72a48
changed seed file from merchants to users
indiakato Nov 18, 2020
2131aa8
Merge pull request #3 from TaylorMililani/MerchantController
indiakato Nov 18, 2020
7f0d39c
added added github_login route, created omniauth initializer
indiakato Nov 18, 2020
a028c69
commit to pull
OlgaSe Nov 19, 2020
d6fca3e
Merge branch 'master' of https://github.com/TaylorMililani/betsy
OlgaSe Nov 19, 2020
df2630d
added login through github feature
indiakato Nov 19, 2020
63cdba5
added logout feature
indiakato Nov 19, 2020
08c8e5e
edited order validations to allow more zip code format
nerdyistrendy Nov 19, 2020
4579ac1
generated category controller and added :new route
nerdyistrendy Nov 19, 2020
71d9eaf
added category :show and :index route
nerdyistrendy Nov 19, 2020
88f1d58
Added views for product model, homepage and updated routes
OlgaSe Nov 19, 2020
4016be1
created join table
nerdyistrendy Nov 19, 2020
3ae4ddf
removed category column
nerdyistrendy Nov 19, 2020
76a2288
Orderitem controller and model
TaylorMililani Nov 19, 2020
9f49782
Merge branch 'orderitem' into master
TaylorMililani Nov 19, 2020
8fe16ab
fixed merge conflicts
TaylorMililani Nov 19, 2020
5a26e92
joined category and products and added view pages for new, index, show
nerdyistrendy Nov 19, 2020
c643dad
Merge branch 'category'
nerdyistrendy Nov 19, 2020
c5fd5c0
edited links in appication html
nerdyistrendy Nov 19, 2020
b813356
added seeds file to connect product/category. edited product category…
nerdyistrendy Nov 19, 2020
7ce01f9
updated categories to ul
nerdyistrendy Nov 19, 2020
6557c2d
Merge branch 'master' into user-oauth
indiakato Nov 19, 2020
ffba14c
Merge pull request #5 from TaylorMililani/user-oauth
indiakato Nov 19, 2020
b6aea63
added username to users schema
indiakato Nov 19, 2020
ff0c018
added index and show action
indiakato Nov 19, 2020
c90d7d9
Merge pull request #6 from TaylorMililani/user-views
indiakato Nov 19, 2020
b73125c
commented out order create validations
nerdyistrendy Nov 19, 2020
ed2c3d3
related orderitem to product and order
TaylorMililani Nov 19, 2020
deef43b
Merge branch 'master' into taylor
TaylorMililani Nov 19, 2020
4858b5d
Merge pull request #7 from TaylorMililani/taylor
TaylorMililani Nov 19, 2020
b77fd8c
order validations only upon update
nerdyistrendy Nov 20, 2020
f1baa70
login
indiakato Nov 20, 2020
028a2b4
added flash view
nerdyistrendy Nov 20, 2020
ca90439
added flash view
nerdyistrendy Nov 20, 2020
d8a7a9e
changed session view page
nerdyistrendy Nov 20, 2020
8803822
new.return user
nerdyistrendy Nov 20, 2020
f6b0111
shopping cart functionality
TaylorMililani Nov 20, 2020
293c751
fixed merge conflicts
TaylorMililani Nov 20, 2020
562df33
Added relation product-user, fixed seeds, created migration, dropdown…
OlgaSe Nov 20, 2020
ebb1fdc
Pull and merged
OlgaSe Nov 20, 2020
7de7ac6
commented out @order_item.order_id = @new_order.id
nerdyistrendy Nov 20, 2020
91e1e09
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 20, 2020
19267aa
Merge pull request #8 from TaylorMililani/login_logout_user
indiakato Nov 20, 2020
e2f81de
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 20, 2020
2a8b616
Added quantity to the product page
OlgaSe Nov 20, 2020
df9dd4b
updated checkout to patch order, changed status to paid and details i…
nerdyistrendy Nov 21, 2020
4df0c0d
do not allow change order after paid
nerdyistrendy Nov 21, 2020
a1546c6
clear shopping cart after purchase
nerdyistrendy Nov 21, 2020
d749bf1
create new session after purchase
nerdyistrendy Nov 21, 2020
287790b
User's shopping cart will reflect the current available stock if some…
nerdyistrendy Nov 21, 2020
4eb7974
added user hash to seeds file
indiakato Nov 21, 2020
a727084
added index and show actions for users, made index.html.erb for users…
indiakato Nov 21, 2020
6c6f097
shopping cart view
TaylorMililani Nov 21, 2020
cf85297
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
TaylorMililani Nov 21, 2020
7d846a3
Validation to the product and tests for validation
OlgaSe Nov 21, 2020
3cc5fef
Added 1 test for numerical validation
OlgaSe Nov 21, 2020
6054daa
orderitem index action fixed
TaylorMililani Nov 21, 2020
a2a3722
Merge pull request #10 from TaylorMililani/product_quantities
OlgaSe Nov 21, 2020
d605319
cart show page
TaylorMililani Nov 21, 2020
cbfcbe3
added shopping cart link to nav
TaylorMililani Nov 21, 2020
b2c4e6e
cart view
TaylorMililani Nov 21, 2020
59db34f
Merge branch 'master' into tmt-betsy
TaylorMililani Nov 21, 2020
961bac7
Merge pull request #11 from TaylorMililani/tmt-betsy
TaylorMililani Nov 21, 2020
eb0c370
Fixed order_items attribute for quantity, fixed issue for destroy act…
OlgaSe Nov 22, 2020
62ead24
Added product authorization (only logged in user allowed to edit, upd…
OlgaSe Nov 22, 2020
a4b3062
added comment
OlgaSe Nov 22, 2020
a6d10d9
created user show page
indiakato Nov 22, 2020
bd8353c
working on shopping cart
TaylorMililani Nov 22, 2020
54abd80
Merge pull request #13 from TaylorMililani/tmt-cart
TaylorMililani Nov 22, 2020
14b34e9
added order confirmation page!
nerdyistrendy Nov 22, 2020
b4c0c2f
Merge branch 'master' into product_authorization_rules
OlgaSe Nov 22, 2020
1686fa1
Merge pull request #12 from TaylorMililani/product_authorization_rules
OlgaSe Nov 22, 2020
d8fa39d
added order confirmation page!
nerdyistrendy Nov 22, 2020
9f61184
added order confirmation page!
nerdyistrendy Nov 22, 2020
8d6b1e0
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 22, 2020
2ed8e48
deleted category column
nerdyistrendy Nov 22, 2020
d9251ee
added checkout button
nerdyistrendy Nov 22, 2020
6f039d9
fixed remove path
nerdyistrendy Nov 22, 2020
c3b32d5
Fixed update action for quantity of products
OlgaSe Nov 22, 2020
124633c
uploaded product pics
nerdyistrendy Nov 23, 2020
319b17b
photo of the product can be uploaded and edited
OlgaSe Nov 23, 2020
6a4ef56
Merge pull request #14 from TaylorMililani/Image_url_for_products
OlgaSe Nov 23, 2020
9d8a5e2
added controller tests for order
nerdyistrendy Nov 23, 2020
d1d9d7e
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 23, 2020
23b27f1
added list of products to each merchant page
indiakato Nov 23, 2020
82cddc9
Merge branch 'master' into user-info
indiakato Nov 23, 2020
3b853a1
Merge pull request #15 from TaylorMililani/user-info
indiakato Nov 23, 2020
d0ab7fc
only can see your own merchant page
indiakato Nov 23, 2020
a2267a2
Merge pull request #16 from TaylorMililani/user-authentication
indiakato Nov 23, 2020
4e8c38b
changed seed file to assign 3 prodcuts to each merchant
indiakato Nov 23, 2020
2feb053
Merge pull request #17 from TaylorMililani/user-authentication
indiakato Nov 23, 2020
5677c80
gemlock
nerdyistrendy Nov 23, 2020
5bf900c
update
nerdyistrendy Nov 23, 2020
f5c9387
working on css
TaylorMililani Nov 23, 2020
5707461
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
TaylorMililani Nov 23, 2020
73db834
fixed stylesheet link
TaylorMililani Nov 23, 2020
9165a80
Fixed log in error, user can create a product
OlgaSe Nov 23, 2020
5e78ee4
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 23, 2020
5630cda
still trying to get review to work
TaylorMililani Nov 23, 2020
24acb1e
updated product destroy action so that it won't throw error
indiakato Nov 23, 2020
1f9ccec
changed nav link to go straight to merchant dashboard
indiakato Nov 23, 2020
b04c74b
merchant dashboard showing orders
nerdyistrendy Nov 23, 2020
7431dd2
Merge pull request #18 from TaylorMililani/merchantorders
nerdyistrendy Nov 23, 2020
8b5e6fe
i dont want these changes
TaylorMililani Nov 23, 2020
e01843c
made some css changes
TaylorMililani Nov 23, 2020
92286cd
Merge pull request #19 from TaylorMililani/destroy-orderitem
TaylorMililani Nov 23, 2020
8c5b8e7
added a folder uploads, fixed error with product controller, added te…
OlgaSe Nov 23, 2020
51c018c
added buttons to merchant dashboard
indiakato Nov 23, 2020
ef4f170
Merge branch 'master' into merchant-dashboard
indiakato Nov 23, 2020
03673e1
Merge pull request #20 from TaylorMililani/merchant-dashboard
indiakato Nov 23, 2020
421a533
merchant dashboard ship/cancel orders
nerdyistrendy Nov 23, 2020
dea2abe
Merge pull request #21 from TaylorMililani/merchantorders
nerdyistrendy Nov 24, 2020
a12d719
added view orders
indiakato Nov 24, 2020
509d292
update action test, nominal case
OlgaSe Nov 24, 2020
07b49ec
Merge pull request #22 from TaylorMililani/user-orders
indiakato Nov 24, 2020
5d16d48
update action test added
OlgaSe Nov 24, 2020
480fe62
working on testing
TaylorMililani Nov 24, 2020
f618b44
fixed orderitems
TaylorMililani Nov 24, 2020
337ce94
only merchants can see their order_items
nerdyistrendy Nov 24, 2020
f4794b1
Merge pull request #23 from TaylorMililani/merchantorders
nerdyistrendy Nov 24, 2020
b4023a4
products tests are passing
OlgaSe Nov 24, 2020
42ad6ed
Merge pull request #24 from TaylorMililani/product_testing
OlgaSe Nov 24, 2020
e7c4245
reviews not working
TaylorMililani Nov 24, 2020
c41ca64
fixed rating
nerdyistrendy Nov 24, 2020
5b90308
Merge pull request #25 from TaylorMililani/tmt-branch
nerdyistrendy Nov 24, 2020
6375c0e
fixed flash now
nerdyistrendy Nov 24, 2020
f4cf4c8
Merge branch 'tmt-branch'
nerdyistrendy Nov 24, 2020
ab579cd
oderuser relationship
nerdyistrendy Nov 24, 2020
1319d5b
sort orders by status
nerdyistrendy Nov 24, 2020
f926e92
sort orders by status - deleted commented out paragraphs
nerdyistrendy Nov 24, 2020
8591479
Merge pull request #26 from TaylorMililani/statussort
nerdyistrendy Nov 24, 2020
f124037
uploaded pics
nerdyistrendy Nov 24, 2020
fbff151
use bootstrap template
nerdyistrendy Nov 24, 2020
7798aa8
added defalut pic
nerdyistrendy Nov 24, 2020
ffe4e09
delete flash message to show validation error
nerdyistrendy Nov 24, 2020
4d32750
commit to pull
OlgaSe Nov 24, 2020
810d1cf
Merge branch 'master' of https://github.com/TaylorMililani/betsy
OlgaSe Nov 24, 2020
cb58220
added missing file
OlgaSe Nov 24, 2020
75f9508
updated seeds file to match right categories
nerdyistrendy Nov 24, 2020
ef63e15
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 24, 2020
01bdad1
cleaned up merchant show page
indiakato Nov 24, 2020
f30436f
added description area to edit/update product page
OlgaSe Nov 24, 2020
aa5878a
style merchant dashboard table
indiakato Nov 24, 2020
294128e
fixed view orders button
indiakato Nov 24, 2020
cc0f31b
Merge pull request #27 from TaylorMililani/merchant-dashboard
indiakato Nov 24, 2020
3f721fc
added custom method for products in stock and dollar sign to prices
OlgaSe Nov 24, 2020
8889ec4
finished merchant dashboard minus hide button
indiakato Nov 24, 2020
02edf25
browse products by merchants
indiakato Nov 24, 2020
dd32e5e
Merge pull request #28 from TaylorMililani/browse-merchant
indiakato Nov 24, 2020
0fcac78
Merge pull request #29 from TaylorMililani/hiding_product_buttons_and…
OlgaSe Nov 24, 2020
de413b1
installed simplecov
nerdyistrendy Nov 24, 2020
523f51e
finished testing for now
TaylorMililani Nov 24, 2020
8a5f24e
Merge pull request #30 from TaylorMililani/t-testing
TaylorMililani Nov 24, 2020
191bc28
Merge branch 'master' of https://github.com/TaylorMililani/betsy
nerdyistrendy Nov 25, 2020
ef166e7
order controller testing
nerdyistrendy Nov 25, 2020
8001c19
header picture and homepage blurb
TaylorMililani Nov 25, 2020
994a657
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
TaylorMililani Nov 25, 2020
35f7540
css tweaks
TaylorMililani Nov 25, 2020
a5b1070
Merge pull request #31 from TaylorMililani/t-css
TaylorMililani Nov 25, 2020
978ecdd
more css tweaks
TaylorMililani Nov 25, 2020
7b4da0e
css tweaks
TaylorMililani Nov 25, 2020
3c7f734
Merge pull request #32 from TaylorMililani/tt-css
TaylorMililani Nov 25, 2020
86785bc
passed all ordercontrollers test
nerdyistrendy Nov 25, 2020
f38fd39
Merge branch 'master' of https://github.com/TaylorMililani/betsy into…
nerdyistrendy Nov 25, 2020
16c4cb6
added show action tests
nerdyistrendy Nov 25, 2020
0d1c925
edited table color
nerdyistrendy Nov 25, 2020
67cd0fc
Merge pull request #33 from TaylorMililani/ordermodeltesting
nerdyistrendy Nov 25, 2020
a2ae1a4
updated category controller tests
nerdyistrendy Nov 25, 2020
9486ef0
updated category model tests
nerdyistrendy Nov 25, 2020
3e50452
removed order index page
nerdyistrendy Nov 25, 2020
6547e9f
removed order new page, added default value to the edit page
nerdyistrendy Nov 25, 2020
c5cb88a
order validation model test
nerdyistrendy Nov 25, 2020
4000670
added retire bitton to the merchant dashboard
OlgaSe Nov 25, 2020
990079a
Merge pull request #34 from TaylorMililani/Retire_button_product_testing
OlgaSe Nov 25, 2020
8c8a424
order model tests
nerdyistrendy Nov 25, 2020
1868116
Merge pull request #35 from TaylorMililani/ordermodeltesting
nerdyistrendy Nov 25, 2020
8f19f0e
some css style changes, seed file with all photos
OlgaSe Nov 25, 2020
5126ba9
fixing dissapeared header image
OlgaSe Nov 25, 2020
5855ef8
model validations tests, auth callback tests
indiakato Nov 25, 2020
045f828
relations tests
indiakato Nov 25, 2020
a571765
user model tests
indiakato Nov 25, 2020
d422289
auth callback, guest users tests
indiakato Nov 25, 2020
6eb5bf2
fixed cannot access merchant dashboard test
indiakato Nov 25, 2020
16a9b24
Merge branch 'master' into user-test
indiakato Nov 25, 2020
9e5d549
Merge pull request #36 from TaylorMililani/user-test
indiakato Nov 25, 2020
c7120d4
fix merge
indiakato Nov 25, 2020
8b5f86b
removed an extra </div> that broke everything TAT
nerdyistrendy Nov 25, 2020
7d048f5
added browse by merchant page
indiakato Nov 25, 2020
ff111ef
updated nav bar
indiakato Nov 25, 2020
0333c11
Merge pull request #38 from TaylorMililani/user-test-2
indiakato Nov 25, 2020
fbfe32b
product tests completed
OlgaSe Nov 26, 2020
a91c1dc
Merge pull request #39 from TaylorMililani/product_testssss
OlgaSe Nov 26, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
39 changes: 39 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
# 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'
.env
# Ignore bundler config.

/.bundle

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

# Ignore pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

# Ignore uploaded files in development.
/storage/*
!/storage/.keep

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity
.idea
coverage/*
153 changes: 153 additions & 0 deletions .idea/betsy.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.6.5
Loading