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

User Enhancements #49

Merged
merged 11 commits into from
Jun 6, 2016
Merged

User Enhancements #49

merged 11 commits into from
Jun 6, 2016

Conversation

michaelpelletier
Copy link
Contributor

@michaelpelletier michaelpelletier commented May 31, 2016

  • Tweaks to the Splash page based on Kevin's comments / changes.
  • Database changes:
    • Add Team table.
    • Add Team Role table.
    • Change User Table to reference both Team Table and Team Role table.
    • Add Seed Data
    • Change Income to reference Team table instead of being a string.
    • Change Public Relations to reference Team table instead of being a string.
    • Change Bonus Credits to reference Team table instead of being a string.
  • Adjust styling for Listing Users / Editing User.
  • Add view for Add User
  • Add views for Adding/Editing Teams.
  • Add/Edit user is not saving correctly.

end

# POST /user
# POST /user.json
def create
@user = User.new(user_params)
puts "NEW USER"
puts @user
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was me testing and should be removed, but FYI it never seems to actually get to this point.

@FifthSurprise
Copy link
Contributor

FifthSurprise commented Jun 2, 2016

The reason edit/new isn't working is because your form routes to Users::RegistrationsController instead of UsersController. This is because Devise gem overrides the registration process to handle that. I think removing that override in the routes.rb:7 might be the easy fix but it might not be...

@FifthSurprise
Copy link
Contributor

Okay I'm done for now. I'll poke around some more once we settle down on schema changes.

@michaelpelletier
Copy link
Contributor Author

@FifthSurprise - I didn't remove the seed data for countries yet because I'm not sure how we want to handle it, but I did add views (that work!) for adding other countries.

I am not sure what these lines are meant to do, so I am not sure if they still work - https://github.com/MegaGameSociety/WatchTheSkiesDashboard/blob/develop/app/controllers/games_controller.rb#L30

I also am having an issue with this where creating a User doesn't seem to work - it redirects to the Splash Page.

Other than those two things, this should possibly be finished!

@FifthSurprise
Copy link
Contributor

Those lines represent the conversion of income level to the # of credits they receive. It's different per country and should probably get moved into the Team Structure/Seed Data at some point. I'll make a separate ticket for this.

@michaelpelletier
Copy link
Contributor Author

Oh, I didn't know that was a thing, but that makes sense.
I suppose that will need to be included into the Team Creation structure as well.

@michaelpelletier michaelpelletier mentioned this pull request Jun 5, 2016
25 tasks
@michaelpelletier
Copy link
Contributor Author

Opened #51 to follow-up on some of the future enhancements to the Team Creation feature introduced in this pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants