Add new tslint rules (class-name, ordered-imports) and fix errors

src/components/keymap/add/keymap-add.component.ts

@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { Keymap } from '../../../config-serializer/config-items/Keymap';
 import { Keymaps } from '../../../config-serializer/config-items/Keymaps';
 import {DataProviderService} from '../../../services/data-provider.service';

src/components/keymap/keymap.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Subscription } from 'rxjs/Subscription';
 
+import { Keymap } from '../../config-serializer/config-items/Keymap';
 import { Layers } from '../../config-serializer/config-items/Layers';
 import { UhkConfigurationService } from '../../services/uhk-configuration.service';
-import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { Subscription } from 'rxjs/Subscription';
 
 @Component({
     selector: 'keymap',

src/components/keymap/keymap.routes.ts

@@ -1,6 +1,7 @@
 import { Routes } from '@angular/router';
-import { KeymapComponent } from './keymap.component';
+
 import { KeymapAddComponent } from './add/keymap-add.component';
+import { KeymapComponent } from './keymap.component';
 
 export const keymapRoutes: Routes = [
     {

src/components/layers/layers.component.ts

@@ -1,4 +1,4 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
 
 @Component({
     selector: 'layers',

src/components/legacy-loader/legacy-loader.routes.ts

@@ -1,4 +1,5 @@
 import { Routes } from '@angular/router';
+
 import {LegacyLoaderComponent} from './legacy-loader.component';
 
 export const legacyRoutes: Routes = [

src/components/macro/macro.routes.ts

@@ -1,4 +1,5 @@
 import { Routes } from '@angular/router';
+
 import { MacroComponent } from './macro.component';
 
 export const macroRoutes: Routes = [

src/components/popover/popover.component.ts

@@ -1,13 +1,12 @@
-import {Component, OnInit, Input, Output, EventEmitter, ViewChild} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core';
 
 import {KeyAction} from '../../config-serializer/config-items/KeyAction';
-
-import {Tab} from './tab/tab';
 import {KeystrokeAction} from '../../config-serializer/config-items/KeystrokeAction';
-import {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
 import {MouseAction} from '../../config-serializer/config-items/MouseAction';
 import {PlayMacroAction} from '../../config-serializer/config-items/PlayMacroAction';
 import {SwitchKeymapAction} from '../../config-serializer/config-items/SwitchKeymapAction';
+import {SwitchLayerAction} from '../../config-serializer/config-items/SwitchLayerAction';
+import {Tab} from './tab/tab';
 
 enum TabName {
     Keypress,

src/components/popover/tab/keymap/keymap-tab.component.ts

@@ -1,13 +1,14 @@
-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 {Tab} from '../tab';
-import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
+import {Component, Input, OnInit } from '@angular/core';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
+import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {Keymap} from '../../../../config-serializer/config-items/Keymap';
+import {SwitchKeymapAction} from '../../../../config-serializer/config-items/SwitchKeymapAction';
+import {Tab} from '../tab';
+
+import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
+
 @Component({
     selector: 'keymap-tab',
     template: require('./keymap-tab.component.html'),

src/components/popover/tab/keypress/keypress-tab.component.ts

@@ -1,4 +1,4 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 
 import {Select2OptionData} from 'ng2-select2/ng2-select2';
 

src/components/popover/tab/layer/layer-tab.component.ts

@@ -1,7 +1,7 @@
-import {Component, OnInit, Input, ViewChild} from '@angular/core';
+import {Component, Input,  OnInit, ViewChild} from '@angular/core';
 
-import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {LayerName, SwitchLayerAction} from '../../../../config-serializer/config-items/SwitchLayerAction';
 
 import {Select2Component, Select2OptionData} from 'ng2-select2/ng2-select2';
 

src/components/popover/tab/macro/macro-item.component.ts

@@ -1,8 +1,8 @@
-import { Component, OnInit, OnChanges, Input } from '@angular/core';
+import { Component, Input, OnChanges, OnInit } from '@angular/core';
 
-import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
 import {DelayMacroAction} from '../../../../config-serializer/config-items/DelayMacroAction';
 import {HoldModifiersMacroAction} from '../../../../config-serializer/config-items/HoldModifiersMacroAction';
+import {MacroAction} from '../../../../config-serializer/config-items/MacroAction';
 import {MoveMouseMacroAction} from '../../../../config-serializer/config-items/MoveMouseMacroAction';
 import {PressModifiersMacroAction} from '../../../../config-serializer/config-items/PressModifiersMacroAction';
 import {ReleaseModifiersMacroAction} from '../../../../config-serializer/config-items/ReleaseModifiersMacroAction';

src/components/popover/tab/macro/macro-tab.component.ts

@@ -1,13 +1,14 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
+
+import {Select2OptionData} from 'ng2-select2/ng2-select2';
 
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
-import {Macro} from '../../../../config-serializer/config-items/Macro';
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
+import {Macro} from '../../../../config-serializer/config-items/Macro';
 import {PlayMacroAction} from '../../../../config-serializer/config-items/PlayMacroAction';
 
 import {Tab} from '../tab';
 
-import {Select2OptionData} from 'ng2-select2/ng2-select2';
+import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
 
 @Component({
     selector: 'macro-tab',

src/components/popover/tab/mouse/mouse-tab.component.ts

@@ -1,9 +1,10 @@
-import {Component, OnInit, Input} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 
-import {Tab} from '../tab';
 import {KeyAction} from '../../../../config-serializer/config-items/KeyAction';
 import {MouseAction, MouseActionParam} from '../../../../config-serializer/config-items/MouseAction';
 
+import {Tab} from '../tab';
+
 @Component({
     selector: 'mouse-tab',
     template: require('./mouse-tab.component.html'),

src/components/popover/tab/none/none-tab.component.ts

@@ -1,7 +1,7 @@
 import {Component, OnInit } from '@angular/core';
 
-import {Tab} from '../tab';
 import {NoneAction} from '../../../../config-serializer/config-items/NoneAction';
+import {Tab} from '../tab';
 
 @Component({
     selector: 'none-tab',

src/components/popover/widgets/icon/icon.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'icon',

src/components/side-menu/side-menu.component.ts

@@ -1,9 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 
 import { Keymap } from '../../config-serializer/config-items/Keymap';
-import { UhkConfigurationService } from '../../services/uhk-configuration.service';
 import { Macro } from '../../config-serializer/config-items/Macro';
 
+import { UhkConfigurationService } from '../../services/uhk-configuration.service';
+
 @Component({
     selector: 'side-menu',
     template: require('./side-menu.component.html'),

src/components/svg/keyboard/svg-keyboard.component.ts

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

src/components/svg/keys/svg-icon-text-key/svg-icon-text-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-icon-text-key]',

src/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts

@@ -1,14 +1,15 @@
-import { Component, OnInit, Input, OnChanges, SimpleChange } from '@angular/core';
+import { Component, Input, OnChanges, OnInit, 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 {KeystrokeAction} from '../../../../config-serializer/config-items/KeystrokeAction';
 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 {LayerName, SwitchLayerAction}  from '../../../../config-serializer/config-items/SwitchLayerAction';
 import {UhkConfiguration} from '../../../../config-serializer/config-items/UhkConfiguration';
-import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
+
 import {MapperService} from '../../../../services/mapper.service';
+import {UhkConfigurationService} from '../../../../services/uhk-configuration.service';
 
 enum LabelTypes {
     KeystrokeKey,

src/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.ts

@@ -1,7 +1,7 @@
-import { Component, OnInit, OnChanges, Input } from '@angular/core';
+import { Component, Input, OnChanges, OnInit } from '@angular/core';
 
-import { KeystrokeAction } from '../../../../config-serializer/config-items/KeystrokeAction';
 import { KeyModifiers } from '../../../../config-serializer/config-items/KeyModifiers';
+import { KeystrokeAction } from '../../../../config-serializer/config-items/KeystrokeAction';
 import { MapperService } from '../../../../services/mapper.service';
 
 class SvgAttributes {

src/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-one-line-text-key]',

src/components/svg/keys/svg-single-icon-key/svg-single-icon-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-single-icon-key]',

src/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 import {MapperService} from '../../../../services/mapper.service';
 

src/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-text-icon-key]',

src/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 
 @Component({
     selector: 'g[svg-two-line-text-key]',

src/components/svg/module/svg-module.component.ts

@@ -1,7 +1,8 @@
-import { Component, Input, Output, EventEmitter } from '@angular/core';
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
 
 import { SvgKeyboardKey } from '../keys';
-import {KeyAction} from '../../../config-serializer/config-items/KeyAction';
 
 @Component({
     selector: 'g[svg-module]',

src/components/svg/wrap/svg-keyboard-wrap.component.ts

@@ -1,6 +1,6 @@
 import {
-    Component, Input, OnInit, style,
-    state, animate, transition, trigger, OnChanges
+    Component, Input, OnChanges, OnInit, animate,
+    state, style, transition, trigger
 } from '@angular/core';
 
 import { KeyAction } from '../../../config-serializer/config-items/KeyAction';