#212 - cleanup more code

angular-client/compose.client.yml

@@ -6,7 +6,7 @@ services:
     build:
       context: .
       args:
-        PROD: 'true'
+        PROD: "true"
         BACKEND_URL: http://192.168.100.1:8000
         MAP_ACCESS_TOKEN: pk.eyJ1IjoibWNrZWVwIiwiYSI6ImNscXBrcmU1ZTBscWIya284cDFyYjR3Nm8ifQ.6TQHlxhAJzptZyV-W28dnw
       target: production

angular-client/src/app/app.module.ts

@@ -33,7 +33,6 @@ import { FlexLayoutModule } from '@angular/flex-layout';
 import HStack from 'src/components/hstack/hstack.component';
 import VStack from 'src/components/vstack/vstack.component';
 import ResolutionSelector from 'src/components/resolution-selector/resolution-selector.component';
-import LatencyDisplay from 'src/components/latency-display/latency-display';
 import { ProgressSpinnerModule } from 'primeng/progressspinner';
 import { MatIconModule } from '@angular/material/icon';
 import { MatGridListModule } from '@angular/material/grid-list';
@@ -54,8 +53,6 @@ import { DriverComponent } from 'src/components/driver-component/driver-componen
 import PieChart from 'src/components/pie-chart/pie-chart.component';
 import RasberryPi from 'src/components/raspberry-pi/raspberry-pi.component';
 import { AccelerationGraphs } from 'src/components/acceleration-graphs/acceleration-graphs.component';
-import ViewerDisplay from 'src/components/viewer-display/viewer-display.component';
-import ConnectionDisplay from 'src/components/connection-display/connection-display.component';
 import SpeedDisplay from 'src/components/speed-display/speed-display.component';
 import SpeedOverTimeDisplay from 'src/components/speed-over-time-display/speed-over-time-display.component';
 import TorqueDisplay from 'src/components/torque-display/torque-display.component';
@@ -105,12 +102,11 @@ import CombinedStatusMobile from 'src/pages/charging-page/components/combined-st
 import PackVoltageMobileDisplay from 'src/pages/charging-page/components/pack-voltage/pack-voltage-display/pack-voltage-mobile/pack-voltage-mobile.component';
 import HighLowCellMobile from 'src/pages/charging-page/components/high-low-cell/high-low-cell-display/high-low-cell-mobile/high-low-cell-mobile.component';
 import CellTempMobile from 'src/pages/charging-page/components/cell-temp/cell-temp-display/cell-temp-mobile/cell-temp-mobile.component';
