Revert "added a device status as it relates to the backend. this is a preliminary step to fix the skill install issue in the marketplace."
This reverts commit a7dd534e
. Commit was made to wrong branch.
pull/9/head
parent
a7dd534e51
commit
09a9ad0257
|
@ -30,8 +30,7 @@ import {
|
|||
MatInputModule,
|
||||
MatStepperModule,
|
||||
MatTabsModule,
|
||||
MatToolbarModule,
|
||||
MatTooltipModule
|
||||
MatToolbarModule
|
||||
} from '@angular/material';
|
||||
|
||||
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
|
||||
|
@ -101,7 +100,6 @@ import { WakeWordCardComponent } from './components/card/wake-word-card/wake-wor
|
|||
MatStepperModule,
|
||||
MatTabsModule,
|
||||
MatToolbarModule,
|
||||
MatTooltipModule,
|
||||
SharedModule,
|
||||
DeviceRoutingModule
|
||||
],
|
||||
|
|
|
@ -18,29 +18,6 @@
|
|||
<img [src]="getDeviceIcon(device)"/>
|
||||
{{device.name}}
|
||||
</mat-card-title>
|
||||
<ng-container [ngSwitch]="device.status">
|
||||
<mat-card-subtitle
|
||||
class="status-active"
|
||||
matTooltip="Device is connected"
|
||||
*ngSwitchCase="'Connected'"
|
||||
>
|
||||
{{device.status}}
|
||||
</mat-card-subtitle>
|
||||
<mat-card-subtitle
|
||||
class="status-dormant"
|
||||
matTooltip="Device disconnected for more than 30 days."
|
||||
*ngSwitchCase="'Dormant'"
|
||||
>
|
||||
{{device.status}}
|
||||
</mat-card-subtitle>
|
||||
<mat-card-subtitle
|
||||
class="status-inactive"
|
||||
matTooltip="Device disconnected for {{device.disconnectDuration}}"
|
||||
*ngSwitchDefault
|
||||
>
|
||||
{{device.status}}
|
||||
</mat-card-subtitle>
|
||||
</ng-container>
|
||||
<account-device-info [device]="device"></account-device-info>
|
||||
<mat-card-actions>
|
||||
<button mat-flat-button color="primary" [routerLink]="['./', device.id]">
|
||||
|
|
|
@ -52,25 +52,6 @@ mat-card {
|
|||
}
|
||||
}
|
||||
|
||||
mat-card-subtitle {
|
||||
border-radius: 4px;
|
||||
padding: 4px;
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.status-active {
|
||||
background-color: mat-color($mycroft-accent, A100);
|
||||
}
|
||||
|
||||
.status-dormant {
|
||||
background-color: mat-color($mycroft-warn, 300);
|
||||
}
|
||||
|
||||
.status-inactive {
|
||||
background-color: mat-color($mycroft-accent, A200);
|
||||
}
|
||||
|
||||
mat-divider {
|
||||
margin-left: 16px;
|
||||
width: 90%;
|
||||
|
|
|
@ -27,14 +27,12 @@ export interface Device {
|
|||
city: City;
|
||||
coreVersion: string;
|
||||
country: Country;
|
||||
disconnectDuration: string;
|
||||
enclosureVersion: string;
|
||||
id: string;
|
||||
name: string;
|
||||
placement: string;
|
||||
platform: string;
|
||||
region: Region;
|
||||
status: string;
|
||||
timezone: Timezone;
|
||||
voice: Voice;
|
||||
wakeWord: WakeWord;
|
||||
|
|
Loading…
Reference in New Issue