diff --git a/src/app/pages/dashboard/chartJs1DCtrl.js b/src/app/pages/dashboard/chartJs1DCtrl.js index 79db594..ed2a7f3 100644 --- a/src/app/pages/dashboard/chartJs1DCtrl.js +++ b/src/app/pages/dashboard/chartJs1DCtrl.js @@ -9,7 +9,7 @@ .controller('chartJs1DCtrl', chartJs1DCtrl); /** @ngInject */ - function chartJs1DCtrl($scope, baConfig, $http, $q) { + function chartJs1DCtrl($scope, baConfig, $http, $interval) { var layoutColors = baConfig.colors; var stories = []; @@ -43,43 +43,15 @@ } }; - $scope.changeData = function () { - console.log('click!') - }; - - function shuffle(o){ - for(var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x){} - return o; - } - - // function returnSessionsFromBrowserstackPromise(buildId) { - // var headers = { - // 'Authorization': 'danneh1:5gXqwjkDjBtTiLVmvsLV' - // }; - - // // var url = 'https://www.browserstack.com/automate/builds/' + buildId + '/sessions.json'; - // var url = 'https://www.browserstack.com/automate/projects.json'; - - // $http({ - // method: 'GET', - // url: url - // }).then(function(response){ - // console.log('response', response); - // }); - // } - - // returnSessionsFromBrowserstackPromise('2f7a6dca052a67852693cd3bdef03356255e0745'); - - function getPivotalStories() { var projectId = '1993279'; - // var auth = '?token=dbd3bfeb53beb6097fe299ab189e50b8'; + var version = 'v0.98'; var queryParams = [ 'token=dbd3bfeb53beb6097fe299ab189e50b8', 'limit=200', - 'filter=label:"v0.98" (label:"approved" OR label:"no approval required")' + 'filter=label:"' + version + '" (label:"approved" OR label:"no approval required")' ]; var url = 'https://www.pivotaltracker.com/services/v5/projects/' + projectId + '/stories'; @@ -123,6 +95,7 @@ }); } + $interval(getPivotalStories, 120000); getPivotalStories(); } diff --git a/src/app/pages/dashboard/chartJs3DCtrl.js b/src/app/pages/dashboard/chartJs3DCtrl.js index 48f70b1..9764922 100644 --- a/src/app/pages/dashboard/chartJs3DCtrl.js +++ b/src/app/pages/dashboard/chartJs3DCtrl.js @@ -9,24 +9,62 @@ .controller('chartJs3DCtrl', chartJs3DCtrl); /** @ngInject */ - function chartJs3DCtrl($scope) { - $scope.labels =["May", "Jun", "Jul", "Aug", "Sep"]; - $scope.data = [ - [65, 59, 90, 81, 56], - [28, 48, 40, 19, 88] - ]; - $scope.series = ['Product A', 'Product B']; + function chartJs3DCtrl($scope, $http, $filter, $interval) { + var users; + var stories; + $scope.workInProgress = []; - $scope.changeData = function () { - $scope.data[0] = shuffle($scope.data[0]); - $scope.data[1] = shuffle($scope.data[1]); - }; + function getPivotalStories() { + var projectId = '1993279'; - function shuffle(o){ - for(var j, x, i = o.length; i; j = Math.floor(Math.random() * i), x = o[--i], o[i] = o[j], o[j] = x){} - return o; + var version = 'v0.98'; + + var queryParams = [ + 'token=dbd3bfeb53beb6097fe299ab189e50b8', + 'limit=200', + 'filter=label:"' + version + '" state:started (label:"approved" OR label:"no approval required")' + ]; + + var url = 'https://www.pivotaltracker.com/services/v5/projects/' + projectId + '/stories'; + + return $http({ + method: 'GET', + url: url + '?' + queryParams.join('&') + }); } + + function getPivotalUsers() { + var projectId = '1993279'; + + var auth = '?token=dbd3bfeb53beb6097fe299ab189e50b8'; + + var url = 'https://www.pivotaltracker.com/services/v5/projects/' + projectId + '/memberships'; + + $http({ + method: 'GET', + url: url + auth + }).then(function (response) { + getPivotalStories().then(function (data) { + $scope.workInProgress = []; + users = response.data; + stories = data.data; + + users.forEach(function (user) { + var items = $filter('filter')(stories, {owned_by_id: user.person.id}); + + items.forEach(function (ignore, index) { + items[index].owner = user.person; + }); + + $scope.workInProgress = $scope.workInProgress.concat(items); + }); + }); + }); + } + + $interval(getPivotalUsers, 120000); + getPivotalUsers(); } })(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboard.html b/src/app/pages/dashboard/dashboard.html index 54f16b2..8930636 100644 --- a/src/app/pages/dashboard/dashboard.html +++ b/src/app/pages/dashboard/dashboard.html @@ -1,96 +1,40 @@
-
-
+
+
+
+
+ + +
-
-
- - -
-
- - -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- - -
-
-
-
- +
+ + +
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
{{story.owner.name}} #{{story.id}}
+

