Make major improvements

helagro · Dec 18, 2024 · 6bc2324 · 6bc2324
1 parent 6c7b87b
commit 6bc2324
Show file tree

Hide file tree

Showing 25 changed files with 441 additions and 434 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,8 +1,8 @@
-# name: Deploy to server
-# on:
-#   push:
-#     branches:
-#       - main
+name: Deploy to server
+on:
+  push:
+    branches:
+      - main
 
 jobs:
   deploy:
@@ -12,12 +12,12 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: SSH into server and pull folder
-        uses: appleboy/ssh-action@master
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: ${{ secrets.SERVER_USERNAME }}
-          password: ${{ secrets.SERVER_PASSWORD }}
-          script: |
-            cd /home/h/resume
-            git pull
+      # - name: SSH into server and pull folder
+      #   uses: appleboy/ssh-action@master
+      #   with:
+      #     host: ${{ secrets.SERVER_HOST }}
+      #     username: ${{ secrets.SERVER_USERNAME }}
+      #     password: ${{ secrets.SERVER_PASSWORD }}
+      #     script: |
+      #       cd /home/h/resume
+      #       git pull
diff --git a/TODO.md b/TODO.md
@@ -1,7 +1,3 @@
-- shorten
-  - rm hobbies?
-  - shorten non-related work experiences
 - add letter of recommendation
 - improve phrasing
-- add scripting
-- fix pipeline
+  - I handled and resolved a variety of equipment
diff --git a/compile.js b/compile.js
@@ -1,10 +1,11 @@
 const Handlebars = require('handlebars')
 const fs = require('fs')
+const yaml = require('js-yaml')
 
 /* ----------------------- LOAD SHARED ---------------------- */
 
-const sharedStr = fs.readFileSync('source/shared.json', 'utf8')
-const sharedObj = JSON.parse(sharedStr)
+const sharedStr = fs.readFileSync('source/shared.yml', 'utf8')
+const sharedObj = yaml.load(sharedStr)
 
 /* ------------------------- HELPERS ------------------------ */
 
