From c177d7749da22f5d200af11100c5798e0f9b62be Mon Sep 17 00:00:00 2001
From: Ruidy Nemausat <ruidy.nemausat@gmail.com>
Date: Tue, 12 May 2020 19:01:12 +0200
Subject: [PATCH] [refactor] Experience.ts: change employer to company; move
 TimePeriod to its own file

---
 src/models/DevFull.ts    |  4 ++--
 src/models/Education.ts  |  2 +-
 src/models/Experience.ts |  4 ++--
 src/pages/Profile.tsx    |  8 ++++----
 src/types/TimePeriod.ts  | 16 ++++++++++++++++
 src/types/index.ts       | 11 -----------
 6 files changed, 25 insertions(+), 20 deletions(-)
 create mode 100644 src/types/TimePeriod.ts
 delete mode 100644 src/types/index.ts

diff --git a/src/models/DevFull.ts b/src/models/DevFull.ts
index dc28eb3..74c1fad 100644
--- a/src/models/DevFull.ts
+++ b/src/models/DevFull.ts
@@ -35,7 +35,7 @@ export const dummyDevFull: DevFull = {
     'Lorem ipsum, dolor sit amet consectetur adipisicing elit. Blanditiis unde quae vero enim adipisci voluptas magni sapiente reprehenderit error minima.',
   experiences: [
     {
-      employer: 'Microsoft',
+      company: 'Microsoft',
       from: new Date(2011, 10),
       to: 'Current',
       position: 'Senior Developer',
@@ -43,7 +43,7 @@ export const dummyDevFull: DevFull = {
         'Lorem ipsum dolor sit, amet consectetur adipisicing elit. Voluptas corrupti rem eius, accusantium ipsum vel eveniet magnam voluptatum? Minus, voluptatum!',
     },
     {
-      employer: 'Sun Microsystems',
+      company: 'Sun Microsystems',
       from: new Date(2004, 10),
       to: new Date(2010, 11),
       position: 'System Admin',
diff --git a/src/models/Education.ts b/src/models/Education.ts
index 3b65104..fcd6d3c 100644
--- a/src/models/Education.ts
+++ b/src/models/Education.ts
@@ -1,4 +1,4 @@
-import {TimePeriod} from '../types';
+import TimePeriod from '../types/TimePeriod';
 
 interface Education {
   school: string;
diff --git a/src/models/Experience.ts b/src/models/Experience.ts
index 31b42e6..face0b0 100644
--- a/src/models/Experience.ts
+++ b/src/models/Experience.ts
@@ -1,7 +1,7 @@
-import {TimePeriod} from '../types';
+import TimePeriod from '../types/TimePeriod';
 
 interface Experience {
-  employer: string;
+  company: string;
   from: Date;
   to: TimePeriod;
   position: string;
diff --git a/src/pages/Profile.tsx b/src/pages/Profile.tsx
index efdbda6..4b23d9d 100644
--- a/src/pages/Profile.tsx
+++ b/src/pages/Profile.tsx
@@ -17,7 +17,7 @@ import {
 } from '@fortawesome/free-solid-svg-icons';
 import DevFull, {dummyDevFull as dev} from '../models/DevFull';
 import Experience from '../models/Experience';
-import {parseDate} from '../types';
+import {getTimePeriod} from '../types/TimePeriod';
 import Education from '../models/Education';
 import Repo from '../models/Repo';
 
@@ -83,8 +83,8 @@ const Profile: FC<DevFull> = () => {
           <h2 className="text-primary">Experiences</h2>
           {dev.experiences.map((exp: Experience, i: number) => (
             <div key={i}>
-              <h3>{exp.employer}</h3>
-              <p>{`${parseDate(exp.from)} - ${parseDate(exp.to)}`}</p>
+              <h3>{exp.company}</h3>
+              <p>{getTimePeriod(exp.from, exp.to)}</p>
               <p>
                 <strong>Position: </strong>
                 {exp.position}
@@ -102,7 +102,7 @@ const Profile: FC<DevFull> = () => {
           {dev.educations.map((edu: Education, i: number) => (
             <div key={i}>
               <h3>{edu.school}</h3>
-              <p>{`${parseDate(edu.from)} - ${parseDate(edu.to)}`}</p>
+              <p>{getTimePeriod(edu.from, edu.to)}</p>
               <p>
                 <strong>Degree: </strong>
                 {edu.degree}
diff --git a/src/types/TimePeriod.ts b/src/types/TimePeriod.ts
new file mode 100644
index 0000000..dba6009
--- /dev/null
+++ b/src/types/TimePeriod.ts
@@ -0,0 +1,16 @@
+import moment from 'moment';
+
+type TimePeriod = Date | 'Current';
+
+/** format exp date to be used */
+const parseDate = (date: TimePeriod): string => {
+  if (date === 'Current') {
+    return date;
+  }
+  return moment(date).format('MMM. YYYY');
+};
+
+export const getTimePeriod = (from: TimePeriod, to: TimePeriod): string =>
+  `${parseDate(from)} - ${parseDate(to)}`;
+
+export default TimePeriod;
diff --git a/src/types/index.ts b/src/types/index.ts
deleted file mode 100644
index 67f12b0..0000000
--- a/src/types/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import moment from 'moment';
-
-export type TimePeriod = Date | 'Current';
-
-/** format exp date to be used */
-export const parseDate = (date: TimePeriod): string => {
-  if (date === 'Current') {
-    return date;
-  }
-  return moment(date).format('MMM. YYYY');
-};