首页 发现 帮助
登录
radu
/
Django-Hackathon-Starter
关注 1
点赞 0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

merge

mk200789 10 年之前
父节点
322bc72a4c 1c2eb6bfb6
当前提交
a9a5cffc88
共有 3 个文件被更改，包括 45 次插入 和 8 次删除
合并视图 显示文件统计
  1. 24 0
      hackathon_starter/hackathon/scripts/tumblr.py
  2. 14 2
      hackathon_starter/hackathon/templates/hackathon/tumblr.html
  3. 7 6
      hackathon_starter/hackathon/views.py

+ 24 - 0
hackathon_starter/hackathon/scripts/tumblr.py
查看文件 

@@ -0,0 +1,24 @@
 
+import requests
 
+import simplejson as json
 
+import time 
+
 
+blog_uri		= "http://api.tumblr.com/v2/blog/"
 
+user_uri		= "api.tumblr.com/v2/user/"
 
+consumer_key    = "KrSbAc9cYLmIgVAn1D21FjRR97QWsutNMxkPDFBxo8CMWtMk4M"
 
+consumer_secret = "lKWMtL2Lj8zr5pY51PVqT8ugeoG0DjrdgoFewM0QTSyJ12jP8d"
 
+oauth_token		= "b2osMdhLljOo5aVBjd47kU7gm08NSTqZnZa1b6gC8MmpZX8h0H"
 
+oauth_secret	= "jHsrI4qM5h4CbUre90SZRAG6snguY22tB1NdujgAZwFh8VD1B1"
 
+
 
+def getUserInfo():
 
+	return "getUserInfo()"
 
+
 
+def getBlogInfo(user):
 
+	blog_info = blog_uri + user +".tumblr.com/info?api_key="+consumer_key
 
+	req = requests.get(blog_info)
 
+	jsonlist = json.loads(req.content)
 
+	
+	meta = jsonlist['meta']
 
+	response = jsonlist['response']
 
+	blog = response['blog']
 
+	blog['updated'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(blog['updated']))
 
+	return meta, response, blog

+ 14 - 2
hackathon_starter/hackathon/templates/hackathon/tumblr.html
查看文件 

@@ -1,9 +1,21 @@
 
 <!DOCTYPE html>
 
 <!DOCTYPE html>
 
 <html>
 
 <html>
 
-
 
 <body>
 
 <body>
 
 	{% include 'hackathon/base.html' %}
 
 	{% include 'hackathon/base.html' %}
 
-	<h1> {{ title }} </h1> 
+	<div class="col-lg-12">
 
+		<h1> {{ title }} : User Blog Info </h1> 
+		<br>
 
+		<div class="table-responsive">
 
+			<table class="table">
 
+				{% for i,v in blogData.items %}
 
+				<tr>
 
+					<th>{{i}}</th>
 
+					<td>{{v}}</td>
 
+				</tr>
 
+				{% endfor %}
 
+			</table>
 
+		</div>
 
+	</div>
 
 </body>
 
 </body>
 
 
 
 </html>
 
 </html>

+ 7 - 6
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, getTopContributedRepositories, filterCommits
 
 from scripts.github import getUserData, getUserRepositories, getTopContributedRepositories, filterCommits
 
+from scripts.tumblr import getUserInfo as tumblrUserInfo
 
+from scripts.tumblr import getBlogInfo as tumblrBlogInfo
 
 
 
 
 
 def index(request):
 
 def index(request):
 
@@ -117,12 +119,10 @@ def steam(request):
 
     return render(request,'hackathon/steam.html', {"game": game })
 
     return render(request,'hackathon/steam.html', {"game": game })
 
 
 
 def github(request):
 
 def github(request):
 
-    allData = {}
 
-    # Get generic user data
 
     userData = getUserData()
 
     userData = getUserData()
 
-    # Get a list of all the user's repositories
 
+    #Get a list of all the user's repositories
 
     repositories = getUserRepositories()
 
     repositories = getUserRepositories()
 
-    # Get a list of all commit statistics for all repositories
 
+    #Get a list of all commit statistics for all repositories
 
     list = getTopContributedRepositories(repositories)
 
     list = getTopContributedRepositories(repositories)
 
     # Get a list of the top 10 most committed repositories
 
     # Get a list of the top 10 most committed repositories
 
     filtered = filterCommits(list)
 
     filtered = filterCommits(list)
 
@@ -130,10 +130,11 @@ def github(request):
 
     allData['userData'] = userData
 
     allData['userData'] = userData
 
     allData['filteredData'] = filtered
 
     allData['filteredData'] = filtered
 
     
     
-    return render(request, 'hackathon/github.html', { 'data': allData })
 
+    return render(request, 'hackathon/github.html', { 'data': userData })
 
 
 
 def tumblr(request):
 
 def tumblr(request):
 
-    context = {'title': 'Tumblr Example'}
 
+    meta, response, blog = tumblrBlogInfo('david')
 
+    context = {'title': 'Tumblr Example', 'blogData': blog}
 
     return render(request, 'hackathon/tumblr.html', context)
 
     return render(request, 'hackathon/tumblr.html', context)
 
 
 
 def linkedin(request):
 
 def linkedin(request):