summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnike Arni <aarni@thoughtworks.com>2017-02-01 16:41:11 -0200
committerAnike Arni <aarni@thoughtworks.com>2017-02-01 16:41:11 -0200
commit50efd8f59b814bc27e870ff3b09372b0d717b926 (patch)
treebfb09a35af6fa82a232eeb702dc069f5f966d04a
parentc141c30b068e91f58b0c64649462589f7442a2df (diff)
[#922] Add react
with @tayanefernandes
-rw-r--r--web-ui/app/account_recovery.html5
-rw-r--r--web-ui/app/js/account_recovery.js7
-rw-r--r--web-ui/package.json3
-rw-r--r--web-ui/webpack.config.js4
4 files changed, 15 insertions, 4 deletions
diff --git a/web-ui/app/account_recovery.html b/web-ui/app/account_recovery.html
index 448f5ea8..407f5907 100644
--- a/web-ui/app/account_recovery.html
+++ b/web-ui/app/account_recovery.html
@@ -1,9 +1,10 @@
<!DOCTYPE html>
<html>
<head>
- <title>$account_email - Pixelated Account Recovery</title>
+ <title>Pixelated Account Recovery</title>
</head>
<body>
- Hello!!! :)
+ <div id="root"/>
+ <script type="text/javascript" src="/assets/account_recovery.js"></script>
</body>
</html>
diff --git a/web-ui/app/js/account_recovery.js b/web-ui/app/js/account_recovery.js
index e69de29b..a136b261 100644
--- a/web-ui/app/js/account_recovery.js
+++ b/web-ui/app/js/account_recovery.js
@@ -0,0 +1,7 @@
+import React from 'react'
+import { render } from 'react-dom'
+
+render(
+ <h1>Hello, world!</h1>,
+ document.getElementById('root')
+);
diff --git a/web-ui/package.json b/web-ui/package.json
index 480dcc55..a41396f7 100644
--- a/web-ui/package.json
+++ b/web-ui/package.json
@@ -9,6 +9,7 @@
"babel-core": "^6.21.0",
"babel-loader": "^6.2.10",
"babel-preset-es2015": "^6.18.0",
+ "babel-preset-react": "^6.22.0",
"bower": "1.7.9",
"copy-webpack-plugin": "^4.0.1",
"dompurify": "^0.8.4",
@@ -39,6 +40,8 @@
"minify": "^2.0.13",
"modernizr": "^3.3.1",
"quoted-printable": "^1.0.1",
+ "react": "^15.4.2",
+ "react-dom": "^15.4.2",
"requirejs": "2.2.0",
"typeahead.js": "^0.11.1",
"utf8": "^2.1.2",
diff --git a/web-ui/webpack.config.js b/web-ui/webpack.config.js
index 720a9a2e..f0f605b0 100644
--- a/web-ui/webpack.config.js
+++ b/web-ui/webpack.config.js
@@ -6,7 +6,7 @@ var aliases = require('./config/alias-webpack');
module.exports = {
entry: {
app: './app/js/index.js',
- recovery: './app/js/account_recovery.js',
+ account_recovery: './app/js/account_recovery.js',
sandbox: './app/js/sandbox.js'
},
node: { fs: 'empty' },
@@ -25,7 +25,7 @@ module.exports = {
test: /\.js$/,
exclude: /(node_modules|bower_components)/,
loader: 'babel',
- query: { presets: ['es2015']}
+ query: { presets: ['es2015', 'react']}
}
]
},