From cf9425a0d752115565f114ecdb33f57b3b70b4dc Mon Sep 17 00:00:00 2001 From: GloriousCode Date: Thu, 14 Dec 2017 17:14:43 +1100 Subject: [PATCH] Dumb fleshout of currency listing and buy sell component --- web/src/app/app-routing.module.ts | 10 ++++ web/src/app/app.component.scss | 3 +- web/src/app/app.module.ts | 6 ++ .../currency-list.component.html | 35 +++++++++++ .../currency-list.component.scss | 9 +++ .../currency-list.component.spec.ts | 25 ++++++++ .../currency-list/currency-list.component.ts | 15 +++++ .../app/pages/donate/donate.component.scss | 2 +- .../exchange-grid.component.html | 60 +++++++++++++++++++ .../exchange-grid.component.scss | 0 .../exchange-grid.component.spec.ts | 25 ++++++++ .../exchange-grid/exchange-grid.component.ts | 15 +++++ .../app/pages/trading/trading.component.html | 4 +- .../buy-sell-form.component.html | 3 + .../buy-sell-form.component.scss | 0 .../buy-sell-form.component.spec.ts | 25 ++++++++ .../buy-sell-form/buy-sell-form.component.ts | 15 +++++ .../shared/buy-sell/buy-sell.component.html | 10 ++-- .../app/shared/navbar/navbar.component.html | 2 + .../selected-currency.component.html | 6 +- 20 files changed, 255 insertions(+), 15 deletions(-) create mode 100644 web/src/app/pages/currency-list/currency-list.component.html create mode 100644 web/src/app/pages/currency-list/currency-list.component.scss create mode 100644 web/src/app/pages/currency-list/currency-list.component.spec.ts create mode 100644 web/src/app/pages/currency-list/currency-list.component.ts create mode 100644 web/src/app/pages/exchange-grid/exchange-grid.component.html create mode 100644 web/src/app/pages/exchange-grid/exchange-grid.component.scss create mode 100644 web/src/app/pages/exchange-grid/exchange-grid.component.spec.ts create mode 100644 web/src/app/pages/exchange-grid/exchange-grid.component.ts create mode 100644 web/src/app/shared/buy-sell-form/buy-sell-form.component.html create mode 100644 web/src/app/shared/buy-sell-form/buy-sell-form.component.scss create mode 100644 web/src/app/shared/buy-sell-form/buy-sell-form.component.spec.ts create mode 100644 web/src/app/shared/buy-sell-form/buy-sell-form.component.ts diff --git a/web/src/app/app-routing.module.ts b/web/src/app/app-routing.module.ts index 36a33adc..623b4a5d 100644 --- a/web/src/app/app-routing.module.ts +++ b/web/src/app/app-routing.module.ts @@ -6,6 +6,8 @@ import { WalletComponent } from './pages/wallet/wallet.component'; import { DonateComponent } from './pages/donate/donate.component'; import { HistoryComponent } from './pages/history/history.component'; import { TradingComponent } from './pages/trading/trading.component'; +import { ExchangeGridComponent } from './pages/exchange-grid/exchange-grid.component'; +import { CurrencyListComponent } from './pages/currency-list/currency-list.component'; import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; @@ -43,6 +45,14 @@ const routes: Routes = [ { path: 'trading', component: TradingComponent + }, + { + path: 'exchange-grid', + component: ExchangeGridComponent + }, + { + path: 'currency-list', + component: CurrencyListComponent } ]; diff --git a/web/src/app/app.component.scss b/web/src/app/app.component.scss index ae2f8824..ee32bed6 100644 --- a/web/src/app/app.component.scss +++ b/web/src/app/app.component.scss @@ -18,7 +18,6 @@ width: 14%; position: fixed; margin-top: 4rem; - } .navbar { @@ -36,7 +35,7 @@ } .history-highlight { - color: blue !important; + color: cornflowerblue !important; } .wallet-highlight { diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts index e59d770e..703cebf2 100644 --- a/web/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -65,6 +65,9 @@ import { BuySellComponent } from './shared/buy-sell/buy-sell.component'; import { SelectedCurrencyComponent } from './shared/selected-currency/selected-currency.component'; import { TradingComponent } from './pages/trading/trading.component'; import { HistoryComponent } from './pages/history/history.component'; +import { BuySellFormComponent } from './shared/buy-sell-form/buy-sell-form.component'; +import { ExchangeGridComponent } from './pages/exchange-grid/exchange-grid.component'; +import { CurrencyListComponent } from './pages/currency-list/currency-list.component'; @NgModule({ @@ -88,6 +91,9 @@ import { HistoryComponent } from './pages/history/history.component'; SelectedCurrencyComponent, TradingComponent, HistoryComponent, + BuySellFormComponent, + ExchangeGridComponent, + CurrencyListComponent, ], imports: [ BrowserModule, diff --git a/web/src/app/pages/currency-list/currency-list.component.html b/web/src/app/pages/currency-list/currency-list.component.html new file mode 100644 index 00000000..ad84feff --- /dev/null +++ b/web/src/app/pages/currency-list/currency-list.component.html @@ -0,0 +1,35 @@ + +

Poloniex

+ + attach_money +

BTC_USD

+ +
+ + attach_money +

LTC_USD

+ +
+ + attach_money +

ETH_USD

+ +
+ +

Kraken

+ + attach_money +

BTC_USD

+ +
+ + attach_money +

LTC_USD

+ +
+ + attach_money +

ETH_USD

+ +
+
\ No newline at end of file diff --git a/web/src/app/pages/currency-list/currency-list.component.scss b/web/src/app/pages/currency-list/currency-list.component.scss new file mode 100644 index 00000000..14568929 --- /dev/null +++ b/web/src/app/pages/currency-list/currency-list.component.scss @@ -0,0 +1,9 @@ +.BTC { + color:orange; +} +.LTC { + color:silver; +} +.ETH { + color:darkslategrey; +} \ No newline at end of file diff --git a/web/src/app/pages/currency-list/currency-list.component.spec.ts b/web/src/app/pages/currency-list/currency-list.component.spec.ts new file mode 100644 index 00000000..0cd6916b --- /dev/null +++ b/web/src/app/pages/currency-list/currency-list.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { CurrencyListComponent } from './currency-list.component'; + +describe('CurrencyListComponent', () => { + let component: CurrencyListComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ CurrencyListComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(CurrencyListComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/pages/currency-list/currency-list.component.ts b/web/src/app/pages/currency-list/currency-list.component.ts new file mode 100644 index 00000000..af96b91d --- /dev/null +++ b/web/src/app/pages/currency-list/currency-list.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-currency-list', + templateUrl: './currency-list.component.html', + styleUrls: ['./currency-list.component.scss'] +}) +export class CurrencyListComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/pages/donate/donate.component.scss b/web/src/app/pages/donate/donate.component.scss index 13f14a65..9bbb6a27 100644 --- a/web/src/app/pages/donate/donate.component.scss +++ b/web/src/app/pages/donate/donate.component.scss @@ -9,5 +9,5 @@ .heart { margin: 0px auto !important; -display:flex; + display:flex; } \ No newline at end of file diff --git a/web/src/app/pages/exchange-grid/exchange-grid.component.html b/web/src/app/pages/exchange-grid/exchange-grid.component.html new file mode 100644 index 00000000..417ab070 --- /dev/null +++ b/web/src/app/pages/exchange-grid/exchange-grid.component.html @@ -0,0 +1,60 @@ + + + + + Poloniex + + + + + image and blurb +
+ + + attach_money +

BTC_USD

+ +
+ + attach_money +

LTC_USD

+ +
+ + attach_money +

ETH_USD

+ +
+
+
+
+ + + Kraken + + + + + image and blurb +
+ + + + attach_money +

BTC_USD

+ +
+ + attach_money +

LTC_USD

+ +
+ + attach_money +

ETH_USD

+ +
+
+
+
+
\ No newline at end of file diff --git a/web/src/app/pages/exchange-grid/exchange-grid.component.scss b/web/src/app/pages/exchange-grid/exchange-grid.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/pages/exchange-grid/exchange-grid.component.spec.ts b/web/src/app/pages/exchange-grid/exchange-grid.component.spec.ts new file mode 100644 index 00000000..40cca157 --- /dev/null +++ b/web/src/app/pages/exchange-grid/exchange-grid.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { ExchangeGridComponent } from './exchange-grid.component'; + +describe('ExchangeGridComponent', () => { + let component: ExchangeGridComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ ExchangeGridComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(ExchangeGridComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/pages/exchange-grid/exchange-grid.component.ts b/web/src/app/pages/exchange-grid/exchange-grid.component.ts new file mode 100644 index 00000000..d72a48ef --- /dev/null +++ b/web/src/app/pages/exchange-grid/exchange-grid.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-exchange-grid', + templateUrl: './exchange-grid.component.html', + styleUrls: ['./exchange-grid.component.scss'] +}) +export class ExchangeGridComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/pages/trading/trading.component.html b/web/src/app/pages/trading/trading.component.html index 826064a5..481dca37 100644 --- a/web/src/app/pages/trading/trading.component.html +++ b/web/src/app/pages/trading/trading.component.html @@ -1,4 +1,2 @@ -

- trading works! -

+ diff --git a/web/src/app/shared/buy-sell-form/buy-sell-form.component.html b/web/src/app/shared/buy-sell-form/buy-sell-form.component.html new file mode 100644 index 00000000..42eb3dea --- /dev/null +++ b/web/src/app/shared/buy-sell-form/buy-sell-form.component.html @@ -0,0 +1,3 @@ +

+ buy-sell-form works! +

diff --git a/web/src/app/shared/buy-sell-form/buy-sell-form.component.scss b/web/src/app/shared/buy-sell-form/buy-sell-form.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/web/src/app/shared/buy-sell-form/buy-sell-form.component.spec.ts b/web/src/app/shared/buy-sell-form/buy-sell-form.component.spec.ts new file mode 100644 index 00000000..78399347 --- /dev/null +++ b/web/src/app/shared/buy-sell-form/buy-sell-form.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { BuySellFormComponent } from './buy-sell-form.component'; + +describe('BuySellFormComponent', () => { + let component: BuySellFormComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ BuySellFormComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(BuySellFormComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/web/src/app/shared/buy-sell-form/buy-sell-form.component.ts b/web/src/app/shared/buy-sell-form/buy-sell-form.component.ts new file mode 100644 index 00000000..593a3a91 --- /dev/null +++ b/web/src/app/shared/buy-sell-form/buy-sell-form.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-buy-sell-form', + templateUrl: './buy-sell-form.component.html', + styleUrls: ['./buy-sell-form.component.scss'] +}) +export class BuySellFormComponent implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/web/src/app/shared/buy-sell/buy-sell.component.html b/web/src/app/shared/buy-sell/buy-sell.component.html index a2e2fdc5..0d923df8 100644 --- a/web/src/app/shared/buy-sell/buy-sell.component.html +++ b/web/src/app/shared/buy-sell/buy-sell.component.html @@ -1,16 +1,14 @@ - The best pasta + BUY -

Best pasta restaurants

-

...

+
- thumb_down The worst sushi + SELL -

Terrible sushi restaurants

-

...

+
\ No newline at end of file diff --git a/web/src/app/shared/navbar/navbar.component.html b/web/src/app/shared/navbar/navbar.component.html index b63ce1ab..291b660d 100644 --- a/web/src/app/shared/navbar/navbar.component.html +++ b/web/src/app/shared/navbar/navbar.component.html @@ -8,5 +8,7 @@
+   +   \ No newline at end of file diff --git a/web/src/app/shared/selected-currency/selected-currency.component.html b/web/src/app/shared/selected-currency/selected-currency.component.html index 39a10213..9d0da2c1 100644 --- a/web/src/app/shared/selected-currency/selected-currency.component.html +++ b/web/src/app/shared/selected-currency/selected-currency.component.html @@ -1,10 +1,10 @@ - - + -