Merge branch 'dev'

* dev:
  v0.2.5 - bugfix - Alert message added(Private planet/Team member)

Conflicts:
	package.json

browser/main/Components/AddMemberModal.jsx

@@ -50,19 +50,24 @@ module.exports = React.createClass({
     }
   },
   handleSubmit: function () {
-    Hq
-      .addMember(this.props.team.name, {
-        userName: this.state.userName,
-        role: this.state.role
-      })
-      .then(function (res) {
-        console.log(res.body)
-        UserStore.Actions.addMember(res.body)
-        this.props.close()
-      }.bind(this))
-      .catch(function (err) {
-        console.error(err)
-      })
+    this.setState({errorMessage: null}, function () {
+      Hq
+        .addMember(this.props.team.name, {
+          userName: this.state.userName,
+          role: this.state.role
+        })
+        .then(function (res) {
+          console.log(res.body)
+          UserStore.Actions.addMember(res.body)
+          this.props.close()
+        }.bind(this))
+        .catch(function (err) {
+          console.error(err)
+          if (err.status === 403) {
+            this.setState({errorMessage: err.response.body.message})
+          }
+        }.bind(this))
+    })
   },
   handleChange: function (value) {
     this.setState({userName: value})
@@ -88,6 +93,8 @@ module.exports = React.createClass({
           role
         </div>
 
+        {this.state.errorMessage != null ? (<p className='errorAlert'>{this.state.errorMessage}</p>) : null}
+
         <button onClick={this.handleSubmit} className='submitButton'><i className='fa fa-check'/></button>
       </div>
     )

browser/main/Components/HomeNavigator.jsx

@@ -71,16 +71,6 @@ module.exports = React.createClass({
   openPlanetCreateModal: function () {
     this.openModal(PlanetCreateModal, {transitionTo: this.transitionTo})
   },
-  handleKeyDown: function (e) {
-    if (this.state.currentUser == null) return
-    if (e.metaKey && e.keyCode > 48 && e.keyCode < 58) {
-      var planet = this.state.currentUser.Planets[e.keyCode - 49]
-      if (planet != null) {
-        this.transitionTo('planet', {userName: planet.userName, planetName: planet.name})
-      }
-      e.preventDefault()
-    }
-  },
   toggleProfilePopup: function () {
     this.openProfilePopup()
   },

browser/main/Components/PlanetCreateModal.jsx

@@ -42,21 +42,26 @@ module.exports = React.createClass({
     }
   },
   handleSubmit: function () {
-    Hq.createPlanet(this.state.ownerName, this.state.planet)
-      .then(function (res) {
-        var planet = res.body
+    this.setState({errorMessage: null}, function () {
+      Hq.createPlanet(this.state.ownerName, this.state.planet)
+        .then(function (res) {
+          var planet = res.body
 
-        PlanetStore.Actions.update(planet)
+          PlanetStore.Actions.update(planet)
 
-        if (this.props.transitionTo != null) {
-          this.props.transitionTo('planetHome', {userName: planet.userName, planetName: planet.name})
-        }
+          if (this.props.transitionTo != null) {
+            this.props.transitionTo('planetHome', {userName: planet.userName, planetName: planet.name})
+          }
 
-        this.props.close()
-      }.bind(this))
-      .catch(function (err) {
-        console.error(err)
-      })
+          this.props.close()
+        }.bind(this))
+        .catch(function (err) {
+          console.error(err)
+          if (err.status === 403) {
+            this.setState({errorMessage: err.response.body.message})
+          }
+        }.bind(this))
+    })
   },
   render: function () {
     var teamOptions = this.state.user.Teams.map(function (team) {
@@ -81,6 +86,8 @@ module.exports = React.createClass({
           </select>
         </div>
 
+        {this.state.errorMessage != null ? (<p className='errorAlert'>{this.state.errorMessage}</p>) : null}
+
         <button onClick={this.handleSubmit} className='submitButton'>
           <i className='fa fa-check'/>
         </button>

browser/main/Containers/UserContainer.jsx

@@ -223,7 +223,9 @@ module.exports = React.createClass({
   renderTeamHome: function (currentUser) {
     var user = this.state.user
 
-    var isOwner = true
+    var isOwner = user.Members == null ? false : user.Members.some(function (member) {
+      return member.id === currentUser.id && member.TeamMember.role === 'owner'
+    })
 
     var userPlanets = user.Planets.map(function (planet) {
       return (
@@ -257,7 +259,7 @@ module.exports = React.createClass({
             <div className='userName'>{user.name}</div>
           </div>
 
-          <button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>
+          {isOwner ? (<button onClick={this.openTeamSettingsModal} className='editProfileButton'>Team settings</button>) : null}
         </div>
         <div className='memberList'>
           <div className='memberLabel'>{members.length} {members.length > 1 ? 'Members' : 'Member'}</div>

browser/main/Mixins/Helper.js

@@ -1,4 +1,5 @@
 function deleteItemFromTargetArray (item, targetArray) {
+  if (targetArray == null) targetArray = []
   targetArray.some(function (_item, index) {
     if (_item.id === item.id) {
       targetArray.splice(index, 1)
@@ -11,6 +12,8 @@ function deleteItemFromTargetArray (item, targetArray) {
 }
 
 function updateItemToTargetArray (item, targetArray) {
+  if (targetArray == null) targetArray = []
+
   var isNew = !targetArray.some(function (_item, index) {
     if (_item.id === item.id) {
       targetArray.splice(index, 1, item)

browser/main/Services/Hq.js

@@ -35,6 +35,9 @@ module.exports = {
   fetchUser: function (userName) {
     return request
       .get(apiUrl + 'resources/' + userName)
+      .set({
+        Authorization: 'Bearer ' + localStorage.getItem('token')
+      })
   },
   updateUser: function (userName, input) {
     return request
@@ -79,6 +82,9 @@ module.exports = {
   fetchPlanet: function (userName, planetName) {
     return request
       .get(apiUrl + 'resources/' + userName + '/planets/' + planetName)
+      .set({
+        Authorization: 'Bearer ' + localStorage.getItem('token')
+      })
   },
   updatePlanet: function (userName, planetName, input) {
     return request

browser/styles/shared/modal.styl

@@ -196,7 +196,6 @@
             border-radius 5px
             float left
 
-
   .LaunchModal
     .modal-tab
       text-align center
@@ -314,6 +313,14 @@
       height 55px
       circle()
       btnPrimary()
+    .errorAlert
+      alertError()
+      padding 12px 10px
+      border-radius 5px
+      text-align center
+      display block
+      width 360px
+      margin 0 auto 15px
 
   .ContactModal
     padding 15px

main.js

@@ -178,6 +178,10 @@ function makeNewMainWindow () {
 
   mainWindow.loadUrl('file://' + __dirname + '/browser/main/index.electron.html')
 
+  mainWindow.webContents.on('new-window', function (e) {
+    e.preventDefault()
+  })
+
   mainWindow.on('closed', function () {
     console.log('main closed')
     mainWindow = null

package.json

@@ -1,6 +1,6 @@
 {
   "name": "boost",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Boost App",
   "main": "main.js",
   "scripts": {