From 85bde1d36098825022a092baa12ea2c78af5c25c Mon Sep 17 00:00:00 2001
From: Joe TS Dell <thunyathep.s@outlook.com>
Date: Mon, 7 Jun 2021 19:03:01 +0200
Subject: [PATCH] update

---
 public/content/content.json | 75 +++++++++++++++++++------------------
 public/content/team.json    |  4 +-
 public/content/text.txt     |  0
 public/css/main.css         | 14 +++++--
 public/imgs/ugl.svg         |  1 +
 public/index.html           | 24 +++++++++---
 6 files changed, 70 insertions(+), 48 deletions(-)
 create mode 100644 public/content/text.txt
 create mode 100644 public/imgs/ugl.svg

diff --git a/public/content/content.json b/public/content/content.json
index 92c3e7b..d3bc0d4 100644
--- a/public/content/content.json
+++ b/public/content/content.json
@@ -24,28 +24,26 @@
   },
   {
     "item": {
-      "title": "Vision Zero",
-      "project": "Hackathon",
+      "title": "COVID-STA",
+      "project": "",
       "author": {
         "firstName": "Joe",
         "lastName": "T. Santhanavanich",
         "hftURL": "https://www.hft-stuttgart.de/p/thunyathep-santhanavanich"
       },
-      "project_year_start": "2019",
-      "project_year_end": "2019",
-      "project_is_on_going": false,
-      "imageLink":"imgs/thumbnails/visionZero.jpeg",
-      "keywords":["CityGML","3D GIS","GIS Analyst","Urban Analytics"],
-      "description_en":"The VISION ZERO is an application for safety routing with the visualization of 3D grid and heatmap. Developed at hackathon event 'Neue Wege für die Mobilität in Augsburg'. (24 hours time limited)",
-      "description_de":"VISION ZERO ist eine Anwendung zum sicheren Routing mit einer Visualisierung eines 3D Grids und einer Heatmap. Entwickelt bein Hackathon Event 'Neue Wege für die Mobilität in Augsburg'. (24 Stunden Zeit begrenzt)"
+      "project_year_start": "2020",
+      "project_year_end": "",
+      "project_is_on_going": true,
+      "imageLink":"imgs/thumbnails/covidSta.jpg",
+      "keywords":["SensorThings API","COVID-19", "Urban Analytics"],
+      "description_en":"The OGC SensorThings API server for managing the COVID-19 case statistic data.",
+      "description_de":"Der OGC SensorThings API Server zur Verwaltung der COVID-19 Fallstatistikdaten."
     },
     "links": {
-      "youtube": "https://www.youtube.com/watch?v=T5jF20yXcWw",
-      "demo": "http://193.196.37.89:8083/visionzero/",
-      "publication":"https://doi.org/10.5194/isprs-annals-VI-4-W2-2020-143-2020",
-      "project":"https://www.hft-stuttgart.de/forschung/i-city"
+      "demo": "https://covidsta.hft-stuttgart.de/server/",
+      "project":"https://www.hft-stuttgart.com/news/covid-19-dashboard-von-hft-stuttgart-entwickelt"
     },
-    "refIndex": 2
+    "refIndex": 1
   },
   {
     "item": {
@@ -95,29 +93,7 @@
     },
     "refIndex": 3
   },
-  {
-    "item": {
-      "title": "COVID-STA",
-      "project": "",
-      "author": {
-        "firstName": "Joe",
-        "lastName": "T. Santhanavanich",
-        "hftURL": "https://www.hft-stuttgart.de/p/thunyathep-santhanavanich"
-      },
-      "project_year_start": "2020",
-      "project_year_end": "",
-      "project_is_on_going": true,
-      "imageLink":"imgs/thumbnails/covidSta.jpg",
-      "keywords":["SensorThings API","COVID-19", "Urban Analytics"],
-      "description_en":"The OGC SensorThings API server for managing the COVID-19 case statistic data.",
-      "description_de":"Der OGC SensorThings API Server zur Verwaltung der COVID-19 Fallstatistikdaten."
-    },
-    "links": {
-      "demo": "https://covidsta.hft-stuttgart.de/server/",
-      "project":"https://www.hft-stuttgart.com/news/covid-19-dashboard-von-hft-stuttgart-entwickelt"
-    },
-    "refIndex": 1
-  },
+  
   {
     "item": {
       "title": "3D Wind Simulation",
@@ -210,6 +186,31 @@
     },
     "refIndex": 3
   },
