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

Gale, Maria, Sara, Kimberley - Carets #72

Open
wants to merge 280 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
280 commits
Select commit Hold shift + click to select a range
f3d7c04
Passing tests for relations between products and merchants/reviews.
kimberleyamackenzie Oct 18, 2017
1d3fb56
Passing tests for review validations.
kimberleyamackenzie Oct 18, 2017
d34f359
Fixing merge conflict?
kimberleyamackenzie Oct 18, 2017
4b2805c
category model tests passing for unqiueness and presence
mariamcgrew Oct 18, 2017
ac95b46
category model test passing for character length
mariamcgrew Oct 18, 2017
6bde75a
Product controller actions & product index view.
kimberleyamackenzie Oct 18, 2017
642a28f
fixed merge conflicts
mariamcgrew Oct 18, 2017
aab87bb
Validate order status
galestorm Oct 18, 2017
29f3d1c
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 18, 2017
efc6495
Functioning but not pretty products index view.
kimberleyamackenzie Oct 18, 2017
a70f5e1
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 18, 2017
50b55f1
Finish order model testing for validations and relations
galestorm Oct 18, 2017
7f940bf
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 18, 2017
a4cbefe
deleted git text from review_test
SaraChandler Oct 18, 2017
bcfbb51
deleted git text from review test
SaraChandler Oct 18, 2017
4db2d3f
Orders controller tests index and new actions
galestorm Oct 19, 2017
25f1088
Pass all works controller tests except update
galestorm Oct 19, 2017
6a4a211
Basic categories controller tests.
kimberleyamackenzie Oct 19, 2017
72cce1f
Category views.
kimberleyamackenzie Oct 19, 2017
912b0dd
Categories controller tests.
kimberleyamackenzie Oct 19, 2017
71327e4
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 19, 2017
a64c4e3
Add relations tests to product and category
galestorm Oct 19, 2017
04bece0
SC added tests to reviews controller
SaraChandler Oct 19, 2017
75179a4
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 19, 2017
d63639b
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 19, 2017
19046da
fixed table name for product categories, working in console
mariamcgrew Oct 19, 2017
c74765e
Merge?
galestorm Oct 19, 2017
f10c59f
fixing destroy test on reviews controller
SaraChandler Oct 19, 2017
d3a6ac5
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 19, 2017
1431d39
Resolve merge conflict
galestorm Oct 19, 2017
f9ab169
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 19, 2017
0ceba86
Remove typo
galestorm Oct 19, 2017
6ac1b70
all tests passing for reviews controller
SaraChandler Oct 19, 2017
23c4428
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 19, 2017
5cabd8d
Remove destroy action from orders controller: orders should never be …
galestorm Oct 19, 2017
a3c6ec0
Merge branch 'order-controller-tests'
galestorm Oct 19, 2017
5504b72
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 19, 2017
50b68c5
merchants controller testing complete for index and show
mariamcgrew Oct 19, 2017
55c62e1
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew Oct 19, 2017
6a91287
tested remove one from stock model method - passing
mariamcgrew Oct 19, 2017
771114a
method method for in stock product works correctly
mariamcgrew Oct 19, 2017
d17ad19
Passing tests for categories controller with edge cases.
kimberleyamackenzie Oct 19, 2017
87edffb
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 19, 2017
fcf9ad5
All products controller tests except the create.
kimberleyamackenzie Oct 19, 2017
779ddc0
Order billing details form.
kimberleyamackenzie Oct 19, 2017
9b337ba
Updated routes for merchant_products path.
kimberleyamackenzie Oct 19, 2017
ec1d06d
Working browse by merchants products path
kimberleyamackenzie Oct 19, 2017
c3d7b67
Slightly updated root path.
kimberleyamackenzie Oct 19, 2017
8ea2975
Test user can add product to pending order
mariamcgrew Oct 19, 2017
a2dd4d7
Merge product controller tests
mariamcgrew Oct 19, 2017
7ff8c1b
Saved file
mariamcgrew Oct 19, 2017
0d82686
Test negative case for add_products action
mariamcgrew Oct 19, 2017
d06777c
pushing current version to gihub
mariamcgrew Oct 19, 2017
a46dc9c
added tests for product adding quantity to product in cart
SaraChandler Oct 20, 2017
305db40
made nested routes for product reviews, added validation for product …
SaraChandler Oct 20, 2017
a8d92e4
Create show page for product. Add create_order action to application_…
galestorm Oct 20, 2017
9ff370b
Add comment
galestorm Oct 20, 2017
9a61a1f
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 20, 2017
30eb757
Link to product show page in index
galestorm Oct 20, 2017
07cb2c5
Merge branch 'product-show-page'
galestorm Oct 20, 2017
edb2126
products by category tests passing
mariamcgrew Oct 20, 2017
054cc92
Dropdown menus.
kimberleyamackenzie Oct 20, 2017
3ba1124
Image tags for index views and updated dropdown menus.
kimberleyamackenzie Oct 20, 2017
17ecbac
updated reviews controller to handle nested routes, not working yet
SaraChandler Oct 20, 2017
4d1c593
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew Oct 20, 2017
800ba53
Work on removing product from orderproducts
galestorm Oct 20, 2017
6c43d59
Resolve merge conflict
galestorm Oct 20, 2017
fd27af2
fixed merge conflict with show.html products
SaraChandler Oct 20, 2017
76a2ae4
added categories seeds
mariamcgrew Oct 20, 2017
3517790
categories seeds working in console
mariamcgrew Oct 20, 2017
3a39cfa
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew Oct 20, 2017
cf870b0
Remove_product_from_cart action working
galestorm Oct 20, 2017
43b77f0
Add strong params back in, it was accidentally delteted in a merge
galestorm Oct 20, 2017
d781fac
Stashing these changes to reviews routing.
kimberleyamackenzie Oct 20, 2017
ea96257
Reviews still broken
SaraChandler Oct 20, 2017
7e829c4
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 20, 2017
6bac4c2
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 20, 2017
391f655
Fix order controller test bug - it was mad order index view file was …
galestorm Oct 20, 2017
aaadffd
Add conditional to order index form
galestorm Oct 20, 2017
1df0542
Product rating model method and links.
kimberleyamackenzie Oct 20, 2017
45d419d
Show pages for products.
kimberleyamackenzie Oct 20, 2017
3e93bfd
Shopping cart functionality.
kimberleyamackenzie Oct 20, 2017
a606d9f
Shopping cart creates new order only if new session id.
kimberleyamackenzie Oct 20, 2017
9ce87fd
Add redirect to application controller create order method
galestorm Oct 20, 2017
f67409c
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 20, 2017
945f76e
Order subtotal method.
kimberleyamackenzie Oct 20, 2017
c21fab5
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 20, 2017
075d29e
moved links to categories page
mariamcgrew Oct 20, 2017
710daee
removed merge conflicts
mariamcgrew Oct 20, 2017
782117b
Updated routes for confirmation page & order create functionality.
kimberleyamackenzie Oct 20, 2017
07dd692
Bug fix: can begin my order session by adding a product or clicking m…
galestorm Oct 20, 2017
4aeeb4d
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 20, 2017
73c55d7
Confirmation page details.
kimberleyamackenzie Oct 20, 2017
f8eff83
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 20, 2017
b5cb2a6
Working confirmation screen.
kimberleyamackenzie Oct 20, 2017
2920547
Message if no roducts meet given parameters.
kimberleyamackenzie Oct 20, 2017
80baa9b
Title created.
kimberleyamackenzie Oct 20, 2017
44c06d2
Crystal ball tab icon.
kimberleyamackenzie Oct 20, 2017
4beb554
changed path to redirect the shopping cart after adding a product
mariamcgrew Oct 20, 2017
b2f711c
Merchants show view.
kimberleyamackenzie Oct 20, 2017
a45cec8
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 20, 2017
33fcb46
Change to reflect that updating order should redirect to confirm orde…
galestorm Oct 22, 2017
1577bbb
Test remove_product_from_cart action for bad requests
galestorm Oct 22, 2017
2cdfd7f
Fix merge conflicts
galestorm Oct 22, 2017
83c1993
Fix typo in order index view
galestorm Oct 22, 2017
8fd9ecc
Redirects user back if can't add product to cart
galestorm Oct 22, 2017
185fbcf
Include Paperclip in GEMFILE and configure environment to use ImageMa…
galestorm Oct 22, 2017
3721746
changed expiration date data type, added validations to order form zi…
mariamcgrew Oct 22, 2017
9fcfadb
added email formatting validation
mariamcgrew Oct 22, 2017
8ee1e54
Add attachment photo field to products table
galestorm Oct 22, 2017
31db625
Add Upload Product Photo to new product form
galestorm Oct 22, 2017
4e3207d
Add Upload Merchant Photo buton to merchant form partial
galestorm Oct 22, 2017
b1a19b0
Add file attachment field photo to merchants table and Upload Merchan…
galestorm Oct 22, 2017
be26e6c
dried up validations
mariamcgrew Oct 22, 2017
a87a872
model tests for orders validations passing
mariamcgrew Oct 22, 2017
0ede865
Controller updates and route cleanup.
kimberleyamackenzie Oct 22, 2017
85437ce
Updated passing tests to match refactored controller methods.
kimberleyamackenzie Oct 22, 2017
21c6bd7
added city and state columns to orders db
mariamcgrew Oct 22, 2017
380e300
added city and state to form, with validations
mariamcgrew Oct 22, 2017
6ec662b
updated orders controller params and order model validations test pas…
mariamcgrew Oct 22, 2017
e639eb5
Responsive normal sized shopping cart header.
kimberleyamackenzie Oct 22, 2017
cbf1a3e
Crystal ball! No header on home page.
kimberleyamackenzie Oct 22, 2017
9e4ec8a
Background image on homepage.
kimberleyamackenzie Oct 22, 2017
87fc679
Body container.
kimberleyamackenzie Oct 22, 2017
9055189
Updated font for header.
kimberleyamackenzie Oct 22, 2017
0904216
Updated index views and show views.
kimberleyamackenzie Oct 23, 2017
be4cf3f
Add and remove to cart button styling.
kimberleyamackenzie Oct 23, 2017
d0fa2e8
Order page styling updates.
kimberleyamackenzie Oct 23, 2017
eaf5e28
controllers updated with controller filters
mariamcgrew Oct 23, 2017
682ad00
Root page logo styling.
kimberleyamackenzie Oct 23, 2017
d1dd9a9
Background styling.
kimberleyamackenzie Oct 23, 2017
1781015
Merge conflcits unconflicted.
kimberleyamackenzie Oct 23, 2017
5168b0e
Fixed failing order controller test.
kimberleyamackenzie Oct 23, 2017
999fd48
JS scrolling featured product on homepage.
kimberleyamackenzie Oct 23, 2017
7a670ac
merging changes_post_demo
mariamcgrew Oct 23, 2017
921d6e2
REVIEWS ARE WORKING
SaraChandler Oct 23, 2017
3b87bec
fixed merge conflict in orders.yml
mariamcgrew Oct 23, 2017
37b3eb0
Styling changes for scrolling featured product.
kimberleyamackenzie Oct 23, 2017
7e7876c
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 23, 2017
33d5127
removed extra yml lines in order.yml
mariamcgrew Oct 23, 2017
e3be10d
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew Oct 23, 2017
8372923
fixed merge conflicts
SaraChandler Oct 23, 2017
1819fd0
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 23, 2017
4712cfe
Weird funky problems being less funky and weird.
kimberleyamackenzie Oct 23, 2017
fc2dce6
Initial OAuth setup method and route
galestorm Oct 23, 2017
b01a779
Added logout button toggle
SaraChandler Oct 23, 2017
fdb1217
Toggle header for logged in merchant or guest.
kimberleyamackenzie Oct 23, 2017
156b04c
New product params switch to automatically take in currently logged i…
kimberleyamackenzie Oct 23, 2017
4e03b40
Migration for order status column to make item unavailable.
kimberleyamackenzie Oct 23, 2017
297f235
Add multipart to new product form
galestorm Oct 23, 2017
f8e36d1
Merge branch 'image-rendering'
galestorm Oct 23, 2017
cee6ea7
Permit photo in product_params
galestorm Oct 23, 2017
33c269f
Fix merge conflict
galestorm Oct 23, 2017
748cfc0
Able to save image information
galestorm Oct 23, 2017
9dfe09e
Uploaded product photos appear on product show page and product index…
galestorm Oct 23, 2017
c687c49
Permissions for only viewing available products unless you are the me…
kimberleyamackenzie Oct 23, 2017
7a9ae9a
added order index method to get merchant orders and products
SaraChandler Oct 24, 2017
7096931
Pretty background yay! (styling).
kimberleyamackenzie Oct 24, 2017
49613bd
Background on all non-root pages.
kimberleyamackenzie Oct 24, 2017
6aed509
Add category for products that you own functionality.
kimberleyamackenzie Oct 24, 2017
52ff3aa
Show default image on index page if no image attached
galestorm Oct 24, 2017
b93bad8
Edit link available if you are a currently logged in merchant who own…
kimberleyamackenzie Oct 24, 2017
8ef0b21
Updated text color for black background.
kimberleyamackenzie Oct 24, 2017
cdf0307
Paperclip working but not communicating with ImageMagick
galestorm Oct 24, 2017
388e405
Merge conflicts fixed? Maybe?
kimberleyamackenzie Oct 24, 2017
51c52c1
Resolved duplicate stylesheet issue.
kimberleyamackenzie Oct 24, 2017
2ea6577
Buttons to add a new review and view reviews on product show page.
kimberleyamackenzie Oct 24, 2017
a2fdf30
Featured product on home page autoplays, booyah.
kimberleyamackenzie Oct 24, 2017
e44a6d8
Update forms styling.
kimberleyamackenzie Oct 24, 2017
c3f9f3b
Product price method experiments that I undid but accidentally had ea…
kimberleyamackenzie Oct 24, 2017
1cfadc6
More user-friendly pathways and links through images.
kimberleyamackenzie Oct 24, 2017
776c4dc
Alerts for flash text.
kimberleyamackenzie Oct 24, 2017
eb6d6ac
added Merchant order sort by status, set shipped button
SaraChandler Oct 24, 2017
8a07119
Rollback unnecessary availability migration.
kimberleyamackenzie Oct 24, 2017
aa3195e
updated migration for default status products column, added .env file…
mariamcgrew Oct 24, 2017
c6bafe6
changed the application.scss file, lines 13 14 15
mariamcgrew Oct 24, 2017
5d360ea
Added a handful of links to different views for UX.
kimberleyamackenzie Oct 24, 2017
7a666c3
fixed merge conflict in add default product status migration
mariamcgrew Oct 24, 2017
d299fc1
Updated redirect for edit products path so it wouldn't redirect to pr…
kimberleyamackenzie Oct 24, 2017
cf64b62
Product description added in schema & all necessary references throug…
kimberleyamackenzie Oct 24, 2017
525a6e8
changed products controller to fix bugs
SaraChandler Oct 24, 2017
2ada102
Deleted unnecessary JS references and files.
kimberleyamackenzie Oct 24, 2017
ddba04f
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 24, 2017
791ae9b
fixed orders controller method
SaraChandler Oct 24, 2017
78b9fc4
fixed merge conflicts with application html
SaraChandler Oct 24, 2017
0cddbb7
changed logout to button so it would work, edited sessions controller…
SaraChandler Oct 25, 2017
67c3aaf
Delete unnecessary reference to file.
kimberleyamackenzie Oct 25, 2017
a02835c
Delete application.js
galestorm Oct 25, 2017
64d6bd5
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 25, 2017
529bcdb
Fixing merge conflicts.
kimberleyamackenzie Oct 25, 2017
50d9ec1
changed application controller flash message to result text and added…
SaraChandler Oct 25, 2017
f6da33b
Add SimpleCov
galestorm Oct 25, 2017
2ace3e0
Test custom order model methods
galestorm Oct 25, 2017
f82b780
Passing and expanded category model and category controller tests, up…
kimberleyamackenzie Oct 25, 2017
7ab6412
Passing sessions controller tests with methods added in test helper f…
kimberleyamackenzie Oct 25, 2017
ad6e1e8
Pass order#show controller tests
galestorm Oct 26, 2017
6a911a4
Pass order#edit controller tests
galestorm Oct 26, 2017
2efcb82
Reviews model tests complete and passing.
kimberleyamackenzie Oct 26, 2017
725b184
product model testing is finished, product controller started
SaraChandler Oct 26, 2017
0102ba0
fixed merge conflicts in gemfile, gemfile.lock, test helper
SaraChandler Oct 26, 2017
758a3e4
updated Order model and individual order page
SaraChandler Oct 26, 2017
e83efd4
All order controller tests except shipped action
galestorm Oct 26, 2017
bbbaaa1
deleted yarn dependency
mariamcgrew Oct 26, 2017
8e19ec0
Trigger Heroku deploy after enabling collectstatic
mariamcgrew Oct 26, 2017
9ae0d32
allow heroku auto assets precompilation
mariamcgrew Oct 26, 2017
9505aed
Add back jquery tag so link_tos work now
galestorm Oct 26, 2017
ff9013d
Fix merge conflicts
galestorm Oct 26, 2017
216882c
Transitions on button transform scale property.
kimberleyamackenzie Oct 26, 2017
8683bcf
Resolved merge conflicts.
kimberleyamackenzie Oct 26, 2017
b23081a
fixed merge conflicts
mariamcgrew Oct 26, 2017
c4efa0a
Test negative case for shipped order controller action
galestorm Oct 26, 2017
b066221
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 26, 2017
47ea966
Bug Fix: flash message no longer appears when merchant navigates to a…
galestorm Oct 26, 2017
726efcc
fixed individual order page and order model
SaraChandler Oct 26, 2017
1e6f9f1
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 26, 2017
8a6ceb6
Merge branch 'master' of https://github.com/galestorm/betsy
kimberleyamackenzie Oct 26, 2017
244c8de
Updated styling for merchant orders page.
kimberleyamackenzie Oct 26, 2017
5be48fd
One more shipped action test passing on order controller tests
galestorm Oct 26, 2017
6a94c29
completed test for merchants viewing orders
mariamcgrew Oct 27, 2017
c95e4c6
refactored the merchant orders index action
mariamcgrew Oct 27, 2017
2fc35c5
Turn all buttons into divs so the whole button is clickable, not just…
kimberleyamackenzie Oct 27, 2017
116a9cf
Turned merchant product images on merchant show view into links.
kimberleyamackenzie Oct 27, 2017
65e1615
tests passing for restricting reviews bu merchant
mariamcgrew Oct 27, 2017
0a6a892
Maybe fixed weird rectangles in background, exclamation point.
kimberleyamackenzie Oct 27, 2017
ca9a319
Commented out unneccessary index product by review id statement.
kimberleyamackenzie Oct 27, 2017
853eead
updated order controller shipped method to find by order id, fixed bug
SaraChandler Oct 27, 2017
684544f
Add session order id to nil when you logout to prevent items remainin…
kimberleyamackenzie Oct 27, 2017
d6bc938
All form text white to be viewable.
kimberleyamackenzie Oct 27, 2017
00135ec
commented out merchant controller actions
mariamcgrew Oct 27, 2017
083c474
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew Oct 27, 2017
322b55c
No real change
galestorm Oct 27, 2017
d1f38c7
Merge branch 'master' of https://github.com/galestorm/betsy
galestorm Oct 27, 2017
831c361
removed test from product model test
SaraChandler Oct 27, 2017
6f7a1f4
fixed merge issues in review controller test, order controller
SaraChandler Oct 27, 2017
14a3fd6
Styling for view individual orders page.
kimberleyamackenzie Oct 27, 2017
4f23a94
Render show view after you create a new order
galestorm Oct 27, 2017
3f9b5a5
updated dates to be readable
SaraChandler Oct 27, 2017
0bdf33a
Merge branch 'master' of https://github.com/galestorm/betsy
SaraChandler Oct 27, 2017
0c9bf2c
added validation message to order cart
mariamcgrew Oct 27, 2017
c0dfac9
Merge branch 'master' of https://github.com/galestorm/betsy
mariamcgrew Oct 27, 2017
38d6916
Various and assorted small styling changes.
kimberleyamackenzie Oct 27, 2017
52cc1bd
Resolved merge conflict.
kimberleyamackenzie Oct 27, 2017
27329da
fixed html for order index
SaraChandler Oct 27, 2017
97e4a8d
HTML alt tags and formatting.
kimberleyamackenzie Oct 27, 2017
b1eb832
Resolve merge conflicts.
kimberleyamackenzie Oct 27, 2017
e6448c0
Revenue styling details.
kimberleyamackenzie Oct 27, 2017
84a3a21
Line item for paragraph descriptions.
kimberleyamackenzie Oct 27, 2017
f582272
Merchant views on account page.
kimberleyamackenzie Oct 27, 2017
107b77d
fixed line of code in category show page
mariamcgrew Oct 27, 2017
6f673ff
answered the questions
mariamcgrew Oct 27, 2017
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.
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 started with assigning people to Trello cards. the models and controllers for testing and creating the methods. We set up the tasks in waves on Trello and as we completed the tasks, we moved on to different tasks in the waves. |
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, these questions shouldn't be answered like this within this file!

