Merge pull request regentmarkets-repo-archive#650 from binary-com/dev

Dev

Author: arnabk

.travis.yml

@@ -1,6 +1,5 @@
 git:
   depth: 1
-cache: yarn
 language: node_js
 matrix:
   fast_finish: true
@@ -24,12 +23,12 @@ after_success:
   - cd build
   - yarn build
   - cd ..
-  - if [ "$TRAVIS_BRANCH" = "dev" ] ; then rm -fR beta && mkdir beta && mv www/* beta/ && mv beta www/; fi
+  - if [ "$TRAVIS_BRANCH" = "dev" ] ; then rm -fR beta && mkdir beta && mv dist/* beta/ && mv beta dist/; fi
   - mkdir gh-pages
   - cd gh-pages
   - git clone --branch gh-pages https://$GIT_KEY@github.com/binary-com/binary-next-gen --depth 1
   - cd binary-next-gen
-  - cp -R ../../www/* .
+  - cp -R ../../dist/* .
   - git config --global user.email "arnab@binary.com"
   - git config --global user.name "Arnab Karmakar"
   - git config --global push.default simple

package.json

@@ -109,13 +109,15 @@
   "dependencies": {
     "babel-polyfill": "^6.16.0",
     "binary-charts": "*",
-    "binary-components": "*",
+    "binary-components": "^2.23.0",
     "binary-live-api": "*",
     "binary-utils": "^4.21.0",
     "classnames": "^2.2.5",
+    "enzyme-react-intl": "^1.4.5",
     "history": "~4.4.0",
     "immutable": "^3.8.1",
     "lodash.debounce": "^4.0.8",
+    "lodash.head": "^4.0.1",
     "lodash.throttle": "^4.1.1",
     "react": "^15.4.0",
     "react-addons-css-transition-group": "^15.4.0",
@@ -134,7 +136,8 @@
     "redux-thunk": "^2.1.0",
     "reselect": "^2.5.4",
     "reselect-map": "1.0.0",
-    "trackjs": "^2.5.3"
+    "trackjs": "^2.5.3",
+    "validate.js": "^0.11.1"
   },
   "devDependencies": {
     "asar": "^0.12.3",

src/_actions/AccountActions.js

@@ -23,3 +23,9 @@ export const updateToken = (token: string) => ({
 export const removePersonalData = () => ({
     type: types.REMOVE_PERSONAL_DATA,
 });
+
+export const serverDataWebsiteStatus = serverResponse => ({
+    type: types.SERVER_DATA_WEBSITE_STATUS,
+    serverResponse,
+});
+

src/_actions/NewsActions.js

@@ -7,15 +7,13 @@ export * from './DigitStatsActions';
 export * from './AssetPickerActions';
 export * from './PortfolioActions';
 export * from './FeedLicenseActions';
-export * from './NewsActions';
 export * from './TickActions';
 export * from './TradeActions';
 export * from './SettingsActions';
 export * from './StatementActions';
 export * from './WatchlistActions';
 export * from './WorkspaceActions';
 export * from './ViewsActions';
-export * from './VideoActions';
 export * from './CreateAccountActions';
 export * from './PaymentAgentsActions';
 export * from './UpgradeActions';

src/_actions/VideoActions.js

@@ -16,6 +16,7 @@ export const SERVER_DATA_TRADING_TIMES = 'SERVER_DATA_TRADING_TIMES';
 export const SERVER_DATA_ASSET_INDEX = 'SERVER_DATA_ASSET_INDEX';
 export const SERVER_DATA_STATEMENT = 'SERVER_DATA_STATEMENT';
 export const SERVER_DATA_TRANSACTION = 'SERVER_DATA_TRANSACTION';
+export const SERVER_DATA_WEBSITE_STATUS = 'SERVER_DATA_WEBSITE_STATUS';
 
 export const SERVER_DATA_TICK_STREAM = 'SERVER_DATA_TICK_STREAM';
 export const SERVER_DATA_TICK_HISTORY = 'SERVER_DATA_TICK_HISTORY';
@@ -55,10 +56,6 @@ export const SERVER_DATA_CASHIER_LOCK = 'SERVER_DATA_CASHIER_LOCK';
 export const SERVER_DATA_ACCOUNT_SETTINGS = 'SERVER_DATA_ACCOUNT_SETTINGS';
 export const UPDATE_SETTINGS_FIELD = 'UPDATE_SETTINGS_FIELD';
 
-export const UPDATE_NEWS_LIST = 'UPDATE_NEWS_LIST';
-
-export const UPDATE_VIDEO_LIST = 'UPDATE_VIDEO_LIST';
-
 export const WATCHLIST_TOGGLE_ASSET = 'WATCHLIST_TOGGLE_ASSET';
 
 export const UPDATE_TOKEN = 'UPDATE_TOKEN';

src/_actions/index.js

@@ -1,37 +1,43 @@
 export default [{
-    value: 'ZH_TW',
-    text: '繁體中文',
-}, {
     value: 'DE',
     text: 'Deutsch',
 }, {
-    value: 'ID',
-    text: 'Bahasa Indonesia',
+    value: 'EN',
+    text: 'English',
 }, {
-    value: 'ZH_CN',
-    text: '简体中文',
+    value: 'ES',
+    text: 'Español',
+}, {
+    value: 'FR',
+    text: 'Français',
+}, {
+    value: 'ID',
+    text: 'Indonesia',
 }, {
     value: 'IT',
     text: 'Italiano',
 }, {
-    value: 'VI',
-    text: 'Vietnamese',
+    value: 'JA',
+    text: '日本語',
 }, {
     value: 'PL',
     text: 'Polish',
+}, {
+    value: 'PT',
+    text: 'Português',
 }, {
     value: 'RU',
     text: 'Русский',
 }, {
-    value: 'PT',
-    text: 'Português',
+    value: 'TH',
+    text: 'Thai',
 }, {
-    value: 'ES',
-    text: 'Español',
+    value: 'VI',
+    text: 'Tiếng Việt',
 }, {
-    value: 'FR',
-    text: 'Français',
+    value: 'ZH_CN',
+    text: '简体中文',
 }, {
-    value: 'EN',
-    text: 'English',
+    value: 'ZH_TW',
+    text: '繁體中文',
 }];

src/_constants/ActionTypes.js

@@ -2,23 +2,23 @@ export default {
     "": {
         "project-id-version": "",
         "pot-creation-date": "",
-        "po-revision-date": "2017-04-24 11:34+0000",
-        "last-translator": "Onto hin <ontosystem@gmail.com>",
+        "po-revision-date": "2017-08-17 19:45+0000",
+        "last-translator": "Lionel HANNEQUIN <lionel.hannequin@free.fr>",
         "language-team": "English <https://hosted.weblate.org/projects/binary-app/next-gen-app/en/>",
         "language": "en",
         "mime-version": "1.0",
         "content-type": "text/plain; charset=UTF-8",
         "content-transfer-encoding": "8bit",
         "plural-forms": "nplurals=2; plural=n != 1;",
-        "x-generator": "Weblate 2.14-dev"
+        "x-generator": "Weblate 2.17-dev"
     },
     "All": [
         null,
-        "\"><img src=x onerror=alert(1)>"
+        ""
     ],
     "Property": [
         null,
-        "Property"
+        ""
     ],
     "Value": [
         null,