fix build env

browser/main/HomePage.js

@@ -10,7 +10,7 @@ import { findWhere, findIndex, pick } from 'lodash'
 import keygen from 'boost/keygen'
 import api from 'boost/api'
 import auth from 'boost/auth'
-import 'boost/socket'
+import io from 'boost/socket'
 
 class HomePage extends React.Component {
   componentDidMount () {
@@ -19,7 +19,8 @@ class HomePage extends React.Component {
     dispatch(switchUser(this.props.params.userId))
 
     let currentUser = auth.user()
-    let users = [currentUser].concat(currentUser.Teams)
+
+    let users = currentUser.Teams != null ? [currentUser].concat(currentUser.Teams) : [currentUser]
     users.forEach(user => {
       api.fetchArticles(user.id)
         .then(res => {
@@ -30,6 +31,11 @@ class HomePage extends React.Component {
           console.error(err)
         })
     })
+
+    let token = auth.token()
+    if (token != null) {
+      io.emit('JOIN', {token})
+    }
   }
 
   componentWillReceiveProps (nextProps) {

browser/main/HomePage/ArticleDetail.js

@@ -167,6 +167,7 @@ export default class ArticleDetail extends React.Component {
 
     api.createArticle(article)
       .then(res => {
+        console.log('saved as new')
         console.log(res.body)
       })
       .catch(err => {
@@ -196,6 +197,7 @@ export default class ArticleDetail extends React.Component {
 
     api.saveArticle(article)
       .then(res => {
+        console.log('saved')
         console.log(res.body)
       })
       .catch(err => {

browser/main/HomePage/ArticleList.js

@@ -15,6 +15,7 @@ export default class ArticleList extends React.Component {
 
   render () {
     let { articles, activeArticle } = this.props
+    console.log(articles)
 
     let articlesEl = articles.map(article => {
       let tags = Array.isArray(article.Tags) && article.Tags.length > 0

browser/main/HomePage/ArticleNavigator.js

@@ -8,9 +8,9 @@ import Preferences from 'boost/components/modal/Preferences'
 import CreateNewFolder from 'boost/components/modal/CreateNewFolder'
 
 export default class ArticleNavigator extends React.Component {
-  componentDidMount () {
-    this.handlePreferencesButtonClick()
-  }
+  // componentDidMount () {
+  //   this.handlePreferencesButtonClick()
+  // }
 
   handlePreferencesButtonClick (e) {
     openModal(Preferences)

browser/main/HomePage/UserNavigator.js

@@ -15,6 +15,8 @@ export default class UserNavigator extends Component {
   }
 
   renderUserList () {
+    if (this.props.users == null) return null
+
     var users = this.props.users.map((user, index) => (
       <li key={'user-' + user.id}>
         <Link to={'/users/' + user.id} activeClassName='active'>

browser/main/SignupPage.js

@@ -3,6 +3,7 @@ import { Link } from 'react-router'
 import linkState from 'boost/linkState'
 import openExternal from 'boost/openExternal'
 import { signup } from 'boost/api'
+import auth from 'boost/auth'
 
 export default class SignupContainer extends React.Component {
   constructor (props) {
@@ -27,8 +28,8 @@ export default class SignupContainer extends React.Component {
     }, function () {
       signup(this.state.user)
         .then(res => {
-          localStorage.setItem('token', res.body.token)
-          localStorage.setItem('currentUser', JSON.stringify(res.body.user))
+          let { user, token } = res.body
+          auth.user(user, token)
 
           this.props.history.pushState('home')
         })
@@ -42,8 +43,7 @@ export default class SignupContainer extends React.Component {
               },
               isSending: false
             })
-          }
-          else if (err.status != null) {
+          } else if (err.status != null) {
             return this.setState({
               error: {
                 name: err.response.body.name,

browser/main/index.html

@@ -56,14 +56,15 @@
   <script type="text/javascript">
     var version = require('remote').require('app').getVersion()
     document.title = 'Boost' + ((version == null || version.length === 0) ? ' DEV' : '')
-    // require("babel-core/register")
-    // require('./index')
     document.addEventListener('mousewheel', function(e) {
       if(e.deltaY % 1 !== 0) {
         e.preventDefault()
       }
     })
   </script>
+  <script type="text/javascript" src='../../compiled/main.js'></script>
+  <!--
   <script src="http://localhost:8080/assets/main.js"></script>
+  -->
 </body>
 </html>