merge server-compile-src

.gitignore

@@ -7,3 +7,5 @@ dist
 vendor/*
 tmp/*
 .vagrant
+lib
+

mocha.setup.js

@@ -1,6 +1,6 @@
 require('babel-register')();
 
-process.env.NODE_PATH = require('path').resolve(__dirname, '.');
+process.env.NODE_PATH = require('path').resolve(__dirname, './src');
 require('module').Module._initPaths();
 
 const jsdom = require('jsdom').jsdom;

package.json

@@ -8,13 +8,13 @@
   "description": "steemit.com is the koa web server & middleware and react.js in-browser code for the world's first blockchain content + social media monetization platform!",
   "main": "index.js",
   "scripts": {
-    "build": "NODE_ENV=production ./node_modules/babel-cli/bin/babel-node.js ./node_modules/.bin/webpack --stats --config ./webpack/prod.config.js",
+    "build": "NODE_ENV=production ./node_modules/babel-cli/bin/babel-node.js ./node_modules/.bin/webpack --stats --config ./webpack/prod.config.js; rm -rf ./lib; babel src --out-dir lib -Dq",
     "mocha": "NODE_ENV=test mocha ./mocha.setup.js",
-    "test": "npm run mocha -- app/**/*.test.js",
+    "test": "npm run mocha -- src/app/**/*.test.js",
     "test:watch:all": "npm test -- --watch --watch-extensions jsx",
     "test:watch": "npm run mocha -- --watch --watch-extensions jsx",
-    "production": "NODE_ENV=production ./node_modules/babel-cli/bin/babel-node.js --max-old-space-size=1792 server/index.js",
-    "start": "./node_modules/babel-cli/bin/babel-node.js ./webpack/dev-server.js",
+    "production": "NODE_ENV=production node lib/server/index.js",
+    "start": "NODE_ENV=development ./node_modules/babel-cli/bin/babel-node.js ./webpack/dev-server.js",
     "webpush": "./node_modules/babel-cli/bin/babel-node.js ./scripts/webpush_notify.js"
   },
   "author": "Steemit, Inc.",
@@ -139,7 +139,7 @@
     "url-loader": "^0.5.7",
     "web-push": "^3.2.1",
     "webpack": "^1.13.2",
-    "webpack-isomorphic-tools": "^2.2.31",
+    "webpack-isomorphic-tools": "^3.0.3",
     "websocket": "^1.0.22",
     "whatwg-fetch": "^0.11.1",
     "xmldom": "^0.1.22"
@@ -162,7 +162,7 @@
     "koa-webpack-dev-middleware": "^1.1.0",
     "koa-webpack-hot-middleware": "^1.0.3",
     "mocha": "^2.4.5",
-    "node-watch": "^0.3.5",
+    "node-watch": "^0.5.5",
     "react-addons-perf": "15.4.2",
     "react-addons-test-utils": "15.4.2",
     "react-transform-catch-errors": "^1.0.1",

app/assets/stylesheets/app.scss → src/app/assets/stylesheets/app.scss

@@ -9,7 +9,7 @@
 @import "./mixins";
 @import "./markdown";
 @import "./notifications";
