From c4e65745e8e04c7dcf86f2a40b803f9d78cbf9c2 Mon Sep 17 00:00:00 2001 From: Pablo Montenegro Date: Sun, 9 May 2021 20:21:01 +0200 Subject: [PATCH] lets release 4.0.2 --- README.MD | 19 ++++-- gatsby-node.js | 5 ++ resume.json | 4 ++ .../ResumeDrawerItems/Items/Work.jsx | 60 +++++++++++++++++++ .../Default/Sections/Awards.jsx | 7 ++- .../Default/Sections/Certificates.jsx | 7 ++- .../Default/Sections/Education.jsx | 7 ++- .../Default/Sections/Languages.jsx | 7 ++- .../Default/Sections/Projects.jsx | 41 ++++++++++++- .../Default/Sections/Publications.jsx | 7 ++- .../Default/Sections/References.jsx | 23 ++++++- .../ResumeTemplates/Default/Sections/Work.jsx | 25 ++++++++ src/utils/spreadsheet-to-json-resume.js | 20 ++++--- 13 files changed, 212 insertions(+), 20 deletions(-) diff --git a/README.MD b/README.MD index bbfbf00..6b005bc 100644 --- a/README.MD +++ b/README.MD @@ -26,7 +26,11 @@ Older versions: [V1](https://github.com/blopa/Resume-Builder/blob/main/README_V1 - Cover Letter Editor ## JSON Resume Schema -This project uses the [jsonresume/resume-schema](https://github.com/jsonresume/resume-schema) v1.0.0, but due a need to extend some of it's features, we also added 2 new fields: `__translation__` to translate template keys, and `coverLetter` so you can add your own Cover Letter template. +This project uses the [jsonresume/resume-schema](https://github.com/jsonresume/resume-schema) v1.0.0, but due a need to extend some of it's features, we also added 4 new fields: +- `__translation__` to translate template keys. +- `coverLetter` to add your own Cover Letter template. +- `work[].keywords` to add keywords to your work experience. +- `enableSourceDataDownload` to allow the JSON data to be downloaded from the resume itself. ## Online viewer Create a GitHub repo [like this one](https://github.com/blopa/resume.json) with the name `resume.json` and a file called `resume.json` in a branch called `main` and following the JSON schema from [github.com/jsonresume/resume-schema](https://github.com/jsonresume/resume-schema/tree/v1.0.0) v1.0.0. @@ -146,6 +150,10 @@ The following `JSON` is a result of [this Google Spreadsheet](https://docs.googl "Build an algorithm for artist to detect if their music was violating copy right infringement laws", "Successfully won Techcrunch Disrupt", "Optimized an algorithm that holds the current world record for Weisman Scores" + ], + "keywords": [ + "Javascript", + "React" ] } ], @@ -296,9 +304,12 @@ The following `JSON` is a result of [this Google Spreadsheet](https://docs.googl ## Release Notes - **v4.0.2:** - - Filter out resume templates that are not ready yet - - Add download link to download the JSON data - - Fix resume viewer + - Filter out resume templates that are not ready yet. + - Add download link to download the JSON data. + - Fix resume viewer. + - Add missing fields on "work" and "projects". + - Small layout fixes in the "Default" template. + - Arrays from the spreadsheet are now parsed using `';'` instead of `','`. - **v4.0.1:** - Add visual cue to the cover letter variables. - **v4.0.0:** diff --git a/gatsby-node.js b/gatsby-node.js index 7ec8925..dd6ad3a 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -84,6 +84,11 @@ exports.onCreateWebpackConfig = async ({ }) => { const templates = await fs.readdir(TEMPLATES_PATH); + // TODO this fixes the 'React Refresh Babel' error where NODE_ENV is 'local' for some reason + if (process.env.NODE_ENV !== 'production') { + process.env.NODE_ENV = 'development'; + } + actions.setWebpackConfig({ plugins: [ plugins.define({ diff --git a/resume.json b/resume.json index e5bb015..5d4d6ce 100644 --- a/resume.json +++ b/resume.json @@ -43,6 +43,10 @@ "Build an algorithm for artist to detect if their music was violating copy right infringement laws", "Successfully won Techcrunch Disrupt", "Optimized an algorithm that holds the current world record for Weisman Scores" + ], + "keywords": [ + "Javascript", + "React" ] } ], diff --git a/src/components/ResumeDrawerItems/Items/Work.jsx b/src/components/ResumeDrawerItems/Items/Work.jsx index 78e5104..2ea456b 100644 --- a/src/components/ResumeDrawerItems/Items/Work.jsx +++ b/src/components/ResumeDrawerItems/Items/Work.jsx @@ -106,6 +106,40 @@ function Work({ work: workData }) { }, }; } + + return wrk; + }); + setResumeWorkState(newWork); + }, [setResumeWorkState, workData]); + + const toggleWorkKeywords = useCallback((oldWork, keyword) => () => { + const newWork = { ...workData }; + newWork.value = + newWork?.value.map((wrk) => { + if (JSON.stringify(wrk?.value) === JSON.stringify(oldWork?.value)) { + return { + ...wrk, + value: { + ...wrk?.value, + keywords: { + ...wrk?.value.keywords, + value: [ + ...wrk?.value.keywords?.value.map((kword) => { + if (JSON.stringify(kword?.value) === JSON.stringify(keyword?.value)) { + return { + ...kword, + enabled: !kword?.enabled, + }; + } + + return kword; + }), + ], + }, + }, + }; + } + return wrk; }); setResumeWorkState(newWork); @@ -131,6 +165,7 @@ function Work({ work: workData }) { endDate, summary, highlights, + keywords, } = work?.value || {}; return ( @@ -249,6 +284,31 @@ function Work({ work: workData }) { ))} )} + {keywords && ( + + )} + {keywords?.enabled && ( + + )} )} diff --git a/src/components/ResumeTemplates/Default/Sections/Awards.jsx b/src/components/ResumeTemplates/Default/Sections/Awards.jsx index 96ce2fb..b7f8704 100644 --- a/src/components/ResumeTemplates/Default/Sections/Awards.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Awards.jsx @@ -16,7 +16,12 @@ const useStyles = makeStyles((theme) => ({ margin: '0', padding: '0', listStyle: 'none', - '& li': { margin: '0 0 10px 0', '&:last-child': { margin: '0' } }, + '& li': { + margin: '0 0 10px 0', + '&:last-child': { + margin: '3px 0 0', + }, + }, }, contentWrapper: { marginLeft: '4px', diff --git a/src/components/ResumeTemplates/Default/Sections/Certificates.jsx b/src/components/ResumeTemplates/Default/Sections/Certificates.jsx index 54c3f22..950e19b 100644 --- a/src/components/ResumeTemplates/Default/Sections/Certificates.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Certificates.jsx @@ -16,7 +16,12 @@ const useStyles = makeStyles((theme) => ({ margin: '0', padding: '0', listStyle: 'none', - '& li': { margin: '0 0 10px 0', '&:last-child': { margin: '0' } }, + '& li': { + margin: '0 0 10px 0', + '&:last-child': { + margin: '3px 0 0', + }, + }, }, contentWrapper: { marginLeft: '4px', diff --git a/src/components/ResumeTemplates/Default/Sections/Education.jsx b/src/components/ResumeTemplates/Default/Sections/Education.jsx index f29a1b3..d20dcdf 100644 --- a/src/components/ResumeTemplates/Default/Sections/Education.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Education.jsx @@ -21,7 +21,12 @@ const useStyles = makeStyles((theme) => ({ margin: '0', padding: '0', listStyle: 'none', - '& li': { margin: '0 0 10px 0', '&:last-child': { margin: '0' } }, + '& li': { + margin: '0 0 10px 0', + '&:last-child': { + margin: '3px 0 0', + }, + }, }, coursesDetails: { display: 'flex', diff --git a/src/components/ResumeTemplates/Default/Sections/Languages.jsx b/src/components/ResumeTemplates/Default/Sections/Languages.jsx index b1a2172..0144af8 100644 --- a/src/components/ResumeTemplates/Default/Sections/Languages.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Languages.jsx @@ -13,7 +13,12 @@ const useStyles = makeStyles((theme) => ({ }, languages: { margin: '0', - '& li': { margin: '0 0 10px 0', '&:last-child': { margin: '0' } }, + '& li': { + margin: '0 0 10px 0', + '&:last-child': { + margin: '3px 0 0', + }, + }, }, contentWrapper: { marginLeft: '4px', diff --git a/src/components/ResumeTemplates/Default/Sections/Projects.jsx b/src/components/ResumeTemplates/Default/Sections/Projects.jsx index 1eda811..5080438 100644 --- a/src/components/ResumeTemplates/Default/Sections/Projects.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Projects.jsx @@ -18,13 +18,32 @@ const useStyles = makeStyles((theme) => ({ '& li': { margin: '0 0 10px 0', '&:last-child': { - margin: '0', + margin: '3px 0 0', }, }, }, project: { fontWeight: 'bold', }, + highlights: { + '& li': { + marginBottom: '1px', + fontStyle: 'italic', + }, + }, + keywords: { + flexWrap: 'wrap', + listStyle: 'none', + paddingLeft: 0, + display: 'inline-flex', + '& li': { + fontStyle: 'italic', + margin: '3px 3px 0 0', + backgroundColor: theme.palette.type === 'dark' ? '#28407b' : '#dae4f4', + borderRadius: '3px', + padding: '1px 3px', + }, + }, contentWrapper: { marginLeft: '4px', }, @@ -103,6 +122,26 @@ const Projects = ({ projects }) => { {entity && entity?.enabled &&

{entity?.value}

} {(url && url?.enabled && url?.value) && {url.value}} {description && description?.enabled &&

{description?.value}

} + {highlights?.enabled && ( + + )} + {keywords?.enabled && ( + + )} ); } diff --git a/src/components/ResumeTemplates/Default/Sections/Publications.jsx b/src/components/ResumeTemplates/Default/Sections/Publications.jsx index 04f22dd..cff4df3 100644 --- a/src/components/ResumeTemplates/Default/Sections/Publications.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Publications.jsx @@ -15,7 +15,12 @@ const useStyles = makeStyles((theme) => ({ margin: '0', padding: '0', listStyle: 'none', - '& li': { margin: '0 0 10px 0', '&:last-child': { margin: '0' } }, + '& li': { + margin: '0 0 10px 0', + '&:last-child': { + margin: '3px 0 0', + }, + }, }, publication: { fontWeight: 'bold', diff --git a/src/components/ResumeTemplates/Default/Sections/References.jsx b/src/components/ResumeTemplates/Default/Sections/References.jsx index cdce0c1..09a6725 100644 --- a/src/components/ResumeTemplates/Default/Sections/References.jsx +++ b/src/components/ResumeTemplates/Default/Sections/References.jsx @@ -15,7 +15,22 @@ const useStyles = makeStyles((theme) => ({ margin: '0', padding: '0', listStyle: 'none', - '& li': { margin: '0 0 10px 0', '&:last-child': { margin: '0' } }, + '& li': { + margin: '0 0 10px 0', + '&:last-child': { + margin: '3px 0 0', + }, + }, + }, + reference: { + fontStyle: 'italic', + textIndent: '15px', + '&:before': { + content: '"❝"', + fontSize: '25px', + margin: '-8px 0 0 -35px', + position: 'absolute', + }, }, contentWrapper: { marginLeft: '4px', @@ -72,7 +87,11 @@ const References = ({ references }) => { {name?.value}

)} - {reference?.enabled &&

{reference?.value}

} + {reference?.enabled && ( +

+ {reference?.value} +

+ )} ); } diff --git a/src/components/ResumeTemplates/Default/Sections/Work.jsx b/src/components/ResumeTemplates/Default/Sections/Work.jsx index 28823d1..6d92b4e 100644 --- a/src/components/ResumeTemplates/Default/Sections/Work.jsx +++ b/src/components/ResumeTemplates/Default/Sections/Work.jsx @@ -35,6 +35,7 @@ const useStyles = makeStyles((theme) => ({ }, summary: { whiteSpace: 'break-spaces', + marginBottom: '5px !important', }, description: { whiteSpace: 'break-spaces', @@ -45,6 +46,19 @@ const useStyles = makeStyles((theme) => ({ fontStyle: 'italic', }, }, + keywords: { + flexWrap: 'wrap', + listStyle: 'none', + paddingLeft: 0, + display: 'inline-flex', + '& li': { + fontStyle: 'italic', + margin: '3px 3px 0 0', + backgroundColor: theme.palette.type === 'dark' ? '#28407b' : '#dae4f4', + borderRadius: '3px', + padding: '1px 3px', + }, + }, contentWrapper: { marginLeft: '4px', }, @@ -89,6 +103,7 @@ const Work = ({ work: works }) => { endDate, summary, highlights, + keywords, } = work?.value || {}; let refProps = {}; @@ -152,6 +167,16 @@ const Work = ({ work: works }) => { ))} )} + {keywords?.enabled && ( + + )} ); } diff --git a/src/utils/spreadsheet-to-json-resume.js b/src/utils/spreadsheet-to-json-resume.js index 06a08f1..adf6f66 100644 --- a/src/utils/spreadsheet-to-json-resume.js +++ b/src/utils/spreadsheet-to-json-resume.js @@ -107,8 +107,8 @@ export default function spreadsheetToJsonResume(jsonSpreadsheet) { } } - if (value[typeAttr] === 'highlights') { - work[value[typeAttr]] = value[contentAttr].split(',').map((item) => item.trim()); + if (value[typeAttr] === 'highlights' || value[typeAttr] === 'keywords') { + work[value[typeAttr]] = value[contentAttr].split(';').map((item) => item.trim()); } else { work[value[typeAttr]] = value[contentAttr]; } @@ -121,7 +121,7 @@ export default function spreadsheetToJsonResume(jsonSpreadsheet) { } if (value[typeAttr] === 'highlights') { - volunteer[value[typeAttr]] = value[contentAttr].split(',').map((item) => item.trim()); + volunteer[value[typeAttr]] = value[contentAttr].split(';').map((item) => item.trim()); } else { volunteer[value[typeAttr]] = value[contentAttr]; } @@ -134,7 +134,7 @@ export default function spreadsheetToJsonResume(jsonSpreadsheet) { } if (value[typeAttr] === 'courses') { - education[value[typeAttr]] = value[contentAttr].split(',').map((item) => item.trim()); + education[value[typeAttr]] = value[contentAttr].split(';').map((item) => item.trim()); } else { education[value[typeAttr]] = value[contentAttr]; } @@ -173,8 +173,12 @@ export default function spreadsheetToJsonResume(jsonSpreadsheet) { } } - if (value[typeAttr] === 'highlights' || value[typeAttr] === 'keywords') { - projects[value[typeAttr]] = value[contentAttr].split(',').map((item) => item.trim()); + if ( + value[typeAttr] === 'highlights' + || value[typeAttr] === 'keywords' + || value[typeAttr] === 'roles' + ) { + projects[value[typeAttr]] = value[contentAttr].split(';').map((item) => item.trim()); } else { projects[value[typeAttr]] = value[contentAttr]; } @@ -187,7 +191,7 @@ export default function spreadsheetToJsonResume(jsonSpreadsheet) { } if (value[typeAttr] === 'keywords') { - skills[value[typeAttr]] = value[contentAttr].split(',').map((item) => item.trim()); + skills[value[typeAttr]] = value[contentAttr].split(';').map((item) => item.trim()); } else { skills[value[typeAttr]] = value[contentAttr]; } @@ -209,7 +213,7 @@ export default function spreadsheetToJsonResume(jsonSpreadsheet) { } if (value[typeAttr] === 'keywords') { - interests[value[typeAttr]] = value[contentAttr].split(',').map((item) => item.trim()); + interests[value[typeAttr]] = value[contentAttr].split(';').map((item) => item.trim()); } else { interests[value[typeAttr]] = value[contentAttr]; }