[refactor] Experience.ts: change employer to company; move TimePeriod to its own file

This commit is contained in:
Ruidy Nemausat 2020-05-12 19:01:12 +02:00
parent 054e7a80c1
commit c177d7749d
6 changed files with 25 additions and 20 deletions

View file

@ -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',

View file

@ -1,4 +1,4 @@
import {TimePeriod} from '../types';
import TimePeriod from '../types/TimePeriod';
interface Education {
school: string;

View file

@ -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;

View file

@ -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}

16
src/types/TimePeriod.ts Normal file
View file

@ -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;

View file

@ -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');
};