{{story.name}}

+
+
+
+ \ No newline at end of file diff --git a/src/app/theme/components/contentTop/contentTop.html b/src/app/theme/components/contentTop/contentTop.html index 10304c7..1c61faf 100644 --- a/src/app/theme/components/contentTop/contentTop.html +++ b/src/app/theme/components/contentTop/contentTop.html @@ -1,9 +1 @@ -
-

{{ activePageTitle }}

- - -
\ No newline at end of file +

{{ activePageTitle }}

\ No newline at end of file diff --git a/src/app/theme/components/pageTop/pageTop.html b/src/app/theme/components/pageTop/pageTop.html index 33919c2..2d318e2 100644 --- a/src/app/theme/components/pageTop/pageTop.html +++ b/src/app/theme/components/pageTop/pageTop.html @@ -1,24 +1,13 @@
- +
- - -
- -
- - +
\ No newline at end of file diff --git a/src/index.html b/src/index.html index 21ac58e..74699c6 100644 --- a/src/index.html +++ b/src/index.html @@ -6,7 +6,8 @@ Blur Admin - + + @@ -32,26 +33,10 @@
-
- +
- - - -
diff --git a/src/sass/theme/_layout.scss b/src/sass/theme/_layout.scss index 4742f81..a55b805 100644 --- a/src/sass/theme/_layout.scss +++ b/src/sass/theme/_layout.scss @@ -70,7 +70,7 @@ a { .al-main { margin-left: $left-space; - padding: 66px 0 34px 0; + padding-top: 66px; min-height: 500px; } diff --git a/src/sass/theme/components/_contentTop.scss b/src/sass/theme/components/_contentTop.scss index aeec36a..92e30f7 100644 --- a/src/sass/theme/components/_contentTop.scss +++ b/src/sass/theme/components/_contentTop.scss @@ -11,7 +11,6 @@ h1.al-title { margin: 0; padding: 0; font-size: 24px; - text-transform: uppercase; opacity: 0.9; } diff --git a/src/sass/theme/components/_pageTop.scss b/src/sass/theme/components/_pageTop.scss index 82138e4..d6a027e 100644 --- a/src/sass/theme/components/_pageTop.scss +++ b/src/sass/theme/components/_pageTop.scss @@ -14,17 +14,22 @@ } a.al-logo { - color: $sidebar-text; + color: white; display: block; - font-size: 24px; + font-size: 28px; font-family: $font-family; white-space: nowrap; float: left; outline: none !important; line-height: 60px; + position: relative; + right: 18px; + top: 3px; - span { - color: $primary; + .path2:before { + color: white; + position: relative; + right: 14px; } } diff --git a/src/sass/theme/conf/_variables.scss b/src/sass/theme/conf/_variables.scss index 46ceaab..481a87f 100644 --- a/src/sass/theme/conf/_variables.scss +++ b/src/sass/theme/conf/_variables.scss @@ -1,4 +1,4 @@ -$font-family: 'Roboto', sans-serif; +$font-family: 'Source Sans Pro', sans-serif; $activelink: $primary; $hoverlink: $primary-dark;