Skip to content
This repository has been archived by the owner on May 6, 2018. It is now read-only.

[WIP] Switch to React from Angular #38

Open
wants to merge 68 commits into
base: master
Choose a base branch
from
Open

[WIP] Switch to React from Angular #38

wants to merge 68 commits into from

Commits on Oct 23, 2016

  1. Bump Ruby version to 2.2.4 

    As seen on Heroku's page: https://devcenter.heroku.com/articles/ruby-versions
    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    fefe8dc View commit details
    Browse the repository at this point in the history

  2. Update thin gem to get around error 

    Error with eventmachine dependency version, see eventmachine/eventmachine#553
    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    1e79e2c View commit details
    Browse the repository at this point in the history

  3. Add react-rails gem

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    719979c View commit details
    Browse the repository at this point in the history

  4. rails g react:install

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    e8c7ce7 View commit details
    Browse the repository at this point in the history

  5. Don't require blicblockjs role locally

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    640f8df View commit details
    Browse the repository at this point in the history

  6. Update schema with limits on strings

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    fd209b1 View commit details
    Browse the repository at this point in the history

  7. Drop the crazy Gruntfile 

    Let's have Rails manage all the building.
    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    77d3fb6 View commit details
    Browse the repository at this point in the history

  8. Move images out of public into assets

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    06c7af6 View commit details
    Browse the repository at this point in the history

  9. Remove old generated public scripts

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    7c79003 View commit details
    Browse the repository at this point in the history

  10. Remove public bower_components

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    3a35ca1 View commit details
    Browse the repository at this point in the history

  11. Add a Rails application layout

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    c4a191c View commit details
    Browse the repository at this point in the history

  12. Move fonts from public to assets

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    4a45a4a View commit details
    Browse the repository at this point in the history

  13. Remove views from public/

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    1ceab20 View commit details
    Browse the repository at this point in the history

  14. Remove generated styles from public

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    9aea42f View commit details
    Browse the repository at this point in the history

  15. Remove public index file

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    c37b8f3 View commit details
    Browse the repository at this point in the history

  16. Add App component in React

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    03bc84a View commit details
    Browse the repository at this point in the history

  17. Add home controller and default route

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    13ceec8 View commit details
    Browse the repository at this point in the history

  18. Add application.css

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    46892db View commit details
    Browse the repository at this point in the history

  19. Add sass-rails gem

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    81e650d View commit details
    Browse the repository at this point in the history

  20. Rename images

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    7102f0e View commit details
    Browse the repository at this point in the history

  21. Set up SCSS in Rails

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    9d8aad7 View commit details
    Browse the repository at this point in the history

  22. Start adding components and models

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    1ec17bc View commit details
    Browse the repository at this point in the history

  23. Show correct game message based on state

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    f6fb840 View commit details
    Browse the repository at this point in the history

  24. Show current score and level

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    83fc191 View commit details
    Browse the repository at this point in the history

  25. Fill in details of game message

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    07ce59f View commit details
    Browse the repository at this point in the history

  26. More logic about game messages to show

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    8988d3f View commit details
    Browse the repository at this point in the history

  27. Apply the right classes to board-container

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    85aea38 View commit details
    Browse the repository at this point in the history

  28. Start on block display

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    692ac49 View commit details
    Browse the repository at this point in the history

  29. Start on game loop

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    b271923 View commit details
    Browse the repository at this point in the history

  30. Drop blocks as game progresses

    @cheshire137
    cheshire137 committed Oct 23, 2016
    Configuration menu
    Copy the full SHA
    594aea7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2016

  1. Fix ending game message with score

    @cheshire137
    cheshire137 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    268e568 View commit details
    Browse the repository at this point in the history

  2. Hook up New Game button

    @cheshire137
    cheshire137 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    4667f87 View commit details
    Browse the repository at this point in the history

  3. Flesh out saveHighScore

    @cheshire137
    cheshire137 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    5494775 View commit details
    Browse the repository at this point in the history

  4. Hook up Resume Game button

    @cheshire137
    cheshire137 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    63d150f View commit details
    Browse the repository at this point in the history

  5. Allow pausing and resuming game via spacebar

    @cheshire137
    cheshire137 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    034e67f View commit details
    Browse the repository at this point in the history

  6. Don't save high score in local storage if it's 0

    @cheshire137
    cheshire137 committed Oct 28, 2016
    Configuration menu
    Copy the full SHA
    09bd889 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2016

  1. Start on movement hookup for left, right, down

    @cheshire137
    cheshire137 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    b1e5790 View commit details
    Browse the repository at this point in the history

  2. Fix move left/right by stopping sliding by id

    @cheshire137
    cheshire137 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    3e2555c View commit details
    Browse the repository at this point in the history

  3. Dehighlight blocks after they land

    @cheshire137
    cheshire137 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    d32cda6 View commit details
    Browse the repository at this point in the history

  4. Start on checking for tetrominos

    @cheshire137
    cheshire137 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    5403b85 View commit details
    Browse the repository at this point in the history

  5. Remove horizontal tetrominos

    @cheshire137
    cheshire137 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    28f0860 View commit details
    Browse the repository at this point in the history

  6. Simplify inline function, use a constant

    @cheshire137
    cheshire137 committed Oct 29, 2016
    Configuration menu
    Copy the full SHA
    48a9098 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2016

  1. Detect straight vertical tetrominos

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    b0bc5b0 View commit details
    Browse the repository at this point in the history

  2. Detect square tetrominos

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    b534004 View commit details
    Browse the repository at this point in the history

  3. Start fleshing out checkForLTetromino

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    85dae75 View commit details
    Browse the repository at this point in the history

  4. Start on a TetrominoChecker class to simplify logic

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    ddda882 View commit details
    Browse the repository at this point in the history

  5. Add jasmine-rails gem

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    e269097 View commit details
    Browse the repository at this point in the history

  6. Set up Jasmine for testing React parts

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    d68643a View commit details
    Browse the repository at this point in the history

  7. Flesh out TetrominoChecker and tests more

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    70508d3 View commit details
    Browse the repository at this point in the history

  8. Detect square tetrominos with checker

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    72fee3c View commit details
    Browse the repository at this point in the history

  9. Add pending tests for remaining tetrominos

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    ad3fb8b View commit details
    Browse the repository at this point in the history

  10. Add test for filtering out other colors

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    48831c7 View commit details
    Browse the repository at this point in the history

  11. Flesh out remaining left L tetromino tests

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    f8d092e View commit details
    Browse the repository at this point in the history

  12. Flesh out remaining right L tetromino tests

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    1571302 View commit details
    Browse the repository at this point in the history

  13. Use TetrominoChecker to simplify BoardContainer

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    257108a View commit details
    Browse the repository at this point in the history

  14. Trying to fix bug with freezing after removal

    @cheshire137
    cheshire137 committed Oct 30, 2016
    Configuration menu
    Copy the full SHA
    dd36b15 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2016

  1. Make game harder to begin with by decreasing tick length

    @cheshire137
    cheshire137 committed Nov 19, 2016
    Configuration menu
    Copy the full SHA
    8fe0a93 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2017

  1. Filter out same block ID in constructor

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    76ef345 View commit details
    Browse the repository at this point in the history

  2. Update test to expect b1 not to be in array

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    cfe85b1 View commit details
    Browse the repository at this point in the history

  3. Flesh out Z tetromino specs

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    0950d94 View commit details
    Browse the repository at this point in the history

  4. Remove bower.json

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    fd4aa9d View commit details
    Browse the repository at this point in the history

  5. Update Travis config to run Ruby tests

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    c9b8938 View commit details
    Browse the repository at this point in the history

  6. Add Travis build status to readme

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    b4bc434 View commit details
    Browse the repository at this point in the history

  7. Remove package.json

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    12ffa8a View commit details
    Browse the repository at this point in the history

  8. Update readme

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    c2bb7f7 View commit details
    Browse the repository at this point in the history

  9. Run JS tests on Travis

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    68be6ee View commit details
    Browse the repository at this point in the history

  10. Drop CoffeeScript extensions from Jasmine

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    bc1d07b View commit details
    Browse the repository at this point in the history

  11. Update react-rails to 1.10.0

    @cheshire137
    cheshire137 committed Jan 29, 2017
    Configuration menu
    Copy the full SHA
    1659748 View commit details
    Browse the repository at this point in the history