浏览代码

wrote function to grab tumblr user blog info

mk200789 10 年之前
父节点
当前提交
2b5c702fdb
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 1 1
      hackathon_starter/hackathon/templates/hackathon/tumblr.html
  2. 3 1
      hackathon_starter/hackathon/views.py

+ 1 - 1
hackathon_starter/hackathon/templates/hackathon/tumblr.html

@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
 <html>
 <html>
-
 <body>
 <body>
 	{% include 'hackathon/base.html' %}
 	{% include 'hackathon/base.html' %}
 	<h1> {{ title }} </h1> 
 	<h1> {{ title }} </h1> 
+	{{ blogData }}
 </body>
 </body>
 
 
 </html>
 </html>

+ 3 - 1
hackathon_starter/hackathon/views.py

@@ -6,6 +6,8 @@ from django.contrib.auth import authenticate, login
 from django.http import HttpResponse, HttpResponseRedirect
 from django.http import HttpResponse, HttpResponseRedirect
 from scripts.steam import gamesPulling, steamIDPulling 
 from scripts.steam import gamesPulling, steamIDPulling 
 from scripts.github import getUserData, getUserRepositories
 from scripts.github import getUserData, getUserRepositories
+from scripts.tumblr import getUserInfo as tumblrUserInfo
+from scripts.tumblr import getBlogInfo as tumblrBlogInfo
 
 
 
 
 def index(request):
 def index(request):
@@ -123,7 +125,7 @@ def github(request):
     return render(request, 'hackathon/github.html', { 'data': userData })
     return render(request, 'hackathon/github.html', { 'data': userData })
 
 
 def tumblr(request):
 def tumblr(request):
-    context = {'title': 'Tumblr Example'}
+    context = {'title': 'Tumblr Example', 'blogData': tumblrBlogInfo('lingsling')}
     return render(request, 'hackathon/tumblr.html', context)
     return render(request, 'hackathon/tumblr.html', context)
 
 
 def linkedin(request):
 def linkedin(request):