-@import "app/components/all";
+@import "src/app/components/all";
 
 /* Small only */
 @media screen and (max-width: 39.9375em) {

app/components/App.jsx → src/app/components/App.jsx

@@ -266,7 +266,7 @@ class App extends React.Component {
                     </li>
                     <li className="last">
                         <a href="https://steemit.github.io/steemit-docs/" target="_blank" rel="noopener noreferrer">
-                            {tt('navigation.steemit_api_docs')}&nbsp;<Icon name="extlink" />
+                            {tt('navigation.api_docs')}&nbsp;<Icon name="extlink" />
                         </a>
                     </li>
                 </ul>

app/components/elements/DropdownMenu.jsx → src/app/components/elements/DropdownMenu.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { browserHistory } from 'react-router';
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 import VerticalMenu from './VerticalMenu';
 import {findParent} from 'app/utils/DomUtils';
 

app/components/elements/HorizontalMenu.jsx → src/app/components/elements/HorizontalMenu.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router'
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 
 export default class HorizontalMenu extends React.Component {
     static propTypes = {

app/components/elements/Icon.jsx → src/app/components/elements/Icon.jsx

@@ -48,7 +48,7 @@ const icons = [
     'pencil2'
 ];
 const icons_map = {};
-for (const i of icons) icons_map[i] = require(`app/assets/icons/${i}.svg`);
+for (const i of icons) icons_map[i] = require(`assets/icons/${i}.svg`);
 
 const rem_sizes = {'1x': '1.12', '1_5x': '1.5', '2x': '2', '3x': '3.45', '4x': '4.60', '5x': '5.75', '10x': '10.0'};
 

app/components/elements/OrderHistory.jsx → src/app/components/elements/OrderHistory.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import HistoryRow from "./OrderhistoryRow.jsx";
+import HistoryRow from "./OrderhistoryRow";
 import tt from 'counterpart';
 import { DEBT_TOKEN_SHORT, LIQUID_TOKEN, CURRENCY_SIGN } from 'app/client_config';
 

app/components/elements/ShareMenu.jsx → src/app/components/elements/ShareMenu.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Link } from 'react-router'
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 
 export default class ShareMenu extends React.Component {
 

app/components/elements/SvgImage.jsx → src/app/components/elements/SvgImage.jsx

@@ -9,7 +9,7 @@ export default class SvgImage extends React.Component {
     };
     render() {
         const style = {display: 'inline-block', width: this.props.width, height: this.props.height};
-        const image = require(`app/assets/images/${this.props.name}.svg`);
+        const image = require(`assets/images/${this.props.name}.svg`);
         const cn = 'SvgImage' + (this.props.className ? ' ' + this.props.className : '');
         return <span className={cn} style={style} dangerouslySetInnerHTML={{__html: image}} />;
     }

app/components/elements/Userpic.jsx → src/app/components/elements/Userpic.jsx

@@ -30,7 +30,7 @@ class Userpic extends Component {
             if(hideIfDefault) {
                 return null;
             }
-            url = require('app/assets/images/user.png');
+            url = require('assets/images/user.png');
         }
 
         const style = {backgroundImage: 'url(' + url + ')',

app/components/elements/VerticalMenu.jsx → src/app/components/elements/VerticalMenu.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router'
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 
 export default class VerticalMenu extends React.Component {
     static propTypes = {

app/components/modules/Header.jsx → src/app/components/modules/Header.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import { Link } from 'react-router';
 import {connect} from 'react-redux';
 import TopRightMenu from 'app/components/modules/TopRightMenu';
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 import resolveRoute from 'app/ResolveRoute';
 import DropdownMenu from 'app/components/elements/DropdownMenu';
 import shouldComponentUpdate from 'app/utils/shouldComponentUpdate';

app/components/modules/Header.test.js → src/app/components/modules/Header.test.js

@@ -2,7 +2,7 @@
 import React from 'react';
 import { expect } from 'chai';
 import { shallow } from 'enzyme';
-import {_Header_} from './Header.jsx';
+import {_Header_} from './Header';
 
 describe('Header', () => {
     it('contains class .header', () => {

app/components/modules/MiniHeader.jsx → src/app/components/modules/MiniHeader.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 import { APP_NAME } from 'app/client_config';
 
 export default function MiniHeader() {

app/components/modules/Transfer.jsx → src/app/components/modules/Transfer.jsx

@@ -72,7 +72,7 @@ class TransferForm extends Component {
             initialValues: props.initialValues,
             validation: values => ({
                 to:
-                    ! values.to ? tt('g.required') : validate_account_name(values.to),
+                    ! values.to ? tt('g.required') : validate_account_name(values.to, values.memo),
                 amount:
                     ! values.amount ? 'Required' :
                     ! /^\d+(\.\d+)?$/.test(values.amount) ? tt('transfer_jsx.amount_is_in_form') :

app/components/pages/NotFound.jsx → src/app/components/pages/NotFound.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import SvgImage from 'app/components/elements/SvgImage';
 import { Link } from 'react-router';
-import Icon from 'app/components/elements/Icon.jsx';
+import Icon from 'app/components/elements/Icon';
 
 class NotFound extends React.Component {
 

app/locales/en.json → src/app/locales/en.json

@@ -254,7 +254,11 @@
     "terms_of_service": "Terms of Service",
     "sign_up": "Sign Up",
     "welcome": "Welcome",
-    "faq": "FAQ"
+    "faq": "FAQ",
+    "chat": "Steemit Chat",
+    "app_center": "Steemit App Center",
+    "api_docs": "Steemit API Docs",
+    "whitepaper": "Steem Whitepaper"
   },
   "main_menu": {
     "hot": "hot",
@@ -742,7 +746,8 @@
     "start_with_a_letter": "start with a letter.",
     "have_only_letters_digits_or_dashes": "have only letters, digits, or dashes.",
     "have_only_one_dash_in_a_row": "have only one dash in a row.",
-    "end_with_a_letter_or_digit": "end with a letter or digit."
+    "end_with_a_letter_or_digit": "end with a letter or digit.",
+    "verified_exchange_no_memo": "You must include a memo for your exchange transfer."
   },
   "settings_jsx": {
     "invalid_url": "Invalid URL",