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

Alice, Noor, Schanen, Blaine Fire & Earth AloeBae bEtsy #73

Open
wants to merge 242 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
242 commits
Select commit Hold shift + click to select a range
52a2473
Created rails new and ignored .env/.idea
Blaine206 Nov 17, 2020
92f69aa
Created merchant controller.
Blaine206 Nov 17, 2020
8deece4
Created products controller.
Blaine206 Nov 17, 2020
47e2bca
Created customers controller.
Blaine206 Nov 17, 2020
51d6d41
MODELS: Setup for Merchant, Customer & Product.
schanenR Nov 17, 2020
50f01a8
Deleted Customer controller & model
Blaine206 Nov 17, 2020
a50fab0
Updated schema - removed Customer
Blaine206 Nov 17, 2020
b22e535
created Order controller.
hn4ever Nov 17, 2020
48a50a7
created OrderItems controller.
hn4ever Nov 17, 2020
14bcbb9
added Order Model
hn4ever Nov 17, 2020
c777d72
migrated
hn4ever Nov 17, 2020
88a297c
MERGE: Cleared migrations
schanenR Nov 18, 2020
3f02715
FIX MERGE CONFLICT
schanenR Nov 18, 2020
4824f20
created CRUD for Merchants controller
hn4ever Nov 18, 2020
4b9be21
created CRUD for Merchants controller and did initial route configura…
hn4ever Nov 18, 2020
713eb14
VALIDATIONS: Basic validations added.
schanenR Nov 18, 2020
374fcf8
FIXTURES
schanenR Nov 18, 2020
95bcec7
FIXTURES
schanenR Nov 18, 2020
b14fc74
FIXTURE: Merchant, product, order & orderitems fixtures added.
schanenR Nov 18, 2020
b0857c3
VALIDATIONS: Product and merchant validations tests added.
schanenR Nov 18, 2020
628d77b
ADDED COMMENTS
schanenR Nov 18, 2020
8fcb7cf
Add crud methods to products
Nov 18, 2020
ed58b0a
YML: Reworked relationship in fixtures
schanenR Nov 18, 2020
026e74c
Adding some views to products
Nov 18, 2020
b38c9ce
Adding homepage
Nov 18, 2020
3dc2a44
Merge pull request #5 from aliceboone/homepage
schanenR Nov 18, 2020
2a551d3
Merge pull request #4 from aliceboone/product/views
schanenR Nov 18, 2020
f7a28c5
Merge pull request #2 from aliceboone/skr/fixtures
aliceboone Nov 18, 2020
2cf671e
Merge pull request #1 from aliceboone/validations_branch
aliceboone Nov 18, 2020
2c11260
CHECKOUT COMMIT
schanenR Nov 18, 2020
e157857
added some tests to Merchants controller.
hn4ever Nov 18, 2020
9dce5ee
Merge pull request #6 from aliceboone/nr
hn4ever Nov 18, 2020
12e2692
created all merchant, order, & product seeds
Blaine206 Nov 18, 2020
7ff15f4
fixed seeding
Blaine206 Nov 18, 2020
b3165f4
Merge branch 'master' into bga/seeding
Blaine206 Nov 18, 2020
09173b8
ORDERITEM: Model added.
schanenR Nov 18, 2020
d8e3100
fixing a @import in css
Nov 18, 2020
a54810a
fixing missing }
Nov 18, 2020
5b12e46
Merge pull request #8 from aliceboone/item_model
Blaine206 Nov 18, 2020
ea4eb1f
fixing a @import in css
Nov 18, 2020
4e7fa0b
Change model product
Nov 18, 2020
295500d
Merge branch 'master' into bga/seeding
Blaine206 Nov 18, 2020
3096f13
Merge pull request #7 from aliceboone/bga/seeding
Blaine206 Nov 18, 2020
508c136
Merge pull request #9 from aliceboone/products/styles
Blaine206 Nov 18, 2020
c2c353a
Merge branch 'master' into products/model
Blaine206 Nov 18, 2020
575ca2a
Merge pull request #10 from aliceboone/products/model
Blaine206 Nov 18, 2020
880e406
CHECKOUT COMMIT
schanenR Nov 18, 2020
8fb90ec
FIXTURES: Product 'merchant' chaged to 'merchant_id' to match table.
schanenR Nov 18, 2020
62a03b7
Merge branch 'master' into skr/fixtures
schanenR Nov 18, 2020
06f1468
FIXTURES AND TABLES: Order_item model undates for product_id and orde…
schanenR Nov 18, 2020
a21faed
finalized merchants controllers and tests (only one remained for vali…
hn4ever Nov 19, 2020
ba43084
Merge pull request #11 from aliceboone/nr
schanenR Nov 19, 2020
2b91689
Merchant and Product validation tests passing
schanenR Nov 19, 2020
c10ac62
ORDER-ITEM: Validations written with passing tests.
schanenR Nov 19, 2020
e8f5115
Merge pull request #12 from aliceboone/skr/fixtures
schanenR Nov 19, 2020
3d483b1
update test controller for products
Nov 19, 2020
1020b69
Merge pull request #13 from aliceboone/test/controller/products
schanenR Nov 19, 2020
de16ebf
OAuth setup, merchant controller create, helper method, routes.
schanenR Nov 19, 2020
aa4f85e
Adding more routes
Nov 19, 2020
0a7b3be
update routes
Nov 19, 2020
17e1468
OAuth: set-up and added logic to application.html.erd.
schanenR Nov 19, 2020
c0e59e4
Merge pull request #15 from aliceboone/routes
schanenR Nov 19, 2020
4b09f55
Merge branch 'master' into OAuth
schanenR Nov 19, 2020
f561a77
Merge pull request #16 from aliceboone/OAuth
hn4ever Nov 19, 2020
f2dbfed
Working on categories and tests
Nov 19, 2020
85680fa
Merge branch 'master' into working_branch
Nov 19, 2020
0092da3
Clean up some tests
Nov 19, 2020
5aaa918
Merge pull request #17 from aliceboone/working_branch
aliceboone Nov 19, 2020
aa88c9f
Add review routes
Nov 19, 2020
40101fc
add routes to reviews
Nov 19, 2020
1f23dae
Logout route fix.
schanenR Nov 19, 2020
bd31ed4
created views for Merchants and CRUD for Orders.
hn4ever Nov 20, 2020
5503948
fixing controller error"
Nov 20, 2020
42dd495
Add category migration'
Nov 20, 2020
6d65774
CRUD for Orders
hn4ever Nov 20, 2020
689cb17
commented some lines in Product views, we had a merge conflict
hn4ever Nov 20, 2020
8298184
Merge pull request #19 from aliceboone/nr
hn4ever Nov 20, 2020
bb44aa7
Add views to categories
Nov 20, 2020
70f6012
update views layouts and homepage
Nov 20, 2020
c6d59f6
update produtcs views
Nov 20, 2020
3e03f2a
update routes
Nov 20, 2020
5941ffa
add pictre test
Nov 20, 2020
162d171
Merge branch 'master' into layout_views
aliceboone Nov 20, 2020
57e4267
Merge pull request #20 from aliceboone/layout_views
aliceboone Nov 20, 2020
cafd124
added methonds to OrderItem controller and routes
hn4ever Nov 20, 2020
ffa50ba
added methonds to OrderItem controller and routes
hn4ever Nov 20, 2020
0463859
Merge branch 'master' into nr
hn4ever Nov 20, 2020
fd63a4a
Merge pull request #21 from aliceboone/nr
hn4ever Nov 20, 2020
af9ae77
made the shopping cart
hn4ever Nov 20, 2020
f1e4b12
Merge branch 'master' into nr
hn4ever Nov 20, 2020
3993952
updated cart path
hn4ever Nov 20, 2020
b1ec6ac
Merge pull request #22 from aliceboone/nr
Blaine206 Nov 20, 2020
0f465e0
Add a > that was missing
Nov 20, 2020
ab09c6b
Merge commit
schanenR Nov 20, 2020
4ed5068
add some css to the forms
Nov 20, 2020
86e455a
Merge Coomit
schanenR Nov 20, 2020
998583d
Merge branch 'master' of https://github.com/aliceboone/betsy
schanenR Nov 20, 2020
ca611a0
Merge pull request #23 from aliceboone/resolve
schanenR Nov 20, 2020
7dbf63f
add missing tag
Nov 20, 2020
2ca4253
fixed a view bug with closing tag
hn4ever Nov 20, 2020
8570245
fixed view with closing tag
hn4ever Nov 20, 2020
76614c1
Commit changes create don wrong branch before merge
schanenR Nov 21, 2020
51f0bbf
Merge branch 'master' into OAuth
schanenR Nov 21, 2020
307ce45
Merge pull request #24 from aliceboone/OAuth
hn4ever Nov 21, 2020
9a4df5c
Add user autentication, discontinue products
Nov 21, 2020
6e31f3b
seed category
Blaine206 Nov 21, 2020
9599790
seed category-merged things
Blaine206 Nov 21, 2020
6cb2670
Merge branch 'master' into current_user
aliceboone Nov 21, 2020
3823d81
Merge pull request #25 from aliceboone/current_user
Blaine206 Nov 21, 2020
8aa4a56
Merge branch 'master' into bag/catseed
Blaine206 Nov 21, 2020
584fc1c
Merge pull request #26 from aliceboone/bag/catseed
Blaine206 Nov 21, 2020
bd941ed
Merge commit
schanenR Nov 21, 2020
724c82c
MERGE COMMIT
schanenR Nov 21, 2020
9341137
Add reviews
Nov 21, 2020
d5a13f0
Merge pull request #27 from aliceboone/current_user
schanenR Nov 21, 2020
a16156c
MERGE COMMIT
schanenR Nov 21, 2020
cc60d7a
Merge branch 'master' of https://github.com/aliceboone/betsy
schanenR Nov 21, 2020
dc65695
CHECKOUT COMMIT
schanenR Nov 22, 2020
399cb7f
Clean up all the testes for categories, rewies and products
Nov 22, 2020
21accb3
Merge pull request #29 from aliceboone/Cleanup_testes
schanenR Nov 22, 2020
fdbc054
Merge branch 'master' into skr/fixtures
schanenR Nov 22, 2020
6014af8
Merge pull request #28 from aliceboone/skr/fixtures
schanenR Nov 22, 2020
e27f0d5
Revert "Skr/fixtures"
schanenR Nov 22, 2020
4d675d1
Merge pull request #30 from aliceboone/revert-28-skr/fixtures
schanenR Nov 22, 2020
b7c58bb
MERGE COMMIT
schanenR Nov 22, 2020
1898619
Merge Commit
schanenR Nov 22, 2020
a1e8307
Merge pull request #31 from aliceboone/skr/fixtures
schanenR Nov 22, 2020
8b3827a
Added missing review yml
schanenR Nov 22, 2020
858e827
Merge pull request #32 from aliceboone/skr/fixtures
aliceboone Nov 22, 2020
9fa43b5
REVIEW: Validations tests written and passing.
schanenR Nov 22, 2020
705aef5
Merge pull request #33 from aliceboone/validations_branch
Blaine206 Nov 22, 2020
f519de5
FIX: before application cont for current user. Homepage css work.
schanenR Nov 22, 2020
a1fbb98
worked on tests of order and order_items controllers, skipped the one…
hn4ever Nov 22, 2020
913870d
HOMEPAGE: CSS and application styling.
schanenR Nov 22, 2020
abbd7bc
Fixing review test controller
Nov 22, 2020
ec23153
taking out a skip in a test
Nov 22, 2020
3f29feb
Merge branch 'master' into homepage
schanenR Nov 22, 2020
fe704d8
Merge pull request #34 from aliceboone/nr
aliceboone Nov 22, 2020
eaa890c
Merge pull request #36 from aliceboone/homepage
aliceboone Nov 22, 2020
909bc60
relationship tests W.I.P.
Blaine206 Nov 22, 2020
04fc23f
MERGE CONFLICT
Blaine206 Nov 22, 2020
bd323e0
worked on issues with orders and orders test.
hn4ever Nov 22, 2020
7b8d82c
fixed issues with order controller
hn4ever Nov 22, 2020
66fcdec
W.I.P. Realations tests
Blaine206 Nov 23, 2020
463c554
seed update order/products/category
Blaine206 Nov 23, 2020
72a3aa1
Merge pull request #38 from aliceboone/bga/seeds_refact
hn4ever Nov 23, 2020
586a942
created form to add quantity (according to product stock) of a produc…
hn4ever Nov 23, 2020
c5119c3
Merge branch 'master' into nr
Blaine206 Nov 23, 2020
91141e7
created add quantity to the shopping cart
hn4ever Nov 23, 2020
b21d543
Merge pull request #37 from aliceboone/nr
Blaine206 Nov 23, 2020
0b44025
worked on cart: adding products by quantity
hn4ever Nov 23, 2020
27f67b0
Merge branch 'master' into bga/relations_t
Blaine206 Nov 23, 2020
7c29a22
merch model relation t fin
Blaine206 Nov 23, 2020
3159134
product relation test w.i.p
Blaine206 Nov 23, 2020
22a50aa
order_item relation test fin
Blaine206 Nov 23, 2020
8fd66bc
order relation t w.i.p.
Blaine206 Nov 23, 2020
c66c20d
created migtation updating merchant table and removing
Blaine206 Nov 23, 2020
3fdf63a
added the functionality of adding a product to a cart with view modif…
hn4ever Nov 23, 2020
bc6e5d5
Merge pull request #39 from aliceboone/nr
hn4ever Nov 23, 2020
0bee47e
Merge branch 'master' into bga/migration
Blaine206 Nov 23, 2020
5cb890e
Fixing some missing code and update some views
Nov 23, 2020
181d4c3
Merge branch 'master' into Fixing_views
aliceboone Nov 23, 2020
c74a4ce
re-seed adding status to csv
Blaine206 Nov 23, 2020
4e699aa
Merge pull request #40 from aliceboone/Fixing_views
schanenR Nov 23, 2020
114eaad
updated seeds/added status/added migration cc in orders
Blaine206 Nov 23, 2020
16c1409
Merge branch 'master' into bga/migration
Blaine206 Nov 23, 2020
c9fc1ae
Merge pull request #42 from aliceboone/bga/migration
Blaine206 Nov 23, 2020
808ff19
finalized checkout cart
hn4ever Nov 23, 2020
9fcd6ed
Merge branch 'master' into nr
hn4ever Nov 23, 2020
22266a2
Merge pull request #43 from aliceboone/nr
Blaine206 Nov 23, 2020
4e8bf22
changed some login requirments.
hn4ever Nov 24, 2020
d4f65df
application find product method written
schanenR Nov 24, 2020
6228ab2
added simplecov to gemfile
schanenR Nov 24, 2020
cbd0745
Merge pull request #44 from aliceboone/login
schanenR Nov 24, 2020
d3f0127
Merge pull request #45 from aliceboone/find_product
schanenR Nov 24, 2020
2bd96aa
Merge pull request #46 from aliceboone/simplecov
hn4ever Nov 24, 2020
fabb7f1
Schema test failures fixed
schanenR Nov 24, 2020
a08ed73
Merge branch 'master' into fix-tests
schanenR Nov 24, 2020
a0bf451
SimpleCov
Blaine206 Nov 24, 2020
8e6a62e
Fixed some tests, still have 2 fail 1 error.
schanenR Nov 24, 2020
59bcd06
Merge pull request #48 from aliceboone/fix-tests
Blaine206 Nov 24, 2020
d9a4509
Merge branch 'master' into bga/relations_t
schanenR Nov 24, 2020
ed6b749
Merge pull request #47 from aliceboone/bga/relations_t
schanenR Nov 24, 2020
e907bca
weird pull confict
Blaine206 Nov 24, 2020
b8afc89
fixed issue with the checkout
hn4ever Nov 24, 2020
712f7ed
fixed issue the checkout
hn4ever Nov 24, 2020
255bf79
Merge branch 'master' into cart-forms
schanenR Nov 24, 2020
b87cd42
Merge pull request #49 from aliceboone/cart-forms
schanenR Nov 24, 2020
2087ba9
Coverage to gitignore
schanenR Nov 24, 2020
a9aa962
things i didn't change'
Blaine206 Nov 24, 2020
9a8832a
Merge pull request #50 from aliceboone/coverage
aliceboone Nov 24, 2020
f0ef8b2
Fixing some views
Nov 24, 2020
8c14175
Merge branch 'master' of https://github.com/aliceboone/betsy into master
Blaine206 Nov 24, 2020
95f1ef6
add dasboard
Nov 24, 2020
3e9ee96
removed coverage from gitignore
schanenR Nov 24, 2020
5588399
deleted coverage folder
schanenR Nov 24, 2020
cf96ae5
added coverage to gitignore
schanenR Nov 24, 2020
a2b51e0
started views and model methods for calculating total orders
hn4ever Nov 24, 2020
d9ea6a7
Merge pull request #52 from aliceboone/final-orders-view
aliceboone Nov 24, 2020
eca3252
Merge branch 'master' into dashboard
Nov 24, 2020
9ff5269
Merge pull request #53 from aliceboone/dashboard
schanenR Nov 24, 2020
5d50802
Fixing cart views
Nov 24, 2020
4d5bbb9
Fixing cart views
Nov 24, 2020
f9a99d3
Merge branch 'master' into cart_views
aliceboone Nov 24, 2020
53c5df3
Merge pull request #54 from aliceboone/cart_views
aliceboone Nov 24, 2020
64c9ee8
dashboard
Nov 24, 2020
8e638fc
Merge pull request #55 from aliceboone/views
aliceboone Nov 24, 2020
6265b9d
finalized funactionality of adding,removing,reducing the quantity of …
hn4ever Nov 25, 2020
7d72e01
Merge branch 'master' into final-orders-view
aliceboone Nov 25, 2020
4531af4
Merge pull request #56 from aliceboone/final-orders-view
aliceboone Nov 25, 2020
a1beaca
more views
Nov 25, 2020
8702fee
Merge pull request #57 from aliceboone/views
hn4ever Nov 25, 2020
13a918b
modifed order summary page after checkout
hn4ever Nov 25, 2020
fe1fb50
Changed icon and color background cart
schanenR Nov 25, 2020
69df4ee
Merge pull request #58 from aliceboone/final-orders-view
aliceboone Nov 25, 2020
16831bc
Cart view finished
Nov 25, 2020
0365473
Merchant controller order status varibles
schanenR Nov 25, 2020
065f901
Merge branch 'master' of https://github.com/aliceboone/betsy into master
Blaine206 Nov 25, 2020
66ac2c8
dash stuff
schanenR Nov 25, 2020
094912d
More views
Nov 25, 2020
00eb53f
stach pop cart logo
schanenR Nov 25, 2020
2ad762b
Merge branch 'master' into skr/dashboard
schanenR Nov 25, 2020
2955a78
Merge branch 'master' of https://github.com/aliceboone/betsy into master
Blaine206 Nov 25, 2020
4b318b6
Merge branch 'master' of https://github.com/aliceboone/betsy into master
Blaine206 Nov 25, 2020
ed711a0
fixing some testes
Nov 25, 2020
fdc1ad6
Fix - can't edit another merchants product
schanenR Nov 25, 2020
5c5f604
Views and tests
Nov 25, 2020
3dbc6e4
Adding table to dashboard
Nov 25, 2020
862a1fb
FIX cannot edit/discontinue another merchant product
schanenR Nov 25, 2020
823c97b
Merge pull request #59 from aliceboone/fixes
schanenR Nov 25, 2020
9215278
added shop images
schanenR Nov 25, 2020
b8cbf5d
Merge branch 'master' of https://github.com/aliceboone/betsy into master
Blaine206 Nov 25, 2020
7bc4555
merchant dash icons
schanenR Nov 25, 2020
14cb9f4
price_float_migration
Blaine206 Nov 25, 2020
764d76e
Merge pull request #60 from aliceboone/bga/price_float_migration
Blaine206 Nov 25, 2020
f0bc00e
fixing errors
Nov 25, 2020
2c6ca7d
Fixed dash order totals
schanenR Nov 25, 2020
6af01b0
Merge pull request #61 from aliceboone/dashfix
schanenR Nov 25, 2020
b52735e
fixing tests
Nov 25, 2020
f0817ce
fixing tests
Nov 25, 2020
b601195
Pull request template
Blaine206 Nov 25, 2020
df39f43
Merge branch 'master' into bga/price_float_migration
Blaine206 Nov 25, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:migration" /><Generator name="active_record:model" /><Generator name="active_record:observer" /><Generator name="active_record:session_migration" /><Generator name="controller" /><Generator name="erb:controller" /><Generator name="erb:mailer" /><Generator name="erb:scaffold" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="mailer" /><Generator name="metal" /><Generator name="migration" /><Generator name="model" /><Generator name="model_subclass" /><Generator name="observer" /><Generator name="performance_test" /><Generator name="plugin" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="session_migration" /><Generator name="stylesheets" /><Generator name="test_unit:controller" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:observer" /><Generator name="test_unit:performance" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /></GeneratorsGroup></Settings>
20 changes: 10 additions & 10 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ 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? |
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? |
Each team member: what is one thing you were primarily responsible for that you're proud of? | Alice: CSS/Views/& Styling, Schanen: OAuth/External technologies, Noor: Cart functionality, Blaine:
Each team member: what is one thing you were primarily responsible for that you would like targeted feedback on? | Noor & Blaine: Cart, make it work., Alice: Login/Authentication, Schanen:
How did your team break up the work to be done? | We divided things up on Trello, and delegated during standups. Team members picked features they wanted to work on.
How did your team utilize git to collaborate? | Our team utilized pull requests. We would create
What did your group do to try to keep your code DRY while many people collaborated on it? | Created helper methods, used before, lets, & fixtures.
What was a technical challenge that you faced as a group? | Collectively understanding an working through the merchant dashboard model logic.
What was a team/personal challenge that you faced as a group? | Scheduling, organization, exhaustion, git-hygiene, communication, and communication.
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/1xz9bvimUd1qiRrT2hLy6LuM77IcK3pVg/view?usp=sharing
What is your Trello URL? | https://trello.com/b/lWgtnyJN/besty-fun-project
What is the Heroku URL of your deployed application? | https://aloebae-app.herokuapp.com/
38 changes: 38 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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'
.idea
.env
coverage
# 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
7 changes: 7 additions & 0 deletions .rakeTasks
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Remove rake task
2. Add existing rake tasks
To add existing rake tasks automatically delete this file and reload the project.
--><RakeGroup description="" fullCmd="" taksId="rake" /></Settings>
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
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'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3', '>= 6.0.3.4'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'
gem 'omniauth'
gem 'omniauth-github'
# 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'
gem 'dotenv-rails'
end

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

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

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

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

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

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