-
@@ -119,21 +129,47 @@
-
- Compatible with:
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-
+
+ Compatible with:
+
+
+
+
+
+
+
+
+
+
+
+
+
{% endblock %}
+
+{% block scripts %}
+
+
+
+{% 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 %}
+-
+
{{ blog.title|safe }}
+
+ 
+
+{{ blog.excerpt|safe }}
+
+
+ read more
+
+
+
+{% 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('\(\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;
+