Merge branch 'master' of https://github.com/moecube/moecube-accounts-web

.roadhogrc → .roadhogrc.js

-{
+
+let publicPath = 'https://cdn01.moecube.com/accounts/'
+let defineConf = {
+  apiRoot: process.env["BUILD"] == 'development' ? 'http://114.215.243.95:8082' : 'https://api.moeube.com/accounts'
+}
+
+export default {
   "entry": "src/index.js",
-  "publicPath":"https://cdn01.moecube.com/accounts/",
+  publicPath,
+  define: {...defineConf},
   "env": {
     "development": {
       "extraBabelPlugins": [

package.json

 {
   "private": true,
   "scripts": {
-    "start": "roadhog server",
+    "start": "BUILD=development roadhog server",
+    "build:dev":"BUILD=development roadhog build",
     "build": "roadhog build",
     "lint": "eslint --ext .js src test",
     "precommit": "npm run lint"
@@ -14,14 +15,10 @@
     "babel-runtime": "^6.9.2",
     "dva": "^1.2.1",
     "dva-loading": "^0.2.1",
-    "egg-init": "^1.8.1",
-    "rc-queue-anim": "^0.13.3",
     "react": "^15.4.0",
-    "react-addons-transition-group": "^15.4.2",
     "react-cropper": "^0.10.1",
     "react-document-title": "^2.0.2",
     "react-dom": "^15.4.0",
-    "react-image-crop": "^2.0.3",
     "react-intl": "^2.2.3",
     "react-particles-js": "^1.5.0",
     "url-api-polyfill": "^1.1.0"

src/config.js

+
 export default {
-  apiRoot: 'http://192.168.1.9:3000'
+  apiRoot: apiRoot
 };

src/models/user.js

@@ -150,8 +150,8 @@ export default {
           }
         }
       } catch (error) {
-        yield put(routerRedux.replace('/signin'));
-        message.error(error.message);
+        yield put(routerRedux.replace("/signin")) 
+        // message.error(error.message)       
       }
     },
     *updateProfile({ payload }, { call, put, select }) {

src/routes/Profiles.js

@@ -13,7 +13,7 @@ import config from '../config'
 const FormItem = Form.Item;
 const TabPane = Tabs.TabPane;
 
-const defaultAvatar = "https://r.my-card.in/accounts/images/default_avatar.jpg"
+const defaultAvatar = require("../../public/default_avatar.jpg")
 
 const formItemLayout = {
   labelCol: { span: 4 },