Refactor: use index files and short import paths.

This commit is contained in:
József Farkas
2016-08-24 21:25:20 +02:00
parent 137f29b1a8
commit 20f015c254
62 changed files with 78 additions and 37 deletions

View File

@@ -8,13 +8,11 @@ import { DataProviderService } from './services/data-provider.service';
import { MapperService } from './services/mapper.service';
import { MainAppComponent } from './main-app.component';
import { KeymapComponent } from './components/keymap/keymap.component';
import { MacroComponent } from './components/macro/macro.component';
import { LegacyLoaderComponent } from './components/legacy/legacy-loader.component';
import { NotificationComponent } from './components/notification/notification.component';
import { SvgKeystrokeKeyComponent } from './components/svg/keys/svg-keystroke-key.component';
import { SvgOneLineTextKeyComponent } from './components/svg/keys/svg-one-line-text-key.component';
import { SvgTwoLineTextKeyComponent } from './components/svg/keys/svg-two-line-text-key.component';
import { KeymapComponent } from './components/keymap';
import { MacroComponent } from './components/macro';
import { LegacyLoaderComponent } from './components/legacy-loader';
import { NotificationComponent } from './components/notification';
import { SvgKeystrokeKeyComponent, SvgOneLineTextKeyComponent, SvgTwoLineTextKeyComponent } from './components/svg/keys';
@NgModule({
declarations: [

View File

@@ -0,0 +1,2 @@
export * from './keymap.component';
export * from './keymap.routes';

View File

@@ -1,7 +1,7 @@
import { Component, ViewChildren, QueryList, ElementRef, OnInit, AfterViewInit, Renderer } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { SvgKeyboardPopoverComponent } from '../svg/popover/svg-keyboard-popover.component';
import { SvgKeyboardPopoverComponent } from '../svg/popover';
import { Layers } from '../../../config-serializer/config-items/Layers';
import { UhkConfigurationService } from '../../services/uhk-configuration.service';
import { Keymap } from '../../../config-serializer/config-items/Keymap';

View File

@@ -0,0 +1,2 @@
export * from './legacy-loader.component';
export * from './legacy-loader.routes';

View File

@@ -0,0 +1,2 @@
export * from './macro.component';
export * from './macro.routes';

View File

@@ -0,0 +1 @@
export * from './notification.component';

View File

@@ -0,0 +1 @@
export * from './popover.component';

View File

@@ -0,0 +1,7 @@
export * from './tab';
export { KeymapTabComponent } from './keymap';
export { KeypressTabComponent } from './keypress';
export { LayerTabComponent } from './layer';
export { MacroTabComponent } from './macro';
export { MouseTabComponent } from './mouse';
export { NoneTabComponent } from './none';

View File

@@ -0,0 +1 @@
export * from './keymap-tab.component';

View File

@@ -3,7 +3,7 @@ import {Component, OnInit, Input} from '@angular/core';
import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
import {Keymap} from '../../../../../config-serializer/config-items/Keymap';
import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
import {SvgKeyboardComponent} from '../../../svg/keyboard/svg-keyboard.component';
import {SvgKeyboardComponent} from '../../../svg/keyboard';
import {Tab} from '../tab';
import {SwitchKeymapAction} from '../../../../../config-serializer/config-items/SwitchKeymapAction';

View File

@@ -0,0 +1 @@
export * from './keypress-tab.component';

View File

@@ -5,8 +5,8 @@ import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../../../../config-serializer/config-items/KeystrokeAction';
import {IconComponent} from '../../widgets/icon/icon.component';
import {CaptureKeystrokeButtonComponent} from '../../widgets/capture-keystroke/capture-keystroke-button.component';
import {IconComponent} from '../../widgets/icon';
import {CaptureKeystrokeButtonComponent} from '../../widgets/capture-keystroke';
import {Tab} from '../tab';
@Component({

View File

@@ -0,0 +1 @@
export * from './layer-tab.component';

View File

@@ -0,0 +1,2 @@
export * from './macro-item.component';
export * from './macro-tab.component';

View File

@@ -9,7 +9,7 @@ import {ReleaseModifiersMacroAction} from '../../../../../config-serializer/conf
import {ScrollMouseMacroAction} from '../../../../../config-serializer/config-items/ScrollMouseMacroAction';
import {TextMacroAction} from '../../../../../config-serializer/config-items/TextMacroAction';
import {IconComponent} from '../../widgets/icon/icon.component';
import {IconComponent} from '../../widgets/icon';
import {KeyModifiers} from '../../../../../config-serializer/config-items/KeyModifiers';

View File

@@ -0,0 +1 @@
export * from './mouse-tab.component';

View File

@@ -0,0 +1 @@
export * from './none-tab.component';

View File

@@ -0,0 +1 @@
export * from './capture-keystroke-button.component';

View File

@@ -0,0 +1 @@
export * from './icon.component';

View File

@@ -0,0 +1 @@
export * from './side-menu.component';

View File

@@ -0,0 +1 @@
export * from './svg-keyboard.component';

View File

@@ -1,8 +1,7 @@
import { Component, OnInit, Input, Output, EventEmitter} from '@angular/core';
import {Module} from '../../../../config-serializer/config-items/Module';
import {SvgModule} from '../module/svg-module.model';
import {SvgModuleComponent} from '../module/svg-module.component';
import {SvgModule, SvgModuleComponent} from '../module';
import {DataProviderService} from '../../../services/data-provider.service';
@Component({

View File

@@ -0,0 +1,8 @@
export { SvgIconTextKeyComponent } from './svg-icon-text-key';
export { SvgKeyboardKeyComponent, SvgKeyboardKey } from './svg-keyboard-key';
export { SvgKeystrokeKeyComponent } from './svg-keystroke-key';
export { SvgOneLineTextKeyComponent } from './svg-one-line-text-key';
export { SvgSingleIconKeyComponent } from './svg-single-icon-key';
export { SvgSwitchKeymapKeyComponent } from './svg-switch-keymap-key';
export { SvgTextIconKeyComponent } from './svg-text-icon-key';
export { SvgTwoLineTextKeyComponent } from './svg-two-line-text-key';

View File

@@ -0,0 +1 @@
export * from './svg-icon-text-key.component';

View File

Before

Width:  |  Height:  |  Size: 331 B

After

Width:  |  Height:  |  Size: 331 B

View File

@@ -0,0 +1,2 @@
export * from './svg-keyboard-key.component';
export * from './svg-keyboard-key.model';

View File

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@@ -1,19 +1,19 @@
import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
import {KeyModifiers} from '../../../../config-serializer/config-items/KeyModifiers';
import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
import {SwitchLayerAction, LayerName} from '../../../../config-serializer/config-items/SwitchLayerAction';
import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
import {UhkConfiguration} from '../../../../config-serializer/config-items/UhkConfiguration';
import {UhkConfigurationService} from '../../../services/uhk-configuration.service';
import {MapperService} from '../../../services/mapper.service';
import {KeyAction} from '../../../../../config-serializer/config-items/KeyAction';
import {KeystrokeAction} from '../../../../../config-serializer/config-items/KeystrokeAction';
import {KeyModifiers} from '../../../../../config-serializer/config-items/KeyModifiers';
import {PlayMacroAction} from '../../../../../config-serializer/config-items/PlayMacroAction';
import {SwitchLayerAction, LayerName} from '../../../../../config-serializer/config-items/SwitchLayerAction';
import {SwitchKeymapAction} from '../../../../../config-serializer/config-items/SwitchKeymapAction';
import {UhkConfiguration} from '../../../../../config-serializer/config-items/UhkConfiguration';
import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
import {MapperService} from '../../../../services/mapper.service';
import {SvgSingleIconKeyComponent} from './svg-single-icon-key.component';
import {SvgTextIconKeyComponent} from './svg-text-icon-key.component';
import {SvgIconTextKeyComponent} from './svg-icon-text-key.component';
import {SvgSwitchKeymapKeyComponent} from './svg-switch-keymap-key.component';
import {SvgSingleIconKeyComponent} from '../svg-single-icon-key';
import {SvgTextIconKeyComponent} from '../svg-text-icon-key';
import {SvgIconTextKeyComponent} from '../svg-icon-text-key';
import {SvgSwitchKeymapKeyComponent} from '../svg-switch-keymap-key';
enum LabelTypes {
KeystrokeKey,

View File

@@ -0,0 +1 @@
export * from './svg-one-line-text-key.component';

View File

@@ -0,0 +1 @@
export * from './svg-single-icon-key.component';

View File

@@ -0,0 +1 @@
export * from './svg-switch-keymap-key.component';

View File

@@ -1,6 +1,6 @@
import { Component, OnInit, Input } from '@angular/core';
import {MapperService} from '../../../services/mapper.service';
import {MapperService} from '../../../../services/mapper.service';
@Component({
moduleId: module.id,

View File

@@ -0,0 +1 @@
export * from './svg-text-icon-key.component';

View File

Before

Width:  |  Height:  |  Size: 309 B

After

Width:  |  Height:  |  Size: 309 B

View File

@@ -0,0 +1 @@
export * from './svg-two-line-text-key.component';

View File

@@ -0,0 +1,2 @@
export * from './svg-module.component';
export * from './svg-module.model';

View File

@@ -1,7 +1,6 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import {SvgKeyboardKey} from '../keys/svg-keyboard-key.model';
import {SvgKeyboardKeyComponent} from '../keys/svg-keyboard-key.component';
import { SvgKeyboardKey, SvgKeyboardKeyComponent } from '../keys';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
@Component({

View File

@@ -1,4 +1,4 @@
import {SvgKeyboardKey} from '../keys/svg-keyboard-key.model';
import { SvgKeyboardKey } from '../keys';
export class SvgModule {
private coverages: any[];

View File

@@ -0,0 +1 @@
export * from './svg-keyboard-popover.component';

View File

@@ -2,8 +2,8 @@ import { Component, OnInit, Input} from '@angular/core';
import {Module} from '../../../../config-serializer/config-items/Module';
import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
import {SvgKeyboardComponent} from '../keyboard/svg-keyboard.component';
import {PopoverComponent} from '../../popover/popover.component';
import {SvgKeyboardComponent} from '../keyboard';
import {PopoverComponent} from '../../popover';
@Component({
selector: 'svg-keyboard-popover',

View File

@@ -1,7 +1,7 @@
import {Component, ViewEncapsulation} from '@angular/core';
import { ROUTER_DIRECTIVES } from '@angular/router';
import { SideMenuComponent } from './components/sidemenu/side-menu.component';
import { SideMenuComponent } from './components/side-menu';
@Component({
moduleId: module.id,

View File

@@ -1,7 +1,7 @@
import { provideRouter, RouterConfig } from '@angular/router';
import { keymapRoutes } from './components/keymap/keymap.routes';
import { macroRoutes } from './components/macro/macro.routes';
import {legacyRoutes} from './components/legacy/legacy-loader.routes';
import { keymapRoutes } from './components/keymap';
import { macroRoutes } from './components/macro';
import { legacyRoutes } from './components/legacy-loader';
export const routes: RouterConfig = [
...keymapRoutes,