Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@

.editForm {
margin-top: $sp-4;

:global(.input-wrapper) {
margin-bottom: $sp-4;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ const ModifyEducationModal: FC<ModifyEducationModalProps> = (props: ModifyEducat
disabled={false}
error={formErrors.endDate}
dirty
maxDate={new Date()}
showMonthPicker={false}
showYearPicker
dateFormat='yyyy'
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const ModifyMemberPhotoModal: FC<ModifyMemberPhotoModalProps> = (props: ModifyMe

const fileElRef: MutableRefObject<HTMLDivElement | any> = useRef()

const [fileSizeError, setFileSizeError]: [boolean, Dispatch<SetStateAction<boolean>>]
= useState<boolean>(false)
const [fileSelectError, setFileSelectError]: [string | undefined, Dispatch<SetStateAction<string | undefined>>]
= useState<string | undefined>()

function handleModifyPhotoSave(): void {
const formData: FormData = new FormData()
Expand Down Expand Up @@ -53,14 +53,19 @@ const ModifyMemberPhotoModal: FC<ModifyMemberPhotoModalProps> = (props: ModifyMe

if (pickedFile) {
if (pickedFile?.size < 2000000) { // max 2mb limit
if (pickedFile.type !== 'image/png' && pickedFile.type !== 'image/jpeg') {
setFileSelectError('Please select a PNG or JPG image.')
return
}

setFile(pickedFile)
setFileSizeError(false)
setFileSelectError(undefined)
} else {
setFileSizeError(true)
setFileSelectError('Please select an image that is less than 2MB.')
}
} else {
setFile(undefined)
setFileSizeError(false)
setFileSelectError(undefined)
}
}

Expand Down Expand Up @@ -105,8 +110,8 @@ const ModifyMemberPhotoModal: FC<ModifyMemberPhotoModalProps> = (props: ModifyMe
onClick={handleFilePickClick}
/>
{
fileSizeError && (
<p>Please select an image that is less than 2MB.</p>
fileSelectError && (
<p>{fileSelectError}</p>
)
}
</form>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ const WorkExpirenceCard: FC<WorkExpirenceCardProps> = (props: WorkExpirenceCardP
</p>
</div>
{
props.work.timePeriodFrom || props.work.timePeriodTo ? (
props.work.timePeriodFrom || props.work.timePeriodTo || props.work.working ? (
<div className={styles.workExpirenceCardHeaderRight}>
<p>
{props.work.timePeriodFrom ? moment(props.work.timePeriodFrom)
.format('MM/YYYY') : ''}
{props.work.timePeriodTo || props.work.currentlyWorking ? ' - ' : ''}
{props.work.timePeriodFrom && (props.work.timePeriodTo || props.work.working) ? ' - ' : ''}
{props.work.timePeriodTo ? moment(props.work.timePeriodTo)
.format('MM/YYYY') : (props.work.currentlyWorking ? 'Present' : '')}
.format('MM/YYYY') : (props.work.working ? 'Present' : '')}
</p>
</div>
) : undefined
Expand Down
1 change: 1 addition & 0 deletions src/apps/profiles/src/profiles.routes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const profilesRoutes: ReadonlyArray<PlatformRoute> = [
{
children: [
{
authRequired: true,
element: <ProfilesLandingPage />,
id: 'ProfilesLandingPage',
route: '',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ interface InputDatePickerProps {
readonly minDate?: Date | null | undefined;
readonly minTime?: Date | undefined;
readonly placeholder?: string
readonly showMonthPicker?: boolean
readonly showYearPicker?: boolean
readonly tabIndex?: number
}
Expand Down Expand Up @@ -63,16 +64,20 @@ const InputDatePicker: FC<InputDatePickerProps> = (props: InputDatePickerProps)
<IconOutline.ArrowCircleLeftIcon />
</button>

<select
value={months[getMonth(date)]}
onChange={({ target: { value } }: any) => changeMonth(months.indexOf(value))}
>
{months.map(option => (
<option key={option} value={option}>
{option}
</option>
))}
</select>
{
props.showMonthPicker !== false && (
<select
value={months[getMonth(date)]}
onChange={({ target: { value } }: any) => changeMonth(months.indexOf(value))}
>
{months.map(option => (
<option key={option} value={option}>
{option}
</option>
))}
</select>
)
}

<select
value={getYear(date)}
Expand Down