From 09390fc52110182cd22862c389f88c198cbb2a78 Mon Sep 17 00:00:00 2001 From: nomo-kazza Date: Thu, 16 Feb 2017 13:39:35 -0500 Subject: [PATCH 1/4] update listings 2 Signed-off-by: Tom Ladendorf --- app/listings/listings.controller.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js index 6f42e1103..1c4746c78 100755 --- a/app/listings/listings.controller.js +++ b/app/listings/listings.controller.js @@ -1,6 +1,5 @@ -import _ from 'lodash' import angular from 'angular' -import { loadUser } from '../services/userv3.service.js' +import { loadUser, getCurrentUser } from '../services/userv3.service.js' (function () { 'use strict' @@ -9,7 +8,7 @@ import { loadUser } from '../services/userv3.service.js' ListingsCtrl.$inject = ['CONSTANTS', 'logger', '$q','TcAuthService', 'UserService', 'UserStatsService', 'ProfileService', 'ChallengeService', - 'ExternalAccountService', 'ngDialog', '$anchorScroll', '$scope' + 'ExternalAccountService', 'ngDialog', '$anchorScroll', '$scope', ] function ListingsCtrl(CONSTANTS, logger, $q, TcAuthService, UserService, UserStatsService, ProfileService, @@ -30,15 +29,10 @@ import { loadUser } from '../services/userv3.service.js' vm.myChallenges = [] loadUser().then(function(token) { handle = UserService.getUserIdentity().handle - // mock current user have this challenges - vm.myChallenges.push({'id':30056409}) - vm.myChallenges.push({'id':30056067}) - vm.myChallenges.push({'id':16870}) - // update auth flag + // update auth flag and get challenges if(TcAuthService.isAuthenticated()) { getChallenges(handle) - $scope.userProps = { isAuth: true, myChallenges: vm.myChallenges } } }, function(error) { // do nothing, just show non logged in state of navigation bar From 3aee7f726bf9410b707fa6d6b2f90cea65d0eb53 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Fri, 17 Feb 2017 03:23:08 +0100 Subject: [PATCH 2/4] update branch for react-components --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 63161ef11..d043c86d6 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "appirio-styles": "0.x.x", "appirio-tech-ng-iso-constants": "^1.0.6", "appirio-tech-ng-ui-components": "^2.1.2", - "appirio-tech-react-components": "appirio-tech/react-components.git#cl-misc-fixes-2", + "appirio-tech-react-components": "appirio-tech/react-components.git#cl-misc-fixes-3", "auth0-angular": "^4.1.0", "auth0-js": "^6.8.0", "d3": "^3.5.14", From cb12d6935bc152aefdf4f39e160831a5347f4d56 Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Fri, 17 Feb 2017 03:24:20 +0100 Subject: [PATCH 3/4] remove trailing comma --- app/listings/listings.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js index 1c4746c78..79e323730 100755 --- a/app/listings/listings.controller.js +++ b/app/listings/listings.controller.js @@ -1,5 +1,5 @@ import angular from 'angular' -import { loadUser, getCurrentUser } from '../services/userv3.service.js' +import { loadUser } from '../services/userv3.service.js' (function () { 'use strict' @@ -8,7 +8,7 @@ import { loadUser, getCurrentUser } from '../services/userv3.service.js' ListingsCtrl.$inject = ['CONSTANTS', 'logger', '$q','TcAuthService', 'UserService', 'UserStatsService', 'ProfileService', 'ChallengeService', - 'ExternalAccountService', 'ngDialog', '$anchorScroll', '$scope', + 'ExternalAccountService', 'ngDialog', '$anchorScroll', '$scope' ] function ListingsCtrl(CONSTANTS, logger, $q, TcAuthService, UserService, UserStatsService, ProfileService, From 5d921faba4f1d9fba639201f858f83d3f8a38d7a Mon Sep 17 00:00:00 2001 From: Tom Ladendorf Date: Fri, 17 Feb 2017 03:28:24 +0100 Subject: [PATCH 4/4] add lodash import --- app/listings/listings.controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/listings/listings.controller.js b/app/listings/listings.controller.js index 79e323730..feef90d51 100755 --- a/app/listings/listings.controller.js +++ b/app/listings/listings.controller.js @@ -1,3 +1,4 @@ +import _ from 'lodash' import angular from 'angular' import { loadUser } from '../services/userv3.service.js' pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy