wip

terminus-settings/package.json

@@ -8,7 +8,9 @@
     "build": "webpack --progress --color --display-modules",
     "watch": "webpack --progress --color --watch"
   },
-  "files": ["dist"],
+  "files": [
+    "dist"
+  ],
   "author": "Eugene Pankov",
   "license": "MIT",
   "devDependencies": {
@@ -17,7 +19,7 @@
     "@types/webpack-env": "1.13.0",
     "awesome-typescript-loader": "3.1.2",
     "css-loader": "^0.28.0",
-    "ng2-filter-pipe": "^0.1.7",
+    "ngx-pipes": "^1.6.1",
     "node-sass": "^4.5.2",
     "pug": "^2.0.0-beta3",
     "pug-loader": "^2.3.0",

terminus-settings/src/buttonProvider.ts

@@ -13,7 +13,7 @@ export class ButtonProvider extends ToolbarButtonProvider {
 
     provide (): IToolbarButton[] {
         return [{
-            icon: 'cog',
+            icon: 'sliders',
             title: 'Settings',
             weight: 10,
             click: () => {

terminus-settings/src/components/settingsTab.component.pug

@@ -149,14 +149,14 @@ ngb-tabset.vertical(type='tabs')
         template(ngbTabTitle)
             | Hotkeys
         template(ngbTabContent)
-            input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter.name')
+            input.form-control(type='search', placeholder='Search hotkeys', [(ngModel)]='hotkeyFilter')
             .form-group
                 table.hotkeys-table
                     tr
                         th Name
                         th ID
                         th Hotkey 
-                    tr(*ngFor='let hotkey of hotkeyDescriptions|filterBy:hotkeyFilter')
+                    tr(*ngFor='let hotkey of hotkeyDescriptions|filterBy:["name"]:hotkeyFilter')
                         td {{hotkey.name}}
                         td {{hotkey.id}}
                         td

terminus-settings/src/components/settingsTab.component.ts

@@ -12,7 +12,7 @@ import { SettingsTabProvider } from '../api'
     ],
 })
 export class SettingsTabComponent extends BaseTabComponent {
-    hotkeyFilter = { name: null }
+    hotkeyFilter = ''
     private hotkeyDescriptions: IHotkeyDescription[]
 
     constructor (

terminus-settings/src/index.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core'
 import { BrowserModule } from '@angular/platform-browser'
 import { FormsModule } from '@angular/forms'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
-import { Ng2FilterPipeModule } from 'ng2-filter-pipe'
+import { NgPipesModule } from 'ngx-pipes'
 
 import { ToolbarButtonProvider, TabRecoveryProvider } from 'terminus-core'
 
@@ -19,7 +19,7 @@ import { RecoveryProvider } from './recoveryProvider'
         BrowserModule,
         FormsModule,
         NgbModule,
-        Ng2FilterPipeModule,
+        NgPipesModule,
     ],
     providers: [
         { provide: ToolbarButtonProvider, useClass: ButtonProvider, multi: true },

terminus-settings/webpack.config.js

@@ -29,7 +29,6 @@ module.exports = {
           }
         }
       },
-      { test: /schemes\/.*$/, use: "raw-loader" },
       { test: /\.pug$/, use: ['apply-loader', 'pug-loader'] },
       { test: /\.scss$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },
       { test: /\.css$/, use: ['to-string-loader', 'css-loader', 'sass-loader'] },