From 85ae44ce1e566c34991a4ca36497a7fae0c1ec34 Mon Sep 17 00:00:00 2001
From: Justin Soto <justinsoto2424@gmail.com>
Date: Tue, 8 Oct 2024 13:31:33 -0400
Subject: [PATCH] #212 - Resolved all comments for change made in PR. Hooked up
 current run component to database.

---
 .../latency-display/latency-display.html      |  5 ----
 ...ing-page-connection-display.component.html | 13 +--------
 ...ng-page-current-run-display.component.html | 27 ++++---------------
 ...ding-page-current-run-display.component.ts |  8 ++++++
 .../landing-page-date-location.component.html | 13 +--------
 .../landing-page-date-location.component.ts   |  2 +-
 ...anding-page-latency-display.component.html | 16 -----------
 ...landing-page-viewer-display.component.html |  4 +--
 angular-client/src/services/theme.service.ts  |  6 ++---
 9 files changed, 21 insertions(+), 73 deletions(-)

diff --git a/angular-client/src/components/latency-display/latency-display.html b/angular-client/src/components/latency-display/latency-display.html
index 0460b503..f5e9b1ba 100644
--- a/angular-client/src/components/latency-display/latency-display.html
+++ b/angular-client/src/components/latency-display/latency-display.html
@@ -15,9 +15,4 @@
       <typography variant="info-unit" content="ms" additionalStyles="padding-top: 5px; font-size:15px;" />
     </div>
   </hstack>
-  <hstack>
-    
-  </hstack>
 </hstack>
-
-
diff --git a/angular-client/src/pages/landing-page/components/landing-page-connection-display/landing-page-connection-display.component.html b/angular-client/src/pages/landing-page/components/landing-page-connection-display/landing-page-connection-display.component.html
index 11ef0997..b77dd3d3 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-connection-display/landing-page-connection-display.component.html
+++ b/angular-client/src/pages/landing-page/components/landing-page-connection-display/landing-page-connection-display.component.html
@@ -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">
@@ -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> -->
diff --git a/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.html b/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.html
index 3d3ab08f..db99a6f9 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.html
+++ b/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.html
@@ -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> -->
\ No newline at end of file
+  <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>
diff --git a/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.ts b/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.ts
index 0cb55f28..f48a976e 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.ts
+++ b/angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+import Storage from 'src/services/storage.service';
 
 @Component({
   selector: 'landing-page-current-run-display',
@@ -6,5 +7,12 @@ import { Component } from '@angular/core';
   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}
+    });
+  }
 }
diff --git a/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.html b/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.html
index ea9a850c..716c4e5d 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.html
+++ b/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.html
@@ -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> -->
\ No newline at end of file
diff --git a/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.ts b/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.ts
index 8cc250a6..2d8715df 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.ts
+++ b/angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.ts
@@ -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';
diff --git a/angular-client/src/pages/landing-page/components/landing-page-latency-display/landing-page-latency-display.component.html b/angular-client/src/pages/landing-page/components/landing-page-latency-display/landing-page-latency-display.component.html
index b8a28fc6..5b2f7569 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-latency-display/landing-page-latency-display.component.html
+++ b/angular-client/src/pages/landing-page/components/landing-page-latency-display/landing-page-latency-display.component.html
@@ -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> -->
diff --git a/angular-client/src/pages/landing-page/components/landing-page-viewer-display/landing-page-viewer-display.component.html b/angular-client/src/pages/landing-page/components/landing-page-viewer-display/landing-page-viewer-display.component.html
index 3772609b..6be91703 100644
--- a/angular-client/src/pages/landing-page/components/landing-page-viewer-display/landing-page-viewer-display.component.html
+++ b/angular-client/src/pages/landing-page/components/landing-page-viewer-display/landing-page-viewer-display.component.html
@@ -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>
 
diff --git a/angular-client/src/services/theme.service.ts b/angular-client/src/services/theme.service.ts
index fa791096..e28883b1 100644
--- a/angular-client/src/services/theme.service.ts
+++ b/angular-client/src/services/theme.service.ts
@@ -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; ';
@@ -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';