diff --git a/src/app/pages/dashboard/chartJs1DCtrl.js b/src/app/pages/dashboard/chartJs1DCtrl.js index a159e4e..ad62632 100644 --- a/src/app/pages/dashboard/chartJs1DCtrl.js +++ b/src/app/pages/dashboard/chartJs1DCtrl.js @@ -24,9 +24,11 @@ $scope.progressLabels = ["Complete", "In progress", "To do"]; $scope.progressData = [complete, inProgress, toDo]; + $scope.progressColors = ['#0BD680', '#FFC93C', '#DBDBDB']; $scope.teamLabels = ["Front end", "Back end", "Devops"]; $scope.teamData = [frontEnd, backEnd, devOps]; + $scope.teamColors = ['#0BD680', '#626EEF', '#FFC93C']; $scope.options = { elements: { @@ -179,10 +181,10 @@ response.data.results.forEach(function (test) { var session = test.automation_session; - if ((session.status === 'done' && session.reason === 'UI_STOPPED') || session.status === 'passed') { + if (session.status === 'passed') { $scope.behatResults.passed += 1; browserTestLog(session, 'passed') - } else if (session.status !== 'running') { + } else if (session.status === 'failed') { $scope.behatResults.failed += 1; browserTestLog(session, 'failed') } diff --git a/src/app/pages/dashboard/dashboard.html b/src/app/pages/dashboard/dashboard.html index 969540c..6f487a3 100644 --- a/src/app/pages/dashboard/dashboard.html +++ b/src/app/pages/dashboard/dashboard.html @@ -4,14 +4,14 @@
+ chart-data="progressData" chart-labels="progressLabels" chart-colors="progressColors" chart-click="changeData">
+ chart-click="changeData" chart-colors="teamColors">
@@ -21,15 +21,15 @@
-
-

Failed

-

{{behatResults.failed}}

+
+

Failed

+

{{behatResults.failed}}

-
-

Passed

-

{{behatResults.passed}}

+
+

Passed

+

{{behatResults.passed}}

@@ -42,8 +42,8 @@

Windows

-
-
    +
    +
    • {{results.name}}{{results.percentage}}%
      • @@ -53,8 +53,8 @@

      Mac

      -
      -
        +
        +
        • {{results.name}}{{results.percentage}}%
          • diff --git a/src/app/pages/pages.module.js b/src/app/pages/pages.module.js index d0d5f5b..ac6564f 100644 --- a/src/app/pages/pages.module.js +++ b/src/app/pages/pages.module.js @@ -7,15 +7,7 @@ angular.module('BlurAdmin.pages', [ 'ui.router', - 'BlurAdmin.pages.dashboard' - // 'BlurAdmin.pages.ui', - // 'BlurAdmin.pages.components', - // 'BlurAdmin.pages.form', - // 'BlurAdmin.pages.tables', - // 'BlurAdmin.pages.charts', - // 'BlurAdmin.pages.maps', - // 'BlurAdmin.pages.profile', ]) .config(routeConfig); @@ -23,40 +15,40 @@ function routeConfig($urlRouterProvider, baSidebarServiceProvider) { $urlRouterProvider.otherwise('/dashboard'); - baSidebarServiceProvider.addStaticItem({ - title: 'Pages', - icon: 'ion-document', - subMenu: [{ - title: 'Sign In', - fixedHref: 'auth.html', - blank: true - }, { - title: 'Sign Up', - fixedHref: 'reg.html', - blank: true - }, { - title: 'User Profile', - stateRef: 'profile' - }, { - title: '404 Page', - fixedHref: '404.html', - blank: true - }] - }); - baSidebarServiceProvider.addStaticItem({ - title: 'Menu Level 1', - icon: 'ion-ios-more', - subMenu: [{ - title: 'Menu Level 1.1', - disabled: true - }, { - title: 'Menu Level 1.2', - subMenu: [{ - title: 'Menu Level 1.2.1', - disabled: true - }] - }] - }); + // baSidebarServiceProvider.addStaticItem({ + // title: 'Pages', + // icon: 'ion-document', + // subMenu: [{ + // title: 'Sign In', + // fixedHref: 'auth.html', + // blank: true + // }, { + // title: 'Sign Up', + // fixedHref: 'reg.html', + // blank: true + // }, { + // title: 'User Profile', + // stateRef: 'profile' + // }, { + // title: '404 Page', + // fixedHref: '404.html', + // blank: true + // }] + // }); + // baSidebarServiceProvider.addStaticItem({ + // title: 'Menu Level 1', + // icon: 'ion-ios-more', + // subMenu: [{ + // title: 'Menu Level 1.1', + // disabled: true + // }, { + // title: 'Menu Level 1.2', + // subMenu: [{ + // title: 'Menu Level 1.2.1', + // disabled: true + // }] + // }] + // }); } })(); diff --git a/src/sass/app/_dashboard.scss b/src/sass/app/_dashboard.scss index d5353ac..c34331b 100644 --- a/src/sass/app/_dashboard.scss +++ b/src/sass/app/_dashboard.scss @@ -24,4 +24,57 @@ .list-of-words:not(:nth-last-child(2)):after { content: ", "; +} + +.behat-box { + border-radius: 8px; + padding: 24px 48px; + box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.25); + + &.passed:not(.no-results) { + background: #0BD680; + } + + &.failed:not(.no-results) { + background: #FF004E; + color: white; + } + + &.no-results { + background: #DBDBDB; + opacity: 0.4; + } + + p { + margin-bottom: 24px; + } + + h1 { + text-align: right; + margin-bottom: 0px; + } +} + +.browser-row { + padding: 6px; + border-radius: 4px; + margin-bottom: 3px; + + &.passed { + background: rgba(11, 214, 128, 0.12); + } + + &.failed { + background: rgba(255, 0, 78, 0.12); + } + + &.no-results { + background: #DBDBDB; + opacity: 0.4; + } + + > ul { + margin-bottom: 0; + padding-left: 24px; + } } \ No newline at end of file diff --git a/src/sass/theme/bootstrap-overrides/_panel.scss b/src/sass/theme/bootstrap-overrides/_panel.scss index 0ed448f..47191d8 100644 --- a/src/sass/theme/bootstrap-overrides/_panel.scss +++ b/src/sass/theme/bootstrap-overrides/_panel.scss @@ -6,7 +6,7 @@ $panel-heading-font-size: 16px; color: $default-text; background-color: $default; border: none; - border-radius: 5px; + border-radius: 8px; position: relative; margin-bottom: 24px; box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.25); diff --git a/src/sass/theme/conf/colorScheme/_mint.scss b/src/sass/theme/conf/colorScheme/_mint.scss index c908498..8808869 100644 --- a/src/sass/theme/conf/colorScheme/_mint.scss +++ b/src/sass/theme/conf/colorScheme/_mint.scss @@ -11,7 +11,7 @@ $border-light: tint($border, 15%); $input-border: shade($border, 5%); $input-background: #ffffff; -$sidebar: #1C2B36; +$sidebar: #273142; $sidebar-text: #ffffff; $dropdown-text: #7d7d7d; $bootstrap-panel-text: #7d7d7d;