From 7d2b27be7d6b5e81c9d780607d75f50eee845eab Mon Sep 17 00:00:00 2001 From: Darren Nelsen Date: Tue, 15 Aug 2017 16:36:11 -0400 Subject: [PATCH] added toggle to searchbar; made text selectable --- app/ionic.config.json | 3 ++- app/package.json | 2 +- app/src/app/app.scss | 4 ++++ app/src/components/head-nav/head-nav.html | 4 ++-- app/src/components/head-nav/head-nav.ts | 6 ++++++ app/src/pages/block-detail/block-detail.html | 2 +- app/src/providers/api/api.ts | 2 +- 7 files changed, 17 insertions(+), 6 deletions(-) diff --git a/app/ionic.config.json b/app/ionic.config.json index b8ac8d6..1c03d6d 100644 --- a/app/ionic.config.json +++ b/app/ionic.config.json @@ -1,5 +1,6 @@ { "name": "insight-ui", "app_id": "", - "type": "ionic-angular" + "type": "ionic-angular", + "integrations": {} } diff --git a/app/package.json b/app/package.json index 1701978..88b33c8 100644 --- a/app/package.json +++ b/app/package.json @@ -43,7 +43,7 @@ "@types/jasmine": "2.5.41", "@types/node": "7.0.4", "codecov": "2.2.0", - "ionic": "3.7.0", + "ionic": "3.8.1", "jasmine-core": "2.5.2", "jasmine-spec-reporter": "3.2.0", "karma": "1.4.1", diff --git a/app/src/app/app.scss b/app/src/app/app.scss index 6e2f3a9..e254df4 100644 --- a/app/src/app/app.scss +++ b/app/src/app/app.scss @@ -25,6 +25,10 @@ font-size: 1.4rem; } +body { + user-select: text; +} + // Shared Sass variables, which can be used to adjust Ionic's // default Sass variables, belong in "theme/variables.scss". // diff --git a/app/src/components/head-nav/head-nav.html b/app/src/components/head-nav/head-nav.html index e7f73fd..1d5ff08 100644 --- a/app/src/components/head-nav/head-nav.html +++ b/app/src/components/head-nav/head-nav.html @@ -7,9 +7,9 @@ - - + diff --git a/app/src/components/head-nav/head-nav.ts b/app/src/components/head-nav/head-nav.ts index 5333728..b3122b6 100644 --- a/app/src/components/head-nav/head-nav.ts +++ b/app/src/components/head-nav/head-nav.ts @@ -18,6 +18,7 @@ import { ActionSheetController } from 'ionic-angular'; }) export class HeadNavComponent { + public showSearch: boolean = false; public loading: boolean; @Input() public title: string; public q: string; @@ -27,6 +28,7 @@ export class HeadNavComponent { } public search(): void { + this.showSearch = false; let apiPrefix: string = this.api.apiPrefix; this.http.get(apiPrefix + 'block/' + this.q).subscribe( @@ -136,4 +138,8 @@ export class HeadNavComponent { }); actionSheet.present(); } + + public toggleSearch() { + this.showSearch = !this.showSearch; + } } diff --git a/app/src/pages/block-detail/block-detail.html b/app/src/pages/block-detail/block-detail.html index daa0444..a20d197 100644 --- a/app/src/pages/block-detail/block-detail.html +++ b/app/src/pages/block-detail/block-detail.html @@ -35,7 +35,7 @@ Mined by - + {{ block.poolInfo.poolName }} diff --git a/app/src/providers/api/api.ts b/app/src/providers/api/api.ts index 31c1966..a15b48e 100644 --- a/app/src/providers/api/api.ts +++ b/app/src/providers/api/api.ts @@ -11,7 +11,7 @@ import 'rxjs/add/operator/map'; @Injectable() export class ApiProvider { - public apiPrefix: string = 'http://localhost:3001/insight-api/'; + public apiPrefix: string = 'https://insight.bitpay.com/api/'; constructor(public http: Http) { }