github uses this file to automatically populate the text box for the description when you open a new Pull Request. Just edit that PR description. I went ahead and copied and pasted this into your PR for you :P

| How did your team utilize git to collaborate? | We used to git to work on different branches based on features and tests. We then did a collaborative merge, pull, push after each day's stand up. |
| What did your group do to try to keep your code DRY while many people collaborated on it? | We tried switching focus areas, such as products and orders, when we started our testing, that way we were reviewing other team member's models and controllers and would essentially proof each other's code to DRY it up. We also used before actions and custom methods that helped us dry the code up. |
| What was a technical challenge that you faced as a group? | Deploying to Heroku. We had trouble logging in with git and with our database. We reviewed the Heroku logs and StackOverflow to determine the solutions. |
| What was a team/personal challenge that you faced as a group? | We think we did a good job overall with ask and guess culture. It was a challenge having a group member out for 2 days, but as a group, we feel we communicated well over Slack to move forward with the project. |
| What could your team have done better? | Deployed earlier to work out those issues. |
| What was your application's ERD? (include a link) | We will Slack the photos of the ERD. We did it on the white board as opposed to electronically. |
| What is your Trello URL? | https://trello.com/b/d42fqbbE/whythehexnots |
| What is the Heroku URL of your deployed application? | http://sourceress.herokuapp.com/ |
24 changes: 24 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# 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

.byebug_history
.env

public/assets/**

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

gem 'awesome_print'
gem "paperclip", "~> 5.0.0"
gem 'omniauth'
gem 'omniauth-github'
gem 'simplecov'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.4'
# Use postgresql as the database for Active Record
gem 'pg', '~> 0.18'
# 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', '~> 3.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'
gem 'dotenv-rails'
gem 'simplecov'
gem 'pry-rails'
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 'foundation-rails', '6.4.1.2'
group :development do
gem 'better_errors'

gem 'binding_of_caller'
end

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

gem 'jquery-rails'
Loading