From 10dbd4343ea913220b1f8556d89c57ac7aa57d6e Mon Sep 17 00:00:00 2001
From: Ruzhinskiy <aruzhinskiy@oruzhinskiy-lws>
Date: Thu, 7 Sep 2017 15:50:24 +0300
Subject: [PATCH 1/3] added idea to git ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index f31eec2f..c7edd026 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ node_modules
 .settings
 *.log
 dist/
+.idea/

From 6033723de4bf15d168980e966bd26b2842a506d1 Mon Sep 17 00:00:00 2001
From: Ruzhinskiy <aruzhinskiy@oruzhinskiy-lws>
Date: Thu, 7 Sep 2017 15:58:31 +0300
Subject: [PATCH 2/3] updated dependencies: angular, angular-router

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 033294b1..cb030923 100644
--- a/package.json
+++ b/package.json
@@ -4,8 +4,8 @@
   "description": "Starter for Angular + ES6 + (Webpack or JSPM)",
   "main": "index.js",
   "dependencies": {
-    "angular": "^1.5.0",
-    "angular-ui-router": "^1.0.0-beta.1",
+    "angular": "^1.6.0",
+    "@uirouter/angularjs": "^1.0.0",
     "normalize.css": "^3.0.3"
   },
   "devDependencies": {

From b65279bfc751af3821fda992973fe495f91714c3 Mon Sep 17 00:00:00 2001
From: Ruzhinskiy <aruzhinskiy@oruzhinskiy-lws>
Date: Thu, 7 Sep 2017 15:59:16 +0300
Subject: [PATCH 3/3] changed import angular-ui-router to @uirouter@angularjs

---
 client/app/app.js                    |  5 ++---
 client/app/common/hero/hero.js       |  4 ++--
 client/app/common/navbar/navbar.js   |  4 ++--
 client/app/components/about/about.js | 24 ++++++++++++------------
 client/app/components/home/home.js   |  6 +++---
 generator/component/temp.js          |  2 +-
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/client/app/app.js b/client/app/app.js
index a5bde5d5..97868385 100644
--- a/client/app/app.js
+++ b/client/app/app.js
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import uiRouter from 'angular-ui-router';
+import uiRouter from '@uirouter/angularjs';
 import Common from './common/common';
 import Components from './components/components';
 import AppComponent from './app.component';
@@ -11,10 +11,9 @@ angular.module('app', [
     Components
   ])
   .config(($locationProvider) => {
-    "ngInject";
+    'ngInject';
     // @see: https://github.com/angular-ui/ui-router/wiki/Frequently-Asked-Questions
     // #how-to-configure-your-server-to-work-with-html5mode
-    $locationProvider.html5Mode(true).hashPrefix('!');
   })
 
   .component('app', AppComponent);
diff --git a/client/app/common/hero/hero.js b/client/app/common/hero/hero.js
index b9c0bdb7..d9a59d13 100644
--- a/client/app/common/hero/hero.js
+++ b/client/app/common/hero/hero.js
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import uiRouter from 'angular-ui-router';
+import uiRouter from '@uirouter/angularjs';
 import heroComponent from './hero.component';
 
 let heroModule = angular.module('hero', [
@@ -7,7 +7,7 @@ let heroModule = angular.module('hero', [
 ])
 
 .component('hero', heroComponent)
-  
+
 .name;
 
 export default heroModule;
diff --git a/client/app/common/navbar/navbar.js b/client/app/common/navbar/navbar.js
index 04a3ecac..40b4005e 100644
--- a/client/app/common/navbar/navbar.js
+++ b/client/app/common/navbar/navbar.js
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import uiRouter from 'angular-ui-router';
+import uiRouter from '@uirouter/angularjs';
 import navbarComponent from './navbar.component';
 
 let navbarModule = angular.module('navbar', [
@@ -7,7 +7,7 @@ let navbarModule = angular.module('navbar', [
 ])
 
 .component('navbar', navbarComponent)
-  
+
 .name;
 
 export default navbarModule;
diff --git a/client/app/components/about/about.js b/client/app/components/about/about.js
index 9dc45a54..1c718fe4 100644
--- a/client/app/components/about/about.js
+++ b/client/app/components/about/about.js
@@ -1,22 +1,22 @@
 import angular from 'angular';
-import uiRouter from 'angular-ui-router';
+import uiRouter from '@uirouter/angularjs';
 import aboutComponent from './about.component';
 
 let aboutModule = angular.module('about', [
   uiRouter
 ])
 
-.config(($stateProvider) => {
-  "ngInject";
-  $stateProvider
-    .state('about', {
-      url: '/about',
-      component: 'about'
-    });
-})
+  .config(($stateProvider) => {
+    'ngInject';
+    $stateProvider
+      .state('about', {
+        url: '/about',
+        component: 'about'
+      });
+  })
 
-.component('about', aboutComponent)
-  
-.name;
+  .component('about', aboutComponent)
+
+  .name;
 
 export default aboutModule;
diff --git a/client/app/components/home/home.js b/client/app/components/home/home.js
index 754c6def..daf57737 100644
--- a/client/app/components/home/home.js
+++ b/client/app/components/home/home.js
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import uiRouter from 'angular-ui-router';
+import uiRouter from '@uirouter/angularjs';
 import homeComponent from './home.component';
 
 let homeModule = angular.module('home', [
@@ -7,7 +7,7 @@ let homeModule = angular.module('home', [
 ])
 
 .config(($stateProvider, $urlRouterProvider) => {
-  "ngInject";
+  'ngInject';
 
   $urlRouterProvider.otherwise('/');
 
@@ -19,7 +19,7 @@ let homeModule = angular.module('home', [
 })
 
 .component('home', homeComponent)
-  
+
 .name;
 
 export default homeModule;
diff --git a/generator/component/temp.js b/generator/component/temp.js
index 7df4c043..9ed87190 100644
--- a/generator/component/temp.js
+++ b/generator/component/temp.js
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import uiRouter from 'angular-ui-router';
+import uiRouter from '@uirouter/angularjs';
 import <%= name %>Component from './<%= name %>.component';
 
 let <%= name %>Module = angular.module('<%= name %>', [