From 1d69ef707aedb42cfa1fa0c783d702cea769c27c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laure=CE=B7t?= <laurentfainsin@protonmail.com>
Date: Fri, 2 Apr 2021 17:26:24 +0200
Subject: [PATCH] resume: added an arrow + some modifications

---
 .gitignore                 |  1 +
 pages/_data/resume.json    | 21 +++++++++++++++++----
 pages/_data/resume_fr.json |  2 +-
 pages/css/main.css         |  2 +-
 pages/css/resume.css       | 11 +++++++++++
 pages/matrix.svg           | 17 -----------------
 pages/resume/index.njk     | 11 ++++++++---
 7 files changed, 39 insertions(+), 26 deletions(-)
 delete mode 100644 pages/matrix.svg

diff --git a/.gitignore b/.gitignore
index 3526acb..1e2fd25 100755
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 node_modules/
 _site/
 pages/content/
+pages/_data/
 
 package-lock.json
 yarn.lock
\ No newline at end of file
diff --git a/pages/_data/resume.json b/pages/_data/resume.json
index 9a0b450..4abcce0 100755
--- a/pages/_data/resume.json
+++ b/pages/_data/resume.json
@@ -97,21 +97,24 @@
         "title": "CS Engineer",
         "url": "https://www.enseeiht.fr/",
         "start": "2020",
-        "end": "2023"
+        "end": "Now",
+        "eqv": "Master (L3, M1, M2)"
       },
       {
         "institution": "Lycée Kérichen/Vauban",
         "title": "CPGE PSI",
         "url": "http://www.lycee-kerichen.org/",
         "start": "2018",
-        "end": "2020"
+        "end": "2020",
+        "eqv": "License (L1, L2)"
       },
       {
         "institution": "Lycée de l'Harteloire",
         "title": "Baccalauréat S",
         "url": "https://www.harteloire.com/",
         "start": "2015",
-        "end": "2018"
+        "end": "2018",
+        "eqv": "Highschool"
       }
     ]
   },
