diff --git a/browser/main/Components/PersonalSettingModal.jsx b/browser/main/Components/PersonalSettingModal.jsx index 12b032d3..2181ae0c 100644 --- a/browser/main/Components/PersonalSettingModal.jsx +++ b/browser/main/Components/PersonalSettingModal.jsx @@ -4,6 +4,8 @@ var request = require('superagent') var Catalyst = require('../Mixins/Catalyst') +var ProfileImage = require('./ProfileImage') + var AuthActions = require('../Actions/AuthActions') var AuthStore = require('../Stores/AuthStore') @@ -243,7 +245,8 @@ module.exports = React.createClass({ content = (

Are you sure to logout?

-
+ +
) diff --git a/browser/main/Components/PlanetNavigator.jsx b/browser/main/Components/PlanetNavigator.jsx index 7d53d736..583463ee 100644 --- a/browser/main/Components/PlanetNavigator.jsx +++ b/browser/main/Components/PlanetNavigator.jsx @@ -1,5 +1,7 @@ var React = require('react/addons') +var ProfileImage = require('./ProfileImage') + var PlanetNavigator = React.createClass({ propTypes: { currentPlanet: React.PropTypes.shape({ @@ -25,7 +27,7 @@ var PlanetNavigator = React.createClass({ var users = this.props.currentPlanet.Users.map(function (user) { return (
  • - +
    {user.profileName}
  • ) diff --git a/browser/main/Components/PlanetSettingModal.jsx b/browser/main/Components/PlanetSettingModal.jsx index d3198f31..59c59fc0 100644 --- a/browser/main/Components/PlanetSettingModal.jsx +++ b/browser/main/Components/PlanetSettingModal.jsx @@ -4,6 +4,8 @@ var Select = require('react-select') var Catalyst = require('../Mixins/Catalyst') +var ProfileImage = require('./ProfileImage') + var PlanetActions = require('../Actions/PlanetActions') var apiUrl = require('../../../config').apiUrl @@ -106,7 +108,7 @@ module.exports = React.createClass({ var members = this.props.currentPlanet.Users.map(function (user) { return (
  • - +
    {user.name}
    {this.props.currentPlanet.OwnerId !== user.id ? : Owner} diff --git a/browser/main/Components/ProfileImage.jsx b/browser/main/Components/ProfileImage.jsx new file mode 100644 index 00000000..1cb3cf6d --- /dev/null +++ b/browser/main/Components/ProfileImage.jsx @@ -0,0 +1,15 @@ +var React = require('react/addons') +var md5 = require('md5') + +module.exports = React.createClass({ + propTypes: { + email: React.PropTypes.string, + size: React.PropTypes.string, + className: React.PropTypes.string + }, + render: function () { + return ( + @@ -75,7 +74,7 @@ module.exports = React.createClass({ return (
      {planets} diff --git a/package.json b/package.json index 44afe6fd..915bb8ce 100644 --- a/package.json +++ b/package.json @@ -35,13 +35,14 @@ "electron-stylus": "^0.1.0", "font-awesome": "^4.3.0", "markdown-it": "^4.3.1", + "md5": "^2.0.0", "moment": "^2.10.3", + "nib": "^1.1.0", "node-jsx": "^0.13.3", "react": "^0.13.3", "react-router": "^0.13.3", "react-select": "^0.5.4", "reflux": "^0.2.8", - "nib": "^1.1.0", "superagent": "^1.2.0" }, "devDependencies": {