简柏林 / thingskit · Commits

Commit ce15baadb6a0f8d5755598efc8dfdfffe6ca9285

Authored by Igor Kulikov
1 parent 8bbee948

Fix components path

Inline Side-by-side
Showing 2 changed files with 62 additions and 62 deletions
... ... @@ -17,51 +17,51 @@
17 17 import { NgModule } from '@angular/core';
18 18 import { CommonModule } from '@angular/common';
19 19 import { SharedModule } from '@app/shared/shared.module';
20   -import { AddEntityDialogComponent } from './entity/add-entity-dialog.component';
21   -import { EntitiesTableComponent } from './entity/entities-table.component';
22   -import { DetailsPanelComponent } from './details-panel.component';
23   -import { EntityDetailsPanelComponent } from './entity/entity-details-panel.component';
24   -import { ContactComponent } from './contact.component';
25   -import { AuditLogDetailsDialogComponent } from './audit-log/audit-log-details-dialog.component';
26   -import { AuditLogTableComponent } from './audit-log/audit-log-table.component';
  20 +import { AddEntityDialogComponent } from '@home/components/entity/add-entity-dialog.component';
  21 +import { EntitiesTableComponent } from '@home/components/entity/entities-table.component';
  22 +import { DetailsPanelComponent } from '@home/components/details-panel.component';
  23 +import { EntityDetailsPanelComponent } from '@home/components/entity/entity-details-panel.component';
  24 +import { ContactComponent } from '@home/components/contact.component';
  25 +import { AuditLogDetailsDialogComponent } from '@home/components/audit-log/audit-log-details-dialog.component';
  26 +import { AuditLogTableComponent } from '@home/components/audit-log/audit-log-table.component';
27 27 import { EventTableHeaderComponent } from '@home/components/event/event-table-header.component';
28 28 import { EventTableComponent } from '@home/components/event/event-table.component';
29 29 import { RelationTableComponent } from '@home/components/relation/relation-table.component';
30   -import { RelationDialogComponent } from './relation/relation-dialog.component';
  30 +import { RelationDialogComponent } from '@home/components/relation/relation-dialog.component';
31 31 import { AlarmTableHeaderComponent } from '@home/components/alarm/alarm-table-header.component';
32 32 import { AlarmTableComponent } from '@home/components/alarm/alarm-table.component';
33 33 import { AttributeTableComponent } from '@home/components/attribute/attribute-table.component';
34   -import { AddAttributeDialogComponent } from './attribute/add-attribute-dialog.component';
35   -import { EditAttributeValuePanelComponent } from './attribute/edit-attribute-value-panel.component';
  34 +import { AddAttributeDialogComponent } from '@home/components/attribute/add-attribute-dialog.component';
  35 +import { EditAttributeValuePanelComponent } from '@home/components/attribute/edit-attribute-value-panel.component';
36 36 import { DashboardComponent } from '@home/components/dashboard/dashboard.component';
37 37 import { WidgetComponent } from '@home/components/widget/widget.component';
38   -import { WidgetComponentService } from './widget/widget-component.service';
  38 +import { WidgetComponentService } from '@home/components/widget/widget-component.service';
39 39 import { LegendComponent } from '@home/components/widget/legend.component';
40 40 import { AliasesEntitySelectPanelComponent } from '@home/components/alias/aliases-entity-select-panel.component';
41 41 import { AliasesEntitySelectComponent } from '@home/components/alias/aliases-entity-select.component';
42 42 import { WidgetConfigComponent } from '@home/components/widget/widget-config.component';
43 43 import { EntityAliasesDialogComponent } from '@home/components/alias/entity-aliases-dialog.component';
44   -import { EntityFilterViewComponent } from './entity/entity-filter-view.component';
45   -import { EntityAliasDialogComponent } from './alias/entity-alias-dialog.component';
46   -import { EntityFilterComponent } from './entity/entity-filter.component';
47   -import { RelationFiltersComponent } from './relation/relation-filters.component';
48   -import { EntityAliasSelectComponent } from './alias/entity-alias-select.component';
  44 +import { EntityFilterViewComponent } from '@home/components/entity/entity-filter-view.component';
  45 +import { EntityAliasDialogComponent } from '@home/components/alias/entity-alias-dialog.component';
  46 +import { EntityFilterComponent } from '@home/components/entity/entity-filter.component';
  47 +import { RelationFiltersComponent } from '@home/components/relation/relation-filters.component';
  48 +import { EntityAliasSelectComponent } from '@home/components/alias/entity-alias-select.component';
