Kaynağa Gözat

merge conflict

mk200789 10 yıl önce
ebeveyn
işleme
00af3525db

+ 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>
 <html>
-
 <body>
 	{% 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>
 
 </html>

+ 5 - 7
hackathon_starter/hackathon/views.py

@@ -6,6 +6,8 @@ from django.contrib.auth import authenticate, login
 from django.http import HttpResponse, HttpResponseRedirect
 from scripts.steam import gamesPulling, steamIDPulling 
 from scripts.github import *
+from scripts.tumblr import getUserInfo as tumblrUserInfo
+from scripts.tumblr import getBlogInfo as tumblrBlogInfo
 
 
 def index(request):
@@ -126,20 +128,16 @@ def github(request):
     list = getTopContributedRepositories(repositories)
     # Get a list of the top 10 most committed repositories
     filtered = filterCommits(list)
-    # Get list of all stargazer counts for all repositories
-    stargazers = getStarGazerCount()
-    # Return list of top 10 stargazed repositories
-    filteredStargazers = filterStarGazerCount(stargazers)
-    
     # Store data into a dictionary for rendering
     allData['userData'] = userData
     allData['filteredData'] = filtered
     allData['filteredStargazers'] = filteredStargazers
 
-    return render(request, 'hackathon/github.html', { 'data': allData })
+    return render(request, 'hackathon/github.html', { 'data': userData })
 
 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)
 
 def linkedin(request):