From 8991a15e5421b2207883513dcf6f9e34b51a569a Mon Sep 17 00:00:00 2001
From: Roman Timashev <roman@tmshv.ru>
Date: Tue, 5 Apr 2016 22:44:17 +0300
Subject: [PATCH] - bower

---
 .bowerrc          |  3 ---
 bower.json        | 30 ------------------------------
 gulpfile.babel.js | 16 ++++++++--------
 package.json      | 12 +++++++++---
 4 files changed, 17 insertions(+), 44 deletions(-)
 delete mode 100644 .bowerrc
 delete mode 100644 bower.json

diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index f45ae666..00000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "directory" : "bower_components"
-}
diff --git a/bower.json b/bower.json
deleted file mode 100644
index e7079155..00000000
--- a/bower.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  "name": "hudozhka",
-  "version": "2.0.0",
-  "authors": [
-    "Roman Timashev <roman@tmshv.ru>"
-  ],
-  "moduleType": [
-    "amd",
-    "es6",
-    "globals",
-    "node"
-  ],
-  "license": "MIT",
-  "private": true,
-  "ignore": [
-    "**/.*",
-    "node_modules",
-    "bower_components",
-    "test",
-    "tests"
-  ],
-  "dependencies": {
-    "jquery": "~2.1.1",
-    "angular-route": "~1.5.0",
-    "angular": "~1.5.1",
-    "angulartics": "~0.17.2",
-    "angular-spinner": "~0.6.1",
-    "socket.io-client": "~1.3.5"
-  }
-}
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
index e3ac7cc7..321a1e56 100644
--- a/gulpfile.babel.js
+++ b/gulpfile.babel.js
@@ -16,14 +16,14 @@ let isProduction = env === 'production';
 
 gulp.task('compile 3rdparty', () => {
     const files = [
-        './bower_components/jquery/dist/jquery.min.js',
-        './bower_components/angular/angular.min.js',
-        './bower_components/angular-route/angular-route.min.js',
-        './bower_components/angulartics/dist/angulartics.min.js',
-        './bower_components/angulartics/dist/angulartics-ga.min.js',
-        './bower_components/spin.js/spin.js',
-        './bower_components/angular-spinner/angular-spinner.min.js',
-        './bower_components/socket.io-client/socket.io.js',
+        './node_modules/jquery/dist/jquery.min.js',
+        './node_modules/angular/angular.min.js',
+        './node_modules/angular-route/angular-route.min.js',
+        './node_modules/angulartics/dist/angulartics.min.js',
+        './node_modules/angulartics-google-analytics/dist/angulartics-ga.min.js',
+        './node_modules/spin.js/spin.js',
+        './node_modules/angular-spinner/angular-spinner.min.js',
+        './node_modules/socket.io-client/socket.io.js',
         
         './node_modules/babel-polyfill/dist/polyfill.min.js'
     ];
diff --git a/package.json b/package.json
index 28849cd2..7c11d86e 100644
--- a/package.json
+++ b/package.json
@@ -8,8 +8,7 @@
     "start": "babel-node src/index.js",
     "out": "babel src/ -d out/",
     "test": "mocha --compilers js:babel-register",
-    "coverage": "istanbul cover mocha -- --compilers js:babel-register",
-    "bower": "bower"
+    "coverage": "istanbul cover mocha -- --compilers js:babel-register"
   },
   "repository": {
     "type": "git",
@@ -18,6 +17,11 @@
   "author": "Roman Timashev",
   "license": "ISC",
   "dependencies": {
+    "angular": "^1.5.3",
+    "angular-route": "^1.5.3",
+    "angular-spinner": "^0.8.1",
+    "angulartics": "^1.0.3",
+    "angulartics-google-analytics": "^0.1.4",
     "babel-core": "^6.7.4",
     "babel-polyfill": "^6.7.4",
     "babel-preset-es2015": "^6.5.0",
@@ -28,6 +32,7 @@
     "hudozka-data": "file:modules/hudozka-data",
     "hudozka-middlewares": "file:modules/hudozka-middlewares",
     "instagram-node": "^0.5.1",
+    "jquery": "^2.2.2",
     "koa": "^2.0.0-alpha.3",
     "koa-bodyparser": "^3.0.0",
     "koa-compose": "^3.1.0",
@@ -46,13 +51,14 @@
     "request-promise": "^2.0.1",
     "sitemap": "^1.5.0",
     "socket.io": "^1.4.5",
+    "socket.io-client": "^1.4.5",
+    "spin.js": "^2.3.2",
     "thunkify": "^2.1.2"
   },
   "devDependencies": {
     "autoprefixer": "^6.3.6",
     "babel-cli": "^6.6.5",
     "babel-loader": "^6.2.2",
-    "bower": "^1.3.12",
     "cssnano": "^3.4.0",
     "gulp": "^3.8.10",
     "gulp-concat": "^2.4.1",