diff --git a/.travis.yml b/.travis.yml index afeccdd6..bfb67faa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,8 +10,9 @@ services: - mysql before_install: -- rvm use 2.2 --install --binary --fuzzy +- rvm use 2.6 --install --binary --fuzzy - ruby --version +- apt-get install ruby-bundler - mysql -e 'CREATE DATABASE development;' - nvm install 6.14.4 - npm install -g npm@6.1.0 diff --git a/client/.babelrc b/client/.babelrc index 91246e4d..e60d3036 100644 --- a/client/.babelrc +++ b/client/.babelrc @@ -1,3 +1,4 @@ { - "optional": ["es7.classProperties"] -} \ No newline at end of file + "presets": ["@babel/preset-env", "@babel/preset-react"], + "plugins": ["@babel/plugin-proposal-class-properties"] +} diff --git a/client/package.json b/client/package.json index 0faea166..66ba307a 100644 --- a/client/package.json +++ b/client/package.json @@ -13,21 +13,35 @@ "npm": "^2.1.x" }, "scripts": { + "start": "webpack-dev-server", + "start-fixtures": "webpack-dev-server --env.FIXTURES=1", + "build": "rimraf build && NODE_ENV=production webpack -p --devtool none", "test": "export NODE_PATH=src && mocha src/lib-test/preprocessor.js --compilers js:babel-core/register --recursive src/**/**/__tests__/*-test.js" }, "devDependencies": { + "@babel/core": "^7.4.5", + "@babel/plugin-proposal-class-properties": "^7.4.4", + "@babel/preset-env": "^7.4.5", + "@babel/preset-react": "^7.0.0", "axios-mock-adapter": "^1.15.0", "babel-core": "^5.8.22", + "babel-eslint": "^10.0.1", + "babel-loader": "^8.0.6", "babel-plugin-transform-class-properties": "^6.11.5", "babel-register": "^6.7.2", "babelify": "^6.1.x", "browser-sync": "^2.7.13", "browserify": "^10.2.6", "chai": "^3.5.0", + "copy-webpack-plugin": "^5.0.3", + "css-loader": "^3.0.0", "debowerify": "^1.3.1", "del": "^1.2.0", + "eslint": "^5.16.0", + "eslint-loader": "^2.1.2", "express": "^4.13.1", "express-http-proxy": "^0.6.0", + "file-loader": "^4.0.0", "gulp": "^3.9.0", "gulp-autoprefixer": "^2.3.1", "gulp-connect-php": "0.0.5", @@ -42,22 +56,33 @@ "gulp-streamify": "0.0.5", "gulp-uglify": "^2.1.2", "gulp-util": "^3.0.6", + "html-webpack-plugin": "^3.2.0", "humps": "^0.6.0", "jsdom": "^8.4.1", "morgan": "^1.6.1", + "path": "^0.12.7", "proxyquire": "^1.7.4", "react-addons-test-utils": "^15.0.1", + "rimraf": "^2.6.3", "run-sequence": "^1.1.1", + "sass-loader": "^7.1.0", "sinon": "^1.17.3", "sinon-chai": "^2.8.0", + "style-loader": "^0.23.1", + "stylelint-webpack-plugin": "^0.10.5", "vinyl-source-stream": "^1.1.0", - "watchify": "^3.2.x" + "watchify": "^3.2.x", + "webpack": "^4.34.0", + "webpack-bundle-analyzer": "^3.3.2", + "webpack-cli": "^3.3.4", + "webpack-dev-server": "^3.7.1", + "webpack-import-glob": "^2.0.0" }, "dependencies": { - "app-module-path": "^1.0.3", "axios": "^0.18.0", - "chart.js": "^2.4.0", "classnames": "^2.2.5", + "font-awesome": "^4.7.0", + "font-awesome-sass-loader": "^2.0.1", "history": "^3.0.0", "html-to-text": "^4.0.0", "keycode": "^2.1.4", @@ -68,10 +93,8 @@ "quill-image-resize-module-react": "^3.0.0", "random-string": "^0.2.0", "react": "^15.4.2", - "react-chartjs-2": "^2.0.0", "react-document-title": "^1.0.2", "react-dom": "^15.4.2", - "react-draft-wysiwyg": "^1.12.13", "react-google-recaptcha": "^0.5.2", "react-motion": "^0.4.7", "react-quill": "^1.3.1", diff --git a/client/src/app/App.js b/client/src/app/App.js index 053fd186..e39148e6 100644 --- a/client/src/app/App.js +++ b/client/src/app/App.js @@ -111,7 +111,7 @@ class App extends React.Component { history.push('/admin'); } - if(isProd && _.includes(props.location.pathname, '/components-demo')) { + if(/*isProd &&*/ _.includes(props.location.pathname, '/components-demo')) { history.push('/'); } } diff --git a/client/src/app/admin/panel/dashboard/admin-panel-stats.js b/client/src/app/admin/panel/dashboard/admin-panel-stats.js index 5da731fd..b9344dde 100644 --- a/client/src/app/admin/panel/dashboard/admin-panel-stats.js +++ b/client/src/app/admin/panel/dashboard/admin-panel-stats.js @@ -1,18 +1,23 @@ import React from 'react'; import i18n from 'lib-app/i18n'; -import Stats from 'app-components/stats'; +// import Stats from 'app-components/stats'; import Header from 'core-components/header'; class AdminPanelStats extends React.Component { render() { + // return ( + //