صفحهٔ اصلی گشت‌و‌گذار راهنما
ورود
radu
/
Django-Hackathon-Starter
دنبال کردن 1
ستاره دار 0
انشعاب 0
پرونده‌ها مشکلات 0 درخواست واکشی 0 ویکی
فهرست منبع

modify the getBlogInfo function and working on getTaggedInfo(), and modify the view

mk200789 10 سال پیش
والد
a842869301
کامیت
8d2ba7a97f
3فایلهای تغییر یافته به همراه47 افزوده شده و 10 حذف شده
نمای یکپارچه نمایش آمار تفاوت ها
  1. 14 1
      hackathon_starter/hackathon/scripts/tumblr.py
  2. 28 5
      hackathon_starter/hackathon/templates/hackathon/tumblr.html
  3. 5 4
      hackathon_starter/hackathon/views.py

+ 14 - 1
hackathon_starter/hackathon/scripts/tumblr.py
مشاهده فایل 

@@ -1,6 +1,8 @@
 
 import requests
 
 import requests
 
 import simplejson as json
 
 import simplejson as json
 
 import time 
 import time 
+import collections
 
+import urllib
 
 
 
 blog_uri		= "http://api.tumblr.com/v2/blog/"
 
 blog_uri		= "http://api.tumblr.com/v2/blog/"
 
 user_uri		= "api.tumblr.com/v2/user/"
 
 user_uri		= "api.tumblr.com/v2/user/"
 
@@ -21,4 +23,15 @@ def getBlogInfo(user):
 
 	response = jsonlist['response']
 
 	response = jsonlist['response']
 
 	blog = response['blog']
 
 	blog = response['blog']
 
 	blog['updated'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(blog['updated']))
 
 	blog['updated'] = time.strftime('%Y-%m-%d %H:%M:%S', time.localtime(blog['updated']))
 
-	return meta, response, blog
 
+
 
+	return meta, response, blog
 
+
 
+def getTaggedInfo(tag):
 
+	tagged_uri = "http://api.tumblr.com/v2/tagged?tag="+tag+"&api_key="+consumer_key+"&limit=2"
 
+	req = requests.get(tagged_uri)
 
+	jsonlist = json.loads(req.content)
 
+	
+	meta = jsonlist['meta']
 
+	response = jsonlist['response'][0]
 
+	
+	return response

+ 28 - 5
hackathon_starter/hackathon/templates/hackathon/tumblr.html
مشاهده فایل 

@@ -2,18 +2,41 @@
 
 <html>
 
 <html>
 
 <body>
 
 <body>
 
 	{% include 'hackathon/base.html' %}
 
 	{% include 'hackathon/base.html' %}
 
-	<div class="col-lg-12">
 
-		<h1> {{ title }} : User Blog Info </h1> 
+	<div class="col-md-6">
 
+		<h1 class="text-center"> {{ title }}</h1> 
 		<br>
 
 		<br>
 
 		<div class="table-responsive">
 
 		<div class="table-responsive">
 
-			<table class="table">
 
+			<table class="table table-bordered">
 
+				<tr>
 
+					<th>Name</th>
 
+					<td>{{blogData.name}}</td>
 
+				</tr>
 
+				<tr>
 
+					<th>Posts</th>
 
+					<td>{{blogData.posts}}</td>				
+				</tr>
 
+				<tr>
 
+					<th>Blog title</th>
 
+					<td>{{blogData.title}}</td>				
+				</tr>
 
+				<tr>
 
+					<th>Last updated</th>
 
+					<td>{{blogData.updated}}</td>				
+				</tr>
 
+				<tr>
 
+					<th>Description</th>
 
+					<td>{{blogData.description}}</td>				
+				</tr>				
+			</table>
 
+			{{blogTag}}
 
+			<!--<table class="table">
 
 				{% for i,v in blogData.items %}
 
 				{% for i,v in blogData.items %}
 
 				<tr>
 
 				<tr>
 
 					<th>{{i}}</th>
 
 					<th>{{i}}</th>
 
 					<td>{{v}}</td>
 
 					<td>{{v}}</td>
 
 				</tr>
 
 				</tr>
 
-				{% endfor %}
 
-			</table>
 
+				{% endfor %}		
+			</table>-->
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>
 
 </body>
 
 </body>

+ 5 - 4
hackathon_starter/hackathon/views.py
مشاهده فایل 

@@ -6,8 +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 *
 
 from scripts.github import *
 
-from scripts.tumblr import getUserInfo as tumblrUserInfo
 
-from scripts.tumblr import getBlogInfo as tumblrBlogInfo
 
+from scripts.tumblr import *
 
+
 
 
 
 
 
 def index(request):
 
 def index(request):
 
@@ -144,8 +144,9 @@ def github(request):
 
     return render(request, 'hackathon/github.html', { 'data': allData })
 
     return render(request, 'hackathon/github.html', { 'data': allData })
 
 
 
 def tumblr(request):
 
 def tumblr(request):
 
-    meta, response, blog = tumblrBlogInfo('david')
 
-    context = {'title': 'Tumblr Example', 'blogData': blog}
 
+    meta, response, blog = getBlogInfo('twitterthecomic')
 
+    tagged_blog = getTaggedInfo("obama")
 
+    context = {'title': 'Tumblr Example', 'blogData': blog, 'blogTag': tagged_blog}
 
     return render(request, 'hackathon/tumblr.html', context)
 
     return render(request, 'hackathon/tumblr.html', context)
 
 
 
 def linkedin(request):
 
 def linkedin(request):