From 67471da0427f7f9f3685f9c48091e44e637b5139 Mon Sep 17 00:00:00 2001 From: Callum White Date: Fri, 24 Nov 2017 15:41:46 +0000 Subject: [PATCH] deleted unnecessary pages and added pivotal api call --- src/app/pages/dashboard/.DS_Store | Bin 0 -> 6148 bytes .../pages/dashboard/blurFeed/BlurFeedCtrl.js | 129 ---------------- .../dashboard/blurFeed/blurFeed.directive.js | 19 --- .../pages/dashboard/blurFeed/blurFeed.html | 33 ---- .../dashboard/calendar/dashboardCalendar.js | 15 -- src/app/pages/dashboard/chartJs1DCtrl.js | 129 ++++++++++++++++ src/app/pages/dashboard/chartJs2DCtrl.js | 32 ++++ src/app/pages/dashboard/chartJs3DCtrl.js | 32 ++++ src/app/pages/dashboard/chartJsWaveCtrl.js | 29 ++++ src/app/pages/dashboard/dashboard.html | 139 ++++++++++------- src/app/pages/dashboard/dashboard.module.js | 52 ++++++- .../DashboardCalendarCtrl.js | 64 -------- .../dashboardCalendar.directive.js | 19 --- .../dashboardCalendar/dashboardCalendar.html | 1 - .../DashboardLineChartCtrl.js | 126 --------------- .../dashboardLineChart.directive.js | 19 --- .../dashboardLineChart.html | 1 - .../dashboardMap/DashboardMapCtrl.js | 104 ------------- .../dashboardMap/dashboardMap.directive.js | 19 --- .../dashboard/dashboardMap/dashboardMap.html | 1 - .../DashboardPieChartCtrl.js | 75 --------- .../dashboardPieChart.directive.js | 19 --- .../dashboardPieChart/dashboardPieChart.html | 14 -- .../dashboardTodo/DashboardTodoCtrl.js | 55 ------- .../dashboardTodo/dashboardTodo.directive.js | 19 --- .../dashboardTodo/dashboardTodo.html | 18 --- .../dashboard/pieCharts/dashboardPieChart.js | 15 -- .../popularApp/popularApp.directive.js | 18 --- .../dashboard/popularApp/popularApp.html | 28 ---- .../trafficChart/TrafficChartCtrl.js | 61 -------- .../trafficChart/trafficChart.directive.js | 19 --- .../dashboard/trafficChart/trafficChart.html | 29 ---- .../pages/dashboard/weather/WeatherCtrl.js | 144 ------------------ .../dashboard/weather/weather.directive.js | 19 --- src/app/pages/dashboard/weather/weather.html | 45 ------ src/app/pages/pages.module.js | 4 +- 36 files changed, 360 insertions(+), 1185 deletions(-) create mode 100644 src/app/pages/dashboard/.DS_Store delete mode 100644 src/app/pages/dashboard/blurFeed/BlurFeedCtrl.js delete mode 100644 src/app/pages/dashboard/blurFeed/blurFeed.directive.js delete mode 100644 src/app/pages/dashboard/blurFeed/blurFeed.html delete mode 100644 src/app/pages/dashboard/calendar/dashboardCalendar.js create mode 100644 src/app/pages/dashboard/chartJs1DCtrl.js create mode 100644 src/app/pages/dashboard/chartJs2DCtrl.js create mode 100644 src/app/pages/dashboard/chartJs3DCtrl.js create mode 100644 src/app/pages/dashboard/chartJsWaveCtrl.js delete mode 100644 src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js delete mode 100644 src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.directive.js delete mode 100644 src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html delete mode 100644 src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js delete mode 100644 src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.directive.js delete mode 100644 src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.html delete mode 100644 src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js delete mode 100644 src/app/pages/dashboard/dashboardMap/dashboardMap.directive.js delete mode 100644 src/app/pages/dashboard/dashboardMap/dashboardMap.html delete mode 100644 src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js delete mode 100644 src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.directive.js delete mode 100644 src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.html delete mode 100644 src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js delete mode 100644 src/app/pages/dashboard/dashboardTodo/dashboardTodo.directive.js delete mode 100644 src/app/pages/dashboard/dashboardTodo/dashboardTodo.html delete mode 100644 src/app/pages/dashboard/pieCharts/dashboardPieChart.js delete mode 100644 src/app/pages/dashboard/popularApp/popularApp.directive.js delete mode 100644 src/app/pages/dashboard/popularApp/popularApp.html delete mode 100644 src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js delete mode 100644 src/app/pages/dashboard/trafficChart/trafficChart.directive.js delete mode 100644 src/app/pages/dashboard/trafficChart/trafficChart.html delete mode 100644 src/app/pages/dashboard/weather/WeatherCtrl.js delete mode 100644 src/app/pages/dashboard/weather/weather.directive.js delete mode 100644 src/app/pages/dashboard/weather/weather.html diff --git a/src/app/pages/dashboard/.DS_Store b/src/app/pages/dashboard/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6 GIT binary patch literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 -
-
- -
-
- - -
-
-
- {{ ::message.author }} {{ ::message.surname}} -
-
- {{message.header}} {{::message.text}} -
-
- - - -
-
-
- {{::message.time}} -
-
- {{::message.ago}} -
-
-
-
- diff --git a/src/app/pages/dashboard/calendar/dashboardCalendar.js b/src/app/pages/dashboard/calendar/dashboardCalendar.js deleted file mode 100644 index 991a4d0..0000000 --- a/src/app/pages/dashboard/calendar/dashboardCalendar.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .service('dashboardCalendar', dashboardCalendar); - - /** @ngInject */ - function dashboardCalendar() { - - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/chartJs1DCtrl.js b/src/app/pages/dashboard/chartJs1DCtrl.js new file mode 100644 index 0000000..bb1db42 --- /dev/null +++ b/src/app/pages/dashboard/chartJs1DCtrl.js @@ -0,0 +1,129 @@ +/** + * @author a.demeshko + * created on 12/16/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.dashboard') + .controller('chartJs1DCtrl', chartJs1DCtrl); + + /** @ngInject */ + function chartJs1DCtrl($scope, baConfig, $http, $q) { + var layoutColors = baConfig.colors; + var stories = []; + + var complete = 0; + var inProgress = 0; + var toDo = 0; + + var frontEnd = 0; + var backEnd = 0; + var devOps = 0; + + + $scope.progressLabels = ["Complete", "In progress", "To do"]; + $scope.progressData = [complete, inProgress, toDo]; + + $scope.teamLabels = ["Front end", "Back end", "Devops"]; + $scope.teamData = [frontEnd, backEnd, devOps]; + + $scope.options = { + elements: { + arc: { + borderWidth: 0 + } + }, + legend: { + display: true, + position: 'bottom', + labels: { + fontColor: layoutColors.defaultText + } + } + }; + + $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 queryParams = [ + 'token=dbd3bfeb53beb6097fe299ab189e50b8', + 'limit=200', + 'filter=label:"v0.98" (label:"approved" OR label:"no approval required")' + ]; + + var url = 'https://www.pivotaltracker.com/services/v5/projects/' + projectId + '/stories'; + + $http({ + method: 'GET', + url: url + '?' + queryParams.join('&') + }).then(function (response) { + console.log('response', response); + + stories = response.data; + complete = 0; + inProgress = 0; + toDo = 0; + frontEnd = 0; + backEnd = 0; + devOps = 0; + + stories.forEach(function (story) { + if (story.current_state === 'accepted' && story.estimate >= 0) { + complete += story.estimate; + } else if (story.current_state === 'unstarted' && story.estimate >= 0) { + toDo += story.estimate; + } else if (story.estimate >= 0) { + inProgress += story.estimate; + } + + story.labels.forEach(function (label) { + if (label.name === 'back end' && story.estimate >= 0) { + backEnd += story.estimate; + } else if (label.name === 'front end' && story.estimate >= 0) { + frontEnd += story.estimate; + } else if (label.name === 'devops' && story.estimate >= 0) { + devOps += story.estimate; + } + }); + }); + + $scope.progressData = [complete, inProgress, toDo]; + $scope.teamData = [frontEnd, backEnd, devOps]; + }); + } + + getPivotalStories(); + } + +})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/chartJs2DCtrl.js b/src/app/pages/dashboard/chartJs2DCtrl.js new file mode 100644 index 0000000..ba202d9 --- /dev/null +++ b/src/app/pages/dashboard/chartJs2DCtrl.js @@ -0,0 +1,32 @@ +/** + * @author a.demeshko + * created on 12/16/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.dashboard') + .controller('chartJs2DCtrl', chartJs2DCtrl); + + /** @ngInject */ + function chartJs2DCtrl($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']; + + + $scope.changeData = function () { + $scope.data[0] = shuffle($scope.data[0]); + $scope.data[1] = shuffle($scope.data[1]); + }; + + 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; + } + } + +})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/chartJs3DCtrl.js b/src/app/pages/dashboard/chartJs3DCtrl.js new file mode 100644 index 0000000..48f70b1 --- /dev/null +++ b/src/app/pages/dashboard/chartJs3DCtrl.js @@ -0,0 +1,32 @@ +/** + * @author a.demeshko + * created on 12/16/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.dashboard') + .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']; + + + $scope.changeData = function () { + $scope.data[0] = shuffle($scope.data[0]); + $scope.data[1] = shuffle($scope.data[1]); + }; + + 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; + } + } + +})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/chartJsWaveCtrl.js b/src/app/pages/dashboard/chartJsWaveCtrl.js new file mode 100644 index 0000000..7cb1f07 --- /dev/null +++ b/src/app/pages/dashboard/chartJsWaveCtrl.js @@ -0,0 +1,29 @@ +/** + * @author a.demeshko + * created on 12/16/15 + */ +(function () { + 'use strict'; + + angular.module('BlurAdmin.pages.dashboard') + .controller('chartJsWaveCtrl', chartJsWaveCtrl); + + /** @ngInject */ + function chartJsWaveCtrl($scope, $interval, stopableInterval) { + $scope.labels =["Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]; + $scope.data = [1, 9, 3, 4, 5, 6, 7, 8, 2].map(function(e){ + return Math.sin(e) * 25 +25; + }); + + stopableInterval.start($interval, function(){ + var tempArray = []; + var lastElement = $scope.data[$scope.data.length-1]; + for(var i = $scope.data.length-1; i > 0; i--){ + tempArray[i] = $scope.data[i-1]; + } + tempArray[0] = lastElement; + $scope.data = tempArray; + }, 400) + } + +})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboard.html b/src/app/pages/dashboard/dashboard.html index 8119ac6..54f16b2 100644 --- a/src/app/pages/dashboard/dashboard.html +++ b/src/app/pages/dashboard/dashboard.html @@ -1,63 +1,96 @@ - -
-
- -
-
- -
-
+
+
+ +
+
+ + +
+
+ + +
+
-
-
-
-
-
-
- +
+ +
+
+
+ + +
-
-
- +
+
+
+ + +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+ + +
+
+
+
--> + + diff --git a/src/app/pages/dashboard/dashboard.module.js b/src/app/pages/dashboard/dashboard.module.js index 51eedb2..3a03e59 100644 --- a/src/app/pages/dashboard/dashboard.module.js +++ b/src/app/pages/dashboard/dashboard.module.js @@ -6,7 +6,7 @@ 'use strict'; angular.module('BlurAdmin.pages.dashboard', []) - .config(routeConfig); + .config(routeConfig).config(chartJsConfig); /** @ngInject */ function routeConfig($stateProvider) { @@ -22,4 +22,52 @@ }); } -})(); + function chartJsConfig(ChartJsProvider, baConfigProvider) { + var layoutColors = baConfigProvider.colors; + // Configure all charts + ChartJsProvider.setOptions({ + chartColors: [ + layoutColors.primary, layoutColors.danger, layoutColors.warning, layoutColors.success, layoutColors.info, layoutColors.default, layoutColors.primaryDark, layoutColors.successDark, layoutColors.warningLight, layoutColors.successLight, layoutColors.primaryLight], + responsive: true, + maintainAspectRatio: false, + animation: { + duration: 2500 + }, + scale: { + gridLines: { + color: layoutColors.border + }, + scaleLabel: { + fontColor: layoutColors.defaultText + }, + ticks: { + fontColor: layoutColors.defaultText, + showLabelBackdrop: false + } + } + }); + // Configure all line charts + ChartJsProvider.setOptions('Line', { + datasetFill: false + }); + // Configure all radar charts + ChartJsProvider.setOptions('radar', { + scale: { + pointLabels: { + fontColor: layoutColors.defaultText + }, + ticks: { + maxTicksLimit: 5, + display: false + } + } + }); + // Configure all bar charts + ChartJsProvider.setOptions('bar', { + tooltips: { + enabled: false + } + }); +} + +})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js b/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js deleted file mode 100644 index f437491..0000000 --- a/src/app/pages/dashboard/dashboardCalendar/DashboardCalendarCtrl.js +++ /dev/null @@ -1,64 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('DashboardCalendarCtrl', DashboardCalendarCtrl); - - /** @ngInject */ - function DashboardCalendarCtrl(baConfig) { - var dashboardColors = baConfig.colors.dashboard; - var $element = $('#calendar').fullCalendar({ - //height: 335, - header: { - left: 'prev,next today', - center: 'title', - right: 'month,agendaWeek,agendaDay' - }, - defaultDate: '2016-03-08', - selectable: true, - selectHelper: true, - select: function (start, end) { - var title = prompt('Event Title:'); - var eventData; - if (title) { - eventData = { - title: title, - start: start, - end: end - }; - $element.fullCalendar('renderEvent', eventData, true); // stick? = true - } - $element.fullCalendar('unselect'); - }, - editable: true, - eventLimit: true, // allow "more" link when too many events - events: [ - { - title: 'All Day Event', - start: '2016-03-01', - color: dashboardColors.silverTree - }, - { - title: 'Long Event', - start: '2016-03-07', - end: '2016-03-10', - color: dashboardColors.blueStone - }, - { - title: 'Dinner', - start: '2016-03-14T20:00:00', - color: dashboardColors.surfieGreen - }, - { - title: 'Birthday Party', - start: '2016-04-01T07:00:00', - color: dashboardColors.gossipDark - } - ] - }); - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.directive.js b/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.directive.js deleted file mode 100644 index bce9df5..0000000 --- a/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('dashboardCalendar', dashboardCalendar); - - /** @ngInject */ - function dashboardCalendar() { - return { - restrict: 'E', - controller: 'DashboardCalendarCtrl', - templateUrl: 'app/pages/dashboard/dashboardCalendar/dashboardCalendar.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html b/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html deleted file mode 100644 index bea1b22..0000000 --- a/src/app/pages/dashboard/dashboardCalendar/dashboardCalendar.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js b/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js deleted file mode 100644 index 72191c4..0000000 --- a/src/app/pages/dashboard/dashboardLineChart/DashboardLineChartCtrl.js +++ /dev/null @@ -1,126 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('DashboardLineChartCtrl', DashboardLineChartCtrl); - - /** @ngInject */ - function DashboardLineChartCtrl(baConfig, layoutPaths, baUtil) { - var layoutColors = baConfig.colors; - var graphColor = baConfig.theme.blur ? '#000000' : layoutColors.primary; - var chartData = [ - { date: new Date(2012, 11), value: 0, value0: 0 }, - { date: new Date(2013, 0), value: 15000, value0: 19000}, - { date: new Date(2013, 1), value: 30000, value0: 20000}, - - { date: new Date(2013, 2), value: 25000, value0: 22000}, - { date: new Date(2013, 3), value: 21000, value0: 25000}, - { date: new Date(2013, 4), value: 24000, value0: 29000}, - { date: new Date(2013, 5), value: 31000, value0: 26000}, - { date: new Date(2013, 6), value: 40000, value0: 25000}, - { date: new Date(2013, 7), value: 37000, value0: 20000}, - { date: new Date(2013, 8), value: 18000, value0: 22000}, - { date: new Date(2013, 9), value: 5000, value0: 26000}, - { date: new Date(2013, 10), value: 40000, value0: 30000}, - { date: new Date(2013, 11), value: 20000, value0: 25000}, - { date: new Date(2014, 0), value: 5000, value0: 13000}, - - { date: new Date(2014, 1), value: 3000, value0: 13000}, - { date: new Date(2014, 2), value: 1800, value0: 13000}, - { date: new Date(2014, 3), value: 10400, value0: 13000}, - { date: new Date(2014, 4), value: 25500, value0: 13000}, - { date: new Date(2014, 5), value: 2100, value0: 13000}, - { date: new Date(2014, 6), value: 6500, value0: 13000}, - { date: new Date(2014, 7), value: 1100, value0: 13000}, - { date: new Date(2014, 8), value: 17200, value0: 13000}, - { date: new Date(2014, 9), value: 26900, value0: 13000}, - { date: new Date(2014, 10), value: 14100, value0: 13000}, - { date: new Date(2014, 11), value: 35300, value0: 13000}, - { date: new Date(2015, 0), value: 54800, value0: 13000}, - { date: new Date(2015, 1), value: 49800, value0: 13000} - ]; - - var chart = AmCharts.makeChart('amchart', { - type: 'serial', - theme: 'blur', - marginTop: 15, - marginRight: 15, - dataProvider: chartData, - categoryField: 'date', - categoryAxis: { - parseDates: true, - gridAlpha: 0, - color: layoutColors.defaultText, - axisColor: layoutColors.defaultText - }, - valueAxes: [ - { - minVerticalGap: 50, - gridAlpha: 0, - color: layoutColors.defaultText, - axisColor: layoutColors.defaultText - } - ], - graphs: [ - { - id: 'g0', - bullet: 'none', - useLineColorForBulletBorder: true, - lineColor: baUtil.hexToRGB(graphColor, 0.3), - lineThickness: 1, - negativeLineColor: layoutColors.danger, - type: 'smoothedLine', - valueField: 'value0', - fillAlphas: 1, - fillColorsField: 'lineColor' - }, - { - id: 'g1', - bullet: 'none', - useLineColorForBulletBorder: true, - lineColor: baUtil.hexToRGB(graphColor, 0.5), - lineThickness: 1, - negativeLineColor: layoutColors.danger, - type: 'smoothedLine', - valueField: 'value', - fillAlphas: 1, - fillColorsField: 'lineColor' - } - ], - chartCursor: { - categoryBalloonDateFormat: 'MM YYYY', - categoryBalloonColor: '#4285F4', - categoryBalloonAlpha: 0.7, - cursorAlpha: 0, - valueLineEnabled: true, - valueLineBalloonEnabled: true, - valueLineAlpha: 0.5 - }, - dataDateFormat: 'MM YYYY', - export: { - enabled: true - }, - creditsPosition: 'bottom-right', - zoomOutButton: { - backgroundColor: '#fff', - backgroundAlpha: 0 - }, - zoomOutText: '', - pathToImages: layoutPaths.images.amChart - }); - - function zoomChart() { - chart.zoomToDates(new Date(2013, 3), new Date(2014, 0)); - } - - chart.addListener('rendered', zoomChart); - zoomChart(); - if (chart.zoomChart) { - chart.zoomChart(); - } - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.directive.js b/src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.directive.js deleted file mode 100644 index be7b4f2..0000000 --- a/src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('dashboardLineChart', dashboardLineChart); - - /** @ngInject */ - function dashboardLineChart() { - return { - restrict: 'E', - controller: 'DashboardLineChartCtrl', - templateUrl: 'app/pages/dashboard/dashboardLineChart/dashboardLineChart.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.html b/src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.html deleted file mode 100644 index 51a9cbe..0000000 --- a/src/app/pages/dashboard/dashboardLineChart/dashboardLineChart.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js b/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js deleted file mode 100644 index 65de9a6..0000000 --- a/src/app/pages/dashboard/dashboardMap/DashboardMapCtrl.js +++ /dev/null @@ -1,104 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('DashboardMapCtrl', DashboardMapCtrl); - - /** @ngInject */ - function DashboardMapCtrl(baConfig, layoutPaths) { - var layoutColors = baConfig.colors; - var map = AmCharts.makeChart('amChartMap', { - type: 'map', - theme: 'blur', - zoomControl: { zoomControlEnabled: false, panControlEnabled: false }, - - dataProvider: { - map: 'worldLow', - zoomLevel: 3.5, - zoomLongitude: 10, - zoomLatitude: 52, - areas: [ - { title: 'Austria', id: 'AT', color: layoutColors.primary, customData: '1 244', groupId: '1'}, - { title: 'Ireland', id: 'IE', color: layoutColors.primary, customData: '1 342', groupId: '1'}, - { title: 'Denmark', id: 'DK', color: layoutColors.primary, customData: '1 973', groupId: '1'}, - { title: 'Finland', id: 'FI', color: layoutColors.primary, customData: '1 573', groupId: '1'}, - { title: 'Sweden', id: 'SE', color: layoutColors.primary, customData: '1 084', groupId: '1'}, - { title: 'Great Britain', id: 'GB', color: layoutColors.primary, customData: '1 452', groupId: '1'}, - { title: 'Italy', id: 'IT', color: layoutColors.primary, customData: '1 321', groupId: '1'}, - { title: 'France', id: 'FR', color: layoutColors.primary, customData: '1 112', groupId: '1'}, - { title: 'Spain', id: 'ES', color: layoutColors.primary, customData: '1 865', groupId: '1'}, - { title: 'Greece', id: 'GR', color: layoutColors.primary, customData: '1 453', groupId: '1'}, - { title: 'Germany', id: 'DE', color: layoutColors.primary, customData: '1 957', groupId: '1'}, - { title: 'Belgium', id: 'BE', color: layoutColors.primary, customData: '1 011', groupId: '1'}, - { title: 'Luxembourg', id: 'LU', color: layoutColors.primary, customData: '1 011', groupId: '1'}, - { title: 'Netherlands', id: 'NL', color: layoutColors.primary, customData: '1 213', groupId: '1'}, - { title: 'Portugal', id: 'PT', color: layoutColors.primary, customData: '1 291', groupId: '1'}, - { title: 'Lithuania', id: 'LT', color: layoutColors.successLight, customData: '567', groupId: '2'}, - { title: 'Latvia', id: 'LV', color: layoutColors.successLight, customData: '589', groupId: '2'}, - { title: 'Czech Republic ', id: 'CZ', color: layoutColors.successLight, customData: '785', groupId: '2'}, - { title: 'Slovakia', id: 'SK', color: layoutColors.successLight, customData: '965', groupId: '2'}, - { title: 'Estonia', id: 'EE', color: layoutColors.successLight, customData: '685', groupId: '2'}, - { title: 'Hungary', id: 'HU', color: layoutColors.successLight, customData: '854', groupId: '2'}, - { title: 'Cyprus', id: 'CY', color: layoutColors.successLight, customData: '754', groupId: '2'}, - { title: 'Malta', id: 'MT', color: layoutColors.successLight, customData: '867', groupId: '2'}, - { title: 'Poland', id: 'PL', color: layoutColors.successLight, customData: '759', groupId: '2'}, - { title: 'Romania', id: 'RO', color: layoutColors.success, customData: '302', groupId: '3'}, - { title: 'Bulgaria', id: 'BG', color: layoutColors.success, customData: '102', groupId: '3'}, - { title: 'Slovenia', id: 'SI', color: layoutColors.danger, customData: '23', groupId: '4'}, - { title: 'Croatia', id: 'HR', color: layoutColors.danger, customData: '96', groupId: '4'} - ] - }, - - areasSettings: { - rollOverOutlineColor: layoutColors.border, - rollOverColor: layoutColors.primaryDark, - alpha: 0.8, - unlistedAreasAlpha: 0.2, - unlistedAreasColor: layoutColors.defaultText, - balloonText: '[[title]]: [[customData]] users' - }, - - - legend: { - width: '100%', - marginRight: 27, - marginLeft: 27, - equalWidths: false, - backgroundAlpha: 0.3, - backgroundColor: layoutColors.border, - borderColor: layoutColors.border, - borderAlpha: 1, - top: 362, - left: 0, - horizontalGap: 10, - data: [ - { - title: 'over 1 000 users', - color: layoutColors.primary - }, - { - title: '500 - 1 000 users', - color: layoutColors.successLight - }, - { - title: '100 - 500 users', - color: layoutColors.success - }, - { - title: '0 - 100 users', - color: layoutColors.danger - } - ] - }, - export: { - enabled: true - }, - creditsPosition: 'bottom-right', - pathToImages: layoutPaths.images.amChart - }); - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardMap/dashboardMap.directive.js b/src/app/pages/dashboard/dashboardMap/dashboardMap.directive.js deleted file mode 100644 index d6403bf..0000000 --- a/src/app/pages/dashboard/dashboardMap/dashboardMap.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('dashboardMap', dashboardMap); - - /** @ngInject */ - function dashboardMap() { - return { - restrict: 'E', - controller: 'DashboardMapCtrl', - templateUrl: 'app/pages/dashboard/dashboardMap/dashboardMap.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardMap/dashboardMap.html b/src/app/pages/dashboard/dashboardMap/dashboardMap.html deleted file mode 100644 index 40247eb..0000000 --- a/src/app/pages/dashboard/dashboardMap/dashboardMap.html +++ /dev/null @@ -1 +0,0 @@ -
\ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js b/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js deleted file mode 100644 index 4009fd4..0000000 --- a/src/app/pages/dashboard/dashboardPieChart/DashboardPieChartCtrl.js +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('DashboardPieChartCtrl', DashboardPieChartCtrl); - - /** @ngInject */ - function DashboardPieChartCtrl($scope, $timeout, baConfig, baUtil) { - var pieColor = baUtil.hexToRGB(baConfig.colors.defaultText, 0.2); - $scope.charts = [{ - color: pieColor, - description: 'New Visits', - stats: '57,820', - icon: 'person', - }, { - color: pieColor, - description: 'Purchases', - stats: '$ 89,745', - icon: 'money', - }, { - color: pieColor, - description: 'Active Users', - stats: '178,391', - icon: 'face', - }, { - color: pieColor, - description: 'Returned', - stats: '32,592', - icon: 'refresh', - } - ]; - - function getRandomArbitrary(min, max) { - return Math.random() * (max - min) + min; - } - - function loadPieCharts() { - $('.chart').each(function () { - var chart = $(this); - chart.easyPieChart({ - easing: 'easeOutBounce', - onStep: function (from, to, percent) { - $(this.el).find('.percent').text(Math.round(percent)); - }, - barColor: chart.attr('rel'), - trackColor: 'rgba(0,0,0,0)', - size: 84, - scaleLength: 0, - animation: 2000, - lineWidth: 9, - lineCap: 'round', - }); - }); - - $('.refresh-data').on('click', function () { - updatePieCharts(); - }); - } - - function updatePieCharts() { - $('.pie-charts .chart').each(function(index, chart) { - $(chart).data('easyPieChart').update(getRandomArbitrary(55, 90)); - }); - } - - $timeout(function () { - loadPieCharts(); - updatePieCharts(); - }, 1000); - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.directive.js b/src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.directive.js deleted file mode 100644 index 72e3f13..0000000 --- a/src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('dashboardPieChart', dashboardPieChart); - - /** @ngInject */ - function dashboardPieChart() { - return { - restrict: 'E', - controller: 'DashboardPieChartCtrl', - templateUrl: 'app/pages/dashboard/dashboardPieChart/dashboardPieChart.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.html b/src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.html deleted file mode 100644 index 9594317..0000000 --- a/src/app/pages/dashboard/dashboardPieChart/dashboardPieChart.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
-
-
-
-
-
{{ ::chart.description }}
-
{{ ::chart.stats }}
-
- -
-
-
-
\ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js b/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js deleted file mode 100644 index 827159d..0000000 --- a/src/app/pages/dashboard/dashboardTodo/DashboardTodoCtrl.js +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('DashboardTodoCtrl', DashboardTodoCtrl); - - /** @ngInject */ - function DashboardTodoCtrl($scope, baConfig) { - - $scope.transparent = baConfig.theme.blur; - var dashboardColors = baConfig.colors.dashboard; - var colors = []; - for (var key in dashboardColors) { - colors.push(dashboardColors[key]); - } - - function getRandomColor() { - var i = Math.floor(Math.random() * (colors.length - 1)); - return colors[i]; - } - - $scope.todoList = [ - { text: 'Check me out' }, - { text: 'Lorem ipsum dolor sit amet, possit denique oportere at his, etiam corpora deseruisse te pro' }, - { text: 'Ex has semper alterum, expetenda dignissim' }, - { text: 'Vim an eius ocurreret abhorreant, id nam aeque persius ornatus.' }, - { text: 'Simul erroribus ad usu' }, - { text: 'Ei cum solet appareat, ex est graeci mediocritatem' }, - { text: 'Get in touch with akveo team' }, - { text: 'Write email to business cat' }, - { text: 'Have fun with blur admin' }, - { text: 'What do you think?' }, - ]; - - $scope.todoList.forEach(function(item) { - item.color = getRandomColor(); - }); - - $scope.newTodoText = ''; - - $scope.addToDoItem = function (event, clickPlus) { - if (clickPlus || event.which === 13) { - $scope.todoList.unshift({ - text: $scope.newTodoText, - color: getRandomColor(), - }); - $scope.newTodoText = ''; - } - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.directive.js b/src/app/pages/dashboard/dashboardTodo/dashboardTodo.directive.js deleted file mode 100644 index 35a12e6..0000000 --- a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('dashboardTodo', dashboardTodo); - - /** @ngInject */ - function dashboardTodo() { - return { - restrict: 'EA', - controller: 'DashboardTodoCtrl', - templateUrl: 'app/pages/dashboard/dashboardTodo/dashboardTodo.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html b/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html deleted file mode 100644 index db46df6..0000000 --- a/src/app/pages/dashboard/dashboardTodo/dashboardTodo.html +++ /dev/null @@ -1,18 +0,0 @@ -
- - -
-
    -
  • -
    - - - -
    • -
-
diff --git a/src/app/pages/dashboard/pieCharts/dashboardPieChart.js b/src/app/pages/dashboard/pieCharts/dashboardPieChart.js deleted file mode 100644 index 0f21e63..0000000 --- a/src/app/pages/dashboard/pieCharts/dashboardPieChart.js +++ /dev/null @@ -1,15 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .service('dashboardPieChart', dashboardPieChart); - - /** @ngInject */ - function dashboardPieChart() { - - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/popularApp/popularApp.directive.js b/src/app/pages/dashboard/popularApp/popularApp.directive.js deleted file mode 100644 index eadef39..0000000 --- a/src/app/pages/dashboard/popularApp/popularApp.directive.js +++ /dev/null @@ -1,18 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('popularApp', popularApp); - - /** @ngInject */ - function popularApp() { - return { - restrict: 'E', - templateUrl: 'app/pages/dashboard/popularApp/popularApp.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/popularApp/popularApp.html b/src/app/pages/dashboard/popularApp/popularApp.html deleted file mode 100644 index 8fb66b8..0000000 --- a/src/app/pages/dashboard/popularApp/popularApp.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
- - Super App -
-
-
-
- Most Popular App -
-
- 175$ -
-
-
-
-
Total Visits
-
47,512
-
-
-
New Visits
-
9,217
-
-
-
Sales
-
2,928
-
-
diff --git a/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js b/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js deleted file mode 100644 index 4f922e5..0000000 --- a/src/app/pages/dashboard/trafficChart/TrafficChartCtrl.js +++ /dev/null @@ -1,61 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('TrafficChartCtrl', TrafficChartCtrl); - - /** @ngInject */ - function TrafficChartCtrl($scope, baConfig, colorHelper) { - - $scope.transparent = baConfig.theme.blur; - var dashboardColors = baConfig.colors.dashboard; - $scope.doughnutData = { - labels: [ - 'Other', - 'Search engines', - 'Referral Traffic', - 'Direct Traffic', - 'Ad Campaigns' - ], - datasets: [ - { - data: [2000, 1500, 1000, 1200, 400], - backgroundColor: [ - dashboardColors.white, - dashboardColors.blueStone, - dashboardColors.surfieGreen, - dashboardColors.silverTree, - dashboardColors.gossip - - ], - hoverBackgroundColor: [ - colorHelper.shade(dashboardColors.white, 15), - colorHelper.shade(dashboardColors.blueStone, 15), - colorHelper.shade(dashboardColors.surfieGreen, 15), - colorHelper.shade(dashboardColors.silverTree, 15), - colorHelper.shade(dashboardColors.gossip, 15) - ], - percentage: [87, 22, 70, 38, 17] - }] - }; - - var ctx = document.getElementById('chart-area').getContext('2d'); - window.myDoughnut = new Chart(ctx, { - type: 'doughnut', - data: $scope.doughnutData, - options: { - cutoutPercentage: 64, - responsive: true, - elements: { - arc: { - borderWidth: 0 - } - } - } - }); - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.directive.js b/src/app/pages/dashboard/trafficChart/trafficChart.directive.js deleted file mode 100644 index a75bc39..0000000 --- a/src/app/pages/dashboard/trafficChart/trafficChart.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('trafficChart', trafficChart); - - /** @ngInject */ - function trafficChart() { - return { - restrict: 'E', - controller: 'TrafficChartCtrl', - templateUrl: 'app/pages/dashboard/trafficChart/trafficChart.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/trafficChart/trafficChart.html b/src/app/pages/dashboard/trafficChart/trafficChart.html deleted file mode 100644 index 2ab0b86..0000000 --- a/src/app/pages/dashboard/trafficChart/trafficChart.html +++ /dev/null @@ -1,29 +0,0 @@ -
-
-
-
- -
- 1,900,128 - Views Total -
-
-
- -
-
-
-
-

{{::label}}+{{data.percentage[i]}}%

-
-
-
-
-
-
-
-
- diff --git a/src/app/pages/dashboard/weather/WeatherCtrl.js b/src/app/pages/dashboard/weather/WeatherCtrl.js deleted file mode 100644 index 42a6cb3..0000000 --- a/src/app/pages/dashboard/weather/WeatherCtrl.js +++ /dev/null @@ -1,144 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .controller('WeatherCtrl', WeatherCtrl); - - /** @ngInject */ - function WeatherCtrl($scope, $http, $timeout, $element) { - var url = 'http://api.openweathermap.org/data/2.5/forecast'; - var method = 'GET'; - var key = '2de143494c0b295cca9337e1e96b00e0'; - var middleOfTheDay = 15; - $scope.units = 'metric'; - $scope.weatherIcons = { - '01d': 'ion-ios-sunny-outline', - '02d': 'ion-ios-partlysunny-outline', - '03d': 'ion-ios-cloud-outline', - '04d': 'ion-ios-cloud', - '09d': 'ion-ios-rainy', - '10d': 'ion-ios-rainy-outline', - '11d': 'ion-ios-thunderstorm-outline', - '13d': 'ion-ios-snowy', - '50d': 'ion-ios-cloudy-outline', - '01n': 'ion-ios-cloudy-night-outline', - '02n': 'ion-ios-cloudy-night', - '03n': 'ion-ios-cloud-outline', - '04n': 'ion-ios-cloud', - '09n': 'ion-ios-rainy', - '10n': 'ion-ios-rainy-outline', - '11n': 'ion-ios-thunderstorm', - '13n': 'ion-ios-snowy', - '50n': 'ion-ios-cloudy-outline' - }; - $scope.weather = {}; - - $scope.switchUnits = function (name) { - $scope.units = name; - $scope.updateWeather(); - }; - - $scope.switchDay = function (day) { - $scope.weather.current = day; - makeChart($scope.weather.days[$scope.weather.current].timeTemp) - }; - - $scope.updateWeather = function () { - $http({ - method: method, url: url, params: { - appid: key, - lat: $scope.geoData.geoplugin_latitude, - lon: $scope.geoData.geoplugin_longitude, - units: $scope.units - } - }).then(function success(response) { - saveWeatherData(response.data); - makeChart($scope.weather.days[$scope.weather.current].timeTemp) - }, function error() { - console.log("WEATHER FAILED") - }); - }; - - function updateGeoData() { - $http.jsonp('http://www.geoplugin.net/json.gp?jsoncallback=JSON_CALLBACK').then(function success(response) { - $scope.geoData = response.data; - $scope.updateWeather(); - }, function error() { - console.log("GEO FAILED") - }); - } - - function makeChart(data) { - AmCharts.makeChart('tempChart', { - type: 'serial', - theme: 'blur', - handDrawn: true, - categoryField: 'time', - dataProvider: data, - valueAxes: [ - { - axisAlpha: 0.3, - gridAlpha: 0 - } - ], - graphs: [ - { - bullet: 'square', - fillAlphas: 0.3, - fillColorsField: 'lineColor', - legendValueText: '[[value]]', - lineColorField: 'lineColor', - title: 'Temp', - valueField: 'temp' - } - ], - categoryAxis: { - gridAlpha: 0, - axisAlpha: 0.3 - } - }).write('tempChart'); - } - - function saveWeatherData(data) { - var firstItem = data.list[0]; - var weather = { - days: [{ - date: new Date(), - timeTemp: [], - main: firstItem.weather[0].main, - description: firstItem.weather[0].description, - icon: firstItem.weather[0].icon, - temp: firstItem.main.temp - }], current: 0 - }; - data.list.forEach(function (item, i) { - var itemDate = new Date(item.dt_txt); - if (itemDate.getDate() !== weather.days[weather.days.length - 1].date.getDate()) { - weather.days.push({date: itemDate, timeTemp: []}); - } - var lastItem = weather.days[weather.days.length - 1]; - lastItem.timeTemp.push({ - time: itemDate.getHours(), - temp: item.main.temp - }); - if ((weather.days.length > 1 && itemDate.getHours() == middleOfTheDay) || i == data.list.length - 1) { - lastItem.main = item.weather[0].main; - lastItem.description = item.weather[0].description; - lastItem.icon = item.weather[0].icon; - lastItem.temp = item.main.temp; - lastItem.date.setHours(i == data.list.length - 1 ? 0 : middleOfTheDay); - lastItem.date.setMinutes(0); - } - }); - console.log(weather.days[weather.current].date); - weather.days = weather.days.slice(0, $element.attr('forecast') || 5); - $scope.weather = weather; - } - - updateGeoData(); - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/weather/weather.directive.js b/src/app/pages/dashboard/weather/weather.directive.js deleted file mode 100644 index 1b0668e..0000000 --- a/src/app/pages/dashboard/weather/weather.directive.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @author v.lugovksy - * created on 16.12.2015 - */ -(function () { - 'use strict'; - - angular.module('BlurAdmin.pages.dashboard') - .directive('weather', weather); - - /** @ngInject */ - function weather() { - return { - restrict: 'EA', - controller: 'WeatherCtrl', - templateUrl: 'app/pages/dashboard/weather/weather.html' - }; - } -})(); \ No newline at end of file diff --git a/src/app/pages/dashboard/weather/weather.html b/src/app/pages/dashboard/weather/weather.html deleted file mode 100644 index ba78a4c..0000000 --- a/src/app/pages/dashboard/weather/weather.html +++ /dev/null @@ -1,45 +0,0 @@ -
-
-
-
- {{geoData.geoplugin_city}} - {{geoData.geoplugin_countryName | uppercase}} -
-
- {{ weather.days[weather.current].date | date : 'EEEE h:mm'}} -
-
-
- - -
{{weather.days[weather.current].main}} - - {{weather.days[weather.current].description}} -
-
-
- - -
- {{weather.days[weather.current].temp}} °C | °F - {{weather.days[weather.current].temp}} °F | °C -
-
-
-
-
-
-
- {{day.temp}} -
-
- - {{day.main}} -
-
- {{day.date | date : 'EEE'}} -
-
-
-
-
diff --git a/src/app/pages/pages.module.js b/src/app/pages/pages.module.js index 22e15a9..d0d5f5b 100644 --- a/src/app/pages/pages.module.js +++ b/src/app/pages/pages.module.js @@ -8,12 +8,12 @@ angular.module('BlurAdmin.pages', [ 'ui.router', - 'BlurAdmin.pages.dashboard', + 'BlurAdmin.pages.dashboard' // 'BlurAdmin.pages.ui', // 'BlurAdmin.pages.components', // 'BlurAdmin.pages.form', // 'BlurAdmin.pages.tables', - 'BlurAdmin.pages.charts', + // 'BlurAdmin.pages.charts', // 'BlurAdmin.pages.maps', // 'BlurAdmin.pages.profile', ])