Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
310 commits
Select commit Hold shift + click to select a range
86214b5
small tweaks to product validation
thenora Jun 12, 2020
0e65152
basic view for shopping cart
jesshliang Jun 12, 2020
7fef0e5
format cart page
jesshliang Jun 12, 2020
e8fdfe4
Merge pull request #9 from thenora/add-error-flash
jesshliang Jun 12, 2020
3b323b1
Merge branch 'master' into feat-basic-styling
thenora Jun 12, 2020
5b530f1
Merge pull request #10 from thenora/feat-basic-styling
thenora Jun 12, 2020
a2dde45
completed order items crud
katemyer Jun 12, 2020
defa0c5
corrected orderitem relation to product
katemyer Jun 12, 2020
921900b
show order with order items listed
katemyer Jun 12, 2020
3d78e3f
created order item seed data
katemyer Jun 12, 2020
189ace2
added order item script
katemyer Jun 12, 2020
e014cd2
renamed file contents are same
katemyer Jun 12, 2020
7e109ff
added destroy order method if order items == 0
katemyer Jun 12, 2020
12f7719
installed simplecov
thenora Jun 12, 2020
c92c75f
Added small changes
snowistaken Jun 12, 2020
0d18c41
Fixed merge conflict
snowistaken Jun 12, 2020
7b54858
Added merchant dashboard and merchant model validations
snowistaken Jun 12, 2020
6c4b25d
completed product data with plants
katemyer Jun 12, 2020
5669695
added merchant dashboard view, method & route
thenora Jun 12, 2020
6ab0afc
added add product form
thenora Jun 12, 2020
d5af19f
Merge branch 'master' into order-order-item-km-june11
katemyer Jun 12, 2020
1fec9eb
Merge pull request #11 from thenora/order-order-item-km-june11
katemyer Jun 12, 2020
d93a14f
Merge pull request #12 from thenora/add-product
katemyer Jun 12, 2020
b673624
fixed seed data images
jesshliang Jun 12, 2020
761b1f8
style product show page
jesshliang Jun 12, 2020
758e115
bug fixes in links, style products#index
jesshliang Jun 12, 2020
b89d149
edit seed data, fix redirects
jesshliang Jun 12, 2020
9ec36a5
Merge pull request #13 from thenora/feat-links-and-styles
thenora Jun 12, 2020
3885e9c
added-product-edit-view
thenora Jun 12, 2020
15e9704
can now edit a product
thenora Jun 12, 2020
6b16c4c
only show edit link on product page if merchant
thenora Jun 13, 2020
e7af113
tweaked product controller tests
thenora Jun 13, 2020
5567f41
created category relationship join tables
thenora Jun 13, 2020
3de1e02
added category seed
thenora Jun 13, 2020
daf6f05
added category resources to routes
thenora Jun 13, 2020
4db987f
created category controller
thenora Jun 13, 2020
b0a4774
added category controller methods
thenora Jun 13, 2020
cccb1ce
created category index
thenora Jun 13, 2020
0574a66
working on show category products
thenora Jun 13, 2020
1a3d90b
empty categories working
thenora Jun 13, 2020
058a78c
added categories to create product
thenora Jun 13, 2020
927394a
added default image to display
thenora Jun 13, 2020
b8b1c12
Merge pull request #14 from thenora/category-start
jesshliang Jun 13, 2020
929d7d3
fixed default image for category show
thenora Jun 13, 2020
7ad7bff
add way to change quantity of order item
jesshliang Jun 13, 2020
3ec4eeb
add logic for changing quantity
jesshliang Jun 13, 2020
7c6c007
model validations for an order
jesshliang Jun 14, 2020
d689188
add route for checkout, format form for checkout
jesshliang Jun 14, 2020
c6d5c63
confirmation route, also view your order items on checkout page
jesshliang Jun 14, 2020
f9329ee
add model method for total price
jesshliang Jun 14, 2020
624cba5
show total on checkout
jesshliang Jun 14, 2020
757ad64
confirmation of order page
jesshliang Jun 15, 2020
b916d1a
add logic to change inventory and status after checking out
jesshliang Jun 15, 2020
00cd694
Adding small changes so git will let me pull
snowistaken Jun 15, 2020
27154ac
If user is not logged in, added feature to deny them access to the da…
snowistaken Jun 15, 2020
bc5144a
Merge pull request #15 from thenora/feat-shopping-cart-purchase
thenora Jun 15, 2020
bcfff99
Fixed route for merchant dashboard. view currently broken
snowistaken Jun 15, 2020
23a6a70
Route details/merchant dashboard details
snowistaken Jun 15, 2020
bcbfa3b
correct total cost logic and clear session on order closing
jesshliang Jun 15, 2020
6cced37
fix order status on confirmation
jesshliang Jun 15, 2020
b6c233a
add state to order
jesshliang Jun 15, 2020
b1f3131
cannot add products to the cart that are out of stock
jesshliang Jun 16, 2020
5bb3091
cannot edit quantity of item in cart if there is not enough inventory…
jesshliang Jun 16, 2020
e546211
update logic to check inventory before checking
jesshliang Jun 16, 2020
f9d05a4
orders#index testing
jesshliang Jun 16, 2020
d273d53
orders#show testing
jesshliang Jun 16, 2020
eae7618
model tests passing: order item
katemyer Jun 16, 2020
81822d7
craeted fixtures: order items
katemyer Jun 16, 2020
d552ca6
orders#update testing
jesshliang Jun 16, 2020
f048954
orders#checkout testing
jesshliang Jun 16, 2020
efde3bd
orders#confirmation testing
jesshliang Jun 16, 2020
e6d384d
change some redirects to block access if cart is not ready
jesshliang Jun 16, 2020
626ee60
category product seeds working!
thenora Jun 16, 2020
a2c925f
made category show page match product index
thenora Jun 16, 2020
18a6e76
Merge pull request #16 from thenora/feat-more-cart-more-testing
thenora Jun 16, 2020
353db1d
heading tweaks
thenora Jun 16, 2020
cf56988
added merchant index routes and links
thenora Jun 16, 2020
b12692e
order fixtures
katemyer Jun 16, 2020
6b5361d
added merchants to product id
thenora Jun 16, 2020
83347ec
Fixed merchant dashboard
snowistaken Jun 16, 2020
363c24c
Merge pull request #17 from thenora/category-product-seed
katemyer Jun 16, 2020
2ded252
cannot add product if 0 or nil
jesshliang Jun 16, 2020
71205fa
fix issues using 'head'
jesshliang Jun 16, 2020
f3ce8bf
change the way session is stored
jesshliang Jun 16, 2020
49a502c
if this item already exists in cart, change quantity instead of addin…
jesshliang Jun 16, 2020
ddfe5da
Merge pull request #18 from thenora/feat-checkout-bug-fixes-session
katemyer Jun 16, 2020
e04388a
change model method format
jesshliang Jun 16, 2020
5e0eb60
Stopped tracking .env File
jesshliang Jun 16, 2020
2619441
Model test validations: Order done + passing
katemyer Jun 16, 2020
ba4bedb
add background img, change colors
jesshliang Jun 16, 2020
f880e37
change more colors, shaddow to header
jesshliang Jun 16, 2020
2ab8e0b
move around heights
jesshliang Jun 16, 2020
429277a
Merge branch 'master' into order-model-tests-km
jesshliang Jun 16, 2020
ba25e83
Merge pull request #19 from thenora/order-model-tests-km
jesshliang Jun 16, 2020
647d927
test state
jesshliang Jun 16, 2020
29582f5
controller test: homepage
katemyer Jun 16, 2020
54fd5ac
Merge pull request #20 from thenora/feat-final-styling
thenora Jun 16, 2020
29b4f30
Wandering Dude
thenora Jun 16, 2020
97256ab
Merge branch 'master' of github.com:thenora/betsy
jesshliang Jun 16, 2020
e99423d
test purchase changes
jesshliang Jun 16, 2020
ef85e5b
one test fix
jesshliang Jun 16, 2020
dae4dd9
add method to find cart item count
jesshliang Jun 16, 2020
efd0fcb
test cart item count
jesshliang Jun 17, 2020
f90a199
test adjustments, update simplecov
jesshliang Jun 17, 2020
23dca51
Restyled by rubocop
restyled-commits Jun 17, 2020
2d7f271
Restyled by whitespace
restyled-commits Jun 17, 2020
f6fe23f
fixed name issue
thenora Jun 17, 2020
662ee1b
Merge pull request #22 from thenora/restyled/more-testing-and-simplecov
thenora Jun 17, 2020
6a1a48e
Merge pull request #23 from thenora/merchant-view
jesshliang Jun 17, 2020
abe0b8d
Merge pull request #21 from thenora/more-testing-and-simplecov
thenora Jun 17, 2020
10563cb
small word tweak
thenora Jun 17, 2020
6a5eb45
deleted extra table
thenora Jun 17, 2020
e99534a
removed products from product cat relationships
thenora Jun 17, 2020
e6b647e
added nested route fx to order items index
katemyer Jun 17, 2020
8e04fb5
changed relations to: product has many order items
katemyer Jun 17, 2020
1eb1fe6
added nested route notes for myself
katemyer Jun 17, 2020
e0bee0c
Merge pull request #25 from thenora/seed-schema-tweaks
katemyer Jun 17, 2020
6defe10
fix logic for cart_item_count
jesshliang Jun 17, 2020
9d82283
Merge remote-tracking branch 'origin/merchant-features'
jesshliang Jun 17, 2020
eb2d605
fixed seed
thenora Jun 17, 2020
5e2986e
seed tweak
thenora Jun 17, 2020
1d34601
and again a seed tweak
thenora Jun 17, 2020
71deaa4
controller tests: order items - index and create.
katemyer Jun 17, 2020
fe2c9d6
added some notes for self
katemyer Jun 17, 2020
3f4f9d3
add new category form and dashboard link
thenora Jun 17, 2020
c5aabf4
Merge branch 'master' into order-items-controller-tests-km
thenora Jun 17, 2020
6f7b3d8
Merge pull request #27 from thenora/order-items-controller-tests-km
thenora Jun 17, 2020
b28b867
added some fixture relationships
thenora Jun 17, 2020
c4362c0
require_login method & skip_before on controllers
thenora Jun 17, 2020
362da42
Merge pull request #28 from thenora/add-new-category
jesshliang Jun 17, 2020
9183143
Merge branch 'master' into add-new-fixture-relationships
jesshliang Jun 17, 2020
db73712
Merge pull request #29 from thenora/add-new-fixture-relationships
jesshliang Jun 17, 2020
aa8179c
Merge pull request #30 from thenora/require_login_skip_login
jesshliang Jun 17, 2020
22de645
merchant tweaks to name vs nickname
thenora Jun 17, 2020
e24ac23
Merge branch 'master' of https://github.com/thenora/betsy
thenora Jun 17, 2020
7bbcb5d
test changes for order items controller
katemyer Jun 17, 2020
ae56277
Merge pull request #31 from thenora/controller-order-items-tests-km
katemyer Jun 17, 2020
52d61af
fixed user to merchant
thenora Jun 17, 2020
209a169
Merge branch 'master' of https://github.com/thenora/betsy
thenora Jun 17, 2020
04a2c07
merchant relations with orderitems fixed
katemyer Jun 17, 2020
80617f1
fixed relations
katemyer Jun 17, 2020
ab20556
fixed order items yml and initial cont test
katemyer Jun 17, 2020
be74168
Merge pull request #32 from thenora/controller-test--order-items
jesshliang Jun 17, 2020
06de97c
add review relationship + view update
jesshliang Jun 17, 2020
014308e
added todo comments
thenora Jun 17, 2020
10d097a
Merge branch 'master' of https://github.com/thenora/betsy
thenora Jun 17, 2020
977c999
only display active products in full products list
thenora Jun 17, 2020
cca5a85
add active checkbox to prooduct form
thenora Jun 17, 2020
b86b208
hide inactive product page if not creator
thenora Jun 17, 2020
88370cd
add review section to product page
jesshliang Jun 17, 2020
3ee2a79
generate reviews controller
jesshliang Jun 17, 2020
ee56504
relate reviews to product
jesshliang Jun 17, 2020
6dad8a0
only show active plants on cat/merch lists
thenora Jun 17, 2020
f801751
Merge pull request #33 from thenora/product-status
katemyer Jun 17, 2020
3cf07b5
styling
jesshliang Jun 17, 2020
36e00b7
add validations
jesshliang Jun 17, 2020
91f8a00
fixtures + cannot leave review if you are the product's merchant
jesshliang Jun 17, 2020
bacf393
destroy test created, passing
katemyer Jun 17, 2020
54a4f68
test for update method complete and passing
katemyer Jun 18, 2020
8d0c999
Merge pull request #34 from thenora/orderitem-controller-test-for-upd…
thenora Jun 18, 2020
678c397
controller tests for reviews
jesshliang Jun 18, 2020
27b00fd
Started implementing merchant's total revenue method. Also prevents n…
snowistaken Jun 18, 2020
77d4173
Merge branch 'master' of https://github.com/thenora/betsy into mercha…
snowistaken Jun 18, 2020
138ff07
clean up
jesshliang Jun 18, 2020
11f8384
Merge branch 'master' into feat-reviews-initial
thenora Jun 18, 2020
f60b6e2
Merge pull request #35 from thenora/feat-reviews-initial
thenora Jun 18, 2020
0626b9c
model testing for reviews
jesshliang Jun 18, 2020
1f7903c
added soldout display for inventory 0
thenora Jun 18, 2020
c022ff6
cart bug fixes + test fixes
jesshliang Jun 18, 2020
b409aa2
Merge pull request #36 from thenora/sold-out
jesshliang Jun 18, 2020
f83d01a
test coverage
jesshliang Jun 18, 2020
a320263
check product inventory custom method test
katemyer Jun 18, 2020
b6029bb
only add review of rating 1 to 5
jesshliang Jun 18, 2020
1d3aad2
Added logic to show orders for the logged in merchant on the order pa…
snowistaken Jun 18, 2020
8c828cd
show number of stars depending on rating
jesshliang Jun 18, 2020
e73f26d
Merge pull request #37 from thenora/merchant-security
jesshliang Jun 18, 2020
27c58b7
Removed unnecessary comments in merchant controller
snowistaken Jun 18, 2020
666798c
Merge pull request #38 from thenora/merchant-security
thenora Jun 18, 2020
7b90bb5
undid merge
thenora Jun 18, 2020
4066f26
drop down select rating
jesshliang Jun 18, 2020
2609024
Merge branch 'master' into feat-reviews-second-round-and-more
thenora Jun 18, 2020
57df5f2
Merge pull request #39 from thenora/feat-reviews-second-round-and-more
thenora Jun 18, 2020
fddc724
Merge branch 'master' of https://github.com/thenora/betsy
thenora Jun 18, 2020
1fc4b32
changed user to merchant
thenora Jun 18, 2020
f1e5539
Merge pull request #40 from thenora/user-merchant-mixups
thenora Jun 18, 2020
0873cab
dry up create, modify valids
jesshliang Jun 18, 2020
5ed7dde
add and reduce inventory custom method tests
katemyer Jun 18, 2020
14d67db
spacing and cleanup
jesshliang Jun 18, 2020
c11b94c
added login and updated lots of things
thenora Jun 18, 2020
bc164cc
Merge pull request #41 from thenora/dry-up-orders-order-items
katemyer Jun 18, 2020
c86181d
so many tests
thenora Jun 18, 2020
fa64308
todo: check order item existence test
katemyer Jun 18, 2020
9649728
Merge branch 'master' into order-item-model-custom-method-tests
thenora Jun 18, 2020
c1b6831
Merge pull request #42 from thenora/order-item-model-custom-method-tests
thenora Jun 18, 2020
78a27c1
Merge branch 'master' of https://github.com/thenora/betsy into produc…
katemyer Jun 18, 2020
b033df4
fixed some order tests
katemyer Jun 18, 2020
e2bd599
Merge pull request #43 from thenora/product_controller_tests_with_login
katemyer Jun 18, 2020
7b10800
change view for order
jesshliang Jun 18, 2020
491ed44
order controller filter
katemyer Jun 18, 2020
309bcb0
Merge pull request #44 from thenora/orders-filter
jesshliang Jun 18, 2020
ceb3aa0
order items filters with some little other fixes
katemyer Jun 18, 2020
bdf7a65
do not add product if retired
jesshliang Jun 18, 2020
b2e5de9
cover edge cases for checking product inventory
jesshliang Jun 18, 2020
4cedf9b
adjust add inventory test
jesshliang Jun 18, 2020
4eec089
Merge pull request #45 from thenora/order-items-filter
jesshliang Jun 18, 2020
e975673
test check existence of item in cart already func
jesshliang Jun 18, 2020
59405df
simple cov order items controller test up to 100%
katemyer Jun 18, 2020
b73cef2
added a clarifying comment, do not remove
katemyer Jun 18, 2020
d0f1eea
Merge pull request #46 from thenora/jessica-more-testing-thurs
katemyer Jun 18, 2020
396ad86
Merge pull request #47 from thenora/simple-cov-order-items-controller…
jesshliang Jun 18, 2020
33fa77b
A merchant can no longer view an order page for an order that they do…
snowistaken Jun 18, 2020
0b908ee
filter bug
jesshliang Jun 18, 2020
c62dc85
Merge branch 'master' of https://github.com/thenora/betsy into mercha…
snowistaken Jun 18, 2020
789fe29
Hid all but last 4 digits of customer card number on order page
snowistaken Jun 18, 2020
17f218a
Added status to order items schema
snowistaken Jun 18, 2020
df41246
Edited seed data to include fulfillment status
snowistaken Jun 18, 2020
d0b0b07
tests
thenora Jun 18, 2020
0816efa
Merge pull request #48 from thenora/category-controller-tests
jesshliang Jun 18, 2020
7f497c0
Started forum for changing status of an order on merchant dashboard
snowistaken Jun 18, 2020
5ce8410
order controllers update test PASSING
katemyer Jun 18, 2020
8b1a51b
Merge pull request #49 from thenora/order-controller-update-test
katemyer Jun 18, 2020
5c24433
continuing to add on to status change form
snowistaken Jun 18, 2020
ebae330
migration fix
jesshliang Jun 18, 2020
bf7dd45
migration fix
jesshliang Jun 18, 2020
d6e13a2
migration fix
jesshliang Jun 18, 2020
b913203
drop file
jesshliang Jun 19, 2020
30c7dc2
drop file
jesshliang Jun 19, 2020
3e04a21
route cleanup
jesshliang Jun 19, 2020
bb337c3
categories routes
jesshliang Jun 19, 2020
cd2f97c
more routes changes
jesshliang Jun 19, 2020
03c4bef
removed todo on cat controller
thenora Jun 19, 2020
72f4a29
added controller filter & removed destroy
thenora Jun 19, 2020
aac9b8c
removed TODO
thenora Jun 19, 2020
9d74700
schema
thenora Jun 19, 2020
5deb549
removed TODO
thenora Jun 19, 2020
360e086
deleted duplicate params
thenora Jun 19, 2020
d5c8b45
removed comment
thenora Jun 19, 2020
d253deb
Merge branch 'master' of https://github.com/thenora/betsy
thenora Jun 19, 2020
1c41549
simple cov order controller test 90%
katemyer Jun 19, 2020
32d83fa
Merge pull request #50 from thenora/nora-clean-up
katemyer Jun 19, 2020
aa090a7
Merge pull request #51 from thenora/simple-cov-order-controller-test
thenora Jun 19, 2020
6ce4c44
clean up spacing and empty lines
jesshliang Jun 19, 2020
69f2430
p statement cleanup
jesshliang Jun 19, 2020
9a19c55
Merge pull request #52 from thenora/jessica-misc-final-changes
katemyer Jun 19, 2020
7ffb6cd
Finished status form and dahsboard view
snowistaken Jun 19, 2020
678f544
Merge branch 'master' into merchant-order-status
jesshliang Jun 19, 2020
55900c9
Merge pull request #53 from thenora/merchant-order-status
jesshliang Jun 19, 2020
0c0f662
fix button color
jesshliang Jun 19, 2020
9d6b780
final PR
katemyer Jun 19, 2020
02317be
Merge pull request #54 from thenora/pullrequest-template
katemyer Jun 19, 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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.env
24 changes: 16 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,20 @@ Congratulations! You're submitting your assignment. Please reflect on the assign
Prompt | Response
--- | ---
Each team member: what is one thing you were primarily responsible for that you're proud of? |
Kate: I was in charge of completing all the model validations, custom mode methods testing. I helped Jessica with order and order_item controller testing as well as doing parts of the crud for these controllers. Most proud of writing tests to pass getting simplecov to 90-100% for these controllers and models.
Nora: I made all the product display pages, including for category and merchant. I also did all the related controller testing. The thing I’m most proud of though is finally realizing how simple controller filters can be and actually using one.
Jessica:I worked primarily on the cart and checkout process. I am most proud that I was able to make it function! I also did the styling and my team thinks it looks very Pinterest worthy!!
Emily: I am proud of how the merchant dashboard turned out because I added several features that were outside of my knowledge. I learned a lot of new tools that will be helpful for future projects. |
Each team member: what is one thing you were primarily responsible for that you would like targeted feedback on? |
How did your team break up the work to be done? |
How did your team utilize git to collaborate? |
What did your group do to try to keep your code DRY while many people collaborated on it? |
What was a technical challenge that you faced as a group? |
What was a team/personal challenge that you faced as a group? |
What was your application's ERD? (upload this to Google Drive, change the share settings to viewable by everyone with a link, and include a link) |
What is your Trello URL? |
What is the Heroku URL of your deployed application? |
Kate: Since I mostly worked on tests, I would like feedback on how to do tests for sessions as that was one that was a difficult to wrap my head around. I understood what was happening in the methods that were written in the controllers but wasn't able to get that last 10% coverage in the order controller.
Jessica: The check out process.
Emily: Styling for the merchant dashboard.
Nora: Product controller testing. |
How did your team break up the work to be done? | We made an ERD first, then we went through the user stories to develop our Trello board. We pretty much just started grabbing parts that we thought were interesting to us and ran with tasks related to those parts. We were committed to daily standups to share our progress, what we were going to work on next, and any help we needed. |
How did your team utilize git to collaborate? | We were really amazing honestly at being diligent about creating branches when we worked on a feature. We had great communication when we submitted a PR and another team member quickly came in to check and merge. We then were great at pulling from the master and using branches for each new feature. In the grand scheme of git hygeine, we did well but sometimes we got caught up and did not commit as frequently. There was an incident where there was a merge conflict but Jessica and Nora were able to quickly mend the issue. |
What did your group do to try to keep your code DRY while many people collaborated on it? | Because we were able to work on our parts "seperately" and were great about continually meeting and merging, we managed to keep the code DRY throughout. However, we did our DRY-ing and cleaning up at the end. The code production was deliberately careful and thought out as much as possible. With our testing, we were able to consistently use the fixtures we created. |
What was a technical challenge that you faced as a group? | Deploying to Heroku was much more involved than we initially thought! DEPLOY EARLY, DEPLOY OFTEN! |
What was a team/personal challenge that you faced as a group? | This project was enormous and at different parts of the project, it felt like one or two people were getting doing the brunt of the work. Then towards the middle, things picked up for all of us, and at the end, we all came together to wrap things up really nicely. Our team was available for help, someone was there to jump in to help at all times even super late into the night. Couldn't have asked for a better team, we really did it! |
What was your application's ERD? (upload this to Google Drive, change the share settings to viewable by everyone with a link, and include a link) | https://drive.google.com/file/d/1RNkK9Z238OJaRnywiimgJSBKwnno-Mz1/view?usp=sharing |
What is your Trello URL? | https://trello.com/b/moXn53QI/plantsy|
What is the Heroku URL of your deployed application? | https://plantsy-2020.herokuapp.com/|
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# 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

.env

coverage/*
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
123,125
87 changes: 87 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
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.1'
# 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'

# 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'
gem 'dotenv-rails'
end

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


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

gem "omniauth"
gem "omniauth-github"
Loading