From 52fbda71576a188e5188204e7171d195afb3d835 Mon Sep 17 00:00:00 2001 From: piratefinn Date: Thu, 31 Aug 2017 16:06:47 +0100 Subject: [PATCH] Removed redundant code and started abiliyt for customer entry --- src/app/dashboard/add-data.component.html | 58 +- src/app/dashboard/add-data.component.ts | 26 - .../dashboard-customer.component.html | 311 ++++++++ .../dashboard/dashboard-customer.component.ts | 732 ++++++++++++++++++ src/app/dashboard/dashboard.module.ts | 2 - src/app/dashboard/dashboard.routing.ts | 6 - src/app/dashboard/leaderboards.component.html | 373 --------- src/app/dashboard/leaderboards.component.ts | 45 -- 8 files changed, 1044 insertions(+), 509 deletions(-) create mode 100644 src/app/dashboard/dashboard-customer.component.html create mode 100644 src/app/dashboard/dashboard-customer.component.ts delete mode 100644 src/app/dashboard/leaderboards.component.html delete mode 100644 src/app/dashboard/leaderboards.component.ts diff --git a/src/app/dashboard/add-data.component.html b/src/app/dashboard/add-data.component.html index 60ab424..659642f 100644 --- a/src/app/dashboard/add-data.component.html +++ b/src/app/dashboard/add-data.component.html @@ -3,7 +3,7 @@
- Submit Supplier Transaction + Submit Transaction Required Data marked in bold.
@@ -178,62 +178,6 @@
-
-
- Total Suppliers Data - Required Data marked in bold. -
-
-
-
- -
- - This is a help text -
-
-
- -
-
- - -
- This is a help text -
-
-
- -
- - This is a help text -
-
-
- -
- - This is a help text -
-
-
-
-
- - -
-
-
-
-
- -
-
-
Individual Supplier Data diff --git a/src/app/dashboard/add-data.component.ts b/src/app/dashboard/add-data.component.ts index 2ed1e54..c4f21a6 100644 --- a/src/app/dashboard/add-data.component.ts +++ b/src/app/dashboard/add-data.component.ts @@ -12,7 +12,6 @@ import 'rxjs/add/operator/map'; }) export class AddDataComponent { payrollForm: FormGroup; - suppliersForm: FormGroup; singleSupplierForm: FormGroup; employeeForm: FormGroup; transactionForm: FormGroup; @@ -57,12 +56,6 @@ export class AddDataComponent { payrolltotalpension: [''], payrollotherbenefit: [''], }); - this.suppliersForm = this.formBuilder.group({ - entryperiod: ['', [Validators.required]], - grossspend: ['', [Validators.required]], - suppliersamount: ['', [Validators.required]], - localsuppliersamount: ['', [Validators.required]], - }); this.singleSupplierForm = this.formBuilder.group({ entryperiod: ['', [Validators.required]], supplierbusinessname: [''], @@ -273,25 +266,6 @@ export class AddDataComponent { ); } - onSubmitSuppliers() { - console.log(this.suppliersForm.value); - - this.api - .login(this.suppliersForm.value) - .subscribe( - result => { - console.log('data submitted!'); - this.suppliersFormStatus = "success"; - console.log(this.suppliersFormStatus); - }, - error => { - console.log( error._body ); - this.suppliersFormStatus = "send_failed"; - console.log(this.suppliersFormStatus); - } - ); - } - onSubmitSingleSupplier() { console.log(this.singleSupplierForm.value); diff --git a/src/app/dashboard/dashboard-customer.component.html b/src/app/dashboard/dashboard-customer.component.html new file mode 100644 index 0000000..5e37b19 --- /dev/null +++ b/src/app/dashboard/dashboard-customer.component.html @@ -0,0 +1,311 @@ +
+
+
+
    +
  • +
    Customers This Month
    + {{customersThisMonth}} +
    • +
  • +
    Money Spent This Month
    + {{moneySpentThisMonth | currency:'GBP':true:'1.2-2'}} +
    • +
  • +
    Points Total
    + {{pointsTotal}} +
    • +
  • +
    Average Transaction Today
    + {{averageTransactionToday | currency:'GBP':true:'1.2-2'}} +
    • +
  • +
    Local Suppliers
    + {{percentOfLocalSuppliers}}% +
    +
    +
    +
    • +
  • +
    Competitor Local Suppliers
    + {{percentOfSingleCompetitorLocalSuppliers}}% +
    +
    +
    +
    • +
+
+
+
+
+ +
+
+
+
+
{{noOfCustomersSector}}
+
No. of Customers in your Sector
+
+
+
+ Lorem ipsum dolor sit amet enim. +
+
+
+
+
+
+
{{percentOfCustomersSector}}%
+
Customers in your Sector
+
+
+
+ Lorem ipsum dolor sit amet enim. +
+
+
+
+
+
+ +

9.823

+

Customers last year

+
+
+ +
+
+
+
+
+
+ +

9.823

+

Returning Customers last week

+
+
+ +
+
+
+
+
+
+ +

9.823

+

Returning Customers last month

+
+
+ +
+
+
+
+
+
+ +

9.823

+

Returning Customers last year

+
+
+ +
+
+
+
+
+
+
+ +
+ Action + Another action + Something else here +
+
+

9.823

+

Points earned this week

+
+
+ +
+
+
+
+
+
+
+ +
+ Action + Another action + Something else here +
+
+

9.823

+

Points earned last week

+
+
+ +
+
+
+
+
+
+
Your suppliers that are local vs a local competitor
+
    +
  • + + Yours + {{percentOfLocalSuppliers}}% +
    +
    +
    +
    +
    +
    • +
  • + + A competitor + {{percentOfSingleCompetitorLocalSuppliers}}% +
    +
    +
    +
    +
    +
    • +
+
+
+
+
+
+
+
+
+

Customers

+
November 2015
+
+
+ + +
+
+
+ +
+
+
+
    +
  • +
    Customers
    + 24.093 Users (20%) +
    +
    +
    +
    • +
  • +
    Pageviews
    + 78.706 Views (60%) +
    +
    +
    +
    • +
  • +
    New Users
    + 22.123 Users (80%) +
    +
    +
    +
    • +
  • +
    Bounce Rate
    + 40.15% +
    +
    +
    +
    • +
+
+
+
diff --git a/src/app/dashboard/dashboard-customer.component.ts b/src/app/dashboard/dashboard-customer.component.ts new file mode 100644 index 0000000..47da3e5 --- /dev/null +++ b/src/app/dashboard/dashboard-customer.component.ts @@ -0,0 +1,732 @@ +import { Directive, Component, OnInit } from '@angular/core'; +import { Http, Response } from '@angular/http'; +import { ApiService } from '../providers/api-service'; +import { Router } from '@angular/router'; +import { GraphWidget } from '../widgets/graph-widget.component'; + +@Component({ + templateUrl: 'dashboard.component.html' +}) +export class DashboardComponent implements OnInit { + shuffledArray: any; + showGraph: any; + showSnippet: any; + customersThisMonth: any; + moneySpentThisMonth: any; + pointsTotal: any; + averageTransactionToday: any; + customersThisWeek: any; + customersLastWeek: any; + customersLastMonth: any; + customersLastYear: any; + pointsThisWeek: any; + pointsLastWeek: any; + percentOfCustomersSector: any; + noOfCustomersSector: any; + percentOfLocalSuppliers: any; + percentOfSingleCompetitorLocalSuppliers: any; + + public widgetList = [ + { + type: 'graph', + name: 'customers_last_7_days', + icon: 'icon-people', + title: 'Customers Last 7 Days', + }, + { + type: 'graph', + name: 'customers_last_30_days', + icon: 'icon-people', + title: 'Customers Last 30 Days', + }, + ]; + + constructor( + private http: Http, + private api: ApiService, + ) { + this.shuffle = this.shuffledArray; + this.api.graph_data(undefined) + .subscribe( + result => { + console.log(result); + // Return what data to show 4 of + this.showGraph = result.elementstoshow.graphs; + this.showSnippet = result.elementstoshow.snippets; + // Percentage Chart + this.percentOfLocalSuppliers = result.data.localsuppliers.percentownlocal; + this.percentOfSingleCompetitorLocalSuppliers = result.data.localsuppliers.percentsinglecompetitorlocal; + // Percentage Chart 2 + this.percentOfCustomersSector = result.data.customersinsector.percent; + this.noOfCustomersSector = result.data.customersinsector.customerno; + // Chart 1 + this.customersThisWeek = result.data.customersthisweek; + this.lineChart1Data[0].data = this.customersThisWeek.customerno; + this.lineChart1Labels = this.customersThisWeek.day; + // Chart 4 + this.customersLastYear = result.data.customerslastyear; + this.lineChart4Data[0].data = this.customersLastYear.customerno; + this.lineChart4Labels = this.customersLastYear.month; + // Chart 5 + this.pointsThisWeek = result.data.pointsthisweek; + this.lineChart5Data[0].data = this.pointsThisWeek.points; + this.lineChart5Labels = this.pointsThisWeek.day; + // Chart 6 + this.pointsLastWeek = result.data.pointslastweek; + this.barChart1Data[0].data = this.pointsLastWeek.points; + this.barChart1Labels = this.pointsLastWeek.day; + // Chart 7 + this.customersLastWeek = result.data.customerslastweek; + this.lineChart6Data[0].data = this.customersLastWeek.returningcustomerno; + this.lineChart6Labels = this.customersLastWeek.day; + // Chart 8 + this.customersLastMonth = result.data.customerslastmonth; + this.lineChart7Data[0].data = this.customersLastMonth.returningcustomerno; + this.lineChart7Labels = this.customersLastMonth.day; + // Chart 9 + this.customersLastYear = result.data.customerslastyear; + this.lineChart8Data[0].data = this.customersLastYear.returningcustomerno; + this.lineChart8Labels = this.customersLastYear.month; + } + ), + this.api.breadcrumb_data(undefined) + .subscribe( + result => { + console.log(result); + this.customersThisMonth = result.customersthismonth; + this.moneySpentThisMonth = result.moneyspentthismonth; + this.pointsTotal = result.pointstotal; + this.averageTransactionToday = result.averagetransactiontoday; + } + ); + } + + // Fisher-Yates shuffle function + public shuffle(array) { + return new Promise(resolve => { + let counter = array.length; + + // While there are elements in the array + while (counter > 0) { + // Pick a random index + const index = Math.floor(Math.random() * counter); + + // Decrease counter by 1 + counter--; + + // And swap the last element with it + const temp = array[counter]; + array[counter] = array[index]; + array[index] = temp; + } + + this.shuffledArray = array; + resolve(true); + }); + } + + public brandPrimary = '#20a8d8'; + public brandSuccess = '#4dbd74'; + public brandInfo = '#63c2de'; + public brandWarning = '#f8cb00'; + public brandDanger = '#f86c6b'; + + // dropdown buttons + public status: { isopen } = { isopen: false }; + public toggleDropdown($event: MouseEvent): void { + $event.preventDefault(); + $event.stopPropagation(); + this.status.isopen = !this.status.isopen; + } + + // convert Hex to RGBA + public convertHex(hex: string, opacity: number) { + hex = hex.replace('#', ''); + const r = parseInt(hex.substring(0, 2), 16); + const g = parseInt(hex.substring(2, 4), 16); + const b = parseInt(hex.substring(4, 6), 16); + + const rgba = 'rgba(' + r + ', ' + g + ', ' + b + ', ' + opacity / 100 + ')'; + return rgba; + } + + // events + public chartClicked(e: any): void { + console.log(e); + } + + public chartHovered(e: any): void { + console.log(e); + } + + // lineChart1 + public lineChart1Data: Array = [ + { + data: [], + label: 'Series A' + } + ]; + public lineChart1Labels: Array = []; + public lineChart1Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + gridLines: { + color: 'transparent', + zeroLineColor: 'transparent' + }, + ticks: { + fontSize: 2, + fontColor: 'transparent', + } + + }], + yAxes: [{ + display: false, + ticks: { + display: false, + } + }], + }, + elements: { + line: { + borderWidth: 1 + }, + point: { + radius: 4, + hitRadius: 10, + hoverRadius: 4, + }, + }, + legend: { + display: false + } + }; + public lineChart1Colours: Array = [ + { // grey + backgroundColor: this.brandPrimary, + borderColor: 'rgba(255,255,255,.55)' + } + ]; + public lineChart1Legend = false; + public lineChart1Type = 'line'; + + // lineChart4 + public lineChart4Data: Array = [ + { + data: [], + label: 'Series B' + } + ]; + public lineChart4Labels: Array = []; + public lineChart4Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + gridLines: { + color: 'transparent', + zeroLineColor: 'transparent' + }, + ticks: { + fontSize: 2, + fontColor: 'transparent', + } + + }], + yAxes: [{ + display: false, + ticks: { + display: false, + } + }], + }, + elements: { + line: { + tension: 0.00001, + borderWidth: 1 + }, + point: { + radius: 4, + hitRadius: 10, + hoverRadius: 4, + }, + }, + legend: { + display: false + } + }; + public lineChart4Colours: Array = [ + { // grey + backgroundColor: this.brandInfo, + borderColor: 'rgba(255,255,255,.55)' + } + ]; + public lineChart4Legend = false; + public lineChart4Type = 'line'; + + // lineChart6 + public lineChart6Data: Array = [ + { + data: [], + label: 'Series B' + } + ]; + public lineChart6Labels: Array = []; + public lineChart6Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + gridLines: { + color: 'transparent', + zeroLineColor: 'transparent' + }, + ticks: { + fontSize: 2, + fontColor: 'transparent', + } + + }], + yAxes: [{ + display: false, + ticks: { + display: false, + } + }], + }, + elements: { + line: { + tension: 0.00001, + borderWidth: 1 + }, + point: { + radius: 4, + hitRadius: 10, + hoverRadius: 4, + }, + }, + legend: { + display: false + } + }; + public lineChart6Colours: Array = [ + { // grey + backgroundColor: this.brandInfo, + borderColor: 'rgba(255,255,255,.55)' + } + ]; + public lineChart6Legend = false; + public lineChart6Type = 'line'; + + // lineChart7 + public lineChart7Data: Array = [ + { + data: [], + label: 'Series B' + } + ]; + public lineChart7Labels: Array = []; + public lineChart7Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + display: false + }], + yAxes: [{ + display: false + }] + }, + elements: { + line: { + borderWidth: 2 + }, + point: { + radius: 2, + hitRadius: 10, + hoverRadius: 4, + }, + }, + legend: { + display: false + } + }; + public lineChart7Colours: Array = [ + { // grey + backgroundColor: this.brandInfo, + borderColor: 'rgba(255,255,255,.55)' + } + ]; + public lineChart7Legend = false; + public lineChart7Type = 'line'; + + // lineChart8 + public lineChart8Data: Array = [ + { + data: [], + label: 'Series B' + } + ]; + public lineChart8Labels: Array = []; + public lineChart8Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + gridLines: { + color: 'transparent', + zeroLineColor: 'transparent' + }, + ticks: { + fontSize: 2, + fontColor: 'transparent', + } + + }], + yAxes: [{ + display: false, + ticks: { + display: false, + } + }], + }, + elements: { + line: { + tension: 0.00001, + borderWidth: 1 + }, + point: { + radius: 4, + hitRadius: 10, + hoverRadius: 4, + }, + }, + legend: { + display: false + } + }; + public lineChart8Colours: Array = [ + { // grey + backgroundColor: this.brandInfo, + borderColor: 'rgba(255,255,255,.55)' + } + ]; + public lineChart8Legend = false; + public lineChart8Type = 'line'; + + // lineChart5 + public lineChart5Data: Array = [ + { + data: [], + label: 'Series A' + } + ]; + public lineChart5Labels: Array = []; + public lineChart5Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + display: false + }], + yAxes: [{ + display: false + }] + }, + elements: { + line: { + borderWidth: 2 + }, + point: { + radius: 0, + hitRadius: 10, + hoverRadius: 4, + }, + }, + legend: { + display: false + } + }; + public lineChart5Colours: Array = [ + { + backgroundColor: 'rgba(255,255,255,.2)', + borderColor: 'rgba(255,255,255,.55)', + } + ]; + public lineChart5Legend = false; + public lineChart5Type = 'line'; + + + // barChart1 + public barChart1Data: Array = [ + { + data: [], + label: 'Series A' + } + ]; + public barChart1Labels: Array = []; + public barChart1Options: any = { + maintainAspectRatio: false, + scales: { + xAxes: [{ + display: false, + barPercentage: 0.6, + }], + yAxes: [{ + display: false + }] + }, + legend: { + display: false + } + }; + public barChart1Colours: Array = [ + { + backgroundColor: 'rgba(255,255,255,.3)', + borderWidth: 0 + } + ]; + public barChart1Legend = false; + public barChart1Type = 'bar'; + + // mainChart + + public random(min: number, max: number) { + return Math.floor(Math.random() * (max - min + 1) + min); + } + + public mainChartElements = 27; + public mainChartData1: Array = []; + public mainChartData2: Array = []; + public mainChartData3: Array = []; + + public mainChartData: Array = [ + { + data: this.mainChartData1, + label: 'Current' + }, + { + data: this.mainChartData2, + label: 'Previous' + }, + { + data: this.mainChartData3, + label: 'BEP' + } + ]; + /* tslint:disable:max-line-length */ + public mainChartLabels: Array = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday', 'Monday', 'Thursday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday']; + /* tslint:enable:max-line-length */ + public mainChartOptions: any = { + responsive: true, + maintainAspectRatio: false, + scales: { + xAxes: [{ + gridLines: { + drawOnChartArea: false, + }, + ticks: { + callback: function(value: any) { + return value.charAt(0); + } + } + }], + yAxes: [{ + ticks: { + beginAtZero: true, + maxTicksLimit: 5, + stepSize: Math.ceil(250 / 5), + max: 250 + } + }] + }, + elements: { + line: { + borderWidth: 2 + }, + point: { + radius: 0, + hitRadius: 10, + hoverRadius: 4, + hoverBorderWidth: 3, + } + }, + legend: { + display: false + } + }; + public mainChartColours: Array = [ + { // brandInfo + backgroundColor: this.convertHex(this.brandInfo, 10), + borderColor: this.brandInfo, + pointHoverBackgroundColor: '#fff' + }, + { // brandSuccess + backgroundColor: 'transparent', + borderColor: this.brandSuccess, + pointHoverBackgroundColor: '#fff' + }, + { // brandDanger + backgroundColor: 'transparent', + borderColor: this.brandDanger, + pointHoverBackgroundColor: '#fff', + borderWidth: 1, + borderDash: [8, 5] + } + ]; + public mainChartLegend = false; + public mainChartType = 'line'; + + // social box charts + + public socialChartData1: Array = [ + { + data: [65, 59, 84, 84, 51, 55, 40], + label: 'Facebook' + } + ]; + public socialChartData2: Array = [ + { + data: [1, 13, 9, 17, 34, 41, 38], + label: 'Twitter' + } + ]; + public socialChartData3: Array = [ + { + data: [78, 81, 80, 45, 34, 12, 40], + label: 'LinkedIn' + } + ]; + public socialChartData4: Array = [ + { + data: [35, 23, 56, 22, 97, 23, 64], + label: 'Google+' + } + ]; + + public socialChartLabels: Array = ['January', 'February', 'March', 'April', 'May', 'June', 'July']; + public socialChartOptions: any = { + responsive: true, + maintainAspectRatio: false, + scales: { + xAxes: [{ + display: false, + }], + yAxes: [{ + display: false, + }] + }, + elements: { + line: { + borderWidth: 2 + }, + point: { + radius: 0, + hitRadius: 10, + hoverRadius: 4, + hoverBorderWidth: 3, + } + }, + legend: { + display: false + } + }; + public socialChartColours: Array = [ + { + backgroundColor: 'rgba(255,255,255,.1)', + borderColor: 'rgba(255,255,255,.55)', + pointHoverBackgroundColor: '#fff' + } + ]; + public socialChartLegend = false; + public socialChartType = 'line'; + + // sparkline charts + + public sparklineChartData1: Array = [ + { + data: [35, 23, 56, 22, 97, 23, 64], + label: 'Clients' + } + ]; + public sparklineChartData2: Array = [ + { + data: [65, 59, 84, 84, 51, 55, 40], + label: 'Clients' + } + ]; + + public sparklineChartLabels: Array = ['January', 'February', 'March', 'April', 'May', 'June', 'July']; + public sparklineChartOptions: any = { + responsive: true, + maintainAspectRatio: false, + scales: { + xAxes: [{ + display: false, + }], + yAxes: [{ + display: false, + }] + }, + elements: { + line: { + borderWidth: 2 + }, + point: { + radius: 0, + hitRadius: 10, + hoverRadius: 4, + hoverBorderWidth: 3, + } + }, + legend: { + display: false + } + }; + public sparklineChartDefault: Array = [ + { + backgroundColor: 'transparent', + borderColor: '#d1d4d7', + } + ]; + public sparklineChartPrimary: Array = [ + { + backgroundColor: 'transparent', + borderColor: this.brandPrimary, + } + ]; + public sparklineChartInfo: Array = [ + { + backgroundColor: 'transparent', + borderColor: this.brandInfo, + } + ]; + public sparklineChartDanger: Array = [ + { + backgroundColor: 'transparent', + borderColor: this.brandDanger, + } + ]; + public sparklineChartWarning: Array = [ + { + backgroundColor: 'transparent', + borderColor: this.brandWarning, + } + ]; + public sparklineChartSuccess: Array = [ + { + backgroundColor: 'transparent', + borderColor: this.brandSuccess, + } + ]; + + + public sparklineChartLegend = false; + public sparklineChartType = 'line'; + + + ngOnInit(): void { + // generate random values for mainChart + for (let i = 0; i <= this.mainChartElements; i++) { + this.mainChartData1.push(this.random(50, 200)); + this.mainChartData2.push(this.random(80, 100)); + this.mainChartData3.push(this.random(50, 200)); + } + } +} diff --git a/src/app/dashboard/dashboard.module.ts b/src/app/dashboard/dashboard.module.ts index c7bcdcc..8eb9d09 100644 --- a/src/app/dashboard/dashboard.module.ts +++ b/src/app/dashboard/dashboard.module.ts @@ -5,7 +5,6 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; import { DashboardComponent } from './dashboard.component'; -import { LeaderboardsComponent } from './leaderboards.component'; import { AccountEditComponent } from './account-edit.component'; import { AddDataComponent } from './add-data.component'; @@ -27,7 +26,6 @@ import { OrgTableComponent } from '../shared/org-table.component'; ], declarations: [ DashboardComponent, - LeaderboardsComponent, AccountEditComponent, AddDataComponent, OrgResultComponent, diff --git a/src/app/dashboard/dashboard.routing.ts b/src/app/dashboard/dashboard.routing.ts index dcd9bfa..3b7f9a0 100644 --- a/src/app/dashboard/dashboard.routing.ts +++ b/src/app/dashboard/dashboard.routing.ts @@ -4,7 +4,6 @@ import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../_guards/auth.guard'; import { DashboardComponent } from './dashboard.component'; -import { LeaderboardsComponent } from './leaderboards.component'; import { FullLayoutComponent } from '../layouts/full-layout.component'; import { AccountEditComponent } from './account-edit.component'; import { AddDataComponent } from './add-data.component'; @@ -22,11 +21,6 @@ const routes: Routes = [ component: DashboardComponent, data: { title: 'Dashboard' }, }, - { - path: 'leaderboards', - component: LeaderboardsComponent, - data: { title: 'Leaderboards' }, - }, { path: 'account-edit', component: AccountEditComponent, diff --git a/src/app/dashboard/leaderboards.component.html b/src/app/dashboard/leaderboards.component.html deleted file mode 100644 index df82859..0000000 --- a/src/app/dashboard/leaderboards.component.html +++ /dev/null @@ -1,373 +0,0 @@ -
-
-
-
-
- Simple Table -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Samppa Nori2012/01/01Member - Active -
Estavan Lykos2012/02/01Staff - Banned -
Chetan Mohamed2012/02/01Admin - Inactive -
Derick Maximinus2012/03/01Member - Pending -
Friderik Dávid2012/01/21Staff - Active -
- -
-
-
- -
-
-
- Striped Table -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Yiorgos Avraamu2012/01/01Member - Active -
Avram Tarasios2012/02/01Staff - Banned -
Quintin Ed2012/02/01Admin - Inactive -
Enéas Kwadwo2012/03/01Member - Pending -
Agapetus Tadeáš2012/01/21Staff - Active -
- -
-
-
- -
- -
-
-
-
- Condensed Table -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Carwyn Fachtna2012/01/01Member - Active -
Nehemiah Tatius2012/02/01Staff - Banned -
Ebbe Gemariah2012/02/01Admin - Inactive -
Eustorgios Amulius2012/03/01Member - Pending -
Leopold Gáspár2012/01/21Staff - Active -
- -
-
-
- -
-
-
- Bordered Table -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Pompeius René2012/01/01Member - Active -
Paĉjo Jadon2012/02/01Staff - Banned -
Micheal Mercurius2012/02/01Admin - Inactive -
Ganesha Dubhghall2012/03/01Member - Pending -
Hiroto Šimun2012/01/21Staff - Active -
- -
-
-
- -
- -
-
-
-
- Combined All Table -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
UsernameDate registeredRoleStatus
Vishnu Serghei2012/01/01Member - Active -
Zbyněk Phoibos2012/02/01Staff - Banned -
Einar Randall2012/02/01Admin - Inactive -
Félix Troels2012/03/01Member - Pending -
Aulus Agmundr2012/01/21Staff - Active -
- -
-
-
- -
- -
diff --git a/src/app/dashboard/leaderboards.component.ts b/src/app/dashboard/leaderboards.component.ts deleted file mode 100644 index c5cda43..0000000 --- a/src/app/dashboard/leaderboards.component.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { Http, Response } from '@angular/http'; -import { ApiService } from '../providers/api-service'; -import 'rxjs/add/operator/map'; - -@Component({ - templateUrl: 'leaderboards.component.html', - providers: [ApiService] -}) -export class LeaderboardsComponent { - - constructor( - private http: Http, - private api: ApiService, - ) { - } - - ngOnInit() { - this.api - // get daily total - .leaderboard_fetch('daily_total') - .subscribe( - result => { - console.log('got daily weekly leaderboard!'); - console.log(result); - }, - error => { - console.log( error._body ); - } - ); - this.api - // get daily count - .leaderboard_fetch('daily_count') - .subscribe( - result => { - console.log('got daily count leaderboard!'); - console.log(result); - }, - error => { - console.log( error._body ); - } - ); - } - -}