Code

Becca and Brittany 2048 rails#4

Code

Open

rmtolmach wants to merge 39 commits intoAda-C4:bkrm/masterAda-C4/2048-rails:bkrm/masterfrom brittanykohler:bkrm/masterbrittanykohler/2048-rails:bkrm/masterCopy head branch name to clipboard

Commits

Commits on Feb 8, 2016

• added gmes and routes for Oauth

  rmtolmach

  committed
  fae80db

  Copy full SHA for fae80db

• omniauth gem and sessions controller

  rmtolmach

  committed
  c4c1890

  Copy full SHA for c4c1890

• generated user model

  rmtolmach

  committed
  2e4454b

  Copy full SHA for 2e4454b

• can login with facebook. yay

  rmtolmach

  committed
  fb9cd1e

  Copy full SHA for fb9cd1e

Commits on Feb 9, 2016

• Adding nav, needs to be fixed

  brittanykohler

  committed
  72bffd8

  Copy full SHA for 72bffd8

• Fixing nav

  brittanykohler

  committed
  2e3a84f

  Copy full SHA for 2e3a84f

• Fixing typo in nav

  brittanykohler

  committed
  38d99f2

  Copy full SHA for 38d99f2

• Adding save function, need to fill in API call

  brittanykohler

  committed
  8bc3fa9

  Copy full SHA for 8bc3fa9

• generated game controller

  rmtolmach

  committed
  1cfb0be

  Copy full SHA for 1cfb0be

• some ajax added. not working

  rmtolmach

  committed
  d041523

  Copy full SHA for d041523

• Posting to rails save api endpoint is working, need to get actual game data to save, not hardcoded values

  brittanykohler

  committed
  1ba9e11

  Copy full SHA for 1ba9e11

• Values are now saving in rails game model for save API endpoint, need to determine how to get correct values on javascript side

  brittanykohler

  committed
  44e04f0

  Copy full SHA for 44e04f0

• created remote storage manager and copied stuff in it

  rmtolmach

  committed
  87aa00b

  Copy full SHA for 87aa00b

• requiring new remote_storage_manager file

  brittanykohler

  committed
  6850417

  Copy full SHA for 6850417

• we can now access info from the game and save it to our database

  rmtolmach

  committed
  a61d269

  Copy full SHA for a61d269

• Adding view for saved games

  brittanykohler

  committed
  e1c496b

  Copy full SHA for e1c496b

• adding route for loading saved game

  brittanykohler

  committed
  3e2c8fe

  Copy full SHA for 3e2c8fe

Commits on Feb 10, 2016

• lots of things

  rmtolmach

  committed
  91df7f8

  Copy full SHA for 91df7f8

• Updated paths, nested games in users, updating API endpoint for getting games

  brittanykohler

  committed
  2c5b013

  Copy full SHA for 2c5b013

Commits on Feb 11, 2016

• Kai helping us debug things. We can now load a saved game. Asynchronous api calls, tile positions, etc.

  rmtolmach

  committed
  f83fdaa

  Copy full SHA for f83fdaa

• Created hidden divs to dynamically pull correct data for selected game

  brittanykohler

  committed
  ad93390

  Copy full SHA for ad93390

• Updating saving/retrieving game data so that score now shows up

  brittanykohler

  committed
  bb2d091

  Copy full SHA for bb2d091

• Fixing storage manager logic, now new game will load

  brittanykohler

  committed
  ae73a36

  Copy full SHA for ae73a36

• Created leaderboard

  brittanykohler

  committed
  c2a9349

  Copy full SHA for c2a9349

• Moving saved games to game#index page

  brittanykohler

  committed
  64ea5af

  Copy full SHA for 64ea5af

• Adding some basic styling to leaderboard page

  brittanykohler

  committed
  9256fdb

  Copy full SHA for 9256fdb

• css for login page

  rmtolmach

  committed
  64bdb07

  Copy full SHA for 64bdb07

• Merge branch 'bkrm/master' of github.com:brittanykohler/2048-rails into bkrm/master

  rmtolmach

  committed
  47600cc

  Copy full SHA for 47600cc

• score and best divs look better

  rmtolmach

  committed
  54fdaff

  Copy full SHA for 54fdaff

• save game button is rebeccapurple

  rmtolmach

  committed
  140b9f9

  Copy full SHA for 140b9f9

• css for leaderboard page

  rmtolmach

  committed
  7fa66e0

  Copy full SHA for 7fa66e0

• Adding basic styling for saved games page

  brittanykohler

  committed
  9f31dd0

  Copy full SHA for 9f31dd0

Commits on Feb 12, 2016

• styling everything

  rmtolmach

  committed
  ce43324

  Copy full SHA for ce43324

• Merge branch 'bkrm/master' of github.com:brittanykohler/2048-rails into bkrm/master

  rmtolmach

  committed
  bbfb506

  Copy full SHA for bbfb506

• Changing background color of index page

  brittanykohler

  committed
  6306cfb

  Copy full SHA for 6306cfb

• Changing color of home page link

  brittanykohler

  committed
  f7547e7

  Copy full SHA for f7547e7

• Removing console.logs and unneccessary comments, adding tictactoe code

  brittanykohler

  committed
  c3b13b6

  Copy full SHA for c3b13b6

• Adding tictactoe route, view, controller action

  brittanykohler

  committed
  755bf39

  Copy full SHA for 755bf39

• added links to nav bar for tic tac

  rmtolmach

  committed
  4c8ae65

  Copy full SHA for 4c8ae65