From 0e37348e146fc34e80d534b1eaf6ed61339538ee Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 08:50:43 +0100
Subject: [PATCH 1/7] Don't try and built search with Postgres

---
 confarchive/model.py | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/confarchive/model.py b/confarchive/model.py
index 9949275..6fc4561 100644
--- a/confarchive/model.py
+++ b/confarchive/model.py
@@ -5,9 +5,8 @@ import typing
 
 import sqlalchemy
 import sqlalchemy.orm.decl_api
-from sqlalchemy import Index, func, text
+from sqlalchemy import func
 from sqlalchemy.dialects import postgresql
-from sqlalchemy.dialects.postgresql import TSVECTOR
 from sqlalchemy.ext.associationproxy import association_proxy
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.ext.orderinglist import ordering_list
@@ -172,22 +171,6 @@ class Event(TimeStampedModel):
     event_type = Column(String)
     url = Column(String)
     cancelled = Column(Boolean)
-    search_vector = Column(TSVECTOR)
-
-    trigger = text(
-        """
-        CREATE TRIGGER event_vector_update BEFORE INSERT OR UPDATE
-        ON event FOR EACH ROW EXECUTE FUNCTION
-        tsvector_update_trigger(search_vector, 'pg_catalog.english', title, abstract, description);
-        """
-    )
-
-    Index(
-        "event_search_vector_idx",
-        search_vector,
-        postgresql_using="gin",
-        postgresql_ops={"abstract_search_vector": "gin_trgm_ops"},
-    )
 
     conference = relationship("Conference", back_populates="events")
 

From a7e2d1706327e29cf5454ebff34b3560084cd3f7 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 08:51:34 +0100
Subject: [PATCH 2/7] Show photos next to speaker name.

---
 templates/top_speakers.html | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/templates/top_speakers.html b/templates/top_speakers.html
index ff3b533..b8ed59d 100644
--- a/templates/top_speakers.html
+++ b/templates/top_speakers.html
@@ -26,10 +26,30 @@
   .container {
     position: relative;
   }
+
+
+  .person {
+    display: flex;
+    align-items: top;
+    margin-bottom: 10px;
+  }
+
+  .info {
+    flex: 1; /* Allow text to take remaining space */
+    padding-right: 10px; /* Add spacing between text and image */
+  }
+
+  img.photo {
+    max-width: 120px; /* Set max width for images */
+    height: auto; /* Maintain image aspect ratio */
+  }
+</style>
+
+
 </style>
 {% endblock %}
 
-{% set show_images = True %}
+{% set show_images = False %}
 
 {% block title %}Conference archive{% endblock %}
 
@@ -88,16 +108,20 @@
     {% if loop.first or loop.previtem[1] != count %}
     <h4>{{ count }} conferences</h4>
     {% endif %}
-    <div>
-      <span id="person-{{ person.id }}">
+    <div class="person">
+      {% set photo = person.photo_filename() %}
+      <span class="info" id="person-{{ person.id }}">
       👤
-      <a href="{{ url_for("person", person_id=person.id) }}">{{ person.name }}</a>
+      <a href="{{ url_for("person", person_id=person.id) }}">{{ person.name }}</a><br>
       ({{ count }} conferences, {{ person.event_count }} talks)
       {% if person.photo_filename() %}📷{% endif %}
       {% if person.wikidata_qid %}
       <a href="https://www.wikidata.org/wiki/{{ person.wikidata_qid }}">Wikidata</a>
       {% endif %}
       </span>
+      {% if photo %}
+      <img class="photo" src="{{ url_for("static", filename=photo) }}" alt="{{ person.name }}">
+      {% endif %}
     </div>
     {% endfor %}
 

From 2cf5dbb22ebfce64ad9eba79821c2f881113eb17 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 08:52:29 +0100
Subject: [PATCH 3/7] Remove unused code.

---
 templates/top_speakers.html | 75 +------------------------------------
 1 file changed, 1 insertion(+), 74 deletions(-)

