Browse Source

package.json changes; minor fixes

romanmatiasko 9 years ago
parent
commit
196a543302
7 changed files with 16 additions and 12 deletions
  1. 0 0
      dist/css/main.css
  2. 0 0
      dist/js/index.js
  3. 0 0
      dist/js/play.js
  4. 8 8
      package.json
  5. 4 0
      src/css/_chat.scss
  6. 1 1
      src/js/components/Chat.js
  7. 3 3
      src/js/components/Index.js

File diff suppressed because it is too large
+ 0 - 0
dist/css/main.css


File diff suppressed because it is too large
+ 0 - 0
dist/js/index.js


File diff suppressed because it is too large
+ 0 - 0
dist/js/play.js


+ 8 - 8
package.json

@@ -10,23 +10,26 @@
   "dependencies": {
     "babel": "^4.7.8",
     "body-parser": "^1.12.0",
+    "chess.js": "^0.1.0",
+    "classnames": "^1.1.4",
     "debug": "^2.1.2",
+    "es6-shim": "^0.27.1",
+    "eventemitter2": "^0.4.14",
     "express": "^4.12.2",
+    "flux": "^2.0.1",
     "immutable": "^3.6.4",
     "jade": "^1.9.2",
+    "lodash.omit": "^3.0.0",
     "morgan": "^1.5.1",
+    "react": "^0.13.0",
     "serve-favicon": "^2.2.0",
     "socket.io": "^1.3.5",
+    "socket.io-client": "^1.3.5",
     "winston": "^0.9.0"
   },
   "devDependencies": {
     "babelify": "^5.0.4",
     "browserify": "^9.0.3",
-    "chess.js": "^0.1.0",
-    "classnames": "^1.1.4",
-    "es6-shim": "^0.27.1",
-    "eventemitter2": "^0.4.14",
-    "flux": "^2.0.1",
     "gulp": "^3.8.11",
     "gulp-autoprefixer": "^2.1.0",
     "gulp-cssmin": "^0.1.6",
@@ -40,9 +43,6 @@
     "gulp-util": "^3.0.4",
     "jasmine": "^2.2.1",
     "jest-cli": "^0.4.0",
-    "lodash.omit": "^3.0.0",
-    "react": "^0.13.0",
-    "socket.io-client": "^1.3.5",
     "vinyl-source-stream": "^1.1.0",
     "watchify": "2.4.0"
   },

+ 4 - 0
src/css/_chat.scss

@@ -6,6 +6,10 @@
   border: 4px solid #fff;
   background: lighten($grey, 5%);
 
+  &.hidden {
+    display: none;
+  }
+
   h4 {
     font-family: 'Cherry Swash', cursive;
     font-size: 1.225rem;

+ 1 - 1
src/js/components/Chat.js

@@ -39,7 +39,7 @@ const Chat = React.createClass({
   render() {
     return (
       <div id="chat-wrapper"
-           style={this.state.isChatHidden ? {display: 'none'} : null}>
+           className={this.state.isChatHidden ? 'hidden' : null}>
         
         <h4>Chat</h4>
         <a className="close"

+ 3 - 3
src/js/components/Index.js

@@ -51,10 +51,10 @@ const Index = React.createClass({
             createGame={this._createGame} />
             
           <p id="game-status">
-            {this.state.link ?
-              'Waiting for opponent to connect'
-            :this.state.hasExpired ?
+            {this.state.hasExpired ?
               'Game link has expired, generate a new one'
+            :this.state.link ?
+              'Waiting for opponent to connect'
             :null}
           </p>
         </div>

Some files were not shown because too many files changed in this diff