From e50561170b5b21577a51c41c70359a7bf508a971 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Wed, 21 Sep 2016 20:21:47 +0200 Subject: [PATCH] Optimization of the folder structure --- .../macro/{macro-action-editor => action-editor}/index.ts | 0 .../macro-action-editor.component.html | 0 .../macro-action-editor.component.scss | 0 .../macro-action-editor.component.ts | 2 +- .../tab/macro-delay => action-editor/tab/delay}/index.ts | 0 .../tab/delay}/macro-delay.component.html | 0 .../tab/delay}/macro-delay.component.scss | 0 .../tab/delay}/macro-delay.component.ts | 0 src/components/macro/action-editor/tab/index.ts | 4 ++++ .../tab/macro-key => action-editor/tab/key}/index.ts | 0 .../tab/key}/macro-key.component.html | 0 .../tab/key}/macro-key.component.scss | 0 .../tab/key}/macro-key.component.ts | 0 .../tab/macro-mouse => action-editor/tab/mouse}/index.ts | 0 .../tab/mouse}/macro-mouse.component.html | 0 .../tab/mouse}/macro-mouse.component.scss | 0 .../tab/mouse}/macro-mouse.component.ts | 0 .../tab/macro-text => action-editor/tab/text}/index.ts | 0 .../tab/text}/macro-text.component.html | 0 .../tab/text}/macro-text.component.scss | 0 .../tab/text}/macro-text.component.ts | 0 src/components/macro/index.ts | 6 +++--- src/components/macro/{macro-item => item}/index.ts | 0 .../macro/{macro-item => item}/macro-item.component.html | 0 .../macro/{macro-item => item}/macro-item.component.scss | 0 .../macro/{macro-item => item}/macro-item.component.ts | 0 src/components/macro/macro-action-editor/tab/index.ts | 4 ---- src/components/macro/macro.component.ts | 2 +- 28 files changed, 9 insertions(+), 9 deletions(-) rename src/components/macro/{macro-action-editor => action-editor}/index.ts (100%) rename src/components/macro/{macro-action-editor => action-editor}/macro-action-editor.component.html (100%) rename src/components/macro/{macro-action-editor => action-editor}/macro-action-editor.component.scss (100%) rename src/components/macro/{macro-action-editor => action-editor}/macro-action-editor.component.ts (98%) rename src/components/macro/{macro-action-editor/tab/macro-delay => action-editor/tab/delay}/index.ts (100%) rename src/components/macro/{macro-action-editor/tab/macro-delay => action-editor/tab/delay}/macro-delay.component.html (100%) rename src/components/macro/{macro-action-editor/tab/macro-delay => action-editor/tab/delay}/macro-delay.component.scss (100%) rename src/components/macro/{macro-action-editor/tab/macro-delay => action-editor/tab/delay}/macro-delay.component.ts (100%) create mode 100644 src/components/macro/action-editor/tab/index.ts rename src/components/macro/{macro-action-editor/tab/macro-key => action-editor/tab/key}/index.ts (100%) rename src/components/macro/{macro-action-editor/tab/macro-key => action-editor/tab/key}/macro-key.component.html (100%) rename src/components/macro/{macro-action-editor/tab/macro-key => action-editor/tab/key}/macro-key.component.scss (100%) rename src/components/macro/{macro-action-editor/tab/macro-key => action-editor/tab/key}/macro-key.component.ts (100%) rename src/components/macro/{macro-action-editor/tab/macro-mouse => action-editor/tab/mouse}/index.ts (100%) rename src/components/macro/{macro-action-editor/tab/macro-mouse => action-editor/tab/mouse}/macro-mouse.component.html (100%) rename src/components/macro/{macro-action-editor/tab/macro-mouse => action-editor/tab/mouse}/macro-mouse.component.scss (100%) rename src/components/macro/{macro-action-editor/tab/macro-mouse => action-editor/tab/mouse}/macro-mouse.component.ts (100%) rename src/components/macro/{macro-action-editor/tab/macro-text => action-editor/tab/text}/index.ts (100%) rename src/components/macro/{macro-action-editor/tab/macro-text => action-editor/tab/text}/macro-text.component.html (100%) rename src/components/macro/{macro-action-editor/tab/macro-text => action-editor/tab/text}/macro-text.component.scss (100%) rename src/components/macro/{macro-action-editor/tab/macro-text => action-editor/tab/text}/macro-text.component.ts (100%) rename src/components/macro/{macro-item => item}/index.ts (100%) rename src/components/macro/{macro-item => item}/macro-item.component.html (100%) rename src/components/macro/{macro-item => item}/macro-item.component.scss (100%) rename src/components/macro/{macro-item => item}/macro-item.component.ts (100%) delete mode 100644 src/components/macro/macro-action-editor/tab/index.ts diff --git a/src/components/macro/macro-action-editor/index.ts b/src/components/macro/action-editor/index.ts similarity index 100% rename from src/components/macro/macro-action-editor/index.ts rename to src/components/macro/action-editor/index.ts diff --git a/src/components/macro/macro-action-editor/macro-action-editor.component.html b/src/components/macro/action-editor/macro-action-editor.component.html similarity index 100% rename from src/components/macro/macro-action-editor/macro-action-editor.component.html rename to src/components/macro/action-editor/macro-action-editor.component.html diff --git a/src/components/macro/macro-action-editor/macro-action-editor.component.scss b/src/components/macro/action-editor/macro-action-editor.component.scss similarity index 100% rename from src/components/macro/macro-action-editor/macro-action-editor.component.scss rename to src/components/macro/action-editor/macro-action-editor.component.scss diff --git a/src/components/macro/macro-action-editor/macro-action-editor.component.ts b/src/components/macro/action-editor/macro-action-editor.component.ts similarity index 98% rename from src/components/macro/macro-action-editor/macro-action-editor.component.ts rename to src/components/macro/action-editor/macro-action-editor.component.ts index b35d6443..480fe6f6 100644 --- a/src/components/macro/macro-action-editor/macro-action-editor.component.ts +++ b/src/components/macro/action-editor/macro-action-editor.component.ts @@ -6,7 +6,7 @@ import { TextMacroAction, macroActionType } from '../../../config-serializer/config-items/macro-action'; -import { MacroKeyTabComponent } from './tab/macro-key'; +import { MacroKeyTabComponent } from './tab/key'; enum TabName { Keypress, diff --git a/src/components/macro/macro-action-editor/tab/macro-delay/index.ts b/src/components/macro/action-editor/tab/delay/index.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-delay/index.ts rename to src/components/macro/action-editor/tab/delay/index.ts diff --git a/src/components/macro/macro-action-editor/tab/macro-delay/macro-delay.component.html b/src/components/macro/action-editor/tab/delay/macro-delay.component.html similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-delay/macro-delay.component.html rename to src/components/macro/action-editor/tab/delay/macro-delay.component.html diff --git a/src/components/macro/macro-action-editor/tab/macro-delay/macro-delay.component.scss b/src/components/macro/action-editor/tab/delay/macro-delay.component.scss similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-delay/macro-delay.component.scss rename to src/components/macro/action-editor/tab/delay/macro-delay.component.scss diff --git a/src/components/macro/macro-action-editor/tab/macro-delay/macro-delay.component.ts b/src/components/macro/action-editor/tab/delay/macro-delay.component.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-delay/macro-delay.component.ts rename to src/components/macro/action-editor/tab/delay/macro-delay.component.ts diff --git a/src/components/macro/action-editor/tab/index.ts b/src/components/macro/action-editor/tab/index.ts new file mode 100644 index 00000000..ca94c71b --- /dev/null +++ b/src/components/macro/action-editor/tab/index.ts @@ -0,0 +1,4 @@ +export { MacroDelayTabComponent } from './delay'; +export { MacroKeyTabComponent } from './key'; +export { MacroMouseTabComponent } from './mouse'; +export { MacroTextTabComponent } from './text'; diff --git a/src/components/macro/macro-action-editor/tab/macro-key/index.ts b/src/components/macro/action-editor/tab/key/index.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-key/index.ts rename to src/components/macro/action-editor/tab/key/index.ts diff --git a/src/components/macro/macro-action-editor/tab/macro-key/macro-key.component.html b/src/components/macro/action-editor/tab/key/macro-key.component.html similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-key/macro-key.component.html rename to src/components/macro/action-editor/tab/key/macro-key.component.html diff --git a/src/components/macro/macro-action-editor/tab/macro-key/macro-key.component.scss b/src/components/macro/action-editor/tab/key/macro-key.component.scss similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-key/macro-key.component.scss rename to src/components/macro/action-editor/tab/key/macro-key.component.scss diff --git a/src/components/macro/macro-action-editor/tab/macro-key/macro-key.component.ts b/src/components/macro/action-editor/tab/key/macro-key.component.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-key/macro-key.component.ts rename to src/components/macro/action-editor/tab/key/macro-key.component.ts diff --git a/src/components/macro/macro-action-editor/tab/macro-mouse/index.ts b/src/components/macro/action-editor/tab/mouse/index.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-mouse/index.ts rename to src/components/macro/action-editor/tab/mouse/index.ts diff --git a/src/components/macro/macro-action-editor/tab/macro-mouse/macro-mouse.component.html b/src/components/macro/action-editor/tab/mouse/macro-mouse.component.html similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-mouse/macro-mouse.component.html rename to src/components/macro/action-editor/tab/mouse/macro-mouse.component.html diff --git a/src/components/macro/macro-action-editor/tab/macro-mouse/macro-mouse.component.scss b/src/components/macro/action-editor/tab/mouse/macro-mouse.component.scss similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-mouse/macro-mouse.component.scss rename to src/components/macro/action-editor/tab/mouse/macro-mouse.component.scss diff --git a/src/components/macro/macro-action-editor/tab/macro-mouse/macro-mouse.component.ts b/src/components/macro/action-editor/tab/mouse/macro-mouse.component.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-mouse/macro-mouse.component.ts rename to src/components/macro/action-editor/tab/mouse/macro-mouse.component.ts diff --git a/src/components/macro/macro-action-editor/tab/macro-text/index.ts b/src/components/macro/action-editor/tab/text/index.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-text/index.ts rename to src/components/macro/action-editor/tab/text/index.ts diff --git a/src/components/macro/macro-action-editor/tab/macro-text/macro-text.component.html b/src/components/macro/action-editor/tab/text/macro-text.component.html similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-text/macro-text.component.html rename to src/components/macro/action-editor/tab/text/macro-text.component.html diff --git a/src/components/macro/macro-action-editor/tab/macro-text/macro-text.component.scss b/src/components/macro/action-editor/tab/text/macro-text.component.scss similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-text/macro-text.component.scss rename to src/components/macro/action-editor/tab/text/macro-text.component.scss diff --git a/src/components/macro/macro-action-editor/tab/macro-text/macro-text.component.ts b/src/components/macro/action-editor/tab/text/macro-text.component.ts similarity index 100% rename from src/components/macro/macro-action-editor/tab/macro-text/macro-text.component.ts rename to src/components/macro/action-editor/tab/text/macro-text.component.ts diff --git a/src/components/macro/index.ts b/src/components/macro/index.ts index 62dcbd9c..16936128 100644 --- a/src/components/macro/index.ts +++ b/src/components/macro/index.ts @@ -1,6 +1,6 @@ export * from './macro.component'; export * from './add/macro-add.component'; export * from './macro.routes'; -export * from './macro-item'; -export * from './macro-action-editor'; -export * from './macro-action-editor/tab'; +export * from './item'; +export * from './action-editor'; +export * from './action-editor/tab'; diff --git a/src/components/macro/macro-item/index.ts b/src/components/macro/item/index.ts similarity index 100% rename from src/components/macro/macro-item/index.ts rename to src/components/macro/item/index.ts diff --git a/src/components/macro/macro-item/macro-item.component.html b/src/components/macro/item/macro-item.component.html similarity index 100% rename from src/components/macro/macro-item/macro-item.component.html rename to src/components/macro/item/macro-item.component.html diff --git a/src/components/macro/macro-item/macro-item.component.scss b/src/components/macro/item/macro-item.component.scss similarity index 100% rename from src/components/macro/macro-item/macro-item.component.scss rename to src/components/macro/item/macro-item.component.scss diff --git a/src/components/macro/macro-item/macro-item.component.ts b/src/components/macro/item/macro-item.component.ts similarity index 100% rename from src/components/macro/macro-item/macro-item.component.ts rename to src/components/macro/item/macro-item.component.ts diff --git a/src/components/macro/macro-action-editor/tab/index.ts b/src/components/macro/macro-action-editor/tab/index.ts deleted file mode 100644 index 1a9cd2b1..00000000 --- a/src/components/macro/macro-action-editor/tab/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { MacroDelayTabComponent } from './macro-delay'; -export { MacroKeyTabComponent } from './macro-key'; -export { MacroMouseTabComponent } from './macro-mouse'; -export { MacroTextTabComponent } from './macro-text'; diff --git a/src/components/macro/macro.component.ts b/src/components/macro/macro.component.ts index a0062f53..554f9089 100644 --- a/src/components/macro/macro.component.ts +++ b/src/components/macro/macro.component.ts @@ -7,7 +7,7 @@ import { DragulaService } from 'ng2-dragula/ng2-dragula'; import { Macro } from '../../config-serializer/config-items/Macro'; import { MacroAction } from '../../config-serializer/config-items/macro-action'; -import { MacroItemComponent } from './macro-item/macro-item.component'; +import { MacroItemComponent } from './item/macro-item.component'; import { UhkConfigurationService } from '../../services/uhk-configuration.service';