diff --git a/templates/top_speakers.html b/templates/top_speakers.html
index b8ed59d..183d550 100644
--- a/templates/top_speakers.html
+++ b/templates/top_speakers.html
@@ -1,33 +1,7 @@
 {% extends "base.html" %}
 
 {% block style %}
-<script src="{{ url_for("static", filename="leader-line.min.js") }}"></script>
 <style>
-  .right-images {
-  position: absolute;
-  right: -280px;
-  top: 0;
-  width: 120px;
-  }
-
-  .left-images {
-  position: absolute;
-  right: -140px;
-  top: 0;
-  width: 120px;
-  }
-
-
-
-  .image {
-      max-width: 100%;
-  }
-
-  .container {
-    position: relative;
-  }
-
-
   .person {
     display: flex;
     align-items: top;
@@ -54,7 +28,7 @@
 {% block title %}Conference archive{% endblock %}
 
   {% block content %}
-  <div class="container">
+  <div>
 
   {% if show_images %}
 
@@ -127,50 +101,3 @@
 
 </div>
 {% endblock %}
-
-{% block script %}
-{% if show_images %}
-<script>
-  {# var person_ids = {{ photo_person_ids | tojson }}; #}
-  var left = {{ left | tojson }};
-  var right = {{ right | tojson }};
-var lines = {};
-
-window.addEventListener('load', function() {
-
-  for(var i =0; i < left.length; i++) {
-    var id = left[i];
-    var person = document.getElementById('person-' + id);
-    var image = document.getElementById('image-' + id);
-
-    var line = new LeaderLine(LeaderLine.mouseHoverAnchor(person, 'draw'), image);
-    line.setOptions({startSocket: 'right', endSocket: 'left', path: 'fluid'});
-
-    var line2 = new LeaderLine(LeaderLine.mouseHoverAnchor(image, 'draw'), person);
-    line2.setOptions({startSocket: 'left', endSocket: 'right', path: 'fluid'});
-
-
-    // lines[id] = line;
-  }
-
-  for(var i =0; i < right.length; i++) {
-    var id = right[i];
-    var person = document.getElementById('person-' + id);
-    var image = document.getElementById('image-' + id);
-
-    var line = new LeaderLine(LeaderLine.mouseHoverAnchor(person, 'draw'), image);
-    line.setOptions({startSocket: 'right', endSocket: 'left', path: 'fluid'});
-
-    var line2 = new LeaderLine(LeaderLine.mouseHoverAnchor(image, 'draw'), person);
-    line2.setOptions({startSocket: 'left', endSocket: 'right', path: 'fluid'});
-
-    // lines[id] = line;
-  }
-
-
-
-});
-
-</script>
-{% endif %}
-{% endblock %}

From e6647a642551121b0cfc6ce235e564589318d533 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 09:21:16 +0100
Subject: [PATCH 4/7] Admin mode needed for some features

---
 main.py                      | 4 ++++
 templates/navbar.html        | 4 +++-
 templates/person.html        | 7 ++++---
 templates/search_people.html | 5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/main.py b/main.py
index b099df6..35fe72b 100755
--- a/main.py
+++ b/main.py
@@ -182,6 +182,8 @@ def search_people() -> str:
 
 @app.route("/merge", methods=["GET", "POST"])
 def merge() -> str | Response:
+    assert app.config["ADMIN_MODE"]
+
     if flask.request.method == "POST":
         search_for = flask.request.form["q"]
 
@@ -407,6 +409,8 @@ def search_everything() -> str:
 
 @app.route("/person/<int:person_id>/delete", methods=["POST"])
 def delete_person(person_id: int) -> str | Response:
+    assert app.config["ADMIN_MODE"]
+
     item = model.Person.query.get(person_id)
 
     for cp in item.conferences_association:
diff --git a/templates/navbar.html b/templates/navbar.html
index c858ae0..eca8885 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -1,7 +1,9 @@
 <p>
   <form action="{{ url_for("search_people") }}">
-  <a href="{{ url_for("index") }}">home</a>
+  <a href="{{ url_for("index") }}">conferences</a>
+  {#
   | <a href="{{ url_for("events_page") }}">events</a>
+  #}
   | <a href="{{ url_for("top_speakers_page") }}">speakers</a>
 
       <input type="text" class="form-control" placeholder="speaker name" name="q" id="q">
diff --git a/templates/person.html b/templates/person.html
index 191eaad..d37ddde 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -21,8 +21,8 @@
 
 
   {% block content %}
-  <div class="container">
-    <div class="row">
+  <div>
+    <div>
 
   {% set photo = item.photo_filename() %}
   {% if photo %}
@@ -45,7 +45,7 @@
   {% endif %}
   </p>
 
-
+  {% if config.ADMIN_MODE %}
   {% set search_for = item.name + ' ' + " haswbstatement:P31=Q5" %}
   <p><a href="https://www.wikidata.org/w/index.php?search={{ search_for | urlencode }}&title=Special%3ASearch&ns0=1&ns120=1">Search for {{ item.name }} on Wikidata</a></p>
 
@@ -80,6 +80,7 @@
   <p>No similar names found on Wikidata</p>
   {% endif %}
   {% endif %}
+  {% endif %}
 
   {% set bio_source = item.bio_source() %}
   {% if bio_source %}
diff --git a/templates/search_people.html b/templates/search_people.html
index bb1572b..aabe7fe 100644
--- a/templates/search_people.html
+++ b/templates/search_people.html
@@ -17,9 +17,12 @@
     </form>
 
     <p>
-    Found {{ q.count() }} people matching '{{ search_for }}'
+    {% set count = q.count() %}
+    Found {{ count }} people matching '{{ search_for }}'
 
+    {% if config.ADMIN_MODE and count %}
     <a href="{{ url_for("merge", q=search_for) }}">merge</a>
+    {% endif %}
     </p>
 
 <ul>

From f3f570063f9ad029fec9d0de28bfbaa36605be5e Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 09:22:20 +0100
Subject: [PATCH 5/7] Improvements

---
 templates/index.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index a02dbf0..c5c8634 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -25,8 +25,9 @@
       📍
       {{ "{:,d}".format(count.venue) }} venues<br/>
       🎤
-      {{ "{:,d}".format(count.event) }} talks -
-      <a href="{{ url_for("events_page") }}">most common titles</a><br/>
+      {{ "{:,d}".format(count.event) }} talks {# -
+      <a href="{{ url_for("events_page") }}">most common titles</a> #}
+      <br/>
       👤
       {{ "{:,d}".format(count.person) }} speakers
       <a href="{{ url_for("top_speakers_page") }}">top speakers</a><br/>

From c4eec7bb7312da486f1a2d38697a73444f9d7266 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 09:23:27 +0100
Subject: [PATCH 6/7] Improve

---
 templates/index.html | 115 ++++++++++++++++++-------------------------
 1 file changed, 49 insertions(+), 66 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index c5c8634..393876a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -2,75 +2,58 @@
 
 {% block title %}Conference archive{% endblock %}
 
-  {% block content %}
-  <div class="container">
-    <div class="row">
-    <h1>Conference archive</h1>
+{% block content %}
+<div>
+  <h1>Conference archive</h1>
 
+  <div style="margin-bottom:1rem">
+    👥
+    {{ "{:,d}".format(count.conference) }} conferences<br/>
+    🌍
+    {{ "{:,d}".format(count.country) }} countries<br/>
+    📍
+    {{ "{:,d}".format(count.venue) }} venues<br/>
+    🎤
+    {{ "{:,d}".format(count.event) }} talks<br/>
+    👤
+    {{ "{:,d}".format(count.person) }} speakers
+    <a href="{{ url_for("top_speakers_page") }}">top speakers</a><br/>
+  </div>
+
+  <h2>Conferences</h2>
+
+  {% for item in items %}
+  {% if loop.first or item.start.year != loop.previtem.start.year %}
+  <h3>{{ item.start.year }}</h3>
+  {% endif %}
+
+  <div style="margin-bottom:1.5rem">
+    👥
+    <a href="{{ url_for("conference_page", short_name=item.short_name) }}">{{ item.title }}</a>
+    📅
+    {{ item.start.strftime("%d %b %Y") }}
+    <br/>
+    {% if item.venue %}
+      📍
+      {{ item.venue.name }}
+      &ndash;
+      {{ item.venue.city.name }},
+      {{ item.venue.city.country.name }}
+      {{ item.venue.city.country.flag }}
+    <br/>
+    {% endif %}
     {#
-    <form action="{{ url_for("search_people") }}">
-      <div class="mb-3">
-        <label for="q" class="form-label">speaker name</label>
-        <input type="text" class="form-control" name="q" id="q">
-      </div>
-      <button type="submit" class="btn btn-primary">Search</button>
-    </form>
+    {% if item.series %}
+    📃 Series: {{ item.series.name }}
+    <br/>
+    {% endif %}
     #}
 
-    <div style="margin-bottom:1rem">
-      👥
-      {{ "{:,d}".format(count.conference) }} conferences<br/>
-      🌍
-      {{ "{:,d}".format(count.country) }} countries<br/>
-      📍
-      {{ "{:,d}".format(count.venue) }} venues<br/>
-      🎤
-      {{ "{:,d}".format(count.event) }} talks {# -
-      <a href="{{ url_for("events_page") }}">most common titles</a> #}
-      <br/>
-      👤
-      {{ "{:,d}".format(count.person) }} speakers
-      <a href="{{ url_for("top_speakers_page") }}">top speakers</a><br/>
-    </div>
-
-    <h2>Conferences</h2>
-
-    {% for item in items %}
-    {% if loop.first or item.start.year != loop.previtem.start.year %}
-    <h3>{{ item.start.year }}</h3>
-    {% endif %}
-
-    <div style="margin-bottom:1.5rem">
-      👥
-      <a href="{{ url_for("conference_page", short_name=item.short_name) }}">{{ item.title }}</a>
-      📅
-      {{ item.start.strftime("%d %b %Y") }}
-      <br/>
-      {% if item.venue %}
-        📍
-        {{ item.venue.name }}
-        &ndash;
-        {{ item.venue.city.name }},
-        {{ item.venue.city.country.name }}
-        {{ item.venue.city.country.flag }}
-      <br/>
-      {% endif %}
-      {#
-      {% if item.series %}
-      📃 Series: {{ item.series.name }}
-      <br/>
-      {% endif %}
-      #}
-
-      {{ (item.end - item.start).days + 1 }} days,
-      {{ item.events.count() }} talks,
-      {{ item.people_detail.count() }} speakers<br/>
-    </div>
-    {% endfor %}
-    </table>
-
-  </div>
+    {{ (item.end - item.start).days + 1 }} days,
+    {{ item.events.count() }} talks,
+    {{ item.people_detail.count() }} speakers<br/>
   </div>
+  {% endfor %}
+
+</div>
 {% endblock %}
-
-

From 59878c16a72eaa34b8b9c186db3c2c4ff37737ba Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Sun, 24 Sep 2023 09:23:56 +0100
Subject: [PATCH 7/7] Improve

---
 templates/navbar.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/navbar.html b/templates/navbar.html
index eca8885..600cde8 100644
--- a/templates/navbar.html
+++ b/templates/navbar.html
@@ -1,9 +1,6 @@
 <p>
   <form action="{{ url_for("search_people") }}">
   <a href="{{ url_for("index") }}">conferences</a>
-  {#
-  | <a href="{{ url_for("events_page") }}">events</a>
-  #}
   | <a href="{{ url_for("top_speakers_page") }}">speakers</a>
 
       <input type="text" class="form-control" placeholder="speaker name" name="q" id="q">