Merge pull request #11 from sadnessOjisan/develop

ブロックを崩し、スコアリングする機能が完成
sadnessOjisan · Nov 24, 2018 · 2b3704b · 2b3704b
2 parents 7585812 + f57d068
commit 2b3704b
Show file tree

Hide file tree

Showing 20 changed files with 673 additions and 153 deletions.
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "awesome-typescript-loader": "^5.2.1",
     "file-loader": "^2.0.0",
     "html-webpack-plugin": "^3.2.0",
+    "prettier": "^1.15.2",
     "source-map-loader": "^0.2.4",
     "typescript": "^3.1.6",
     "url-loader": "^1.1.2",
@@ -36,7 +37,7 @@
     "start:dev": "BUILD_MODE='development' REACT_APP_ENV=development webpack-dev-server",
     "start:stg": "BUILD_MODE='production' REACT_APP_ENV='staging' webpack-dev-server",
     "start:prd": "BUILD_MODE='production' REACT_APP_ENV='production' webpack-dev-server",
-    "format": "prettier --write '**/*.js'",
+    "format": "prettier --write '**/*.tsx'",
     "lint": "eslint --fix 'src/**/*.js'",
     "flow-typed": "flow-typed",
     "flow:check": "flow",

diff --git a/src/assets/GraphQL.svg b/src/assets/GraphQL.svg
diff --git a/src/assets/angular.svg b/src/assets/angular.svg
diff --git a/src/assets/browserify.svg b/src/assets/browserify.svg