Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
339 commits
Select commit Hold shift + click to select a range
8d6cc62
Merge branch 'master' into shopping_cart
jwinchan Nov 20, 2020
fdc94d9
Merge pull request #17 from jwinchan/shopping_cart
jwinchan Nov 20, 2020
8a11958
Merge pull request #15 from jwinchan/orderitem_create
jwinchan Nov 20, 2020
459996e
fixed new order item path
jwinchan Nov 20, 2020
66f90b1
moved order_status to order_items table
ichbinorange Nov 20, 2020
0b7f00b
add shipped & cancelled to orderitems table
ichbinorange Nov 20, 2020
757f4fa
add methods shipped & cancelled to order_items_controller
ichbinorange Nov 20, 2020
1941040
revise retired method in products
ichbinorange Nov 20, 2020
9c6c6bf
updated User view page with buttons - retired, shipped, cancelled, ed…
ichbinorange Nov 20, 2020
052aeb6
revise show action for order which only for confirmed order
ichbinorange Nov 20, 2020
bc4e8e8
working tests for destroy and retired action of products
ichbinorange Nov 20, 2020
02e586c
add working tests for shipped and cancelled for order_items
ichbinorange Nov 20, 2020
8b1a3fd
edited cart view and method
jwinchan Nov 20, 2020
e036aa3
changed route formatting
jwinchan Nov 20, 2020
ad318cc
created removed orderitem column from orders and created new fake dat…
jwinchan Nov 20, 2020
2c241ed
changed seed data for products
jwinchan Nov 20, 2020
d72fe99
edited tests for product create and user edit
jwinchan Nov 20, 2020
0413bd3
changed user info to merchant dashboard
jwinchan Nov 20, 2020
7cb16b2
update costom methods and views for user show
ichbinorange Nov 20, 2020
e15c31e
Merge pull request #22 from jwinchan/cart_v2
jwinchan Nov 20, 2020
07eeb90
Merge branch 'master' into user-index-show
jwinchan Nov 20, 2020
2dfb436
Merge pull request #21 from jwinchan/user-index-show
jwinchan Nov 20, 2020
16b8c37
draft tests for custom methods in User model
ichbinorange Nov 20, 2020
89d21ba
merge on 11202020 morning
ichbinorange Nov 20, 2020
ab1be59
fixed add product to order_items table
ichbinorange Nov 20, 2020
1d635a5
fixed create action for order_item
ichbinorange Nov 20, 2020
f69a44f
Merge pull request #23 from jwinchan/orderitem_create.v2
jwinchan Nov 20, 2020
0bcd700
revised quantity calculation and stock for product
ichbinorange Nov 20, 2020
7549fee
Merge pull request #24 from jwinchan/orderitem_create.v2
jwinchan Nov 20, 2020
9cbdd27
edited cart view
jwinchan Nov 20, 2020
72cc9ec
removed stock calculation in create action for orderitem
ichbinorange Nov 20, 2020
23f515f
Merge branch 'master' of github.com:jwinchan/betsy into orderitem_cre…
ichbinorange Nov 20, 2020
0b99fcb
schema update
Maha-ElMais Nov 20, 2020
670c978
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 20, 2020
bb0daef
Merge branch 'master' of github.com:jwinchan/betsy into user-index-show
ichbinorange Nov 20, 2020
cef6f7e
changed order date to updated_at from order
ichbinorange Nov 20, 2020
4f7ba40
added before action for chosen product, update and destroy in controller
Schmarj3 Nov 20, 2020
d261cf8
deleted code in comments
Schmarj3 Nov 20, 2020
03f10af
added working tests for user's show action
ichbinorange Nov 20, 2020
a5b0b59
cart view changes
jwinchan Nov 21, 2020
a98bce8
fixed select to work based on stock
Schmarj3 Nov 21, 2020
47c7ae8
Merge pull request #25 from jwinchan/orderitem_create.v2
jwinchan Nov 21, 2020
df0c714
Merge pull request #26 from jwinchan/user-index-show
jwinchan Nov 21, 2020
e5838dc
Merge pull request #27 from jwinchan/cart_v4.5
jwinchan Nov 21, 2020
14e8715
Merge pull request #28 from jwinchan/quantity_select
jwinchan Nov 21, 2020
29ea6a3
draft tests for the custom methods for user model
ichbinorange Nov 21, 2020
1b57d30
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 21, 2020
f438c94
Merge branch 'master' into orderitem_update
Schmarj3 Nov 21, 2020
8ccff3a
Merge pull request #29 from jwinchan/orderitem_update
Schmarj3 Nov 21, 2020
bc5a832
add custom methods for user model
ichbinorange Nov 21, 2020
a6d368e
created category model with jointable to product
jwinchan Nov 21, 2020
aaefedb
fixed application html
jwinchan Nov 21, 2020
64b1cb7
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 21, 2020
3729a78
add custom methods for user model.2
ichbinorange Nov 21, 2020
e7cf26e
Merge branch 'master' of github.com:jwinchan/betsy
ichbinorange Nov 21, 2020
a26b1d5
merged conflict
ichbinorange Nov 21, 2020
5b5c5e2
add custom methods on user model for show page
ichbinorange Nov 21, 2020
2d31924
drafte relation for products and categories
ichbinorange Nov 21, 2020
cd66cbe
added user validations and changed cart and user show views
jwinchan Nov 21, 2020
a56172e
fixed categories_products join table
ichbinorange Nov 21, 2020
660d920
hides images if retired
jwinchan Nov 21, 2020
e66f859
finally got working tests for product's destroy
ichbinorange Nov 21, 2020
3e39f94
removed debug lines
ichbinorange Nov 21, 2020
298f526
login and logout tests
jwinchan Nov 21, 2020
40d3a34
add tests for order show action (for confirmed order)
ichbinorange Nov 21, 2020
45af68e
draft show page for Order (for confirmed order)
ichbinorange Nov 21, 2020
a2a3bb5
draft tests for orderitem create
ichbinorange Nov 21, 2020
67f3d71
Merge pull request #31 from jwinchan/product-destroy
Schmarj3 Nov 22, 2020
bfd2785
Update show.html.erb
Schmarj3 Nov 22, 2020
e0fba5c
Merge pull request #33 from jwinchan/user_tests
Schmarj3 Nov 22, 2020
c3364ca
Merge branch 'master' of github.com:jwinchan/betsy into orderitem_cre…
ichbinorange Nov 22, 2020
b8fb708
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 22, 2020
fd238be
add quantity check for create action for orderitem
ichbinorange Nov 22, 2020
af0d8d9
add working tests for create for orderitem
ichbinorange Nov 22, 2020
518aad3
changed and added routes
Schmarj3 Nov 22, 2020
105640c
Merge branch 'master' of github.com:jwinchan/betsy
ichbinorange Nov 22, 2020
1adc7ac
made change to select tag and form in cart and product show
Schmarj3 Nov 22, 2020
53dad6f
fix merge issues
ichbinorange Nov 22, 2020
cd68ed6
fix merge issues
ichbinorange Nov 22, 2020
2920cbf
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 23, 2020
2597d09
drafted validates for order
ichbinorange Nov 23, 2020
a116154
Merge branch 'master' of github.com:jwinchan/betsy into orderitem_cre…
ichbinorange Nov 23, 2020
c2fa9dc
add order_item validates and remove >=0 tests in create for order_item
ichbinorange Nov 23, 2020
c342840
add tests for product relationships
ichbinorange Nov 23, 2020
7c84f8f
add An Order must have one or more Order Items to order validates
ichbinorange Nov 23, 2020
a7461b7
remove redundent validate
ichbinorange Nov 23, 2020
c8ac875
fix merge conflict
ichbinorange Nov 23, 2020
6d4940d
fixed the update button situation
Schmarj3 Nov 23, 2020
cf5d64b
Merge pull request #30 from jwinchan/user_custom_methods_on_model
Schmarj3 Nov 23, 2020
94cc7fe
Update orders_controller.rb
Schmarj3 Nov 23, 2020
14986ee
Merge pull request #32 from jwinchan/order_show
Schmarj3 Nov 23, 2020
227da0e
Update orderitem_test.rb
jwinchan Nov 23, 2020
bd3d54a
Merge pull request #34 from jwinchan/orderitem_create.v2
jwinchan Nov 23, 2020
dc3681a
Merge branch 'master' into orderitems_select_update
jwinchan Nov 23, 2020
031c5ca
Merge pull request #35 from jwinchan/orderitems_select_update
jwinchan Nov 23, 2020
45f3ff9
Merge branch 'master' into order_validates
jwinchan Nov 23, 2020
a68ec0b
Merge pull request #36 from jwinchan/order_validates
jwinchan Nov 23, 2020
4b17c01
Merge pull request #37 from jwinchan/product_relation_test
jwinchan Nov 23, 2020
0f8dbc6
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 23, 2020
daf4b39
fix syntax errors from order validates
ichbinorange Nov 23, 2020
2ac6161
revise User show render and tests by using perform_login
ichbinorange Nov 23, 2020
417f394
revise Product destroy render and revise tests for destroy and retire…
ichbinorange Nov 23, 2020
5c15bb5
revise Order show render and tests by using perform_login
ichbinorange Nov 23, 2020
c2c08b7
figure out how to fix the bug after merge
ichbinorange Nov 23, 2020
208328a
revise tests for create/shipped/cancelled in Orderitem by using perfo…
ichbinorange Nov 23, 2020
778d092
fix tests for Product relationships after merged
ichbinorange Nov 23, 2020
82be19d
add the feature - Filter orders displayed by status - on User show
ichbinorange Nov 24, 2020
4e7b37f
modified the drop down for all items in stock
Schmarj3 Nov 24, 2020
f93596d
fixed orderitem update code
Schmarj3 Nov 24, 2020
47d3ab5
add a method and its tests for feature - Filter orders displayed by s…
ichbinorange Nov 24, 2020
b979fd9
removed extra code from order item update
Schmarj3 Nov 24, 2020
a67dbe2
Merge branch 'orderitems_select_update' into orderitem_update
Schmarj3 Nov 24, 2020
b98de8c
added seed categories, updated product form, and reformatted cart view
jwinchan Nov 24, 2020
bbe7fdd
splited the user show page into dashboard/products/fulfillments
ichbinorange Nov 24, 2020
a729cdd
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 24, 2020
432a3e9
removed table from cart
jwinchan Nov 24, 2020
658792e
made changes to order_items update method and test
Schmarj3 Nov 24, 2020
58a2673
added payment and complete actions to orders controller and custom me…
Maha-ElMais Nov 24, 2020
f092c8b
updates routes and debugged validations
Maha-ElMais Nov 24, 2020
498b6d5
changed cart layout, added footer, and seeded category data
jwinchan Nov 24, 2020
48fce6c
Update orders_controller.rb
jwinchan Nov 24, 2020
896eb4b
Merge pull request #38 from jwinchan/user-index-show
jwinchan Nov 24, 2020
8e6af7a
Merge pull request #39 from jwinchan/product-destroy
jwinchan Nov 24, 2020
5dc5b98
Merge pull request #40 from jwinchan/order_show
jwinchan Nov 24, 2020
013dc55
Merge pull request #41 from jwinchan/orderitem_create.v2
jwinchan Nov 24, 2020
2524066
Merge pull request #42 from jwinchan/product_relation_test
jwinchan Nov 24, 2020
78175e0
Merge pull request #43 from jwinchan/orderitems_select_update
jwinchan Nov 24, 2020
366ffd0
Merge branch 'master' into orderitem_update
jwinchan Nov 24, 2020
4cb6009
Merge pull request #44 from jwinchan/orderitem_update
jwinchan Nov 24, 2020
d6a9047
Merge branch 'master' into category_to_product_v1
jwinchan Nov 24, 2020
3394b0d
Merge pull request #45 from jwinchan/category_to_product_v1
jwinchan Nov 24, 2020
ea73514
Merge branch 'master' into order_new
jwinchan Nov 24, 2020
042900b
Merge pull request #46 from jwinchan/order_new
jwinchan Nov 24, 2020
a9606f6
create routes for split User show
ichbinorange Nov 24, 2020
b589500
Merge pull request #47 from jwinchan/user-index-show
jwinchan Nov 24, 2020
5fd8557
fix order show page to have buyer info and fix the params for order c…
ichbinorange Nov 24, 2020
db940aa
add category to product on user show page
ichbinorange Nov 24, 2020
aa563e3
fix tests for order show after revise the action
ichbinorange Nov 24, 2020
f9b0107
added a confirmation page voew and a helper method for calculationg t…
Maha-ElMais Nov 24, 2020
c1d5489
Merge pull request #48 from jwinchan/order_show.v2
jwinchan Nov 24, 2020
aa34958
Merge branch 'master' into confirmation_view
jwinchan Nov 24, 2020
0d48204
Merge pull request #49 from jwinchan/confirmation_view
jwinchan Nov 24, 2020
3cd5bf5
generated controller and model for review
ichbinorange Nov 24, 2020
5c798dd
Merge branch 'master' of github.com:jwinchan/betsy
ichbinorange Nov 24, 2020
6599186
basic setup for review: methods in controller, relation with product,…
ichbinorange Nov 24, 2020
3fe132c
Merge pull request #50 from jwinchan/review
Maha-ElMais Nov 24, 2020
4ebf404
routes no change
Maha-ElMais Nov 24, 2020
88f23cf
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 24, 2020
00f7b3c
edited user validation, and error messages to show on edit form
jwinchan Nov 24, 2020
30bd239
added product_id column to reviews table
ichbinorange Nov 24, 2020
04d6694
changed styling in cart and footer, and added authorization checks fo…
jwinchan Nov 24, 2020
e010b7a
fixed cart view and added category button in new product
jwinchan Nov 24, 2020
3b6a0c8
Merge pull request #51 from jwinchan/review
Maha-ElMais Nov 25, 2020
ed41a5e
Merge branch 'master' of https://github.com/jwinchan/betsy
Maha-ElMais Nov 25, 2020
1342ac2
added review button to product show page
ichbinorange Nov 25, 2020
2519907
Merge pull request #53 from jwinchan/review
Maha-ElMais Nov 25, 2020
0df410e
created category controller
jwinchan Nov 25, 2020
8271b4c
create category method and validations
jwinchan Nov 25, 2020
6d1424f
_form and partial views for reviews
Maha-ElMais Nov 25, 2020
972f985
fixed double routes parameters issues
ichbinorange Nov 25, 2020
1de1cd8
added simplecov code to fix percentage covered
ichbinorange Nov 25, 2020
ef33de7
updated views for reviews and update product model validation
Maha-ElMais Nov 25, 2020
a8afee8
Merge pull request #55 from jwinchan/product_validation
ichbinorange Nov 25, 2020
2dadb60
Merge pull request #56 from jwinchan/review
Maha-ElMais Nov 25, 2020
8b8660b
changed styling in homepage
jwinchan Nov 25, 2020
3409454
Merge pull request #52 from jwinchan/users_validation
jwinchan Nov 25, 2020
e0b95e7
Merge branch 'master' into new_categories
jwinchan Nov 25, 2020
cb1a222
Merge pull request #54 from jwinchan/new_categories
jwinchan Nov 25, 2020
76cb8b9
Merge pull request #57 from jwinchan/styling_v2
jwinchan Nov 25, 2020
1ab3d37
corrected new category button
jwinchan Nov 25, 2020
6657f95
got rid of partial forms and made a new and edit forms
Maha-ElMais Nov 25, 2020
7a26ac1
fix url for the new/edit forms for review
ichbinorange Nov 25, 2020
d9715bd
Merge branch 'master' into _form_review
Maha-ElMais Nov 25, 2020
c53f862
Merge branch 'master' of github.com:jwinchan/betsy into review
ichbinorange Nov 25, 2020
7782ad5
Merge pull request #58 from jwinchan/_form_review
Maha-ElMais Nov 25, 2020
71b4819
fix merge conflicts
ichbinorange Nov 25, 2020
f5d00c3
Merge pull request #59 from jwinchan/review
Maha-ElMais Nov 25, 2020
d017f15
styled footer
jwinchan Nov 25, 2020
98ec6c3
removed over-nested routes for review actions
ichbinorange Nov 25, 2020
c81910e
changed nav bar styling and edited test for edit user
jwinchan Nov 25, 2020
c639fe7
untrue to branch name; changed a bunch of styling
jwinchan Nov 25, 2020
51891db
fixed all select filter for merchant and category
Schmarj3 Nov 25, 2020
90342b1
Merge pull request #60 from jwinchan/review
jwinchan Nov 25, 2020
25095a3
Merge branch 'master' into jess_test_v2
jwinchan Nov 25, 2020
9672c91
Merge pull request #61 from jwinchan/jess_test_v2
jwinchan Nov 25, 2020
48710b8
Merge branch 'master' into filter
jwinchan Nov 25, 2020
4fb6c6b
Merge pull request #62 from jwinchan/filter
jwinchan Nov 25, 2020
477b7fd
fixed merge overwrite for review button
jwinchan Nov 25, 2020
c102972
add Merchant couldn't review themselve
ichbinorange Nov 25, 2020
11b946c
added the money gem to format prices and revenue
Schmarj3 Nov 25, 2020
d8dfe3c
fixed product index page
jwinchan Nov 25, 2020
5b7947a
Merge pull request #63 from jwinchan/review
jwinchan Nov 25, 2020
3bd6957
Merge pull request #64 from jwinchan/add_money_gem
jwinchan Nov 25, 2020
cc5c051
Merge pull request #65 from jwinchan/jess_test_V3
jwinchan Nov 25, 2020
088d9f6
added styling to index product and confirmation page
jwinchan Nov 25, 2020
ec9da5a
fix footer position
ichbinorange Nov 25, 2020
cb2d724
changed csv for product seed data
jwinchan Nov 25, 2020
11c16a3
added zero stock notice on product show page
Schmarj3 Nov 25, 2020
322016f
changed card sizing, spotlight product, and header
jwinchan Nov 25, 2020
ba12708
changed styling for heading
jwinchan Nov 25, 2020
4b3a416
changed edit button
jwinchan Nov 25, 2020
42352f5
add grid on product show page
ichbinorange Nov 25, 2020
1670dcd
Merge pull request #66 from jwinchan/styling_v4
jwinchan Nov 25, 2020
09c6b97
Merge branch 'master' into css
jwinchan Nov 25, 2020
36a31c4
Merge pull request #67 from jwinchan/css
jwinchan Nov 25, 2020
4b54752
changed product sizing
jwinchan Nov 25, 2020
3d44a68
matched confirmation page to user stories
jwinchan Nov 25, 2020
4c1b3e2
Merge pull request #68 from jwinchan/confirmation_v2
jwinchan Nov 25, 2020
cacf4a5
css for shopping cart button
ichbinorange Nov 25, 2020
85a5f41
Merge branch 'master' of github.com:jwinchan/betsy into css
ichbinorange Nov 25, 2020
80559a2
Merge pull request #69 from jwinchan/css
jwinchan Nov 25, 2020
bb3cc3f
unskipped edit user test
jwinchan Nov 25, 2020
9855f1e
added cart tests
jwinchan Nov 25, 2020
8beca2f
add about us page
ichbinorange Nov 25, 2020
5b92f9a
added category relationships and validations tests for model
jwinchan Nov 25, 2020
4a42bec
Merge pull request #71 from jwinchan/split_merchant_page
jwinchan Nov 25, 2020
ba448fd
created validation tests for user model
jwinchan Nov 25, 2020
df810c8
edited about us page
jwinchan Nov 25, 2020
e8fe3f3
changed form styling
Schmarj3 Nov 25, 2020
8d44351
Merge pull request #74 from jwinchan/zero_stock
jwinchan Nov 25, 2020
90d6223
merged with master
jwinchan Nov 25, 2020
09d4300
add cc_cvv to orders table, add validates and revise order controller…
ichbinorange Nov 25, 2020
2f6b27e
changed product new test to account for login, created tests for user…
jwinchan Nov 25, 2020
0fa0f57
relationship tests for user
jwinchan Nov 26, 2020
ef69eb9
revise credit card expiration date format
ichbinorange Nov 26, 2020
d4c5d50
Merge pull request #70 from jwinchan/jess_tests_v3
jwinchan Nov 26, 2020
378152a
Merge pull request #72 from jwinchan/cart_tests
jwinchan Nov 26, 2020
5d693c7
Merge pull request #73 from jwinchan/user_model_test
jwinchan Nov 26, 2020
4b6b021
Merge pull request #75 from jwinchan/cc_cvv
jwinchan Nov 26, 2020
2a9e466
add tests for orderitem validates & relations
ichbinorange Nov 26, 2020
46844dd
tests for new/create for review
ichbinorange Nov 26, 2020
03bdc99
tests for edit/update for review
ichbinorange Nov 26, 2020
cf2f16c
tests for destroy for review
ichbinorange Nov 26, 2020
146a66b
tests for validates/relations for review
ichbinorange Nov 26, 2020
1070ace
updated products controller tests and method for show
jwinchan Nov 26, 2020
bb4adb9
corrected tests for edit product
jwinchan Nov 26, 2020
3bc42c1
edited update products tests
jwinchan Nov 26, 2020
0c7aa5b
Merge pull request #76 from jwinchan/orderitem_validates
jwinchan Nov 26, 2020
cd00a76
Merge pull request #77 from jwinchan/review
jwinchan Nov 26, 2020
68adcb2
Merge pull request #78 from jwinchan/product_controller_tests
jwinchan Nov 26, 2020
503e986
updated user tests
jwinchan Nov 26, 2020
f27ed22
created category controller tests
jwinchan Nov 26, 2020
0b3adb8
tested order_cart method from application controller
jwinchan Nov 26, 2020
b21758b
added destroy tests for orderitem
Schmarj3 Nov 26, 2020
ef244ae
tested custom modek methods for order
jwinchan Nov 26, 2020
9febbc3
added more custom method tests for order
jwinchan Nov 26, 2020
24d848f
finished order model tests
jwinchan Nov 26, 2020
33f8b83
Merge pull request #79 from jwinchan/jess_tests_v5
jwinchan Nov 26, 2020
0906ac9
Merge pull request #80 from jwinchan/write_orderitem_update_test
jwinchan Nov 26, 2020
2e1c302
Merge pull request #81 from jwinchan/order_model_tests
jwinchan Nov 26, 2020
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
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>
47 changes: 47 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# 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

# 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

# Ignore auto generated files
.generators
.idea/
.env

# Ignore simplecov
coverage/*

# Ignore ds.store
.DS_Store
6 changes: 6 additions & 0 deletions .idea/.gitignore

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

156 changes: 156 additions & 0 deletions .idea/betsy.iml

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

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

4 changes: 4 additions & 0 deletions .idea/misc.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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 @@
2.6.5
94 changes: 94 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem "faker"
gem "date"
gem "csv"

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', require: false

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]
end

group :development do
# Access an interactive console on exception pages or by calling 'console' anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '~> 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'
end

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of web drivers to run system tests with browsers
gem 'webdrivers'
end

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

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

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

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

group :test do
gem 'simplecov', require: false
end

group :development do
gem 'dotenv-rails'
end

gem "omniauth"
gem "omniauth-github"

gem "money"
Loading