From 5c061b90ef6577f5f6b42640a8c1ca7aa70e9023 Mon Sep 17 00:00:00 2001
From: MeowcaTheoRange <me@abtmtr.link>
Date: Wed, 9 Oct 2024 11:50:35 -0500
Subject: [PATCH] raw resume formatting, more fields and stuff

---
 index.js               | 12 +++++--
 views/pages/resume.ejs | 79 +++++++++++++++++++++++++-----------------
 2 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/index.js b/index.js
index e245076..ea9bd52 100644
--- a/index.js
+++ b/index.js
@@ -572,13 +572,21 @@ app.get('/resume', async (req, res) => {
     return res.render('resumeEntry', { badError: true });
   }
 
-  console.log(unencryptedOrgs)
+  if (req.query.raw && process.env.NODE_ENV === "development")
+    return res.json({
+      pd: unencryptedPD,
+      jobs: unencryptedJobs,
+      education: unencryptedEducation,
+      orgs: unencryptedOrgs,
+      // desc: unencryptedDesc
+    });
 
   res.render('resume', {
     pd: unencryptedPD,
     jobs: unencryptedJobs,
     education: unencryptedEducation,
-    orgs: unencryptedOrgs
+    orgs: unencryptedOrgs,
+    // desc: unencryptedDesc
   });
 });
 
diff --git a/views/pages/resume.ejs b/views/pages/resume.ejs
index a69f49e..15d1324 100644
--- a/views/pages/resume.ejs
+++ b/views/pages/resume.ejs
@@ -6,6 +6,7 @@
       @media print {
         :root {
           --color: #FF4000;
+          font-size: 11pt;
         }
 
         body {
@@ -19,6 +20,10 @@
           border-left: 4px solid var(--color);
         }
 
+        section {
+          page-break-inside: avoid;
+        }
+
         a {
           color: black;
           text-decoration: none;
@@ -32,6 +37,10 @@
           margin-top: -0.5em;
         }
 
+        h3 {
+          margin-bottom: -0.5rem;
+        }
+
         p.address,
         p.pd {
           margin-left: 1rem;
@@ -59,12 +68,15 @@
           Hint: Use <kbd>CTRL</kbd> <kbd>P</kbd> to print this page and get a more readable layout.
         </span>
       </p>
+      <!-- <h2>About me</h2>
+      <p style="white-space: pre-line;">< desc %></p> -->
+      <section>
       <h2>Organizations / Volunteering</h2>
       <ul>
         <% orgs.forEach((org) => { %>
           <li>
             <h3><a href="<%= org.url %>" target="_blank"><%= org.name %></a></h3>
-            <p>
+            <p class="position">
             <% if (org.main && org.main.url) { %>
             <a href="<%= org.main.url %>" target="_blank"><%= org.main.title %></a>
             <% } else if (org.main) { %>
@@ -77,21 +89,24 @@
               </a>
             </span>
             <% } %>
+            <% if (org.main.date) { %><br />
+              <span style="opacity: 0.5;">Done <%= org.main.date %></span>
+              <% } else if (org.main.start) { %><br />
+              <span style="opacity: 0.5;"><%= org.main.start %> - <%= org.main.end || "Present" %></span>
+            <% } %>
             </p>
+            <p><%= org.description %></p>
             <ul>
               <% org.involvement.forEach((period) => { %>
                 <li>
-                  <h4><%= period.description %></h4>
-                  <p>
-                    <% if (period.supervisor) { %>
+                  <p><%= period.description %>
+                    <% if (period.supervisor) { %><br />
                     <span style="opacity: 0.5;">Supervised by <%= period.supervisor %></span>
                     <% } %>
-                  </p>
-                  <p>
-                    <% if (period.date) { %>
-                      <span>Done <%= period.date %></span>
-                      <% } else if (period.start) { %>
-                      <%= period.start %> - <%= period.end || "Present" %>
+                    <% if (period.date) { %><br />
+                      <span style="opacity: 0.5;">Done <%= period.date %></span>
+                      <% } else if (period.start) { %><br />
+                      <span style="opacity: 0.5;"><%= period.start %> - <%= period.end || "Present" %></span>
                     <% } %>
                   </p>
                 </li>
@@ -100,58 +115,60 @@
           </li>
         <% }); %>
       </ul>
+      </section>
+      <section>
       <h2>Education</h2>
       <ul>
         <% education.forEach((school) => { %>
           <li>
             <h3><a href="<%= school.url %>" target="_blank"><%= school.name %></a></h3>
-            <p>
+            <!-- <p class="inlineaddress">
               <span style="opacity: 0.5;" class="address">
-                <%= school.address.street_address %>,
-                <%= school.address.city %>,
-                <%= school.address.state %>
-                <%= school.address.postal %>
+                < school.address.street_address %>,
+                < school.address.city %>,
+                < school.address.state %>
+                < school.address.postal %>
               </span>
-            </p>
-            <p>
+            </p> -->
+            <p style="opacity: 0.5;">
               <%= school.start || "???" %> - <%= school.end || "Present" %><br />
-              <span style="opacity: 0.5;">Learned <%= school.experience.join(", ") %></span>
+              <!-- <span>Learned < school.experience.join(", ") %></span> -->
             </p>
           </li>
         <% }); %>
       </ul>
+      </section>
+      <section>
       <h2>Experience</h2>
       <ul>
         <% jobs.forEach((job) => { %>
           <li>
             <h3><a href="<%= job.url %>" target="_blank"><%= job.name %></a></h3>
-            <p>
+            <!-- <p class="inlineaddress">
               <span style="opacity: 0.5;" class="address">
-                <%= job.address.street_address %>,
-                <%= job.address.city %>,
-                <%= job.address.state %>
-                <%= job.address.postal %>
+                < job.address.street_address %>,
+                < job.address.city %>,
+                < job.address.state %>
+                < job.address.postal %>
               </span>
-            </p>
+            </p> -->
             <ul>
               <% job.involvement.forEach((period) => { %>
                 <li>
-                  <h4><%= period.description %></h4>
-                  <p>
-                    <span style="opacity: 0.5;">Supervised by <%= period.supervisor %></span>
-                  </p>
-                  <p>
-                    <%= period.start || "???" %> - <%= period.end || "Present" %>
+                  <p><%= period.description %><br />
+                    <span style="opacity: 0.5;">Supervised by <%= period.supervisor %></span><br />
+                    <span style="opacity: 0.5;"><%= period.start || "???" %> - <%= period.end || "Present" %></span>
                   </p>
                 </li>
               <% }); %>
             </ul>
             <p>
-              <span style="opacity: 0.5;">Learned <%= job.experience.join(", ") %></span>
+              <!-- <span style="opacity: 0.5;">Learned < job.experience.join(", ") %></span> -->
             </p>
           </li>
         <% }); %>
       </ul>
+      </section>
     </main>
     <%- include("../components/footer.ejs") %>
     <%- include("../components/post-main.ejs") %>