49 49 import { DataKeysComponent } from '@home/components/widget/data-keys.component';
50   -import { DataKeyConfigDialogComponent } from './widget/data-key-config-dialog.component';
51   -import { DataKeyConfigComponent } from './widget/data-key-config.component';
52   -import { LegendConfigPanelComponent } from './widget/legend-config-panel.component';
53   -import { LegendConfigComponent } from './widget/legend-config.component';
54   -import { ManageWidgetActionsComponent } from './widget/action/manage-widget-actions.component';
55   -import { WidgetActionDialogComponent } from './widget/action/widget-action-dialog.component';
56   -import { CustomActionPrettyResourcesTabsComponent } from './widget/action/custom-action-pretty-resources-tabs.component';
57   -import { CustomActionPrettyEditorComponent } from './widget/action/custom-action-pretty-editor.component';
58   -import { CustomDialogService } from './widget/dialog/custom-dialog.service';
59   -import { CustomDialogContainerComponent } from './widget/dialog/custom-dialog-container.component';
60   -import { ImportExportService } from './import-export/import-export.service';
61   -import { ImportDialogComponent } from './import-export/import-dialog.component';
62   -import { AddWidgetToDashboardDialogComponent } from './attribute/add-widget-to-dashboard-dialog.component';
63   -import { ImportDialogCsvComponent } from './import-export/import-dialog-csv.component';
64   -import { TableColumnsAssignmentComponent } from './import-export/table-columns-assignment.component';
  50 +import { DataKeyConfigDialogComponent } from '@home/components/widget/data-key-config-dialog.component';
  51 +import { DataKeyConfigComponent } from '@home/components/widget/data-key-config.component';
  52 +import { LegendConfigPanelComponent } from '@home/components/widget/legend-config-panel.component';
  53 +import { LegendConfigComponent } from '@home/components/widget/legend-config.component';
  54 +import { ManageWidgetActionsComponent } from '@home/components/widget/action/manage-widget-actions.component';
  55 +import { WidgetActionDialogComponent } from '@home/components/widget/action/widget-action-dialog.component';
  56 +import { CustomActionPrettyResourcesTabsComponent } from '@home/components/widget/action/custom-action-pretty-resources-tabs.component';
  57 +import { CustomActionPrettyEditorComponent } from '@home/components/widget/action/custom-action-pretty-editor.component';
  58 +import { CustomDialogService } from '@home/components/widget/dialog/custom-dialog.service';
  59 +import { CustomDialogContainerComponent } from '@home/components/widget/dialog/custom-dialog-container.component';
  60 +import { ImportExportService } from '@home/components/import-export/import-export.service';
  61 +import { ImportDialogComponent } from '@home/components/import-export/import-dialog.component';
  62 +import { AddWidgetToDashboardDialogComponent } from '@home/components/attribute/add-widget-to-dashboard-dialog.component';
  63 +import { ImportDialogCsvComponent } from '@home/components/import-export/import-dialog-csv.component';
  64 +import { TableColumnsAssignmentComponent } from '@home/components/import-export/table-columns-assignment.component';
