diff --git a/src/app.module.ts b/src/app.module.ts index 5bc0335d..f413800d 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -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: [ diff --git a/src/components/keymap/index.ts b/src/components/keymap/index.ts new file mode 100644 index 00000000..69136468 --- /dev/null +++ b/src/components/keymap/index.ts @@ -0,0 +1,2 @@ +export * from './keymap.component'; +export * from './keymap.routes'; diff --git a/src/components/keymap/keymap.component.ts b/src/components/keymap/keymap.component.ts index d278dd49..fe0bd7b1 100644 --- a/src/components/keymap/keymap.component.ts +++ b/src/components/keymap/keymap.component.ts @@ -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'; diff --git a/src/components/legacy-loader/index.ts b/src/components/legacy-loader/index.ts new file mode 100644 index 00000000..3d58d78d --- /dev/null +++ b/src/components/legacy-loader/index.ts @@ -0,0 +1,2 @@ +export * from './legacy-loader.component'; +export * from './legacy-loader.routes'; diff --git a/src/components/legacy/legacy-loader.component.scss b/src/components/legacy-loader/legacy-loader.component.scss similarity index 100% rename from src/components/legacy/legacy-loader.component.scss rename to src/components/legacy-loader/legacy-loader.component.scss diff --git a/src/components/legacy/legacy-loader.component.ts b/src/components/legacy-loader/legacy-loader.component.ts similarity index 100% rename from src/components/legacy/legacy-loader.component.ts rename to src/components/legacy-loader/legacy-loader.component.ts diff --git a/src/components/legacy/legacy-loader.routes.ts b/src/components/legacy-loader/legacy-loader.routes.ts similarity index 100% rename from src/components/legacy/legacy-loader.routes.ts rename to src/components/legacy-loader/legacy-loader.routes.ts diff --git a/src/components/macro/index.ts b/src/components/macro/index.ts new file mode 100644 index 00000000..5e1543e6 --- /dev/null +++ b/src/components/macro/index.ts @@ -0,0 +1,2 @@ +export * from './macro.component'; +export * from './macro.routes'; diff --git a/src/components/notification/index.ts b/src/components/notification/index.ts new file mode 100644 index 00000000..a5e8b488 --- /dev/null +++ b/src/components/notification/index.ts @@ -0,0 +1 @@ +export * from './notification.component'; diff --git a/src/components/popover/index.ts b/src/components/popover/index.ts new file mode 100644 index 00000000..fa67caf9 --- /dev/null +++ b/src/components/popover/index.ts @@ -0,0 +1 @@ +export * from './popover.component'; diff --git a/src/components/popover/tab/index.ts b/src/components/popover/tab/index.ts new file mode 100644 index 00000000..017505a2 --- /dev/null +++ b/src/components/popover/tab/index.ts @@ -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'; diff --git a/src/components/popover/tab/keymap/index.ts b/src/components/popover/tab/keymap/index.ts new file mode 100644 index 00000000..324a600e --- /dev/null +++ b/src/components/popover/tab/keymap/index.ts @@ -0,0 +1 @@ +export * from './keymap-tab.component'; diff --git a/src/components/popover/tab/keymap/keymap-tab.component.ts b/src/components/popover/tab/keymap/keymap-tab.component.ts index 5e5dcbeb..48603908 100644 --- a/src/components/popover/tab/keymap/keymap-tab.component.ts +++ b/src/components/popover/tab/keymap/keymap-tab.component.ts @@ -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'; diff --git a/src/components/popover/tab/keypress/index.ts b/src/components/popover/tab/keypress/index.ts new file mode 100644 index 00000000..e00e8855 --- /dev/null +++ b/src/components/popover/tab/keypress/index.ts @@ -0,0 +1 @@ +export * from './keypress-tab.component'; diff --git a/src/components/popover/tab/keypress/keypress-tab.component.ts b/src/components/popover/tab/keypress/keypress-tab.component.ts index 1298220c..40c2d82e 100644 --- a/src/components/popover/tab/keypress/keypress-tab.component.ts +++ b/src/components/popover/tab/keypress/keypress-tab.component.ts @@ -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({ diff --git a/src/components/popover/tab/layer/index.ts b/src/components/popover/tab/layer/index.ts new file mode 100644 index 00000000..b9eef156 --- /dev/null +++ b/src/components/popover/tab/layer/index.ts @@ -0,0 +1 @@ +export * from './layer-tab.component'; diff --git a/src/components/popover/tab/macro/index.ts b/src/components/popover/tab/macro/index.ts new file mode 100644 index 00000000..58cac3e1 --- /dev/null +++ b/src/components/popover/tab/macro/index.ts @@ -0,0 +1,2 @@ +export * from './macro-item.component'; +export * from './macro-tab.component'; diff --git a/src/components/popover/tab/macro/macro-item.component.ts b/src/components/popover/tab/macro/macro-item.component.ts index d2b2dc87..088415d1 100644 --- a/src/components/popover/tab/macro/macro-item.component.ts +++ b/src/components/popover/tab/macro/macro-item.component.ts @@ -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'; diff --git a/src/components/popover/tab/mouse/index.ts b/src/components/popover/tab/mouse/index.ts new file mode 100644 index 00000000..77364c92 --- /dev/null +++ b/src/components/popover/tab/mouse/index.ts @@ -0,0 +1 @@ +export * from './mouse-tab.component'; diff --git a/src/components/popover/tab/none/index.ts b/src/components/popover/tab/none/index.ts new file mode 100644 index 00000000..477a4324 --- /dev/null +++ b/src/components/popover/tab/none/index.ts @@ -0,0 +1 @@ +export * from './none-tab.component'; diff --git a/src/components/popover/widgets/capture-keystroke/index.ts b/src/components/popover/widgets/capture-keystroke/index.ts new file mode 100644 index 00000000..e83a7736 --- /dev/null +++ b/src/components/popover/widgets/capture-keystroke/index.ts @@ -0,0 +1 @@ +export * from './capture-keystroke-button.component'; diff --git a/src/components/popover/widgets/icon/index.ts b/src/components/popover/widgets/icon/index.ts new file mode 100644 index 00000000..ba63cdc5 --- /dev/null +++ b/src/components/popover/widgets/icon/index.ts @@ -0,0 +1 @@ +export * from './icon.component'; diff --git a/src/components/side-menu/index.ts b/src/components/side-menu/index.ts new file mode 100644 index 00000000..2db1c14c --- /dev/null +++ b/src/components/side-menu/index.ts @@ -0,0 +1 @@ +export * from './side-menu.component'; diff --git a/src/components/sidemenu/side-menu.component.html b/src/components/side-menu/side-menu.component.html similarity index 100% rename from src/components/sidemenu/side-menu.component.html rename to src/components/side-menu/side-menu.component.html diff --git a/src/components/sidemenu/side-menu.component.scss b/src/components/side-menu/side-menu.component.scss similarity index 100% rename from src/components/sidemenu/side-menu.component.scss rename to src/components/side-menu/side-menu.component.scss diff --git a/src/components/sidemenu/side-menu.component.ts b/src/components/side-menu/side-menu.component.ts similarity index 100% rename from src/components/sidemenu/side-menu.component.ts rename to src/components/side-menu/side-menu.component.ts diff --git a/src/components/svg/keyboard/index.ts b/src/components/svg/keyboard/index.ts new file mode 100644 index 00000000..c2103aa4 --- /dev/null +++ b/src/components/svg/keyboard/index.ts @@ -0,0 +1 @@ +export * from './svg-keyboard.component'; diff --git a/src/components/svg/keyboard/svg-keyboard.component.ts b/src/components/svg/keyboard/svg-keyboard.component.ts index 1ed797c4..78b090da 100644 --- a/src/components/svg/keyboard/svg-keyboard.component.ts +++ b/src/components/svg/keyboard/svg-keyboard.component.ts @@ -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({ diff --git a/src/components/svg/keys/index.ts b/src/components/svg/keys/index.ts new file mode 100644 index 00000000..834d65ef --- /dev/null +++ b/src/components/svg/keys/index.ts @@ -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'; diff --git a/src/components/svg/keys/svg-icon-text-key/index.ts b/src/components/svg/keys/svg-icon-text-key/index.ts new file mode 100644 index 00000000..64f1c046 --- /dev/null +++ b/src/components/svg/keys/svg-icon-text-key/index.ts @@ -0,0 +1 @@ +export * from './svg-icon-text-key.component'; diff --git a/src/components/svg/keys/svg-icon-text-key.component.html b/src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.html similarity index 100% rename from src/components/svg/keys/svg-icon-text-key.component.html rename to src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.html diff --git a/src/components/svg/keys/svg-icon-text-key.component.ts b/src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts similarity index 100% rename from src/components/svg/keys/svg-icon-text-key.component.ts rename to src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts diff --git a/src/components/svg/keys/svg-keyboard-key/index.ts b/src/components/svg/keys/svg-keyboard-key/index.ts new file mode 100644 index 00000000..73daa67c --- /dev/null +++ b/src/components/svg/keys/svg-keyboard-key/index.ts @@ -0,0 +1,2 @@ +export * from './svg-keyboard-key.component'; +export * from './svg-keyboard-key.model'; diff --git a/src/components/svg/keys/svg-keyboard-key.component.html b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.html similarity index 100% rename from src/components/svg/keys/svg-keyboard-key.component.html rename to src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.html diff --git a/src/components/svg/keys/svg-keyboard-key.component.ts b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts similarity index 84% rename from src/components/svg/keys/svg-keyboard-key.component.ts rename to src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts index 93566a76..40b608a3 100644 --- a/src/components/svg/keys/svg-keyboard-key.component.ts +++ b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts @@ -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, diff --git a/src/components/svg/keys/svg-keyboard-key.model.ts b/src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.model.ts similarity index 100% rename from src/components/svg/keys/svg-keyboard-key.model.ts rename to src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.model.ts diff --git a/src/components/svg/keys/svg-keystroke-key.component/index.ts b/src/components/svg/keys/svg-keystroke-key/index.ts similarity index 100% rename from src/components/svg/keys/svg-keystroke-key.component/index.ts rename to src/components/svg/keys/svg-keystroke-key/index.ts diff --git a/src/components/svg/keys/svg-keystroke-key.component/svg-keystroke-key.component.html b/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.html similarity index 100% rename from src/components/svg/keys/svg-keystroke-key.component/svg-keystroke-key.component.html rename to src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.html diff --git a/src/components/svg/keys/svg-keystroke-key.component/svg-keystroke-key.component.scss b/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.scss similarity index 100% rename from src/components/svg/keys/svg-keystroke-key.component/svg-keystroke-key.component.scss rename to src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.scss diff --git a/src/components/svg/keys/svg-keystroke-key.component/svg-keystroke-key.component.ts b/src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts similarity index 100% rename from src/components/svg/keys/svg-keystroke-key.component/svg-keystroke-key.component.ts rename to src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts diff --git a/src/components/svg/keys/svg-one-line-text-key/index.ts b/src/components/svg/keys/svg-one-line-text-key/index.ts new file mode 100644 index 00000000..6faa75a3 --- /dev/null +++ b/src/components/svg/keys/svg-one-line-text-key/index.ts @@ -0,0 +1 @@ +export * from './svg-one-line-text-key.component'; diff --git a/src/components/svg/keys/svg-one-line-text-key.component.html b/src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.html similarity index 100% rename from src/components/svg/keys/svg-one-line-text-key.component.html rename to src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.html diff --git a/src/components/svg/keys/svg-one-line-text-key.component.ts b/src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts similarity index 100% rename from src/components/svg/keys/svg-one-line-text-key.component.ts rename to src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts diff --git a/src/components/svg/keys/svg-single-icon-key/index.ts b/src/components/svg/keys/svg-single-icon-key/index.ts new file mode 100644 index 00000000..05fee5f1 --- /dev/null +++ b/src/components/svg/keys/svg-single-icon-key/index.ts @@ -0,0 +1 @@ +export * from './svg-single-icon-key.component'; diff --git a/src/components/svg/keys/svg-single-icon-key.component.html b/src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.html similarity index 100% rename from src/components/svg/keys/svg-single-icon-key.component.html rename to src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.html diff --git a/src/components/svg/keys/svg-single-icon-key.component.ts b/src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts similarity index 100% rename from src/components/svg/keys/svg-single-icon-key.component.ts rename to src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts diff --git a/src/components/svg/keys/svg-switch-keymap-key/index.ts b/src/components/svg/keys/svg-switch-keymap-key/index.ts new file mode 100644 index 00000000..b706525c --- /dev/null +++ b/src/components/svg/keys/svg-switch-keymap-key/index.ts @@ -0,0 +1 @@ +export * from './svg-switch-keymap-key.component'; diff --git a/src/components/svg/keys/svg-switch-keymap-key.component.html b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.html similarity index 100% rename from src/components/svg/keys/svg-switch-keymap-key.component.html rename to src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.html diff --git a/src/components/svg/keys/svg-switch-keymap-key.component.ts b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts similarity index 93% rename from src/components/svg/keys/svg-switch-keymap-key.component.ts rename to src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts index 947ecafb..4e75d080 100644 --- a/src/components/svg/keys/svg-switch-keymap-key.component.ts +++ b/src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts @@ -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, diff --git a/src/components/svg/keys/svg-text-icon-key/index.ts b/src/components/svg/keys/svg-text-icon-key/index.ts new file mode 100644 index 00000000..fc39d17c --- /dev/null +++ b/src/components/svg/keys/svg-text-icon-key/index.ts @@ -0,0 +1 @@ +export * from './svg-text-icon-key.component'; diff --git a/src/components/svg/keys/svg-text-icon-key.component.html b/src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.html similarity index 100% rename from src/components/svg/keys/svg-text-icon-key.component.html rename to src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.html diff --git a/src/components/svg/keys/svg-text-icon-key.component.ts b/src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts similarity index 100% rename from src/components/svg/keys/svg-text-icon-key.component.ts rename to src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts diff --git a/src/components/svg/keys/svg-two-line-text-key/index.ts b/src/components/svg/keys/svg-two-line-text-key/index.ts new file mode 100644 index 00000000..67969504 --- /dev/null +++ b/src/components/svg/keys/svg-two-line-text-key/index.ts @@ -0,0 +1 @@ +export * from './svg-two-line-text-key.component'; diff --git a/src/components/svg/keys/svg-two-line-text-key.component.html b/src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.html similarity index 100% rename from src/components/svg/keys/svg-two-line-text-key.component.html rename to src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.html diff --git a/src/components/svg/keys/svg-two-line-text-key.component.ts b/src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts similarity index 100% rename from src/components/svg/keys/svg-two-line-text-key.component.ts rename to src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts diff --git a/src/components/svg/module/index.ts b/src/components/svg/module/index.ts new file mode 100644 index 00000000..0b0b3f8c --- /dev/null +++ b/src/components/svg/module/index.ts @@ -0,0 +1,2 @@ +export * from './svg-module.component'; +export * from './svg-module.model'; diff --git a/src/components/svg/module/svg-module.component.ts b/src/components/svg/module/svg-module.component.ts index e3f56138..8821a600 100644 --- a/src/components/svg/module/svg-module.component.ts +++ b/src/components/svg/module/svg-module.component.ts @@ -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({ diff --git a/src/components/svg/module/svg-module.model.ts b/src/components/svg/module/svg-module.model.ts index c74bc4fa..be88bbf6 100644 --- a/src/components/svg/module/svg-module.model.ts +++ b/src/components/svg/module/svg-module.model.ts @@ -1,4 +1,4 @@ -import {SvgKeyboardKey} from '../keys/svg-keyboard-key.model'; +import { SvgKeyboardKey } from '../keys'; export class SvgModule { private coverages: any[]; diff --git a/src/components/svg/popover/index.ts b/src/components/svg/popover/index.ts new file mode 100644 index 00000000..1697750e --- /dev/null +++ b/src/components/svg/popover/index.ts @@ -0,0 +1 @@ +export * from './svg-keyboard-popover.component'; diff --git a/src/components/svg/popover/svg-keyboard-popover.component.ts b/src/components/svg/popover/svg-keyboard-popover.component.ts index 030233ce..38f1ca1a 100644 --- a/src/components/svg/popover/svg-keyboard-popover.component.ts +++ b/src/components/svg/popover/svg-keyboard-popover.component.ts @@ -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', diff --git a/src/main-app.component.ts b/src/main-app.component.ts index 806e7904..4f6617bc 100644 --- a/src/main-app.component.ts +++ b/src/main-app.component.ts @@ -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, diff --git a/src/main-app.routes.ts b/src/main-app.routes.ts index f173a23b..59beda93 100644 --- a/src/main-app.routes.ts +++ b/src/main-app.routes.ts @@ -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,