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

Logan and Audrey #5

Open
wants to merge 89 commits into
base: audrogan/master
Choose a base branch
from
Open

Logan and Audrey #5

wants to merge 89 commits into from

Conversation

Dreedle
Copy link

@Dreedle Dreedle commented Feb 13, 2016

Met requirements, didn't do added fun.

loganmeetsworld and others added 30 commits February 8, 2016 14:27
@loganmeetsworld
added env and yml files to gitignore
3f6c722
@Dreedle
Adding gems and stuff (bootstrap, bcrypt, oauth, httparty)
1e1e5df
@Dreedle
Merge branch 'audrogan/master' of github.com:Dreedle/2048-rails into …
81f56e7 
…audrogan/master
@Dreedle
Adding github oauth gem
882bed0
@Dreedle
Merge branch 'audrey' into audrogan/master
f8c5c84
@Dreedle
Making users controller and routes(only new and create)
21bdfeb
@Dreedle
Creating preliminary user model and find_or_create method for that user
5cbb977
@loganmeetsworld
gemfile added dotenv
6447427
@Dreedle
Adding user migration
b28096b
@Dreedle
Gemfile.lock
3529940
@Dreedle
Merge branch 'audrogan/master' into audrey
6eb5529
@Dreedle
User has secure password. Deleting dev strategy callback
21a2fcc
@Dreedle
Password digest added to user model
445cfc2
@Dreedle
Creating sessions controller with new, create and destroy routes
1ca6e64
@Dreedle
Adding omniauth.rb file
399f7eb
@Dreedle
Able to login with github.
915a1ca
@Dreedle
Narrowing div with user's name
debf079
@Dreedle
Deleting sessions#new view
e8d2304
@Dreedle
Can login from navbar instead of separate view
a791534
@Dreedle
Adding logout button
38061b8
@Dreedle
Adding some POSSIBLE useful code to game files pertaining to saving g…
0fd200a 
…ames
@Dreedle
Applying analogous class to save button in game, for styling
835d8df
@Dreedle
A user has many games
a516042
@Dreedle
Creating preliminary game model, belongs to user
bbfa346
@Dreedle
Creating games controller
33f7efa
@Dreedle
Adding private method game params (probably not needed since params c…
274fe2b 
…ome internally?)
@Dreedle
Very rough draft skeleton of games controller
28ebb11
@Dreedle
Game have a user id
ef79a65
@Dreedle
Shovel new game into current user games
a808f8e
@Dreedle
Adding routes for game
716acc2
loganmeetsworld and others added 30 commits February 10, 2016 12:25
@loganmeetsworld
css again
3207cc5
@Dreedle
Adding resume-game class to button, skeleton for click method
aa59e84
@Dreedle
Pseudocoded .load
5ad506e
@loganmeetsworld
cleaning up routes, added something to games controller
1a45602
@loganmeetsworld
broken but something
66a85b5
@loganmeetsworld
changes to game manager
9e1a8d7
@loganmeetsworld
Merge branch 'newlm' into audrogan/master
a21f1d4
@loganmeetsworld
some problems fixed others not fixed
7e40e49
@loganmeetsworld
stuff is working
8b14051
@loganmeetsworld
moving to a single page app perhaps
a933057
@loganmeetsworld
need to work on tiles showing up
0b19fdb
@Dreedle
Adding stringify
29a4009
@Dreedle
Adding delete link to resume games
b933935
@Dreedle
Games destroy redirects to root route
e4e6f59
@Dreedle
Root path, that is
57f43d5
@Dreedle
params coming in to save game look better
cf0f3c7
@Dreedle
Saving games from different params hash
6cb1abd
@Dreedle
Parsing json to get out data to make games
152a7db
@Dreedle
Can reload games
77d7e83
@Dreedle
Changing schema to accomodate gamestate
8c6a244
@Dreedle
Removing button null conditional
1af41bb
@Dreedle
Removed T key (not needed)
8b8b74d
@Dreedle
Can now click on any game link to reload
9a90988
@loganmeetsworld
can't save games if not logged in and current user is user of particu…
b212816 
…lar game
@loganmeetsworld
200 to ok on status
4cdaade
@loganmeetsworld
everything back to working
61751f8
@Dreedle
Centered downdown menu items
8aa4a42
@loganmeetsworld
flash notice working
36fa53b
@Dreedle
Merge branch 'audrogan/master' of github.com:Dreedle/2048-rails into …
8640549 
…audrogan/master
@Dreedle
Changing min width of game resume button
49ac62a
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.
2 participants
@Dreedle @loganmeetsworld