Ryan/Reactive-Resume
1
0
Fork 0
mirror of https://github.com/AmruthPillai/Reactive-Resume.git synced 2025-11-19 03:01:53 +10:00
Code Issues Packages Projects Releases Wiki Activity

update project to use date range

Browse Source
This commit is contained in:
Ryan Polley
2020-11-09 15:59:24 -06:00
parent d4816291b4
commit 81ad16ae8a
2 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/modals/sections/ProjectModal.js
View File

@ -52,8 +52,16 @@ const ProjectModal = () => {
<Input
type="date"
label={t('shared.forms.date')}
{...getFieldProps(formik, schema, 'date')}
label={t('shared.forms.startDate')}
placeholder="6th August 208"
{...getFieldProps(formik, schema, 'startDate')}
/>
<Input
type="date"
label={t('shared.forms.endDate')}
placeholder="6th August 208"
{...getFieldProps(formik, schema, 'endDate')}
/>
<Input

23
src/templates/blocks/Projects/ProjectsA.js
View File

@ -1,9 +1,12 @@
import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { formatDate, safetyCheck } from '../../../utils';
import { formatDateRange, safetyCheck } from '../../../utils';
const ProjectItem = ({ item, language }) => (
const ProjectItem = ({ item, language }) => {
const { t } = useTranslation();
return (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -14,9 +17,18 @@ const ProjectItem = ({ item, language }) => (
</a>
)}
</div>
{item.date && (
{(item.startDate || item.date) && (
<h6 className="text-xs font-medium text-right">
{formatDate({ date: item.date, language })}
(
{formatDateRange(
{
startDate: item.startDate? item.startDate : item.date,
endDate: item.endDate,
language,
},
t,
)}
)
</h6>
)}
</div>
@ -24,7 +36,8 @@ const ProjectItem = ({ item, language }) => (
<ReactMarkdown className="markdown mt-2 text-sm" source={item.summary} />
)}
</div>
);
);
};
const ProjectsA = () => {
const { data, heading: Heading } = useContext(PageContext);