Bläddra i källkod

updated controller to display images

mk200789 10 år sedan
förälder
incheckning
cde11dc304

+ 1 - 0
angular/index.html

@@ -76,6 +76,7 @@
         <script src="scripts/factories/githubTopContributionsFactory.js"></script>
         <script src="scripts/factories/steamSalesFactory.js"></script>
         <script src="scripts/factories/instagramUserFactory.js"></script>
+        <script src="scripts/factories/instagramUserMediaFactory.js"></script>
 
     </head>
 

+ 3 - 2
angular/partials/instagramUser.partial.html

@@ -35,8 +35,9 @@
 	                	</tr>
 	                </tbody>
 	            </table>
-	        </div>
-	    </div>
 
+	        	<img data-ng-repeat= "i in instagramUserMediaData.data" src="{{i.images.thumbnail.url}}">
+	        </div>
+	    </div>	    
 	</div>
 </div>

+ 1 - 1
angular/scripts/app.js

@@ -49,6 +49,6 @@ var restApp = angular.module('restApp', [
             data : {
                 pageTitle: 'Instagram User Data'
             }
-        });
+        });   
 
 });

+ 9 - 3
angular/scripts/controllers/instagramUserController.js

@@ -1,13 +1,19 @@
 'use strict';
 
-restApp.controller('instagramUserController', function($scope, instagramUserFactory){
-	$scope.instagramUserData = {}
+restApp.controller('instagramUserController', function($scope, instagramUserFactory, instagramUserMediaFactory){
+	$scope.instagramUserData = {};
+	$scope.instagramUserMediaData = {};
 
 	$scope.instagramUserData = instagramUserFactory.get().success(function(data){
 		$scope.instagramUserData = data;
 
 		console.log(data);
+	});
+	
+	$scope.instagramUserMediaData = instagramUserMediaFactory.get().success(function(data){
+		$scope.instagramUserMediaData = data;
 
-	})
+		console.log(data);
+	});
 
 })

+ 3 - 2
hackathon_starter/hackathon/scripts/instagram.py

@@ -128,7 +128,7 @@ class InstagramOauthClient(object):
 		return data
 
 
-	def get_user_media(self, access_token):
+	def get_user_media(self, user_id, access_token):
 		'''
 		Parameters:
 			access_token: String
@@ -140,7 +140,8 @@ class InstagramOauthClient(object):
 				- A dictionary containing user media information.
 		'''
 
-		user_media = 'https://api.instagram.com/v1/users/32833691/media/recent/?access_token='+access_token
+		user_media = 'https://api.instagram.com/v1/users/'+str(user_id)+'/media/recent/?access_token='+access_token
+		#user_media = 'https://api.instagram.com/v1/users/32833691/media/recent/?access_token='+access_token
 		req = requests.get(user_media)
 		content = json2.loads(req.content)
 		data = content['data']

+ 1 - 1
hackathon_starter/hackathon/views.py

@@ -192,7 +192,7 @@ def instagramUserMedia(request):
     ''' Returns JSON response about a specific Instagram User's Media. '''
     user_id = User.objects.get(username='mk200789').id
     access_token = Profile.objects.get(user=user_id).oauth_secret
-    parsedData = getInstagram.get_user_media(access_token)
+    parsedData = getInstagram.get_user_media(32833691,access_token)
     return JsonResponse({'data': parsedData })
 
 def instagramMediaByLocation(request):

+ 0 - 1
ionic/www/templates/instagramUser.html

@@ -14,7 +14,6 @@
 			  <div class="col">Media: {{ data.counts.media }}</div>
     	</ion-item>
   
-
       <img collection-repeat="data in instagramUserMediaData.data"
         ng-src="{{data.images.thumbnail.url}}">