From 055f128639b84731734f795f2a6f1b7b2b7a00d8 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 24 Oct 2018 20:10:53 +0200
Subject: [PATCH 1/3] first version with blog posts

---
 rowers/templates/frontpage.html      | 66 ++++++++++++++++++++------
 rowers/templates/frontpageblogs.html | 17 +++++++
 rowers/templatetags/rowerfilters.py  |  2 +-
 rowers/views.py                      | 71 ++++++++++++++++++++++++++++
 rowsandall_app/urls.py               |  1 +
 rowsandall_app/views.py              | 14 ++----
 static/css/rowsandall2.css           | 22 +++++++++
 7 files changed, 166 insertions(+), 27 deletions(-)
 create mode 100644 rowers/templates/frontpageblogs.html

diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index 1d7112b2..c97b38e2 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -92,6 +92,16 @@
   <li class="grid_5">
     <p class="midden">and more</p>
   </li>
+  <li class="grid_5">
+    <div class="midden">
+      <img src="/static/img/horizontal_line.png"
+           alt="horizontal line">
+      </div>
+  </li>    
+</ul>
+<ul class="main-content" id="id_blogs">
+</ul>
+<ul class="main-content">
   <li>
     &nbsp;
   </li>
@@ -119,21 +129,47 @@
 
         
 
-    <p class="midden">
-      Compatible with:
-      <img src="/static/img/stravasquare.png" alt="Strava icon" width="30" height="30">
-      <img src="/static/img/sporttrackssquare.png" alt="SportTracks icon" width="30" height="30">
-      <img src="/static/img/c2square.jpg" alt="C2 icon" width="30" height="30">
-      <img src="/static/img/nksquare.png" alt="NK icon" width="30" height="30">
-      <img src="/static/img/cnsquare.png" alt="CrewNerd icon" width="30" height="30">
-      <img src="/static/img/rimsquare.png" alt="RiM icon" width="30" height="30">
-      <img src="/static/img/rpsquare.png" alt="RowPro icon" width="30" height="30">
-      <img src="/static/img/essquare.png" alt="ErgStick icon" width="30" height="30">
-      <img src="/static/img/bcsquare.png" alt="BoatCoach icon" width="30" height="30">
-      <img src="/static/img/pssquare.png" alt="PainSled icon" width="30" height="30">
-      <img src="/static/img/coxmate.png" alt="CoxMate icon" width="30" height="30">
-      <img src="/static/img/ritmo_logo.gif" alt="RitmoTime icon" width="30" height="30">
-    </p>
+<p class="midden">
+  Compatible with:
+  <img src="/static/img/stravasquare.png" alt="Strava icon" width="30" height="30">
+  <img src="/static/img/sporttrackssquare.png" alt="SportTracks icon" width="30" height="30">
+  <img src="/static/img/c2square.jpg" alt="C2 icon" width="30" height="30">
+  <img src="/static/img/nksquare.png" alt="NK icon" width="30" height="30">
+  <img src="/static/img/cnsquare.png" alt="CrewNerd icon" width="30" height="30">
+  <img src="/static/img/rimsquare.png" alt="RiM icon" width="30" height="30">
+  <img src="/static/img/rpsquare.png" alt="RowPro icon" width="30" height="30">
+  <img src="/static/img/essquare.png" alt="ErgStick icon" width="30" height="30">
+  <img src="/static/img/bcsquare.png" alt="BoatCoach icon" width="30" height="30">
+  <img src="/static/img/pssquare.png" alt="PainSled icon" width="30" height="30">
+  <img src="/static/img/coxmate.png" alt="CoxMate icon" width="30" height="30">
+  <img src="/static/img/ritmo_logo.gif" alt="RitmoTime icon" width="30" height="30">
+</p>
 
 
 {% endblock %}
+
+{%  block scripts %}
+<script type='text/javascript'
+        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+
+<script>
+$( document ).ready(function() {
+console.log('loading script');
+$.getJSON(window.location.protocol + '//'+window.location.host + '/getblogs', function(data) {
+var html = '';
+console.log(data);
+$.each(data, function(key, blog) {
+console.log(blog.title);
+    html += '<li class="frontitem">';
+    html += '<h3 class="midden">'+blog.title+'</h3>';
+    html += '<a href="'+blog.link+'">';
+    html += '<p class="midden"><img src="'+blog.image+'" height=150px;></p>';
+    html += '</a>';
+    html += blog.excerpt+'</li>';
+$("#id_blogs").html(html);
+});
+      });
+});
+</script>
+{% endblock %}
diff --git a/rowers/templates/frontpageblogs.html b/rowers/templates/frontpageblogs.html
new file mode 100644
index 00000000..dd65e3ff
--- /dev/null
+++ b/rowers/templates/frontpageblogs.html
@@ -0,0 +1,17 @@
+{% load staticfiles %}
+{% load rowerfilters %}
+
+{% for blog in blogposts %}
+<li class="frontitem">
+  <h3 class="midden">{{ blog.title|safe }}</h3>
+    <p class="midden">
+      <img src={{ blog.image }} height=150px;>
+    </p>
+{{ blog.excerpt|safe }}
+  <p class="midden">
+    <a href={{ blog.link }}>
+      read more
+    </a>
+  </p>
+</li>
+{% endfor %}
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py
index 9456bded..cad2e1f6 100644
--- a/rowers/templatetags/rowerfilters.py
+++ b/rowers/templatetags/rowerfilters.py
@@ -135,7 +135,7 @@ def courselength(course):
 def jsdict(dict,key):
     s = dict.get(key)
     return mark_safe(json.dumps(s))
-    
+
 @register.filter
 def lookup(dict, key):
     s = dict.get(key)
diff --git a/rowers/views.py b/rowers/views.py
index 9bfbde2c..ec9389ff 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -25,8 +25,12 @@ from pyparsing import ParseException
 from uuid import uuid4
 import codecs
 import isodate
+import re
+import cgi
+
 
 from django.shortcuts import render
+from django.template.loader import render_to_string
 
 from django.views.generic.edit import UpdateView,DeleteView
 
@@ -654,6 +658,73 @@ def get_thumbnails(request,id):
         
     return JSONResponse(charts)
 
+
+def get_blog_posts(request):
+    response = requests.get(
+        'https://analytics.rowsandall.com/wp-json/wp/v2/posts')
+    if response.status_code == 200:
+        blogs_json = response.json()
+        #        with open('blogs.txt','w') as o:
+        #            o.write(json.dumps(blogs_json,indent=2,sort_keys=True))
+    else:
+        blogs_json = []
+
+    blogposts = []
+
+    
+    for postdata in blogs_json[0:5]:
+        try:
+            featuredmedia = postdata['featured_media']
+            url = 'https://analytics.rowsandall.com/wp-json/wp/v2/media/%d' % featuredmedia
+            response = requests.get(url)
+                
+            if response.status_code == 200:
+                image_json = response.json()
+                image_url = image_json[
+                    'media_details'
+                ][
+                    'sizes'
+                ][
+                    'thumbnail'
+                ][
+                    'source_url'
+                ]
+        except KeyError:
+            image_url = ''
+            
+
+        title = cgi.escape(postdata['title']['rendered']).encode(
+            'ascii','xmlcharrefreplace')
+
+        excerpt = postdata['excerpt']['rendered'].encode(
+            'ascii','xmlcharrefreplace')
+
+        ptester = re.compile('\<p\>(\w.*)\<\/p\>')
+        excerpt_first = ptester.match(excerpt).group(1)
+        
+        thedict = {
+            'title': title,
+            'author': '',
+            'image': image_url,
+            'excerpt': excerpt_first,
+            'link': postdata['link'],
+            }
+
+        blogposts.append(thedict)
+
+    return JSONResponse(blogposts)
+#    html = render_to_string('frontpageblogs.html',
+#                            {
+#                                'blogposts':blogposts,
+#                                }
+#                            )
+
+
+#    return JSONResponse({'html':html})
+
+
+
+
 @login_required()
 def deactivate_user(request):
     pk = request.user.id
diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py
index 66771e86..d824ae0e 100644
--- a/rowsandall_app/urls.py
+++ b/rowsandall_app/urls.py
@@ -58,6 +58,7 @@ urlpatterns += [
     url(r'^admin/', admin.site.urls),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),
     url(r'^$',rootview),
+    url(r'^getblogs$',rowersviews.get_blog_posts),
     url(r'^login/',auth_views.login, name='login'),
     url(r'^logout/$',auth_views.logout,
         {'next_page': '/'},
diff --git a/rowsandall_app/views.py b/rowsandall_app/views.py
index 72ff85b4..e439e787 100644
--- a/rowsandall_app/views.py
+++ b/rowsandall_app/views.py
@@ -1,4 +1,5 @@
 from django.shortcuts import render, redirect, render_to_response
+from django.template.loader import render_to_string
 from django.template import RequestContext
 from django.conf import settings
 from rowers.forms import LoginForm
@@ -6,9 +7,9 @@ from django.http import HttpResponse
 
 from rowingdata import main as rmain
 
-import requests
-import json
+
 import random
+    
 
 def rootview(request):
     magicsentence = rmain()
@@ -56,15 +57,6 @@ def rootview(request):
         'text':'Rowsandall.com is the ideal platform for remote rowing coaching. As a coach, you can easily manage your athletes, set up plans and monitor execution and technique'
         }
     