+  {
+    "item": {
+      "title": "Vision Zero",
+      "project": "Hackathon",
+      "author": {
+        "firstName": "Joe",
+        "lastName": "T. Santhanavanich",
+        "hftURL": "https://www.hft-stuttgart.de/p/thunyathep-santhanavanich"
+      },
+      "project_year_start": "2019",
+      "project_year_end": "2019",
+      "project_is_on_going": false,
+      "imageLink":"imgs/thumbnails/visionZero.jpeg",
+      "keywords":["CityGML","3D GIS","GIS Analyst","Urban Analytics"],
+      "description_en":"The VISION ZERO is an application for safety routing with the visualization of 3D grid and heatmap. Developed at hackathon event 'Neue Wege für die Mobilität in Augsburg'. (24 hours time limited)",
+      "description_de":"VISION ZERO ist eine Anwendung zum sicheren Routing mit einer Visualisierung eines 3D Grids und einer Heatmap. Entwickelt bein Hackathon Event 'Neue Wege für die Mobilität in Augsburg'. (24 Stunden Zeit begrenzt)"
+    },
+    "links": {
+      "youtube": "https://www.youtube.com/watch?v=T5jF20yXcWw",
+      "demo": "http://193.196.37.89:8083/visionzero/",
+      "publication":"https://doi.org/10.5194/isprs-annals-VI-4-W2-2020-143-2020",
+      "project":"https://www.hft-stuttgart.de/forschung/i-city"
+    },
+    "refIndex": 2
+  },
   {
     "item": {
       "title": "Multi-scale Urban Scenario Interface",
diff --git a/public/content/team.json b/public/content/team.json
index a933e68..032e6f1 100644
--- a/public/content/team.json
+++ b/public/content/team.json
@@ -3,7 +3,7 @@
         "firstName": "Prof. Dr. Volker",
         "lastName": "Coors",
         "jobTitle_en": "Lab Leader",
-        "imgUrl": "/imgs/avatar/volker.Coors.jpg",
+        "imgUrl": "https://www.hft-stuttgart.de/fileadmin/Dateien/Profilbilder/_processed_/f/2/csm_Coors-Volker__2__2fbc5a88e2.jpg",
         "profile_link": "https://www.hft-stuttgart.de/p/volker-coors",
         "researchTopics": "Smart Cities | OGC Standards | Sensors & IoT | 3D City Models | 3D Web Visualization | 3D Simulation | Big Data",
         "optional": {
@@ -15,7 +15,7 @@
         "firstName": "Joe T.",
         "lastName": "Santhanavanich",
         "jobTitle_en": "Researcher",
-        "imgUrl": "/imgs/avatar/JoeSquare.jpg",
+        "imgUrl": "https://www.hft-stuttgart.de/fileadmin/Dateien/Profilbilder/_processed_/9/b/csm_JoeSquare_89b2f100d1.jpg",
         "profile_link": "https://www.hft-stuttgart.de/p/thunyathep-santhanavanich",
         "researchTopics": "Smart Cities | OGC Standards | Sensors & IoT | 3D City Models | 3D Web Visualization | 3D Simulation | Big Data",
         "optional": {
diff --git a/public/content/text.txt b/public/content/text.txt
new file mode 100644
index 0000000..e69de29
diff --git a/public/css/main.css b/public/css/main.css
index aea0c76..47d1bcd 100644
--- a/public/css/main.css
+++ b/public/css/main.css
@@ -11,13 +11,21 @@
   }
 }
 
+#document-body {
+  font-family: 'Noto Sans JP', sans-serif;
+}
+
+h1, h2, h3, h4, h5, h6 {
+  font-family: 'Roboto', sans-serif; 
+}
+
 .jumbotron p:last-child {
   margin-bottom: 0;
 }
 
-.jumbotron h1 {
-  font-weight: 300;
-}
+/* .jumbotron h1 {
+  font-weight: 700;
+} */
 
 .jumbotron .container {
   max-width: 40rem;
diff --git a/public/imgs/ugl.svg b/public/imgs/ugl.svg
new file mode 100644
index 0000000..635903d
--- /dev/null
+++ b/public/imgs/ugl.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 101.74 130.27"><defs><style>.cls-1{isolation:isolate;}.cls-2{fill:#00050a;}.cls-3{fill:#fff;}.cls-4{fill:#211355;}.cls-5{fill:#0574e2;}.cls-6{fill:url(#linear-gradient);}.cls-7{fill:url(#linear-gradient-2);}.cls-8{fill:url(#linear-gradient-3);}.cls-9{fill:#30b9ef;}.cls-10{fill:#54c5f0;}.cls-11{fill:#77d1f2;}.cls-12{fill:#9bdcf3;}.cls-13{fill:#bee8f4;}.cls-14{fill:url(#linear-gradient-4);}</style><linearGradient id="linear-gradient" x1="60.36" y1="111.67" x2="101.74" y2="111.67" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#055ad4"/><stop offset="1" stop-color="#00050a"/></linearGradient><linearGradient id="linear-gradient-2" x1="77.88" y1="92.76" x2="64.7" y2="56.11" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-3" x1="89.52" y1="47.52" x2="36.74" y2="78.49" xlink:href="#linear-gradient"/><linearGradient id="linear-gradient-4" x1="84.6" y1="38" x2="35.91" y2="63.79" xlink:href="#linear-gradient"/></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><g class="cls-1"><path class="cls-2" d="M10.37,85.17,45.61,64.69c0,1.52,0,3,0,4.39L10.36,89.56C10.36,88.12,10.37,86.69,10.37,85.17Z"/><path class="cls-2" d="M10.36,89.56,45.6,69.08l4.68,2.7L15,92.26Z"/><path class="cls-2" d="M10.37,85.17,45.61,64.69l4.68,2.7L15.05,87.87Z"/><path class="cls-2" d="M15.05,87.87,50.29,67.39v4.39L15,92.26C15,90.77,15.05,89.32,15.05,87.87Z"/><path class="cls-3" d="M15.05,87.87v4.39l-4.68-2.7V85.17Z"/><path class="cls-4" d="M.06,71.24,35.3,50.76,66.85,69,31.61,89.45Z"/><path class="cls-2" d="M10.44,61.4,45.68,40.92c0,1.49,0,2.94,0,4.41L10.43,65.81C10.44,64.34,10.44,62.89,10.44,61.4Z"/><path class="cls-2" d="M10.43,65.81,45.67,45.33,50.37,48,15.13,68.52Z"/><path class="cls-3" d="M15.14,64.11v4.41l-4.7-2.71V61.4Z"/><path class="cls-2" d="M15.14,64.11,50.38,43.63c0,1.47,0,2.9,0,4.41L15.13,68.52C15.13,67,15.14,65.58,15.14,64.11Z"/><path class="cls-2" d="M10.44,61.4,45.68,40.92l4.7,2.71L15.14,64.11Z"/><path class="cls-5" d="M.06,71.24,31.61,89.45l-.4.51c-2.46,2.84-4.87,5.73-7.38,8.49-1.54,1.7-2.11,4-1,7.81l-.87-.5L.84,93.58c-.28-.16-.56-.28-.84-.42Zm15,21V87.87l-4.68-2.7v4.39L15,92.26"/><path class="cls-4" d="M31.61,89.45l-.4.51c-2.46,2.84-4.87,5.73-7.38,8.49-1.54,1.7-2.11,4-1,7.81L58.05,85.78c-1.09-3.76-.52-6.11,1-7.8,2.51-2.77,4.92-5.66,7.38-8.5l.4-.51Z"/><path class="cls-2" d="M23.67,69,58.91,48.55c0,1.51,0,3,0,4.39L23.66,73.42Z"/><path class="cls-2" d="M23.66,73.42,58.9,52.94l4.69,2.7L28.35,76.12Z"/><path class="cls-2" d="M28.36,71.74,63.6,51.26c0,1.46,0,2.89,0,4.38L28.35,76.12C28.35,74.63,28.35,73.2,28.36,71.74Z"/><path class="cls-3" d="M28.36,71.74v4.38l-4.69-2.7V69Z"/><path class="cls-2" d="M23.67,69,58.91,48.55l4.69,2.71L28.36,71.74Z"/><path class="cls-4" d="M87.27,88.45l-6.41-3.7-.64-.37h0L70,78.46l-1-.57-.33-.19c-.36-.21-.73-.42-1.09-.61A.64.64,0,0,0,67,77L31.74,97.51a.68.68,0,0,1,.58.06c.36.19.73.4,1.09.61l.33.19,1,.57L45,104.86l.64.37,6.41,3.7h0l8.33,4.8L95.6,93.25Z"/><path class="cls-2" d="M10.51,37,45.75,16.48c0,1.49,0,2.94,0,4.42L10.49,41.38C10.5,39.9,10.5,38.45,10.51,37Z"/><path class="cls-4" d="M.13,47.81,35.37,27.33c.3.2.6.42.9.59L72,48.54l.89.52L37.63,69.54,36.74,69,1,48.4C.73,48.23.43,48,.13,47.81Z"/><path class="cls-2" d="M10.49,41.38,45.73,20.9l4.7,2.72L15.19,44.1Z"/><path class="cls-2" d="M15.21,39.67,50.45,19.19c0,1.47,0,2.92,0,4.43L15.19,44.1C15.2,42.58,15.2,41.14,15.21,39.67Z"/><path class="cls-3" d="M15.21,39.67l0,4.43-4.7-2.72,0-4.42Z"/><path class="cls-2" d="M10.51,37,45.75,16.48l4.7,2.71L15.21,39.67Z"/><path class="cls-6" d="M100.86,109.61,65.62,130.09a.57.57,0,0,0,.13-.08,1.43,1.43,0,0,0,.37-.4,2.32,2.32,0,0,0,.38-1.3,6.37,6.37,0,0,0-.6-2.48c-1.49-3.6-3-7.2-4.45-10.8a2.31,2.31,0,0,0-1.09-1.3L95.6,93.25a2.34,2.34,0,0,1,1.09,1.31c1.46,3.59,3,7.19,4.45,10.79a6.37,6.37,0,0,1,.6,2.49,2.36,2.36,0,0,1-.38,1.3,1.54,1.54,0,0,1-.37.39A.57.57,0,0,1,100.86,109.61Z"/><path class="cls-5" d="M60.36,113.73a2.31,2.31,0,0,1,1.09,1.3c1.46,3.6,3,7.2,4.45,10.8a6.37,6.37,0,0,1,.6,2.48,2.32,2.32,0,0,1-.38,1.3,1.43,1.43,0,0,1-.37.4l-.15.1a1.34,1.34,0,0,1-.6.16,3.25,3.25,0,0,1-1.67-.53l-8.56-5-8.54-4.92L34.9,113.32,29.23,110a6.34,6.34,0,0,1-3.05-4.47,4.18,4.18,0,0,1-.06-.68,2.22,2.22,0,0,1,.49-1.49c1.68-2,3.37-3.92,5.08-5.84.11-.14.41-.1.63,0s.73.4,1.09.61l.33.19,1,.57L45,104.86l.64.37,6.41,3.7Z"/><path class="cls-5" d="M37.66,70.39c0,3.83,0,7.67,0,11.48a1.81,1.81,0,0,1-.33,1C36.43,84,35.5,85,34.65,86c-.28.36-.59.38-1.14.06q-10-5.82-20.06-11.6L.07,66.76l.06-19c.3.2.6.42.9.59L36.74,69l.89.52C37.64,69.86,37.66,70.13,37.66,70.39ZM15.13,68.52V64.11l-4.7-2.71v4.41l4.7,2.71m13.22,7.6V71.74L23.67,69v4.39l4.69,2.7"/><path class="cls-4" d="M72.87,49.06,37.63,69.54c0,.32,0,.59,0,.85,0,3.83,0,7.67,0,11.48a1.81,1.81,0,0,1-.33,1C36.43,84,35.5,85,34.65,86a.9.9,0,0,1-.23.21L69.66,65.75a.9.9,0,0,0,.23-.21c.85-1.07,1.78-2.05,2.64-3.11a1.81,1.81,0,0,0,.33-1c0-3.81,0-7.65,0-11.48C72.9,49.66,72.88,49.38,72.87,49.06Z"/><path class="cls-2" d="M23.72,44.58,59,24.1v4.43L23.71,49Z"/><path class="cls-2" d="M23.71,49,59,28.53l4.71,2.72L28.42,51.73Z"/><path class="cls-2" d="M28.43,47.3,63.67,26.82c0,1.48,0,2.93,0,4.43L28.42,51.73C28.43,50.23,28.43,48.78,28.43,47.3Z"/><path class="cls-2" d="M23.72,44.58,59,24.1l4.71,2.72L28.43,47.3Z"/><path class="cls-3" d="M28.43,47.3v4.43L23.71,49V44.58Z"/><path class="cls-4" d="M33.83,48.89,69.07,28.41l0,14L33.79,62.83Z"/><path class="cls-7" d="M52.13,68.41,87.37,47.93c0,.32,0,.58,0,.84,0,7.43,0,14.86,0,22.3a4,4,0,0,0,.32,1.42q2.9,7.1,5.85,14.2c.12.29.23.59.37,1L58.58,108.14c-.14-.38-.25-.68-.37-1Q55.27,100.07,52.36,93A4.07,4.07,0,0,1,52,91.55c0-7.44,0-14.87.05-22.3C52.09,69,52.11,68.73,52.13,68.41Z"/><path class="cls-8" d="M54.85,65.57,90.09,45.09l0,4.4L54.83,70C54.84,68.47,54.84,67,54.85,65.57Z"/><path class="cls-9" d="M37.75,55.7,73,35.22l17.1,9.87L54.85,65.57Z"/><path class="cls-5" d="M54.85,65.57l0,4.4-2.7-1.56c0,.32,0,.58,0,.84,0,7.43-.05,14.86-.05,22.3A4.07,4.07,0,0,0,52.36,93q2.89,7.09,5.85,14.19c.12.3.23.6.37,1l-24-13.88c.14-.19.25-.35.37-.49,2.11-2.43,4.23-4.86,6.32-7.31a1.34,1.34,0,0,0,.28-.86q.06-11.25.08-22.52c0-.22,0-.44,0-.73l-3.81-2.2V55.7Z"/><path class="cls-5" d="M.2,23,52,53l0,6.42L33.83,48.89l0,13.94-.95-.54L1,43.94c-.3-.18-.6-.31-.9-.46ZM28.42,51.73V47.3l-4.71-2.72V49l4.71,2.72M15.19,44.1l0-4.43L10.51,37l0,4.42,4.7,2.72"/><path class="cls-9" d="M.2,23,35.44,2.56,87.26,32.48,52,53Z"/><path class="cls-10" d="M.2,22.4,35.44,1.92c22.21,14.9,34.88,16.56,51.82,28.74l-34.83,21C38.23,41.94,21.55,34.45.2,22.4Z"/><path class="cls-11" d="M.2,21.76,35.44,1.28C62.59,21.1,70.66,14.46,87.26,28.84L52.84,50.45C41.71,40.9,25.63,35.88.2,21.76Z"/><path class="cls-12" d="M.2,21.12,35.44.64C67.52,25.38,71,10.44,87.26,27l-34,22.17C45.19,39.86,29.71,37.3.2,21.12Z"/><path class="cls-13" d="M.2,20.48,35.44,0c37,29.66,35.9,6.41,51.82,25.2L53.66,47.93C48.68,38.81,33.79,38.73.2,20.48Z"/><path class="cls-14" d="M52,53,87.26,32.48c0,2.11,0,4.22,0,6.42L52,59.38C52,57.18,52,55.07,52,53Z"/></g></g></g></svg>
\ No newline at end of file
diff --git a/public/index.html b/public/index.html
index 424576a..a2fe851 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,11 +10,13 @@
   <meta name="generator" content="GitLab Pages">
   <link rel="stylesheet" href="./css/bootstrap.min.css">
   <!-- <link rel="stylesheet" href="./css/theme.min.css"> -->
-  <link href="css/main.css" rel="stylesheet">
   <link href="css/custom.css" rel="stylesheet">
   <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.15.3/xlsx.full.min.js"></script>
   <script src="https://kit.fontawesome.com/79b3e255a2.js" crossorigin="anonymous"></script>
   <link rel="shortcut icon" type="image/png" sizes="32x32" href="./imgs/icon.png">
+  <link rel="preconnect" href="https://fonts.gstatic.com">
+<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+JP&family=Roboto:wght@700&display=swap" rel="stylesheet">
+  <link href="css/main.css" rel="stylesheet">
 
 </head>
 
@@ -64,14 +66,24 @@
 
     <section class="jumbotron text-center hftBackground">
       <div class="container">
-        <img src="imgs/database.svg" class="windSVG" width="100px" alt="wind">
-        <h1> <b>Urban Geoinformatics Lab </b> <br>@HFT Stuttgart </h1>
-        <!-- <p id="rgc_introduction" class="lead text-muted"> (or Vote for new group name) <br>A research group introduction
-          here ....</p> -->
-        <!-- <p id="rgc_introduction2">The research projects at HFT Stuttgart (University of Applied Sciences Stuttgart).</p> -->
+        <img src="imgs/ugl.svg" class="windSVG" width="100px" alt="wind">
+        <h1 class="display-5 fw-bold" >Urban Geoinformatics Lab</h1>
+        <h3 class="text-muted"> @HFT Stuttgart </h3>
       </div>
     </section>
 
+    <!-- <div class="px-4 py-5 my-5 text-center">
+      <img class="d-block mx-auto mb-4" src="imgs/ugl.svg" alt="" width="72" height="57">
+      <h1 class="display-5 fw-bold">Urban Geoinformatics Lab</h1>
+      <div class="col-lg-6 mx-auto">
+        <p class="lead mb-4">@HFT Stuttgart</p>
+        <div class="d-grid gap-2 d-sm-flex justify-content-sm-center">
+          <button type="button" class="btn btn-primary btn-lg px-4 gap-3">Primary button</button>
+          <button type="button" class="btn btn-outline-secondary btn-lg px-4">Secondary</button>
+        </div>
+      </div>
+    </div> -->
+
     <!-- <div class="container col-xxl-8 px-4 py-5">
       <div class="row flex-lg-row-reverse align-items-center g-5 py-5">
         <div class="col-10 col-sm-8 col-lg-6">
-- 
GitLab