@@ -172,6 +175,16 @@
   ],
 
   "reading": [
+    {
+      "title": "Data-Driven Science and Engineering",
+      "type": "book",
+      "url": "http://www.databookuw.com/"
+    },
+    {
+      "title": "The Book of Shaders",
+      "type": "book",
+      "url": "https://thebookofshaders.com/"
+    },
     {
       "title": "r/programming",
       "type": "website",
@@ -318,7 +331,7 @@
       ]
     },
     {
-      "name": "Aquariums",
+      "name": "Fishkeeping",
       "summary": "Tamagochis, but with real responsabilities.",
       "tags": [
         "Patience",
diff --git a/pages/_data/resume_fr.json b/pages/_data/resume_fr.json
index 8a169d2..0e26b80 100755
--- a/pages/_data/resume_fr.json
+++ b/pages/_data/resume_fr.json
@@ -97,7 +97,7 @@
         "title": "Ingénieur SN",
         "url": "https://www.enseeiht.fr/",
         "start": "2020",
-        "end": "2023"
+        "end": "Maintenant"
       },
       {
         "institution": "Lycée Kérichen/Vauban",
diff --git a/pages/css/main.css b/pages/css/main.css
index 3c41b02..9e12205 100755
--- a/pages/css/main.css
+++ b/pages/css/main.css
@@ -51,7 +51,7 @@ li {
 
 hr {
   border: 0;
-  border-top: 1px dashed #d2d2d2;
+  border-top: 1px dashed #c0c5ce;
   height: 0;
   margin: 1.7em 0;
 }
diff --git a/pages/css/resume.css b/pages/css/resume.css
index 95061cf..ad6c796 100755
--- a/pages/css/resume.css
+++ b/pages/css/resume.css
@@ -75,6 +75,17 @@ h2 {
   margin: 1em 0 .3em 0;
 }
 
+.arrow-up {
+  width: 0;
+  height: 0;
+  border-left: 5px solid transparent;
+  border-right: 5px solid transparent;
+  border-bottom: 10px solid #c0c5ce;
+  margin-left: calc(1.25em - 4px);
+  top: -8px;
+  position: relative;
+}
+
 @media print {
   @page {
     size: auto; 
diff --git a/pages/matrix.svg b/pages/matrix.svg
deleted file mode 100644
index 5bc3790..0000000
--- a/pages/matrix.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" version="1.1" width="340.80899" height="340.80899" style="stroke:#ffffff;stroke-width:4;stroke-linejoin:round;stroke-opacity:0.5;paint-order:stroke" id="Layer_1" sodipodi:docname="matrix-icon.svg" inkscape:version="0.92.1 r15371">
-  <metadata id="metadata23">
-    <rdf:RDF>
-      <cc:Work rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-        <dc:title/>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs id="defs21"/>
-  <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" borderopacity="1" objecttolerance="10" gridtolerance="10" guidetolerance="10" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1024" inkscape:window-height="704" id="namedview19" showgrid="false" inkscape:zoom="0.67040735" inkscape:cx="157.84079" inkscape:cy="320.11787" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:current-layer="Layer_1"/>
-  <path d="M 10.875,9.710999 V 331.097 h 23.13 v 7.711 H 2 V 1.999999 h 32 v 7.71 z" id="path2" inkscape:connector-curvature="0"/>
-  <path d="m 109.7685,111.595 v 16.264 h 0.463 c 4.338,-6.191 9.563,-11 15.684,-14.406 6.117,-3.402 13.129,-5.11 21.027,-5.11 7.588,0 14.521,1.475 20.793,4.415 6.274,2.945 11.038,8.131 14.291,15.567 3.56,-5.265 8.4,-9.913 14.521,-13.94 6.117,-4.025 13.358,-6.042 21.724,-6.042 6.351,0 12.234,0.776 17.66,2.325 5.418,1.549 10.065,4.027 13.938,7.434 3.869,3.41 6.889,7.863 9.062,13.357 2.167,5.504 3.253,12.122 3.253,19.869 v 80.385 h -33.006 v -68.074 c 0,-4.025 -0.154,-7.82 -0.465,-11.385 -0.313,-3.56 -1.161,-6.656 -2.555,-9.293 -1.395,-2.631 -3.45,-4.724 -6.157,-6.274 -2.711,-1.543 -6.391,-2.322 -11.037,-2.322 -4.646,0 -8.403,0.896 -11.269,2.671 -2.868,1.784 -5.112,4.109 -6.737,6.971 -1.626,2.869 -2.711,6.12 -3.252,9.762 -0.545,3.638 -0.814,7.318 -0.814,11.035 v 66.91 h -33 v -67.375 c 0,-3.562 -0.081,-7.087 -0.23,-10.57 -0.158,-3.487 -0.814,-6.7 -1.978,-9.645 -1.162,-2.94 -3.1,-5.304 -5.809,-7.088 -2.711,-1.775 -6.7,-2.671 -11.965,-2.671 -1.551,0 -3.603,0.349 -6.156,1.048 -2.556,0.697 -5.036,2.016 -7.435,3.949 -2.404,1.938 -4.454,4.726 -6.158,8.363 -1.705,3.642 -2.556,8.402 -2.556,14.287 v 69.701 H 78.624495 V 111.595 Z" id="path4" inkscape:connector-curvature="0"/>
-  <path d="M 330.41953,331.097 V 9.710999 h -23.13 v -7.71 h 32 V 338.808 h -32 v -7.711 z" id="path16" inkscape:connector-curvature="0"/>
-<script xmlns=""/></svg>
\ No newline at end of file
diff --git a/pages/resume/index.njk b/pages/resume/index.njk
index f565cbb..43b5c74 100755
--- a/pages/resume/index.njk
+++ b/pages/resume/index.njk
@@ -24,6 +24,8 @@ username: Laureηt
       <span class="blink" style="display:inline;">_</span>
       <a style="right: 0px; position: absolute;" href="{{ 'fr/' | url }}" ><span class="flag-icon flag-icon-fr"></span>FR</a>
   </header>
+
+  <base target="_blank">
   
   <div class="row">
     <div class="col-1">
@@ -58,9 +60,9 @@ username: Laureηt
       <ul>
         {% for read in resume.reading %}
           <li>
-            {% if read.type == 'website' %}
+            {# {% if read.type == 'website' %} #}
               <a href="{{ read.url }}">{{ read.title | safe }}</a>
-            {% endif %}
+            {# {% endif %} #}
           </li>
         {% endfor %}
       </ul>
@@ -109,7 +111,9 @@ username: Laureηt
       <hr>
 
       <h2>Education</h2>
+      
       <ul class="timeline">
+        <span class="arrow-up"></span>
         <li class="event"></li>
 
         <li class="year">{{ resume.education.history[0].end }}</li>
@@ -117,7 +121,8 @@ username: Laureηt
         {% for edu in resume.education.history %}
         <li class="event">
           {{ edu.title }}<br>
-          <a href="{{ edu.url }}">{{ edu.institution }}</a>
+          <a href="{{ edu.url }}">{{ edu.institution }}</a><br>
+          {{ edu.eqv }}
         </li>
         <li class="year">{{ edu.start }}</li>
         {% endfor %}