From ffd6d392fd5705efd916eea3b92a06d1005fdd9c Mon Sep 17 00:00:00 2001 From: GloriousCode Date: Tue, 21 Nov 2017 17:30:08 +1100 Subject: [PATCH] Removes sidebar component Updates homepage Updates navigation Updates text font family --- web/src/app/app.component.html | 24 +++++++++----- web/src/app/app.module.ts | 2 -- web/src/app/pages/home/home.component.html | 21 +++---------- .../app/shared/sidebar/sidebar.component.html | 0 .../app/shared/sidebar/sidebar.component.scss | 22 ------------- .../shared/sidebar/sidebar.component.spec.ts | 25 --------------- .../app/shared/sidebar/sidebar.component.ts | 31 ------------------- web/src/styles.scss | 1 + 8 files changed, 23 insertions(+), 103 deletions(-) delete mode 100644 web/src/app/shared/sidebar/sidebar.component.html delete mode 100644 web/src/app/shared/sidebar/sidebar.component.scss delete mode 100644 web/src/app/shared/sidebar/sidebar.component.spec.ts delete mode 100644 web/src/app/shared/sidebar/sidebar.component.ts diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html index 7537aaea..2b2811bd 100644 --- a/web/src/app/app.component.html +++ b/web/src/app/app.component.html @@ -24,17 +24,27 @@

Settings

- bug_report  -

Report a bug

-
+ thumb_up  +

Donate

+ grade  -

GitHub

+ +

GitHub

+
+
+ + view_agenda  + +

Trello

+
- thumb_up  -

Donate

-
+ bug_report  + +

Report a bug

+
+ diff --git a/web/src/app/app.module.ts b/web/src/app/app.module.ts index bae632c9..a6687f5a 100644 --- a/web/src/app/app.module.ts +++ b/web/src/app/app.module.ts @@ -35,7 +35,6 @@ import { DashboardComponent } from './pages/dashboard/dashboard.component'; import { WalletComponent } from './pages/wallet/wallet.component'; //Shared import { NavbarComponent } from './shared/navbar/navbar.component'; -import { SidebarComponent } from './shared/sidebar/sidebar.component'; import { ExchangeCurrencyTickerComponent } from './shared/exchange-currency-ticker/exchange-currency-ticker.component'; import { AllEnabledCurrencyTickersComponent } from './shared/all-enabled-currency-tickers/all-enabled-currency-tickers.component'; import { ThemePickerComponent } from './shared/theme-picker/theme-picker'; @@ -73,7 +72,6 @@ import { SelectedCurrencyComponent } from './shared/selected-currency/selected-c DashboardComponent, ExchangeCurrencyTickerComponent, AllEnabledCurrencyTickersComponent, - SidebarComponent, WalletComponent, ThemePickerComponent, TradeHistoryComponent, diff --git a/web/src/app/pages/home/home.component.html b/web/src/app/pages/home/home.component.html index 64508b2a..d900709c 100644 --- a/web/src/app/pages/home/home.component.html +++ b/web/src/app/pages/home/home.component.html @@ -1,16 +1,5 @@ - - -
- Shiba Inu - Dog Breed -
- -

- The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan. A small, agile dog that copes very well with mountainous terrain, the Shiba Inu was originally bred for hunting. -

-
- - - - -
\ No newline at end of file + +

Welcome to GoCryptoTrader

+

GoCryptoTrader is a multi-currency, multi-exchange trader for cryptocurrencies

+

It is under active development and you can see its development progress by clicking the trello button to the left

+

If you like what you see, consider clicking the donation button to the left

\ No newline at end of file diff --git a/web/src/app/shared/sidebar/sidebar.component.html b/web/src/app/shared/sidebar/sidebar.component.html deleted file mode 100644 index e69de29b..00000000 diff --git a/web/src/app/shared/sidebar/sidebar.component.scss b/web/src/app/shared/sidebar/sidebar.component.scss deleted file mode 100644 index aec098e4..00000000 --- a/web/src/app/shared/sidebar/sidebar.component.scss +++ /dev/null @@ -1,22 +0,0 @@ -.sidebar { - padding: 20px; - width:20%; -} - - - -.dashboard-highlight { - color: green !important; -} - -.trading-highlight { - color: red !important; -} - -.wallet-highlight { - color: blueviolet !important; -} - -.settings-highlight { - color: magenta !important; -} \ No newline at end of file diff --git a/web/src/app/shared/sidebar/sidebar.component.spec.ts b/web/src/app/shared/sidebar/sidebar.component.spec.ts deleted file mode 100644 index e49c1a50..00000000 --- a/web/src/app/shared/sidebar/sidebar.component.spec.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; - -import { SidebarComponent } from './sidebar.component'; - -describe('SidebarComponent', () => { - let component: SidebarComponent; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ SidebarComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(SidebarComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should be created', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/web/src/app/shared/sidebar/sidebar.component.ts b/web/src/app/shared/sidebar/sidebar.component.ts deleted file mode 100644 index dd505987..00000000 --- a/web/src/app/shared/sidebar/sidebar.component.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { Component, OnInit, ViewChild } from '@angular/core'; -import { MatSidenav } from '@angular/material'; -import { SidebarService } from './../../services/sidebar/sidebar.service'; -import { Router, NavigationEnd } from '@angular/router'; - -@Component({ - selector: 'app-sidebar', - templateUrl: './sidebar.component.html', - styleUrls: ['./sidebar.component.scss'] -}) -export class SidebarComponent implements OnInit { - @ViewChild('sidenav') public sidenav: MatSidenav; - sidebarService: SidebarService -public currentUrl:string; - - constructor(something: SidebarService, private router:Router) { - this.sidebarService = something; - - router.events.subscribe(event => { - - if (event instanceof NavigationEnd ) { - console.log("current url",event.url); // event.url has current url - this.currentUrl = event.url; - } - }); - } - - ngOnInit() { - this.sidebarService.setSidenav(this.sidenav); - } - } diff --git a/web/src/styles.scss b/web/src/styles.scss index 75f8ede2..8baaf5dc 100644 --- a/web/src/styles.scss +++ b/web/src/styles.scss @@ -4,6 +4,7 @@ html, body { margin: 0; padding: 0; + font-family: Roboto,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif; } .loading-spinner {