Replace default router with UI-Router

mraible · mraible · commit 41ed54418eba · 2016-10-17T08:52:24.000-06:00
diff --git a/README.md b/README.md
@@ -9,6 +9,8 @@ framework and a bunch of development and testing tools for instant web developme
 
 The seed app doesn't do much, just shows how to wire two controllers and views together.
 
+**NOTE:** This fork of angular-seed contains [UI-Router](https://ui-router.github.io/) instead of the
+default router. It also integrates [gulp.js](http://gulpjs.com/) for building and managing dependencies.
 
 ## Getting Started
 
@@ -24,17 +26,17 @@ its package manager (npm) installed.  You can get them from [http://nodejs.org/]
 
 ### Clone angular-seed
 
-Clone the angular-seed repository using [git][git]:
+Clone this angular-seed repository using [git][git]:
 
 ```
-git clone https://github.com/angular/angular-seed.git
+git clone https://github.com/mraible/angular-seed.git
 cd angular-seed
 ```
 
 If you just want to start a new project without the angular-seed commit history then you can do:
 
 ```bash
-git clone --depth=1 https://github.com/angular/angular-seed.git <your-project-name>
+git clone --depth=1 https://github.com/mraible/angular-seed.git <your-project-name>
 ```
 
 The `depth=1` tells git to only pull down one commit worth of historical data.
diff --git a/app/app.js b/app/app.js
@@ -2,13 +2,12 @@
 
 // Declare app level module which depends on views, and components
 angular.module('myApp', [
-  'ngRoute',
+  'ui.router',
   'myApp.view1',
   'myApp.view2',
   'myApp.version'
 ]).
-config(['$locationProvider', '$routeProvider', function($locationProvider, $routeProvider) {
-  $locationProvider.hashPrefix('!');
-
-  $routeProvider.otherwise({redirectTo: '/view1'});
+config(['$stateProvider', '$urlRouterProvider', function($stateProvider, $urlRouterProvider) {
+  // For any unmatched url, redirect to /view1
+  $urlRouterProvider.otherwise('/view1');
 }]);
diff --git a/app/index-async.html b/app/index-async.html
@@ -29,7 +29,7 @@
     // load all of the dependencies asynchronously.
     $script([
       'bower_components/angular/angular.js',
-      'bower_components/angular-route/angular-route.js',
+      'bower_components/angular-ui-router/release/angular-ui-router.js',
       'app.js',
       'view1/view1.js',
       'view2/view2.js',
diff --git a/app/index.html b/app/index.html
@@ -7,56 +7,37 @@
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <title>My AngularJS App</title>
-<<<<<<< HEAD
-  <!-- build:css css/seed.min.css -->
-  <link rel="stylesheet" href="css/app.css"/>
-  <link rel="stylesheet" href="css/app2.css"/>
-  <!-- endbuild -->
-=======
   <meta name="description" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="stylesheet" href="bower_components/html5-boilerplate/dist/css/normalize.css">
   <link rel="stylesheet" href="bower_components/html5-boilerplate/dist/css/main.css">
   <link rel="stylesheet" href="app.css">
   <script src="bower_components/html5-boilerplate/dist/js/vendor/modernizr-2.8.3.min.js"></script>
->>>>>>> angular/master
 </head>
 <body>
   <ul class="menu">
-    <li><a href="#!/view1">view1</a></li>
-    <li><a href="#!/view2">view2</a></li>
+    <li><a ui-sref="view1">view1</a></li>
+    <li><a ui-sref="view2">view2</a></li>
   </ul>
 
   <!--[if lt IE 7]>
       <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
   <![endif]-->
 
-  <div ng-view></div>
+  <div ui-view></div>
 
   <div>Angular seed app: v<span app-version></span></div>
 
-<<<<<<< HEAD
-  <!-- build:js js/seed.min.js -->
-  <script src="lib/angular/angular.js"></script>
-  <script src="lib/angular/angular-route.js"></script>
-  <script src="js/app.js"></script>
-  <script src="js/services.js"></script>
-  <script src="js/controllers.js"></script>
-  <script src="js/filters.js"></script>
-  <script src="js/directives.js"></script>
-  <!-- endbuild -->
-=======
   <!-- In production use:
   <script src="//ajax.googleapis.com/ajax/libs/angularjs/x.x.x/angular.min.js"></script>
   -->
   <script src="bower_components/angular/angular.js"></script>
-  <script src="bower_components/angular-route/angular-route.js"></script>
+  <script src="bower_components/angular-ui-router/release/angular-ui-router.js"></script>
   <script src="app.js"></script>
   <script src="view1/view1.js"></script>
   <script src="view2/view2.js"></script>
   <script src="components/version/version.js"></script>
   <script src="components/version/version-directive.js"></script>
   <script src="components/version/interpolate-filter.js"></script>
->>>>>>> angular/master
 </body>
 </html>
diff --git a/app/view1/view1.js b/app/view1/view1.js
@@ -1,14 +1,15 @@
 'use strict';
 
-angular.module('myApp.view1', ['ngRoute'])
+angular.module('myApp.view1', ['ui.router'])
 
-.config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/view1', {
+.config(['$stateProvider', function($stateProvider) {
+  $stateProvider.state('view1', {
+    url: '/view1',
     templateUrl: 'view1/view1.html',
     controller: 'View1Ctrl'
   });
 }])
 
 .controller('View1Ctrl', [function() {
 
-}]);
+}]);
diff --git a/app/view2/view2.js b/app/view2/view2.js
@@ -1,14 +1,15 @@
 'use strict';
 
-angular.module('myApp.view2', ['ngRoute'])
+angular.module('myApp.view2', ['ui.router'])
 
-.config(['$routeProvider', function($routeProvider) {
-  $routeProvider.when('/view2', {
+.config(['$stateProvider', function($stateProvider) {
+  $stateProvider.state('view2', {
+    url: '/view2',
     templateUrl: 'view2/view2.html',
     controller: 'View2Ctrl'
   });
 }])
 
 .controller('View2Ctrl', [function() {
 
-}]);
+}]);
diff --git a/bower.json b/bower.json
@@ -7,9 +7,9 @@
   "private": true,
   "dependencies": {
     "angular": "~1.5.0",
-    "angular-route": "~1.5.0",
     "angular-loader": "~1.5.0",
     "angular-mocks": "~1.5.0",
-    "html5-boilerplate": "^5.3.0"
+    "html5-boilerplate": "^5.3.0",
+    "angular-ui-router": "^0.3.1"
   }
 }
diff --git a/karma.conf.js b/karma.conf.js
@@ -6,7 +6,7 @@ module.exports = function(config) {
 
     files: [
       'bower_components/angular/angular.js',
-      'bower_components/angular-route/angular-route.js',
+      'bower_components/angular-ui-router/release/angular-ui-router.js',
       'bower_components/angular-mocks/angular-mocks.js',
       'components/**/*.js',
       'view*/**/*.js'

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,9 @@`
`7`	`7`	`"private": true,`
`8`	`8`	`"dependencies": {`
`9`	`9`	`"angular": "~1.5.0",`
`10`		`- "angular-route": "~1.5.0",`
`11`	`10`	`"angular-loader": "~1.5.0",`
`12`	`11`	`"angular-mocks": "~1.5.0",`
`13`		`- "html5-boilerplate": "^5.3.0"`
	`12`	`+ "html5-boilerplate": "^5.3.0",`
	`13`	`+ "angular-ui-router": "^0.3.1"`
`14`	`14`	`}`
`15`	`15`	`}`