Browse Source

UI: Refactoring

pull/6545/head
Igor Kulikov 5 years ago
parent
commit
852b1d62f5
  1. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/dashboard-state-widget-settings.component.html
  2. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/dashboard-state-widget-settings.component.ts
  3. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-hierarchy-widget-settings.component.html
  4. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-hierarchy-widget-settings.component.ts
  5. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-key-settings.component.html
  6. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-key-settings.component.ts
  7. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-widget-settings.component.html
  8. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-widget-settings.component.ts
  9. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/html-card-widget-settings.component.html
  10. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/html-card-widget-settings.component.ts
  11. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-font.component.html
  12. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-font.component.ts
  13. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-label.component.html
  14. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-label.component.scss
  15. 4
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-label.component.ts
  16. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-settings.component.html
  17. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-settings.component.scss
  18. 4
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-settings.component.ts
  19. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.html
  20. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.ts
  21. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/qrcode-widget-settings.component.html
  22. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/qrcode-widget-settings.component.ts
  23. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/simple-card-widget-settings.component.html
  24. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/simple-card-widget-settings.component.ts
  25. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-key-settings.component.html
  26. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-key-settings.component.ts
  27. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-latest-key-settings.component.html
  28. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-latest-key-settings.component.ts
  29. 0
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.html
  30. 2
      ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.ts
  31. 28
      ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/dashboard-state-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/dashboard-state-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/dashboard-state-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/dashboard-state-widget-settings.component.ts