-import LandingPageHeader from 'src/pages/landing-page/components/landing-page-header/landing-page-header.component';
-import LandingPageConnectionDisplay from 'src/pages/landing-page/components/landing-page-connection-display/landing-page-connection-display.component';
-import LandingPageLatencyDisplay from 'src/pages/landing-page/components/landing-page-latency-display/landing-page-latency-display.component';
-import { LandingPageDateLocation } from 'src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component';
-import { LandingPageCurrentRunDisplay } from 'src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component';
-import { LandingPageViewerDisplay } from 'src/pages/landing-page/components/landing-page-viewer-display/landing-page-viewer-display.component';
+import ConnectionDisplay from 'src/pages/landing-page/components/connection-display/connection-display.component';
+import { CurrentRunDisplay } from 'src/pages/landing-page/components/current-run-display/current-run-display.component';
+import LatencyDisplay from 'src/components/latency-display/latency-display';
+import { DateLocation } from 'src/pages/landing-page/components/date-location-display/date-location.component';
+import { ViewerDisplay } from 'src/pages/landing-page/components/viewer-display/viewer-display.component';
 
 @NgModule({
   declarations: [
@@ -142,7 +138,6 @@ import { LandingPageViewerDisplay } from 'src/pages/landing-page/components/land
     VStack,
     HStack,
     ResolutionSelector,
-    LatencyDisplay,
     BatteryInfoDisplay,
     GraphComponent,
     InfoGraph,
@@ -155,7 +150,6 @@ import { LandingPageViewerDisplay } from 'src/pages/landing-page/components/land
     PieChart,
     AccelerationGraphs,
     ViewerDisplay,
-    ConnectionDisplay,
     SpeedDisplay,
     SpeedOverTimeDisplay,
     TorqueDisplay,
@@ -200,12 +194,11 @@ import { LandingPageViewerDisplay } from 'src/pages/landing-page/components/land
     PackVoltageMobileDisplay,
     HighLowCellMobile,
     CellTempMobile,
-    LandingPageHeader,
-    LandingPageConnectionDisplay,
-    LandingPageLatencyDisplay,
-    LandingPageDateLocation,
-    LandingPageCurrentRunDisplay,
-    LandingPageViewerDisplay
+    ConnectionDisplay,
+    LatencyDisplay,
+    DateLocation,
+    CurrentRunDisplay,
+    ViewerDisplay
   ],
   bootstrap: [AppContext],
   imports: [

angular-client/src/components/connection-display/connection-display.component.ts → angular-client/src/pages/landing-page/components/connection-display/connection-display.component.ts

@@ -4,7 +4,7 @@ import Storage from 'src/services/storage.service';
 @Component({
   selector: 'connection-display',
   templateUrl: './connection-display.component.html',
-  styleUrls: ['./connection-display.component.css']
+  styleUrl: './connection-display.component.css'
 })
 export default class ConnectionDisplay {
   connected: boolean = false;

angular-client/src/pages/landing-page/components/landing-page-current-run-display/landing-page-current-run-display.component.ts → angular-client/src/pages/landing-page/components/current-run-display/current-run-display.component.ts

@@ -2,11 +2,11 @@ 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'
+  selector: 'current-run-display',
+  templateUrl: './current-run-display.component.html',
+  styleUrl: './current-run-display.component.css'
 })
-export class LandingPageCurrentRunDisplay {
+export class CurrentRunDisplay {
   currentRun: number = 0;
   constructor(private storage: Storage) {}
 

angular-client/src/pages/landing-page/components/landing-page-date-location/landing-page-date-location.component.ts → angular-client/src/pages/landing-page/components/date-location-display/date-location.component.ts

@@ -6,11 +6,11 @@ import Storage from 'src/services/storage.service';
 import { IdentifierDataType } from 'src/utils/enumerations/identifier-data-type';
 
 @Component({
-  selector: 'landing-page-date-location',
-  templateUrl: './landing-page-date-location.component.html',
-  styleUrl: './landing-page-date-location.component.css'
+  selector: 'date-location',
+  templateUrl: './date-location.component.html',
+  styleUrl: './date-location.component.css'
 })
-export class LandingPageDateLocation {
+export class DateLocation {
   time = new Date();
   location: string = 'Boston, MA';
   newRunIsLoading = false;

angular-client/src/components/viewer-display/viewer-display.component.ts → angular-client/src/pages/landing-page/components/viewer-display/viewer-display.component.ts

@@ -5,9 +5,9 @@ import { IdentifierDataType } from 'src/utils/enumerations/identifier-data-type'
 @Component({
   selector: 'viewer-display',
   templateUrl: './viewer-display.component.html',
-  styleUrls: ['./viewer-display.component.css']
+  styleUrl: './viewer-display.component.css'
 })
-export default class ViewerDisplay implements OnInit {
+export class ViewerDisplay implements OnInit {
   numViewers: number = 0;
   constructor(private storage: Storage) {}
 

angular-client/src/pages/landing-page/landing-page.component.html

@@ -17,18 +17,18 @@
           />
         </div>
         <div style="display: flex; grid-column-start: 3; grid-column-end: 4">
-          <landing-page-date-location style="height: 100%; width: 100%" />
+          <date-location style="height: 100%; width: 100%" />
         </div>
         <div style="display: flex; grid-column-start: 4; grid-column-end: 5">
-          <landing-page-connection-display style="height: 100%; width: 100%" />
+          <connection-display style="height: 100%; width: 100%" />
         </div>
 
         <div style="display: flex; grid-column-start: 5; grid-column-end: 6">
-          <landing-page-current-run-display style="height: 100%; width: 100%" />
+          <current-run-display style="height: 100%; width: 100%" />
         </div>
 
         <div style="display: flex; grid-column-start: 6; grid-column-end: 7">
-          <landing-page-viewer-display style="width: 100%; height: 100%" />
+          <viewer-display style="width: 100%; height: 100%" />
         </div>
 
         <div style="display: flex; grid-column-start: 1; grid-column-end: 3">