Skip to content

Commit 5a44123

Browse files
authored
Merge pull request #796 from topcoder-platform/profiles-app
Profiles app -> dev
2 parents 14c9f18 + 23964f3 commit 5a44123

File tree

13 files changed

+266
-227
lines changed

13 files changed

+266
-227
lines changed

src/apps/profiles/src/config/constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ export const TC_VERIFIED_SKILL_LABEL: string = 'Topcoder Verified'
88

99
export const EDIT_MODE_QUERY_PARAM: string = 'edit-mode'
1010

11+
export const TALENT_SEARCH_MODE_QUERY_PARAM: string = 'talent-search'
12+
1113
export enum profileEditModes {
1214
aboutMe = 'aboutMe',
1315
languages = 'languages',

src/apps/profiles/src/member-profile/languages/LanguageCard/LanguageCard.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { compact } from 'lodash'
21
import { FC } from 'react'
32

43
import { UserTrait } from '~/libs/core'
@@ -11,14 +10,7 @@ interface LanguageCardProps {
1110

1211
const LanguageCard: FC<LanguageCardProps> = (props: LanguageCardProps) => (
1312
<div className={styles.language}>
14-
<p className='body-main-medium'>{props.trait.language}</p>
15-
<p className='body-small'>
16-
{compact([
17-
props.trait.spokenLevel ? `Spoken: ${props.trait.spokenLevel}` : undefined,
18-
props.trait.writtenLevel ? `Written: ${props.trait.writtenLevel}` : undefined,
19-
])
20-
.join(' | ')}
21-
</p>
13+
<p className='body-main-bold'>{props.trait.language}</p>
2214
</div>
2315
)
2416

src/apps/profiles/src/member-profile/languages/MemberLanguages.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { EDIT_MODE_QUERY_PARAM, profileEditModes } from '../../config'
88
import { notifyUniNavi } from '../../lib'
99

1010
import { ModifyLanguagesModal } from './ModifyLanguagesModal'
11-
import { LanguageCard } from './LanguageCard'
1211
import styles from './MemberLanguages.module.scss'
1312

1413
interface MemberLanguagesProps {
@@ -74,8 +73,11 @@ const MemberLanguages: FC<MemberLanguagesProps> = (props: MemberLanguagesProps)
7473
)}
7574
<div className={styles.languages}>
7675
{
77-
memberLanguages?.map((trait: UserTrait) => (
78-
<LanguageCard trait={trait} key={`member-lan-${trait.language}`} />
76+
memberLanguages?.map((trait: UserTrait, indx: number) => (
77+
<span key={`member-lan-${trait.language}`}>
78+
{trait.language}
79+
{indx < memberLanguages.length - 1 && ', '}
80+
</span>
7981
))
8082
}
8183
</div>

src/apps/profiles/src/member-profile/languages/ModifyLanguagesModal/ModifyLanguagesModal.module.scss

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,50 +14,49 @@
1414
.formWrap {
1515
display: flex;
1616
flex-direction: column;
17-
min-height: 500px;
1817
margin-top: $sp-2;
1918

2019
@include ltelg {
2120
:global(.input-wrapper) {
2221
margin-bottom: $sp-2;
2322
}
2423
}
25-
26-
.formCTAs {
27-
display: flex;
28-
align-items: center;
29-
30-
svg {
31-
width: 14px;
32-
height: 14px;
33-
margin-right: $sp-1;
34-
}
35-
36-
.ctaBtnCancel {
37-
margin-left: $sp-8;
38-
}
39-
}
4024
}
4125

4226
.languages {
43-
margin-bottom: $sp-15;
44-
45-
&.noLanguages {
46-
margin-bottom: 0;
47-
}
27+
margin: $sp-4 0 $sp-6;
28+
padding-bottom: $sp-4;
29+
display: grid;
30+
grid-template-columns: repeat(2, 1fr);
31+
grid-gap: $sp-4;
32+
border-bottom: 1px solid $black-20;
4833

4934
.languageItemWrap {
5035
display: flex;
5136
align-items: center;
5237
justify-content: space-between;
5338
margin-bottom: $sp-2;
5439
border-radius: 8px;
55-
padding: $sp-2;
40+
padding: $sp-5 $sp-6;
5641
border: 1px solid $black-10;
5742

58-
button svg {
59-
width: 16px;
60-
height: 16px;
43+
button {
44+
padding-right: 0;
45+
46+
svg {
47+
width: 24px;
48+
height: 24px;
49+
}
6150
}
6251
}
52+
}
53+
54+
.langModal {
55+
@include gtemd {
56+
overflow: visible !important;
57+
}
58+
}
59+
60+
.langModalBody {
61+
overflow: visible !important;
6362
}

0 commit comments

Comments
 (0)