#172 -combined status name change

Northeastern-Electric-Racing · Sep 14, 2024 · aaaaf16 · aaaaf16
1 parent fdae63e
commit aaaaf16
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/angular-client/src/app/app.module.ts b/angular-client/src/app/app.module.ts
@@ -100,6 +100,7 @@ import BalancingStatus from 'src/pages/charging-page/components/balancing-status
 import FaultedStatus from 'src/pages/charging-page/components/faulted-status/faulted-status.component';
 import ActiveStatus from 'src/pages/charging-page/components/active-status/active-status.component';
 import CombinedStatusDisplay from 'src/pages/charging-page/components/combined-status-display/combined-status-display.component';
+import CombinedStatusMobile from 'src/pages/charging-page/components/combined-status-display/mobile-view/combined-status-mobile.component';
 
 @NgModule({
   declarations: [
@@ -183,7 +184,8 @@ import CombinedStatusDisplay from 'src/pages/charging-page/components/combined-s
     CurrentTotalTimer,
     BalancingStatus,
     FaultedStatus,
-    ActiveStatus
+    ActiveStatus,
+    CombinedStatusMobile
   ],
   imports: [
     BrowserModule,
@@ -256,6 +258,10 @@ export class AppModule {
       .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('timer', this.domSanitizer.bypassSecurityTrustResourceUrl('../assets/icons/timer.svg'))
+      .addSvgIcon(
+        'arrow_drop_down_circle',
+        this.domSanitizer.bypassSecurityTrustResourceUrl('../assests/icons/arrow_drop_down_circle.svg')
+      );
   }
 }
diff --git a/...ges/charging-page/components/combined-status-display/combined-status-display.component.ts b/...ges/charging-page/components/combined-status-display/combined-status-display.component.ts
@@ -1,8 +1,16 @@
-import { Component } from '@angular/core';
+import { Component, HostListener } from '@angular/core';
 
 @Component({
   selector: 'combined-status-display',
   templateUrl: './combined-status-display.component.html',
   styleUrls: ['./combined-status-display.component.css']
 })
-export default class CombinedStatusDisplay {}
+export default class CombinedStatusDisplay {
+  mobileThreshold = 1000;
+  isMobile = window.innerWidth < this.mobileThreshold;
+
+  @HostListener('window:resize', ['$event'])
+  onResize() {
+    this.isMobile = window.innerWidth <= this.mobileThreshold;
+  }
+}
diff --git a/...iew/combined-status-display.component.css → ...view/combined-status-mobile.component.css b/...iew/combined-status-display.component.css → ...view/combined-status-mobile.component.css
diff --git a/...ew/combined-status-display.component.html → ...iew/combined-status-mobile.component.html b/...ew/combined-status-display.component.html → ...iew/combined-status-mobile.component.html
diff --git a/...view/combined-status-display.component.ts → ...-view/combined-status-mobile.component.ts b/...view/combined-status-display.component.ts → ...-view/combined-status-mobile.component.ts