diff --git a/library/page.py b/library/page.py index 7a9d1ae..c26f9fe 100644 --- a/library/page.py +++ b/library/page.py @@ -3,7 +3,7 @@ import flask from flask import render_template - +from rnrfeed.rnrfeeder import getentries from csvparser.csvparser import ( getlicenses, getpublications, @@ -40,10 +40,11 @@ def show_book(publicationID): return render_template("publication.html", fullpublication=fullpublication) -@APP.route("/") -def upload_book(publication): - """upload a new book, still needs to be made""" - return render_template("upload.html") +@APP.route("/pastevents") +def pastevents(): + """show past events and book recommendations""" + events = getentries() + return render_template("pastevents.html", events=events) if __name__ == "__main__": diff --git a/library/rnrfeed/rnrfeeder.py b/library/rnrfeed/rnrfeeder.py index 9cc0f35..a05b7d1 100644 --- a/library/rnrfeed/rnrfeeder.py +++ b/library/rnrfeed/rnrfeeder.py @@ -7,7 +7,7 @@ feed = parse("http://varia.zone/en/feeds/all-en.rss.xml") def getentries(): entries = {} for entry in feed.entries: - if "Read & Repair" in entry.title: + if "readrepair" in entry.category: entries[entry.title] = entry.description return entries @@ -15,25 +15,29 @@ def getentries(): def gettitles(): titles = [] for entry in feed.entries: - if "Read & Repair" in entry.title: + if "readrepair" in entry.category: titles.append(entry.title) return titles -def rabbithole(): - entries = getentries() +def rabbithole(entry): + pubtitles = [] fieldsofinterest = getfieldsofinterest() - for title, entry in entries.items(): - entry = entry.lower() - for id, fields in fieldsofinterest.items(): - if [f for f in fields if(f.lower() in entry)]: - publicationinfo = getfullpublication(id) - pubtitle = publicationinfo["Title"] - print( - "After {0} we recommend reading {1}".format( - title, - pubtitle) - ) - - -print(rabbithole()) + entry = entry.lower() + for id, fields in fieldsofinterest.items(): + if [f for f in fields if(f.lower() in entry)]: + publicationinfo = getfullpublication(id) + pubtitle = publicationinfo["Title"] + pubtitles.append(pubtitle) + return pubtitles + + +def getevents(): + events = getentries() + for entry in events: + titles = rabbithole(entry) + print(titles) + return events + + +# print(rabbithole()) diff --git a/library/static/css/style.css b/library/static/css/style.css index e7bb5dc..734a88d 100644 --- a/library/static/css/style.css +++ b/library/static/css/style.css @@ -75,6 +75,19 @@ body:after { margin-top: 3em; } +.event { + margin: 0 1em 1em; + max-width: 90%; + margin-top: 3em; + padding: 6px; + display: block; + border: 3px solid black; + background-color: #f1f1f1; + border-spacing: 0; + border-collapse: collapse; + z-index: 10; +} + button { z-index: 10; border: 3px solid black; diff --git a/library/templates/base.html b/library/templates/base.html index d8beacb..04fa801 100644 --- a/library/templates/base.html +++ b/library/templates/base.html @@ -17,8 +17,8 @@

VARIA LIBRARY COLLECTION

- - + + {% block main %} {% endblock main %} diff --git a/library/templates/events.html b/library/templates/events.html deleted file mode 100644 index e69de29..0000000 diff --git a/library/templates/pastevents.html b/library/templates/pastevents.html new file mode 100644 index 0000000..4b64c67 --- /dev/null +++ b/library/templates/pastevents.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% block main %} + +{% for title, text in events.items() %} +
+

{{ title }}

+ {{ text|safe }} +
+{% endfor%} +{% endblock %}