Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
fix build
Browse files Browse the repository at this point in the history
  • Loading branch information
Alex Eng committed Mar 29, 2016
1 parent 23ba22f commit 5f9cd92
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 14 deletions.
8 changes: 0 additions & 8 deletions frontend/src/main/web/.babelrc

This file was deleted.

4 changes: 2 additions & 2 deletions frontend/src/main/web/package.json
Expand Up @@ -26,7 +26,7 @@
"atomic-loader": "^0.1.3",
"autoprefixer-loader": "^3.2.0",
"babel-core": "^6.7.2",
"babel-eslint": "^5.0.0",
"babel-eslint": "^6.0.0",
"babel-jest": "^6.0.1",
"babel-loader": "^6.2.1",
"babel-plugin-lodash": "2.1.0",
Expand All @@ -38,7 +38,7 @@
"eslint": "^2.4.0",
"eslint-config-standard": "^5.1.0",
"eslint-config-standard-react": "^2.3.0",
"eslint-config-zanata": "^2.0.0",
"eslint-config-zanata": "^2.0.1",
"eslint-loader": "^1.3.0",
"eslint-plugin-promise": "^1.1.0",
"eslint-plugin-react": "^4.2.3",
Expand Down
5 changes: 2 additions & 3 deletions frontend/src/main/web/src/containers/UserProfile/index.jsx
Expand Up @@ -72,10 +72,9 @@ var UserProfile = React.createClass({
render: function () {
const user = isEmpty(this.state.user) ? window.config.user : this.state.user
const username = user && user.username ? user.username : ''
const languageTeams = user && user.languageTeams.length > 0
const languageTeams = user && !isEmpty(user.languageTeams)
? user.languageTeams.join() : ''
const notification = this.state.notification
console.log(languageTeams, user)
return (
<Page>
{notification && (<Notification
Expand Down Expand Up @@ -112,7 +111,7 @@ var UserProfile = React.createClass({
</span>)
}
</Flex>
{user && user.languageTeams.length > 0 &&
{user && !isEmpty(user.languageTeams) &&
(<Flex tagName='li' align='c' id='profile-languages'>
<Icon name='language'
atomic={{m: 'Mend(re)'}}
Expand Down
3 changes: 2 additions & 1 deletion frontend/src/main/web/src/index.js
Expand Up @@ -29,12 +29,13 @@ WebFont.load({

const routerMiddleware = syncHistory(hashHistory)

console.log('alex', process)
const finalCreateStore = compose(
applyMiddleware(
thunk,
apiMiddleware,
routerMiddleware,
createLogger()
process.env === 'development' && createLogger()
)
// DevTools.instrument()
)(createStore)
Expand Down

0 comments on commit 5f9cd92

Please sign in to comment.