Merge pull request #2 from pmbenjamin/new-page

pbnj · pbnj · commit 3831fd5c1af9 · 2016-05-23T14:27:33.000-07:00
wip
diff --git a/data/projects.json b/data/projects.json
@@ -1,3 +1,3 @@
 {
-  "All projects": ["awesome-devsecops", "controlplane", "heroes", "raindance", "radar", "assumer", "playbook", "devsecops", "forecast", "firebolt", "weatherman", "foghorn", "experiments", "catv", "science", "aws-policies", "ssl_checks"]
+  "AllProjects": ["awesome-devsecops", "controlplane", "heroes", "raindance", "radar", "assumer", "playbook", "devsecops", "forecast", "firebolt", "weatherman", "foghorn", "experiments", "catv", "science", "aws-policies", "ssl_checks"]
 }
diff --git a/js/main.js b/js/main.js
@@ -167,72 +167,60 @@ var bootcampData = {
 
 var projectsData = { "All projects": ["awesome-devsecops", "controlplane", "heroes", "raindance", "radar", "assumer", "playbook", "devsecops", "forecast", "firebolt", "weatherman", "foghorn", "experiments", "catv", "science", "aws-policies", "ssl_checks"] };
 app.controller('MainCtrl', ['$scope', 'filterFilter', '$anchorScroll',
-function($scope, filterFilter, $anchorScroll) {
-  var self = this;
-  self.projects = projectsData;
-  self.bootcamp = bootcampData;
+    function($scope, filterFilter, $anchorScroll) {
+      var self = this;
+      self.projects = projectsData;
+      self.bootcamp = bootcampData;
 
-  $.ajax({
-    url: 'https://raw.githubusercontent.com/devsecops/devsecops.github.io/master/data/bootcamp.json',
-    dataType: 'jsonp',
-    jsonpCallback: 'JSON_CALLBACK',
-    success: function(data) {
-      var projects = data[0].Bootcamp;
-      $scope.currentPage = 1; //current page
-      $scope.maxSize = 5; //pagination max size
-      $scope.entryLimit = 36; //max rows for data table
+      $.ajax({
+        url: 'https://raw.githubusercontent.com/devsecops/devsecops.github.io/master/data/projects.json',
+        dataType: 'json',
+        // jsonpCallback: 'JSON_CALLBACK',
+        success: function(data) {
+          var projects = data.AllProjects;
+          $scope.currentPage = 1; //current page
+          $scope.maxSize = 5; //pagination max size
+          $scope.entryLimit = 36; //max rows for data table
 
-      /* init pagination with $scope.list */
-      $scope.noOfRepos = projects.length;
-      $scope.noOfPages = Math.ceil($scope.noOfRepos / $scope.entryLimit);
-      $scope.resultsSectionTitle = 'All Repos';
-      $scope.pageChanged = function() {
-        $anchorScroll();
-      };
+          /* init pagination with $scope.list */
+          $scope.noOfRepos = projects.length;
+          $scope.noOfPages = Math.ceil($scope.noOfRepos / $scope.entryLimit);
+          $scope.resultsSectionTitle = 'All Repos';
+          $scope.pageChanged = function() {
+            $anchorScroll();
+          };
 
-      $scope.$watch('searchText', function(term) {
-        // Create $scope.filtered and then calculate $scope.noOfPages, no racing!
-        $scope.filtered = filterFilter(projects, term);
-        $scope.noOfRepos = $scope.filtered.length;
-        $scope.noOfPages = Math.ceil($scope.noOfRepos / $scope.entryLimit);
-        $scope.resultsSectionTitle = (!term) ? 'All Repos' : (($scope.noOfRepos === 0) ? 'Search results' : ($scope.noOfRepos + ' repositories found'));
-      });
-
-      var featuredProjects = new Array();
+          $scope.$watch('searchText', function(term) {
+            // Create $scope.filtered and then calculate $scope.noOfPages, no racing!
+            $scope.filtered = filterFilter(projects, term);
+            $scope.noOfRepos = $scope.filtered.length;
+            $scope.noOfPages = Math.ceil($scope.noOfRepos / $scope.entryLimit);
+            $scope.resultsSectionTitle = (!term) ? 'All Repos' : (($scope.noOfRepos === 0) ? 'Search results' : ($scope.noOfRepos + ' repositories found'));
+          });
 
-      self.featured.forEach(function(name) {
-        for (var i = 0; i < projects.length; i++) {
-          var project = projects[i];
-          if (project.Name == name) {
-            featuredProjects.push(project);
-            return;
+          self.projects = projects;
+          self.featuredProjects = featuredProjects;
+          $scope.$apply();
+        }
+      });
+      $.ajax({
+        url: 'https://popularrepostg.blob.core.windows.net/popularrepos/projectssummary.json',
+        dataType: 'jsonp',
+        jsonpCallback: 'JSON_CALLBACK',
+        success: function(stats) {
+          if (stats !== null) {
+            $scope.overAllStats = stats[0];
           }
         }
       });
-
-      self.projects = projects;
-      self.featuredProjects = featuredProjects;
-      $scope.$apply();
     }
-  });
-  $.ajax({
-    url: 'https://popularrepostg.blob.core.windows.net/popularrepos/projectssummary.json',
-    dataType: 'jsonp',
-    jsonpCallback: 'JSON_CALLBACK',
-    success: function(stats) {
-      if (stats !== null) {
-        $scope.overAllStats = stats[0];
+  ])
+  .filter('startFrom', function() {
+    return function(input, start) {
+      if (input) {
+        start = +start; //parse to int
+        return input.slice(start);
       }
-    }
+      return [];
+    };
   });
-}
-])
-.filter('startFrom', function() {
-  return function(input, start) {
-    if (input) {
-      start = +start; //parse to int
-      return input.slice(start);
-    }
-    return [];
-  };
-});
diff --git a/projects.json b/projects.json

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`{`
`2`		`- "All projects": ["awesome-devsecops", "controlplane", "heroes", "raindance", "radar", "assumer", "playbook", "devsecops", "forecast", "firebolt", "weatherman", "foghorn", "experiments", "catv", "science", "aws-policies", "ssl_checks"]`
	`2`	`+ "AllProjects": ["awesome-devsecops", "controlplane", "heroes", "raindance", "radar", "assumer", "playbook", "devsecops", "forecast", "firebolt", "weatherman", "foghorn", "experiments", "catv", "science", "aws-policies", "ssl_checks"]`
`3`	`3`	`}`