Skip to content

Issue #1533 - Unify the use of the Avatar component on project grid and cards #1587

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
gondzo merged 1 commit into from
Jan 7, 2018
Merged

Issue #1533 - Unify the use of the Avatar component on project grid and cards #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions src/components/User/UserTooltip.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@ import React from 'react'
import PropTypes from 'prop-types'
import _ from 'lodash'
import { Tooltip } from 'appirio-tech-react-components'
import UserAvatar from './UserAvatar'
import { Avatar } from 'appirio-tech-react-components'
import { DOMAIN } from '../../../config/constants'

require('./UserTooltip.scss')

const UserTooltip = ({ usr, id, previewAvatar }) => {
const rating = _.get(usr, 'maxRating.rating', 0)
const theme = `customer-data level-${id}`
const tooltipMargin = previewAvatar ? -(100 + (id * 20)) : 0
return (
<Tooltip theme={theme} pointerWidth={20} tooltipMargin={tooltipMargin}>
<div className="tooltip-target" id={`tt-${id}`}>
{
previewAvatar ? (<div className={`stack-avatar-${id}`}>
<UserAvatar rating={0} showLevel={false} photoURL={usr.photoURL} />
<Avatar
avatarUrl={_.get(usr, 'photoURL', require('../../assets/images/avatar-coder.png'))}
userName={usr.firstName ? (usr.firstName + ' ' + usr.lastName) : 'Connect user'}
size={30}
/>
</div>) :
<span className="project-customer">{usr.firstName} {usr.lastName}</span>
}
Expand All @@ -25,7 +28,10 @@ const UserTooltip = ({ usr, id, previewAvatar }) => {
<div className="top-container">
<div className="tt-col-avatar">
<a href={`//www.${DOMAIN}/members/${usr.handle}/`} target="_blank" rel="noopener noreferrer" className="tt-user-avatar">
<UserAvatar rating={rating} showLevel={false} photoURL={usr.photoURL} />
<Avatar
avatarUrl={_.get(usr, 'photoURL', require('../../assets/images/avatar-coder.png'))}
userName={usr.firstName ? (usr.firstName + ' ' + usr.lastName) : 'Connect user'}
/>
</a>
</div>
<div className="tt-col-user-data">
Expand Down
11 changes: 9 additions & 2 deletions src/components/User/UserTooltip.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,24 @@
}
}

.tooltip-target {
.Avatar {
height: 30px;
width: 30px;
}
}

.stack-avatar-0 {
z-index: 3;
}

.stack-avatar-1 {
margin-left: -10px;
margin-left: -5px;
z-index: 2;
}

.stack-avatar-2 {
margin-left: -10px;
margin-left: -5px;
z-index: 1;
}

Expand Down