diff --git a/Dockerfile b/Dockerfile index efd81e4..15ca3e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1 @@ FROM digitallyseamless/nodejs-bower-grunt-runtime - diff --git a/bower.json b/bower.json index f3f0577..035230f 100755 --- a/bower.json +++ b/bower.json @@ -38,10 +38,10 @@ "smalot-bootstrap-datetimepicker": "~2.3.4", "js-data-angular": "~3.1.0", "ui-select": "angular-ui-select#~0.13.2", - "ngInfiniteScroll": "~1.2.1", "zeroclipboard": "~2.2.0", "ng-clip": "~0.2.6", - "satellizer": "~0.13.3" + "satellizer": "~0.13.3", + "ngInfiniteScroll": "1.2.1" }, "devDependencies": { "angular-mocks": ">=1.2.*", diff --git a/client/app/app.js b/client/app/app.js index b436a1d..ece4228 100755 --- a/client/app/app.js +++ b/client/app/app.js @@ -54,7 +54,7 @@ angular.module('dssWebApp', [ }); $authProvider.google({ clientId: '248170132962-5km115budk9h84raa26hdmnnqdj8ivkl.apps.googleusercontent.com', - redirectUri: 'http://ext-test.deepsouthsounds.com:9000/', + redirectUri: window.location.origin + '/', url: '/_a/?backend=google', }); ngClipProvider.setPath("bower_components/zeroclipboard/dist/ZeroClipboard.swf"); @@ -104,35 +104,4 @@ angular.module('dssWebApp', [ }); }; - //ensure login before state change - $rootScope.$on('$stateChangeStart', function (event, toState, toParams) { - - /* - if (!$rootScope.currentUser && Session.getLocalToken() != null && Session.getBackend()) { - LoginService.loginUser().then(function (user) { - LoginService.getUserProfile() - .then(function (user) { - $rootScope.setCurrentUser(user); - $rootScope.connectSockets(); - return $state.go(toState.name, toParams); - }); - }, function (result) { - console.log('Unable to login', result); - if (result.code === 403 || result.code === 400 || result.code === 401 || result.code === 500) { - LoginService.logoutUser() - .then(function () { - return $state.go(toState.name, toParams); - }); - } else { - debugger; - console.error('Ooops'); - LoginService.logoutUser() - .then(function () { - return $state.go(toState.name, toParams); - }); - } - }); - event.preventDefault(); - }*/ - }); }); diff --git a/client/app/services/auth/login.service.js b/client/app/services/auth/login.service.js index 3c8ecdb..10d1ded 100644 --- a/client/app/services/auth/login.service.js +++ b/client/app/services/auth/login.service.js @@ -76,6 +76,8 @@ angular.module('dssWebApp') } function logoutUser() { + return $q.resolve(); + /* var defer = $q.defer(); $auth.logout() .then(function(){ @@ -83,5 +85,6 @@ angular.module('dssWebApp') }); return defer.promise; + */ } }); diff --git a/client/app/views/mixes/mixes.html b/client/app/views/mixes/mixes.html index f2fa262..6b6e58f 100755 --- a/client/app/views/mixes/mixes.html +++ b/client/app/views/mixes/mixes.html @@ -1,4 +1,4 @@ -