diff --git a/src/Web/Properties/launchSettings.json b/src/Web/Properties/launchSettings.json index 556917029c..a0d4f0414c 100644 --- a/src/Web/Properties/launchSettings.json +++ b/src/Web/Properties/launchSettings.json @@ -1,27 +1,27 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:4001/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, - "Web": { - "commandName": "Project", - "launchBrowser": true, - "launchUrl": "http://localhost:5001", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:4001/", + "sslPort": 0 } + }, + "profiles": { + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "Web": { + "commandName": "Project", + "launchBrowser": true, + "launchUrl": "http://localhost:5001", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } } diff --git a/src/Web/gulpfile.js b/src/Web/gulpfile.js index 26276e792e..1ce68a2e0e 100644 --- a/src/Web/gulpfile.js +++ b/src/Web/gulpfile.js @@ -158,6 +158,13 @@ gulp.task('lib', ['clean:lib'], function () { { src: paths.npmDir + 'clipboard/dist/clipboard*.js', dest: paths.libDir + 'clipboard' + }, + { + src: [ + paths.npmDir + 'angulartics-google-analytics/lib/angulartics*.js', + paths.npmDir + 'angulartics/src/angulartics.js' + ], + dest: paths.libDir + 'angulartics' } ]; diff --git a/src/Web/package.json b/src/Web/package.json index 020ce24398..1931103439 100644 --- a/src/Web/package.json +++ b/src/Web/package.json @@ -1,43 +1,45 @@ { - "name": "bitwarden", - "version": "0.0.1", - "devDependencies": { - "connect": "3.4.1", - "lodash": "4.13.1", - "gulp": "3.9.1", - "gulp-concat": "2.6.0", - "gulp-cssmin": "0.1.7", - "gulp-less": "3.1.0", - "gulp-rename": "1.2.2", - "gulp-uglify": "1.5.3", - "gulp-gh-pages": "0.5.4", - "gulp-preprocess": "2.0.0", - "gulp-ng-annotate": "2.0.0", - "gulp-ng-config": "1.3.1", - "jshint": "2.9.2", - "gulp-jshint": "2.0.1", - "rimraf": "2.5.2", - "run-sequence": "1.2.1", - "merge-stream": "1.0.0", - "jquery": "2.2.4", - "font-awesome": "4.6.3", - "bootstrap": "3.3.6", - "sjcl": "1.0.3", - "angular": "1.5.6", - "angular-resource": "1.5.6", - "angular-bootstrap-npm": "0.14.3", - "angular-ui-router": "0.3.1", - "angular-jwt": "0.0.9", - "angular-cookies": "1.5.6", - "admin-lte": "2.3.5", - "angular-md5": "0.1.10", - "angular-toastr": "1.7.0", - "angular-bootstrap-show-errors": "2.3.0", - "angular-messages": "1.5.6", - "ngstorage": "0.3.10", - "papaparse": "4.1.2", - "toastr": "2.1.2", - "clipboard": "1.5.12", - "ngclipboard": "1.1.1" - } + "name": "bitwarden", + "version": "0.0.1", + "devDependencies": { + "connect": "3.4.1", + "lodash": "4.13.1", + "gulp": "3.9.1", + "gulp-concat": "2.6.0", + "gulp-cssmin": "0.1.7", + "gulp-less": "3.1.0", + "gulp-rename": "1.2.2", + "gulp-uglify": "1.5.3", + "gulp-gh-pages": "0.5.4", + "gulp-preprocess": "2.0.0", + "gulp-ng-annotate": "2.0.0", + "gulp-ng-config": "1.3.1", + "jshint": "2.9.2", + "gulp-jshint": "2.0.1", + "rimraf": "2.5.2", + "run-sequence": "1.2.1", + "merge-stream": "1.0.0", + "jquery": "2.2.4", + "font-awesome": "4.6.3", + "bootstrap": "3.3.6", + "sjcl": "1.0.3", + "angular": "1.5.6", + "angular-resource": "1.5.6", + "angular-bootstrap-npm": "0.14.3", + "angular-ui-router": "0.3.1", + "angular-jwt": "0.0.9", + "angular-cookies": "1.5.6", + "admin-lte": "2.3.5", + "angular-md5": "0.1.10", + "angular-toastr": "1.7.0", + "angular-bootstrap-show-errors": "2.3.0", + "angular-messages": "1.5.6", + "ngstorage": "0.3.10", + "papaparse": "4.1.2", + "toastr": "2.1.2", + "clipboard": "1.5.12", + "ngclipboard": "1.1.1", + "angulartics": "1.1.2", + "angulartics-google-analytics": "0.2.1" + } } diff --git a/src/Web/project.json b/src/Web/project.json index a433c4fd9a..ab9cdc4d82 100644 --- a/src/Web/project.json +++ b/src/Web/project.json @@ -1,56 +1,56 @@ { - "version": "0.0.1", - "environment": "Development", + "version": "0.0.1", + "environment": "Development", - "dependencies": { - "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", - "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.StaticFiles": "1.0.0" - }, + "dependencies": { + "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.StaticFiles": "1.0.0" + }, - "tools": { - "Microsoft.AspNetCore.Server.IISIntegration.Tools": { - "version": "1.0.0-preview2-final", - "imports": "portable-net45+win8+dnxcore50" + "tools": { + "Microsoft.AspNetCore.Server.IISIntegration.Tools": { + "version": "1.0.0-preview2-final", + "imports": "portable-net45+win8+dnxcore50" + } + }, + + "frameworks": { + "netcoreapp1.0": { + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.0.0", + "type": "platform" } - }, + } + } + }, - "frameworks": { - "netcoreapp1.0": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - } - } - } - }, + "buildOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, - "buildOptions": { - "emitEntryPoint": true, - "preserveCompilationContext": true - }, + "runtimeOptions": { + "gcServer": false, + "gcConcurrent": true + }, - "runtimeOptions": { - "gcServer": false, - "gcConcurrent": true - }, + "publishOptions": { + "include": [ + "wwwroot", + "Views", + "settings.json", + "settings.Development.json", + "settings.Production.json", + "settings.Staging.json", + "web.config" + ] + }, - "publishOptions": { - "include": [ - "wwwroot", - "Views", - "settings.json", - "settings.Development.json", - "settings.Production.json", - "settings.Staging.json", - "web.config" - ] - }, + "scripts": { + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + }, - "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] - }, - - "userSecretsId": "aspnet-Vault-20160519103145" + "userSecretsId": "aspnet-Vault-20160519103145" } diff --git a/src/Web/settings.json b/src/Web/settings.json index 2e50bde1f9..422a72a728 100644 --- a/src/Web/settings.json +++ b/src/Web/settings.json @@ -1,5 +1,5 @@ { - "appSettings": { - "rememberdEmailCookieName": "bit.rememberedEmail" - } + "appSettings": { + "rememberdEmailCookieName": "bit.rememberedEmail" + } } diff --git a/src/Web/web.config b/src/Web/web.config index 7b3cb2073a..05ac0e36d8 100644 --- a/src/Web/web.config +++ b/src/Web/web.config @@ -1,9 +1,9 @@  - - - - - - + + + + + + diff --git a/src/Web/wwwroot/app/app.js b/src/Web/wwwroot/app/app.js index b27f39d254..ef2a589cd1 100644 --- a/src/Web/wwwroot/app/app.js +++ b/src/Web/wwwroot/app/app.js @@ -6,6 +6,8 @@ 'angular-md5', 'ui.bootstrap.showErrors', 'toastr', + 'angulartics', + 'angulartics.google.analytics', 'bit.directives', 'bit.services', diff --git a/src/Web/wwwroot/index.html b/src/Web/wwwroot/index.html index 13f26e8a6e..f3ce358d2f 100644 --- a/src/Web/wwwroot/index.html +++ b/src/Web/wwwroot/index.html @@ -48,7 +48,6 @@ })(window,document,'script','https://www.google-analytics.com/analytics.js','ga'); ga('create', 'UA-81915606-4', 'auto'); - ga('send', 'pageview'); @@ -75,6 +74,8 @@ + +