Skip to content

Commit

Permalink
feat: ui-router for routing
Browse files Browse the repository at this point in the history
This commit adds in ui-router to the bower dependencies, removes
ngRoute, and adjusts the code to work with ui-router.
  • Loading branch information
jniles committed Mar 31, 2016
1 parent 9fa323d commit 1c97e63
Show file tree
Hide file tree
Showing 9 changed files with 264 additions and 292 deletions.
5 changes: 3 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"dependencies": {
"angular": "^1.5.0",
"angular-bootstrap": "^1.2.1",
"angular-route": "^1.5.0",
"angular-sanitize": "^1.5.0",
"angular-translate": "^2.10.0",
"angular-translate-loader-static-files": "^2.10.0",
Expand All @@ -26,13 +25,15 @@
"ng-file-upload": "^12.0.1",
"ng-file-upload-shim": "^12.0.1",
"angular-ui-grid": "^3.1.1",
"angular-ui-router": "^0.2.18",
"bootstrap": "~3.3.6",
"angular-moment": "^1.0.0",
"moment": "^2.11.2",
"angular-dynamic-locale": "~0.1.29",
"angular-messages": "^1.5.0",
"ngstorage": "^0.3.10",
"angular-ui-router": "^0.2.18"
"Chart.js": "^1.0.2",
"angular-chart.js": "^0.9.0"
},
"resolutions": {
"angular": "^1.5.0"
Expand Down
2 changes: 1 addition & 1 deletion client/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ <h4><a class="title-content">{{AppCtrl.projectName}}</a></h4>
</div>
<!-- End page -->

<div class="flex-view" ng-view></div>
<div class="flex-view" ui-view></div>
</div>
</div>

Expand Down
Loading

0 comments on commit 1c97e63

Please sign in to comment.