diff --git a/src/components/Profile.js b/src/components/Profile.js index 229a7d29..9edf7ff2 100644 --- a/src/components/Profile.js +++ b/src/components/Profile.js @@ -12,14 +12,14 @@ import Container from './Sidebar/Container'; import UserBlock from './UserBlock'; const Field = props => ( -

- { props.name }: +

+ { props.name }:{ ' ' } { props.children }

); const LocalTime = props => { - const timeZone = props.user.meta.hm_time_timezone; + const timeZone = props.user.meta.hm_time_timezone || ( props.user.facts && props.user.facts.timezone ); if ( ! timeZone ) { const profileUrl = `${ window.H2Data.site.url }/wp-admin/profile.php?user_id=${ props.user.id }`; return ( @@ -86,7 +86,7 @@ export class Profile extends React.Component { - { user.facts && ( + { user.facts && user.facts.location && window.H2Data.site.mapbox_key && ( + { user.facts && user.facts.location_name && { user.facts.location_name } } + { user.facts && user.facts.pronouns && { user.facts.pronouns } }
- { user.facts && user.facts.long_description.split( '\n' ).map( ( text, idx ) => + { user.facts && user.facts.long_description && user.facts.long_description.split( '\n' ).map( ( text, idx ) =>

{ text }

) }
diff --git a/src/components/UserBlock.js b/src/components/UserBlock.js index 0458d58a..88b9d9d5 100644 --- a/src/components/UserBlock.js +++ b/src/components/UserBlock.js @@ -18,11 +18,7 @@ export default function UserBlock( props ) {

{ user.name }

@{ user.slug }

- { user.facts && ( -

- { user.facts.job_title || 'Unknown Role' } -

- ) } + { user.facts && user.facts.job_title &&

{ user.facts.job_title }

}
); diff --git a/src/components/UserHovercard.js b/src/components/UserHovercard.js index 4188a821..f1f8f708 100644 --- a/src/components/UserHovercard.js +++ b/src/components/UserHovercard.js @@ -19,7 +19,7 @@ const DESCRIPTION_CLASSES = [ ].join( ' ' ); const LocalTime = props => { - const timeZone = props.user.meta.hm_time_timezone; + const timeZone = props.user.meta.hm_time_timezone || props.user.facts.timezone; if ( ! timeZone ) { return (

@@ -47,10 +47,6 @@ const LocalTime = props => { }; export function UserCard( { user } ) { - const titleClasses = user.facts.job_title - ? 'text-hm-medium-grey' - : 'text-hm-medium-grey italic'; - return (

); } @@ -92,7 +90,7 @@ export default class UserHovercard extends React.Component { render() { const { children, user } = this.props; - if ( ! user.facts || ! window.H2Data.site.mapbox_key ) { + if ( ! user.facts ) { return children; }