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

- fix language issue when printing

Browse Source
This commit is contained in:
Amruth Pillai
2020-07-28 10:09:05 +05:30
parent a1d345dfb2
commit 3eb69151a6
11 changed files with 35 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/templates/blocks/Awards/AwardsA.js
View File

@ -1,11 +1,9 @@
import dayjs from 'dayjs';
import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { safetyCheck } from '../../../utils';
import { formatDate, safetyCheck } from '../../../utils';
const AwardItem = ({ item, i18n }) => (
const AwardItem = ({ item, language }) => (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -14,9 +12,7 @@ const AwardItem = ({ item, i18n }) => (
</div>
{item.date && (
<h6 className="text-xs font-medium text-right">
{dayjs(item.date)
.locale(i18n.language.substr(0, 2))
.format('MMMM YYYY')}
{formatDate({ date: item.date, language })}
</h6>
)}
</div>
@ -27,7 +23,6 @@ const AwardItem = ({ item, i18n }) => (
);
const AwardsA = () => {
const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.awards) ? (
@ -35,7 +30,7 @@ const AwardsA = () => {
<Heading>{data.awards.heading}</Heading>
<div className="grid gap-4">
{data.awards.items.map((x) => (
<AwardItem key={x.id} item={x} i18n={i18n} />
<AwardItem key={x.id} item={x} language={data.metadata.language} />
))}
</div>
</div>

17
src/templates/blocks/Certifications/CertificationsA.js
View File

@ -1,11 +1,9 @@
import dayjs from 'dayjs';
import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { safetyCheck } from '../../../utils';
import { formatDate, safetyCheck } from '../../../utils';
const CertificationItem = ({ item, i18n }) => (
const CertificationItem = ({ item, language }) => (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -14,9 +12,7 @@ const CertificationItem = ({ item, i18n }) => (
</div>
{item.date && (
<h6 className="text-xs font-medium text-right">
{dayjs(item.date)
.locale(i18n.language.substr(0, 2))
.format('MMMM YYYY')}
{formatDate({ date: item.date, language })}
</h6>
)}
</div>
@ -27,7 +23,6 @@ const CertificationItem = ({ item, i18n }) => (
);
const CertificationsA = () => {
const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.certifications) ? (
@ -35,7 +30,11 @@ const CertificationsA = () => {
<Heading>{data.certifications.heading}</Heading>
<div className="grid gap-4">
{data.certifications.items.map((x) => (
<CertificationItem key={x.id} item={x} i18n={i18n} />
<CertificationItem
key={x.id}
item={x}
language={data.metadata.language}
/>
))}
</div>
</div>

12
src/templates/blocks/Education/EducationA.js
View File

@ -1,10 +1,9 @@
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 EducationItem = ({ item, i18n }) => (
const EducationItem = ({ item, language }) => (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -20,7 +19,7 @@ const EducationItem = ({ item, i18n }) => (
{formatDateRange({
startDate: item.startDate,
endDate: item.endDate,
language: i18n.language,
language,
})}
)
</h6>
@ -35,7 +34,6 @@ const EducationItem = ({ item, i18n }) => (
);
const EducationA = () => {
const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.education) ? (
@ -43,7 +41,11 @@ const EducationA = () => {
<Heading>{data.education.heading}</Heading>
<div className="grid gap-4">
{data.education.items.map((x) => (
<EducationItem key={x.id} item={x} i18n={i18n} />
<EducationItem
key={x.id}
item={x}
language={data.metadata.language}
/>
))}
</div>
</div>

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

@ -1,11 +1,9 @@
import dayjs from 'dayjs';
import React, { memo, useContext } from 'react';
import { useTranslation } from 'react-i18next';
import ReactMarkdown from 'react-markdown';
import PageContext from '../../../contexts/PageContext';
import { safetyCheck } from '../../../utils';
import { formatDate, safetyCheck } from '../../../utils';
const ProjectItem = ({ item, i18n }) => (
const ProjectItem = ({ item, language }) => (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -18,9 +16,7 @@ const ProjectItem = ({ item, i18n }) => (
</div>
{item.date && (
<h6 className="text-xs font-medium text-right">
{dayjs(item.date)
.locale(i18n.language.substr(0, 2))
.format('MMMM YYYY')}
{formatDate({ date: item.date, language })}
</h6>
)}
</div>
@ -31,7 +27,6 @@ const ProjectItem = ({ item, i18n }) => (
);
const ProjectsA = () => {
const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.projects) ? (
@ -39,7 +34,7 @@ const ProjectsA = () => {
<Heading>{data.projects.heading}</Heading>
<div className="grid gap-4">
{data.projects.items.map((x) => (
<ProjectItem key={x.id} item={x} i18n={i18n} />
<ProjectItem key={x.id} item={x} language={data.metadata.language} />
))}
</div>
</div>

8
src/templates/blocks/Work/WorkA.js
View File

@ -1,10 +1,9 @@
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 = ({ item, i18n }) => (
const WorkItem = ({ item, language }) => (
<div>
<div className="flex justify-between items-center">
<div className="flex flex-col text-left mr-2">
@ -17,7 +16,7 @@ const WorkItem = ({ item, i18n }) => (
{formatDateRange({
startDate: item.startDate,
endDate: item.endDate,
language: i18n.language,
language,
})}
)
</h6>
@ -30,7 +29,6 @@ const WorkItem = ({ item, i18n }) => (
);
const WorkA = () => {
const { i18n } = useTranslation();
const { data, heading: Heading } = useContext(PageContext);
return safetyCheck(data.work) ? (
@ -38,7 +36,7 @@ const WorkA = () => {
<Heading>{data.work.heading}</Heading>
<div className="grid gap-4">
{data.work.items.map((x) => (
<WorkItem key={x.id} item={x} i18n={i18n} />
<WorkItem key={x.id} item={x} language={data.metadata.language} />
))}
</div>
</div>