65 65 import { EventContentDialogComponent } from '@home/components/event/event-content-dialog.component';
66 66 import { SharedHomeComponentsModule } from '@home/components/shared-home-components.module';
67 67
... ...
... ... @@ -16,10 +16,10 @@
16 16
17 17 import { NgModule } from '@angular/core';
18 18 import { CommonModule, DatePipe } from '@angular/common';
19   -import { FooterComponent } from './components/footer.component';
20   -import { LogoComponent } from './components/logo.component';
21   -import { TbSnackBarComponent, ToastDirective } from './components/toast.directive';
22   -import { BreadcrumbComponent } from '@app/shared/components/breadcrumb.component';
  19 +import { FooterComponent } from '@shared/components/footer.component';
  20 +import { LogoComponent } from '@shared/components/logo.component';
  21 +import { TbSnackBarComponent, ToastDirective } from '@shared/components/toast.directive';
  22 +import { BreadcrumbComponent } from '@shared/components/breadcrumb.component';
23 23 import { NgxFlowModule, FlowInjectionToken } from '@flowjs/ngx-flow';
24 24 import { NgxFlowchartModule } from 'ngx-flowchart/dist/ngx-flowchart';
25 25 import Flow from '@flowjs/flow.js';
... ... @@ -62,7 +62,7 @@ import { HotkeyModule } from 'angular2-hotkeys';
62 62 import { ColorPickerModule } from 'ngx-color-picker';
63 63 import { NgxHmCarouselModule } from 'ngx-hm-carousel';
64 64 import { UserMenuComponent } from '@shared/components/user-menu.component';
65   -import { NospacePipe } from './pipe/nospace.pipe';
  65 +import { NospacePipe } from '@shared/pipe/nospace.pipe';
66 66 import { TranslateModule } from '@ngx-translate/core';
67 67 import { TbCheckboxComponent } from '@shared/components/tb-checkbox.component';
68 68 import { HelpComponent } from '@shared/components/help.component';
... ... @@ -80,42 +80,42 @@ import { FullscreenDirective } from '@shared/components/fullscreen.directive';
80 80 import { HighlightPipe } from '@shared/pipe/highlight.pipe';
81 81 import { DashboardAutocompleteComponent } from '@shared/components/dashboard-autocomplete.component';
82 82 import { EntitySubTypeAutocompleteComponent } from '@shared/components/entity/entity-subtype-autocomplete.component';
83   -import { EntitySubTypeSelectComponent } from './components/entity/entity-subtype-select.component';
84   -import { EntityAutocompleteComponent } from './components/entity/entity-autocomplete.component';
  83 +import { EntitySubTypeSelectComponent } from '@shared/components/entity/entity-subtype-select.component';
  84 +import { EntityAutocompleteComponent } from '@shared/components/entity/entity-autocomplete.component';
85 85 import { EntityListComponent } from '@shared/components/entity/entity-list.component';
86   -import { EntityTypeSelectComponent } from './components/entity/entity-type-select.component';
87   -import { EntitySelectComponent } from './components/entity/entity-select.component';
  86 +import { EntityTypeSelectComponent } from '@shared/components/entity/entity-type-select.component';
  87 +import { EntitySelectComponent } from '@shared/components/entity/entity-select.component';
88 88 import { DatetimeComponent } from '@shared/components/time/datetime.component';
89   -import { EntityKeysListComponent } from './components/entity/entity-keys-list.component';
90   -import { SocialSharePanelComponent } from './components/socialshare-panel.component';
  89 +import { EntityKeysListComponent } from '@shared/components/entity/entity-keys-list.component';
  90 +import { SocialSharePanelComponent } from '@shared/components/socialshare-panel.component';
91 91 import { RelationTypeAutocompleteComponent } from '@shared/components/relation/relation-type-autocomplete.component';
92   -import { EntityListSelectComponent } from './components/entity/entity-list-select.component';
93   -import { JsonObjectEditComponent } from './components/json-object-edit.component';
  92 +import { EntityListSelectComponent } from '@shared/components/entity/entity-list-select.component';
  93 +import { JsonObjectEditComponent } from '@shared/components/json-object-edit.component';
