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

Merge branch 'develop' into l10n_develop

Browse Source
This commit is contained in:
Amruth Pillai
2020-07-31 12:31:08 +05:30
committed by GitHub
parent 729570c8b7 b8215a9081
commit 4fbe758165
23 changed files with 70 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/contexts/ResumeContext.js
View File

@ -85,7 +85,7 @@ const ResumeProvider = ({ children }) => {
return newState;
case 'change_language':
newState = clone(state);
newState = set(clone(state), 'metadata.language', payload);
items = get(
i18next.getDataByLanguage(payload),
'translation.builder.sections',
@ -94,6 +94,7 @@ const ResumeProvider = ({ children }) => {
has(newState, `${key}.heading`) &&
set(newState, `${key}.heading`, items[key]);
});
debouncedUpdateResume(newState);
return newState;
case 'reset_layout':

4
src/i18n/index.js
View File

@ -27,6 +27,10 @@ const languages = [
code: 'de',
name: 'German (Deutsche)',
},
{
code: 'ja',
name: 'Japanese (日本人)',
},
{
code: 'kn',
name: 'Kannada (ಕನ್ನಡ)',

2
src/i18n/locales/index.js
View File

@ -4,6 +4,7 @@ import en from './en.json';
import es from './es.json';
import fi from './fi.json';
import fr from './fr.json';
import ja from './ja.json';
import kn from './kn.json';
import nl from './nl.json';
import ptBr from './pt-br.json';
@ -16,6 +17,7 @@ export default {
es: { translation: es },
fi: { translation: fi },
fr: { translation: fr },
ja: { translation: ja },
kn: { translation: kn },
nl: { translation: nl },
ptBr: { translation: ptBr },

2
src/pages/index.js
View File

@ -77,7 +77,7 @@ const Home = () => {
<strong>Well, this is the exception</strong>. Your data is your own,
as stated in the ridiculously simple{' '}
<Link to="/faq">Privacy Policy</Link>, I don&apos;t do anything with
the data, it just exists on a database for the convinient features
the data, it just exists on a database for the convenient features
provided by Reactive Resume.
</Feature>
</div>

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>

2
src/templates/blocks/Contact/ContactA.js
View File

@ -40,7 +40,7 @@ const ContactA = () => {
<ContactItem
icon="website"
value={data.profile.website}
link={`http://${data.profile.website}`}
link={data.profile.website}
/>
<ContactItem
icon="email"

2
src/templates/blocks/Contact/ContactB.js
View File

@ -40,7 +40,7 @@ const ContactA = () => {
<ContactItem
icon="website"
value={data.profile.website}
link={`http://${data.profile.website}`}
link={data.profile.website}
/>
<ContactItem
icon="email"

2
src/templates/blocks/Contact/ContactC.js
View File

@ -47,7 +47,7 @@ const ContactC = () => {
<ContactItem
label="website"
value={data.profile.website}
link={`http://${data.profile.website}`}
link={data.profile.website}
/>
<ContactItem
label="email"

2
src/templates/blocks/Contact/ContactD.js
View File

@ -65,7 +65,7 @@ const ContactD = () => {
<ContactItem
label="website"
value={data.profile.website}
link={`http://${data.profile.website}`}
link={data.profile.website}
/>
<ContactItem
label="email"

2
src/templates/blocks/Contact/ContactE.js
View File

@ -47,7 +47,7 @@ const ContactE = () => {
<ContactItem
label="website"
value={data.profile.website}
link={`http://${data.profile.website}`}
link={data.profile.website}
/>
<ContactItem
label="email"

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>

1
src/utils/dayjs.js
View File

@ -5,6 +5,7 @@ import 'dayjs/locale/en';
import 'dayjs/locale/es';
import 'dayjs/locale/fi';
import 'dayjs/locale/fr';
import 'dayjs/locale/ja';
import 'dayjs/locale/kn';
import 'dayjs/locale/nl';
import 'dayjs/locale/pt';

6
src/utils/index.js
View File

@ -22,7 +22,11 @@ export const isFileImage = (file) => {
return file && acceptedImageTypes.includes(file.type);
};
export const formatDateRange = ({ startDate, endDate, language }) => {
export const formatDate = ({ date, language = 'en' }) => {
return dayjs(date).locale(language.substr(0, 2)).format('MMMM YYYY');
};
export const formatDateRange = ({ startDate, endDate, language = 'en' }) => {
const start = `${dayjs(startDate)
.locale(language.substr(0, 2))
.format('MMMM YYYY')}`;