From c7f891412b48ec6b2d66714cb80e5800a5928925 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 13 Jul 2023 06:56:10 +0300 Subject: [PATCH 1/4] MP-226 Experience modal updated --- .../ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx b/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx index 7e081c9af..901d652a8 100644 --- a/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx +++ b/src/apps/profiles/src/member-profile/work-expirence/ModifyWorkExpirenceModal/ModifyWorkExpirenceModal.tsx @@ -214,7 +214,7 @@ const ModifyWorkExpirenceModal: FC = (props: Modi onClose={props.onClose} open size='lg' - title='Work Experience' + title='Experience' buttons={(
= (props: Modi {editedItemIndex === undefined ? : undefined} + { + props.showMonthPicker !== false && ( + + ) + } { props.showMonthPicker !== false && ( @@ -90,9 +94,13 @@ const InputDatePicker: FC = (props: InputDatePickerProps) ))} - + { + props.showMonthPicker !== false && ( + + ) + } ) } From 71cbc44153d27c424459ac2205e34f0c51b7c7e7 Mon Sep 17 00:00:00 2001 From: Kiril Kartunov Date: Thu, 13 Jul 2023 07:21:35 +0300 Subject: [PATCH 3/4] MP-230 gig work availability modal update --- .../OpenForGigsModifyModal/OpenForGigsModifyModal.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/apps/profiles/src/member-profile/profile-header/OpenForGigsModifyModal/OpenForGigsModifyModal.tsx b/src/apps/profiles/src/member-profile/profile-header/OpenForGigsModifyModal/OpenForGigsModifyModal.tsx index 8c16149fb..a3a7ef3ec 100644 --- a/src/apps/profiles/src/member-profile/profile-header/OpenForGigsModifyModal/OpenForGigsModifyModal.tsx +++ b/src/apps/profiles/src/member-profile/profile-header/OpenForGigsModifyModal/OpenForGigsModifyModal.tsx @@ -94,7 +94,12 @@ const OpenForGigsModifyModal: FC = (props: OpenForG )} >
-

Open for Gig Work

+

+ {openForWork + ? 'Currently available for work.' + : `Mark your availability to get found in search results when potential + clients look for services and let them reach out to you for free.`} +

Date: Thu, 13 Jul 2023 09:01:12 +0300 Subject: [PATCH 4/4] MP-29 skills picker --- .../page-layout/ProfilePageLayout.module.scss | 6 ++-- .../page-layout/ProfilePageLayout.tsx | 6 +++- .../profile-header/ProfileHeader.module.scss | 2 +- .../skills/MemberSkillsInfo.tsx | 10 +++++- .../ModifySkillsModal.module.scss | 19 +++++++++++ .../ModifySkillsModal/ModifySkillsModal.tsx | 33 +++++++++++++++++-- 6 files changed, 67 insertions(+), 9 deletions(-) diff --git a/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.module.scss b/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.module.scss index 41a58918c..cbde4c842 100644 --- a/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.module.scss +++ b/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.module.scss @@ -7,11 +7,11 @@ height: 100%; .profileHeaderWrap { - background: url('../../lib/assets/profile-header-bg.png') no-repeat right center / auto, linear-gradient(#0d83c5, #0e89d5); + background: url('../../lib/assets/profile-header-bg.png') no-repeat right top / auto, linear-gradient(#0d83c5, #0e89d5); .profileHeaderContent { padding: 0; - max-height: 200px; + max-height: 260px; overflow: visible; @include ltelg { @@ -57,7 +57,7 @@ .profileInfoRight { display: flex; flex-direction: column; - margin-top: -215px; + margin-top: -275px; @include ltelg { margin-top: 0; diff --git a/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.tsx b/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.tsx index 4763fe692..c35f296a0 100644 --- a/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.tsx +++ b/src/apps/profiles/src/member-profile/page-layout/ProfilePageLayout.tsx @@ -80,7 +80,11 @@ const ProfilePageLayout: FC = (props: ProfilePageLayoutP
- +
diff --git a/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.module.scss b/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.module.scss index f800a56c9..6b474d08d 100644 --- a/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.module.scss +++ b/src/apps/profiles/src/member-profile/profile-header/ProfileHeader.module.scss @@ -9,7 +9,7 @@ .photoWrap { position: relative; - margin-right: $sp-13; + margin-right: 60px; .verifiedBadge { position: absolute; diff --git a/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx b/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx index b8ed95e41..1c29239ca 100644 --- a/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx +++ b/src/apps/profiles/src/member-profile/skills/MemberSkillsInfo.tsx @@ -14,6 +14,7 @@ import styles from './MemberSkillsInfo.module.scss' interface MemberSkillsInfoProps { profile: UserProfile authProfile: UserProfile | undefined + refreshProfile: (handle: string) => void } const MemberSkillsInfo: FC = (props: MemberSkillsInfoProps) => { @@ -47,6 +48,13 @@ const MemberSkillsInfo: FC = (props: MemberSkillsInfoProp setIsEditMode(false) } + function handleModyfSkillsSave(): void { + setTimeout(() => { + setIsEditMode(false) + props.refreshProfile(props.profile.handle) + }, 1500) + } + return memberEMSISkills ? (
@@ -98,8 +106,8 @@ const MemberSkillsInfo: FC = (props: MemberSkillsInfoProp { isEditMode && ( ) } diff --git a/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.module.scss b/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.module.scss index aa0ef5871..37d2fe777 100644 --- a/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.module.scss +++ b/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.module.scss @@ -3,6 +3,15 @@ .container { display: flex; flex-direction: column; + + :global(.body-main-bold) { + font-size: 20px; + margin-bottom: $sp-2; + } + + .skillPicker { + margin-top: $sp-4; + } } .modalButtons { @@ -10,3 +19,13 @@ justify-content: space-between; width: 100%; } + +.skillsModal { + @include gtemd { + overflow: visible !important; + } +} + +.skillsModalBody { + overflow: visible !important; +} \ No newline at end of file diff --git a/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx b/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx index efe6e45bf..8ff38b1f1 100644 --- a/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx +++ b/src/apps/profiles/src/member-profile/skills/ModifySkillsModal/ModifySkillsModal.tsx @@ -1,25 +1,42 @@ import { Dispatch, FC, SetStateAction, useState } from 'react' +import { toast } from 'react-toastify' -// import { UserProfile } from '~/libs/core' import { BaseModal, Button } from '~/libs/ui' +import { MemberSkillEditor, useMemberSkillEditor } from '~/libs/shared' import styles from './ModifySkillsModal.module.scss' interface ModifySkillsModalProps { - // profile: UserProfile onClose: () => void + onSave: () => void } const ModifySkillsModal: FC = (props: ModifySkillsModalProps) => { const [isSaving, setIsSaving]: [boolean, Dispatch>] = useState(false) + const { formInput: emsiFormInput, saveSkills: saveEmsiSkills }: MemberSkillEditor = useMemberSkillEditor() + function handleModifySkillsSave(): void { setIsSaving(true) + + saveEmsiSkills() + .then(() => { + toast.success('Skills updated successfully.', { position: toast.POSITION.BOTTOM_RIGHT }) + props.onSave() + }) + .catch(() => { + toast.error('Failed to update your skills.', { position: toast.POSITION.BOTTOM_RIGHT }) + setIsSaving(false) + }) } return ( = (props: ModifySkillsModalP />
)} - /> + > +
+

What are your skills?

+

+ Understanding your skills will allow us to connect you to the right opportunities. +

+
+ {emsiFormInput} +
+
+ ) }