From f8dea21292b2ddc25a2a9dd5cb99040e07faed94 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sat, 11 Jul 2015 20:36:10 -0400
Subject: [PATCH] renamed the controllers to not include the word controller.
---
dist/index.html | 18 +++++++++---------
dist/js/analyzerController.js | 3 ---
dist/js/app.js | 12 ++++++------
.../analyzer.dataModel.js} | 2 +-
dist/js/controllers/analyzer.js | 3 +++
.../charts.js} | 2 +-
.../header.js} | 2 +-
.../{homeController.js => controllers/home.js} | 2 +-
dist/js/controllers/uppercase.js | 3 +++
dist/js/controllers/userToggle.js | 3 +++
dist/js/{userService.js => services/user.js} | 0
dist/js/uppercaseController.js | 3 ---
dist/js/userToggleController.js | 3 ---
13 files changed, 28 insertions(+), 28 deletions(-)
delete mode 100644 dist/js/analyzerController.js
rename dist/js/{dataModelController.js => controllers/analyzer.dataModel.js} (98%)
create mode 100644 dist/js/controllers/analyzer.js
rename dist/js/{chartsController.js => controllers/charts.js} (98%)
rename dist/js/{headerController.js => controllers/header.js} (90%)
rename dist/js/{homeController.js => controllers/home.js} (76%)
create mode 100644 dist/js/controllers/uppercase.js
create mode 100644 dist/js/controllers/userToggle.js
rename dist/js/{userService.js => services/user.js} (100%)
delete mode 100644 dist/js/uppercaseController.js
delete mode 100644 dist/js/userToggleController.js
diff --git a/dist/index.html b/dist/index.html
index ec9d1dd..a9c06bf 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -26,7 +26,7 @@
</p>
<![endif]-->
- <div ng-controller="headerController">
+ <div ng-controller="header">
<header headroom
class="header"
tolerance="5"
@@ -70,13 +70,13 @@
</div>
<script src="js/app.js"></script>
- <script src="js/userService.js"></script>
- <script src="js/headerController.js"></script>
- <script src="js/homeController.js"></script>
- <script src="js/uppercaseController.js"></script>
- <script src="js/chartsController.js"></script>
- <script src="js/userToggleController.js"></script>
- <script src="js/analyzerController.js"></script>
- <script src="js/dataModelController.js"></script>
+ <script src="js/services/user.js"></script>
+ <script src="js/controllers/header.js"></script>
+ <script src="js/controllers/home.js"></script>
+ <script src="js/controllers/uppercase.js"></script>
+ <script src="js/controllers/charts.js"></script>
+ <script src="js/controllers/userToggle.js"></script>
+ <script src="js/controllers/analyzer.js"></script>
+ <script src="js/controllers/analyzer.dataModel.js"></script>
</body>
</html>
diff --git a/dist/js/analyzerController.js b/dist/js/analyzerController.js
deleted file mode 100644
index 8643bfe..0000000
--- a/dist/js/analyzerController.js
+++ /dev/null
@@ -1,3 +0,0 @@
-app.controller('analyzerController', ['$scope', function ($scope) {
- $scope.navSelected = "dataModel";
-}]);
diff --git a/dist/js/app.js b/dist/js/app.js
index 2ce9fd1..6bfccbb 100644
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -4,17 +4,17 @@ app.config(function ($stateProvider, $urlRouterProvider) {
$stateProvider
.state('home', {
url: '/',
- controller: 'homeController',
+ controller: 'home',
templateUrl: 'views/home.html'
})
.state('charts', {
url: '/charts',
- controller: 'chartsController',
+ controller: 'charts',
templateUrl: 'views/charts.html'
})
.state('userToggle', {
url: '/userToggle',
- controller: 'userToggleController',
+ controller: 'userToggle',
templateUrl: 'views/userToggle.html'
})
.state('lorem', {
@@ -23,17 +23,17 @@ app.config(function ($stateProvider, $urlRouterProvider) {
})
.state('analyzer', {
url: '/analyzer',
- controller: 'analyzerController',
+ controller: 'analyzer',
templateUrl: 'views/analyzer.html'
})
.state('analyzer.dataModel', {
url: '/dataModel',
- controller: 'dataModelController',
+ controller: 'analyzer.dataModel',
templateUrl: 'views/analyzer.dataModel.html'
})
.state('details', {
url: '/uppercase/:name',
- controller: 'uppercaseController',
+ controller: 'uppercase',
templateUrl: 'views/uppercase.html'
});
$urlRouterProvider.otherwise('/');
diff --git a/dist/js/dataModelController.js b/dist/js/controllers/analyzer.dataModel.js
similarity index 98%
rename from dist/js/dataModelController.js
rename to dist/js/controllers/analyzer.dataModel.js
index 4654264..fc999c0 100644
--- a/dist/js/dataModelController.js
+++ b/dist/js/controllers/analyzer.dataModel.js
@@ -1,4 +1,4 @@
-app.controller('dataModelController', ['$scope', function ($scope) {
+app.controller('analyzer.dataModel', ['$scope', function ($scope) {
$scope.datapoints = [
{
"key": "educationMax",
diff --git a/dist/js/controllers/analyzer.js b/dist/js/controllers/analyzer.js
new file mode 100644
index 0000000..a7c5eb1
--- /dev/null
+++ b/dist/js/controllers/analyzer.js
@@ -0,0 +1,3 @@
+app.controller('analyzer', ['$scope', function ($scope) {
+ $scope.navSelected = "dataModel";
+}]);
diff --git a/dist/js/chartsController.js b/dist/js/controllers/charts.js
similarity index 98%
rename from dist/js/chartsController.js
rename to dist/js/controllers/charts.js
index e17fa51..c58385c 100644
--- a/dist/js/chartsController.js
+++ b/dist/js/controllers/charts.js
@@ -1,4 +1,4 @@
-app.controller('chartsController', ['$scope', function ($scope) {
+app.controller('charts', ['$scope', function ($scope) {
//$scope.exampleData = [
// {
diff --git a/dist/js/headerController.js b/dist/js/controllers/header.js
similarity index 90%
rename from dist/js/headerController.js
rename to dist/js/controllers/header.js
index 74dcdf1..716e0a2 100644
--- a/dist/js/headerController.js
+++ b/dist/js/controllers/header.js
@@ -1,4 +1,4 @@
-app.controller('headerController', ['$scope', 'user', function($scope, user) {
+app.controller('header', ['$scope', 'user', function($scope, user) {
$scope.user = user;
$scope.unreadNotifications = false;
diff --git a/dist/js/homeController.js b/dist/js/controllers/home.js
similarity index 76%
rename from dist/js/homeController.js
rename to dist/js/controllers/home.js
index 676a632..49db507 100644
--- a/dist/js/homeController.js
+++ b/dist/js/controllers/home.js
@@ -1,4 +1,4 @@
-app.controller('homeController', ['$scope', function ($scope) {
+app.controller('home', ['$scope', function ($scope) {
$scope.people = [
{
text: 'Jeffrey',
diff --git a/dist/js/controllers/uppercase.js b/dist/js/controllers/uppercase.js
new file mode 100644
index 0000000..5c79342
--- /dev/null
+++ b/dist/js/controllers/uppercase.js
@@ -0,0 +1,3 @@
+app.controller('uppercase', ['$scope', '$stateParams', function($scope, $stateParams) {
+ $scope.name = $stateParams.name;
+}]);
diff --git a/dist/js/controllers/userToggle.js b/dist/js/controllers/userToggle.js
new file mode 100644
index 0000000..31b3c4b
--- /dev/null
+++ b/dist/js/controllers/userToggle.js
@@ -0,0 +1,3 @@
+app.controller('userToggle', ['$scope', 'user', function ($scope, user) {
+ $scope.user = user;
+}]);
diff --git a/dist/js/userService.js b/dist/js/services/user.js
similarity index 100%
rename from dist/js/userService.js
rename to dist/js/services/user.js
diff --git a/dist/js/uppercaseController.js b/dist/js/uppercaseController.js
deleted file mode 100644
index eb30992..0000000
--- a/dist/js/uppercaseController.js
+++ /dev/null
@@ -1,3 +0,0 @@
-app.controller('uppercaseController', ['$scope', '$stateParams', function($scope, $stateParams) {
- $scope.name = $stateParams.name;
-}]);
diff --git a/dist/js/userToggleController.js b/dist/js/userToggleController.js
deleted file mode 100644
index 1c22beb..0000000
--- a/dist/js/userToggleController.js
+++ /dev/null
@@ -1,3 +0,0 @@
-app.controller('userToggleController', ['$scope', 'user', function ($scope, user) {
- $scope.user = user;
-}]);
--
GitLab