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
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
fefe8dc
Bump Ruby version to 2.2.4
cheshire137 Oct 23, 2016
1e79e2c
Update thin gem to get around error
cheshire137 Oct 23, 2016
719979c
Add react-rails gem
cheshire137 Oct 23, 2016
e8c7ce7
rails g react:install
cheshire137 Oct 23, 2016
640f8df
Don't require blicblockjs role locally
cheshire137 Oct 23, 2016
fd209b1
Update schema with limits on strings
cheshire137 Oct 23, 2016
77d3fb6
Drop the crazy Gruntfile
cheshire137 Oct 23, 2016
06c7af6
Move images out of public into assets
cheshire137 Oct 23, 2016
7c79003
Remove old generated public scripts
cheshire137 Oct 23, 2016
3a35ca1
Remove public bower_components
cheshire137 Oct 23, 2016
c4a191c
Add a Rails application layout
cheshire137 Oct 23, 2016
4a45a4a
Move fonts from public to assets
cheshire137 Oct 23, 2016
1ceab20
Remove views from public/
cheshire137 Oct 23, 2016
9aea42f
Remove generated styles from public
cheshire137 Oct 23, 2016
c37b8f3
Remove public index file
cheshire137 Oct 23, 2016
03bc84a
Add App component in React
cheshire137 Oct 23, 2016
13ceec8
Add home controller and default route
cheshire137 Oct 23, 2016
46892db
Add application.css
cheshire137 Oct 23, 2016
81e650d
Add sass-rails gem
cheshire137 Oct 23, 2016
7102f0e
Rename images
cheshire137 Oct 23, 2016
9d8aad7
Set up SCSS in Rails
cheshire137 Oct 23, 2016
1ec17bc
Start adding components and models
cheshire137 Oct 23, 2016
f6fb840
Show correct game message based on state
cheshire137 Oct 23, 2016
83fc191
Show current score and level
cheshire137 Oct 23, 2016
07ce59f
Fill in details of game message
cheshire137 Oct 23, 2016
8988d3f
More logic about game messages to show
cheshire137 Oct 23, 2016
85aea38
Apply the right classes to board-container
cheshire137 Oct 23, 2016
692ac49
Start on block display
cheshire137 Oct 23, 2016
b271923
Start on game loop
cheshire137 Oct 23, 2016
594aea7
Drop blocks as game progresses
cheshire137 Oct 23, 2016
268e568
Fix ending game message with score
cheshire137 Oct 28, 2016
4667f87
Hook up New Game button
cheshire137 Oct 28, 2016
5494775
Flesh out saveHighScore
cheshire137 Oct 28, 2016
63d150f
Hook up Resume Game button
cheshire137 Oct 28, 2016
034e67f
Allow pausing and resuming game via spacebar
cheshire137 Oct 28, 2016
09bd889
Don't save high score in local storage if it's 0
cheshire137 Oct 28, 2016
b1e5790
Start on movement hookup for left, right, down
cheshire137 Oct 29, 2016
3e2555c
Fix move left/right by stopping sliding by id
cheshire137 Oct 29, 2016
d32cda6
Dehighlight blocks after they land
cheshire137 Oct 29, 2016
5403b85
Start on checking for tetrominos
cheshire137 Oct 29, 2016
28f0860
Remove horizontal tetrominos
cheshire137 Oct 29, 2016
48a9098
Simplify inline function, use a constant
cheshire137 Oct 29, 2016
b0bc5b0
Detect straight vertical tetrominos
cheshire137 Oct 30, 2016
b534004
Detect square tetrominos
cheshire137 Oct 30, 2016
85dae75
Start fleshing out checkForLTetromino
cheshire137 Oct 30, 2016
ddda882
Start on a TetrominoChecker class to simplify logic
cheshire137 Oct 30, 2016
e269097
Add jasmine-rails gem
cheshire137 Oct 30, 2016
d68643a
Set up Jasmine for testing React parts
cheshire137 Oct 30, 2016
70508d3
Flesh out TetrominoChecker and tests more
cheshire137 Oct 30, 2016
72fee3c
Detect square tetrominos with checker
cheshire137 Oct 30, 2016
ad3fb8b
Add pending tests for remaining tetrominos
cheshire137 Oct 30, 2016
48831c7
Add test for filtering out other colors
cheshire137 Oct 30, 2016
f8d092e
Flesh out remaining left L tetromino tests
cheshire137 Oct 30, 2016
1571302
Flesh out remaining right L tetromino tests
cheshire137 Oct 30, 2016
257108a
Use TetrominoChecker to simplify BoardContainer
cheshire137 Oct 30, 2016
dd36b15
Trying to fix bug with freezing after removal
cheshire137 Oct 30, 2016
8fe0a93
Make game harder to begin with by decreasing tick length
cheshire137 Nov 19, 2016
76ef345
Filter out same block ID in constructor
cheshire137 Jan 29, 2017
cfe85b1
Update test to expect b1 not to be in array
cheshire137 Jan 29, 2017
0950d94
Flesh out Z tetromino specs
cheshire137 Jan 29, 2017
fd4aa9d
Remove bower.json
cheshire137 Jan 29, 2017
c9b8938
Update Travis config to run Ruby tests
cheshire137 Jan 29, 2017
b4bc434
Add Travis build status to readme
cheshire137 Jan 29, 2017
12ffa8a
Remove package.json
cheshire137 Jan 29, 2017
c2bb7f7
Update readme
cheshire137 Jan 29, 2017
68be6ee
Run JS tests on Travis
cheshire137 Jan 29, 2017
bc1d07b
Drop CoffeeScript extensions from Jasmine
cheshire137 Jan 29, 2017
1659748
Update react-rails to 1.10.0
cheshire137 Jan 29, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@
/*.dump

spec/examples.txt

.rake_tasks~
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.1.4
2.2.4
10 changes: 5 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- '0.10'
language: ruby
before_script:
- 'npm install -g bower grunt-cli'
- 'bower install'
- 'RAILS_ENV=test bundle exec rake db:create db:migrate'
script:
- 'RAILS_ENV=test bundle exec rake spec'
- 'RAILS_ENV=test bundle exec rake spec:javascript'
11 changes: 7 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.1.4'
ruby '2.2.4'

gem 'rails', '~> 4.2.0'
gem 'uglifier', '>= 1.3.0'
Expand All @@ -8,13 +8,15 @@ gem 'sdoc', '~> 0.4.0', group: :doc
gem 'spring', group: :development
gem 'pg', '~> 0.17.1'
gem 'responders', '~> 2.1.1'
gem 'react-rails', '~> 1.10.0'

group :development, :test do
gem 'rspec-rails', '~> 3.4.0'
gem 'rspec-collection_matchers', '~> 1.1.2'
gem 'factory_girl_rails', '~> 4.4.1'
gem 'database_cleaner', '~> 1.5.1'
gem 'faker', '~> 1.6.1'
gem 'jasmine-rails', '~> 0.14.1'
end

group :test do
Expand All @@ -23,9 +25,10 @@ group :test do
end

gem 'spring-commands-rspec', group: :development
gem 'thin', '~> 1.6.2'
gem 'sass', '~> 3.4.5'
gem 'compass', '~> 1.0.1'
gem 'thin', '~> 1.7.0'
gem 'sass-rails', '~> 5.0.6'
gem 'compass-rails', '~> 3.0.2'
gem 'bootstrap-sass', '~> 3.3.7'
gem 'will_paginate', '~> 3.0.7'
gem 'geokit-rails', '~> 2.0.1'
gem 'countries', '~> 0.9.3'
Expand Down
Loading