Northeastern-Electric-Racing
diff --git a/‎.github/dependabot.yml‎
Lines changed: 2 additions & 2 deletions b/‎.github/dependabot.yml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎.gitignore‎
Lines changed: 1 addition & 0 deletions b/‎.gitignore‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎README.md‎
Lines changed: 6 additions & 0 deletions b/‎README.md‎
Lines changed: 6 additions & 0 deletions
diff --git a/‎angular-client/compose.client.yml‎
Lines changed: 1 addition & 1 deletion b/‎angular-client/compose.client.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎angular-client/src/api/data.api.ts‎
Lines changed: 5 additions & 0 deletions b/‎angular-client/src/api/data.api.ts‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎angular-client/src/api/urls.ts‎
Lines changed: 15 additions & 1 deletion b/‎angular-client/src/api/urls.ts‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎angular-client/src/api/video.api.ts‎
Lines changed: 17 additions & 0 deletions b/‎angular-client/src/api/video.api.ts‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎angular-client/src/app/app-nav-bar/app-nav-bar.component.ts‎
Lines changed: 9 additions & 8 deletions b/‎angular-client/src/app/app-nav-bar/app-nav-bar.component.ts‎
Lines changed: 9 additions & 8 deletions
diff --git a/‎angular-client/src/app/app-routing.module.ts‎
Lines changed: 31 additions & 1 deletion b/‎angular-client/src/app/app-routing.module.ts‎
Lines changed: 31 additions & 1 deletion
diff --git a/‎angular-client/src/app/app.module.ts‎
Lines changed: 32 additions & 2 deletions b/‎angular-client/src/app/app.module.ts‎
Lines changed: 32 additions & 2 deletions
@@ -3,11 +3,11 @@ updates:
   - package-ecosystem: "cargo"
     directory: "/scylla-server/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
   # Enable version updates for GitHub Actions
   - package-ecosystem: "github-actions"
     # Workflow files stored in the default location of `.github/workflows`
     # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
@@ -5,6 +5,7 @@
 **/.env
 scylla-server-typescript/src/prisma/mydatabase.db
 scylla-server-typescript/src/prisma/mydatabase.db-journal
+scylla-server/files
 
 # Xcode
 #
 
@@ -33,6 +33,12 @@ Only used when deploying to the router for testing or comp.
 
 Please see [Compose Profiles](./compose/README.md) to for more info on docker deployment abstractions.
 
+### Starting out
+
+connect to the router and ssh in. (link to confluence?)
+
+Run: `./argos.sh router -d up` to start all stuff up for data collection
+
 ### Codegen Protobuf Types (client only)
 
 Server protobuf generation is automatic. See below for client protobuf generation.
 
@@ -7,7 +7,7 @@ services:
       context: .
       args:
         PROD: "true"
-        BACKEND_URL: http://192.168.100.1:8000
+        BACKEND_URL: http://192.168.100.11:8000
         MAP_ACCESS_TOKEN: pk.eyJ1IjoibWNrZWVwIiwiYSI6ImNscXBrcmU1ZTBscWIya284cDFyYjR3Nm8ifQ.6TQHlxhAJzptZyV-W28dnw
       target: production
       dockerfile: Dockerfile
 
@@ -1,5 +1,10 @@
+import { Timing } from 'src/utils/types.utils';
 import { urls } from './urls';
 
 export const getDataByDataTypeNameAndRunId = (dataTypeName: string, runId: number): Promise<Response> => {
   return fetch(urls.getDataByDataTypeNameAndRunId(dataTypeName, runId));
 };
+
+export const getDataByDatatTypeNameAndTiming = (dataTypeName: string, timing: Timing): Promise<Response> => {
+  return fetch(urls.getDataByDataTypeNameAndTiming(dataTypeName, timing));
+};
@@ -1,4 +1,5 @@
 import { environment } from 'src/environment/environment';
