Skip to content

Restore H2 profile cards with optional maps #662

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
willmot merged 3 commits into from
Oct 1, 2026
Merged

Restore H2 profile cards with optional maps #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eb5604a
Render H2 profile cards without Mapbox
willmot Sep 28, 2026
ecc97ef
Use Location labels and separate profile field values
willmot Oct 1, 2026
d116056
Use neutral location name field in profile cards
willmot Oct 1, 2026
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
12 changes: 7 additions & 5 deletions src/components/Profile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ import Container from './Sidebar/Container';
import UserBlock from './UserBlock';

const Field = props => (
<p className="m-0 mb-1 flex">
<strong className="w-1/4 grow-0 shrink-0">{ props.name }:</strong>
<p className="m-0 mb-1 flex gap-x-2">
<strong className="w-1/4 grow-0 shrink-0">{ props.name }:{ ' ' }</strong>
<span className={ props.missing ? 'missing italic' : null }>{ props.children }</span>
</p>
);

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 (
Expand Down Expand Up @@ -86,7 +86,7 @@ export class Profile extends React.Component {
<Container { ...containerProps }>
<UserBlock user={ user } />

{ user.facts && (
{ user.facts && user.facts.location && window.H2Data.site.mapbox_key && (
<Map
height="200"
location={ user.facts.location }
Expand All @@ -105,9 +105,11 @@ export class Profile extends React.Component {
</ul>

<LocalTime user={ user } />
{ user.facts && user.facts.location_name && <Field name="Location">{ user.facts.location_name }</Field> }
{ user.facts && user.facts.pronouns && <Field name="Pronouns">{ user.facts.pronouns }</Field> }

<div className="Profile-description">
{ 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 ) =>
<p key={ idx }>{ text }</p>
) }
</div>
Expand Down
6 changes: 1 addition & 5 deletions src/components/UserBlock.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,7 @@ export default function UserBlock( props ) {
<div>
<h2>{ user.name }</h2>
<p>@{ user.slug }</p>
{ user.facts && (
<p className={ user.facts.job_title ? 'text-hm-medium-grey' : 'text-hm-medium-grey italic' }>
{ user.facts.job_title || 'Unknown Role' }
</p>
) }
{ user.facts && user.facts.job_title && <p className="text-hm-medium-grey">{ user.facts.job_title }</p> }
</div>
</div>
);
Expand Down
28 changes: 13 additions & 15 deletions src/components/UserHovercard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<p className="m-0">
Expand Down Expand Up @@ -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 (
<aside className={ ASIDE_CLASSES }>
<div>
Expand All @@ -68,22 +64,24 @@ export function UserCard( { user } ) {
<p className="text-hm-medium-grey text-[0.9em] font-normal">
@{ user.slug }
</p>
<p className={ titleClasses }>
{ user.facts.job_title || 'Unknown Role' }
</p>
{ user.facts.job_title && <p className="text-hm-medium-grey">{ user.facts.job_title }</p> }
</div>
</header>

<div className={ DESCRIPTION_CLASSES }>
<LocalTime user={ user } />
<p>{ user.facts.short_bio }</p>
{ user.facts.location_name && <p><strong>Location:</strong> { user.facts.location_name }</p> }
{ user.facts.pronouns && <p><strong>Pronouns:</strong> { user.facts.pronouns }</p> }
{ user.facts.short_bio && <p>{ user.facts.short_bio }</p> }
</div>
</div>
<Map
height="150"
location={ user.facts.location }
width="150"
/>
{ user.facts.location && window.H2Data.site.mapbox_key && (
<Map
height="150"
location={ user.facts.location }
width="150"
/>
) }
</aside>
);
}
Expand All @@ -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;
}

Expand Down
Loading