Merge remote-tracking branch 'upstream/master'

This commit is contained in:
mati108@gmail.com committed 2018-10-18 10:36:53 -03:00
commit 076de155b3
5 files changed
+7673 -5167

No files matched your search

+6627 -4112
View File
File diff suppressed because it is too large. Load diff
+4 -3
View File
@@ -22,9 +22,9 @@
"homepage": "https://github.com/Algoteers/MasterApp#readme",
"devDependencies": {
"@advancedalgos/key-vault-client": "^0.0.9",
"@advancedalgos/teams-client": "^0.0.21",
"@advancedalgos/users-client": "^0.0.11",
"@advancedalgos/web-components": "^0.0.12",
"@advancedalgos/teams-client": "0.0.22",
"@advancedalgos/users-client": "^0.0.12",
"@advancedalgos/web-components": "0.0.13",
"@babel/core": "^7.1.2",
"autoprefixer": "^9.2.0",
"babel-loader": "^8.0.4",
@@ -75,6 +75,7 @@
"graphql": "^14.0.2",
"graphql-tag": "^2.10.0",
"mini-css-extract-plugin": "^0.4.4",
"npm": "^6.4.1",
"optimize-css-assets-webpack-plugin": "^5.0.1",
"prop-types": "^15.6.2",
"react": "^16.5.2",
-4
View File
@@ -21,7 +21,6 @@ import { LoggedOut } from './LoggedOut'
import AALogo from '../../assets/advanced-algos/aa-logo-dark.svg'
const AboutLink = props => <Link to='/about' {...props} />
const UsersLink = props => <Link to='/users' {...props} />
const TeamsLink = props => <Link to='/teams' {...props} />
const KeyVaultLink = props => <Link to='/key-vault' {...props} />
@@ -110,9 +109,6 @@ class Header extends Component {
<Button component={TeamsLink} color='inherit'>
Teams
</Button>
<Button component={AboutLink} color='inherit'>
About
</Button>
{this.state.user !== undefined && this.state.user !== null ? (
<React.Fragment>
@@ -3,7 +3,6 @@ const path = require('path')
const merge = require('webpack-merge')
const commonConfig = require('./helpers/webpack.common.config')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin')
const HtmlWebpackPlugin = require('html-webpack-plugin')
const HtmlWebpackHarddiskPlugin = require('html-webpack-harddisk-plugin')
@@ -21,11 +20,6 @@ module.exports = merge(commonConfig, {
optimization: {
minimizer: [
new UglifyJsPlugin({
cache: true,
parallel: true,
sourceMap: false
}),
new OptimizeCSSAssetsPlugin({})
],
splitChunks: {
+1042 -1042
View File
File diff suppressed because it is too large. Load diff