Added all missing controllers

themitvp · Dec 7, 2015 · 0dce77a · 0dce77a
1 parent 84dee78
commit 0dce77a
Show file tree

Hide file tree

Showing 20 changed files with 97 additions and 35 deletions.
diff --git a/static/javascripts/controllers/extra/extrafunController.js b/static/javascripts/controllers/extra/extrafunController.js
@@ -0,0 +1,6 @@
+app.controller('extrafunController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Extra Fun!');
+});
diff --git a/static/javascripts/controllers/extra/italyController.js b/static/javascripts/controllers/extra/italyController.js
@@ -0,0 +1,6 @@
+app.controller('italyController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Italy');
+});
diff --git a/static/javascripts/controllers/extra/transfersController.js b/static/javascripts/controllers/extra/transfersController.js
@@ -0,0 +1,6 @@
+app.controller('transfersController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Best Transfers');
+});
diff --git a/...javascripts/controllers/homeController.js → ...cripts/controllers/home/homeController.js b/...javascripts/controllers/homeController.js → ...cripts/controllers/home/homeController.js
diff --git a/...javascripts/controllers/mainController.js → ...cripts/controllers/home/mainController.js b/...javascripts/controllers/mainController.js → ...cripts/controllers/home/mainController.js
diff --git a/...ipts/controllers/communitiesController.js → ...rs/socialnetwork/communitiesController.js b/...ipts/controllers/communitiesController.js → ...rs/socialnetwork/communitiesController.js
diff --git a/static/javascripts/controllers/socialnetwork/degreeController.js b/static/javascripts/controllers/socialnetwork/degreeController.js
@@ -0,0 +1,6 @@
+app.controller('degreeController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Degree Distribution');
+});
diff --git a/static/javascripts/controllers/socialnetwork/influentialController.js b/static/javascripts/controllers/socialnetwork/influentialController.js
@@ -0,0 +1,6 @@
+app.controller('influentialController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Most Influential Players');
+});
diff --git a/...ipts/controllers/interactiveController.js → ...rs/socialnetwork/interactiveController.js b/...ipts/controllers/interactiveController.js → ...rs/socialnetwork/interactiveController.js
@@ -3,7 +3,7 @@ app.controller('interactiveController', function ($scope, $http, $location, $rou
     $scope.$routeSegment = $routeSegment;
     $scope.selectednode = "test";
 
-    Page.setTitle('Interactive Network Graph');
+    Page.setTitle('Interactive Graph');
 
     $scope.init = function() {
         $scope.nodes = [];

diff --git a/static/javascripts/controllers/socialnetwork/loyalController.js b/static/javascripts/controllers/socialnetwork/loyalController.js
@@ -0,0 +1,6 @@
+app.controller('loyalController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Old Players Are More Loyal');
+});
diff --git a/static/javascripts/controllers/socialnetwork/paradoxController.js b/static/javascripts/controllers/socialnetwork/paradoxController.js
@@ -0,0 +1,6 @@
+app.controller('paradoxController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Friendship Paradox');
+});
diff --git a/static/javascripts/controllers/socialnetwork/playerindexController.js b/static/javascripts/controllers/socialnetwork/playerindexController.js
@@ -0,0 +1,6 @@
+app.controller('playerindexController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Lord Bendtner Index');
+});
diff --git a/...ts/controllers/socialnetworkController.js → .../socialnetwork/socialnetworkController.js b/...ts/controllers/socialnetworkController.js → .../socialnetwork/socialnetworkController.js
@@ -1,12 +1,6 @@
-app.controller('socialnetworkController', function ($scope, $http, $location, $routeSegment, Page, socialnetworkService) {
+app.controller('socialnetworkController', function ($scope, $http, $location, $routeSegment, Page) {
     $scope.Page = Page;
     $scope.$routeSegment = $routeSegment;
 
     Page.setTitle('Social Network');
-
-    $scope.init = function() {
-
-    };
-
-    $scope.init();
 });
diff --git a/static/javascripts/controllers/wiki/marketvalueController.js b/static/javascripts/controllers/wiki/marketvalueController.js
@@ -0,0 +1,6 @@
+app.controller('marketvalueController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Market Value');
+});
diff --git a/static/javascripts/controllers/wiki/playerpositionController.js b/static/javascripts/controllers/wiki/playerpositionController.js
@@ -0,0 +1,6 @@
+app.controller('playerpositionController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Player Position');
+});
diff --git a/static/javascripts/controllers/wiki/wikiController.js b/static/javascripts/controllers/wiki/wikiController.js
@@ -0,0 +1,6 @@
+app.controller('wikiController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('Wikipedia Pages');
+});
diff --git a/static/javascripts/controllers/wiki/wordcloudController.js b/static/javascripts/controllers/wiki/wordcloudController.js
@@ -0,0 +1,6 @@
+app.controller('wordcloudController', function ($scope, $http, $location, $routeSegment, Page) {
+    $scope.Page = Page;
+    $scope.$routeSegment = $routeSegment;
+
+    Page.setTitle('WordCloud');
+});
diff --git a/static/javascripts/controllers/wikiController.js b/static/javascripts/controllers/wikiController.js
diff --git a/templates/javascripts.html b/templates/javascripts.html
@@ -22,9 +22,24 @@
 <script type="text/javascript" src="{% static 'javascripts/services/socialnetworkService.js' %}"></script>
 <script type="text/javascript" src="{% static 'javascripts/services/classifierService.js' %}"></script>
 
-<script type="text/javascript" src="{% static 'javascripts/controllers/mainController.js' %}"></script>
-<script type="text/javascript" src="{% static 'javascripts/controllers/homeController.js' %}"></script>
-<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetworkController.js' %}"></script>
-<script type="text/javascript" src="{% static 'javascripts/controllers/interactiveController.js' %}"></script>
-<script type="text/javascript" src="{% static 'javascripts/controllers/wikiController.js' %}"></script>
-<script type="text/javascript" src="{% static 'javascripts/controllers/communitiesController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/home/mainController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/home/homeController.js' %}"></script>
+
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/socialnetworkController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/communitiesController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/degreeController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/influentialController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/interactiveController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/loyalController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/paradoxController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/socialnetwork/playerindexController.js' %}"></script>
+
+<script type="text/javascript" src="{% static 'javascripts/controllers/wiki/wikiController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/wiki/marketvalueController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/wiki/playerpositionController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/wiki/wordcloudController.js' %}"></script>
+
+<script type="text/javascript" src="{% static 'javascripts/controllers/extra/extrafunController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/extra/italyController.js' %}"></script>
+<script type="text/javascript" src="{% static 'javascripts/controllers/extra/transfersController.js' %}"></script>
+
diff --git a/templates/sidebar.html b/templates/sidebar.html
@@ -11,7 +11,7 @@
 					<a href="/network/degree">Degree Distribution</a>
 				</li>
 				<li ng-class="{ 'active': isActive('/network/playerindex')}">
-					<a href="/network/playerindex">The Player Index</a>
+					<a href="/network/playerindex">Lord Bendtner Index</a>
 				</li>
 				<li ng-class="{ 'active': isActive('/network/influential')}">
 					<a href="/network/influential">Most Influential Players</a>
@@ -25,7 +25,7 @@
 				<li ng-class="{ 'active': isActive('/network/communities')}">
 					<a href="/network/communities">Communities</a>
 				</li>
-				<li ng-class="{ 'active': isActive('/network/interactive)}">
+				<li ng-class="{ 'active': isActive('/network/interactive')}">
 					<a href="/network/interactive">Interactive Graph</a>
 				</li>
 			</ul>