Merge pull request #115 from scientist-softserv/114-default-to-one-week-out

Add minimum date of a day and default date of a week

Author: summer-cook

src/components/AdditionalInfo/AdditionalInfo.jsx

@@ -3,13 +3,14 @@ import PropTypes from 'prop-types'
 import {
   Card, CloseButton, Form, ListGroup,
 } from 'react-bootstrap'
-import { convertToBase64, apiV2CompatibleStrings } from '../../resources/utilityFunctions'
+import { addDays, apiV2CompatibleStrings, convertToBase64 } from '../../resources/utilityFunctions'
 
 const AdditionalInfo = ({ updateRequestForm }) => {
   const [showProposalDate, setShowProposalDate] = useState(true)
   const [files, setFiles] = useState([])
-  const today = new Date().toISOString().slice(0, 10)
   const fileRef = useRef(null)
+  const oneWeekFromNow = addDays((new Date()), 7).toISOString().slice(0, 10)
+  const oneDayFromNow = addDays((new Date()), 1).toISOString().slice(0, 10)
 
   const handleChange = (value) => {
     updateRequestForm(value, 'proposedDeadline')
@@ -52,7 +53,8 @@ const AdditionalInfo = ({ updateRequestForm }) => {
               <Form.Control
                 className='prevent-validation-styles'
                 type='date'
-                min={today}
+                min={oneDayFromNow}
+                defaultValue={oneWeekFromNow}
                 placeholder='Proposals Required By'
                 disabled={showProposalDate === false}
                 onChange={showProposalDate && ((e) => handleChange(e.target.value))}

src/resources/utilityFunctions.js

@@ -9,3 +9,9 @@ export const convertToBase64 = (fileArray) => fileArray.map((file) => new Promis
   fileReader.onload = () => resolve(fileReader.result)
   fileReader.onerror = (error) => reject(new Error(error))
 }))
+
+// used to add days to a new Date() in the AdditionalInfo component
+export const addDays = (date, days) => {
+  date.setDate(date.getDate() + days)
+  return date
+}