diff --git a/main.py b/main.py
index c85ec45..7751551 100755
--- a/main.py
+++ b/main.py
@@ -59,7 +59,7 @@ def drop_start(s: str, start: str) -> str:
@app.route("/person/", methods=["GET", "POST"])
def person(person_id: int) -> str | Response:
item = model.Person.query.get(person_id)
- if flask.request.method == "POST" and check_admin_mode():
+ if flask.request.method == "POST":
qid = flask.request.form["wikidata_qid"] or None
item.name = flask.request.form["name"]
@@ -115,7 +115,6 @@ def person(person_id: int) -> str | Response:
Event=model.Event,
plural=plural,
wikidata_hits=wikidata_hits,
- is_admin=check_admin_mode,
)
@@ -125,27 +124,13 @@ def event_page(event_id: int) -> str:
return flask.render_template("event.html", item=item)
-@app.route("/conference/", methods=["GET", "POST"])
-def conference_page(short_name: str) -> str | Response:
+@app.route("/conference/")
+def conference_page(short_name: str) -> str:
item = model.Conference.query.filter_by(short_name=short_name).one_or_none()
if item is None:
flask.abort(404)
-
- if flask.request.method == "POST" and check_admin_mode():
- item.short_name = flask.request.form["short_name"]
- item.title = flask.request.form["title"]
- database.session.commit()
-
- assert flask.request.endpoint
- return flask.redirect(
- flask.url_for(flask.request.endpoint, short_name=item.short_name)
- )
-
return flask.render_template(
- "conference.html",
- item=item,
- person_image_filename=person_image_filename,
- is_admin=check_admin_mode,
+ "conference.html", item=item, person_image_filename=person_image_filename
)
@@ -420,25 +405,6 @@ def person_image_filename(person_id: int) -> str:
return os.path.join("wikidata_photo", "thumb", person.wikidata_photo[0])
-@app.route("/login", methods=["GET", "POST"])
-def login() -> str | Response:
- """Login page."""
- if flask.request.method == "GET":
- return flask.render_template("login.html")
- password = flask.request.form["password"]
- if password != app.config["ADMIN_PASSWORD"]:
- endpoint = flask.endpoint
- return flask.redirect(endpoint)
-
- flask.session["admin_password"] = password
- return flask.redirect(flask.url_for("index"))
-
-
-def check_admin_mode() -> bool:
- """User is an admin."""
- return bool(flask.session.get("admin_password") == app.config["ADMIN_PASSWORD"])
-
-
@app.route("/github_wikidata")
def github_wikidata() -> str:
"""Look for speakers on Wikidata based on the GitHub property."""
@@ -450,8 +416,6 @@ def github_wikidata() -> str:
continue
items.append((person, qid, wd_name, photo))
- items.sort(key=lambda i: len(i[0].name))
-
return flask.render_template("github.html", items=items)
diff --git a/templates/conference.html b/templates/conference.html
index 3c58ea6..56fc448 100644
--- a/templates/conference.html
+++ b/templates/conference.html
@@ -86,21 +86,6 @@
- {% if is_admin() %}
-
- {% endif %}
-
Talks
{{ item.events.count() }} talks
diff --git a/templates/login.html b/templates/login.html
deleted file mode 100644
index efcd454..0000000
--- a/templates/login.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Conference archive{% endblock %}
-
- {% block content %}
- Conference archive
-
- Admin login.
-
-
-
-{% endblock %}
diff --git a/templates/person.html b/templates/person.html
index 786998d..d37ddde 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -45,7 +45,7 @@
{% endif %}
- {% if is_admin() %}
+ {% if config.ADMIN_MODE %}
{% set search_for = item.name + ' ' + " haswbstatement:P31=Q5" %}
Search for {{ item.name }} on Wikidata