From 15f26883e64684cd13087ae6f8564afb3048b19b Mon Sep 17 00:00:00 2001 From: Robbie Antenesse Date: Wed, 21 Sep 2016 14:40:25 -0600 Subject: [PATCH] Got new word form React component working and rendering mostly correctly in ES2016! --- .babelrc | 3 ++ .gitignore | 2 +- package.json | 25 +++++++++++- src/components/EditWordForm.jsx | 24 ++++++++++++ src/components/Input.jsx | 59 ++++++++++++++++++++++++++++ src/components/NewWordForm.jsx | 30 ++++++++++++++ src/components/TextArea.jsx | 43 ++++++++++++++++++++ src/components/WordForm.jsx | 69 +++++++++++++++++++++++++++++++++ src/index.html | 4 +- src/index.jsx | 21 ++++++++++ src/js/helpers.js | 52 ++++++++++++------------- src/sass/main.scss | 3 ++ start-server.js | 16 ++++++++ webpack.config.js | 59 ++++++++++++++++++++++++++++ 14 files changed, 378 insertions(+), 32 deletions(-) create mode 100644 .babelrc create mode 100644 src/components/EditWordForm.jsx create mode 100644 src/components/Input.jsx create mode 100644 src/components/NewWordForm.jsx create mode 100644 src/components/TextArea.jsx create mode 100644 src/components/WordForm.jsx create mode 100644 src/index.jsx create mode 100644 src/sass/main.scss create mode 100644 start-server.js create mode 100644 webpack.config.js diff --git a/.babelrc b/.babelrc new file mode 100644 index 0000000..6763fb5 --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "presets": [ "es2015", "react" ] +} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 7d9e4ea..25a478e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ php/google/ -ipa_character_picker/ node_modules/ +public/ diff --git a/package.json b/package.json index 9df1146..0124386 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,10 @@ "description": "A tool to build simple dictionaries using JSON.", "main": "src/app.js", "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "start": "node start-server.js", + "pack": "node ./node_modules/webpack/bin/webpack.js -d --progress --display-error-details", + "watch": "node ./node_modules/webpack/bin/webpack.js -d --progress --watch", + "build": "node ./node_modules/webpack/bin/webpack.js -p --progress" }, "repository": { "type": "git", @@ -18,7 +21,25 @@ }, "homepage": "https://github.com/Alamantus/Lexiconga#readme", "dependencies": { + "babel-polyfill": "^6.13.0", + "json-query": "^2.2.0", "marked": "^0.3.6", - "papaparse": "^4.1.2" + "papaparse": "^4.1.2", + "react": "^15.3.2", + "react-dom": "^15.3.2" + }, + "devDependencies": { + "babel-core": "^6.14.0", + "babel-loader": "^6.2.5", + "babel-preset-es2015": "^6.14.0", + "babel-preset-react": "^6.11.1", + "css-loader": "^0.25.0", + "express": "^4.14.0", + "file-loader": "^0.9.0", + "html-minify-loader": "^1.1.0", + "node-sass": "^3.10.0", + "sass-loader": "^4.0.2", + "style-loader": "^0.13.1", + "webpack": "^1.13.2" } } diff --git a/src/components/EditWordForm.jsx b/src/components/EditWordForm.jsx new file mode 100644 index 0000000..3df80cb --- /dev/null +++ b/src/components/EditWordForm.jsx @@ -0,0 +1,24 @@ +import React from 'react'; + +import {Input} from './Input'; +import {TextArea} from './TextArea'; + +import {WordForm} from './WordForm'; + +export class EditWordForm extends React.Component { + constructor(props) { + super(props); + } + + render() { + return ( + + + + + +