-
- {x.date && (
-
- {dayjs(x.date)
- .locale(i18n.language.substr(0, 2))
- .format('MMMM YYYY')}
-
+const ProjectItem = ({ item, i18n }) => (
+
+
+
- {x.summary && (
-
+ {item.date && (
+
+ {dayjs(item.date)
+ .locale(i18n.language.substr(0, 2))
+ .format('MMMM YYYY')}
+
)}
- );
-};
+ {item.summary && (
+
+ )}
+
+);
const ProjectsA = () => {
+ const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.projects) ? (
{data.projects.heading}
-
{data.projects.items.map(ProjectItem)}
+
+ {data.projects.items.map((x) => (
+
+ ))}
+
) : null;
};
diff --git a/src/templates/blocks/Work/WorkA.js b/src/templates/blocks/Work/WorkA.js
index 8d09a3f1..ab0da695 100644
--- a/src/templates/blocks/Work/WorkA.js
+++ b/src/templates/blocks/Work/WorkA.js
@@ -1,34 +1,46 @@
import React, { memo, useContext } from 'react';
+import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { formatDateRange, safetyCheck } from '../../../utils';
-const WorkItem = (x) => (
-
+const WorkItem = ({ item, i18n }) => (
+
-
{x.company}
- {x.position}
+ {item.company}
+ {item.position}
- {x.startDate && (
+ {item.startDate && (
- ({formatDateRange({ startDate: x.startDate, endDate: x.endDate })})
+ (
+ {formatDateRange({
+ startDate: item.startDate,
+ endDate: item.endDate,
+ language: i18n.language,
+ })}
+ )
)}
- {x.summary && (
-
+ {item.summary && (
+
)}
);
const WorkA = () => {
+ const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.work) ? (
{data.work.heading}
-
{data.work.items.map(WorkItem)}
+
+ {data.work.items.map((x) => (
+
+ ))}
+
) : null;
};
diff --git a/src/utils/index.js b/src/utils/index.js
index 7a071bd6..1440bc03 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -22,15 +22,13 @@ export const isFileImage = (file) => {
return file && acceptedImageTypes.includes(file.type);
};
-export const formatDateRange = ({ startDate, endDate }) => {
- const { i18n } = useTranslation();
-
+export const formatDateRange = ({ startDate, endDate, language }) => {
const start = `${dayjs(startDate)
- .locale(i18n.language.substr(0, 2))
+ .locale(language.substr(0, 2))
.format('MMMM YYYY')}`;
const end = dayjs(endDate).isValid()
- ? `${dayjs(endDate).locale(i18n.language.substr(0, 2)).format('MMMM YYYY')}`
+ ? `${dayjs(endDate).locale(language.substr(0, 2)).format('MMMM YYYY')}`
: 'Present';
return `${start} - ${end}`;