-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: Calendar alert * minor fix * requested changes
- Loading branch information
Showing
15 changed files
with
294 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import React from 'react' | ||
|
||
interface Props { | ||
size?: string | ||
className?: string | ||
} | ||
|
||
function CalendarAdd({ size = '24', className }: Props) { | ||
return ( | ||
<svg | ||
className={className} | ||
width={size} | ||
height={size} | ||
viewBox="0 0 16 16" | ||
fill="none" | ||
xmlns="http://www.w3.org/2000/svg" | ||
> | ||
<path | ||
d="M5.75 0.75C5.75 0.334375 5.41563 0 5 0C4.58437 0 4.25 0.334375 4.25 0.75V2H3C1.89688 2 1 2.89687 1 4V4.5V6V14C1 15.1031 1.89688 16 3 16H13C14.1031 16 15 15.1031 15 14V6V4.5V4C15 2.89687 14.1031 2 13 2H11.75V0.75C11.75 0.334375 11.4156 0 11 0C10.5844 0 10.25 0.334375 10.25 0.75V2H5.75V0.75ZM2.5 6H13.5V14C13.5 14.275 13.275 14.5 13 14.5H3C2.725 14.5 2.5 14.275 2.5 14V6ZM8 7.25C7.58437 7.25 7.25 7.58437 7.25 8V9.5H5.75C5.33437 9.5 5 9.83438 5 10.25C5 10.6656 5.33437 11 5.75 11H7.25V12.5C7.25 12.9156 7.58437 13.25 8 13.25C8.41563 13.25 8.75 12.9156 8.75 12.5V11H10.25C10.6656 11 11 10.6656 11 10.25C11 9.83438 10.6656 9.5 10.25 9.5H8.75V8C8.75 7.58437 8.41563 7.25 8 7.25Z" | ||
fill="black" | ||
/> | ||
</svg> | ||
) | ||
} | ||
|
||
export default CalendarAdd |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
.CalendarAlertModal__SelectorContainer { | ||
margin-bottom: 25px; | ||
} | ||
|
||
.ui.button.basic.CalendarAlertModal__CancelButton { | ||
color: var(--black-600) !important; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,96 @@ | ||
import React, { useEffect, useMemo, useState } from 'react' | ||
|
||
import { UnitTypeLongPlural } from 'dayjs' | ||
import { Button } from 'decentraland-ui/dist/components/Button/Button' | ||
import { Close } from 'decentraland-ui/dist/components/Close/Close' | ||
import { Header } from 'decentraland-ui/dist/components/Header/Header' | ||
import { Modal, ModalProps } from 'decentraland-ui/dist/components/Modal/Modal' | ||
|
||
import { ProposalAttributes } from '../../entities/Proposal/types' | ||
import { proposalUrl } from '../../entities/Proposal/utils' | ||
import useFormatMessage from '../../hooks/useFormatMessage' | ||
import Time from '../../utils/date/Time' | ||
import { getGoogleCalendarUrl } from '../../utils/projects' | ||
import NumberSelector from '../ProjectRequest/NumberSelector' | ||
|
||
import './CalendarAlertModal.css' | ||
|
||
type CalendarAlertModalProps = Omit<ModalProps, 'children'> & { | ||
proposal: Pick<ProposalAttributes, 'id' | 'title' | 'finish_at'> | ||
} | ||
|
||
const UNITS: UnitTypeLongPlural[] = ['seconds', 'minutes', 'hours', 'days'] | ||
const MAX_TIME_VALUE = 300 | ||
|
||
function getAlertDate(finishAt: ProposalAttributes['finish_at'], value: number, unit: UnitTypeLongPlural): Date | null { | ||
const proposalFinishDate = Time.from(finishAt) | ||
const currentDate = Time() | ||
const alertDate = proposalFinishDate.subtract(value, unit) | ||
if (alertDate.isBefore(currentDate)) { | ||
return null | ||
} | ||
return alertDate.toDate() | ||
} | ||
|
||
function CalendarAlertModal({ proposal, onClose, ...props }: CalendarAlertModalProps) { | ||
const t = useFormatMessage() | ||
const { finish_at, title, id } = proposal | ||
const [timeValue, setTimeValue] = useState(0) | ||
const [unit, setUnit] = useState<UnitTypeLongPlural | undefined>() | ||
const [isDisabled, setIsDisabled] = useState(false) | ||
|
||
const handleClose = () => { | ||
onClose() | ||
setTimeValue(0) | ||
setUnit(undefined) | ||
} | ||
|
||
const alertDate = useMemo( | ||
() => (unit ? getAlertDate(finish_at, timeValue, unit) : null), | ||
[finish_at, unit, timeValue] | ||
) | ||
|
||
useEffect(() => { | ||
setIsDisabled(!alertDate) | ||
}, [alertDate]) | ||
|
||
const alertUrl = getGoogleCalendarUrl({ | ||
title: t(`modal.calendar_alert.calendar_title`, { title }), | ||
details: t(`modal.calendar_alert.calendar_details`, { | ||
finish_date: Time.from(finish_at).format('MMM DD, YYYY HH:mm'), | ||
url: proposalUrl(id), | ||
}), | ||
startAt: alertDate!, | ||
}) | ||
|
||
return ( | ||
<Modal {...props} onClose={handleClose} size="tiny" closeIcon={<Close />}> | ||
<Modal.Content> | ||
<div className="ProposalModal__Title"> | ||
<Header>{t('modal.calendar_alert.title')}</Header> | ||
</div> | ||
<div className="CalendarAlertModal__SelectorContainer"> | ||
<NumberSelector | ||
value={timeValue} | ||
min={0} | ||
max={MAX_TIME_VALUE} | ||
onChange={setTimeValue} | ||
label={t('modal.calendar_alert.label')} | ||
unit={UNITS} | ||
onUnitChange={setUnit} | ||
/> | ||
</div> | ||
<div className="ProposalModal__Actions"> | ||
<Button fluid primary disabled={isDisabled} as="a" href={alertUrl} target="_blank"> | ||
{t('modal.calendar_alert.add_to_calendar')} | ||
</Button> | ||
<Button className="CalendarAlertModal__CancelButton" fluid basic onClick={handleClose}> | ||
{t('modal.calendar_alert.cancel')} | ||
</Button> | ||
</div> | ||
</Modal.Content> | ||
</Modal> | ||
) | ||
} | ||
|
||
export default CalendarAlertModal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
import React from 'react' | ||
|
||
import useFormatMessage from '../../../hooks/useFormatMessage' | ||
import CalendarAdd from '../../Icon/CalendarAdd' | ||
|
||
import SidebarButton from './SidebarButton' | ||
|
||
interface Props { | ||
loading?: boolean | ||
disabled?: boolean | ||
onClick: () => void | ||
} | ||
|
||
function CalendarAlertButton({ loading, disabled, onClick }: Props) { | ||
const t = useFormatMessage() | ||
return ( | ||
<SidebarButton loading={loading} disabled={disabled} onClick={onClick}> | ||
<CalendarAdd size="20" /> | ||
<span>{t('page.proposal_detail.calendar_button')}</span> | ||
</SidebarButton> | ||
) | ||
} | ||
|
||
export default CalendarAlertButton |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import React from 'react' | ||
|
||
import classNames from 'classnames' | ||
|
||
import './DetailsSection.css' | ||
import './SectionButton.css' | ||
|
||
interface Props { | ||
loading?: boolean | ||
disabled?: boolean | ||
onClick?: () => void | ||
children?: React.ReactNode | ||
} | ||
|
||
function SidebarButton({ loading, disabled, onClick, children }: Props) { | ||
return ( | ||
<button | ||
onClick={onClick} | ||
className={classNames( | ||
'DetailsSection', | ||
'SectionButton', | ||
loading && 'SectionButton--loading', | ||
disabled && 'SectionButton--disabled' | ||
)} | ||
> | ||
<div className="SectionButton__Container">{children}</div> | ||
</button> | ||
) | ||
} | ||
|
||
export default SidebarButton |
Oops, something went wrong.