@@ -18,11 +19,11 @@ Handlebars.registerHelper('isMissing', function (value, options) {
 
 const languages = [
   {
-    inputName: 'english.json',
+    inputName: 'english.yml',
     outputName: 'en.html',
   },
   {
-    inputName: 'swedish.json',
+    inputName: 'swedish.yml',
     outputName: 'se.html',
   },
 ]
@@ -36,7 +37,7 @@ for (const language of languages) {
 function compileLanguage(lang) {
   const templateSource = fs.readFileSync('source/template.html', 'utf8')
   const contentStr = fs.readFileSync(`source/${lang.inputName}`, 'utf8')
-  const contentObj = JSON.parse(contentStr)
+  const contentObj = yaml.load(contentStr)
 
   const context = {
     ...sharedObj,

diff --git a/docs/en.html b/docs/en.html
@@ -20,8 +20,8 @@
                 <div class="leftColumn">
                     <header class="columns">
                         <img class="profilePic" id="profilePic" src="img/me.jpg"
-                            alt="Profile picture of Henrik Lagrosen" width="110px" height="110px">
-                        <div class="floor">
+                            alt="Profile picture of Henrik Lagrosen" width="100px" height="100px">
+                        <div class="floor" id="headerText">
                             <h1>Henrik Lagrosen</h1>
                             <div class="columns">
                                 <a class="largeText" id="email"></a>
@@ -33,79 +33,29 @@ <h1>Henrik Lagrosen</h1>
 
                     <div class="pageContent">
                         <h2>PROFILE</h2>
-                        <p class="bodyText">I have extensive experience in IT support as an IT technician at Amplius Field Service Group AB and as a laboratory assistant at ALS Danderyd. Additionally, I have worked in retail. Currently, I am studying Software Engineering and Management at the University of Gothenburg.</p>
+                        <p class="bodyText">I have extensive experience in IT support as an IT technician at Amplius Field Service Group AB and as a laboratory assistant at ALS Danderyd. Currently, I am studying Software Engineering and Management at the University of Gothenburg.</p>
                     </div>
 
                     <div class="pageContent">
                         <h2>WORK EXPERIENCE</h2>
 
                         <div class="infoItem">
-                            <h3>IT Technician, Amplius Field Service Group AB</h3>
-                            <p class="bodyText">As an IT technician, I was responsible for providing technical support and service to various clients. My role involved extensive fieldwork where I handled and resolved a variety of equipment, including Cisco devices, POS devices, and computers.</p>
+                            <h3>IT Technician, <a href="https://amplius.se/">Amplius Field Service Group AB</a></h3>
+                            <p class="bodyText">As an IT technician, I was responsible for providing technical support and service to various clients. My role involved extensive fieldwork where I handled and resolved issues with variety of equipment, including Cisco devices, POS devices, and computers.</p>
                             <p class="smallText">August 2022 — Present</p>
                         </div>
                         <div class="infoItem">
-                            <h3>Laboratory Assistant, ALS Danderyd</h3>
-                            <p class="bodyText">Responsible for preparing soil samples for analysis and performing post-analysis cleanup. I also had an additional responsibility as IT support, which involved tasks primarily related to the installation and troubleshooting of software, computers, and connected devices. Another major responsibility was key fob management.</p>
+                            <h3>Laboratory Assistant, <a href="https://www.alsglobal.se/">ALS Danderyd</a></h3>
+                            <p class="bodyText">Responsible for preparing for and cleaning up after analysis. I also had additional responsibilities as key fob manager and IT support. The support involved installation and troubleshooting for computers, and connected devices.</p>
                             <p class="smallText">April 2022 — August 2022, Danderyd</p>
                         </div>
                         <div class="infoItem">
-                            <h3>Shop Assistant, Ica Stillingsön</h3>
-                            <p class="bodyText">Cashier service in an ICA store, mostly in a special department where garden products, toys, and home improvement products were sold.</p>
+                            <h3>Shop Assistant, <a href="https://www.ica.se/butiker/nara/orust/stillingsons-handel-1003402/">Ica Stillingsön</a></h3>
+                            <p class="bodyText">Cashier service and store maintenance.</p>
                             <p class="smallText">June 2020 — July 2020, June 2019 — July 2019, Orust</p>
                         </div>
-                        <div class="infoItem">
-                            <h3>Leisure Assistant, Orust Municipality</h3>
-                            <p class="bodyText">Participated in the educational activities of the leisure center.</p>
-                            <p class="smallText">June 2018 — July 2018, Ellös</p>
-                        </div>
-                    </div>
-
-                </div>
-
-                <div class="rightColumn">
-                    <div>
-                        <h2>QUALIFICATIONS</h2>
-
-                        <p class="largeText">Programming</p>
-                        <p class="largeText">IT service</p>
-                        <p class="largeText">Web design</p>
-                        <p class="largeText">Android development</p>
-                        <p class="largeText">Fluent in English</p>
-                        <p class="largeText">Experience in image and video editing</p>
-                        <p class="largeText">Proficient in Excel</p>
-                    </div>
-
-                    <div>
-                        <h2>HOBBIES</h2>
-
-                        <p class="largeText">Strength training</p>
-                        <p class="largeText">Literature</p>
-                        <p class="largeText">Climbing</p>
                     </div>
 
-                    <div class="linkRow">
-                        <a href="https://www.linkedin.com/in/henrik-lagrosen">
-                            <img src="img/LI-In-Bug.png" alt="LinkedIn link" height="34">
-                        </a>
-
-                        <a href="https://github.com/helagro" style="padding-bottom: .1em;">
-                            <img src="img/github-mark.svg" alt="github link" height="33">
-                        </a>
-
-                        <a href="https://helagro.github.io/resume/se.html" class="printOnly"
-                            style="margin: -.13em .35em 0 .35em;">
-                            <img src="img/Svenska.svg" alt="Link for Svenska version" height="37">
-                        </a>
-                    </div>
-                </div>
-
-            </section>
-
-            <!-- ---------------------- PAGE TWO ----------------------- -->
-
-            <section>
-                <div class="leftColumn">
                     <div class="pageContent">
                         <h2>EDUCATION</h2>
                         <div class="infoItem">
@@ -133,9 +83,27 @@ <h3>Jensen Gymnasieskola</h3>
                     <div class="pageContent">
                         <h2></h2>
                     </div>
+
                 </div>
 
                 <div class="rightColumn">
+                    <div>
+                        <h2>QUALIFICATIONS</h2>
+
+                        <p class="largeText">Programming</p>
+                        <p class="largeText">IT service</p>
+                        <p class="largeText">Web design</p>
+                        <p class="largeText">Android development</p>
+                        <p class="largeText">Fluent in English</p>
+                        <p class="largeText">Experience in image and video editing</p>
+                        <p class="largeText">Proficient in Excel</p>
+                    </div>
+
+                    <div>
+                        <h2></h2>
+
+                    </div>
+
                     <div>
                         <h2>TECHNIQUES</h2>
 
@@ -145,6 +113,9 @@ <h2>TECHNIQUES</h2>
                         <a href="https://github.com/helagro?tab&#x3D;repositories&amp;q&#x3D;&amp;type&#x3D;&amp;language&#x3D;c&amp;sort&#x3D;" class="">
                             <p class="largeText">C</p>
                         </a>
+                        <a href="https://github.com/helagro?tab&#x3D;repositories&amp;q&#x3D;&amp;type&#x3D;&amp;language&#x3D;c%2B%2B&amp;sort&#x3D;" class="">
+                            <p class="largeText">C++</p>
+                        </a>
                         <a href="" class="disabled">
                             <p class="largeText">Flutter</p>
                         </a>
@@ -179,10 +150,30 @@ <h2>TECHNIQUES</h2>
                             <p class="largeText">Vue</p>
                         </a>
                     </div>
+
+
+                    <div class="linkRow">
+                        <a href="https://www.linkedin.com/in/henrik-lagrosen">
+                            <img src="img/LI-In-Bug.png" alt="LinkedIn link" height="34">
+                        </a>
+
+                        <a href="https://github.com/helagro" style="padding-bottom: .1em;">
+                            <img src="img/github-mark.svg" alt="github link" height="33">
+                        </a>
+
+                        <a href="https://helagro.github.io/resume/se.html" class="printOnly"
+                            style="margin: -.13em .35em 0 .35em;">
+                            <img src="img/Svenska.svg" alt="Link for Svenska version" height="37">
+                        </a>
+                    </div>
                 </div>
+
             </section>
+
         </div>
 
+        <!-- ----------------------- OPTIONS ----------------------- -->
+
         <div class="optionsPanelContainer">
             <button onclick="toggleOptionsPopup()" id="toggleOptionsBtn">
                 <img src="img/icons8-double-left-30.png" width="20px" height="20px" id="toggleOptionsBtnImg"
@@ -196,7 +187,7 @@ <h2>Options</h2>
                     </a>
                 </div>
                 <p>
-                    <label for="showImages"><span class="largeText">Show Image</span></label>
+                    <label for="showImages"><span class="largeText" id="showImagesLabel">Show Image</span></label>
                     <input type="checkbox" name="showImages" id="showImages" autocomplete="off"
                         onchange="showPFP(this.checked)">
                 </p>
@@ -208,6 +199,8 @@ <h2>Options</h2>
 
     </main>
 
+    <!-- ----------------------- FOOTER ------------------------ -->
+
     <footer>
         <div class="credit">
             <a target="_blank" href="https://icons8.com/icon/46171/cv">CV</a>

diff --git a/docs/script/main.js b/docs/script/main.js
@@ -1,33 +1,36 @@
-const emailAddrScrambled = "B0bydWYsVGavdXRsb29rLmNvbQ=="
+const emailAddrScrambled = 'B0bydWYsVGavdXRsb29rLmNvbQ=='
 
 function loadContactDetails() {
   const unscramble = (s) =>
     atob(
       s
         .slice(0, Math.floor(s.length / 2.5))
-        .split("")
+        .split('')
         .reverse()
-        .join("") + s.slice(Math.floor(s.length / 2.5))
+        .join('') + s.slice(Math.floor(s.length / 2.5))
     )
 
   const emailAddr = unscramble(emailAddrScrambled)
 
-  const emailElem = document.getElementById("email")
+  const emailElem = document.getElementById('email')
   emailElem.textContent = emailAddr
-  emailElem.href = "mailto:" + emailAddr
+  emailElem.href = 'mailto:' + emailAddr
 
-  if (typeof phoneNrScrambled === "undefined") {
-    for (const elem of document.getElementsByClassName("ifPhoneNr")) elem.style.display = "none"
+  if (typeof phoneNrScrambled === 'undefined') {
+    for (const elem of document.getElementsByClassName('ifPhoneNr'))
+      elem.style.display = 'none'
   } else {
     const phoneNr = unscramble(phoneNrScrambled)
-    const phoneElem = document.getElementById("phone")
+    const phoneElem = document.getElementById('phone')
     phoneElem.textContent = phoneNr
-    phoneElem.href = "tel:" + phoneNr
+    phoneElem.href = 'tel:' + phoneNr
   }
 }
 
-const showPFP = (value) =>
-  (document.getElementById("profilePic").style.display = value ? "unset" : "none")
+function showPFP(value) {
+  document.getElementById('profilePic').style.display = value ? 'unset' : 'none'
+  document.getElementById('headerText').style.marginBottom = value ? '1em' : '0'
+}
 
 /* --------------------- MOBILE OPTIONS --------------------- */
 
@@ -37,7 +40,11 @@ const toggleOptionsPopup = () => showOptionsPopup(!popupIsShowing)
 
 function handleOutsideTouch(event) {
   //exit if the click was within the popup or on the toggle button
-  if (event.target.closest("#optionsContent") || event.target.closest("#toggleOptionsBtn")) return
+  if (
+    event.target.closest('#optionsContent') ||
+    event.target.closest('#toggleOptionsBtn')
+  )
+    return
 
   showOptionsPopup(false)
 }
@@ -48,21 +55,21 @@ function showOptionsPopup(doShow) {
 
   rotateToggleOptionsPopupBtn(popupIsShowing)
 
-  const optionsContent = document.getElementById("optionsContent")
-  optionsContent.style.display = popupIsShowing ? "grid" : "none"
+  const optionsContent = document.getElementById('optionsContent')
+  optionsContent.style.display = popupIsShowing ? 'grid' : 'none'
 }
 
 function rotateToggleOptionsPopupBtn(popupIsShowing) {
   let rotation = popupIsShowing ? 180 : 0
-  const img = document.getElementById("toggleOptionsBtnImg")
+  const img = document.getElementById('toggleOptionsBtnImg')
   img.style.transform = `rotate(${rotation}deg)`
 }
 
 /* ---------------------- ENTRY POINTS ---------------------- */
 
-console.log("Version 1")
+console.log('Version 1')
 
 loadContactDetails()
 
-document.addEventListener("mousedown", handleOutsideTouch)
-document.addEventListener("touchstart", handleOutsideTouch)
+document.addEventListener('mousedown', handleOutsideTouch)
+document.addEventListener('touchstart', handleOutsideTouch)