Skip to content

Commit 26cbc32

Browse files
Minor fixes
- selected skills label - social profiles label
1 parent 12d83b6 commit 26cbc32

File tree

2 files changed

+62
-41
lines changed

2 files changed

+62
-41
lines changed

Frontend/components/MyProfile.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,12 @@ function MyProfile({route}) {
225225
const init = async () => {
226226
try {
227227
setIsSaving(true);
228-
await getDBskills();
229-
await getDBlanguages();
228+
if (skillsList.length === 0) {
229+
await getDBskills();
230+
}
231+
if (languageList.length === 0) {
232+
await getDBlanguages();
233+
}
230234
setIsSaving(false);
231235
} catch (e) {
232236
console.log(e);
@@ -430,7 +434,7 @@ function MyProfile({route}) {
430434
</View>
431435

432436
{/* Social URLs */}
433-
<NewSection name="Social URLs" />
437+
<NewSection name="Social Profiles" />
434438
<SocialURL
435439
label="Twitter"
436440
value={twitterUrl}

Frontend/components/SkillSection.js

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -46,45 +46,62 @@ function SkillSection(props) {
4646
paddingStart: 4,
4747
marginTop: 12,
4848
}}>
49-
{searchTerm.length > 0
50-
? getFilteredSkills().map((skill, index) => {
51-
return (
52-
<Chip
53-
key={skill.skill_id}
54-
onPress={() => {
55-
if (skills.some(s => s.skill_id === skill.skill_id)) {
56-
setSkills(
57-
skills.filter(s => s.skill_id !== skill.skill_id),
58-
);
59-
} else {
60-
setSkills(skills.concat(skill));
61-
}
62-
}}
63-
selected={skills.some(s => s.skill_id === skill.skill_id)}
64-
style={{
65-
marginEnd: 8,
66-
marginBottom: 8,
67-
}}>
68-
{skill.skill_name}
69-
</Chip>
70-
);
71-
})
72-
: skills.map((skill, index) => {
73-
return (
74-
<Chip
75-
key={index}
76-
onPress={() => {
77-
const newSkills = skills.filter(
78-
it => it.skill_id !== skill.skill_id,
49+
{searchTerm.length > 0 ? (
50+
getFilteredSkills().map((skill, index) => {
51+
return (
52+
<Chip
53+
key={skill.skill_id}
54+
onPress={() => {
55+
if (skills.some(s => s.skill_id === skill.skill_id)) {
56+
setSkills(
57+
skills.filter(s => s.skill_id !== skill.skill_id),
7958
);
80-
setSkills(newSkills);
81-
}}
82-
style={{margin: 4}}
83-
icon="close-circle-outline">
84-
{skill.skill_name}
85-
</Chip>
86-
);
87-
})}
59+
} else {
60+
setSkills(skills.concat(skill));
61+
}
62+
}}
63+
selected={skills.some(s => s.skill_id === skill.skill_id)}
64+
style={{
65+
marginEnd: 8,
66+
marginBottom: 8,
67+
}}>
68+
{skill.skill_name}
69+
</Chip>
70+
);
71+
})
72+
) : (
73+
<View
74+
style={{
75+
width: '100%',
76+
}}>
77+
{skills.length > 0 && <NewSection name="Selected Skills" />}
78+
<View
79+
style={{
80+
flexDirection: 'row',
81+
flexWrap: 'wrap',
82+
justifyContent: 'flex-start',
83+
paddingStart: 4,
84+
paddingBottom: 8,
85+
}}>
86+
{skills.map((skill, index) => {
87+
return (
88+
<Chip
89+
key={index}
90+
onPress={() => {
91+
const newSkills = skills.filter(
92+
it => it.skill_id !== skill.skill_id,
93+
);
94+
setSkills(newSkills);
95+
}}
96+
style={{margin: 4}}
97+
icon="close-circle-outline">
98+
{skill.skill_name}
99+
</Chip>
100+
);
101+
})}
102+
</View>
103+
</View>
104+
)}
88105
</View>
89106
{searchTerm.length === 0 &&
90107
skillList.map((domain, index) => (

0 commit comments

Comments
 (0)