+import { Timing } from 'src/utils/types.utils';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const baseURL = (environment as any).url || 'http://localhost:8000';
@@ -13,6 +14,9 @@ const getAllSystems = () => `${baseURL}/systems`;
 const getDataByDataTypeNameAndRunId = (dataTypeName: string, runId: number) =>
   `${baseURL}/data/${encodeURIComponent(dataTypeName)}/${runId}`;
 
+const getDataByDataTypeNameAndTiming = (dataTypeName: string, timing: Timing) =>
+  `${baseURL}/data/${encodeURIComponent(dataTypeName)}?time=${timing.time}&before=${timing.before}&after=${timing.after}`;
+
 /* Runs */
 const getRunById = (id: number) => `${baseURL}/runs/${id}`;
 const getAllRuns = () => `${baseURL}/runs`;
@@ -21,17 +25,27 @@ const startNewRun = () => `${baseURL}/runs/new`;
 const startNewRunWithData = (driver: string, location: string, notes: string) => `${baseURL}/runs/new/${driver}/${location}/${notes}`;
 const updateRun = (id: number, driver: string, location: string, notes: string) => `${baseURL}/runs/update/${id}/${driver}/${location}/${notes}`;
 
+/* Videos */
+const getAllVideos = () => `${baseURL}/videos`;
+const getVideo = (fileName: string) => `${getAllVideos()}/${encodeURIComponent(fileName)}`;
+const updateVideos = () => `${getAllVideos()}/update`;
+
 export const urls = {
   getAllDatatypes,
 
   getAllSystems,
 
   getDataByDataTypeNameAndRunId,
+  getDataByDataTypeNameAndTiming,
 
   getAllRuns,
   getLatestRun,
   getRunById,
   startNewRun,
   startNewRunWithData,
-  updateRun,
+  updateRun,,
+
+  getAllVideos,
+  getVideo,
+  updateVideos
 };
@@ -0,0 +1,17 @@
+import { urls } from './urls';
+
+/**
+ * Fetches all videos from the server
+ * @returns A promise containing the response from the server
+ */
+export const getAllVideos = (): Promise<Response> => {
+  return fetch(urls.getAllVideos());
+};
+
+/**
+ * Requests Scylla to update its videos
+ * @returns A promise containing the response from scylla
+ */
+export const updateVideos = (): Promise<Response> => {
+  return fetch(urls.updateVideos(), { method: 'POST' });
+};
@@ -7,7 +7,7 @@ import { startNewRun } from 'src/api/run.api';
 import { RunFormComponent } from 'src/components/run-form/run-form.component';
 import APIService from 'src/services/api.service';
 import SidebarService from 'src/services/sidebar.service';