-    response = requests.get(
-        'https://analytics.rowsandall.com/wp-json/wp/v2/posts')
-    if response.status_code == 200:
-        blogs_json = response.json()
-        #        with open('blogs.txt','w') as o:
-        #            o.write(json.dumps(blogs_json,indent=2,sort_keys=True))
-    else:
-        blogs_json = []
-
 
     
     allofferings = [
diff --git a/static/css/rowsandall2.css b/static/css/rowsandall2.css
index 329faf27..b8bd8ecf 100644
--- a/static/css/rowsandall2.css
+++ b/static/css/rowsandall2.css
@@ -324,6 +324,28 @@ th.rotate > div > span {
     z-index: -1;
 }
 
+.vignet2 {
+    border-radius: 50%;
+    width: 200px;
+    height: 200px;
+    display: block;
+    overflow: hidden;
+    padding: 5px;
+    margin: 5px;
+    -webkit-box-shadow: inset 0px 0px 85px rgba(0,0,0,0.4);
+    -moz-box-shadow:    inset 0px 0px 85px rgba(0,0,0,0.4);
+    box-shadow:         inset 0px 0px 85px rgba(0,0,0,0.4);
+	
+    line-height: 0;         /* ensure no space between bottom */
+		
+}
+
+.vignet2 img {
+    position: center;
+    z-index: -1;
+}
+
+
 .button {
   font: 1.1em/1.5em sans-serif;
   text-decoration: none;

From 3aa0445deebb76a4fbf8ced8ea2f01912f50a008 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 24 Oct 2018 20:13:48 +0200
Subject: [PATCH 2/3] improvement (not escaping chars)

---
 rowers/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/views.py b/rowers/views.py
index ec9389ff..3c037728 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -693,7 +693,7 @@ def get_blog_posts(request):
             image_url = ''
             
 
-        title = cgi.escape(postdata['title']['rendered']).encode(
+        title = postdata['title']['rendered'].encode(
             'ascii','xmlcharrefreplace')
 
         excerpt = postdata['excerpt']['rendered'].encode(

From 81815316f395dbcc96711882efcbdc4a3a484244 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 25 Oct 2018 08:20:11 +0200
Subject: [PATCH 3/3] front page improvements

---
 rowers/templates/frontpage.html | 24 +++++++++++++-----------
 rowers/views.py                 | 10 +---------
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/rowers/templates/frontpage.html b/rowers/templates/frontpage.html
index c97b38e2..ef972c0b 100644
--- a/rowers/templates/frontpage.html
+++ b/rowers/templates/frontpage.html
@@ -92,12 +92,6 @@
   <li class="grid_5">
     <p class="midden">and more</p>
   </li>
-  <li class="grid_5">
-    <div class="midden">
-      <img src="/static/img/horizontal_line.png"
-           alt="horizontal line">
-      </div>
-  </li>    
 </ul>
 <ul class="main-content" id="id_blogs">
 </ul>
@@ -158,17 +152,25 @@ $( document ).ready(function() {
 console.log('loading script');
 $.getJSON(window.location.protocol + '//'+window.location.host + '/getblogs', function(data) {
 var html = '';
-console.log(data);
+if (data.length != 0) {
+html +=  '<li class="grid_5"><div class="midden"><img src="/static/img/horizontal_line.png" alt="horizontal line"></div></li>    '
+html += '<li class="grid_5"><h2 class="midden">Recent articles on the Analytics blog</h2></li>';
+html += '<li></li>';
+};
 $.each(data, function(key, blog) {
 console.log(blog.title);
     html += '<li class="frontitem">';
+    html += '<a style="text-decoration: none; color: black;" href="'+blog.link+'">';
     html += '<h3 class="midden">'+blog.title+'</h3>';
-    html += '<a href="'+blog.link+'">';
     html += '<p class="midden"><img src="'+blog.image+'" height=150px;></p>';
-    html += '</a>';
-    html += blog.excerpt+'</li>';
-$("#id_blogs").html(html);
+    html += '<p>'+blog.excerpt+'</p>';
+      html += '</a>';
+    html += '</li>';
 });
+if (data.length != 0) {
+html += '<li></li>';
+};
+$("#id_blogs").html(html);
       });
 });
 </script>
diff --git a/rowers/views.py b/rowers/views.py
index 3c037728..8d6487f5 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -672,7 +672,7 @@ def get_blog_posts(request):
     blogposts = []
 
     
-    for postdata in blogs_json[0:5]:
+    for postdata in blogs_json[0:3]:
         try:
             featuredmedia = postdata['featured_media']
             url = 'https://analytics.rowsandall.com/wp-json/wp/v2/media/%d' % featuredmedia
@@ -713,14 +713,6 @@ def get_blog_posts(request):
         blogposts.append(thedict)
 
     return JSONResponse(blogposts)
-#    html = render_to_string('frontpageblogs.html',
-#                            {
-#                                'blogposts':blogposts,
-#                                }
-#                            )
-
-
-#    return JSONResponse({'html':html})