diff --git a/library/rnrfeed/rnrfeeder.py b/library/rnrfeed/rnrfeeder.py index 35405d7..9cc0f35 100644 --- a/library/rnrfeed/rnrfeeder.py +++ b/library/rnrfeed/rnrfeeder.py @@ -1,8 +1,6 @@ from feedparser import parse - from csvparser.csvparser import getfieldsofinterest, getfullpublication - feed = parse("http://varia.zone/en/feeds/all-en.rss.xml") @@ -26,8 +24,9 @@ def rabbithole(): entries = getentries() 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 in entry)]: + if [f for f in fields if(f.lower() in entry)]: publicationinfo = getfullpublication(id) pubtitle = publicationinfo["Title"] print( diff --git a/library/static/css/bookmark.css b/library/static/css/bookmark.css new file mode 100644 index 0000000..1746b3b --- /dev/null +++ b/library/static/css/bookmark.css @@ -0,0 +1,16 @@ +#pastevents{ + position: fixed; + top: -1em; + right: 3em; + height: 14em; +} + +#upcomingevents{ + position: fixed; + top: -2.5em; + right: 6em; + height: 14em; +} +#pastevents:hover{ + z-index: 1; +} diff --git a/library/static/css/style.css b/library/static/css/style.css index 5e8a999..e7bb5dc 100644 --- a/library/static/css/style.css +++ b/library/static/css/style.css @@ -71,6 +71,10 @@ body:after { color: black; } +#publication { + margin-top: 3em; +} + button { z-index: 10; border: 3px solid black; diff --git a/library/static/images/image-11.jpg b/library/static/images/image-11.jpg deleted file mode 100644 index 89a5390..0000000 Binary files a/library/static/images/image-11.jpg and /dev/null differ diff --git a/library/static/images/image-16.jpg b/library/static/images/image-16.jpg deleted file mode 100644 index f18bd97..0000000 Binary files a/library/static/images/image-16.jpg and /dev/null differ diff --git a/library/static/images/image-2.jpg b/library/static/images/image-2.jpg deleted file mode 100644 index 34daf86..0000000 Binary files a/library/static/images/image-2.jpg and /dev/null differ diff --git a/library/static/images/image-22.jpg b/library/static/images/image-22.jpg deleted file mode 100644 index 0d4b057..0000000 Binary files a/library/static/images/image-22.jpg and /dev/null differ diff --git a/library/static/images/image-42.jpg b/library/static/images/image-42.jpg deleted file mode 100644 index ff95f19..0000000 Binary files a/library/static/images/image-42.jpg and /dev/null differ diff --git a/library/static/images/image-5.jpg b/library/static/images/image-5.jpg deleted file mode 100644 index 41a89bb..0000000 Binary files a/library/static/images/image-5.jpg and /dev/null differ diff --git a/library/static/images/image-60.jpg b/library/static/images/image-60.jpg deleted file mode 100644 index 65d6931..0000000 Binary files a/library/static/images/image-60.jpg and /dev/null differ diff --git a/library/static/images/image-7.jpg b/library/static/images/image-7.jpg deleted file mode 100644 index afe27c0..0000000 Binary files a/library/static/images/image-7.jpg and /dev/null differ diff --git a/library/static/images/image-8.jpg b/library/static/images/image-8.jpg deleted file mode 100644 index 1907d26..0000000 Binary files a/library/static/images/image-8.jpg and /dev/null differ diff --git a/library/static/svg/bookmark-past.svg b/library/static/svg/bookmark-past.svg new file mode 100644 index 0000000..1da2729 --- /dev/null +++ b/library/static/svg/bookmark-past.svg @@ -0,0 +1,73 @@ + +image/svg+xml + + + +Past Events diff --git a/library/static/svg/bookmark-svgrepo-com.svg b/library/static/svg/bookmark-svgrepo-com.svg new file mode 100644 index 0000000..2862af1 --- /dev/null +++ b/library/static/svg/bookmark-svgrepo-com.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/library/static/svg/bookmark-upcoming.svg b/library/static/svg/bookmark-upcoming.svg new file mode 100644 index 0000000..b75f396 --- /dev/null +++ b/library/static/svg/bookmark-upcoming.svg @@ -0,0 +1,87 @@ + +image/svg+xml + + + +UpcomingRead & Repair diff --git a/library/templates/base.html b/library/templates/base.html index 3868192..d8beacb 100644 --- a/library/templates/base.html +++ b/library/templates/base.html @@ -5,6 +5,7 @@ varia library zone +
@@ -16,6 +17,8 @@

VARIA LIBRARY COLLECTION

+ + {% block main %} {% endblock main %} diff --git a/library/templates/events.html b/library/templates/events.html new file mode 100644 index 0000000..e69de29 diff --git a/library/templates/publication.html b/library/templates/publication.html index 6697d58..be9039c 100644 --- a/library/templates/publication.html +++ b/library/templates/publication.html @@ -4,7 +4,7 @@ - +
Title of publication