-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#172 - requested improvements(mainly sizing stuff)
- Loading branch information
Showing
28 changed files
with
285 additions
and
127 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
22 changes: 10 additions & 12 deletions
22
...r-client/src/pages/charging-page/charging-page-mobile/charging-page-mobile.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,23 @@ | ||
| <vstack style="width: 100%" spacing="20px"> | ||
| <typography variant="x-large-title" content="Argos"></typography> | ||
| <typography variant="x-large-title" content="Argos" additionalStyles="fontSize:40px"></typography> | ||
| <hstack> | ||
| <typography variant="large-header" [content]="time | date: 'HH:mm:ss'"></typography> | ||
| <typography variant="large-header" [content]="time | date: 'HH:mm:ss'" additionalStyles="fontSize:25px"></typography> | ||
| <divider style="height: 40px"></divider> | ||
| <typography variant="large-header" content="{{ time | date: 'MM/dd/yyyy' }}"></typography> | ||
| <typography | ||
| variant="large-header" | ||
| content="{{ time | date: 'MM/dd/yyyy' }}" | ||
| additionalStyles="fontSize:25px" | ||
| ></typography> | ||
| </hstack> | ||
| <latency-display style="padding-bottom: 20px; margin-top: -10px" /> | ||
| <vstack style="width: 100%" spacing="15px"> | ||
| <combined-status-mobile style="width: 80%; height: 720px" /> | ||
| <state-of-charge-display style="width: 80%; height: 123px" /> | ||
| <current-display style="width: 80%; height: 122px" /> | ||
| <pack-temp style="width: 80%; height: 122px" /> | ||
| <cell-temp-display style="width: 80%; height: 210px" /> | ||
| <high-low-cell-display style="width: 80%; height: 200px" /> | ||
| <info-background style="width: 80%"> | ||
| <high-low-cell-graph></high-low-cell-graph> | ||
| </info-background> | ||
| <pack-voltage-display style="width: 80%; height: 120px" /> | ||
| <info-background style="width: 80%"> | ||
| <pack-voltage-graph></pack-voltage-graph> | ||
| </info-background> | ||
| <cell-temp-display style="width: 80%; height: 325px" /> | ||
| <high-low-cell-display style="width: 80%; height: 325px" /> | ||
| <pack-voltage-display style="width: 80%; height: 275px" /> | ||
| <fault-display style="width: 80%; height: 375px" /> | ||
| </vstack> | ||
| </vstack> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
...ge/components/cell-temp/cell-temp-display/cell-temp-mobile/cell-temp-mobile.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| .connection-dot { | ||
| width: 50px; | ||
| height: 50px; | ||
| border-radius: 50%; | ||
| margin-top: 20px; | ||
| } |
22 changes: 22 additions & 0 deletions
22
...e/components/cell-temp/cell-temp-display/cell-temp-mobile/cell-temp-mobile.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <info-background svgIcon="thermostat" title="Cell Temp" [button]="resetGraphButton"> | ||
| <div style="padding-top: 20px"></div> | ||
| <vstack> | ||
| <hstack> | ||
| <vstack style="width: 10%; padding-bottom: 10px"> | ||
| <typography variant="info-value" [content]="avgTemp.toString() + '°'" additionalStyles="fontSize:30px" /> | ||
| <typography variant="info-subtitle" content="Avg. Temp" additionalStyles="fontSize:15px" /> | ||
| </vstack> | ||
|
|
||
| <div style="padding-left: 20px"></div> | ||
| <!--TODO: temp fix for divider setting pixel height: is only way for divider to show--> | ||
| <divider style="height: 100px"></divider> | ||
| <div style="padding-right: 20px"></div> | ||
|
|
||
| <vstack style="width: 10%; padding-bottom: 10px"> | ||
| <typography variant="info-value" [content]="maxTemp.toString() + '°'" additionalStyles="fontSize:30px" /> | ||
| <typography variant="info-subtitle" content="Max. Temp" additionalStyles="fontSize:15px" /> | ||
| </vstack> | ||
| </hstack> | ||
| <cell-temp-graph style="width: 100%; padding-bottom: 30px" [maxCellTempData]="cellTempData"></cell-temp-graph> | ||
| </vstack> | ||
| </info-background> |
24 changes: 24 additions & 0 deletions
24
...age/components/cell-temp/cell-temp-display/cell-temp-mobile/cell-temp-mobile.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import { Component, Input } from '@angular/core'; | ||
| import Storage from 'src/services/storage.service'; | ||
|
|
||
| import { GraphData } from 'src/utils/types.utils'; | ||
|
|
||
| @Component({ | ||
| selector: 'cell-temp-mobile', | ||
| templateUrl: './cell-temp-mobile.component.html', | ||
| styleUrls: ['./cell-temp-mobile.component.css'] | ||
| }) | ||
| export default class CellTempMobile { | ||
| @Input() avgTemp: number = 0; | ||
| @Input() maxTemp: number = 0; | ||
| @Input() resetGraphButton = { | ||
| onClick: () => { | ||
| this.cellTempData = []; | ||
| }, | ||
| icon: 'restart_alt' | ||
| }; | ||
| @Input() cellTempData: GraphData[] = []; | ||
| constructor(private storage: Storage) {} | ||
|
|
||
| ngOnInit() {} | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.