Skip to content

Profiles app -> dev #814

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
Jul 20, 2023
Merged

Profiles app -> dev #814

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
d9f1d16
MP-90 work status
kkartunov Jul 20, 2023
2cf0990
MP-258 modal fixes
kkartunov Jul 20, 2023
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
4 changes: 4 additions & 0 deletions src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@
color: $black-100;
padding-right: $sp-2;
}

.notOopenToWork {
color: $red-100;
}
}
3 changes: 2 additions & 1 deletion src/apps/profiles/src/member-profile/profile-header/OpenForGigs/OpenForGigs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Dispatch, FC, SetStateAction, useEffect, useMemo, useState } from 'react'
import { useSearchParams } from 'react-router-dom'
import { KeyedMutator } from 'swr'
import classNames from 'classnames'

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

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

return props.canEdit || openForWork ? (
<div className={styles.container}>
<p className='body-main-bold'>
<p className={classNames('body-main-bold', !openForWork?.availableForGigs ? styles.notOopenToWork : '')}>
{openForWork?.availableForGigs ? 'open to work' : 'not open to work'}
</p>
{
Expand Down
13 changes: 4 additions & 9 deletions src/apps/profiles/src/member-profile/profile-header/ProfileHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
}
= useMemberTraits(props.profile.handle, { traitIds: UserTraitIds.personalization })

const openForWork: UserTrait | undefined
= useMemo(() => memberPersonalizationTraits?.[0]?.traits?.data?.find(
(trait: UserTrait) => trait.availableForGigs,
), [memberPersonalizationTraits])

const namesAndHandleAppearanceData: UserTrait | undefined
= useMemo(() => memberPersonalizationTraits?.[0]?.traits?.data?.find(
(trait: UserTrait) => trait.namesAndHandleAppearance,
Expand Down Expand Up @@ -113,9 +108,7 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
function renderOpenForWork(): JSX.Element {
return (
<div className={styles.profileActions}>
<span>
{canEdit ? 'I am' : `${props.profile.firstName} is`}
</span>
<span>My status:</span>
<OpenForGigs canEdit={canEdit} authProfile={props.authProfile} profile={props.profile} />
{/* Enable this with talent search app */}
{/* {
Expand Down Expand Up @@ -208,7 +201,9 @@ const ProfileHeader: FC<ProfileHeaderProps> = (props: ProfileHeaderProps) => {
)}

{
openForWork || canEdit ? renderOpenForWork() : undefined
// Showing only when they can edit until we have the talent search app
// and enough data to make this useful
canEdit ? renderOpenForWork() : undefined
}

{
Expand Down
6 changes: 3 additions & 3 deletions ...s/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ const ModifyWorkExpirenceModal: FC<ModifyWorkExpirenceModalProps> = (props: Modi
onClose={props.onClose}
open
size='lg'
title='Experience'
title={`${addingNewItem ? 'Add ' : (editedItemIndex !== undefined ? 'Edit ' : '')}Experience`}
buttons={(
<div className={styles.modalButtons}>
<Button
Expand All @@ -248,7 +248,7 @@ const ModifyWorkExpirenceModal: FC<ModifyWorkExpirenceModalProps> = (props: Modi
>
<div className={styles.container}>
<p>
Add experience that demonstrate your skills and abilities.
Add jobs that demonstrate your skills and abilities.
</p>

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