-import Storage from 'src/services/storage.service';
+import { appRoutes } from '../app-routing.module';
 
 interface NavItem {
   label: string;
@@ -21,7 +21,6 @@ interface NavItem {
   styleUrls: ['./app-nav-bar.component.css']
 })
 export class AppNavBarComponent implements OnInit {
-  private storage = inject(Storage);
   private serverService = inject(APIService);
   private messageService = inject(MessageService);
   private router = inject(Router);
@@ -69,12 +68,14 @@ export class AppNavBarComponent implements OnInit {
   };
 
   navItems: NavItem[] = [
-    { label: 'Home', route: '/landing', icon: 'home' },
-    { label: 'Charging', route: '/charging', icon: 'ev_station' },
-    { label: 'Graph', route: '/graph', icon: 'bar_chart' },
-    { label: 'Map', route: '/map', icon: 'map' },
-    { label: 'BMS', route: '/bms', icon: 'action_key' },
-    { label: 'Camera', route: '/camera', icon: 'linked_camera' }
+    { label: 'Home', route: appRoutes.landingRoute(), icon: 'home' },
+    { label: 'Charging', route: appRoutes.chargingRoute(), icon: 'ev_station' },
+    { label: 'Graph', route: appRoutes.graphRoute(), icon: 'bar_chart' },
+    // TODO: fix map
+    // { label: 'Map', route: appRoutes.mapRoute(), icon: 'map' },
+    { label: 'BMS', route: appRoutes.bmsRoute(), icon: 'action_key' },
+    { label: 'Faults', route: appRoutes.faultsRoute(), icon: 'error' },
+    { label: 'Camera', route: appRoutes.cameraRoute(), icon: 'linked_camera' }
   ];
 
   navigateTo(route: string): void {
 
@@ -1,19 +1,49 @@
 import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { BmsDebugPageComponent } from 'src/pages/bms-debug-page/bms-debug-page.component';
+import { BmsSegmentViewComponent } from 'src/pages/bms-debug-page/bms-segment-view/bms-segment-view.component';
 import { CameraPageComponent } from 'src/pages/camera-page/camera-page.component';
 import ChargingPageComponent from 'src/pages/charging-page/charging-page.component';
+import FaultPageComponent from 'src/pages/fault-page/fault-page.component';
 import GraphPageComponent from 'src/pages/graph-page/graph-page.component';
 import LandingPageComponent from 'src/pages/landing-page/landing-page.component';
 import MapComponent from 'src/pages/map/map.component';
+import { Segment } from 'src/utils/bms.utils';
 
+const landingRoute = () => `/landing`;
+const graphRoute = () => `/graph`;
+const mapRoute = () => `/map`;
+const chargingRoute = () => `/charging`;
+const bmsRoute = () => `/bms`;
+const bmsSegmentViewRoute = (id: Segment) => `/bms/segment/${id + 1}`;
+const cameraRoute = () => `/camera`;
+const faultsRoute = () => `/faults`;
+const faultsGraphRoute = () => `/faults/fault-graph`;
+
+export const appRoutes = {
+  landingRoute,
+  graphRoute,
+  mapRoute,
+  chargingRoute,
+  bmsRoute,
+  bmsSegmentViewRoute,
+  cameraRoute,
+  faultsRoute,
+  faultsGraphRoute
+};
+
+// Routes should be defined carefully in accordance with the appRoutes
 const routes: Routes = [
   { path: 'landing', component: LandingPageComponent },
   { path: 'graph', component: GraphPageComponent },
-  { path: '', redirectTo: '/landing', pathMatch: 'full' },
+  { path: '', redirectTo: appRoutes.landingRoute(), pathMatch: 'full' },
   { path: 'map', component: MapComponent },
   { path: 'charging', component: ChargingPageComponent },
   { path: 'bms', component: BmsDebugPageComponent },
+  // NOTE: paramaterized routes should be even more carefully defined in accordance with the appRoutes
+  { path: 'bms/segment/:id', component: BmsSegmentViewComponent },
+  { path: 'faults', component: FaultPageComponent },
+  { path: 'faults/fault-graph', component: GraphPageComponent },
   { path: 'camera', component: CameraPageComponent }
 ];
 
 
@@ -124,10 +124,25 @@ import { SelectModule } from 'primeng/select';
 import { providePrimeNG } from 'primeng/config';
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import Lara from '@primeng/themes/aura';
+import FaultPageComponent from 'src/pages/fault-page/fault-page.component';
+import { AccordionModule } from 'primeng/accordion';
+import { TableModule } from 'primeng/table';
 import { TreeModule } from 'primeng/tree';
 import { BmsHeaderComponent } from 'src/pages/bms-debug-page/components/bms-header/bms-header.component';
 import { ConnectionDotWithMessageComponent } from 'src/components/connection-dot-with-message/connection-dot-with-message.component';
+import { GeneralButtonsComponent } from 'src/pages/graph-page/graph-caption/general-buttons/general-buttons.component';
+import { FaultDisplayInfoComponent } from 'src/pages/graph-page/graph-caption/fault-display-info/fault-display-info.component';
+import { FaultButtonsComponent } from 'src/pages/graph-page/graph-caption/fault-buttons/fault-buttons.component';
+import { GeneralDisplayInfoComponent } from 'src/pages/graph-page/graph-caption/general-display-info/general-display-info.component';
 import { CameraPageComponent } from 'src/pages/camera-page/camera-page.component';
+import { BmsSegmentViewComponent } from 'src/pages/bms-debug-page/bms-segment-view/bms-segment-view.component';
+import { SegmentAtAGlanceComponent } from 'src/pages/bms-debug-page/components/segment-at-a-glance/segment-at-a-glance.component';
+import { CellByCellHeatMapComponent } from 'src/pages/bms-debug-page/components/cell-by-cell-heat-map/cell-by-cell-heat-map.component';
+import { CellViewComponent } from 'src/pages/bms-debug-page/components/cell-view/cell-view.component';
+import { ChipDiagnosticsComponent } from 'src/pages/bms-debug-page/components/chip-diagnostics/chip-diagnostics.component';
+import { ChipFaultsComponent } from 'src/pages/bms-debug-page/components/chip-faults/chip-faults.component';
+import { CellTileComponent } from 'src/pages/bms-debug-page/components/cell-by-cell-heat-map/cell-tile/cell-tile.component';
+import { ChipFaultPipe } from 'src/utils/pipes/chip-fault.pipe';
 import { FormTemplateComponent } from 'src/components/form-template/form-template.component';
 import { RunFormComponent } from 'src/components/run-form/run-form.component';
 
@@ -188,6 +203,7 @@ import { RunFormComponent } from 'src/components/run-form/run-form.component';
     BatteryInfoDesktopComponent,
     BatteryInfoMobileComponent,
     NodeFilterPipe,
+    ChipFaultPipe,
     CombinedStatusDisplayComponent,
     StateOfChargeDisplayComponent,
     PackTempComponent,
@@ -231,11 +247,21 @@ import { RunFormComponent } from 'src/components/run-form/run-form.component';
     BmsOverflowComponent,
     InfoValueDisplayComponent,
     SelectDropdownComponent,
+    FaultPageComponent,
     BmsHeaderComponent,
     ConnectionDotWithMessageComponent,
+    GeneralButtonsComponent,
+    FaultButtonsComponent,
+    GeneralDisplayInfoComponent,
+    FaultDisplayInfoComponent,
     CameraPageComponent,
-    FormTemplateComponent,
-    RunFormComponent,
+    BmsSegmentViewComponent,
+    SegmentAtAGlanceComponent,
+    CellViewComponent,
+    CellByCellHeatMapComponent,
+    ChipDiagnosticsComponent,
+    ChipFaultsComponent,
+    CellTileComponent
   ],
   bootstrap: [AppContextComponent],
   imports: [
@@ -264,11 +290,14 @@ import { RunFormComponent } from 'src/components/run-form/run-form.component';
     MatFormFieldModule,
     FormsModule,
     SelectModule,
+    AccordionModule,
+    TableModule,
     TreeModule
   ],
   providers: [
     DialogService,
     MessageService,
+    ChipFaultPipe,
     provideHttpClient(withInterceptorsFromDi()),
     provideClientHydration(),
     provideAnimationsAsync(),
@@ -335,6 +364,7 @@ export class AppModule {
         'battery_charging_2',
         this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/battery_charging_2.svg')
       )
+      .addSvgIcon('error', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/alert-triangle.svg'))
       .addSvgIcon('linked_camera', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/linked_camera.svg'));
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`**/.env`
`6`	`6`	`scylla-server-typescript/src/prisma/mydatabase.db`
`7`	`7`	`scylla-server-typescript/src/prisma/mydatabase.db-journal`
	`8`	`+scylla-server/files`
`8`	`9`
`9`	`10`	`# Xcode`
`10`	`11`	`#`