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

Caroline, Analisa, Wini, and Wenji - Betsy - Octos #28

Open
wants to merge 312 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
312 commits
Select commit Hold shift + click to select a range
d7efcb2
Resolved more merge conflicts, mostly in coverage files
cmn53 Apr 21, 2018
1e66d40
Minor spelling corrections in products index view
The-Beez-Kneez Apr 21, 2018
7de033e
resolving merge conflict in products yml
The-Beez-Kneez Apr 21, 2018
8622efe
Tests are passing and implemented for the following controllers: Prod…
The-Beez-Kneez Apr 21, 2018
a07117f
Some changes to controllers
winirarrazaval Apr 22, 2018
5b7e606
controller
winirarrazaval Apr 22, 2018
3ce5e75
Working on homepage design, currently giving me problems with the hea…
The-Beez-Kneez Apr 22, 2018
7fb53aa
Trying to implement images for the orbits
The-Beez-Kneez Apr 22, 2018
181df6e
c
winirarrazaval Apr 22, 2018
ea97b92
Still working on the layout and look for the home page
The-Beez-Kneez Apr 22, 2018
b2e5311
Added tests for merchants controller
wf1101 Apr 22, 2018
ee67a00
Created merchants controller and index and show action
wf1101 Apr 22, 2018
de58d87
Still working on homepage. CSS is like wrestling a gator covered in b…
The-Beez-Kneez Apr 22, 2018
ab7178a
Added in New and Create Methods for Reviews Controller, currently 2 t…
The-Beez-Kneez Apr 23, 2018
8a33d7e
minor change to my TODO list
The-Beez-Kneez Apr 23, 2018
78fd570
Minor change in reviews controller test
The-Beez-Kneez Apr 23, 2018
d8faee3
Working on Homepage. Pissed off at CSS, cause boxes
The-Beez-Kneez Apr 23, 2018
a9ddda4
It is telling me to commit all these changes before we go forward.
The-Beez-Kneez Apr 23, 2018
ac9944d
CONTROLLErs
winirarrazaval Apr 23, 2018
580fc58
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 23, 2018
f12a561
added and update_create_cart action to cart controller
winirarrazaval Apr 23, 2018
b6987fd
Updated tests on merchants controller
wf1101 Apr 23, 2018
5c04749
Continued work on Homepage, added links to merchants and number of re…
The-Beez-Kneez Apr 23, 2018
ea8c1cb
Merge branch 'products_reviews_categories'
The-Beez-Kneez Apr 23, 2018
bd33fed
Added some controller function to cartitem to be able to create a new…
winirarrazaval Apr 23, 2018
065e46b
Fixed price display
The-Beez-Kneez Apr 23, 2018
439a0e4
Merge branch 'products_reviews_categories'
The-Beez-Kneez Apr 23, 2018
b271e64
Made cart show page. Updated cart and cartitem model methods but have…
cmn53 Apr 23, 2018
8f07635
Added some centering for Products Show Images, and also disabled turb…
The-Beez-Kneez Apr 23, 2018
8d66039
Merge branch 'products_reviews_categories'
The-Beez-Kneez Apr 23, 2018
8fb7418
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 23, 2018
92872cd
Started working on adding reviews and the category index page
cmn53 Apr 23, 2018
2b58434
Stop tracking coverage files
cmn53 Apr 23, 2018
16b4bb3
Resolved merge conflicts
cmn53 Apr 23, 2018
4318a19
something
winirarrazaval Apr 23, 2018
05aa086
Merchants controller and view
wf1101 Apr 23, 2018
ff2a3b5
fixed all conflict
winirarrazaval Apr 23, 2018
e0c96ab
run bundle install
wf1101 Apr 23, 2018
5a8c02c
Small changes to cartitem controller
cmn53 Apr 23, 2018
8ec32a9
Small changes to order
cmn53 Apr 23, 2018
fa09975
Fixed bug in cartitem controller to delpoy to heroku
wf1101 Apr 23, 2018
316729c
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 23, 2018
d1b9618
Built out Login Button on Nav, still no Merchant to connect
The-Beez-Kneez Apr 23, 2018
ea9153a
Able to create new cartitem from product page
cmn53 Apr 23, 2018
a6ddd27
Activated My Cart link in nav
cmn53 Apr 23, 2018
fb5902f
Fixed link to proceed to checkout. Changed some order form fields
cmn53 Apr 23, 2018
8581417
Added in a pagination, linked images to appear, and styled images as …
The-Beez-Kneez Apr 23, 2018
75a1645
Ran migration to change date fields for order
cmn53 Apr 23, 2018
c804ffd
Added a border, silly but I like it. Still hate the color
The-Beez-Kneez Apr 23, 2018
e537d37
Added business logic to show certain products in model
wf1101 Apr 23, 2018
85a9417
Created categories index page and show page
wf1101 Apr 23, 2018
1c8076f
Created merchants index page and show page
wf1101 Apr 23, 2018
e7a5bd4
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 23, 2018
e91fadf
Styling changes to Product and Application layout
The-Beez-Kneez Apr 23, 2018
9fb41a5
Merge branch 'product_root_work'
The-Beez-Kneez Apr 23, 2018
98613b2
Got the orders submission to work. Still messing around with the revi…
cmn53 Apr 23, 2018
91e77bb
Resolved merge conflicts
cmn53 Apr 23, 2018
76bde51
merge conflicts
winirarrazaval Apr 23, 2018
403edcc
merging some conflicts
winirarrazaval Apr 23, 2018
83a9e36
Fixed showing login and logout on nav bar
wf1101 Apr 23, 2018
6689527
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 23, 2018
aa0ca78
Fixed spacing for nav bar, only needs a color adjustment
The-Beez-Kneez Apr 23, 2018
3f91917
merge conflict'
The-Beez-Kneez Apr 23, 2018
0c3368c
Merged session cart and merchant id
wf1101 Apr 23, 2018
ce5ac5f
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 23, 2018
9985084
Removed duplicate nav right bar
wf1101 Apr 23, 2018
c6ba222
Redid My Cart link in navigation and added flash messages
cmn53 Apr 23, 2018
8db1d57
Added flash messages
cmn53 Apr 23, 2018
5e385ff
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 23, 2018
a0cd934
Removed duplicate flash error messages
wf1101 Apr 23, 2018
6dea921
Fixed missing closing divs
wf1101 Apr 23, 2018
2acb090
Can now add reviews
cmn53 Apr 23, 2018
73edb55
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 23, 2018
8bf8699
All sessions controller passed
wf1101 Apr 23, 2018
0ad648e
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 23, 2018
a6bf870
removed expiration date from orders fixtures
The-Beez-Kneez Apr 24, 2018
f0d4902
Nav Bar Spacing has been fixed.
The-Beez-Kneez Apr 23, 2018
947c82b
Continued Styling Views Adventures
The-Beez-Kneez Apr 23, 2018
f52ecba
Added additional styling work
The-Beez-Kneez Apr 23, 2018
80de3f3
Nonsensical changes
The-Beez-Kneez Apr 24, 2018
de71eb3
Changed dependent behavior on Product Model to restrict_with_error, a…
The-Beez-Kneez Apr 24, 2018
054a86c
Testing for restrict_with_error relationship between Product and Cart…
The-Beez-Kneez Apr 24, 2018
d46c512
Added in star helper method and applied it to product index and show …
The-Beez-Kneez Apr 24, 2018
5f12ece
Implmented Display for Product stock pon Product Show View
The-Beez-Kneez Apr 24, 2018
f82db61
Fixed Seed data, products now have associated categories. And Product…
The-Beez-Kneez Apr 24, 2018
f8aad03
All model order tests passing
cmn53 Apr 24, 2018
1a52f24
Added imgae column in product yaml for testing
wf1101 Apr 24, 2018
58e39aa
Implemented tests in merchant controller and model
wf1101 Apr 24, 2018
5ba2c83
Implemented tests for category model and controller
wf1101 Apr 24, 2018
9577779
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 24, 2018
fea708c
Added tests for business logic methods in cart. All cart method tests…
cmn53 Apr 24, 2018
3ad3813
All cartitem model tests passing
cmn53 Apr 24, 2018
bce75cd
All order model tests passing
cmn53 Apr 24, 2018
4a4e5c3
Added tests for product#available? method. All product model tests pa…
cmn53 Apr 24, 2018
fd3ca6d
Added tests for new order methods, but not passing
cmn53 Apr 24, 2018
b8e0ad8
Dried up the reviews_controller and routes
cmn53 Apr 24, 2018
daf8f8a
Various changes to all aspects of reviews, including deleting unused …
cmn53 Apr 24, 2018
1f9a9a6
Dried up cart controller and routes. All cart controller tests passing
cmn53 Apr 24, 2018
a4a45c3
Cartitem controller tests passing
cmn53 Apr 24, 2018
92618fa
added more features to the order controller, creating and order to ch…
winirarrazaval Apr 24, 2018
7e6cee5
Added ERD to file
wf1101 Apr 24, 2018
b24e526
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 24, 2018
2533caa
Get rid of coverage file
cmn53 Apr 24, 2018
1c31941
Created link paths for product image thumbnails
The-Beez-Kneez Apr 24, 2018
53350d8
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 24, 2018
d5e1d30
Currently, cleaning up categories show, turned all images, product na…
The-Beez-Kneez Apr 24, 2018
21939b4
Added model order tests for new methods. Amended tests to account for…
cmn53 Apr 24, 2018
6c0828b
Style the main body layout
wf1101 Apr 24, 2018
cba1ec9
Created form partial and new product page
wf1101 Apr 24, 2018
b0edef9
Created new, edit and update action in products controller
wf1101 Apr 24, 2018
d1bb355
Still fiddling around with flexbox and grid for Category Show Method …
The-Beez-Kneez Apr 24, 2018
f828503
Added non-restful route to empty a cart
cmn53 Apr 24, 2018
5aa442d
Created nested routes for a merchant to add, eidt and update a product
wf1101 Apr 24, 2018
146fbad
Updated update action in merchant controller
wf1101 Apr 24, 2018
7f98c59
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 24, 2018
6bbf48d
Product controller index just shows products that are visible, and pr…
winirarrazaval Apr 24, 2018
715df17
Added tests for empty_cart to cart controller tests
cmn53 Apr 24, 2018
523d308
fixed some bugs on the order controller
winirarrazaval Apr 24, 2018
f3ba45d
Fixed seed bug
wf1101 Apr 24, 2018
5d3b020
solved merge conflict in product controller
winirarrazaval Apr 24, 2018
1a80fd7
resolved merge conflicts
cmn53 Apr 24, 2018
7ad91d1
Implemented spacing, color changes, formatting, and updated method do…
The-Beez-Kneez Apr 24, 2018
db86ac2
resolving even more merge conflicts
cmn53 Apr 24, 2018
bcc9bd7
Fixing errors in merge conflicts
cmn53 Apr 24, 2018
8e5c362
Changed spacing
The-Beez-Kneez Apr 24, 2018
56d7acb
Merge conflicts resolved
The-Beez-Kneez Apr 24, 2018
06fcf4e
Created new category form
wf1101 Apr 24, 2018
f812151
Created new and create action in categories controller
wf1101 Apr 24, 2018
88a82f3
Created category form
wf1101 Apr 24, 2018
7b14b87
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 24, 2018
af427b8
Changed font color to Brown for Wenji, and added in border formatting
The-Beez-Kneez Apr 24, 2018
6c9543c
Merge branch 'master' of https://github.com/cmn53/betsy
The-Beez-Kneez Apr 24, 2018
41142cb
Some styling in html and css for cart and order
winirarrazaval Apr 25, 2018
a68c782
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 25, 2018
e99abbe
Added retire action in products controller
wf1101 Apr 25, 2018
922048e
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 25, 2018
e7a5db4
Added logic in merchant model to show visible and invisible products
wf1101 Apr 25, 2018
1587d66
Styled new category form and edit product page
wf1101 Apr 25, 2018
5d93fbf
Created actions to list all products and orders of a merchant
wf1101 Apr 25, 2018
c8e3f98
Updated model logic and controller action to list visible and invisib…
wf1101 Apr 25, 2018
8677c7a
Fixed display text bugs
wf1101 Apr 25, 2018
852f4e0
Further styling choices
The-Beez-Kneez Apr 25, 2018
032e672
Merge branch 'styling_work'
The-Beez-Kneez Apr 25, 2018
9199763
Fixed Review form on Product Show View, still need to put space betwe…
The-Beez-Kneez Apr 25, 2018
9fc531e
Completed Wini's request for product show view to have ordering next …
The-Beez-Kneez Apr 25, 2018
e8163c9
Fixed bus with dispaly orders
wf1101 Apr 25, 2018
bb1f216
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 25, 2018
b459c4e
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 25, 2018
845cb7c
Added helper file to display date and time
cmn53 Apr 25, 2018
1acfd32
Resolving merge conflicts
cmn53 Apr 25, 2018
e3bc74d
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 25, 2018
abbc99a
Deleted coverage file
wf1101 Apr 25, 2018
7fc982c
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 25, 2018
6faccff
created routes for merchant orders
winirarrazaval Apr 25, 2018
c1ee94c
Remove coverage files dangit
cmn53 Apr 25, 2018
a89a140
Whatever changes were outstanding
cmn53 Apr 25, 2018
702bdc7
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 25, 2018
fd7ef88
Fixed categories formatting and look, added additonal link paths to a…
The-Beez-Kneez Apr 25, 2018
f9632a8
Merge branch 'master' of https://github.com/cmn53/betsy
The-Beez-Kneez Apr 25, 2018
9e75d0f
creater a controller action in orders caller my_orders and a view for it
winirarrazaval Apr 25, 2018
003fdc3
Merge branch 'merchantfeatures'
winirarrazaval Apr 25, 2018
da88d0d
Made merchant, categories and products show and index compatible for…
The-Beez-Kneez Apr 25, 2018
b3628cc
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 25, 2018
12d7a36
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 25, 2018
733805f
New merchant methods for products and cartitems
cmn53 Apr 25, 2018
fb61644
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 25, 2018
458e425
Added merchant methods for my_carts and my_orders
cmn53 Apr 25, 2018
5e173b4
fixed a bug to be able to update product
winirarrazaval Apr 25, 2018
e05a1f5
Merge branch 'merchantfeatures'
winirarrazaval Apr 25, 2018
79ce3b8
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 25, 2018
51356bc
Routes bugs
wf1101 Apr 25, 2018
af1806b
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 25, 2018
0c29883
Fixed routes problem
wf1101 Apr 25, 2018
721dbe6
fixed bug for cart button for guest user
winirarrazaval Apr 25, 2018
a76a7e7
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 25, 2018
f2723e5
Added in a temporary footer, we can style it further or add things to…
The-Beez-Kneez Apr 25, 2018
673b783
Added revenue_by_merchant method to cart
cmn53 Apr 25, 2018
1bb5717
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 25, 2018
8aee848
Styled some more things
The-Beez-Kneez Apr 25, 2018
9bcd84b
Merge branch 'master' of https://github.com/cmn53/betsy
The-Beez-Kneez Apr 25, 2018
7cf7f94
We modified the review so the merchant can not review their own product
winirarrazaval Apr 25, 2018
70c3c88
merged conflicts
winirarrazaval Apr 25, 2018
397c304
solved merge conflict
winirarrazaval Apr 25, 2018
5da8658
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 25, 2018
dcb2aa8
Fixed total_revenue and total_revenue_by_status methods in Merchant m…
cmn53 Apr 26, 2018
6dc2c04
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 26, 2018
5653bfe
Modifed log out function to only allow merchant to log out themselves…
wf1101 Apr 26, 2018
7465ca6
Styled merchant's order view page
wf1101 Apr 26, 2018
18ddfe8
merchant can change status and calculate revenue per order
winirarrazaval Apr 26, 2018
8960e39
Created partial table form
wf1101 Apr 26, 2018
ca7e773
Currently doing Products Controller testing, fixed one or two styling…
The-Beez-Kneez Apr 26, 2018
d1c91da
Fixed retire/unretire link in merchant order list page
wf1101 Apr 26, 2018
550c6d7
still working on product controller testing, have written out scaffol…
The-Beez-Kneez Apr 26, 2018
e11efb3
Merge branch 'prod_contr_tests'
The-Beez-Kneez Apr 26, 2018
2d2bcc1
Fixed table headers and retained dynamic tables for mobile view.
The-Beez-Kneez Apr 26, 2018
3393fbf
created a search bar in product page and some features in the my orde…
winirarrazaval Apr 26, 2018
d1b5951
Added tabs for revenue on merchant show page
cmn53 Apr 26, 2018
b63b56b
solved merge conflict
winirarrazaval Apr 26, 2018
6280362
Style buttons based background color
wf1101 Apr 26, 2018
6c05822
Fixed table width for consistency
wf1101 Apr 26, 2018
ac59cee
Added necessary links to go to other pages
wf1101 Apr 26, 2018
a29f159
Changed credit card display to last four digits
wf1101 Apr 26, 2018
7883028
Added restriction to allow merchant view their own account only
wf1101 Apr 26, 2018
6a9368b
created a new order controller action to update the status
winirarrazaval Apr 26, 2018
f9c22fe
Merge branch 'master' of https://github.com/cmn53/betsy
winirarrazaval Apr 26, 2018
4699341
Added reviews controller test to prohibit merchant from reviewing the…
cmn53 Apr 26, 2018
09a98e8
Style tabs and search button
wf1101 Apr 27, 2018
8547aeb
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 27, 2018
5d1df7c
Refined the search bar for merchants and products
winirarrazaval Apr 27, 2018
3a88fa2
merge conflict
winirarrazaval Apr 27, 2018
b992a01
Added new route, controller action, and view page for guest user to s…
wf1101 Apr 27, 2018
e80c6c5
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 27, 2018
0d8177f
Style new search bar to be consistent
wf1101 Apr 27, 2018
edb63a0
Modified link to merchant's products page for guest user
wf1101 Apr 27, 2018
74b9056
Styled buttons in cart page, order form and order review page
wf1101 Apr 27, 2018
453c070
doing merchant testing
winirarrazaval Apr 27, 2018
a2737a0
Products controller testing ongoing
The-Beez-Kneez Apr 27, 2018
f990922
Merge branch 'master' of https://github.com/cmn53/betsy
The-Beez-Kneez Apr 27, 2018
2440691
added test for merchant model invisible_products, visible_products, m…
winirarrazaval Apr 27, 2018
b664471
Added login merchant account in nav bar
wf1101 Apr 27, 2018
d43b82d
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 27, 2018
ed0edca
More controller tests. All order tests still not passing
cmn53 Apr 27, 2018
84c9e3f
Now have tests at 90% coverage for Products Controller Tests, have on…
The-Beez-Kneez Apr 27, 2018
6d6249e
Merge branch 'master' of https://github.com/cmn53/betsy
The-Beez-Kneez Apr 27, 2018
68659f3
Categories controller coverage 100% now
wf1101 Apr 27, 2018
162d000
Cartitems controller update method tests all passing
cmn53 Apr 27, 2018
96ce2ba
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 27, 2018
b0dd301
working on merchant model tests
winirarrazaval Apr 27, 2018
0ec62fd
merge conflict
winirarrazaval Apr 27, 2018
0a09527
Finished the last of the retire method tests, onemore optional method…
The-Beez-Kneez Apr 27, 2018
8bcdb75
Merge branch 'retire_fully_tested'
The-Beez-Kneez Apr 27, 2018
ac00ab1
Removed pry in product controller
wf1101 Apr 27, 2018
e65c201
Fixed model function
wf1101 Apr 27, 2018
01b46bc
Fixed products display
wf1101 Apr 27, 2018
caada73
Fixed showing order confirmation page
wf1101 Apr 27, 2018
7f5397b
fixed search bar for products
wf1101 Apr 27, 2018
b57fb66
Updated Wenjie's name
The-Beez-Kneez Apr 27, 2018
8fc4197
Fixed search bar bug
wf1101 Apr 27, 2018
9001406
Fixed new product form bug
wf1101 Apr 27, 2018
0c99667
changes to merchant model
cmn53 Apr 27, 2018
956af07
Merge branch 'master' of https://github.com/cmn53/betsy
cmn53 Apr 27, 2018
97c11b7
Added las changes
winirarrazaval Apr 27, 2018
a158ed8
Solved merge conflicts
winirarrazaval Apr 27, 2018
b4b6c2c
To merge
wf1101 Apr 27, 2018
01ca0ed
Merge branch 'master' of https://github.com/cmn53/betsy
wf1101 Apr 27, 2018
df5dda6
Worked on tests on session troller
wf1101 Apr 28, 2018
a826fc7
Implemented cartitems controller tests
wf1101 Apr 28, 2018
85f4c63
Implemented additional cart controller tests
wf1101 Apr 28, 2018
086f25c
Made changes to merchant#my_total_revenue and merchant#my_revenue_by_…
cmn53 Apr 28, 2018
28819ce
fixed a bug in display orders
winirarrazaval Apr 29, 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
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
GITHUB_CLIENT_ID: 7de823906fd607e07f3d
GITHUB_CLIENT_SECRET: a7fd0670681c55d342e8580b38c2a95b74286ba1
22 changes: 22 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# 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
/coverage/*
Binary file added Alibonbon_ERD.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
source 'https://rubygems.org'

ruby '2.5.0'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
"https://github.com/#{repo_name}.git"
end

gem 'simplecov', require: true, group: :test
# 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'
# 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

gem "omniauth"
gem "omniauth-github"

gem 'will_paginate'


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'

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

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

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end
279 changes: 279 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
GEM
remote: https://rubygems.org/
specs:
actioncable (5.1.6)
actionpack (= 5.1.6)
nio4r (~> 2.0)
websocket-driver (~> 0.6.1)
actionmailer (5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.1.6)
actionview (= 5.1.6)
activesupport (= 5.1.6)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.1.6)
activesupport (= 5.1.6)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.1.6)
activesupport (= 5.1.6)
globalid (>= 0.3.6)
activemodel (5.1.6)
activesupport (= 5.1.6)
activerecord (5.1.6)
activemodel (= 5.1.6)
activesupport (= 5.1.6)
arel (~> 8.0)
activesupport (5.1.6)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
ansi (1.5.0)
arel (8.0.0)
autoprefixer-rails (8.2.0)
execjs
babel-source (5.8.35)
babel-transpiler (0.7.0)
babel-source (>= 4.0, < 6)
execjs (~> 2.0)
better_errors (2.4.0)
coderay (>= 1.0.0)
erubi (>= 1.0.0)
rack (>= 0.9.0)
bindex (0.5.0)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
childprocess (0.9.0)
ffi (~> 1.0, >= 1.0.11)
coderay (1.1.2)
concurrent-ruby (1.0.5)
crass (1.0.4)
debug_inspector (0.0.3)
docile (1.3.0)
dotenv (2.2.2)
dotenv-rails (2.2.2)
dotenv (= 2.2.2)
railties (>= 3.2, < 6.0)
erubi (1.7.1)
execjs (2.7.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
ffi (1.9.23)
foundation-rails (6.4.3.0)
railties (>= 3.1.0)
sass (>= 3.3.0, < 3.5)
sprockets-es6 (>= 0.9.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
hashie (3.5.7)
i18n (1.0.1)
concurrent-ruby (~> 1.0)
jbuilder (2.7.0)
activesupport (>= 4.2.0)
multi_json (>= 1.2)
jquery-rails (4.3.3)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-turbolinks (2.1.0)
railties (>= 3.1.0)
turbolinks
json (2.1.0)
jwt (1.5.6)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.2.2)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.0)
mini_mime (>= 0.1.1)
method_source (0.9.0)
mini_mime (1.0.0)
mini_portile2 (2.3.0)
minitest (5.11.3)
minitest-rails (3.0.0)
minitest (~> 5.8)
railties (~> 5.0)
minitest-reporters (1.2.0)
ansi
builder
minitest (>= 5.0)
ruby-progressbar
multi_json (1.13.1)
multi_xml (0.6.0)
multipart-post (2.0.0)
nio4r (2.3.0)
nokogiri (1.8.2)
mini_portile2 (~> 2.3.0)
normalize-rails (4.1.1)
oauth2 (1.4.0)
faraday (>= 0.8, < 0.13)
jwt (~> 1.0)
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.8.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-github (1.3.0)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-oauth2 (1.5.0)
oauth2 (~> 1.1)
omniauth (~> 1.2)
pg (1.0.0)
pry (0.11.3)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-rails (0.3.6)
pry (>= 0.10.4)
public_suffix (3.0.2)
puma (3.11.4)
rack (2.0.4)
rack-test (1.0.0)
rack (>= 1.0, < 3)
rails (5.1.6)
actioncable (= 5.1.6)
actionmailer (= 5.1.6)
actionpack (= 5.1.6)
actionview (= 5.1.6)
activejob (= 5.1.6)
activemodel (= 5.1.6)
activerecord (= 5.1.6)
activesupport (= 5.1.6)
bundler (>= 1.3.0)
railties (= 5.1.6)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.0.4)
loofah (~> 2.2, >= 2.2.2)
railties (5.1.6)
actionpack (= 5.1.6)
activesupport (= 5.1.6)
method_source
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (12.3.1)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
ruby-progressbar (1.9.0)
ruby_dep (1.5.0)
rubyzip (1.2.1)
sass (3.4.25)
sass-rails (5.0.7)
railties (>= 4.0.0, < 6)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
selenium-webdriver (3.11.0)
childprocess (~> 0.5)
rubyzip (~> 1.2)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spring (2.0.2)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (3.7.1)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-es6 (0.9.2)
babel-source (>= 5.8.11)
babel-transpiler
sprockets (>= 3.0.0)
sprockets-rails (3.2.1)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
turbolinks (5.1.1)
turbolinks-source (~> 5.1)
turbolinks-source (5.1.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.1.9)
execjs (>= 0.3.0, < 3)
web-console (3.6.1)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
railties (>= 5.0)
websocket-driver (0.6.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
will_paginate (3.1.6)
xpath (3.0.0)
nokogiri (~> 1.8)

PLATFORMS
ruby

DEPENDENCIES
autoprefixer-rails
better_errors
binding_of_caller
byebug
capybara (~> 2.13)
dotenv-rails
foundation-rails
jbuilder (~> 2.5)
jquery-rails
jquery-turbolinks
listen (>= 3.0.5, < 3.2)
minitest-rails
minitest-reporters
normalize-rails
omniauth
omniauth-github
pg (>= 0.18, < 2.0)
pry-rails
puma (~> 3.7)
rails (~> 5.1.6)
sass-rails (~> 5.0)
selenium-webdriver
simplecov
spring
spring-watcher-listen (~> 2.0.0)
tzinfo-data
uglifier (>= 1.3.0)
web-console (>= 3.3.0)
will_paginate

RUBY VERSION
ruby 2.5.0p0

BUNDLED WITH
1.16.1
Loading