.

terminus-core/src/api/index.ts

@@ -1,4 +1,4 @@
-export { BaseTabComponent } from '../components/baseTab'
+export { BaseTabComponent } from '../components/baseTab.component'
 export { TabRecoveryProvider } from './tabRecovery'
 export { ToolbarButtonProvider, IToolbarButton } from './toolbarButtonProvider'
 export { ConfigProvider } from './configProvider'
@@ -6,10 +6,10 @@ export { HotkeyProvider, IHotkeyDescription } from './hotkeyProvider'
 export { DefaultTabProvider } from './defaultTabProvider'
 export { Theme } from './theme'
 
-export { AppService } from '../services/app'
-export { ConfigService } from '../services/config'
-export { DockingService } from '../services/docking'
-export { ElectronService } from '../services/electron'
-export { Logger, LogService } from '../services/log'
-export { HotkeysService } from '../services/hotkeys'
-export { HostAppService, Platform } from '../services/hostApp'
+export { AppService } from '../services/app.service'
+export { ConfigService } from '../services/config.service'
+export { DockingService } from '../services/docking.service'
+export { ElectronService } from '../services/electron.service'
+export { Logger, LogService } from '../services/log.service'
+export { HotkeysService } from '../services/hotkeys.service'
+export { HostAppService, Platform } from '../services/hostApp.service'

terminus-core/src/app.d.ts

@@ -1,8 +0,0 @@
-declare interface Window {
-    require: any
-    process: any
-    __dirname: any
-    __platform: any
-}
-
-declare var window: Window

terminus-core/src/components/appRoot.component.ts

@@ -2,23 +2,23 @@ import { Component, Inject } from '@angular/core'
 import { trigger, style, animate, transition, state } from '@angular/animations'
 import { ToasterConfig } from 'angular2-toaster'
 
