Skip to content

Commit

Permalink
#212 - Resolved all comments for change made in PR. Hooked up current…
Browse files Browse the repository at this point in the history
… run component to database.
  • Loading branch information
justinsoto committed Oct 8, 2024
1 parent cbf2ece commit 85ae44c
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 73 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,4 @@
<typography variant="info-unit" content="ms" additionalStyles="padding-top: 5px; font-size:15px;" />
</div>
</hstack>
<hstack>

</hstack>
</hstack>


Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<info-background>
<div class="connection-display">
<div class="connection-display-title">
<typography variant="header" content="Connection" additionStyles="font-size: 40px;"></typography>
<typography variant="header" content="Connection" additionalStyles="margin: 0px;"></typography>
</div>

<div class="connection-display-data">
Expand All @@ -14,14 +14,3 @@
</div>
</div>
</info-background>

<!-- <vstack>
<hstack>
<typography variant="header" content="Connection"></typography>
</hstack>
<hstack spacing="5px">
<div class="connection-dot" [style.background-color]="getConnectedColor(connected)"
additionalStyles="height: 15px;"></div>
<typography variant="info-subtitle" [content]="getConnectedStatus(connected)" />
</hstack>
</vstack> -->
Original file line number Diff line number Diff line change
@@ -1,23 +1,6 @@
<info-background>
<div class="current-run-display">
<typography variant="header" content="Current Run" />
<typography
variant="subheader"
content="#1"
additionalStyles="margin-top: 0px; margin-bottom: 0px;"/>
</div>
</info-background>

<!-- <vstack>
<hstack>
<typography variant="header" content="Current Run" />
</hstack>
<hstack>
<div class="current-run-body">
<typography
variant="subheader"
content="#1"
additionalStyles="padding-right: 2px; margin-top: 0px; margin-bottom: 0px;"/>
</div>
</hstack>
</vstack> -->
<div class="current-run-display">
<typography variant="header" content="Current Run" additionalStyles="margin: 0px" />
<typography variant="info-subtitle" content="#{{ currentRun }}" additionalStyles="margin: 0px" />
</div>
</info-background>
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
import { Component } from '@angular/core';
import Storage from 'src/services/storage.service';

@Component({
selector: 'landing-page-current-run-display',
templateUrl: './landing-page-current-run-display.component.html',
styleUrl: './landing-page-current-run-display.component.css'
})
export class LandingPageCurrentRunDisplay {
currentRun: number = 0;
constructor(private storage: Storage) {}

ngOnInit() {
this.storage.getCurrentRunId().subscribe((runId) => {
if (runId) { this.currentRun = runId}
});
}
}
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
<!-- <typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }} | {{ location }} " /> -->

<info-background>
<div class="date-location-display">
<typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" />
<typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" additionalStyles="margin: 0px"/>
<typography variant="info-subtitle" content="{{ location }}" />
</div>
</info-background>

<!-- <vstack>
<hstack>
<typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" />
</hstack>
<hstack>
<typography variant="info-subtitle" content="{{ location }}" />
</hstack>
</vstack> -->
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, HostListener, OnInit } from '@angular/core';
import { Component, HostListener } from '@angular/core';
import { MessageService } from 'primeng/api';
import { startNewRun } from 'src/api/run.api';
import APIService from 'src/services/api.service';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,3 @@
</div>
</div>
</info-background>

<!-- <vstack>
<hstack>
<typography variant="header" content="Latency" />
</hstack>
<hstack>
<div class="latency-display-body">
<div class="latency-display-dot" [style.background-color]="mapColor(latency, medVal)"></div>
<typography
variant="subheader"
[content]="latency.toString()"
additionalStyles="padding-right: 2px; margin-top: 0px; margin-bottom: 0px;"/>
<typography variant="info-subtitle" content="ms" additionalStyles="font-size: 15px;" />
</div>
</hstack>
</vstack> -->
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<info-background>
<div class="viewer-display">
<typography variant="header" content="Viewers" />
<typography variant="info-subtitle" [content]="numViewers.toString()" additionStyles="margin: 0px; padding: 0px"/>
<typography variant="header" content="Viewers" additionalStyles="margin: 0px"/>
<typography variant="info-subtitle" [content]="numViewers.toString()" />
</div>
</info-background>

6 changes: 3 additions & 3 deletions angular-client/src/services/theme.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ export default class Theme {
static readonly textColor: string = 'color: #EFEFEF; ';
static readonly textStyle: string = this.font + this.textColor;
static readonly boldedText: string = this.textStyle + 'font-weight: bold; ';
static readonly header: string = this.boldedText + 'font-size: 20px; margin: 0';
static readonly header: string = this.boldedText + 'fontSize: 20px;';
static readonly secondaryHeader: string = this.font + 'font-weight: bold; fontSize: 20px; color: #808080; ';
static readonly subheader: string = this.textStyle + 'font-size: 16px;';
static readonly subheader: string = this.textStyle + 'fontSize: 16px;';
static readonly xLargeHeader: string = this.boldedText + 'font-size: 2.5rem; margin: 0; padding: 0;';
static readonly xxLargeHeader: string = this.boldedText + 'font-size: 7.5rem; margin: 0; padding: 0;';
static readonly largeSecondaryHeader: string = this.font + 'font-weight: bold; font-size: xx-large; color: #808080; ';
Expand All @@ -19,7 +19,7 @@ export default class Theme {
static readonly value: string = this.boldedText + 'fontSize: 85px; margin: 0; padding: 0;';
static readonly infoValue: string = this.boldedText + 'fontSize: 50px; margin: 0; align-self: center;';
static readonly infoValueMobile: string = this.boldedText + 'fontSize: 25px; margin: 0; align-self: center;';
static readonly infoUnit: string = this.textStyle + 'font-size: 24px; color: gray; padding-top: 0px;';
static readonly infoUnit: string = this.textStyle + 'font-size: 24px; color: gray; padding-top: 22px;';
static readonly sidebarLabel: string = this.font + 'font-size: 16px; margin: 0;';

static readonly battteryLow: string = '#f50905';
Expand Down

0 comments on commit 85ae44c

Please sign in to comment.