diff --git a/src/app/@theme/styles/themes.scss b/src/app/@theme/styles/themes.scss index f43da984..1f3207b3 100644 --- a/src/app/@theme/styles/themes.scss +++ b/src/app/@theme/styles/themes.scss @@ -17,6 +17,7 @@ $nb-themes: nb-register-theme(( font-family-secondary: Exo, card-height-tiny: 13.5rem, + select-min-width: 6rem, // //switcher-background: #ebeff5, diff --git a/src/app/pages/e-commerce/e-commerce.module.ts b/src/app/pages/e-commerce/e-commerce.module.ts index ca256bf6..dd832bf9 100644 --- a/src/app/pages/e-commerce/e-commerce.module.ts +++ b/src/app/pages/e-commerce/e-commerce.module.ts @@ -6,6 +6,7 @@ import { NbTabsetModule, NbUserModule, NbIconModule, + NbSelectModule, } from '@nebular/theme'; import { NgxEchartsModule } from 'ngx-echarts'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -62,6 +63,7 @@ import { EarningLiveUpdateChartComponent } from './earning-card/front-side/earni NbButtonModule, NbIconModule, NbTabsetModule, + NbSelectModule, ChartModule, NbProgressBarModule, NgxEchartsModule, diff --git a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html index c9479fcf..182dcc36 100644 --- a/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html +++ b/src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.html @@ -3,9 +3,9 @@
-
{{ name }}
-
Last week
-
{{ value }}%
+
{{ name }}
+
Last week:
+
{{ value }}%
- + - + - + - + diff --git a/src/app/pages/e-commerce/earning-card/earning-card.component.scss b/src/app/pages/e-commerce/earning-card/earning-card.component.scss index 2916c494..293d2717 100644 --- a/src/app/pages/e-commerce/earning-card/earning-card.component.scss +++ b/src/app/pages/e-commerce/earning-card/earning-card.component.scss @@ -5,43 +5,36 @@ position: relative; } - .nb-arrow-right { + .flip-icon { position: absolute; - top: 0; - right: 0; + right: 0.625rem; + top: 1rem; @include nb-rtl(right, auto); - @include nb-rtl(left, 0); - padding: 1.5rem; + @include nb-rtl(left, 0.625rem); cursor: pointer; } ::ng-deep .flipped { .back-container { - .nb-arrow-right { + .flip-icon { transform: scaleX(-1); } } .front-container { - .nb-arrow-right { + .flip-icon { display: none; } } } - ngx-earning-card-back, ngx-earning-card-front { + ngx-earning-card-back, + ngx-earning-card-front { display: flex; flex-direction: column; flex: 1; } - ::ng-deep nb-card-header { - display: flex; - justify-content: space-between; - @include nb-rtl(flex-direction, row-reverse); - padding-left: 1rem; - } - ::ng-deep nb-card-body { overflow: hidden; display: flex; diff --git a/src/app/pages/e-commerce/earning-card/earning-card.component.ts b/src/app/pages/e-commerce/earning-card/earning-card.component.ts index fbe4f52f..ec1c8b85 100644 --- a/src/app/pages/e-commerce/earning-card/earning-card.component.ts +++ b/src/app/pages/e-commerce/earning-card/earning-card.component.ts @@ -9,7 +9,7 @@ export class EarningCardComponent { flipped = false; - toggleFlipView() { + toggleView() { this.flipped = !this.flipped; } } diff --git a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html index ea1db0d5..0f932318 100644 --- a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html +++ b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html @@ -1,23 +1,19 @@ - + + {{ currency }} +
-
Daily Income
-
{{ earningLiveUpdateCardData.dailyIncome | ngxNumberWithCommas }}
+
Daily Income
+
{{ earningLiveUpdateCardData.dailyIncome | ngxNumberWithCommas }}
+ + {{ earningLiveUpdateCardData.delta.value }}%
diff --git a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss index f4fb77f7..9616b759 100644 --- a/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss +++ b/src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.scss @@ -12,10 +12,6 @@ padding-bottom: 0.45rem; } - .dropdown { - min-width: 8.125rem; - } - nb-card-body { padding: 1rem 0 0; flex-direction: column; @@ -29,87 +25,37 @@ margin: 0 nb-theme(card-padding); } - .title { - color: nb-theme(color-fg-heading); - } - - .value { - color: nb-theme(color-success); - font-size: 1.5rem; - - @include nb-for-theme(corporate) { - color: nb-theme(color-primary); + .delta { + &.up .direction { + color: nb-theme(color-success-default); + } + &.down .direction { + color: nb-theme(color-danger-default); } } .delta { position: absolute; display: inline-block; - color: nb-theme(color-fg-heading); - padding-left: 0.5rem; - font-size: 1rem; top: 0; right: 0; - @include nb-rtl(left, 1.25rem); - @include nb-rtl(right, inherit); - - &::before { - position: absolute; - content: ''; - right: 100%; - border-left: 6px solid transparent; - border-right: 6px solid transparent; - } - - &.down { - &::before { - bottom: 4px; - border-top: 7px solid text-danger(); - } - } - - &.up { - &::before { - top: 4px; - border-bottom: 7px solid text-success(); - } - } + @include nb-rtl(left, 0); + @include nb-rtl(right, auto); } ngx-earning-live-update-chart { flex: 1; position: relative; - } - ::ng-deep canvas { - border-bottom-left-radius: nb-theme(card-border-radius); - border-bottom-right-radius: nb-theme(card-border-radius); - } - - .echart { - position: absolute; - height: 100%; - width: 100%; - } - - @include nb-for-theme(corporate) { - .delta { - &.down { - color: text-danger(); - - &::before { - bottom: 4px; - border-top: 7px solid text-danger(); - } + ::ng-deep { + canvas { + border-bottom-left-radius: nb-theme(card-border-radius); + border-bottom-right-radius: nb-theme(card-border-radius); } - - &.up { - color: text-primary(); - - &::before { - top: 4px; - border-bottom: 7px solid text-primary(); - } + .echart { + position: absolute; + height: 100%; + width: 100%; } } }