94 94 import { FooterFabButtonsComponent } from '@shared/components/footer-fab-buttons.component';
95   -import { CircularProgressDirective } from './components/circular-progress.directive';
  95 +import { CircularProgressDirective } from '@shared/components/circular-progress.directive';
96 96 import { MatSpinner } from '@angular/material/progress-spinner';
97   -import { FabToolbarComponent, FabActionsDirective, FabTriggerDirective } from './components/fab-toolbar.component';
  97 +import { FabToolbarComponent, FabActionsDirective, FabTriggerDirective } from '@shared/components/fab-toolbar.component';
98 98 import { DashboardSelectPanelComponent } from '@shared/components/dashboard-select-panel.component';
99 99 import { DashboardSelectComponent } from '@shared/components/dashboard-select.component';
100   -import { WidgetsBundleSelectComponent } from './components/widgets-bundle-select.component';
101   -import { KeyboardShortcutPipe } from './pipe/keyboard-shortcut.pipe';
102   -import { TbErrorComponent } from './components/tb-error.component';
103   -import { EntityTypeListComponent } from './components/entity/entity-type-list.component';
104   -import { EntitySubTypeListComponent } from './components/entity/entity-subtype-list.component';
105   -import { TruncatePipe } from './pipe/truncate.pipe';
106   -import { ColorPickerDialogComponent } from './components/dialog/color-picker-dialog.component';
107   -import { MatChipDraggableDirective } from './components/mat-chip-draggable.directive';
108   -import { ColorInputComponent } from './components/color-input.component';
109   -import { JsFuncComponent } from './components/js-func.component';
110   -import { JsonFormComponent } from './components/json-form/json-form.component';
  100 +import { WidgetsBundleSelectComponent } from '@shared/components/widgets-bundle-select.component';
  101 +import { KeyboardShortcutPipe } from '@shared/pipe/keyboard-shortcut.pipe';
  102 +import { TbErrorComponent } from '@shared/components/tb-error.component';
  103 +import { EntityTypeListComponent } from '@shared/components/entity/entity-type-list.component';
  104 +import { EntitySubTypeListComponent } from '@shared/components/entity/entity-subtype-list.component';
  105 +import { TruncatePipe } from '@shared/pipe/truncate.pipe';
  106 +import { ColorPickerDialogComponent } from '@shared/components/dialog/color-picker-dialog.component';
  107 +import { MatChipDraggableDirective } from '@shared/components/mat-chip-draggable.directive';
  108 +import { ColorInputComponent } from '@shared/components/color-input.component';
  109 +import { JsFuncComponent } from '@shared/components/js-func.component';
  110 +import { JsonFormComponent } from '@shared/components/json-form/json-form.component';
111 111 import { MaterialIconsDialogComponent } from '@shared/components/dialog/material-icons-dialog.component';
112 112 import { MaterialIconSelectComponent } from '@shared/components/material-icon-select.component';
113   -import { ImageInputComponent } from './components/image-input.component';
114   -import { FileInputComponent } from './components/file-input.component';
  113 +import { ImageInputComponent } from '@shared/components/image-input.component';
  114 +import { FileInputComponent } from '@shared/components/file-input.component';
115 115 import { NodeScriptTestDialogComponent } from '@shared/components/dialog/node-script-test-dialog.component';
116   -import { MessageTypeAutocompleteComponent } from './components/message-type-autocomplete.component';
117   -import { JsonContentComponent } from './components/json-content.component';
118   -import { KeyValMapComponent } from './components/kv-map.component';
  116 +import { MessageTypeAutocompleteComponent } from '@shared/components/message-type-autocomplete.component';
  117 +import { JsonContentComponent } from '@shared/components/json-content.component';
  118 +import { KeyValMapComponent } from '@shared/components/kv-map.component';
119 119 import { TbCheatSheetComponent } from '@shared/components/cheatsheet.component';
120 120 import { TbHotkeysDirective } from '@shared/components/hotkeys.directive';
121 121 import { NavTreeComponent } from '@shared/components/nav-tree.component';
... ...