-
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.
#212 - Resolved all comments for change made in PR. Hooked up current…
… run component to database.
- Loading branch information
1 parent
cbf2ece
commit 85ae44c
Showing
9 changed files
with
21 additions
and
73 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
27 changes: 5 additions & 22 deletions
27
...mponents/landing-page-current-run-display/landing-page-current-run-display.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,23 +1,6 @@ | ||
<info-background> | ||
<div class="current-run-display"> | ||
<typography variant="header" content="Current Run" /> | ||
<typography | ||
variant="subheader" | ||
content="#1" | ||
additionalStyles="margin-top: 0px; margin-bottom: 0px;"/> | ||
</div> | ||
</info-background> | ||
|
||
<!-- <vstack> | ||
<hstack> | ||
<typography variant="header" content="Current Run" /> | ||
</hstack> | ||
<hstack> | ||
<div class="current-run-body"> | ||
<typography | ||
variant="subheader" | ||
content="#1" | ||
additionalStyles="padding-right: 2px; margin-top: 0px; margin-bottom: 0px;"/> | ||
</div> | ||
</hstack> | ||
</vstack> --> | ||
<div class="current-run-display"> | ||
<typography variant="header" content="Current Run" additionalStyles="margin: 0px" /> | ||
<typography variant="info-subtitle" content="#{{ currentRun }}" additionalStyles="margin: 0px" /> | ||
</div> | ||
</info-background> |
8 changes: 8 additions & 0 deletions
8
...components/landing-page-current-run-display/landing-page-current-run-display.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 |
---|---|---|
@@ -1,10 +1,18 @@ | ||
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' | ||
}) | ||
export class LandingPageCurrentRunDisplay { | ||
currentRun: number = 0; | ||
constructor(private storage: Storage) {} | ||
|
||
ngOnInit() { | ||
this.storage.getCurrentRunId().subscribe((runId) => { | ||
if (runId) { this.currentRun = runId} | ||
}); | ||
} | ||
} |
13 changes: 1 addition & 12 deletions
13
...ding-page/components/landing-page-date-location/landing-page-date-location.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,17 +1,6 @@ | ||
<!-- <typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }} | {{ location }} " /> --> | ||
|
||
<info-background> | ||
<div class="date-location-display"> | ||
<typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" /> | ||
<typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" additionalStyles="margin: 0px"/> | ||
<typography variant="info-subtitle" content="{{ location }}" /> | ||
</div> | ||
</info-background> | ||
|
||
<!-- <vstack> | ||
<hstack> | ||
<typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" /> | ||
</hstack> | ||
<hstack> | ||
<typography variant="info-subtitle" content="{{ location }}" /> | ||
</hstack> | ||
</vstack> --> |
2 changes: 1 addition & 1 deletion
2
...anding-page/components/landing-page-date-location/landing-page-date-location.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
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
4 changes: 2 additions & 2 deletions
4
...ng-page/components/landing-page-viewer-display/landing-page-viewer-display.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,7 +1,7 @@ | ||
<info-background> | ||
<div class="viewer-display"> | ||
<typography variant="header" content="Viewers" /> | ||
<typography variant="info-subtitle" [content]="numViewers.toString()" additionStyles="margin: 0px; padding: 0px"/> | ||
<typography variant="header" content="Viewers" additionalStyles="margin: 0px"/> | ||
<typography variant="info-subtitle" [content]="numViewers.toString()" /> | ||
</div> | ||
</info-background> | ||
|
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