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

Seeds #113

Open
wants to merge 231 commits into
base: main
Choose a base branch
from
Open

Seeds #113

wants to merge 231 commits into from

Conversation

BJSherman80
Copy link

added seeds

BJSherman80 and others added 30 commits October 27, 2020 12:59
@BJSherman80
created model validations for user
d844fb2
@BJSherman80
created test for creating a new user
ffac508
@BJSherman80
created migration for users
856b02e
@BJSherman80
create migration for users
41e4672
@BJSherman80
added users routes
f666fcc
@BJSherman80
created welcome view
f624c62
@BJSherman80
created users show page
92bf024
@BJSherman80
created new user form
dc143cf
@BJSherman80
added register link to application.html
72b28f9
@BJSherman80
created user model with validations and secure password / uniqueness
e371c03
@BJSherman80
created welcome controller
2a14878
@BJSherman80
added new /create / show and private params to user controller
8d904de
@BJSherman80
added helper method current_user
a3ea015
@BJSherman80
added bcrypt to gem file
139e165
@BJSherman80
add validation for email and password
636edbd
@helloeduardo
Merge pull request #1 from nmking22/user_story10
2fcee2c 
User story10
@BJSherman80
remove save and open page
829930d
@BJSherman80
changed password syntax
e6b0747
@BJSherman80
addded test for user show and for missing fields
dcd0903
@BJSherman80
added to the update method for missing fields
3bf03ec
@BJSherman80
added flash and conditional for missing fields
bf31b08
@helloeduardo
Merge pull request #2 from nmking22/user_story11
39db813 
User story11
@BJSherman80
add some syntax changes
a30b940
@BJSherman80
add method test for duplicate emails //passing spec
8c24e45
@BJSherman80
edit spec
3802e78
@BJSherman80
crteate method for duplicate_email?
4928dd7
@BJSherman80
add conditional for duplicate email
6e7f18b
@nmking22
Merge pull request #4 from nmking22/user_story12
3444366 
User story12
@the-color-bliu
Add link paths for Home, Log In, and Register in the nav bar.
8e50b56
@the-color-bliu
Add route for login to sessions#new
b2d8c7b
the-color-bliu and others added 30 commits November 1, 2020 13:50
@the-color-bliu
Commit changes to prep for us 40 and 41.
57d0645
@the-color-bliu
Merge branch 'merchant_dashboard' of github.com:nmking22/monster_shop…
0b8907f 
…_2008 into merchant_index_page
@BJSherman80
added orderly gem
30ca18d
@BJSherman80
added order(:status) AR method to Orders
bda5f86
@BJSherman80
create user dashboard controller for restfull routing & show action
fcde350
@BJSherman80
add enum to our order
5d31974
@BJSherman80
create admin user show view
284860a
@BJSherman80
create admin dashboard view
320bb96
@BJSherman80
added route for users dashboard show action
a3a1382
@BJSherman80
removed migration
39aeeda
@BJSherman80
add status as integer and a default of 'pending'
2834b53
@BJSherman80
Migrations for order status
bb92eb4
@BJSherman80
test for admin user show page
2eb292e
@helloeduardo
Merge pull request #32 from nmking22/us31
a0bbcfa 
Us31
@the-color-bliu
Add button to enable merchant from admin dash.
c8142e1
@the-color-bliu
Add conditional to update method for admin to enable/disable merchant.
66d0a0b
@the-color-bliu
Add test admin can enable merchant from dashboard.
ad57c98
@helloeduardo
Merge pull request #33 from nmking22/us32
5dcf2f1 
Us32
@BJSherman80
create test for admin to ship an order
1ec7bec
@BJSherman80
add route for admin user update action
dbebbd7
@BJSherman80
add link to ship order and conditional w/ mock cancel button
1a6505c
@BJSherman80
create update action for admin user
242b74b
@BJSherman80
add space for merge
7e9e54e
@the-color-bliu
Add test admin can enable a merchant and their items.
751a2cf
@the-color-bliu
Add conditional for admin to activate merchant items.
8da5503
@helloeduardo
Merge pull request #34 from nmking22/us-33
a0703d6 
add space for merge
@helloeduardo
Merge pull request #35 from nmking22/us32
d084a6b 
Us32
@the-color-bliu
Merge branch 'main' of github.com:nmking22/monster_shop_2008 into mer…
6e08128 
…chant_index_page
@helloeduardo
Merge pull request #36 from nmking22/merchant_index_page
4be0121 
Merchant Dashboard and Merchant Index Page
@BJSherman80
add seeds for development
22d9183
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
@BJSherman80 @helloeduardo @nmking22 @the-color-bliu