Skip to content

Commit 2f87db7

Browse files
authored
Merge pull request #814 from topcoder-platform/profiles-app
Profiles app -> dev
2 parents 93dd2cd + 2cf0990 commit 2f87db7

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.module.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,8 @@
1111
color: $black-100;
1212
padding-right: $sp-2;
1313
}
14+
15+
.notOopenToWork {
16+
color: $red-100;
17+
}
1418
}

src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react'
22
import { useSearchParams } from 'react-router-dom'
33
import { KeyedMutator } from 'swr'
4+
import classNames from 'classnames'
45

56
import { useMemberTraits, UserProfile, UserTrait, UserTraitIds, UserTraits } from '~/libs/core'
67

@@ -60,7 +61,7 @@ const OpenForGigs: FC<OpenForGigsProps> = (props: OpenForGigsProps) => {
6061

6162
return props.canEdit || openForWork ? (
6263
<div className={styles.container}>
63-
<p className='body-main-bold'>
64+
<p className={classNames('body-main-bold', !openForWork?.availableForGigs ? styles.notOopenToWork : '')}>
6465
{openForWork?.availableForGigs ? 'open to work' : 'not open to work'}
6566
</p>
6667
{

src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,6 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
5353
}
5454
= useMemberTraits(props.profile.handle, { traitIds: UserTraitIds.personalization })
5555

56-
const openForWork: UserTrait | undefined
57-
= useMemo(() => memberPersonalizationTraits?.[0]?.traits?.data?.find(
58-
(trait: UserTrait) => trait.availableForGigs,
59-
), [memberPersonalizationTraits])
60-
6156
const namesAndHandleAppearanceData: UserTrait | undefined
6257
= useMemo(() => memberPersonalizationTraits?.[0]?.traits?.data?.find(
6358
(trait: UserTrait) => trait.namesAndHandleAppearance,
@@ -113,9 +108,7 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
113108
function renderOpenForWork(): JSX.Element {
114109
return (
115110
<div className={styles.profileActions}>
116-
<span>
117-
{canEdit ? 'I am' : `${props.profile.firstName} is`}
118-
</span>
111+
<span>My status:</span>
119112
<OpenForGigs canEdit={canEdit} authProfile={props.authProfile} profile={props.profile} />
120113
{/* Enable this with talent search app */}
121114
{/* {
@@ -208,7 +201,9 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
208201
)}
209202

210203
{
211-
openForWork || canEdit ? renderOpenForWork() : undefined
204+
// Showing only when they can edit until we have the talent search app
205+
// and enough data to make this useful
206+
canEdit ? renderOpenForWork() : undefined
212207
}
213208

214209
{

src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ const ModifyWorkExpirenceModal: FC<ModifyWorkExpirenceModalProps> = (props: Modi
229229
onClose={props.onClose}
230230
open
231231
size='lg'
232-
title='Experience'
232+
title={`${addingNewItem ? 'Add ' : (editedItemIndex !== undefined ? 'Edit ' : '')}Experience`}
233233
buttons={(
234234
<div className={styles.modalButtons}>
235235
<Button
@@ -248,7 +248,7 @@ const ModifyWorkExpirenceModal: FC<ModifyWorkExpirenceModalProps> = (props: Modi
248248
>
249249
<div className={styles.container}>
250250
<p>
251-
Add experience that demonstrate your skills and abilities.
251+
Add jobs that demonstrate your skills and abilities.
252252
</p>
253253

254254
{editedItemIndex === undefined && !addingNewItem ? (
@@ -353,7 +353,7 @@ const ModifyWorkExpirenceModal: FC<ModifyWorkExpirenceModalProps> = (props: Modi
353353
</div>
354354
<InputText
355355
name='currentlyWorking'
356-
label='I am currently in this role'
356+
label='I am currently working in this role'
357357
error={formErrors.currentlyWorking}
358358
dirty
359359
tabIndex={-1}

0 commit comments

Comments
 (0)