From 499a5681fe4c443df67cd18d28b7ec607d3461a5 Mon Sep 17 00:00:00 2001 From: Barry Gitarts Date: Thu, 1 Aug 2019 14:55:21 -0400 Subject: [PATCH] add text display field add contact field add created on date --- src/components/base/TextDisplay.jsx | 50 +++++++++++++++++++++++++ src/components/projects/FundProject.jsx | 28 ++++++++++++-- src/utils/dates.js | 6 +++ 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 src/components/base/TextDisplay.jsx diff --git a/src/components/base/TextDisplay.jsx b/src/components/base/TextDisplay.jsx new file mode 100644 index 0000000..0287939 --- /dev/null +++ b/src/components/base/TextDisplay.jsx @@ -0,0 +1,50 @@ +import React from 'react' +import PropTypes from 'prop-types' +import classnames from 'classnames' +import { withStyles } from '@material-ui/core/' + +const styles = theme => ({ + container: { + display: 'grid', + gridTemplateColumns: 'repeat(24, [col] 1fr)', + gridTemplateRows: '2rem', + gridColumnStart: 1, + gridColumnEnd: 13 + }, + margin: { + margin: theme.spacing.unit + }, + name: { + gridColumnStart: 1, + gridColumnEnd: 25, + fontSize: '15px', + color: '#939BA1' + }, + text: { + fontSize: '15px', + gridColumnStart: 4 + } +}) + +function TextDisplay({ classes, name, text, rootClass }) { + return ( +
+
{name}
+
{text}
+
+ ) +} + +TextDisplay.defaultProps = { + name: '', + text: '' +} + +TextDisplay.propTypes = { + classes: PropTypes.object.isRequired, + name: PropTypes.string, + text: PropTypes.string, + rootClass: PropTypes.object +} + +export default withStyles(styles)(TextDisplay) diff --git a/src/components/projects/FundProject.jsx b/src/components/projects/FundProject.jsx index 078b5f5..ec6ae8f 100644 --- a/src/components/projects/FundProject.jsx +++ b/src/components/projects/FundProject.jsx @@ -17,12 +17,14 @@ import { FundingContext } from '../../context' import {ZERO_ADDRESS} from '../../utils/address' import CurrencySelect from '../base/CurrencySelect' import StatusTextField from '../base/TextField' +import TextDisplay from '../base/TextDisplay' import IconTextField from '../base/IconTextField' import Icon from '../base/icons/IconByName' import { convertTokenAmountUsd } from '../../utils/prices' import { getAmountsPledged } from '../../utils/pledges' import { useProjectData } from './hooks' import { getNumberOfBackers, getMediaType, getMediaSrc } from '../../utils/project' +import { getDateCreated } from '../../utils/dates' const { addProject } = LiquidPledging.methods @@ -60,12 +62,12 @@ const styles = theme => ({ projectTitle:{ fontSize: '28px', gridColumnStart: 1, - gridColumnEnd: 12 + gridColumnEnd: 13 }, projectSubTitle:{ fontSize: '15px', gridColumnStart: 1, - gridColumnEnd: 12 + gridColumnEnd: 13 }, submissionRoot: { display: 'grid', @@ -143,6 +145,14 @@ const styles = theme => ({ }, preview: { fontSize: '20px' + }, + contact: { + gridColumnStart: '1', + gridColumnEnd: '6' + }, + created: { + gridColumnStart: '7', + gridColumnEnd: '13' } }) @@ -199,7 +209,8 @@ const SubmissionSection = ({ classes, history, projectData, projectId, pledges } const numberOfBackers = useMemo(() => getNumberOfBackers(pledges), [pledges, projectId]) const mediaType = useMemo(() => getMediaType(projectAssets), [projectAssets, projectId]) const mediaUrl = useMemo(() => getMediaSrc(projectAssets), [projectAssets, projectId]) - console.log({ projectAge, projectAssets, manifest, amountsPledged, numberOfBackers, mediaType, mediaUrl}) + const createdDate = getDateCreated(projectAge) + console.log({createdDate, projectAge, projectAssets, manifest, amountsPledged, numberOfBackers, mediaType, mediaUrl}) return ( {manifest && manifest.subtitle} + {manifest && } + {manifest && } +