From 77a19df3e451cdf55d204824f894e2d278e2d36f Mon Sep 17 00:00:00 2001 From: shunmugam Date: Mon, 16 Sep 2019 15:07:05 +0530 Subject: [PATCH] Graph layout fix and email text in api page --- .../siteheader/siteheader.component.html | 2 +- src/app/view/api-view/api-view.component.html | 18 +++++----- src/app/view/api-view/api-view.component.ts | 4 +++ .../home/graph-list/graph-list.component.ts | 33 ++++++++++++------- 4 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/app/shared/components/siteheader/siteheader.component.html b/src/app/shared/components/siteheader/siteheader.component.html index 921c075..33d2b92 100644 --- a/src/app/shared/components/siteheader/siteheader.component.html +++ b/src/app/shared/components/siteheader/siteheader.component.html @@ -75,7 +75,7 @@
You are viewing - diff --git a/src/app/view/api-view/api-view.component.html b/src/app/view/api-view/api-view.component.html index 2e6c8b5..12be3b2 100644 --- a/src/app/view/api-view/api-view.component.html +++ b/src/app/view/api-view/api-view.component.html @@ -9,11 +9,11 @@

{{'api-view.real-time-simple-query' | translate}}

{{'api-view.Block-Queries' | translate}}

@@ -21,14 +21,14 @@ {{'api-view.block-query-text' | translate}}

{{'api-view.Note' | translate}}

- If you require another API, please request it by sending an email to xxx@epic.tech + If you require another API, please request it by sending an email to {{email}}
diff --git a/src/app/view/api-view/api-view.component.ts b/src/app/view/api-view/api-view.component.ts index 97ac34f..0d81cc4 100644 --- a/src/app/view/api-view/api-view.component.ts +++ b/src/app/view/api-view/api-view.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit } from '@angular/core'; +import { environment } from "../../../environments/environment"; @Component({ selector: 'app-api-view', @@ -8,6 +9,9 @@ import { Component, OnInit } from '@angular/core'; export class ApiViewComponent implements OnInit { constructor() { } + + public email:string = environment.EMAIL; + public angerstring:string ="mailto:"+ environment.EMAIL +"?subject = API-Request&body = Message"; ngOnInit() { } diff --git a/src/app/view/home/graph-list/graph-list.component.ts b/src/app/view/home/graph-list/graph-list.component.ts index 570d3cf..798abff 100644 --- a/src/app/view/home/graph-list/graph-list.component.ts +++ b/src/app/view/home/graph-list/graph-list.component.ts @@ -613,17 +613,20 @@ export class GraphListComponent implements OnInit { let position = 0.00; let angle = 0; let domain_start = 0; + let left_margin = 5; if(window_width > 700) { position = 0.10; angle = 0; - domain_start = 0.26; + domain_start = 0.18; + left_margin = 5; } else { - position = 0.00; + position = 0.03; angle = -45; - domain_start = 0.34; + domain_start = 0.23; + left_margin = 25; } // console.log('range rangerangerange',range); @@ -689,8 +692,8 @@ export class GraphListComponent implements OnInit { }, margin: { - l: 50, - r: 50, + l: left_margin, + r: 5, b: 50, t: 50, }, @@ -1356,17 +1359,23 @@ export class GraphListComponent implements OnInit { let position = 0.00; let angle = 0; let domain_start = 0; + let left_margin = 5; + let tick_size = 11; if(window_width > 700) { position = 0.10; angle = 0; - domain_start = 0.22; + domain_start = 0.18; + left_margin = 5; + tick_size = 12; } else { - position = 0.00; + position = 0.17; angle = -45; - domain_start = 0.3; + domain_start = 0.34; + left_margin = 5; + tick_size = 10; } this.linearTotalGraphData = { data: data, @@ -1388,7 +1397,7 @@ export class GraphListComponent implements OnInit { title: 'Cuckoo', fixedrange: true, rangemode: 'nonnegative', - // showgrid: true, + // position: 0.33, range: range1, tickangle: angle, tickfont: { @@ -1407,7 +1416,7 @@ export class GraphListComponent implements OnInit { position: position , tickangle: angle, tickfont: { - size: 12 + size: tick_size } }, yaxis3: { @@ -1427,8 +1436,8 @@ export class GraphListComponent implements OnInit { }, margin: { - l: 50, - r: 50, + l: left_margin, + r: 5, b: 50, t: 50, },