Skip to content

Commit

Permalink
run prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
RChandler234 committed Dec 15, 2024
1 parent e674a9e commit 45fe15a
Show file tree
Hide file tree
Showing 28 changed files with 258 additions and 737 deletions.
205 changes: 34 additions & 171 deletions angular-client/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,7 @@ import { GraphDialog } from 'src/components/graph-dialog/graph-dialog.component'
import { SteeringAngleDisplay } from 'src/components/steering-angle-display/steering-angle-display.component';
import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
import {
provideHttpClient,
withInterceptorsFromDi,
} from '@angular/common/http';
import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
import HalfGauge from 'src/components/half-gauge/half-gauge.component';
import { Divider } from 'src/components/divider/divider';
import { DriverComponent } from 'src/components/driver-component/driver-component';
Expand Down Expand Up @@ -197,7 +194,7 @@ import { ViewerDisplay } from 'src/pages/landing-page/components/viewer-display/
LatencyDisplay,
DateLocation,
CurrentRunDisplay,
ViewerDisplay,
ViewerDisplay
],
bootstrap: [AppContext],
imports: [
Expand All @@ -220,193 +217,59 @@ import { ViewerDisplay } from 'src/pages/landing-page/components/viewer-display/
MatToolbarModule,
MatButtonModule,
MatInputModule,
ReactiveFormsModule,
],
providers: [
DialogService,
MessageService,
provideHttpClient(withInterceptorsFromDi()),
ReactiveFormsModule
],
providers: [DialogService, MessageService, provideHttpClient(withInterceptorsFromDi())]
})
export class AppModule {
constructor(
private matIconRegistry: MatIconRegistry,
private domSanitizer: DomSanitizer,
private domSanitizer: DomSanitizer
) {
this.matIconRegistry
.addSvgIcon(
'steering_wheel',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/search_hands_free.svg',
),
)
.addSvgIcon(
'wifi',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/wifi.svg',
),
)
.addSvgIcon(
'speed',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/speed.svg',
),
)
.addSvgIcon(
'person',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/person.svg',
),
)
.addSvgIcon(
'eye',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/eye_tracking.svg',
),
)
.addSvgIcon(
'timelapse',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/timelapse.svg',
),
)
.addSvgIcon(
'cell_tower',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/cell_tower.svg',
),
)
.addSvgIcon(
'map',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/map.svg',
),
)
.addSvgIcon(
'360',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/360.svg',
),
)
.addSvgIcon(
'electric_car',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/electric_car.svg',
),
)
.addSvgIcon(
'memory',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/memory.svg',
),
)
.addSvgIcon(
'back_hand',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/back_hand.svg',
),
this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/search_hands_free.svg')
)
.addSvgIcon('wifi', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/wifi.svg'))
.addSvgIcon('speed', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/speed.svg'))
.addSvgIcon('person', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/person.svg'))
.addSvgIcon('eye', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/eye_tracking.svg'))
.addSvgIcon('timelapse', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/timelapse.svg'))
.addSvgIcon('cell_tower', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/cell_tower.svg'))
.addSvgIcon('map', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/map.svg'))
.addSvgIcon('360', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/360.svg'))
.addSvgIcon('electric_car', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/electric_car.svg'))
.addSvgIcon('memory', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/memory.svg'))
.addSvgIcon('back_hand', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/back_hand.svg'))
.addSvgIcon(
'battery_charging_full',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/battery_charging_full.svg',
),
)
.addSvgIcon(
'menu',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/menu.svg',
),
)
.addSvgIcon(
'home',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/home.svg',
),
)
.addSvgIcon(
'bar_chart',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/bar_chart.svg',
),
)
.addSvgIcon(
'search',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/search.svg',
),
)
.addSvgIcon(
'arrow_right',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/arrow_right.svg',
),
)
.addSvgIcon(
'ev_station',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/ev_station.svg',
),
this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/battery_charging_full.svg')
)
.addSvgIcon('menu', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/menu.svg'))
.addSvgIcon('home', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/home.svg'))
.addSvgIcon('bar_chart', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/bar_chart.svg'))
.addSvgIcon('search', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/search.svg'))
.addSvgIcon('arrow_right', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/arrow_right.svg'))
.addSvgIcon('ev_station', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/ev_station.svg'))
.addSvgIcon(
'device_thermostat',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/device_thermostat.svg',
),
)
.addSvgIcon(
'electric_meter',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/electric_meter.svg',
),
)
.addSvgIcon(
'warning',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/warning.svg',
),
this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/device_thermostat.svg')
)
.addSvgIcon('electric_meter', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/electric_meter.svg'))
.addSvgIcon('warning', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/warning.svg'))
.addSvgIcon(
'electrical_services',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/electrical_services.svg',
),
)
.addSvgIcon(
'thermostat',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/thermostat.svg',
),
)
.addSvgIcon(
'model_training',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/model_training.svg',
),
)
.addSvgIcon(
'quickreply',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/quickreply.svg',
),
)
.addSvgIcon(
'bolt',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/bolt.svg',
),
)
.addSvgIcon(
'timer',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assets/icons/timer.svg',
),
this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/electrical_services.svg')
)
.addSvgIcon('thermostat', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/thermostat.svg'))
.addSvgIcon('model_training', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/model_training.svg'))
.addSvgIcon('quickreply', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/quickreply.svg'))
.addSvgIcon('bolt', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/bolt.svg'))
.addSvgIcon('timer', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/timer.svg'))
.addSvgIcon(
'arrow_drop_down_circle',
this.domSanitizer.bypassSecurityTrustResourceUrl(
'../assests/icons/arrow_drop_down_circle.svg',
),
this.domSanitizer.bypassSecurityTrustResourceUrl('../assests/icons/arrow_drop_down_circle.svg')
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,8 @@
<vstack>
<hstack style="width: 100%">
<div class="graph-container">
<graph-component
[data]="xData"
color="#4d9ac9"
title="Longitudinal Acceleration"
graphContainerId="xGraph"
/>
<typography
variant="info-subtitle"
content="Longitudinal Acceleration"
additionalStyles="margin-top: 10px"
/>
<graph-component [data]="xData" color="#4d9ac9" title="Longitudinal Acceleration" graphContainerId="xGraph" />
<typography variant="info-subtitle" content="Longitudinal Acceleration" additionalStyles="margin-top: 10px" />
</div>
<div class="right-panel">
<div class="vBar"></div>
Expand All @@ -29,28 +20,15 @@
additionalStyles="fontSize: 20px; margin-bottom: 10px; color: #797a7a"
/>
</div>
<typography
variant="info-subtitle"
content="Peak Long. Accel."
additionalStyles=""
/>
<typography variant="info-subtitle" content="Peak Long. Accel." additionalStyles="" />
</div>
</div>
</hstack>
<div class="hBar"></div>
<hstack style="width: 100%">
<div class="graph-container">
<graph-component
[data]="yData"
color="#17ff00"
title="Lateral Acceleration"
graphContainerId="yGraph"
/>
<typography
variant="info-subtitle"
content="Lateral Acceleration"
additionalStyles="margin-top: 10px"
/>
<graph-component [data]="yData" color="#17ff00" title="Lateral Acceleration" graphContainerId="yGraph" />
<typography variant="info-subtitle" content="Lateral Acceleration" additionalStyles="margin-top: 10px" />
</div>
<div class="right-panel">
<div class="vBar"></div>
Expand All @@ -67,11 +45,7 @@
additionalStyles="fontSize: 20px; margin-bottom: 10px; color: #797a7a"
/>
</div>
<typography
variant="info-subtitle"
content="Peak Lat. Accel."
additionalStyles=""
/>
<typography variant="info-subtitle" content="Peak Lat. Accel." additionalStyles="" />
</div>
</div>
</hstack>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<info-background svgIcon="back_hand" title="Brake Pressure">
<div
style="
height: 80%;
display: flex;
justify-content: center;
align-items: center;
"
>
<div style="height: 80%; display: flex; justify-content: center; align-items: center">
<typography variant="info-value" [content]="brakePressure.toString()" />
<typography variant="info-unit" content="psi" />
</div>
Expand Down
28 changes: 5 additions & 23 deletions angular-client/src/components/carousel/carousel.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,21 @@
<div class="run-card">
<mat-grid-list cols="2" rowHeight="40px">
<mat-grid-tile>
<typography
class="left"
variant="subheader"
[content]="'Run #' + run.id"
/>
<typography class="left" variant="subheader" [content]="'Run #' + run.id" />
</mat-grid-tile>
<mat-grid-tile>
<typography
class="right"
variant="subheader"
[content]="run.driverName"
/>
<typography class="right" variant="subheader" [content]="run.driverName" />
</mat-grid-tile>
<mat-grid-tile>
<typography
class="left"
variant="subheader"
[content]="datePipe(run.time)"
/>
<typography class="left" variant="subheader" [content]="datePipe(run.time)" />
</mat-grid-tile>
<mat-grid-tile colspan="2">
<typography
variant="subheader"
class="right"
[content]="run.locationName"
/>
<typography variant="subheader" class="right" [content]="run.locationName" />
</mat-grid-tile>
</mat-grid-list>
</div>
<div class="select-button-container">
<p-button class="run-select-button" (onClick)="selectRun(run)"
>Select this Run</p-button
>
<p-button class="run-select-button" (onClick)="selectRun(run)">Select this Run</p-button>
</div>
</ng-template>
</p-carousel>
Expand Down
Loading

0 comments on commit 45fe15a

Please sign in to comment.