diff --git a/src/components/Timeline.vue b/src/components/Timeline.vue index b075d82..b5a391d 100644 --- a/src/components/Timeline.vue +++ b/src/components/Timeline.vue @@ -61,10 +61,10 @@
@@ -90,17 +90,16 @@ interface TimeDiff { plural: string; // plural translation label } -// returns a TimeDiff from a date. Holds the time elapsed until now in the most +// returns a TimeDiff from a date. Holds the time elapsed until @stop in the most // broad unit that is greater than 0. -function getTimeDiff(date: Date): TimeDiff { +function getTimeDiff(start: Date, stop: Date): TimeDiff { const minute = 60 * 1000; const hour = 60 * minute; const day = 24 * hour; const month = 30 * day; const year = 365 * day; - const now = new Date(); - const diff = now.getTime() - date.getTime(); + const diff = stop.getTime() - start.getTime(); if ( diff < 0 ) { return {diff: 0, one: 'time.some', plural: 'time.some'}; @@ -153,7 +152,7 @@ export default class Timeline extends Vue { protected elapsed(date: Date): string { const fmt = 'time.diff-format'; - const td = getTimeDiff(date); + const td = getTimeDiff(date, new Date()); const diff = Math.floor(td.diff); @@ -168,6 +167,22 @@ export default class Timeline extends Vue { return this.$t(fmt, { elapsed: this.$t(td.one, { n: diff }) }).toString(); } + protected duration(start: Date, stop: Date, ended: boolean): string { + const fmt = ended ? 'time.dur-format' : 'time.cur-format'; + const td = getTimeDiff(start, stop); + const diff = Math.floor(td.diff); + + if( diff == 0 ){ + return this.$t(fmt, { duration: this.$t(td.one) }).toString(); + } + + if( diff > 1 ){ // plural + return this.$t(fmt, { duration: this.$t(td.plural, { n: diff }) }).toString(); + } + // singular + return this.$t(fmt, { duration: this.$t(td.one, { n: diff }) }).toString(); + } + private onScroll(e: Event) { const target = e.target as HTMLElement; const header = this.$refs.header as HTMLElement; @@ -214,6 +229,7 @@ export default class Timeline extends Vue { width: 100%; height: $header-height; + font-size: 1em; background: #202228; box-shadow: 0 0 1em transparent; @@ -229,6 +245,8 @@ export default class Timeline extends Vue { border-radius .2s ease-in-out, box-shadow .1s ease-in-out; + overflow: hidden; + img { width: $logo-size; height: $logo-size; @@ -245,6 +263,8 @@ export default class Timeline extends Vue { margin: auto; flex-flow: row nowrap; + justify-content: space-around; + align-items: center; h3 { color: #fff; @@ -473,6 +493,7 @@ export default class Timeline extends Vue { padding-bottom: 2em; margin-bottom: 1.5em; + color: #c1c1c1; background: #323841; border: .1rem solid #45454b; @@ -540,4 +561,25 @@ export default class Timeline extends Vue { } + + + + \ No newline at end of file diff --git a/src/locales/en.json b/src/locales/en.json index 1616a2c..7266e94 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -76,6 +76,8 @@ "skill.rnd": "R&D", "skill.teamlead": "Team Lead", + "time.dur-format": "took {duration}", + "time.cur-format": "since {duration}", "time.diff-format": "{elapsed} ago", "time.some": "sometime", diff --git a/src/locales/fr.json b/src/locales/fr.json index 1bb38e6..1014eca 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -38,7 +38,8 @@ "skill.concurrency": "Programmation Concurrente", "skill.teamlead": "Chef d'équipe", - + "time.dur-format": "a duré {duration}", + "time.cur-format": "depuis {duration}", "time.diff-format": "il y a {elapsed}", "time.some": "un moment",