Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into #191-self-closing-tags
- Loading branch information
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
Empty file.
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,21 @@ | ||
| .connection-display { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 100%; | ||
| } | ||
|
|
||
| .connection-display-data { | ||
| display: flex; | ||
| justify-content: center; | ||
| } | ||
|
|
||
| .connection-dot { | ||
| display: flex; | ||
| justify-content: center; | ||
| width: 20px; | ||
| height: 20px; | ||
| border-radius: 50%; | ||
| margin-right: 5px; | ||
| } |
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,16 @@ | ||
| <info-background> | ||
| <div class="connection-display"> | ||
| <div class="connection-display-title"> | ||
| <typography variant="header" content="Connection" additionalStyles="margin: 0px;"></typography> | ||
| </div> | ||
|
|
||
| <div class="connection-display-data"> | ||
| <div | ||
| class="connection-dot" | ||
| [style.background-color]="getConnectedColor(connected)" | ||
| additionalStyles="height: 15px;" | ||
| ></div> | ||
| <typography variant="info-subtitle" [content]="getConnectedStatus(connected)" /> | ||
| </div> | ||
| </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
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,7 @@ | ||
| .current-run-display { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 100%; | ||
| } |
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 @@ | ||
| <info-background> | ||
| <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> |
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,20 @@ | ||
| import { Component } from '@angular/core'; | ||
| import Storage from 'src/services/storage.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'current-run-display', | ||
| templateUrl: './current-run-display.component.html', | ||
| styleUrl: './current-run-display.component.css' | ||
| }) | ||
| export class CurrentRunDisplay { | ||
| currentRun: number = 0; | ||
| constructor(private storage: Storage) {} | ||
|
|
||
| ngOnInit() { | ||
| this.storage.getCurrentRunId().subscribe((runId) => { | ||
| if (runId) { | ||
| this.currentRun = runId; | ||
| } | ||
| }); | ||
| } | ||
| } |
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,7 @@ | ||
| .date-location-display { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 100%; | ||
| } |
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 @@ | ||
| <info-background> | ||
| <div class="date-location-display"> | ||
| <typography variant="header" content="{{ time | date: 'MM/dd/yyyy' }}" additionalStyles="margin: 0px" /> | ||
| <typography variant="info-subtitle" content="{{ location }}" /> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { Component, HostListener } from '@angular/core'; | ||
| import { MessageService } from 'primeng/api'; | ||
| import { startNewRun } from 'src/api/run.api'; | ||
| import APIService from 'src/services/api.service'; | ||
| import Storage from 'src/services/storage.service'; | ||
| import { IdentifierDataType } from 'src/utils/enumerations/identifier-data-type'; | ||
|
|
||
| @Component({ | ||
| selector: 'date-location', | ||
| templateUrl: './date-location.component.html', | ||
| styleUrl: './date-location.component.css' | ||
| }) | ||
| export class DateLocation { | ||
| time = new Date(); | ||
| location: string = 'Boston, MA'; | ||
| mobileThreshold = 1070; | ||
| isMobile = window.innerWidth < this.mobileThreshold; | ||
|
|
||
| constructor(private storage: Storage) {} | ||
|
|
||
| ngOnInit() { | ||
| setInterval(() => { | ||
| this.time = new Date(); | ||
| }, 1000); | ||
|
|
||
| this.storage.get(IdentifierDataType.LOCATION).subscribe((value) => { | ||
| [this.location] = value.values || ['No Location Set']; | ||
| }); | ||
| } | ||
|
|
||
| @HostListener('window:resize', ['$event']) | ||
| onResize() { | ||
| this.isMobile = window.innerWidth <= this.mobileThreshold; | ||
| } | ||
| } | ||
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,7 @@ | ||
| .viewer-display { | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| align-items: center; | ||
| height: 100%; | ||
| } |
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 @@ | ||
| <info-background> | ||
| <div class="viewer-display"> | ||
| <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
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
File renamed without changes.
File renamed without changes.