From 8984df24ad2d304be338e55949465d696badd8ee Mon Sep 17 00:00:00 2001 From: GloriousCode Date: Mon, 13 Nov 2017 17:53:29 +1100 Subject: [PATCH] Adds components for design of dashboard, selected currency, donate and buy-sell components --- web/src/app/app.component.html | 4 ++- web/src/app/app.module.ts | 14 +++++++++++ .../pages/dashboard/dashboard.component.html | 18 ++++++++++++- .../pages/dashboard/dashboard.component.scss | 10 ++++++++ .../shared/buy-sell/buy-sell.component.html | 3 +++ .../shared/buy-sell/buy-sell.component.scss | 0 .../buy-sell/buy-sell.component.spec.ts | 25 +++++++++++++++++++ .../app/shared/buy-sell/buy-sell.component.ts | 15 +++++++++++ .../app/shared/donate/donate.component.html | 1 + .../app/shared/donate/donate.component.scss | 0 .../shared/donate/donate.component.spec.ts | 25 +++++++++++++++++++ web/src/app/shared/donate/donate.component.ts | 15 +++++++++++ .../shared/my-orders/my-orders.component.html | 5 ++++ .../shared/my-orders/my-orders.component.scss | 0 .../my-orders/my-orders.component.spec.ts | 25 +++++++++++++++++++ .../shared/my-orders/my-orders.component.ts | 15 +++++++++++ .../app/shared/orders/orders.component.html | 5 ++++ .../app/shared/orders/orders.component.scss | 0 .../shared/orders/orders.component.spec.ts | 25 +++++++++++++++++++ web/src/app/shared/orders/orders.component.ts | 15 +++++++++++ .../price-history.component.html | 5 ++++ .../price-history.component.scss | 0 .../price-history.component.spec.ts | 25 +++++++++++++++++++ .../price-history/price-history.component.ts | 15 +++++++++++ .../selected-currency.component.html | 3 +++ .../selected-currency.component.scss | 0 .../selected-currency.component.spec.ts | 25 +++++++++++++++++++ .../selected-currency.component.ts | 15 +++++++++++ .../trade-history.component.html | 5 ++++ .../trade-history.component.scss | 0 .../trade-history.component.spec.ts | 25 +++++++++++++++++++ .../trade-history/trade-history.component.ts | 15 +++++++++++ 32 files changed, 351 insertions(+), 2 deletions(-) create mode 100644 web/src/app/shared/buy-sell/buy-sell.component.html create mode 100644 web/src/app/shared/buy-sell/buy-sell.component.scss create mode 100644 web/src/app/shared/buy-sell/buy-sell.component.spec.ts create mode 100644 web/src/app/shared/buy-sell/buy-sell.component.ts create mode 100644 web/src/app/shared/donate/donate.component.html create mode 100644 web/src/app/shared/donate/donate.component.scss create mode 100644 web/src/app/shared/donate/donate.component.spec.ts create mode 100644 web/src/app/shared/donate/donate.component.ts create mode 100644 web/src/app/shared/my-orders/my-orders.component.html create mode 100644 web/src/app/shared/my-orders/my-orders.component.scss create mode 100644 web/src/app/shared/my-orders/my-orders.component.spec.ts create mode 100644 web/src/app/shared/my-orders/my-orders.component.ts create mode 100644 web/src/app/shared/orders/orders.component.html create mode 100644 web/src/app/shared/orders/orders.component.scss create mode 100644 web/src/app/shared/orders/orders.component.spec.ts create mode 100644 web/src/app/shared/orders/orders.component.ts create mode 100644 web/src/app/shared/price-history/price-history.component.html create mode 100644 web/src/app/shared/price-history/price-history.component.scss create mode 100644 web/src/app/shared/price-history/price-history.component.spec.ts create mode 100644 web/src/app/shared/price-history/price-history.component.ts create mode 100644 web/src/app/shared/selected-currency/selected-currency.component.html create mode 100644 web/src/app/shared/selected-currency/selected-currency.component.scss create mode 100644 web/src/app/shared/selected-currency/selected-currency.component.spec.ts create mode 100644 web/src/app/shared/selected-currency/selected-currency.component.ts create mode 100644 web/src/app/shared/trade-history/trade-history.component.html create mode 100644 web/src/app/shared/trade-history/trade-history.component.scss create mode 100644 web/src/app/shared/trade-history/trade-history.component.spec.ts create mode 100644 web/src/app/shared/trade-history/trade-history.component.ts diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html index 107e242c..da75cf50 100644 --- a/web/src/app/app.component.html +++ b/web/src/app/app.component.html @@ -4,7 +4,7 @@ - trending_up  + view_quilt 

Dashboard

 @@ -24,6 +24,8 @@

Settings

 +
+ diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts index eb6e7403..bae632c9 100644 --- a/web/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -54,6 +54,13 @@ import { Wallet } from './shared/classes/wallet'; import * as Rx from 'rxjs/Rx'; +import { TradeHistoryComponent } from './shared/trade-history/trade-history.component'; +import { PriceHistoryComponent } from './shared/price-history/price-history.component'; +import { MyOrdersComponent } from './shared/my-orders/my-orders.component'; +import { OrdersComponent } from './shared/orders/orders.component'; +import { BuySellComponent } from './shared/buy-sell/buy-sell.component'; +import { DonateComponent } from './shared/donate/donate.component'; +import { SelectedCurrencyComponent } from './shared/selected-currency/selected-currency.component'; @NgModule({ @@ -69,6 +76,13 @@ import * as Rx from 'rxjs/Rx'; SidebarComponent, WalletComponent, ThemePickerComponent, + TradeHistoryComponent, + PriceHistoryComponent, + MyOrdersComponent, + OrdersComponent, + BuySellComponent, + DonateComponent, + SelectedCurrencyComponent, ], imports: [ BrowserModule, diff --git a/web/src/app/pages/dashboard/dashboard.component.html b/web/src/app/pages/dashboard/dashboard.component.html index f19d6c27..e830e491 100644 --- a/web/src/app/pages/dashboard/dashboard.component.html +++ b/web/src/app/pages/dashboard/dashboard.component.html @@ -1 +1,17 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + diff --git a/web/src/app/pages/dashboard/dashboard.component.scss b/web/src/app/pages/dashboard/dashboard.component.scss index e69de29b..f0d02af2 100644 --- a/web/src/app/pages/dashboard/dashboard.component.scss +++ b/web/src/app/pages/dashboard/dashboard.component.scss @@ -0,0 +1,10 @@ +app-trade-history, app-orders, app-price-history, app-my-orders { + height:100%; + width:100%; + margin: 15px; +} + +.my-orders-card, .orders-card,.trade-history-card,.price-history-card { + height: 90%; + width:90%; +} \ No newline at end of file diff --git a/web/src/app/shared/buy-sell/buy-sell.component.html b/web/src/app/shared/buy-sell/buy-sell.component.html new file mode 100644 index 00000000..40a5d1ef --- /dev/null +++ b/web/src/app/shared/buy-sell/buy-sell.component.html @@ -0,0 +1,3 @@ +

+ buy-sell works! +

diff --git a/web/src/app/shared/buy-sell/buy-sell.component.scss b/web/src/app/shared/buy-sell/buy-sell.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/buy-sell/buy-sell.component.spec.ts b/web/src/app/shared/buy-sell/buy-sell.component.spec.ts new file mode 100644 index 00000000..139eef84 --- /dev/null +++ b/web/src/app/shared/buy-sell/buy-sell.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BuySellComponent } from './buy-sell.component'; + +describe('BuySellComponent', () => { + let component: BuySellComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ BuySellComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BuySellComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/buy-sell/buy-sell.component.ts b/web/src/app/shared/buy-sell/buy-sell.component.ts new file mode 100644 index 00000000..c0b2e2af --- /dev/null +++ b/web/src/app/shared/buy-sell/buy-sell.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-buy-sell', + templateUrl: './buy-sell.component.html', + styleUrls: ['./buy-sell.component.scss'] +}) +export class BuySellComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/donate/donate.component.html b/web/src/app/shared/donate/donate.component.html new file mode 100644 index 00000000..ec9cc2d1 --- /dev/null +++ b/web/src/app/shared/donate/donate.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/src/app/shared/donate/donate.component.scss b/web/src/app/shared/donate/donate.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/donate/donate.component.spec.ts b/web/src/app/shared/donate/donate.component.spec.ts new file mode 100644 index 00000000..295968ed --- /dev/null +++ b/web/src/app/shared/donate/donate.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { DonateComponent } from './donate.component'; + +describe('DonateComponent', () => { + let component: DonateComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ DonateComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DonateComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/donate/donate.component.ts b/web/src/app/shared/donate/donate.component.ts new file mode 100644 index 00000000..6c782663 --- /dev/null +++ b/web/src/app/shared/donate/donate.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-donate', + templateUrl: './donate.component.html', + styleUrls: ['./donate.component.scss'] +}) +export class DonateComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/my-orders/my-orders.component.html b/web/src/app/shared/my-orders/my-orders.component.html new file mode 100644 index 00000000..dd8ade0c --- /dev/null +++ b/web/src/app/shared/my-orders/my-orders.component.html @@ -0,0 +1,5 @@ + + + My Orders + + \ No newline at end of file diff --git a/web/src/app/shared/my-orders/my-orders.component.scss b/web/src/app/shared/my-orders/my-orders.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/my-orders/my-orders.component.spec.ts b/web/src/app/shared/my-orders/my-orders.component.spec.ts new file mode 100644 index 00000000..f17ff491 --- /dev/null +++ b/web/src/app/shared/my-orders/my-orders.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MyOrdersComponent } from './my-orders.component'; + +describe('MyOrdersComponent', () => { + let component: MyOrdersComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ MyOrdersComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MyOrdersComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/my-orders/my-orders.component.ts b/web/src/app/shared/my-orders/my-orders.component.ts new file mode 100644 index 00000000..8861addd --- /dev/null +++ b/web/src/app/shared/my-orders/my-orders.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-my-orders', + templateUrl: './my-orders.component.html', + styleUrls: ['./my-orders.component.scss'] +}) +export class MyOrdersComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/orders/orders.component.html b/web/src/app/shared/orders/orders.component.html new file mode 100644 index 00000000..6eac8919 --- /dev/null +++ b/web/src/app/shared/orders/orders.component.html @@ -0,0 +1,5 @@ + + + Orders + + \ No newline at end of file diff --git a/web/src/app/shared/orders/orders.component.scss b/web/src/app/shared/orders/orders.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/orders/orders.component.spec.ts b/web/src/app/shared/orders/orders.component.spec.ts new file mode 100644 index 00000000..b8efbb0f --- /dev/null +++ b/web/src/app/shared/orders/orders.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { OrdersComponent } from './orders.component'; + +describe('OrdersComponent', () => { + let component: OrdersComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ OrdersComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrdersComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/orders/orders.component.ts b/web/src/app/shared/orders/orders.component.ts new file mode 100644 index 00000000..de2ad688 --- /dev/null +++ b/web/src/app/shared/orders/orders.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-orders', + templateUrl: './orders.component.html', + styleUrls: ['./orders.component.scss'] +}) +export class OrdersComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/price-history/price-history.component.html b/web/src/app/shared/price-history/price-history.component.html new file mode 100644 index 00000000..85294996 --- /dev/null +++ b/web/src/app/shared/price-history/price-history.component.html @@ -0,0 +1,5 @@ + + + Price History + + \ No newline at end of file diff --git a/web/src/app/shared/price-history/price-history.component.scss b/web/src/app/shared/price-history/price-history.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/price-history/price-history.component.spec.ts b/web/src/app/shared/price-history/price-history.component.spec.ts new file mode 100644 index 00000000..56f7d51b --- /dev/null +++ b/web/src/app/shared/price-history/price-history.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { PriceHistoryComponent } from './price-history.component'; + +describe('PriceHistoryComponent', () => { + let component: PriceHistoryComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ PriceHistoryComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PriceHistoryComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/price-history/price-history.component.ts b/web/src/app/shared/price-history/price-history.component.ts new file mode 100644 index 00000000..3120ec5a --- /dev/null +++ b/web/src/app/shared/price-history/price-history.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-price-history', + templateUrl: './price-history.component.html', + styleUrls: ['./price-history.component.scss'] +}) +export class PriceHistoryComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/selected-currency/selected-currency.component.html b/web/src/app/shared/selected-currency/selected-currency.component.html new file mode 100644 index 00000000..946f8943 --- /dev/null +++ b/web/src/app/shared/selected-currency/selected-currency.component.html @@ -0,0 +1,3 @@ +

+ selected-currency works! +

diff --git a/web/src/app/shared/selected-currency/selected-currency.component.scss b/web/src/app/shared/selected-currency/selected-currency.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/selected-currency/selected-currency.component.spec.ts b/web/src/app/shared/selected-currency/selected-currency.component.spec.ts new file mode 100644 index 00000000..b01c9a44 --- /dev/null +++ b/web/src/app/shared/selected-currency/selected-currency.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { SelectedCurrencyComponent } from './selected-currency.component'; + +describe('SelectedCurrencyComponent', () => { + let component: SelectedCurrencyComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ SelectedCurrencyComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(SelectedCurrencyComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/selected-currency/selected-currency.component.ts b/web/src/app/shared/selected-currency/selected-currency.component.ts new file mode 100644 index 00000000..2b608650 --- /dev/null +++ b/web/src/app/shared/selected-currency/selected-currency.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-selected-currency', + templateUrl: './selected-currency.component.html', + styleUrls: ['./selected-currency.component.scss'] +}) +export class SelectedCurrencyComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/trade-history/trade-history.component.html b/web/src/app/shared/trade-history/trade-history.component.html new file mode 100644 index 00000000..982c2f1b --- /dev/null +++ b/web/src/app/shared/trade-history/trade-history.component.html @@ -0,0 +1,5 @@ + + + Trade History + + \ No newline at end of file diff --git a/web/src/app/shared/trade-history/trade-history.component.scss b/web/src/app/shared/trade-history/trade-history.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/trade-history/trade-history.component.spec.ts b/web/src/app/shared/trade-history/trade-history.component.spec.ts new file mode 100644 index 00000000..f835805c --- /dev/null +++ b/web/src/app/shared/trade-history/trade-history.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { TradeHistoryComponent } from './trade-history.component'; + +describe('TradeHistoryComponent', () => { + let component: TradeHistoryComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ TradeHistoryComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(TradeHistoryComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/trade-history/trade-history.component.ts b/web/src/app/shared/trade-history/trade-history.component.ts new file mode 100644 index 00000000..79808e63 --- /dev/null +++ b/web/src/app/shared/trade-history/trade-history.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-trade-history', + templateUrl: './trade-history.component.html', + styleUrls: ['./trade-history.component.scss'] +}) +export class TradeHistoryComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +}