Ecommerce dashboard by ESadouski · Pull Request #1754 · akveo/ngx-admin

ESadouski · 2018-06-26T20:50:16Z

Please read and mark the following check list before creating a pull request (check one with "x"):

I read and followed the CONTRIBUTING.md guide.
I read and followed the New Feature Checklist guide.

Short description of what this resolves:

…rt on dashboard page

…merce-dashboard

feat(ecDashboard): update earning chert with live data

Fix/safati charts issues

nnixaa · 2018-07-26T12:09:16Z

src/app/@core/data/orders-profit-chart.service.ts

+
+  constructor(private ordersChartService: OrdersChartService,
+              private profitChartService: ProfitChartService) {
+


unnecessary new line

nnixaa · 2018-07-26T12:12:02Z

src/app/@theme/styles/themes.scss

+  list-item-border-width: 1px,
+
+  slide-out-container-width: 30%,
+  slide-out-background: 	linear-gradient(270deg, #f7fafb 0%, #ecf2f5 100%),


unnecessary space

nnixaa · 2018-07-26T12:14:22Z

src/app/pages/e-commerce/charts-panel/charts/profit-chart.component.ts

+
+import { ProfitChart } from '../../../../@core/data/profit-chart.service';
+
+// TODO: need design, temporary solution


nnixaa · 2018-07-26T12:14:59Z

src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.scss

+    nb-theme(card-header-border-color);
+
+  .header {
+    margin-left: 1.1rem;


nnixaa · 2018-07-26T12:15:26Z

src/app/pages/e-commerce/country-orders/chart/country-orders-chart.component.ts

+            data: this.data,
+          },
+        ],
+      })


nnixaa · 2018-07-26T12:36:30Z

src/app/pages/e-commerce/earning-card/back-side/earning-card-back.component.scss

