Skip to content

Fix issue #287 #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 1, 2017
Merged

Fix issue #287 #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e13d65
Fix issue #287
elfman Aug 28, 2017
741030c
Remove handleError from Avatar
elfman Aug 31, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 10 additions & 21 deletions src/shared/components/challenge-listing/Tooltips/UserAvatarTooltip/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,10 @@ import React, { Component } from 'react';
import PT from 'prop-types';
// import moment from 'moment';
import Tooltip from 'components/Tooltip';
import './style.scss';
import Avatar from 'components/Avatar';
import styles from './style.scss';
import config from 'utils/config';

const MOCK_PHOTO = 'https://acrobatusers.com/assets/images/template/author_generic.jpg';
/**
* Renders the tooltip's content.
* It includes: user profile picture, handle, his country and the TC registration
Expand All @@ -31,15 +32,15 @@ function Tip(props) {
</span>
)); */
const { photoLink } = props.user;
const src = photoLink.startsWith('https') ? photoLink : `${props.MAIN_URL}/${photoLink}`;
const src = photoLink.startsWith('https') ? photoLink : `${config.URL.BASE}/${photoLink}`;

return (
<div styleName="user-avatar-tooltip">
<img
alt="User avatar"
styleName="avatar"
src={src}
onError={props.handleError}
<Avatar
theme={{
avatar: styles.avatar,
}}
url={src}
/>
<div styleName="handle">{props.user.handle}</div>
{/* Below block is commented out as it's not possible to get this information
Expand All @@ -58,8 +59,6 @@ function Tip(props) {
}

Tip.propTypes = {
handleError: PT.func.isRequired,
MAIN_URL: PT.string,
user: PT.shape({
country: PT.string,
handle: PT.string,
Expand All @@ -69,10 +68,6 @@ Tip.propTypes = {
}).isRequired,
};

Tip.defaultProps = {
MAIN_URL: process.env.MAIN_URL,
};

/**
* Renders the tooltip.
*/
Expand All @@ -82,16 +77,10 @@ class UserAvatarTooltip extends Component {
this.state = {
user: props.user,
};
this.handleError = this.handleError.bind(this);
}
handleError() {
const user = this.state.user;
user.photoLink = MOCK_PHOTO;
this.setState({ user });
}

render() {
const tip = <Tip user={this.state.user} handleError={this.handleError} />;
const tip = <Tip user={this.state.user} />;
return (
<Tooltip content={tip}>
<div>{this.props.children}</div>
Expand Down
7 changes: 5 additions & 2 deletions src/shared/components/challenge-listing/Tooltips/UserAvatarTooltip/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ $avatar-radius-50: $corner-radius * 25;
$avatar-radius-4: $corner-radius * 2;

.user-avatar-tooltip {
display: flex;
justify-content: space-between;
align-items: center;
max-width: 640px;
font-family: 'Roboto';
overflow: auto;
Expand Down Expand Up @@ -43,13 +46,13 @@ $avatar-radius-4: $corner-radius * 2;

.avatar {
border-radius: $avatar-radius-50;
float: left;
margin-right: $avatar-space-15;
width: $base-unit * 10;
height: $base-unit * 10;
overflow: hidden;
}

.handle {
margin-left: $avatar-space-15;
display: inline-block;
font-weight: 500;
font-size: 20px;
Expand Down