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
137 changes: 137 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"@fortawesome/fontawesome-svg-core": "^1.2.14",
"@fortawesome/free-solid-svg-icons": "^5.7.1",
"@fortawesome/react-fontawesome": "^0.1.4",
"@nateradebaugh/react-datetime": "^4.4.11",
"@popperjs/core": "^2.5.4",
"@svgr/webpack": "2.4.1",
"axios": "^0.19.0",
Expand Down Expand Up @@ -53,6 +54,7 @@
"mini-css-extract-plugin": "0.4.3",
"moment": "^2.24.0",
"moment-duration-format": "^2.2.2",
"moment-timezone": "^0.5.34",
"node-sass": "^4.14.0",
"optimize-css-assets-webpack-plugin": "5.0.1",
"pnp-webpack-plugin": "1.1.0",
Expand Down
7 changes: 6 additions & 1 deletion src/components/PhaseInput/PhaseInput.module.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
@import "../../styles/includes";
@i

:global {
div[data-reach-popover] {
z-index: 10;
}
}

.container {
display: flex;
Expand Down
53 changes: 41 additions & 12 deletions src/components/PhaseInput/index.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,38 @@
import _ from 'lodash'
import moment from 'moment'
import moment from 'moment-timezone'
import React, { Component } from 'react'
import PropTypes from 'prop-types'
import styles from './PhaseInput.module.scss'
import cn from 'classnames'
import DayPickerInput from 'react-day-picker/DayPickerInput'
import TimePicker from 'rc-time-picker'
import {
formatDate,
parseDate
} from 'react-day-picker/moment'
import 'react-day-picker/lib/style.css'
import 'rc-time-picker/assets/index.css'
import Select from '../Select'
import DateTime from '@nateradebaugh/react-datetime'
import isAfter from 'date-fns/isAfter'
import subDays from 'date-fns/subDays'
import '@nateradebaugh/react-datetime/scss/styles.scss'

const timeFormat = 'HH:mm'
const dateFormat = 'MM/DD/YYYY'
const dateFormat = 'MM/DD/YYYY HH:mm'
// const tcTimeZone = 'America/New_York'

class PhaseInput extends Component {
constructor (props) {
super(props)

this.onDateChange = this.onDateChange.bind(this)
}

onDateChange (e) {
const { onUpdatePhase } = this.props

onUpdatePhase(moment(e, dateFormat))
}

render () {
const { phase, onUpdateSelect, onUpdatePhase, withDates, withDuration, endDate, readOnly } = this.props
if (_.isEmpty(phase)) return null

const date = moment(phase.date).format(dateFormat)
const time = moment(phase.date)

return (
<div className={styles.container}>
Expand All @@ -33,13 +43,32 @@ class PhaseInput extends Component {
withDuration && endDate && (
<div className={styles.previewDates}>
<span>Ends:</span>
{moment(endDate).format(`${dateFormat} ${timeFormat}`)}
{moment(endDate).local().format(`${dateFormat}`)}
</div>
)
}
</div>
<div className={cn(styles.field, styles.col2)}>
{
withDates && (
<div className={styles.dayPicker}>
{
readOnly ? (
<span className={styles.readOnlyValue}>{date}</span>
)
: (
<DateTime
value={date}
onChange={this.onDateChange}
isValidDate={(current) => {
const yesterday = subDays(new Date(), 1)
return isAfter(current, yesterday)
}}
/>)}
</div>
)
}
{/* {
withDates && (
<div className={styles.dayPicker}>
{readOnly ? (
Expand All @@ -62,7 +91,7 @@ class PhaseInput extends Component {
/>)}
</div>
)
}
} */}
{
withDuration && (
<div className={styles.durationPicker}>
Expand Down