From b44254fd970cea7fef717ff6ebfa80d3728144d7 Mon Sep 17 00:00:00 2001
From: nikola <nikolape7@gmail.com>
Date: Tue, 30 Jul 2024 16:15:26 +0200
Subject: [PATCH] put more data in json

---
 routes/userKnowledge.json |  9 +++++++++
 views/cv.hbs              | 32 ++++++++++++++++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/routes/userKnowledge.json b/routes/userKnowledge.json
index 4cb0311..ba38734 100644
--- a/routes/userKnowledge.json
+++ b/routes/userKnowledge.json
@@ -1,4 +1,13 @@
 {
+  "first_name": "Nikola",
+  "last_name": "Petrov",
+  "phone_number": "+38670749506",
+  "occupation": "Student",
+  "birth": "14, November, 2000",
+  "living_location": "Ljubljana, Slovenia",
+  "web_link": "https://petrovv.com",
+  "git_link": "https://git.petrovv.com",
+  "email": "nikolape7@gmail.com",
   "project": [
     {
       "img": "/images/projects/Advent_Of_Code_Logo.jpg",
diff --git a/views/cv.hbs b/views/cv.hbs
index 2ee5167..9b438bd 100644
--- a/views/cv.hbs
+++ b/views/cv.hbs
@@ -40,7 +40,7 @@
     </div>
   </nav>
 </header>
-
+{{#with userData}}
 <main class="l-main bd-container">
   <!-- Resume CV -->
   <div class="resume" id="area-cv">
@@ -53,30 +53,30 @@
           <div class="home_data bd-grid">
             <img src="/images/Jaz.jpg" alt="Icon picture" class="home_img" id="home-img">
             <!--<img alt="Icon picture" class="home_img" id="home-img">-->
-            <h1 class="home_title">Nikola Petrov</h1>
-            <h3 class="home_profession">Student</h3>
+            <h1 class="home_title">{{first_name}} {{last_name}}</h1>
+            <h3 class="home_profession">{{occupation}}</h3>
           </div>
 
           <div class="home_address bd-grid">
             <span class="home_information">
-              <i class="fa-solid fa-location-dot home_icon"></i> Ljubljana, Slovenija
+              <i class="fa-solid fa-location-dot home_icon"></i>{{living_location}}
             </span>
             <span class="home_information">
-              <i class="fa-solid fa-calendar-days home_icon"></i> November, 2000
+              <i class="fa-solid fa-calendar-days home_icon"></i>{{birth}}
             </span>
             <span class="home_information">
-              <a href="mailto:nikolape7@gmail.com" class="home_link">
-                <i class="fa-solid fa-envelope home_icon"></i> nikolape7@gmail.com
+              <a href="mailto:{{email}}" class="home_link">
+                <i class="fa-solid fa-envelope home_icon"></i>{{email}}
               </a>
             </span>
             <span class="home_information">
-              <a href="tel:+38670749506" class="home_link">
-                <i class="fa-solid fa-phone home_icon"></i> (+386) 070749506
+              <a href="tel:{{phone_number}}" class="home_link">
+                <i class="fa-solid fa-phone home_icon"></i>{{phone_number}}
               </a>
             </span>
             <span class="home_information">
-              <a href="https://petrovv.com" class="home_link">
-                <i class="fa-solid fa-globe home_icon"></i> https://petrovv.com
+              <a href="{{web_link}}" class="home_link">
+                <i class="fa-solid fa-globe home_icon"></i>{{web_link}}
               </a>
             </span>
           </div>
@@ -95,8 +95,8 @@
         <h2 class="section-title">Social</h2>
 
         <div class="social_container bd-grid">
-          <a href="https://git.petrovv.com" target="_blank" class="social_link">
-            <i class="fa-brands fa-gitlab social_icon"></i> https://git.petrovv.com
+          <a href="{{git_link}}" target="_blank" class="social_link">
+            <i class="fa-brands fa-gitlab social_icon"></i>{{git_link}}
           </a>
 
 
@@ -111,7 +111,7 @@
         <h2 class="section-title">Experience</h2>
 
         <div class="experience_container bd-grid">
-          {{#each userData.experience}}
+          {{#each experience}}
           <div class="experience_content">
             <div class="experience_time">
               <span class="experience_rounder"></span>
@@ -138,7 +138,7 @@
 
         <div class="education_container bd-grid">
 
-          {{#each userData.education}}
+          {{#each education}}
           <div class="education_content">
             <div class="education_time">
               <span class="education_rounder"></span>
@@ -159,7 +159,7 @@
     </div>
   </div>
 </main>
-
+{{/with}}
 <a href="#" class="scrolltop" id="scroll-top">
   <i class="fa-solid fa-arrow-up scrolltop_icon"></i>
 </a>