From 582d629057ffdd8a8f679472f65dcf360858a775 Mon Sep 17 00:00:00 2001
From: Reorx <novoreorx@gmail.com>
Date: Sat, 4 Feb 2023 22:38:36 +0800
Subject: [PATCH] handle date format in template

---
 src/lib/date.js               |  5 ++++
 src/main.js                   |  8 +++++-
 src/templates/reorx/index.ejs | 51 ++++++++++++++++++++++-------------
 3 files changed, 44 insertions(+), 20 deletions(-)
 create mode 100644 src/lib/date.js

diff --git a/src/lib/date.js b/src/lib/date.js
new file mode 100644
index 0000000..d89fc5e
--- /dev/null
+++ b/src/lib/date.js
@@ -0,0 +1,5 @@
+import dayjs from 'dayjs';
+
+export function reformatDate(dateStr, format) {
+  return dayjs(dateStr).format(format)
+}
diff --git a/src/main.js b/src/main.js
index db6c721..bb4813d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,13 @@
 import * as exampleData from '../data/rxresume-converted.json';
+import { reformatDate } from './lib/date';
 import { applyThemeTo } from './themer';
 
 const elCV = document.querySelector('.cv-container')
 
 
-applyThemeTo('default', exampleData, elCV)
+applyThemeTo('default', {
+  cv: exampleData,
+  fn: {
+    reformatDate,
+  }
+}, elCV)
diff --git a/src/templates/reorx/index.ejs b/src/templates/reorx/index.ejs
index 81279bf..26ced3c 100644
--- a/src/templates/reorx/index.ejs
+++ b/src/templates/reorx/index.ejs
@@ -1,35 +1,48 @@
 <!-- Basics -->
-<h1><%= basics.name %></h1>
-<p><%= basics.summary %></p>
+<h1><%= cv.basics.name %></h1>
+<p><%= cv.basics.summary %></p>
 <div class="contact">
-  <%= basics.email %> | <%= basics.phone %>
+  <%= cv.basics.email %> | <%= cv.basics.phone %>
 </div>
 
+<%
+function dateRange(item, preserveDay) {
+  let {startDate, endDate} = item
+  if (!startDate && !endDate) return ''
+  if (!preserveDay) {
+    const format = 'YYYY-MM'
+    startDate = fn.reformatDate(startDate, format)
+    endDate = fn.reformatDate(endDate, format)
+  }
+  return `<p>${startDate}~${endDate}</p>`
+}
+%>
+
 <!-- Educations -->
-<% if (locals.education) { %>
+<% if (cv.education) { %>
 <section>
   <h2>Educations</h2>
-  <% for (const item of education) { %>
+  <% for (const item of cv.education) { %>
     <div class="education">
       <h3><%= item.institution %></h3>
       <p><%= item.url %></p>
       <p><%= item.area %></p>
       <p><%= item.score %></p>
-      <p><%= item.startDate %> - <%= item.endDate %></p>
+      <%- dateRange(item) %>
     </div>
   <% } %>
 </section>
 <% } %>
 
 <!-- Work -->
-<% if (locals.work) { %>
+<% if (cv.work) { %>
 <section>
   <h2>Work</h2>
-  <% for (const item of work) { %>
+  <% for (const item of cv.work) { %>
     <div class="work">
       <h3><%= item.name %></h3>
       <p><%= item.url %></p>
-      <p><%= item.startDate %> - <%= item.endDate %></p>
+      <%- dateRange(item) %>
       <p><%= item.position %></p>
       <div class="summary"><%= item.summary %></div>
       <div class="highlights">
@@ -43,15 +56,15 @@
 <% } %>
 
 <!-- Projects -->
-<% if (locals.projects) { %>
+<% if (cv.projects) { %>
 <section>
   <h2>Projects</h2>
-  <% for (const item of projects) { %>
+  <% for (const item of cv.projects) { %>
     <div class="project">
       <h3><%= item.name %></h3>
       <p><%= item.url %></p>
       <p><%= item.description %></p>
-      <p><%= item.startDate %> - <%= item.endDate %></p>
+      <%- dateRange(item) %>
       <div class="highlights">
         <% for (const hl of item.highlights) { %>
           <div class="item"><%= hl %></div>
@@ -68,15 +81,15 @@
 <% } %>
 
 <!-- Side-projects -->
-<% if (locals.sideProjects) { %>
+<% if (cv.sideProjects) { %>
 <section>
   <h2>Side-projects</h2>
-  <% for (const item of sideProjects) { %>
+  <% for (const item of cv.sideProjects) { %>
     <div class="sideproject">
       <h3><%= item.name %></h3>
       <p><%= item.url %></p>
       <p><%= item.description %></p>
-      <p><%= item.startDate %> - <%= item.endDate %></p>
+      <%- dateRange(item) %>
       <div class="keywords">
         <% for (const kw of item.keywords) { %>
           <span class="item"><%= kw %></span>
@@ -88,10 +101,10 @@
 <% } %>
 
 <!-- Skills -->
-<% if (locals.skills) { %>
+<% if (cv.skills) { %>
 <section>
   <h2>Skills</h2>
-  <% for (const item of skills) { %>
+  <% for (const item of cv.skills) { %>
     <div class="skill">
       <h3><%= item.name %></h3>
       <div class="level"><%= item.level %></div>
@@ -106,10 +119,10 @@
 <% } %>
 
 <!-- Languages -->
-<% if (locals.languages) { %>
+<% if (cv.languages) { %>
 <section>
   <h2>Languages</h2>
-  <% for (const item of languages) { %>
+  <% for (const item of cv.languages) { %>
     <div class="language">
       <h3><%= item.language %></h3>
       <div class="fluency"><%= item.fluency %></div>