diff --git a/feedtools.py b/feedtools.py index 536648e..c1b97f9 100644 --- a/feedtools.py +++ b/feedtools.py @@ -16,11 +16,10 @@ def update(): parsed = feedparser.parse(feed) x = str(x) - print(parsed) - tmp['feeds'][x] = {} tmp['feeds'][x]['title'] = parsed.feed.title tmp['feeds'][x]['link'] = parsed.feed.link + tmp['feeds'][x]['rss'] = parsed.entries[0].title_detail.base tmp['feeds'][x]['description'] = parsed.feed.description for post in parsed.entries: @@ -35,6 +34,7 @@ def update(): post['feed_details'] = {} post['feed_details']['title'] = parsed.feed.title post['feed_details']['link'] = parsed.feed.link + post['feed_details']['rss'] = parsed.entries[0].title_detail.base post['feed_details']['description'] = parsed.feed.description tmp['all_posts_sorted'][str(post_date)].append(post) diff --git a/static/css/stylesheet.css b/static/css/stylesheet.css index aeea20b..6294974 100644 --- a/static/css/stylesheet.css +++ b/static/css/stylesheet.css @@ -1,6 +1,6 @@ body{ - background-color: pink; - /*color: red;*/ + background-color: #e1cfd9; + color: #7137c8ff; margin: 1em; font-size: 16px; line-height: 1.6; @@ -12,38 +12,64 @@ h1#title{ margin: 1em auto; } h1#title img{ - width: 500px; + width: 90%; + max-width: 500px; +} + +h1{ + text-align: center; + margin: 3em auto 0; } h2{ margin: 0 0 1em; } -table{ - table-layout: fixed; - width: 100%; - border-collapse: collapse; -} -table tr{ - border-bottom: 20px solid white; -} -table td{ - padding: 1em 2em; - vertical-align: top; -} -table td:first-of-type{ - width: 100px; +div.add{ + color: blue; + margin: 2em auto; + text-align: center; } +section#feeds{ + margin: 5em 0; + text-align: center; +} + section#feeds div.feed{ + padding: 1em 2em; + border-bottom: 20px solid white; + } + section#feeds div.feed.el0{ + border-top: 20px solid white; + } + section#feeds div.feed div{ + margin: 1em auto; + } + section#feeds div.feed div.description{ + max-width: 400px; + } section#api{ - margin: 6em 0em; - color: fuchsia; + margin: 5em 0; } -section#api div.accesspoint{ - margin: 0; - padding: 1em 2em; - border-bottom: 20px solid black; + section#api div.accesspoint{ + padding: 1em 2em; + border-bottom: 20px solid #aa87deff; + } + section#api div.accesspoint:first-of-type{ + border-top: 20px solid #aa87deff; + } + +footer{ + font-size: small; + text-align: center; + margin: 3em 0; } +p{ + color: blue; + font-size: small; + margin: 2em auto 3em; + max-width: 400px; +} a, a:active, a:visited, diff --git a/static/img/multifeeder.svg b/static/img/multifeeder.svg index 7436ea7..2292f1d 100644 --- a/static/img/multifeeder.svg +++ b/static/img/multifeeder.svg @@ -38,10 +38,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.4" - inkscape:cx="362.93895" - inkscape:cy="176.11126" + inkscape:cx="357.9433" + inkscape:cy="191.03438" inkscape:document-units="mm" - inkscape:current-layer="layer1" + inkscape:current-layer="text835" inkscape:document-rotation="0" showgrid="false" width="100mm" @@ -66,16 +66,109 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> - multifeeder + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/templates/index.html b/templates/index.html index 5131ac0..3e1add9 100644 --- a/templates/index.html +++ b/templates/index.html @@ -4,31 +4,27 @@ multifeeder +

-
(Add a feed)
-
Currently feeding:
-
-
- - +
(Add a feed)
+
+

Currently feeding

+

The following feeds are rendered in the Multifeeder. The feeds in this list include streams of projects and activities in and around Varia.

{% for x, feed in db['feeds'].items() %} -
- - - - +
+
{{ feed.title }}
+
{{ feed.description }}
+
{{ feed.rss }}
+
{% endfor %} - -
{{ feed.title }}{{ feed.description }}
-
-
- - +
+

Aggregated Publishing Interface (API)

+

This is the Multifeeder API :---), an Aggregated Publishing Interface supporting any kinds of publishing experiments. Currently the API is used to feed Varia's TeleVex.

/API/latest/[num]

For example: https://multi.vvvvvvaria.org/API/latest/5 @@ -54,5 +50,8 @@ Format: JSON
+ \ No newline at end of file