attempting to clean up community app, moving data to a service

Author: Parth Shah

app/community/community.routes.js

@@ -28,12 +28,6 @@
         data: {
           authRequired: false,
           title: 'Community Members'
-        },
-        resolve: {
-          membersData: function($http) {
-            // TODO this needs to move to a service
-            return $http.get('community/mock-data/members.json', {skipAuthorization: true});
-          }
         }
       },
 
@@ -45,14 +39,8 @@
         controllerAs: 'ctrl',
         data: {
           title: 'Community Statistics'
-        },
-        resolve: {
-          statData: function($http) {
-            // TODO this needs to move to a service
-            return $http.get('community/mock-data/statistics.json', {skipAuthorization: true});
-          }
         }
-      },
+      }
     };
 
     angular.forEach(states, function(state, name) {

app/community/members.controller.js

@@ -3,27 +3,27 @@
 
   angular.module('tc.community').controller('MembersController', MembersController);
 
-  MembersController.$inject = ['membersData', '$http', 'CONSTANTS'];
+  MembersController.$inject = ['CommunityDataService', 'CONSTANTS'];
 
-  function MembersController(membersData, $http, CONSTANTS) {
+  function MembersController(CommunityDataService, CONSTANTS) {
+    var ctrl = this;
+    ctrl.notSearch = true;
+    ctrl.showing = 'list';
+    ctrl.domain = CONSTANTS.domain;
+    ctrl.currentMonth = 'October 2015';
+    ctrl.memberLeaderboard = [];
+    ctrl.copilots = [];
+    CommunityDataService.getMembersData()
+      .then(function(data) {
+        ctrl.memberLeaderboard = data.memberLeaderboard;
+        ctrl.copilots = data.copilots;
+      });
 
-    this.notSearch = true;
-    this.showing = 'list';
-    this.domain = CONSTANTS.domain;
-    this.currentMonth = 'October 2015';
-    this.memberLeaderboard = membersData.data.memberLeaderboard;
-    this.copilots = membersData.data.copilots;
-    this.search = function() {
-      if (this.keywords) {
-        window.location.replace('/search?s=' + this.keywords + '&scope=member');
-
-        //$http.get('community/mock-data/search-result.json')
-        //    .success(function(data) {
-        //        this.searchResult = data.result;
-        //        this.notSearch = false;
-        //    }.bind(this));
+    ctrl.search = function() {
+      if (ctrl.keywords) {
+        window.location.replace('/search?s=' + ctrl.keywords + '&scope=member');
       } else {
-        this.notSearch = true;
+        ctrl.notSearch = true;
       }
     };
   }

app/community/mock-data/avatar.png

@@ -1,27 +1,33 @@
-(function () {
+(function() {
   'use strict';
 
   angular.module('tc.community').controller('StatisticsController', StatisticsController);
 
-  StatisticsController.$inject = ['statData', 'StatisticsService', 'CONSTANTS'];
+  StatisticsController.$inject = ['CommunityDataService', 'StatisticsService', 'CONSTANTS'];
 
-  function StatisticsController(statData, StatisticsService, CONSTANTS) {
+  function StatisticsController(CommunityDataService, StatisticsService, CONSTANTS) {
     var statsData = this;
     statsData.domain = CONSTANTS.domain;
-    statsData.SRMWinners = statData.data.SRMWinners;
-    statsData.MarathonWinner = statData.data.MarathonWinner;
+    statsData.SRMWinners = [];
+    statsData.MarathonWinner = [];
     statsData.TopPerformers = [];
 
-    StatisticsService.getDesignTop(10).then(function (data) {
+    CommunityDataService.getStatisticsData()
+      .then(function(data) {
+        statsData.SRMWinners = data.SRMWinners;
+        statsData.MarathonWinner = data.MarathonWinner;
+      });
+
+    StatisticsService.getDesignTop(10).then(function(data) {
       statsData.TopPerformers.push({
         "contestType": "Design",
         "class": "design",
         "dataType": "Wins",
         "performers": data.plain().data
-    });
+      });
     });
 
-    StatisticsService.getDevTop(10).then(function (data) {
+    StatisticsService.getDevTop(10).then(function(data) {
       statsData.TopPerformers.push({
         "contestType": "Development",
         "class": "develop",
@@ -30,14 +36,13 @@
       });
     });
 
-    StatisticsService.getDataTop(10).then(function (data) {
+    StatisticsService.getDataTop(10).then(function(data) {
       statsData.TopPerformers.push({
         "contestType": "Competitive Programming",
         "class": "data-science",
         "dataType": "Rating",
         "performers": data.plain().data
       });
     });
-    console.log(statsData.TopPerformers);
   }
 })();

app/community/mock-data/members.json

@@ -263,6 +263,7 @@ html
     script(src="services/authtoken.service.js")
     script(src="services/blog.service.js")
     script(src="services/challenge.service.js")
+    script(src="services/communityData.service.js")
     script(src="services/externalAccounts.service.js")
     script(src="services/helpers.service.js")
     script(src="services/image.service.js")