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

Ampers: Fur-eign Keys #27

Open
wants to merge 358 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
358 commits
Select commit Hold shift + click to select a range
2a3be8e
add toggle is active test and method
MonalisaC Apr 23, 2018
1636d93
Add view for homepage
2020dream Apr 23, 2018
079df00
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 23, 2018
343723a
Implement Retire and Reactivate buttons on user account page
2020dream Apr 23, 2018
fdda17f
add_to_cart method in Products controller is starting to work.
Lasiorhine Apr 23, 2018
4fa40f3
beginning of a button_to for adding to cart for the products show page.
Lasiorhine Apr 23, 2018
791eefe
Resolved potential merge conflict after pulling from master
Lasiorhine Apr 23, 2018
83d78ed
Deleted and regenerated Gemfile.lock because everything suddenly went…
Lasiorhine Apr 23, 2018
79a4a62
added homepage controller and route
SelamawitA Apr 23, 2018
c92d1a0
Merge branch 'master' of https://github.com/choricao/betsy
SelamawitA Apr 23, 2018
5139b36
Vary basic cart is working, can can be viewed from the cart button in…
Lasiorhine Apr 23, 2018
8d1e18b
When a duplicate item is added to the cart, the quantity now goes up,…
Lasiorhine Apr 23, 2018
c2db026
Discard date for data_select
2020dream Apr 23, 2018
34f3b1d
Homepage: add outfits, toys & categories; collect images for carousal
2020dream Apr 23, 2018
f4cf80a
Add carousal images
2020dream Apr 23, 2018
1264eec
Add dog-with-keys image to footer yay
2020dream Apr 23, 2018
07eccf0
Initial cart controller created
Lasiorhine Apr 23, 2018
0100daf
Steps w/re routing and controller method creation toward having a New…
Lasiorhine Apr 23, 2018
c0c6af0
methods and tests for top seller and can cancel
MonalisaC Apr 23, 2018
f888233
Merge branch 'modeltesting'
MonalisaC Apr 23, 2018
448a0ef
Add search box on Products#index & it workedgit add .
2020dream Apr 23, 2018
5fb5a6f
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 23, 2018
3c16e28
Add popular list
2020dream Apr 23, 2018
d4b7c41
Messing around with the cart controller on my own.
Lasiorhine Apr 23, 2018
1371ad3
Add status filter on Users#show, statistics is working properly
2020dream Apr 23, 2018
2cae41e
Update Cancel on confirmation page using custom method can_cancel
2020dream Apr 23, 2018
b132945
Link Cancel button
2020dream Apr 23, 2018
0553c31
Add product buttons in both products show and products index pages ar…
Lasiorhine Apr 23, 2018
175ca2d
search method and tests
MonalisaC Apr 23, 2018
9ec22fa
Move search button to right side of search box
2020dream Apr 23, 2018
428d63e
Cart's add_products method is working again, after having failed in t…
Lasiorhine Apr 23, 2018
a206b50
list of all orders and by status method and tests
MonalisaC Apr 23, 2018
1e2355d
attempts with cart
SelamawitA Apr 24, 2018
88a4498
Beginning to work on the Destroy method for the cart controller again.
Lasiorhine Apr 24, 2018
3f5eec0
merged in Selam's evening work.
Lasiorhine Apr 24, 2018
7cb92c6
Update homepage: customize carousal, rearrange lists
2020dream Apr 24, 2018
15a8aae
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 24, 2018
d50e3e8
Implement status filter with right data
2020dream Apr 24, 2018
38a6efa
Minor changes on user account page
2020dream Apr 24, 2018
736ca94
Got the quantity update and cart-emptying buttons to work.
Lasiorhine Apr 24, 2018
5b893ac
change data in seed
MonalisaC Apr 24, 2018
fc77c20
Merge branch 'master' of https://github.com/choricao/betsy
MonalisaC Apr 24, 2018
8ae069e
mechanism for deleting individual items from the cart is now working.
Lasiorhine Apr 24, 2018
ee5e15a
Fix bug (retired products show up) on homepage
2020dream Apr 24, 2018
358e1b7
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 24, 2018
c83c1c8
Resolved merge conflicts after pulling from Origin Master
Lasiorhine Apr 24, 2018
ca991e1
Got the duplicate-handling / stock level comparison logic working in …
Lasiorhine Apr 24, 2018
e417d4f
Update search box: use model method and make search case insensitive
2020dream Apr 24, 2018
b8fc762
progress toward getting the 'place order' button to work in the Cart …
Lasiorhine Apr 24, 2018
8734d71
Merge branch 'master' of https://github.com/choricao/betsy into VEG_c…
Lasiorhine Apr 24, 2018
f894ae7
Removed old 'add products' method from the products controller
Lasiorhine Apr 24, 2018
c36d963
flash messages now working.
Lasiorhine Apr 24, 2018
9ddc3cd
Update homepage design: use food for third list, design nav bar for s…
2020dream Apr 24, 2018
9f6b0c2
an updated commit message
2020dream Apr 24, 2018
361ade1
Fix conflicts
2020dream Apr 24, 2018
a3ad041
Solve heroku push error by adding curly brace
2020dream Apr 24, 2018
a6cb44b
Set up client-side-validations
2020dream Apr 24, 2018
595d095
Changes to Orders to attempt to save the input from the shipping form…
Lasiorhine Apr 24, 2018
846504c
resolved minor merge conflict after pull from origin master.
Lasiorhine Apr 24, 2018
4cea003
Fix initializers bug
2020dream Apr 24, 2018
bf82641
Style client side validation messages
2020dream Apr 24, 2018
1101924
Merge branch 'client-side-validations'
2020dream Apr 24, 2018
3aa786f
Update header for mobile design
2020dream Apr 24, 2018
7896cce
Fix header white margin bug
2020dream Apr 24, 2018
5dd4b77
render-404 custom method
MonalisaC Apr 24, 2018
968e367
Add categories controoler test
MonalisaC Apr 24, 2018
efa7692
Fixed bug and user controller test, tests passing
MonalisaC Apr 24, 2018
2ee2d48
Merge branch 'cu_test'
MonalisaC Apr 24, 2018
f586765
Mobile design for pages without tables
2020dream Apr 24, 2018
c7d3db0
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 24, 2018
5d671ff
Got the cart-specific update method working, along with the flash mes…
Lasiorhine Apr 24, 2018
54de942
Hide categories on homepage for cell phone
2020dream Apr 24, 2018
b5daa61
Mobile design for table on user account page
2020dream Apr 24, 2018
c866fc6
Mobile design: header fonts updated
2020dream Apr 24, 2018
0c46afd
added introductory tests for order controller, added 404_not found me…
SelamawitA Apr 24, 2018
41f86a6
Mobile design: transpose customer table on order details page
2020dream Apr 24, 2018
7f163be
Update user account page: Update disabled when product is retired
2020dream Apr 24, 2018
062444c
removed position of helper method in update
SelamawitA Apr 24, 2018
640b566
Got the cart controller's access_cart method to properly display the …
Lasiorhine Apr 24, 2018
580e2b0
updated destroy and cancel tests and controller methods with 404 mess…
SelamawitA Apr 24, 2018
e121dbc
update to edit testing - confirm render form with edit inputs and 404…
SelamawitA Apr 24, 2018
a6d9211
The cart is now fully working. There may be some bugs, and there may…
Lasiorhine Apr 24, 2018
b28d07c
MaMerge branch 'master' of https://github.com/choricao/betsy into VEG…
Lasiorhine Apr 24, 2018
ede465a
Update cart with basic design, disable validation for expiry temporarily
2020dream Apr 25, 2018
c80915a
Account Page button is linked, Puppsy is linked to homepage
2020dream Apr 25, 2018
967fc8d
Updates to flash messages and formats for nearly all controllers.
Lasiorhine Apr 25, 2018
8a455fb
Merge branch 'master' of https://github.com/choricao/betsy
Lasiorhine Apr 25, 2018
b79af74
Add expiry validation
MonalisaC Apr 25, 2018
33fc25a
Merge branch 'modeltesting'
MonalisaC Apr 25, 2018
f66b2f8
Temporarily commented out test because code is commented
MonalisaC Apr 25, 2018
6224011
Order update method is partially functioning - there is a big for upd…
SelamawitA Apr 25, 2018
2ee2c0b
Add user image
MonalisaC Apr 25, 2018
04aa7a6
Refactor CSS file
2020dream Apr 25, 2018
042bb34
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 25, 2018
3753cd9
tests pass for order controller, updates still needed in Order#Update…
SelamawitA Apr 25, 2018
493db75
Update width of search box
2020dream Apr 25, 2018
0bfd2bc
Uncommented validation
MonalisaC Apr 25, 2018
3644830
Add username on account page
2020dream Apr 25, 2018
98f5963
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 25, 2018
110624e
Format expiry on order details page: mm/yyyy
2020dream Apr 25, 2018
a7522d6
Add user link on product details page
2020dream Apr 25, 2018
140d04c
Change unit of price input to dollar, and update controller method
2020dream Apr 25, 2018
5abe8f9
Show message when search result is empty on All Products page
2020dream Apr 25, 2018
4b1c40f
Add product name on Home page. Will use partial to show more informat…
2020dream Apr 25, 2018
7cb9b2c
Added the mocking setup to the test helper file.
Lasiorhine Apr 25, 2018
71988fd
Fix image bug with placeholder image
2020dream Apr 25, 2018
e33ddf4
removed unused routes from reviews controller
SelamawitA Apr 25, 2018
d0f29b8
Update cart page with basic design
2020dream Apr 25, 2018
62bdc86
first tests for the OAuth login method are written, and either passin…
Lasiorhine Apr 25, 2018
4325f24
More design on cart page
2020dream Apr 25, 2018
27b3c58
Revision of first Oauth login test.
Lasiorhine Apr 25, 2018
47b1f5c
Style flash messages
2020dream Apr 25, 2018
c5be4c6
mocking hash and first Oauth login test are finally right.
Lasiorhine Apr 25, 2018
d5c2bb7
Pausing in the middle of testing so that we can deal with something e…
Lasiorhine Apr 25, 2018
7f49d48
Took Kai's advice about forcing SSL
Lasiorhine Apr 25, 2018
2e02f92
Merge branch 'master' of https://github.com/choricao/betsy into Oauth…
Lasiorhine Apr 25, 2018
9cf9682
First two Oauth login tests are now working (and passing) at the same…
Lasiorhine Apr 25, 2018
e00bf5c
fixed bug got a date from date select
MonalisaC Apr 25, 2018
81cb6d0
Finish mobile design for cart
2020dream Apr 25, 2018
b54efba
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 25, 2018
984d569
Wrote test
MonalisaC Apr 25, 2018
f3fb766
Fixed bug expiry cann't be in past was not validating and wrote custo…
MonalisaC Apr 25, 2018
ee81588
Change button name on cart to make it compact and clear
2020dream Apr 25, 2018
31e3a54
All three tests of the login are now working.
Lasiorhine Apr 25, 2018
7201d61
Merge branch 'controllersandmodels'
MonalisaC Apr 25, 2018
cf0880e
logout tests now passing after appropriate failure.
Lasiorhine Apr 25, 2018
147a762
added create testing for products controller
SelamawitA Apr 25, 2018
f6f6eab
Test for session - new method is now passing, after an appropriate fa…
Lasiorhine Apr 25, 2018
5a42a04
Additional test for Login method in sessions controller is passing.
Lasiorhine Apr 25, 2018
a45d881
Got the last of the login tests working, against all odds.
Lasiorhine Apr 26, 2018
ed1aad9
All the freaking sessions controller tests are freaking working.
Lasiorhine Apr 26, 2018
1048ed4
Merge branch 'master' of https://github.com/choricao/betsy into Oauth…
Lasiorhine Apr 26, 2018
fd306e3
removed a test from the Users Controller Test document that didn't ne…
Lasiorhine Apr 26, 2018
abeff16
removed pry requirements from a couple of documents.
Lasiorhine Apr 26, 2018
ed66666
stubbed cart controller tests and added 'require pry' statements wher…
Lasiorhine Apr 26, 2018
1290601
adding testing for products controller, will look into more edge cases.
SelamawitA Apr 26, 2018
ae1f7e1
Fix Mark Shipped button on account page
2020dream Apr 26, 2018
d339766
Resolving potential conflicts proactively
Lasiorhine Apr 26, 2018
d8a2413
fixed merge conflicts
SelamawitA Apr 26, 2018
f951656
updated merge conflict
SelamawitA Apr 26, 2018
49c981a
Avoiding future conflicts and duplicated work
Lasiorhine Apr 26, 2018
f7294c4
Continuing the process of stubbing cart controller tests, now with up…
Lasiorhine Apr 26, 2018
3058f7c
Hide PLACE ORDER if name is empty, show empty page message after empt…
2020dream Apr 26, 2018
fb492de
Update stock based on order confirm and cancel
MonalisaC Apr 26, 2018
0c99761
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 26, 2018
e7a45fc
made adjustments based on modified orders controller
SelamawitA Apr 26, 2018
684158d
updated tests/controllers after merge related failures.
SelamawitA Apr 26, 2018
c8d5430
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 26, 2018
1f63314
Resolved merge conflict
MonalisaC Apr 26, 2018
c39b864
Merging because that's what you do.
Lasiorhine Apr 26, 2018
bd1e037
Committing because I'm going home and I don't want to mess anything u…
Lasiorhine Apr 26, 2018
9e67739
Clean up code in comments and label unused views
2020dream Apr 26, 2018
aefe41a
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 26, 2018
3e7b35f
Testing photo urls
MonalisaC Apr 26, 2018
75cff36
Merge latest
MonalisaC Apr 26, 2018
4444bb7
fixed cancel text
SelamawitA Apr 26, 2018
02343b6
nominal test cases for order updated and passing
SelamawitA Apr 26, 2018
c174635
Merging because merging happens.
Lasiorhine Apr 26, 2018
561d563
Merge branch 'master' of https://github.com/choricao/betsy
MonalisaC Apr 26, 2018
04928cd
Fix cancel bug
2020dream Apr 26, 2018
0a75708
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 26, 2018
7fd244b
Merge branch 'master' of https://github.com/choricao/betsy
MonalisaC Apr 26, 2018
1c36720
Fix cart name check
MonalisaC Apr 26, 2018
1bc47b7
Fix search and filter bug
2020dream Apr 26, 2018
a809d0a
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 26, 2018
09bcbb5
very simple bug fixes, mostly to do with extra of missing 'end' state…
Lasiorhine Apr 26, 2018
0e9faf5
Merging again.
Lasiorhine Apr 26, 2018
7c0bf19
Switched to order cancel again and added missing end
MonalisaC Apr 26, 2018
4f13c67
Some more tests
MonalisaC Apr 26, 2018
753478e
Removed binding.pry
MonalisaC Apr 26, 2018
0bbc5e1
First cart controller method's tests are passing.
Lasiorhine Apr 26, 2018
d90f4ee
First test of Add Product is passing, after first failing appropriately.
Lasiorhine Apr 26, 2018
63da27b
second test for the add_to_cart controller method for Cart is written…
Lasiorhine Apr 26, 2018
23e6611
local images
MonalisaC Apr 26, 2018
da77a34
fix cart bug
MonalisaC Apr 26, 2018
e13d973
three out of six add_to_cart tests for Cart controller are now passin…
Lasiorhine Apr 26, 2018
f4bcf4a
Fourth of six cart controller methods is now passing tests, after app…
Lasiorhine Apr 26, 2018
7880c45
Four of six tests for 'add product' in the Cart controller are writte…
Lasiorhine Apr 26, 2018
e66de30
Five out of six tests for the add_product method in the cart controll…
Lasiorhine Apr 26, 2018
4936b00
Last of the tests for cart's add_products method are now passing, aft…
Lasiorhine Apr 26, 2018
2fc1f63
first of two tests for 'update to paid' method in Cart controller is …
Lasiorhine Apr 26, 2018
dbd91f1
Second of two tests for 'update to paid' is now working, after approp…
Lasiorhine Apr 26, 2018
50f3831
Task controller tests for 'Update to Paid' are all done. Three method…
Lasiorhine Apr 26, 2018
c71ea98
last of the task controller tests for tonight.
Lasiorhine Apr 26, 2018
ccc976c
Change avatar and username position on account page
2020dream Apr 26, 2018
b94f378
Update empty cart view
2020dream Apr 26, 2018
12a9bb5
Add title to empty cart page
2020dream Apr 26, 2018
1cd5bc3
merge conflict with various controller tests resolved
Lasiorhine Apr 26, 2018
c49210f
fixed two tests and corresponding controller methods for updates in …
Lasiorhine Apr 26, 2018
711a868
Merge branch 'master' into seedsimages
MonalisaC Apr 26, 2018
4feea65
removed pry
MonalisaC Apr 26, 2018
916d5ae
Comment out photo URL
MonalisaC Apr 26, 2018
8825388
ruby comment out image_tag
MonalisaC Apr 26, 2018
77d75b9
ruby comment out image_tag
MonalisaC Apr 26, 2018
cd9e1b3
Trying to hardcode image
MonalisaC Apr 26, 2018
c4be9ae
11.jpeeg --> 11.jpg
MonalisaC Apr 26, 2018
7f699cd
Set up require login for some controllers
2020dream Apr 26, 2018
b6aa19c
updated remove_single_item method to remove bug when removing an orde…
SelamawitA Apr 26, 2018
5690d70
Rename image 11 and update seed file products
2020dream Apr 26, 2018
56805ed
Merge branch 'master' of https://github.com/choricao/betsy
2020dream Apr 26, 2018
dbc34d5
Merge branch 'master' of https://github.com/choricao/betsy
MonalisaC Apr 26, 2018
f3f739e
Merge branch 'master' of https://git.heroku.com/puppsy
2020dream Apr 26, 2018
5bfa500
Fix image bug
2020dream Apr 26, 2018
a8b6730
removed order item add and create controller method and associated ro…
SelamawitA Apr 26, 2018
6c5a74a
Merge branch 'master' of https://github.com/choricao/betsy
SelamawitA Apr 26, 2018
62fbeec
Merge branch 'master' of https://github.com/choricao/betsy
MonalisaC Apr 26, 2018
5dafec1
Fixed test link showing
MonalisaC Apr 26, 2018
4b4c922
bugs
MonalisaC Apr 26, 2018
65b33d8
Update some changes
2020dream Apr 26, 2018
f284914
Delete unused views
2020dream Apr 26, 2018
c09d80c
Merge branch 'master' into remove_unused_views
2020dream Apr 26, 2018
5201cae
Add Date Placed on order list
2020dream Apr 26, 2018
abf6ba6
Update product show view
2020dream Apr 26, 2018
b8f0801
Resolve merge conflict
2020dream Apr 26, 2018
cdf9db8
included more assertions to orders test and updated order items tests
SelamawitA Apr 27, 2018
e52c80a
small update to reviews controller test
SelamawitA Apr 27, 2018
85ca89e
updated order items controller testing
SelamawitA Apr 27, 2018
fd948be
Add title for carousal
2020dream Apr 27, 2018
3a0e48d
Fix retire button
2020dream Apr 27, 2018
3d82048
Set update min to 1
2020dream Apr 27, 2018
298b9bb
Change seed file to show out of stock products and button
2020dream Apr 27, 2018
afcb2b2
attempt to create mock user with current tests to resolve failed test…
SelamawitA Apr 27, 2018
4153ac0
Fix price input error on Update Product page
2020dream Apr 27, 2018
ccf4e4c
fixed test to add login and commented out tests related to deleted views
MonalisaC Apr 27, 2018
d67d60f
Merge branch 'master' of https://github.com/choricao/betsy
MonalisaC Apr 27, 2018
2ed007f
fixed small typo error
SelamawitA Apr 27, 2018
5885f0c
finally, all the cart controller tests are where they need to be.
Lasiorhine Apr 27, 2018
3b87734
Fixes for cart and sessions controller tests
Lasiorhine Apr 27, 2018
7d0a782
Cart controllers now passing with adequate coverage.
Lasiorhine Apr 27, 2018
63157b1
So very many cart controller tests.
Lasiorhine Apr 27, 2018
7d1c297
failures fixed in Sessions controller
Lasiorhine Apr 27, 2018
7f7f4ef
fixed a typo on the homepage.
Lasiorhine Apr 27, 2018
ca151fd
Two tests for 'set status' are now functional and passing, after vali…
Lasiorhine Apr 27, 2018
e315803
progress toward straightening controller tests
Lasiorhine Apr 27, 2018
b91f6c3
update to order-items controller testing
SelamawitA Apr 27, 2018
8a28d7a
Got the product creation method in the products controller to refuse …
Lasiorhine Apr 27, 2018
5b972c4
products controller test and method for create are now what they shou…
Lasiorhine Apr 27, 2018
c6e45d7
modified order_item controller test
SelamawitA Apr 27, 2018
6c7f8cc
commented out some unused methods in order controller
SelamawitA Apr 27, 2018
db39f71
updated order controller testing
SelamawitA Apr 27, 2018
e1aac28
updated reviews controller testing
SelamawitA Apr 27, 2018
effa963
all tests and methods for Products Edit are functional and passing.
Lasiorhine Apr 27, 2018
f0fb43d
All products controller tests are written and passing, with login fun…
Lasiorhine Apr 27, 2018
1cef706
Merge branch 'master' of https://github.com/choricao/betsy into conti…
SelamawitA Apr 27, 2018
c46b3de
Merge branch 'master' of https://github.com/choricao/betsy
SelamawitA Apr 27, 2018
0924a14
Merge branch 'master' of https://github.com/choricao/betsy into conti…
SelamawitA Apr 27, 2018
ec52a93
Merge branch 'master' into continued_products_orders_orderitem_review…
SelamawitA Apr 27, 2018
8c21e90
added homepage test
SelamawitA Apr 27, 2018
ec8923f
Merge branch 'master' of https://github.com/choricao/betsy
SelamawitA Apr 27, 2018
28707c2
Merge branch 'continued_products_orders_orderitem_reviews_controller_…
SelamawitA 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
18 changes: 9 additions & 9 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ Congratulations! You're submitting your assignment! These comprehension question
## Comprehension Questions
Question | Answer
:------------- | :-------------
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 could your team have done better? |
What was your application's ERD? (include a link) |
What is your Trello URL? |
What is the Heroku URL of your deployed application? |
How did your team break up the work to be done? | We divided work by MVC. We have one Model/DB person, one View person, and two Controller people. Most of the individual work were done at home. Whenever there was a need to collaborate or communicate, we did it at Ada as a whole group or pairs.
How did your team utilize git to collaborate? | All of us had our own branches on local and/or github, especially for features we were not sure about. We learned about how to resolve merge conflicts, and realized that no merge conflicts doesn't mean no errors during merging. Although we planned to use PR in our project, we didn't try it because of time constraint. We should definitely use it in our future group project.
What did your group do to try to keep your code DRY while many people collaborated on it? | It's hard... We kinda prioritize our work to make the app work, rather than writing beautiful codes. We did some cleanup when the app was 90% ready for demo. We probably will do more after final deployment.
What was a technical challenge that you faced as a group? | Cart logic. After discussions with tutor and PM, we realized that there were several ways to implement it. We compared them and chose one based on how comfortable we were with the different options. It still took us a long time to implement that function.
What was a team/personal challenge that you faced as a group? | We believed that all members in the team did their best to make our app not just work but better than we expected.
What could your team have done better? | We probably should write controller tests first next time.
What was your application's ERD? (include a link) | https://www.lucidchart.com/documents/edit/619b0172-f884-42d1-91fe-ea00101d45c1/0
What is your Trello URL? | https://trello.com/b/2tpzc7EV/puppsy
What is the Heroku URL of your deployed application? | https://puppsy.herokuapp.com/
25 changes: 25 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# 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

/node_modules
/yarn-error.log

.env
.byebug_history

.DS_Store
coverage

.env
80 changes: 80 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
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

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'
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 'normalize-rails'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'dotenv-rails'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
gem 'simplecov', require: false
end


gem "omniauth"
gem "omniauth-github"

gem 'client_side_validations'
Loading