From 5f64b5470c4c0166190eb69aa8a9db6d005af069 Mon Sep 17 00:00:00 2001 From: JiaChi Wang Date: Sat, 21 Oct 2023 13:48:08 +0800 Subject: [PATCH 1/2] add more state colors --- .../components/dashboard/dashboard.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/components/dashboard/dashboard.component.ts b/src/app/components/dashboard/dashboard.component.ts index 2cf141c8..31cae81c 100644 --- a/src/app/components/dashboard/dashboard.component.ts +++ b/src/app/components/dashboard/dashboard.component.ts @@ -123,16 +123,16 @@ export class DashboardComponent implements OnInit { updateAppStatusData(applications: Applications) { this.appStatusData = [] if (applications.New) this.appStatusData.push(new DonutDataItem('New', applications.New, '#facc54')) - if (applications.Accepted) this.appStatusData.push(new DonutDataItem('Accepted', applications.Accepted, '#facc54')) - if (applications.Starting) this.appStatusData.push(new DonutDataItem('Starting', applications.Starting, '#26bbf0')) + if (applications.Accepted) this.appStatusData.push(new DonutDataItem('Accepted', applications.Accepted, '#faa854')) + if (applications.Starting) this.appStatusData.push(new DonutDataItem('Starting', applications.Starting, '#75e7ec')) if (applications.Running) this.appStatusData.push(new DonutDataItem('Running', applications.Running, '#26bbf0')) - if (applications.Rejected) this.appStatusData.push(new DonutDataItem('Rejected', applications.Rejected, '#cc6164')) + if (applications.Rejected) this.appStatusData.push(new DonutDataItem('Rejected', applications.Rejected, '#ffacac')) if (applications.Completing) this.appStatusData.push(new DonutDataItem('Completing', applications.Completing, '#60cea5')) - if (applications.Completed) this.appStatusData.push(new DonutDataItem('Completed', applications.Completed, '#60cea5')) + if (applications.Completed) this.appStatusData.push(new DonutDataItem('Completed', applications.Completed, '#44aa83')) if (applications.Failing) this.appStatusData.push(new DonutDataItem('Failing', applications.Failing, '#cc6164')) - if (applications.Failed) this.appStatusData.push(new DonutDataItem('Failed', applications.Failed, '#cc6164')) - if (applications.Expired) this.appStatusData.push(new DonutDataItem('Expired', applications.Expired, '#cc6164')) - if (applications.Resuming) this.appStatusData.push(new DonutDataItem('Resuming', applications.Resuming, '#facc54')) + if (applications.Failed) this.appStatusData.push(new DonutDataItem('Failed', applications.Failed, '#9a393c')) + if (applications.Expired) this.appStatusData.push(new DonutDataItem('Expired', applications.Expired, '#9a7772')) + if (applications.Resuming) this.appStatusData.push(new DonutDataItem('Resuming', applications.Resuming, '#b2aeb4')) } updateContainerStatusData(info: Partition) { From 59ec7beaec58018578d610a8fd2d41d59577368b Mon Sep 17 00:00:00 2001 From: targetoee Date: Sun, 29 Oct 2023 00:16:04 +0800 Subject: [PATCH 2/2] reuse color for UI unity --- .../components/dashboard/dashboard.component.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/components/dashboard/dashboard.component.ts b/src/app/components/dashboard/dashboard.component.ts index e633659a..233eab08 100644 --- a/src/app/components/dashboard/dashboard.component.ts +++ b/src/app/components/dashboard/dashboard.component.ts @@ -149,16 +149,16 @@ export class DashboardComponent implements OnInit { updateAppStatusData(applications: Applications) { this.appStatusData = [] if (applications.New) this.appStatusData.push(new ChartDataItem('New', applications.New, '#facc54')) - if (applications.Accepted) this.appStatusData.push(new ChartDataItem('Accepted', applications.Accepted, '#facc54')) + if (applications.Accepted) this.appStatusData.push(new ChartDataItem('Accepted', applications.Accepted, '#f4b400')) if (applications.Starting) this.appStatusData.push(new ChartDataItem('Starting', applications.Starting, '#26bbf0')) - if (applications.Running) this.appStatusData.push(new ChartDataItem('Running', applications.Running, '#26bbf0')) - if (applications.Rejected) this.appStatusData.push(new ChartDataItem('Rejected', applications.Rejected, '#cc6164')) + if (applications.Running) this.appStatusData.push(new ChartDataItem('Running', applications.Running, '#4285f4')) if (applications.Completing) this.appStatusData.push(new ChartDataItem('Completing', applications.Completing, '#60cea5')) - if (applications.Completed) this.appStatusData.push(new ChartDataItem('Completed', applications.Completed, '#60cea5')) + if (applications.Completed) this.appStatusData.push(new ChartDataItem('Completed', applications.Completed, '#0f9d58')) + if (applications.Rejected) this.appStatusData.push(new ChartDataItem('Rejected', applications.Rejected, '#ff6d00')) if (applications.Failing) this.appStatusData.push(new ChartDataItem('Failing', applications.Failing, '#cc6164')) - if (applications.Failed) this.appStatusData.push(new ChartDataItem('Failed', applications.Failed, '#cc6164')) - if (applications.Expired) this.appStatusData.push(new ChartDataItem('Expired', applications.Expired, '#cc6164')) - if (applications.Resuming) this.appStatusData.push(new ChartDataItem('Resuming', applications.Resuming, '#facc54')) + if (applications.Failed) this.appStatusData.push(new ChartDataItem('Failed', applications.Failed, '#db4437')) + if (applications.Expired) this.appStatusData.push(new ChartDataItem('Expired', applications.Expired, '#3949ab')) + if (applications.Resuming) this.appStatusData.push(new ChartDataItem('Resuming', applications.Resuming, '#694cb5')) } updateContainerStatusData(info: Partition) {