@ -25,7 +25,7 @@ import { map, mergeMap, startWith } from 'rxjs/operators';
@Component({ @Component({
selector: 'tb-dashboard-state-widget-settings', selector: 'tb-dashboard-state-widget-settings',
templateUrl: './dashboard-state-widget-settings.component.html', templateUrl: './dashboard-state-widget-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class DashboardStateWidgetSettingsComponent extends WidgetSettingsComponent { export class DashboardStateWidgetSettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/entities-hierarchy-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-hierarchy-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/entities-hierarchy-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-hierarchy-widget-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-entities-hierarchy-widget-settings', selector: 'tb-entities-hierarchy-widget-settings',
templateUrl: './entities-hierarchy-widget-settings.component.html', templateUrl: './entities-hierarchy-widget-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class EntitiesHierarchyWidgetSettingsComponent extends WidgetSettingsComponent { export class EntitiesHierarchyWidgetSettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/entities-table-key-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-key-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/entities-table-key-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-key-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-entities-table-key-settings', selector: 'tb-entities-table-key-settings',
templateUrl: './entities-table-key-settings.component.html', templateUrl: './entities-table-key-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class EntitiesTableKeySettingsComponent extends WidgetSettingsComponent { export class EntitiesTableKeySettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/entities-table-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/entities-table-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/entities-table-widget-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-entities-table-widget-settings', selector: 'tb-entities-table-widget-settings',
templateUrl: './entities-table-widget-settings.component.html', templateUrl: './entities-table-widget-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class EntitiesTableWidgetSettingsComponent extends WidgetSettingsComponent { export class EntitiesTableWidgetSettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/html-card-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/html-card-widget-settings.component.html

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/html-card-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/html-card-widget-settings.component.ts

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-font.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-font.component.html

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-font.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-font.component.ts

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-label.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-label.component.html

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-label.component.scss → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-label.component.scss

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-label.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-label.component.ts

@ -20,7 +20,7 @@ import { PageComponent } from '@shared/components/page.component';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { LabelWidgetFont } from '@home/components/widget/lib/settings/label-widget-font.component'; import { LabelWidgetFont } from '@home/components/widget/lib/settings/cards/label-widget-font.component';
export interface LabelWidgetLabel { export interface LabelWidgetLabel {
pattern: string; pattern: string;
@ -33,7 +33,7 @@ export interface LabelWidgetLabel {
@Component({ @Component({
selector: 'tb-label-widget-label', selector: 'tb-label-widget-label',
templateUrl: './label-widget-label.component.html', templateUrl: './label-widget-label.component.html',
styleUrls: ['./label-widget-label.component.scss', './widget-settings.scss'], styleUrls: ['./label-widget-label.component.scss', './../widget-settings.scss'],
providers: [ providers: [
{ {
provide: NG_VALUE_ACCESSOR, provide: NG_VALUE_ACCESSOR,

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-settings.component.scss → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-settings.component.scss

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
@import '../../../../../../../scss/constants'; @import '../../../../../../../../scss/constants';
:host { :host {
.tb-label-widget-labels { .tb-label-widget-labels {

4
ui-ngx/src/app/modules/home/components/widget/lib/settings/label-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/label-widget-settings.component.ts

@ -19,12 +19,12 @@ import { WidgetSettings, WidgetSettingsComponent } from '@shared/models/widget.m
import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { AbstractControl, FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Store } from '@ngrx/store'; import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { LabelWidgetLabel } from '@home/components/widget/lib/settings/label-widget-label.component'; import { LabelWidgetLabel } from '@home/components/widget/lib/settings/cards/label-widget-label.component';
@Component({ @Component({
selector: 'tb-label-widget-settings', selector: 'tb-label-widget-settings',
templateUrl: './label-widget-settings.component.html', templateUrl: './label-widget-settings.component.html',
styleUrls: ['./label-widget-settings.component.scss', './widget-settings.scss'] styleUrls: ['./label-widget-settings.component.scss', './../widget-settings.scss']
}) })
export class LabelWidgetSettingsComponent extends WidgetSettingsComponent { export class LabelWidgetSettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/markdown-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/markdown-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/markdown-widget-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-markdown-widget-settings', selector: 'tb-markdown-widget-settings',
templateUrl: './markdown-widget-settings.component.html', templateUrl: './markdown-widget-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class MarkdownWidgetSettingsComponent extends WidgetSettingsComponent { export class MarkdownWidgetSettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/qrcode-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/qrcode-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/qrcode-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/qrcode-widget-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-qrcode-widget-settings', selector: 'tb-qrcode-widget-settings',
templateUrl: './qrcode-widget-settings.component.html', templateUrl: './qrcode-widget-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class QrCodeWidgetSettingsComponent extends WidgetSettingsComponent { export class QrCodeWidgetSettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/simple-card-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/simple-card-widget-settings.component.html

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/simple-card-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/simple-card-widget-settings.component.ts

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/timeseries-table-key-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-key-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/timeseries-table-key-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-key-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-timeseries-table-key-settings', selector: 'tb-timeseries-table-key-settings',
templateUrl: './timeseries-table-key-settings.component.html', templateUrl: './timeseries-table-key-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class TimeseriesTableKeySettingsComponent extends WidgetSettingsComponent { export class TimeseriesTableKeySettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/timeseries-table-latest-key-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-latest-key-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/timeseries-table-latest-key-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-latest-key-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-timeseries-table-latest-key-settings', selector: 'tb-timeseries-table-latest-key-settings',
templateUrl: './timeseries-table-latest-key-settings.component.html', templateUrl: './timeseries-table-latest-key-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class TimeseriesTableLatestKeySettingsComponent extends WidgetSettingsComponent { export class TimeseriesTableLatestKeySettingsComponent extends WidgetSettingsComponent {

0
ui-ngx/src/app/modules/home/components/widget/lib/settings/timeseries-table-widget-settings.component.html → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.html

2
ui-ngx/src/app/modules/home/components/widget/lib/settings/timeseries-table-widget-settings.component.ts → ui-ngx/src/app/modules/home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component.ts

@ -23,7 +23,7 @@ import { AppState } from '@core/core.state';
@Component({ @Component({
selector: 'tb-timeseries-table-widget-settings', selector: 'tb-timeseries-table-widget-settings',
templateUrl: './timeseries-table-widget-settings.component.html', templateUrl: './timeseries-table-widget-settings.component.html',
styleUrls: ['./widget-settings.scss'] styleUrls: ['./../widget-settings.scss']
}) })
export class TimeseriesTableWidgetSettingsComponent extends WidgetSettingsComponent { export class TimeseriesTableWidgetSettingsComponent extends WidgetSettingsComponent {

28
ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts

@ -15,44 +15,44 @@
/// ///
import { NgModule, Type } from '@angular/core'; import { NgModule, Type } from '@angular/core';
import { QrCodeWidgetSettingsComponent } from '@home/components/widget/lib/settings/qrcode-widget-settings.component'; import { QrCodeWidgetSettingsComponent } from '@home/components/widget/lib/settings/cards/qrcode-widget-settings.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared/shared.module'; import { SharedModule } from '@shared/shared.module';
import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module'; import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module';
import { IWidgetSettingsComponent } from '@shared/models/widget.models'; import { IWidgetSettingsComponent } from '@shared/models/widget.models';
import { import {
TimeseriesTableWidgetSettingsComponent TimeseriesTableWidgetSettingsComponent
} from '@home/components/widget/lib/settings/timeseries-table-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/timeseries-table-widget-settings.component';
import { import {
TimeseriesTableKeySettingsComponent TimeseriesTableKeySettingsComponent
} from '@home/components/widget/lib/settings/timeseries-table-key-settings.component'; } from '@home/components/widget/lib/settings/cards/timeseries-table-key-settings.component';
import { import {
TimeseriesTableLatestKeySettingsComponent TimeseriesTableLatestKeySettingsComponent
} from '@home/components/widget/lib/settings/timeseries-table-latest-key-settings.component'; } from '@home/components/widget/lib/settings/cards/timeseries-table-latest-key-settings.component';
import { import {
MarkdownWidgetSettingsComponent MarkdownWidgetSettingsComponent
} from '@home/components/widget/lib/settings/markdown-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/markdown-widget-settings.component';
import { LabelWidgetFontComponent } from '@home/components/widget/lib/settings/label-widget-font.component'; import { LabelWidgetFontComponent } from '@home/components/widget/lib/settings/cards/label-widget-font.component';
import { LabelWidgetLabelComponent } from '@home/components/widget/lib/settings/label-widget-label.component'; import { LabelWidgetLabelComponent } from '@home/components/widget/lib/settings/cards/label-widget-label.component';
import { LabelWidgetSettingsComponent } from '@home/components/widget/lib/settings/label-widget-settings.component'; import { LabelWidgetSettingsComponent } from '@home/components/widget/lib/settings/cards/label-widget-settings.component';
import { import {
SimpleCardWidgetSettingsComponent SimpleCardWidgetSettingsComponent
} from '@home/components/widget/lib/settings/simple-card-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/simple-card-widget-settings.component';
import { import {
DashboardStateWidgetSettingsComponent DashboardStateWidgetSettingsComponent
} from '@home/components/widget/lib/settings/dashboard-state-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/dashboard-state-widget-settings.component';
import { import {
EntitiesHierarchyWidgetSettingsComponent EntitiesHierarchyWidgetSettingsComponent
} from '@home/components/widget/lib/settings/entities-hierarchy-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/entities-hierarchy-widget-settings.component';
import { import {
HtmlCardWidgetSettingsComponent HtmlCardWidgetSettingsComponent
} from '@home/components/widget/lib/settings/html-card-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/html-card-widget-settings.component';
import { import {
EntitiesTableWidgetSettingsComponent EntitiesTableWidgetSettingsComponent
} from '@home/components/widget/lib/settings/entities-table-widget-settings.component'; } from '@home/components/widget/lib/settings/cards/entities-table-widget-settings.component';
import { import {
EntitiesTableKeySettingsComponent EntitiesTableKeySettingsComponent
} from '@home/components/widget/lib/settings/entities-table-key-settings.component'; } from '@home/components/widget/lib/settings/cards/entities-table-key-settings.component';
@NgModule({ @NgModule({
declarations: [ declarations: [

Loading…
Cancel
Save