Fix bug for livereloading avatar

gocreating · Oct 31, 2016 · 4e773ca · 4e773ca
1 parent a68ddc2
commit 4e773ca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/src/common/components/forms/user/AvatarForm.js b/src/common/components/forms/user/AvatarForm.js
@@ -2,14 +2,14 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { Field, reduxForm } from 'redux-form';
 import Button from 'react-bootstrap/lib/Button';
+import Image from 'react-bootstrap/lib/Image';
 import FormNames from '../../../constants/FormNames';
 import configs from '../../../../../configs/project/client';
 import firebaseAPI from '../../../api/firebase';
 import userAPI from '../../../api/user';
 import { pushErrors } from '../../../actions/errorActions';
 import { setCookies } from '../../../actions/cookieActions';
 import { Form, FormField, FormFooter } from '../../utils/BsForm';
-import RefreshImage from '../../utils/RefreshImage';
 import toRefreshURL from '../../../utils/toRefreshURL';
 
 const initialValues = {
@@ -187,17 +187,16 @@ class AvatarForm extends Component {
 
   render() {
     const {
-      user,
+      user: { avatarURL },
       handleSubmit,
       pristine,
       submitting,
       invalid,
     } = this.props;
-    let avatarURL = this.state.avatarURL || user.avatarURL;
 
     return (
       <Form onSubmit={handleSubmit(this.handleSubmit)}>
-        {avatarURL && <RefreshImage thumbnail src={avatarURL} />}
+        {avatarURL && <Image thumbnail src={avatarURL} />}
         <Field
           name="avatar"
           component={FormField}

diff --git a/src/common/components/pages/user/ShowPage.js b/src/common/components/pages/user/ShowPage.js
@@ -6,13 +6,14 @@ import Modal from 'react-bootstrap/lib/Modal';
 import Row from 'react-bootstrap/lib/Row';
 import Col from 'react-bootstrap/lib/Col';
 import Button from 'react-bootstrap/lib/Button';
+import Image from 'react-bootstrap/lib/Image';
 import userAPI from '../../../api/user';
 import { pushErrors } from '../../../actions/errorActions';
 import Head from '../../widgets/Head';
 import PageLayout from '../../layouts/PageLayout';
 import Time from '../../widgets/Time';
-import RefreshImage from '../../utils/RefreshImage';
 import VerifyEmailForm from '../../forms/user/VerifyEmailForm';
+import toRefreshURL from '../../../utils/toRefreshURL';
 
 class ShowPage extends Component {
   constructor(props) {
@@ -35,6 +36,7 @@ class ShowPage extends Component {
         throw err;
       })
       .then((json) => {
+        json.user.avatarURL = toRefreshURL(json.user.avatarURL);
         this.setState({
           user: json.user,
         });
@@ -94,7 +96,7 @@ class ShowPage extends Component {
           <dd>{user._id}</dd>
           <dt>avatar</dt>
           <dd>
-            {user.avatarURL && <RefreshImage thumbnail src={user.avatarURL} />}
+            {user.avatarURL && <Image thumbnail src={user.avatarURL} />}
           </dd>
           <dt>name</dt>
           <dd>{user.name}</dd>

diff --git a/src/common/components/utils/RefreshImage.js b/src/common/components/utils/RefreshImage.js