remove s3 and angularticis
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6b1c0764 Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6b1c0764 Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6b1c0764 Branch: refs/pull/70/merge Commit: 6b1c0764c71cc1114282ba5844856800b0b9c1f7 Parents: 44805da Author: Shawn Feldman <[email protected]> Authored: Mon Mar 10 15:01:51 2014 -0600 Committer: Shawn Feldman <[email protected]> Committed: Mon Mar 10 15:01:51 2014 -0600 ---------------------------------------------------------------------- portal/Gruntfile.js | 28 ---------------------------- portal/bower.json | 1 - portal/config.js | 15 --------------- portal/js/app.js | 7 ++----- portal/js/global/page-controller.js | 10 +--------- 5 files changed, 3 insertions(+), 58 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6b1c0764/portal/Gruntfile.js ---------------------------------------------------------------------- diff --git a/portal/Gruntfile.js b/portal/Gruntfile.js index e35c24d..37fbd9b 100644 --- a/portal/Gruntfile.js +++ b/portal/Gruntfile.js @@ -319,33 +319,6 @@ module.exports = function (grunt) { copy:false } } - }, - s3: { - options: { - key: process.env.AWS_KEY || 'noidea', - secret: process.env.AWS_SECRET || 'noidea', - bucket: 'appservices-deployments', - access: 'public-read', - headers: { - // Two Year cache policy (1000 * 60 * 60 * 24 * 730) - "Cache-Control": "max-age=630720000, public", - "Expires": new Date(Date.now() + 63072000000).toUTCString() - } - }, - dev: { - // These options override the defaults - options: { - encodePaths: false, - maxOperations: 20 - }, - // Files to be uploaded. - upload: [ - { - src: 'dist/appsvc-ui.'+packageJson.version+'.zip', - dest: '/production-releases/dist/appsvc-ui.'+packageJson.version+'.zip' - } - ] - } } }); @@ -362,7 +335,6 @@ module.exports = function (grunt) { grunt.loadNpmTasks('grunt-protractor-runner'); grunt.loadNpmTasks('grunt-karma'); grunt.loadNpmTasks('grunt-dom-munger'); - grunt.loadNpmTasks('grunt-s3'); // Default task(s). grunt.registerTask('dev', ['connect:server', 'watch']); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6b1c0764/portal/bower.json ---------------------------------------------------------------------- diff --git a/portal/bower.json b/portal/bower.json index bb34bca..98a9d65 100644 --- a/portal/bower.json +++ b/portal/bower.json @@ -3,7 +3,6 @@ "version": "2.0.12", "ignore": [], "dependencies": { - "angularitics": "~0.8.7", "apigee-sdk": "~2.0.8" }, "devDependencies": {}, http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6b1c0764/portal/config.js ---------------------------------------------------------------------- diff --git a/portal/config.js b/portal/config.js index 7b1920f..36804d6 100644 --- a/portal/config.js +++ b/portal/config.js @@ -1,20 +1,5 @@ var Usergrid = Usergrid || {}; -//Google Analytics -var _gaq = _gaq || []; -_gaq.push(['_setAccount', '{{yourtoken}}']); -try{ - (function(document) { - if(!document){ - return; - } - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(document || null); -}catch(e){}; -//End Google Analytics - Usergrid.showNotifcations = true; http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6b1c0764/portal/js/app.js ---------------------------------------------------------------------- diff --git a/portal/js/app.js b/portal/js/app.js index 0954859..73d0c6d 100644 --- a/portal/js/app.js +++ b/portal/js/app.js @@ -68,8 +68,8 @@ angular.module('appservices', 'appservices.controllers', 'appservices.performance', 'appservices.push' - ]).config(['$routeProvider', '$locationProvider','$sceDelegateProvider','$analyticsProvider', - function ($routeProvider,$locationProvider,$sceDelegateProvider, $analyticsProvider) { + ]).config(['$routeProvider', '$locationProvider','$sceDelegateProvider', + function ($routeProvider,$locationProvider,$sceDelegateProvider) { $routeProvider .when('/org-overview', {templateUrl: 'org-overview/org-overview.html', controller: 'OrgOverviewCtrl'}) .when('/login', {templateUrl: 'login/login.html', controller: 'LoginCtrl'}) @@ -119,7 +119,4 @@ angular.module('appservices', 'https://api.usergrid.com/**' ]); - $analyticsProvider.virtualPageviews(false); - $analyticsProvider.firstPageview(false); - }]); http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6b1c0764/portal/js/global/page-controller.js ---------------------------------------------------------------------- diff --git a/portal/js/global/page-controller.js b/portal/js/global/page-controller.js index 0e4ad60..f8ed966 100644 --- a/portal/js/global/page-controller.js +++ b/portal/js/global/page-controller.js @@ -20,8 +20,7 @@ AppServices.Controllers.controller('PageCtrl', $routeParams, $q, $route, - $log, - $analytics) { + $log) { var initScopeVariables = function(){ //$rootScope.urls()... will determine which URL should be used for a given environment @@ -353,7 +352,6 @@ AppServices.Controllers.controller('PageCtrl', $rootScope.$broadcast('alert', 'info', 'We are experiencing performance issues on our server. Please click Get Help for support if this continues.'); }); - var lastPage = ""; //verify on every route change $scope.$on('$routeChangeSuccess', function () { //todo possibly do a date check here for token expiry @@ -363,12 +361,6 @@ AppServices.Controllers.controller('PageCtrl', if(!$scope.showDemoBar){ $rootScope.demoData = false; } - setTimeout(function(){ - lastPage = ""; //remove the double load event - },50); - var path = window.location.pathname.replace("index-debug.html",""); - lastPage === "" && $analytics.pageTrack((path+$location.path()).replace("//","/")); - lastPage = $location.path(); }); $scope.$on('applications-received', function (event, applications) { $scope.applications = applications;
