diff --git a/src/app/@theme/styles/theme.cosmic.ts b/src/app/@theme/styles/theme.cosmic.ts index e8cee71a..ae9a5400 100644 --- a/src/app/@theme/styles/theme.cosmic.ts +++ b/src/app/@theme/styles/theme.cosmic.ts @@ -81,14 +81,5 @@ export const COSMIC_THEME = { axisLineColor: '#a1a1e5', textColor: '#ffffff', }, - - d3: { - pie: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - bar: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - line: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - advancedPie: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - areaStack: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - polar: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - }, }, }; diff --git a/src/app/@theme/styles/theme.default.ts b/src/app/@theme/styles/theme.default.ts index 2a01e033..d20f6a2c 100644 --- a/src/app/@theme/styles/theme.default.ts +++ b/src/app/@theme/styles/theme.default.ts @@ -75,14 +75,5 @@ export const DEFAULT_THEME = { axisLineColor: '#cccccc', textColor: '#484848', }, - - d3: { - pie: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - bar: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - line: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - advancedPie: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - areaStack: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - polar: ['#5AA454', '#A10A28', '#C7B42C', '#AAAAAA'], - }, }, }; diff --git a/src/app/pages/charts/d3/d3-advanced-pie.component.ts b/src/app/pages/charts/d3/d3-advanced-pie.component.ts index a8d0ef93..6f6fdfb8 100644 --- a/src/app/pages/charts/d3/d3-advanced-pie.component.ts +++ b/src/app/pages/charts/d3/d3-advanced-pie.component.ts @@ -5,7 +5,6 @@ import { NbThemeService } from '@nebular/theme'; selector: 'ngx-d3-advanced-pie', template: ` @@ -26,13 +25,13 @@ export class D3AdvancedPieComponent { value: 7200000, }, ]; - view: any[] = [700, 400]; colorScheme: any; constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { + const colors: any = config.variables; this.colorScheme = { - domain: (config.variables.d3).advancedPie, + domain: [colors.primaryLight, colors.infoLight, colors.successLight, colors.warningLight, colors.dangerLight], }; }); } diff --git a/src/app/pages/charts/d3/d3-area-stack.component.ts b/src/app/pages/charts/d3/d3-area-stack.component.ts index 89c48463..fb866f4f 100644 --- a/src/app/pages/charts/d3/d3-area-stack.component.ts +++ b/src/app/pages/charts/d3/d3-area-stack.component.ts @@ -5,7 +5,6 @@ import { NbThemeService } from '@nebular/theme'; selector: 'ngx-d3-area-stack', template: ` { + const colors: any = config.variables; this.colorScheme = { - domain: (config.variables.d3).areaStack, + domain: [colors.primaryLight, colors.infoLight, colors.successLight, colors.warningLight, colors.dangerLight], }; }); } diff --git a/src/app/pages/charts/d3/d3-bar.component.ts b/src/app/pages/charts/d3/d3-bar.component.ts index 220e02b6..7ac30636 100644 --- a/src/app/pages/charts/d3/d3-bar.component.ts +++ b/src/app/pages/charts/d3/d3-bar.component.ts @@ -5,49 +5,35 @@ import { NbThemeService } from '@nebular/theme'; selector: 'ngx-d3-bar', template: ` `, }) export class D3BarComponent { - single = [ - { - name: 'Germany', - value: 8940000, - }, - { - name: 'USA', - value: 5000000, - }, - { - name: 'France', - value: 7200000, - }, + + results = [ + { name: 'Germany', value: 8940 }, + { name: 'USA', value: 5000 }, + { name: 'France', value: 7200 }, ]; - view: any[] = [700, 400]; showLegend = true; showXAxis = true; showYAxis = true; - showLabels = true; - showXAxisLabel = true; xAxisLabel = 'Country'; - showYAxisLabel = true; yAxisLabel = 'Population'; colorScheme: any; constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { + const colors: any = config.variables; this.colorScheme = { - domain: (config.variables.d3).bar, + domain: [colors.primaryLight, colors.infoLight, colors.successLight, colors.warningLight, colors.dangerLight], }; }); } diff --git a/src/app/pages/charts/d3/d3-line.component.ts b/src/app/pages/charts/d3/d3-line.component.ts index d051b1b9..2abb066e 100644 --- a/src/app/pages/charts/d3/d3-line.component.ts +++ b/src/app/pages/charts/d3/d3-line.component.ts @@ -5,7 +5,6 @@ import { NbThemeService } from '@nebular/theme'; selector: 'ngx-d3-line', template: ` { + const colors: any = config.variables; this.colorScheme = { - domain: (config.variables.d3).line, + domain: [colors.primaryLight, colors.infoLight, colors.successLight, colors.warningLight, colors.dangerLight], }; }); } diff --git a/src/app/pages/charts/d3/d3-pie.component.ts b/src/app/pages/charts/d3/d3-pie.component.ts index c65ee1d8..82a75e31 100644 --- a/src/app/pages/charts/d3/d3-pie.component.ts +++ b/src/app/pages/charts/d3/d3-pie.component.ts @@ -5,44 +5,28 @@ import { NbThemeService } from '@nebular/theme'; selector: 'ngx-d3-pie', template: ` `, }) export class D3PieComponent { - single = [ - { - name: 'Germany', - value: 8940000, - }, - { - name: 'USA', - value: 5000000, - }, - { - name: 'France', - value: 7200000, - }, + results = [ + { name: 'Germany', value: 8940 }, + { name: 'USA', value: 5000 }, + { name: 'France', value: 7200 }, ]; - view: any[] = [700, 400]; showLegend = true; - showXAxis = true; - showYAxis = true; showLabels = true; - showXAxisLabel = true; - xAxisLabel = 'Country'; - showYAxisLabel = true; - yAxisLabel = 'Population'; colorScheme: any; constructor(private theme: NbThemeService) { this.theme.getJsTheme().subscribe(config => { + const colors: any = config.variables; this.colorScheme = { - domain: (config.variables.d3).pie, + domain: [colors.primaryLight, colors.infoLight, colors.successLight, colors.warningLight, colors.dangerLight], }; }); } diff --git a/src/app/pages/charts/d3/d3-polar.component.ts b/src/app/pages/charts/d3/d3-polar.component.ts index 2ee953af..4778b8e1 100644 --- a/src/app/pages/charts/d3/d3-polar.component.ts +++ b/src/app/pages/charts/d3/d3-polar.component.ts @@ -5,7 +5,6 @@ import { NbThemeService } from '@nebular/theme'; selector: 'ngx-d3-polar', template: ` { + const colors: any = config.variables; this.colorScheme = { - domain: (config.variables.d3).polar, + domain: [colors.primaryLight, colors.infoLight, colors.successLight, colors.warningLight, colors.dangerLight], }; }); } diff --git a/src/app/pages/charts/d3/d3.component.scss b/src/app/pages/charts/d3/d3.component.scss index b3203e62..47d46af0 100644 --- a/src/app/pages/charts/d3/d3.component.scss +++ b/src/app/pages/charts/d3/d3.component.scss @@ -1,4 +1,14 @@ @import '../../../@theme/styles/themes'; @include nb-install-component() { + ngx-d3-bar, + ngx-d3-pie, + ngx-d3-advanced-pie, + ngx-d3-area-stack, + ngx-d3-line, + ngx-d3-polar { + display: block; + width: 100%; + height: 100%; + } } diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts index 7481e321..d73a02bf 100644 --- a/src/app/pages/pages-menu.ts +++ b/src/app/pages/pages-menu.ts @@ -75,12 +75,12 @@ export const MENU_ITEMS: List = List([{ children: List([{ title: 'Echarts', link: '/pages/charts/echarts', - }, { - title: 'D3', - link: '/pages/charts/d3', }, { title: 'Charts.js', link: '/pages/charts/chartjs', + }, { + title: 'D3', + link: '/pages/charts/d3', }]), }, { title: 'Editors',