-import { ElectronService } from '../services/electron'
-import { HostAppService } from '../services/hostApp'
-import { HotkeysService } from '../services/hotkeys'
-import { Logger, LogService } from '../services/log'
-import { QuitterService } from '../services/quitter'
-import { ConfigService } from '../services/config'
-import { DockingService } from '../services/docking'
-import { TabRecoveryService } from '../services/tabRecovery'
-import { ThemesService } from '../services/themes'
+import { ElectronService } from '../services/electron.service'
+import { HostAppService } from '../services/hostApp.service'
+import { HotkeysService } from '../services/hotkeys.service'
+import { Logger, LogService } from '../services/log.service'
+import { QuitterService } from '../services/quitter.service'
+import { ConfigService } from '../services/config.service'
+import { DockingService } from '../services/docking.service'
+import { TabRecoveryService } from '../services/tabRecovery.service'
+import { ThemesService } from '../services/themes.service'
 
 import { AppService, IToolbarButton, ToolbarButtonProvider } from '../api'
 
 
 @Component({
     selector: 'app-root',
-    template: require('./appRoot.pug'),
-    styles: [require('./appRoot.scss')],
+    template: require('./appRoot.component.pug'),
+    styles: [require('./appRoot.component.scss')],
     animations: [
         trigger('animateTab', [
             state('in', style({

terminus-core/src/components/startPage.component.ts

@@ -3,8 +3,8 @@ import { IToolbarButton, ToolbarButtonProvider } from '../api'
 
 @Component({
   selector: 'start-page',
-  template: require('./startPage.pug'),
-  styles: [require('./startPage.scss')],
+  template: require('./startPage.component.pug'),
+  styles: [require('./startPage.component.scss')],
 })
 export class StartPageComponent {
     constructor(

terminus-core/src/components/tabBody.component.ts

@@ -1,5 +1,5 @@
 import { Component, Input, ViewChild, HostBinding, ViewContainerRef } from '@angular/core'
-import { BaseTabComponent } from '../components/baseTab'
+import { BaseTabComponent } from '../components/baseTab.component'
 
 @Component({
     selector: 'tab-body',

terminus-core/src/components/tabHeader.component.ts

@@ -1,12 +1,10 @@
 import { Component, Input, Output, EventEmitter, HostBinding } from '@angular/core'
-import { BaseTabComponent } from '../components/baseTab'
-
-import './tabHeader.scss'
+import { BaseTabComponent } from '../components/baseTab.component'
 
 @Component({
   selector: 'tab-header',
-  template: require('./tabHeader.pug'),
-  styles: [require('./tabHeader.scss')],
+  template: require('./tabHeader.component.pug'),
+  styles: [require('./tabHeader.component.scss')],
 })
 export class TabHeaderComponent {
     @Input() index: number

terminus-core/src/components/titleBar.component.ts

@@ -1,10 +1,10 @@
 import { Component, HostBinding } from '@angular/core'
-import { HostAppService, Platform } from '../services/hostApp'
+import { HostAppService, Platform } from '../services/hostApp.service'
 
 @Component({
   selector: 'title-bar',
-  template: require('./titleBar.pug'),
-  styles: [require('./titleBar.scss')],
+  template: require('./titleBar.component.pug'),
+  styles: [require('./titleBar.component.scss')],
 })
 export class TitleBarComponent {
     @HostBinding('class.inset-titlebar') insetTitlebar = false

terminus-core/src/index.ts

@@ -6,24 +6,24 @@ import { ToasterModule } from 'angular2-toaster'
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap'
 import { PerfectScrollbarModule } from 'ngx-perfect-scrollbar'
 
-import { AppService } from './services/app'
-import { ConfigService } from './services/config'
-import { ElectronService } from './services/electron'
-import { HostAppService } from './services/hostApp'
-import { LogService } from './services/log'
-import { HotkeysService, AppHotkeyProvider } from './services/hotkeys'
-import { NotifyService } from './services/notify'
-import { PluginsService } from './services/plugins'
-import { QuitterService } from './services/quitter'
-import { DockingService } from './services/docking'
-import { TabRecoveryService } from './services/tabRecovery'
-import { ThemesService } from './services/themes'
+import { AppService } from './services/app.service'
+import { ConfigService } from './services/config.service'
+import { ElectronService } from './services/electron.service'
+import { HostAppService } from './services/hostApp.service'
+import { LogService } from './services/log.service'
+import { HotkeysService, AppHotkeyProvider } from './services/hotkeys.service'
+import { NotifyService } from './services/notify.service'
+import { PluginsService } from './services/plugins.service'
+import { QuitterService } from './services/quitter.service'
+import { DockingService } from './services/docking.service'
+import { TabRecoveryService } from './services/tabRecovery.service'
+import { ThemesService } from './services/themes.service'
 
-import { AppRootComponent } from './components/appRoot'
+import { AppRootComponent } from './components/appRoot.component'
 import { TabBodyComponent } from './components/tabBody.component'
-import { StartPageComponent } from './components/startPage'
-import { TabHeaderComponent } from './components/tabHeader'
-import { TitleBarComponent } from './components/titleBar'
+import { StartPageComponent } from './components/startPage.component'
+import { TabHeaderComponent } from './components/tabHeader.component'
+import { TitleBarComponent } from './components/titleBar.component'
 
 import { HotkeyProvider } from './api/hotkeyProvider'
 import { Theme } from './api/theme'

terminus-core/src/services/app.service.ts

@@ -1,8 +1,8 @@
 import { Subject } from 'rxjs'
 import { Injectable, ComponentFactoryResolver, Injector, Optional } from '@angular/core'
-import { Logger, LogService } from '../services/log'
 import { DefaultTabProvider } from '../api/defaultTabProvider'
-import { BaseTabComponent } from '../components/baseTab'
+import { BaseTabComponent } from '../components/baseTab.component'
+import { Logger, LogService } from '../services/log.service'
 
 export declare type TabComponentType = new (...args: any[]) => BaseTabComponent
 

terminus-core/src/services/config.service.ts

@@ -2,8 +2,8 @@ import * as yaml from 'js-yaml'
 import * as path from 'path'
 import * as fs from 'fs'
 import { EventEmitter, Injectable, Inject } from '@angular/core'
-import { ElectronService } from '../services/electron'
 import { ConfigProvider } from '../api/configProvider'
+import { ElectronService } from '../services/electron.service'
 
 
 export class ConfigProxy {

terminus-core/src/services/docking.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core'
-import { HostAppService } from '../services/hostApp'
-import { ConfigService } from '../services/config'
-import { ElectronService } from '../services/electron'
+import { ConfigService } from '../services/config.service'
+import { ElectronService } from '../services/electron.service'
+import { HostAppService } from '../services/hostApp.service'
 
 
 export interface IScreen {

terminus-core/src/services/hostApp.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, NgZone, EventEmitter } from '@angular/core'
-import { ElectronService } from '../services/electron'
-import { Logger, LogService } from '../services/log'
+import { ElectronService } from '../services/electron.service'
+import { Logger, LogService } from '../services/log.service'
 
 export enum Platform {
     Linux, macOS, Windows,

terminus-core/src/services/hotkeys.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, Inject, NgZone, EventEmitter } from '@angular/core'
-import { ElectronService } from '../services/electron'
-import { ConfigService } from '../services/config'
-import { NativeKeyEvent, stringifyKeySequence } from './hotkeys.util'
 import { IHotkeyDescription, HotkeyProvider } from '../api/hotkeyProvider'
+import { NativeKeyEvent, stringifyKeySequence } from './hotkeys.util'
+import { ConfigService } from '../services/config.service'
+import { ElectronService } from '../services/electron.service'
 
 
 export interface PartialHotkeyMatch {

terminus-core/src/services/quitter.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core'
-import { HostAppService } from '../services/hostApp'
+import { HostAppService } from '../services/hostApp.service'
 
 
 @Injectable()

terminus-core/src/services/tabRecovery.service.ts

@@ -1,8 +1,8 @@
 import { Injectable, Inject } from '@angular/core'
-import { Logger, LogService } from '../services/log'
-import { BaseTabComponent } from '../components/baseTab'
 import { TabRecoveryProvider } from '../api/tabRecovery'
-import { AppService } from '../services/app'
+import { BaseTabComponent } from '../components/baseTab.component'
+import { Logger, LogService } from '../services/log.service'
+import { AppService } from '../services/app.service'
 
 
 @Injectable()

terminus-core/src/services/themes.service.ts

@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@angular/core'
-import { ConfigService } from '../services/config'
+import { ConfigService } from '../services/config.service'
 import { Theme } from '../api/theme'