From 6cd2bfa6b0572d8094cb40e46961c6208afb973d Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Thu, 17 Jun 2021 19:12:07 +0200
Subject: [PATCH] Show username for logged in users

---
 frontend/App.vue   | 58 ++++++++++++++++++++++++++++++++++++----------
 templates/map.html |  1 +
 web_view.py        |  8 +++++--
 3 files changed, 53 insertions(+), 14 deletions(-)

diff --git a/frontend/App.vue b/frontend/App.vue
index 19f614d..c3e8b4f 100644
--- a/frontend/App.vue
+++ b/frontend/App.vue
@@ -1,5 +1,40 @@
 <template>
 <div>
+
+  <nav id="nav" class="navbar navbar-expand navbar-light bg-light">
+    <div class="container-fluid">
+      <a class="navbar-brand" href="/">osm.wikidata.link</a>
+      <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+        <li class="nav-item">
+          <a class="nav-link active" aria-current="page" href="#">Home</a>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link" href="#">Link</a>
+        </li>
+        <li class="nav-item dropdown">
+          <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
+            Dropdown
+          </a>
+          <ul class="dropdown-menu" aria-labelledby="navbarDropdown">
+            <li><a class="dropdown-item" href="#">Action</a></li>
+            <li><a class="dropdown-item" href="#">Another action</a></li>
+            <li><hr class="dropdown-divider"></li>
+            <li><a class="dropdown-item" href="#">Something else here</a></li>
+          </ul>
+        </li>
+        <li class="nav-item">
+          <a class="nav-link disabled" href="#" tabindex="-1" aria-disabled="true">Disabled</a>
+        </li>
+      </ul>
+      <ul class="navbar-nav">
+        <li class="nav-item">
+          <a v-if="username" class="nav-link" href="#">{{ username }}</a>
+          <a v-else class="nav-link" href="/login">Login</a>
+        </li>
+      </ul>
+    </div>
+  </nav>
+
   <div id="map">
   </div>
   <button ref="btn" id="load-btn" type="button" class="btn btn-primary btn-lg" @click="load_wikidata_items">
@@ -221,6 +256,7 @@ export default {
     startLat: Number,
     startLon: Number,
     startZoom: Number,
+    username: String,
   },
   data() {
     return {
@@ -717,26 +753,31 @@ export default {
 
 <style>
 
+#nav {
+  left: 35%;
+  width: 65%;
+}
+
 #map {
   position: absolute;
-  top: 0px;
+  top: 57px;
   bottom: 0px;
   left: 35%;
   width: 65%;
-  z-index: -1; 
+  z-index: -1;
 }
 
 #load-btn {
   position: absolute;
-  top: 20px;
-  left: 62.5%;
+  top: 77px;
+  left: 67.5%;
   transform: translate(-50%, 0);
 }
 
 #search {
   position: absolute;
   overflow: auto;
-  top: 20px;
+  top: 77px;
   left: 20px;
   bottom: 20px;
   width: 25%;
@@ -747,13 +788,6 @@ export default {
   background: lightgray !important;
 }
 
-#load-btn {
-  position: absolute;
-  top: 20px;
-  left: 62.5%;
-  transform: translate(-50%, 0);
-}
-
 #sidebar {
   position: absolute;
   background: #eee;
diff --git a/templates/map.html b/templates/map.html
index 5aaded9..c116ba6 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -21,6 +21,7 @@
         startLat: {{ lat }},
         startLon: {{ lon }},
         startZoom: {{ zoom }},
+        username: {{ username | tojson }},
       };
 
       const app = createApp(App, props).mount('#app');
diff --git a/web_view.py b/web_view.py
index c0e8d8f..628fc16 100755
--- a/web_view.py
+++ b/web_view.py
@@ -299,16 +299,20 @@ def old_map_location(zoom, lat, lng):
 def map_start_page():
     location = get_user_location()
     lat, lon = location
+
     return redirect(url_for(
         'map_location',
         zoom=16,
         lat=f'{lat:.5f}',
-        lon=f'{lon:.5f}'
+        lon=f'{lon:.5f}',
     ))
 
 @app.route("/map/<int:zoom>/<float(signed=True):lat>/<float(signed=True):lon>")
 def map_location(zoom, lat, lon):
-    return render_template("map.html", zoom=zoom, lat=lat, lon=lon)
+    user = flask_login.current_user
+    username = user.username if user.is_authenticated else None
+
+    return render_template("map.html", zoom=zoom, lat=lat, lon=lon, username=username)
 
 
 @app.route("/old_map")