From 6a031384cf79c14fdd3d99bbe8c03dc19419de7a Mon Sep 17 00:00:00 2001 From: Toni Ristola Date: Fri, 27 Nov 2015 21:25:25 +0200 Subject: [PATCH 1/3] updated to react 0.13 --- package.json | 2 +- src/js/components/inviteForm.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 34e12c0..80e5e50 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "http-server": "^0.8.0", "lodash": "^3.9.1", "parse-github-event": "^0.2.0", - "react": "^0.12.2", + "react": "^0.13.3", "timeago": "^0.2.0", "twitter-text": "^1.11.0" }, diff --git a/src/js/components/inviteForm.js b/src/js/components/inviteForm.js index 7357092..951645d 100644 --- a/src/js/components/inviteForm.js +++ b/src/js/components/inviteForm.js @@ -1,8 +1,8 @@ 'use strict'; var request = require('axios'); -var React = require('react/addons'); -var classSet = React.addons.classSet; +var React = require('react'); +var classSet = require('classnames'); var api = require('../api'); From 882c3523127c1bd40735cebc789da2502c152f19 Mon Sep 17 00:00:00 2001 From: Toni Ristola Date: Fri, 27 Nov 2015 21:35:15 +0200 Subject: [PATCH 2/3] updated to react 0.14 --- package.json | 3 ++- src/js/main.js | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 80e5e50..90dc347 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,8 @@ "http-server": "^0.8.0", "lodash": "^3.9.1", "parse-github-event": "^0.2.0", - "react": "^0.13.3", + "react": "^0.14.3", + "react-dom": "^0.14.3", "timeago": "^0.2.0", "twitter-text": "^1.11.0" }, diff --git a/src/js/main.js b/src/js/main.js index f089523..d5b35bc 100644 --- a/src/js/main.js +++ b/src/js/main.js @@ -1,32 +1,33 @@ 'use strict'; require('./ga'); - +let ReactDOM = require('react-dom'); var React = require('react'); + var inviteForm = React.createFactory(require('./components/inviteForm')); var fader = React.createFactory(require('./components/fader')); var members = React.createFactory(require('./components/members')); var feed = React.createFactory(require('./components/feed')); var email = React.createFactory(require('./components/email')); -React.render( +ReactDOM.render( inviteForm(), document.getElementById('invite-form')); -React.render( +ReactDOM.render( fader(), document.getElementById('fader')); -React.render( +ReactDOM.render( members(), document.getElementById('members')); -React.render( +ReactDOM.render( feed(), document.getElementById('feed')); -React.render( +ReactDOM.render( email(), document.getElementById('email')); From 295c445518f26b1d21344ba1a938ab6e94811749 Mon Sep 17 00:00:00 2001 From: Toni Ristola Date: Sun, 29 Nov 2015 11:26:07 +0200 Subject: [PATCH 3/3] added missing dependency --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 90dc347..37a6ad5 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ ], "dependencies": { "axios": "^0.4.2", + "classnames": "^2.2.1", "font-awesome": "^4.4.0", "http-server": "^0.8.0", "lodash": "^3.9.1",