From c77ae56ba088eb953ce1054288f583a953e5e2e3 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Fri, 8 Sep 2023 03:46:04 +0100
Subject: [PATCH] More steps, include link to search flickr

---
 main.py                      | 15 +++++++++++++--
 templates/flickr_search.html | 23 +++++++++++++++++++++++
 templates/wikipedia_url.html | 20 ++++++++++++++++++++
 3 files changed, 56 insertions(+), 2 deletions(-)
 create mode 100644 templates/flickr_search.html
 create mode 100644 templates/wikipedia_url.html

diff --git a/main.py b/main.py
index 3e2e2f2..345c63c 100755
--- a/main.py
+++ b/main.py
@@ -12,9 +12,20 @@ enwiki = "en.wikipedia.org/wiki/"
 
 
 @app.route("/")
-def start_form() -> str:
+def start() -> str:
     """Start form."""
-    return flask.render_template("start_form.html")
+    return flask.render_template("wikipedia_url.html")
+
+
+@app.route("/flickr")
+def flickr_search() -> str:
+    """Search flickr."""
+    wikipedia_url = flask.request.args["wikipedia"]
+    start = wikipedia_url.find(enwiki) + len(enwiki)
+    name = unquote(wikipedia_url[start:]).replace("_", " ")
+    return flask.render_template(
+        "flickr_search.html", name=name, wikipedia_url=wikipedia_url
+    )
 
 
 @app.route("/message")
diff --git a/templates/flickr_search.html b/templates/flickr_search.html
new file mode 100644
index 0000000..9a6d5be
--- /dev/null
+++ b/templates/flickr_search.html
@@ -0,0 +1,23 @@
+{% extends "base.html" %}
+
+{% block title %}Flickr mail{% endblock %}
+
+{% block content %}
+  <div class="container">
+    <h1>Flickr mail</h1>
+    <p>Wikipedia article: {{ name }}</p>
+    <p><a href="https://flickr.com/search/?view_all=1&safe_search=3&text={{ '"' + name + '"' | urlencode }}">Search flickr</a></p>
+
+    <form action="{{ url_for("show_message") }}">
+      <input type="hidden" name="wikipedia" value="{{ wikipedia_url }}"></input>
+  <div class="mb-3">
+        <label for="flickr" class="form-label">Flickr URL:</label>
+        <input type="text" class="form-control" id="flickr" name="flickr" required>
+        </div>
+
+        <input type="submit" value="Submit">
+    </form>
+
+
+  </div>
+{% endblock %}
diff --git a/templates/wikipedia_url.html b/templates/wikipedia_url.html
new file mode 100644
index 0000000..e31a938
--- /dev/null
+++ b/templates/wikipedia_url.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+
+{% block title %}Flickr mail{% endblock %}
+
+{% block content %}
+  <div class="container">
+    <div class="row">
+    <h1>Enter URLs</h1>
+    <form action="{{ url_for("flickr_search") }}">
+      <div class="mb-3">
+        <label for="wikipedia" class="form-label">Wikipedia URL:</label>
+        <input type="text" class="form-control" id="wikipedia" name="wikipedia" required>
+      </div>
+
+      <input type="submit" value="Submit">
+    </form>
+
+  </div>
+  </div>
+{% endblock %}