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

Refactorx2 routes #122

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

Refactorx2 routes #122

wants to merge 269 commits into from

Conversation

GarrettCottrell
Copy link

Added def put(*) end to routes file to remove put routes from resources

jakeheft and others added 30 commits October 27, 2020 14:10
@jakeheft
Update object in test to merchant_user
c2228d4
@jakeheft
Add functionality to log in as admin
7d1be6d
@jakeheft
Add test to check for invalid credentials
f7959e2
@GregJMitchell
resolve merge conflicts
c16b4de
@GregJMitchell
Reslolve merge conflict
db6bb33
@GregJMitchell
Reslolve merge conflict
32dc653
@GregJMitchell
Update test to log user in and then check for links
6937f4f
@GregJMitchell
Remove duplicate routes
8244c5e
@GregJMitchell
Remove duplicate actions
17b6151
@GregJMitchell
Update nav bar to show links based off role
19dd34f
@jakeheft
Add test to make sure invalid email or password is returned to login …
84cf90a 
…with flash
@jakeheft
Add role into test user objects
16fe3ce
@jakeheft
Add functionality to prevent user from logging in with incorrect cred…
dd463f2 
…entials
@GregJMitchell
Fix user roles to be 1,2, or 3
2e866b3
@GregJMitchell
Update tests to use new user roles
a067b46
@GregJMitchell
Update nav bar to show links based off role
de9be26
@GregJMitchell
Update describe block in test:
2fe149c
@GregJMitchell
Create test for admin nav bar
50de003
@jakeheft
Update test to log user in
fe3432c
@GregJMitchell
Add admin links to nav bar
707e23c
@jakeheft
Add functionality for logged in user to not see login page
8e04a61
@GregJMitchell
Update test for visitor auth
befb270
@GregJMitchell
Add require role functionality to admin, merchant, and user controllers
efae3b4
@jakeheft
Add tests for merchant and admin to be directed to proper page when t…
c974c96 
…rying to login again
@jakeheft
Build functionality to redirect already logged in admin and merchant
2ac7fa1
@GregJMitchell
Create test for user auth for admin and merchant pages
ec4d3d3
@GregJMitchell
Re-organize user controllers
03eef35
@GregJMitchell
Create test for merchant auth to admin
b36b536
@GregJMitchell
Update test for merchant auth to admin
bb25ead
@GregJMitchell
Create cart base controller for auth
d6229d0
abcdefghijohnk and others added 30 commits November 4, 2020 17:10
@abcdefghijohnk
update view, controller, and route for admin user
5eb3515
@abcdefghijohnk
create spec for admin user show
caa1918
@abcdefghijohnk
update show action in user controller
7d05f69
@abcdefghijohnk
update view for admin user show page
927a074
@GarrettCottrell
Merge pull request #17 from jakeheft/admin_merchant/user_pages
391b374 
Admin merchant/user pages
@abcdefghijohnk
update css and styling for merchant dashboard
51218a8
@jakeheft
Update seeds with accurate objects
f1ccd0b
@jakeheft
Update seeds
5673445
@abcdefghijohnk
update css and styling for buttons and text color
290e413
@abcdefghijohnk
refactor
93b1c19
@GregJMitchell
Refactor models
ded2201
@abcdefghijohn
Merge pull request #18 from jakeheft/refactor_seeds
2e27dc5 
Refactor seeds
@GregJMitchell
Merge pull request #19 from jakeheft/refactor_style
d2f530b 
Refactor style
@jakeheft
Merge pull request #20 from jakeheft/refactor_models
37c72d3 
Refactor models
@abcdefghijohnk
create spec and itemorder method items_left update controller
4e85ab3
@GregJMitchell
Create test for cancel order method
37fbc41
@GregJMitchell
Create cancel order method
42e1869
@GregJMitchell
Refactor controllers using rubocop
434cbca
@GarrettCottrell
change routes to resources
9071dbb
@GarrettCottrell
edit symbol arrays to use %i syntax
ac32478
@jakeheft
Correct status naming for order items and make casing consistent
71f58d2
@jakeheft
Merge pull request #21 from jakeheft/refactor_admin_controllers
81e1eae 
create spec and itemorder method items_left update controller
@GregJMitchell
Change empty method syntax
8691d69
@GregJMitchell
resolve merge conflicts
8d76bd9
@jakeheft
Merge pull request #22 from jakeheft/refactor_non_admin_controllers
1665f18 
Refactor non admin controllers
@jakeheft
Merge branch 'main' into refactor_statuses
6e408db
@GregJMitchell
Merge pull request #25 from jakeheft/refactor_statuses
10e4b52 
Correct status naming for order items and make casing consistent
@jakeheft
Correct status capitalization errors that GREG made
15c276e
@jakeheft
Merge pull request #24 from jakeheft/refactor_routes
7cda042 
Refactor routes
@GarrettCottrell
added syntax to remove put from resource routes
45d9a60
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.
5 participants
@GarrettCottrell @jakeheft @GregJMitchell @abcdefghijohn @abcdefghijohnk