diff --git a/.gitignore b/.gitignore index d3f1562f..ffa7fe71 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,4 @@ yarn-error.log* # Local Netlify folder .netlify - -# VSCode -.vscode \ No newline at end of file +.vscode/* diff --git a/src/models.ts b/src/models.ts index fca6d28c..ffeab63b 100644 --- a/src/models.ts +++ b/src/models.ts @@ -316,7 +316,7 @@ export interface Work { /** * e.g. Social Media Company */ - description?: string; + name?: string; // name isn't shown on jsonresume org /** * e.g. 2012-06-29 */ @@ -332,7 +332,7 @@ export interface Work { /** * e.g. Facebook */ - name?: string; + company?: string; /** * e.g. Software Engineer */ @@ -348,7 +348,7 @@ export interface Work { /** * e.g. http://facebook.example.com */ - url?: string; + website?: string; } diff --git a/src/skins/Adventure/components/Work/Work.tsx b/src/skins/Adventure/components/Work/Work.tsx index 4e94a9c8..bf82f7f3 100644 --- a/src/skins/Adventure/components/Work/Work.tsx +++ b/src/skins/Adventure/components/Work/Work.tsx @@ -17,8 +17,8 @@ export function WorkComponent(props: { {utils.formatDate(work?.endDate) || "Present"}
- {work?.position} at{" "} - + {work?.position} at {work.company} + {work?.name}
diff --git a/src/skins/Adventure/manifest.json b/src/skins/Adventure/manifest.json index 1f239ba3..be4e59e4 100644 --- a/src/skins/Adventure/manifest.json +++ b/src/skins/Adventure/manifest.json @@ -2,7 +2,7 @@ "displayName": "Adventure", "createdBy": [ { - "name": "Ohad Shivak", + "name": "Ohad Shivek", "link": "https://www.linkedin.com/in/ohadshivek" }, { @@ -11,7 +11,7 @@ }, { "name": "Daniel Giat", - "link": "https://www.linkedin.com/in/daniel-giat-33512aa1/" + "link": "https://www.linkedin.com/in/daniel-giat" } ] } diff --git a/src/skins/Basic/Basic.scss b/src/skins/Basic/Basic.scss index cd3b9ea4..8cf2e346 100644 --- a/src/skins/Basic/Basic.scss +++ b/src/skins/Basic/Basic.scss @@ -13,7 +13,7 @@ align-items: flex-start; flex-wrap: wrap; word-break: break-word; - + $lead-color: #124c41; $sidebar-width: 400px; $breakpoint: 800px; diff --git a/src/skins/CssTyper/CssTyper.tsx b/src/skins/CssTyper/CssTyper.tsx index 06c7991a..1414f67c 100644 --- a/src/skins/CssTyper/CssTyper.tsx +++ b/src/skins/CssTyper/CssTyper.tsx @@ -57,7 +57,7 @@ export function CssTyper(props: PropsWithChildren) {
{w.position}
-
{w.url || (w as any).website}
+
{(w as any).url || w.website}
{w.summary &&

{w.summary}

} {w.highlights && !!w.highlights.length &&