diff --git a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts index 79d767e85..0f557d2f9 100644 --- a/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts +++ b/frontend/src/app/bisq/bisq-dashboard/bisq-dashboard.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { Observable, combineLatest } from 'rxjs'; -import { filter, map } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { SeoService } from 'src/app/services/seo.service'; import { StateService } from 'src/app/services/state.service'; import { WebsocketService } from 'src/app/services/websocket.service'; diff --git a/frontend/src/app/bisq/bisq-market/bisq-market.component.ts b/frontend/src/app/bisq/bisq-market/bisq-market.component.ts index a21ac4ae7..ff54d2a9c 100644 --- a/frontend/src/app/bisq/bisq-market/bisq-market.component.ts +++ b/frontend/src/app/bisq/bisq-market/bisq-market.component.ts @@ -82,7 +82,7 @@ export class BisqMarketComponent implements OnInit, OnDestroy { return { time: h.time, value: h.volume_right, - color: h.close > h.avg ? 'rgba(0, 150, 136, 0.8)' : 'rgba(255,82,82, 0.8)', + color: h.close > h.avg ? 'rgba(0, 41, 74, 0.7)' : 'rgba(0, 41, 74, 1)', }; }) }; diff --git a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss b/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss index 277c3861f..56fe6ab0e 100644 --- a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss +++ b/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.scss @@ -17,9 +17,9 @@ } :host ::ng-deep .volumeText { - color: rgba(37, 177, 53, 1); + color: rgba(33, 150, 243, 0.7); } :host ::ng-deep .tradesText { - color: rgba(33, 150, 243, 1); + color: rgba(37, 177, 53, 1); } diff --git a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts b/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts index 815cbb448..14f39feee 100644 --- a/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts +++ b/frontend/src/app/bisq/lightweight-charts-area/lightweight-charts-area.component.ts @@ -24,7 +24,6 @@ export class LightweightChartsAreaComponent implements OnChanges, OnDestroy { constructor( private element: ElementRef, ) { - this.container = document.createElement('div'); const chartholder = this.element.nativeElement.appendChild(this.container); @@ -54,20 +53,20 @@ export class LightweightChartsAreaComponent implements OnChanges, OnDestroy { }, }); - this.areaSeries = this.chart.addAreaSeries({ - topColor: 'rgba(33, 150, 243, 0.9)', - bottomColor: 'rgba(33, 150, 243, 0.1)', - lineColor: 'rgba(33, 150, 243, 1)', - lineWidth: 2, - }); - this.lineSeries = this.chart.addLineSeries({ color: 'rgba(37, 177, 53, 1)', lineColor: 'rgba(216, 27, 96, 1)', lineWidth: 2, }); - var toolTip = document.createElement('div'); + this.areaSeries = this.chart.addAreaSeries({ + topColor: 'rgba(33, 150, 243, 0.7)', + bottomColor: 'rgba(33, 150, 243, 0.1)', + lineColor: 'rgba(33, 150, 243, 0.1)', + lineWidth: 2, + }); + + const toolTip = document.createElement('div'); toolTip.className = 'floating-tooltip-2'; chartholder.appendChild(toolTip); @@ -76,37 +75,37 @@ export class LightweightChartsAreaComponent implements OnChanges, OnDestroy { toolTip.style.display = 'none'; return; } - - var dateStr = isBusinessDay(param.time) + + const dateStr = isBusinessDay(param.time) ? this.businessDayToString(param.time) : new Date(param.time * 1000).toLocaleDateString(); - - toolTip.style.display = 'block'; - var price = param.seriesPrices.get(this.areaSeries); - var line = param.seriesPrices.get(this.lineSeries); - toolTip.innerHTML = - ` + toolTip.style.display = 'block'; + const price = param.seriesPrices.get(this.areaSeries); + const line = param.seriesPrices.get(this.lineSeries); + + toolTip.innerHTML = `
Volume:${Math.round(price * 100) / 100} BTC
+
# of trades:${Math.round(line * 100) / 100}
Volume:${Math.round(price * 100) / 100} BTC
${dateStr}
`; - - var y = param.point.y; - var toolTipWidth = 100; - var toolTipHeight = 80; - var toolTipMargin = 15; - - var left = param.point.x + toolTipMargin; + const y = param.point.y; + + const toolTipWidth = 100; + const toolTipHeight = 80; + const toolTipMargin = 15; + + let left = param.point.x + toolTipMargin; if (left > this.width - toolTipWidth) { left = param.point.x - toolTipMargin - toolTipWidth; } - - var top = y + toolTipMargin; + + let top = y + toolTipMargin; if (top > this.height - toolTipHeight) { top = y - toolTipHeight - toolTipMargin; } - + toolTip.style.left = left + 'px'; toolTip.style.top = top + 'px'; });