Andreas/ngx-admin
1
0
Fork 0
mirror of https://github.com/akveo/ngx-admin.git synced 2026-02-23 16:34:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: rebase with master

Browse source
This commit is contained in:
Sergey Andrievskiy 2021-08-06 17:23:50 +03:00 • committed by d.strigo
parent 1d78122d3f
commit e1708d2f4a
69 changed files with 2414 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.html
View file

@ -1,7 +1,7 @@
<ngx-legend-chart [legendItems]="chartLegend"></ngx-legend-chart>
<nb-select class="period-select" [selected]="type" (selectedChange)="changePeriod($event)">
<nb-option *ngFor="let period of types" [value]="period">
<nb-select matRipple class="period-select" [selected]="type" (selectedChange)="changePeriod($event)">
<nb-option matRipple *ngFor="let period of types" [value]="period">
{{ period }}
</nb-option>
</nb-select>

6
src/app/pages/e-commerce/charts-panel/chart-panel-header/chart-panel-header.component.scss
View file

@ -11,9 +11,9 @@
ngx-legend-chart,
.period-select {
padding-top: 1rem;
@include nb-ltr(padding-left, 0.5rem);
@include nb-rtl(padding-right, 0.5rem);
margin-top: 1rem;
@include nb-ltr(margin-left, 0.5rem);
@include nb-rtl(margin-right, 0.5rem);
}
@include media-breakpoint-up(md) {

4
src/app/pages/e-commerce/charts-panel/charts-panel.component.scss
View file

@ -6,6 +6,10 @@ $legend-canceled-color: #3f4fda;
@include nb-install-component() {
nb-card {
overflow: hidden;
}
nb-tabset {
display: flex;
flex-direction: column;

4
src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.html
View file

@ -1,6 +1,6 @@
<nb-card-header>
<nb-select [selected]="selectedCurrency" (selectedChange)="changeCurrency($event)">
<nb-option *ngFor="let currency of currencies" [value]="currency">{{ currency }}</nb-option>
<nb-select matRipple [selected]="selectedCurrency" (selectedChange)="changeCurrency($event)">
<nb-option matRipple *ngFor="let currency of currencies" [value]="currency">{{ currency }}</nb-option>
</nb-select>
</nb-card-header>
<nb-card-body>

11
src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.html
View file

@ -1,6 +1,5 @@
<nb-card-body>
<ngx-traffic-bar-chart [data]="trafficBarData.data"
[labels]="trafficBarData.labels"
[formatter]="trafficBarData.formatter">
</ngx-traffic-bar-chart>
</nb-card-body>
<ngx-traffic-bar-chart
[data]="trafficBarData.data"
[labels]="trafficBarData.labels"
[formatter]="trafficBarData.formatter"
></ngx-traffic-bar-chart>

12
src/app/pages/e-commerce/traffic-reveal-card/back-side/traffic-back-card.component.scss
View file

@ -1,19 +1,7 @@
@import '../../../../@theme/styles/themes';
@include nb-install-component() {
display: flex;
flex-direction: column;
flex: 1;
nb-card-body {
overflow: hidden;
position: relative;
display: flex;
flex-direction: column;
}
ngx-traffic-bar-chart {
flex: 1;
position: relative;
::ng-deep {

6
src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-front-card.component.scss
View file

@ -3,7 +3,11 @@
@import '../../../../@theme/styles/themes';
@include nb-install-component() {
overflow: auto;
overflow: hidden;
nb-list {
height: 100%;
}
.item {
display: flex;

10
src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.html
View file

@ -1,6 +1,4 @@
<nb-card-header>
<span>Traffic</span>
<nb-select [selected]="type" (selectedChange)="changePeriod($event)">
<nb-option *ngFor="let period of types" [value]="period">{{ period }}</nb-option>
</nb-select>
</nb-card-header>
<span>Traffic</span>
<nb-select matRipple [selected]="type" (selectedChange)="changePeriod($event)">
<nb-option matRipple *ngFor="let period of types" [value]="period">{{ period }}</nb-option>
</nb-select>

17
src/app/pages/e-commerce/traffic-reveal-card/traffic-cards-header/traffic-cards-header.component.scss
View file

@ -1,14 +1,5 @@
@import '../../../../@theme/styles/themes';
@include nb-install-component() {
nb-card-header {
display: flex;
align-items: center;
justify-content: space-between;
padding-top: nb-theme(card-header-with-select-padding-top);
padding-bottom: nb-theme(card-header-with-select-padding-bottom);
@include nb-ltr(padding-right, 4rem);
@include nb-rtl(padding-left, 4rem);
}
:host {
display: flex;
align-items: center;
justify-content: space-between;
}

14
src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.html
View file

@ -1,15 +1,23 @@
<nb-reveal-card [showToggleButton]="false" [revealed]="revealed">
<nb-card-front>
<nb-card size="small">
<ngx-traffic-cards-header [type]="period" (periodChange)="setPeriodAngGetData($event)"></ngx-traffic-cards-header>
<nb-card-header>
<ngx-traffic-cards-header [type]="period" (periodChange)="setPeriodAngGetData($event)">
</ngx-traffic-cards-header>
</nb-card-header>
<ngx-traffic-front-card [frontCardData]="trafficListData"></ngx-traffic-front-card>
<nb-icon class="toggle-icon" icon="chevron-up-outline" pack="eva" (click)="toggleView()"></nb-icon>
</nb-card>
</nb-card-front>
<nb-card-back>
<nb-card size="small">
<ngx-traffic-cards-header [type]="period" (periodChange)="setPeriodAngGetData($event)"></ngx-traffic-cards-header>
<ngx-traffic-back-card [trafficBarData]="trafficBarData"></ngx-traffic-back-card>
<nb-card-header>
<ngx-traffic-cards-header [type]="period" (periodChange)="setPeriodAngGetData($event)">
</ngx-traffic-cards-header>
</nb-card-header>
<nb-card-body>
<ngx-traffic-back-card [trafficBarData]="trafficBarData"></ngx-traffic-back-card>
</nb-card-body>
<nb-icon class="toggle-icon" icon="chevron-down-outline" pack="eva" (click)="toggleView()"></nb-icon>
</nb-card>
</nb-card-back>

7
src/app/pages/e-commerce/traffic-reveal-card/traffic-reveal-card.component.scss
View file

@ -9,4 +9,11 @@
@include nb-rtl(left, 1.25rem);
cursor: pointer;
}
nb-card-header {
padding-top: nb-theme(card-header-with-select-padding-top);
padding-bottom: nb-theme(card-header-with-select-padding-bottom);
@include nb-ltr(padding-right, 4rem);
@include nb-rtl(padding-left, 4rem);
}
}

4
src/app/pages/e-commerce/user-activity/user-activity.component.html
View file

@ -2,8 +2,8 @@
<nb-card-header>
<span>User Activity</span>
<nb-select [selected]="type" (selectedChange)="getUserActivity($event); type = $event">
<nb-option *ngFor="let t of types" [value]="t">{{ t }}</nb-option>
<nb-select matRipple [selected]="type" (selectedChange)="getUserActivity($event); type = $event">
<nb-option matRipple *ngFor="let t of types" [value]="t">{{ t }}</nb-option>
</nb-select>
</nb-card-header>

2
src/app/pages/e-commerce/visitors-analytics/visitors-analytics.component.scss
View file

@ -5,10 +5,10 @@
@include nb-install-component() {
position: relative;
display: block;
overflow: hidden;
nb-card {
position: relative;
overflow: hidden;
}
nb-card-header {