+  .echart {
+    position: absolute;
+    width: calc(50% - #{nb-theme(card-padding)});
+    height: calc(100% - 2 * #{nb-theme(card-padding)});


nnixaa · 2018-07-26T12:37:06Z

src/app/pages/e-commerce/earning-card/back-side/earning-pie-chart.component.ts

+        this.options = this.getOptions(variables);
+        const defaultSelectedData =
+          this.options.series[0].data.find((item) => item.name === this.defaultSelectedCurrency);
+        const color = defaultSelectedData.itemStyle.normal.color.colorStops[0].color;


efaultSelectedData.itemStyle.normal.color.colorStops[0].color;

nnixaa · 2018-07-26T12:38:07Z

src/app/pages/e-commerce/earning-card/front-side/earning-card-front.component.ts

+  earningLiveUpdateCardData: LiveUpdateChart;
+  liveUpdateChartData: {value: [string, number]}[];
+  timeTicket: any;
+


unnecessary line

nnixaa · 2018-07-26T12:39:47Z

src/app/pages/e-commerce/legend-chart/legend-chart.component.ts

+   * @type {{iconColor: string; title: string}[]}
+   */
+  @Input()
+  legendItems: {iconColor: NgxLegendItemColor; title: string}[];


nnixaa · 2018-07-26T12:41:07Z

src/app/pages/e-commerce/traffic-reveal-card/front-side/traffic-bar-chart.component.ts

+  }
+
+  ngOnDestroy() {
+    this.themeSubscription.unsubscribe();


nnixaa · 2018-07-26T12:46:13Z

Hey @dizco, this is a new dashboard we are working on, so if you have any comments - looking forward to it!

dizco · 2018-07-26T16:38:58Z

@nnixaa ohhh that sounds interesting! I'll check it out.

Nevermind my previous comment on here, I didn't know 😅

dizco · 2018-07-31T06:26:57Z

Hey @nnixaa, I checked it out and it looks really nice!! Definitely a few components that I should be able to reuse for my own project too.

Also something to think about could be a way to filter data, either by date interval or other... I know right now those filters are mostly on a per-card basis, but I'm wondering if that's really a main use case, versus filtering globally.

Just my 2 cents, great work

nnixaa · 2018-07-31T12:20:13Z

@dizco hm, good idea, I believe we can somehow combine both per card and global date/time filters. Will save it as a possible enhancement.

Apply review comments

feat(ecommerce): add responsive

…d front view

ecommerce update profit icon, add e commerce icon

ecommerce fix lint issues

DmytroLitvinov · 2018-08-08T15:15:30Z

Wow. New major release?

ESadouski and others added 30 commits February 6, 2018 00:50

feat(dashboard): prepare component for e-commerce dashboard

b99c1cb

feat(dashboard): update nebular version. use flip cards. add test cha…

a2f1217

…rt on dashboard page

feat(dashboard): stats card draft makeup

ef01d7e

feat(dashboard): flip card area. add tab to charts panel

c0370fb

feat(dashboard): add chart for back side

e10c346

feat(dashboard): add leaflet map

f4472a3

feat(dashboard): leaflet add country shapes

adbdef2

fix(dashboard): lint errors

c8cafaf

feat(dashboard): highlight and click on map

e0e5754

feat(dashboard): update chart by clicking on country

713c885

fix(dashboard): lint errors

9d4e316

feat(dashboard): rework front part of statisctic card

434f07c

fix(dashboard): lint errors

69b7858

fix(ecDashboard): change map background

b8a6ad1

fix(ecDashboard): make charts smaller

6b76dad

fix(ecDashboard): use two cards

a407b19

fix(ecDashboard): update colors

b505e59

fix(ecDashboard): merge with upstream master

dfca89c

feat(ecDashboard): update statistic front side card. merge fixes.

488bca0

feat(ecDashboard): back side profit component

c92111f

feat(ecDashboard): add traffic component

82212ab

feat(ecDashboard): hide axes line. show labels under chart

aaf117b

fix(ecDashboard): lint errors

eee6d6f

feat(ecDashboard): add period dropdown to header

338b811

feat(ecDashboard): redraw traffic chart

befe6de

fix(ecDashboard): lint

8f66a0f

Merge branch 'master' of https://github.com/akveo/ngx-admin into ecom…

d0a774a

…merce-dashboard

feat(ecommerce): add order chart, add profit chart template

7ea7235

feat(ecommerce): add order chart fix lint

4af118b

feat(ecommerce): update css styles for order, profit charts

5357c63

Eugen Sadovsky and others added 5 commits July 25, 2018 00:49

fix(ecDashboard): earning card merge conflicts

90e478b

Merge pull request #14 from ESadouski/ESad/live_data

0377729

feat(ecDashboard): update earning chert with live data

feat(ecommerce): fix safari issues

286395f

feat(ecommerce): fix lint

9b644e3

Merge pull request #17 from denStrigo/fix/safati_charts_issues

5c02a0b

Fix/safati charts issues

nnixaa requested changes Jul 26, 2018

View reviewed changes

Denis Strigo added 2 commits July 31, 2018 14:56

feat(ecommerce): apply review comments

2a2e6e3

feat(ecommerce): apply review comments

bb673d1

Denis Strigo and others added 12 commits July 31, 2018 15:36

feat(ecommerce): remove to do comment

5f50f65

feat(ecommerce): add traffic bar service

ab6118f

Merge pull request #18 from denStrigo/feat/ecommerce_fix_review

82e78a7

Apply review comments

feat(ecommerce): add responsive

220041a

feat(ecommerce): fix issues for responsive

6c27483

Merge pull request #19 from denStrigo/feat/ecommerce_responsive

57fbea2

feat(ecommerce): add responsive

feat(ecommerce): fix comments, add e-commerce icon, update profit car…

f35ec98

…d front view

Merge branch 'ecommerce-dashboard' into feat/ecommerce_fix_review

372295e

feat(ecommerce): fix review comments

ca509a0

feat(ecommerce): fix legend, earning chart

e20da6f

feat(ecommerce): fix e commerce layout size

86c1681

Merge pull request #20 from denStrigo/feat/ecommerce_fix_review

4dc2484

ecommerce update profit icon, add e commerce icon

nnixaa previously approved these changes Aug 8, 2018

View reviewed changes

Denis Strigo and others added 2 commits August 8, 2018 15:59

feat(ecommerce): fix lint issues

ee3bacd

Merge pull request #21 from denStrigo/fix/ecommerce_lint

60a8d2f

ecommerce fix lint issues

ESadouski dismissed nnixaa’s stale review via 60a8d2f August 8, 2018 13:16

nnixaa merged commit 56e4709 into akveo:master Aug 8, 2018


		constructor(private ordersChartService: OrdersChartService,
		private profitChartService: ProfitChartService) {


		import { ProfitChart } from '../../../../@core/data/profit-chart.service';

		// TODO: need design, temporary solution

Conversation

ESadouski commented Jun 26, 2018

Please read and mark the following check list before creating a pull request (check one with "x"):

Short description of what this resolves:

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nnixaa commented Jul 26, 2018

Uh oh!

dizco commented Jul 26, 2018

Uh oh!

dizco commented Jul 31, 2018

Uh oh!

nnixaa commented Jul 31, 2018

Uh oh!

DmytroLitvinov commented Aug 8, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants