diff --git a/CHANGELOG.md b/CHANGELOG.md
index 332d5aaf8..47f73fd45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
### Changelog
+**0.61.0**
+
+* bower was replaced with npm
+https://github.com/forCrowd/WealthEconomy/issues/76
+
**0.60.1**
* Contributors page fixes
diff --git a/SolutionItems/Properties/AssemblyInfo.cs b/SolutionItems/Properties/AssemblyInfo.cs
index fead69ac4..3247211e1 100644
--- a/SolutionItems/Properties/AssemblyInfo.cs
+++ b/SolutionItems/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
//
// AssemblyFileVersion is not in use for the moment
//
-[assembly: AssemblyVersion("0.60.1")]
+[assembly: AssemblyVersion("0.61.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/ngClient/bower.json b/ngClient/bower.json
deleted file mode 100644
index 784e6a14a..000000000
--- a/ngClient/bower.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "name": "WealthEconomy-ngClient",
- "description": "",
- "keywords": [ ],
- "main": "",
- "moduleType": [
- "amd",
- "globals"
- ],
- "author": {
- "name": "forCrowd Foundation",
- "url": "http://forcrowd.org/",
- "email": "contact@forcrowd.org"
- },
- "homepage": "https://github.com/forCrowd/WealthEconomy",
- "license": "MIT",
- "version": "0.0.0",
- "ignore": [
- "bower_components"
- ],
- "dependencies": {
- "angular": "1.5.4",
- "angular-bootstrap": "^1.2.1",
- "angular-google-analytics": "^1.1.6",
- "angular-mocks": "^1.5.0",
- "angular-moment": "*",
- "angular-route": "^1.5.0",
- "angular-sanitize": "^1.5.0",
- "angular-utils-disqus": "^1.0.0",
- "bootstrap": "^3.3.6",
- "breeze-client": "^1.5.7",
- "breeze-client-labs": "^1.5.8",
- "datajs": "^1.1.3",
- "font-awesome": "^4.5.0",
- "highcharts": "^4.2.3",
- "highcharts-ng": "^0.0.11",
- "jquery": "2.2.2",
- "moment": "^2.12.0",
- "respond": "^1.4.2",
- "source-map": "^0.5.2",
- "toastr": "^2.1.2"
- },
- "resolutions": {
- "angular": ">=1.4.0",
- "moment": "^2.12.0"
- }
-}
diff --git a/ngClient/gulpfile.js b/ngClient/gulpfile.js
index b7e752ed4..55342f880 100644
--- a/ngClient/gulpfile.js
+++ b/ngClient/gulpfile.js
@@ -25,7 +25,7 @@ var appMinCss = 'app.min.css',
appCssSrc = [appCssRoot + '/*.css', appJsRoot + '/directives/**/*.css', '!' + appCssRoot + '/' + appCss, '!' + appCssRoot + '/' + appMinCss];
// lib variables
-var libJsSrcRoot = './bower_components',
+var libJsSrcRoot = './node_modules',
libJsSourceMapRoot = libJsSrcRoot.substring(1);
// lib.js variables
@@ -38,7 +38,7 @@ var libMinJs = 'lib.min.js',
libJsSrcRoot + '/angular-route/angular-route.js', // angularRoute
libJsSrcRoot + '/angular-sanitize/angular-sanitize.js', // angularSanitize
libJsSrcRoot + '/angular-moment/angular-moment.js', // angularMoment
- libJsSrcRoot + '/datajs/datajs.js', // datajs
+ libJsSrcRoot + '/datajs/lib/datajs.js', // datajs
libJsSrcRoot + '/breeze-client/build/breeze.base.debug.js', // breeze
libJsSrcRoot + '/breeze-client/build/adapters/breeze.ajax.angular.js', // breezeAjaxAngular
libJsSrcRoot + '/breeze-client/build/adapters/breeze.dataService.odata.js', // breezeDataServiceOData
@@ -49,8 +49,8 @@ var libMinJs = 'lib.min.js',
libJsSrcRoot + '/angular-google-analytics/dist/angular-google-analytics.js', // googleAnalyticsAngular
libJsSrcRoot + '/angular-utils-disqus/dirDisqus.js', // disqusAngular
libJsSrcRoot + '/bootstrap/dist/js/bootstrap.js', // bootstrap
- libJsSrcRoot + '/respond/dest/respond.js', // respond
- libJsSrcRoot + '/angular-bootstrap/ui-bootstrap-tpls.js', // bootstrapAngular
+ libJsSrcRoot + '/respond.js/dest/respond.js', // respond
+ libJsSrcRoot + '/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js', // bootstrapAngular
libJsSrcRoot + '/highcharts/highcharts.src.js', // highcharts
libJsSrcRoot + '/highcharts-ng/dist/highcharts-ng.js', // highchartsAngular
libJsSrcRoot + '/toastr/toastr.js', // toastr
@@ -65,7 +65,7 @@ var libMinCss = 'lib.min.css',
libJsSrcRoot + '/bootstrap/dist/css/bootstrap.css', // bootstrap
libJsSrcRoot + '/font-awesome/css/font-awesome.css', // fontAwesome
libJsSrcRoot + '/breeze-client-labs/breeze.directives.css', // breezeDirectivesCss
- libJsSrcRoot + '/toastr/toastr.css', // toastrCss
+ libJsSrcRoot + '/toastr/build/toastr.css', // toastrCss
],
libCssDest = './_system/css/lib';
diff --git a/ngClient/ngClient.csproj b/ngClient/ngClient.csproj
index 5364f3833..ac83ef3bd 100644
--- a/ngClient/ngClient.csproj
+++ b/ngClient/ngClient.csproj
@@ -152,7 +152,6 @@
-
diff --git a/ngClient/package.json b/ngClient/package.json
index 5c764c1ea..2fcef3a61 100644
--- a/ngClient/package.json
+++ b/ngClient/package.json
@@ -3,7 +3,6 @@
"name": "ASP.NET",
"private": true,
"devDependencies": {
- "bower": "^1.7.9",
"brace-expansion": "^1.1.5",
"gulp": "^3.9.1",
"gulp-clean": "^0.3.1",
@@ -15,6 +14,27 @@
"gulp-tap": "^0.1.3",
"gulp-uglify": "^1.5.3",
"jshint": "^2.9.2",
- "jshint-stylish": "^2.1.0"
+ "jshint-stylish": "^2.1.0",
+
+ "angular": "^1.5.0",
+ "angular-ui-bootstrap": "^1.2.1",
+ "angular-google-analytics": "^1.1.6",
+ "angular-mocks": "^1.5.0",
+ "angular-moment": "^1.0.0-beta.6",
+ "angular-route": "^1.5.0",
+ "angular-sanitize": "^1.5.0",
+ "angular-utils-disqus": "^1.0.0",
+ "bootstrap": "^3.3.6",
+ "breeze-client": "^1.5.7",
+ "breeze-client-labs": "^1.5.8",
+ "datajs": "^1.0.3",
+ "font-awesome": "^4.5.0",
+ "highcharts": "^4.2.3",
+ "highcharts-ng": "^0.0.11",
+ "jquery": "^2.2.2",
+ "moment": "^2.12.0",
+ "respond.js": "^1.4.2",
+ "source-map": "^0.5.2",
+ "toastr": "^2.1.2"
}
}