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.

Sign up for GitHub

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

Jump to bottom

Sandy bootstrap form #48

Open
wants to merge 172 commits into
base: master
Choose a base branch
from
Open

Sandy bootstrap form #48

wants to merge 172 commits into from

Conversation

crypt0kitty
Copy link

@crypt0kitty crypt0kitty commented Nov 23, 2020 •
edited
Loading

No description provided.

Beatress and others added 30 commits November 17, 2020 15:17
@Beatress
Ran rails nw
11a6e97
@Beatress
Updated gitignore to exclude env and idea
d288751
@Beatress
Generated migrations for product, merchant, order, orderitem
886093c
@Beatress
Ran rails db:migrate and made model relations
8dbc181
@Beatress
Updated lockfile and generated Merchants controller
5f5923e
Added controllers to petsy
7b40d2b
@Beatress
Removed order_item_id reference column from order table
f17c7eb
@Beatress
Added seed data
d7d1861
added indirect relationship
06a5d70
added indirect relationship
04052dd
@idago123
added merchant and product views and index controller action
6ca9594
initial style push to sandy-pEtsy-theme
1b13306
@Beatress
Added basic product CRUD
2501dd0
@Beatress
Some basic CRUD and view refinements for product/merchant
67f1e8e
@idago123
add validations for merchant class
7df9f20
@idago123
added validations for product and orderitem classes
09a74c1
@idago123
updated product validation
df59510
@idago123
added validation and relationship tests for Product class
48be2df
@idago123
updated merchant and product test validations
f12b296
@seattlefurby17
Set up omniauth, .env and initilaizer
45bdd50
@seattlefurby17
create method and helper method for merchants
0b4ef09
@idago123
added products controller tests
65d4f10
@seattlefurby17
log_out, current_user methods
c979cef
@seattlefurby17
Updated Oauth testing for merchants
ce46b2c
@idago123
Merge pull request #2 from seattlefurby17/testing
421bd5f 
Testing
@Beatress
Merge pull request #1 from seattlefurby17/product-crud
82a6ca5 
Product crud
@seattlefurby17
Fixed merchant controller tests
ac761e8
@seattlefurby17
Merge branch 'master' into Oauth_Users
3ab82b3
@seattlefurby17
Merge pull request #3 from seattlefurby17/Oauth_Users
a29232a 
Oauth users
@seattlefurby17
Merged conflict fixed
beeec44
Sandy and others added 30 commits November 24, 2020 16:20
Added rounded corners to pics
1693325
@seattlefurby17
updated homepages controller test
ed9e258
@idago123
added retire tests
5e8133d
@seattlefurby17
Updated test_helper simplecov
61bd34a
@Beatress
Wrote tests for merchant and order controller
71c1ce7
@Beatress
Merge pull request #19 from seattlefurby17/tuesday-tests
edbdfd6 
Wrote tests for merchant and order controller
@idago123
added find product
8053698
@idago123
added find product test
9d10aba
@Beatress
Merge pull request #20 from seattlefurby17/productcontroller
7889dc9 
Productcontroller
Added test framework for order items
efc6f5f
Added test framework for order items
8128bc9
@seattlefurby17
merchant model tests
3478614
Merge pull request #21 from seattlefurby17/sandy-branch-03
7d665b7 
Sandy branch 03
initial push
b1cc87e
Merge pull request #22 from seattlefurby17/sandy-tests-branch
e43ea79 
Sandy tests branch
@seattlefurby17
merchant model tests
0fc8e38
@seattlefurby17
Merge branch 'master' of https://github.com/seattlefurby17/betsy into…
8a73d31 
… master
@Beatress
Added check for product not found in add to cart
b5059a7
order item tests
b777715
Merge branch 'master' into sandy-tests-branch
0a8bedc
Merge pull request #23 from seattlefurby17/sandy-tests-branch
8ebf23f 
order item tests
@idago123
added more tests including edge cases for total rev, total num and to…
02c9e5f 
…tal orders
@idago123
updated total orders test
d62d556
more files
3c96e68
@Beatress
98% coverage
7bf7307
@Beatress
Merge branch 'master' of github.com:seattlefurby17/betsy
a39fe27
Added social media icons to footer
471c5d6 
Added spacing to homepage title for better presentation
Added border to homepage pictures to match products page
Added more pics of Churro
added social media icons
ac3fa61
Added social media icons to footer
00e351d 
Added spacing to homepage title for better presentation
Added border to homepage pictures to match products page
Added more pics of Churro
Added styling to order summary receipt
18391ea
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@crypt0kitty @Beatress @idago123 @seattlefurby17