mirror of
https://github.com/koodiklinikka/koodiklinikka.fi.git
synced 2026-02-10 07:51:09 +00:00
Merge pull request #12 from tristola/master
Updated react version to 0.14
This commit is contained in:
@@ -17,11 +17,13 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"axios": "^0.4.2",
|
||||
"classnames": "^2.2.1",
|
||||
"font-awesome": "^4.4.0",
|
||||
"http-server": "^0.8.0",
|
||||
"lodash": "^3.9.1",
|
||||
"parse-github-event": "^0.2.0",
|
||||
"react": "^0.12.2",
|
||||
"react": "^0.14.3",
|
||||
"react-dom": "^0.14.3",
|
||||
"timeago": "^0.2.0",
|
||||
"twitter-text": "^1.11.0"
|
||||
},
|
||||
|
||||
@@ -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');
|
||||
|
||||
|
||||
@@ -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'));
|
||||
|
||||
Reference in New Issue
Block a user