diff --git a/shared/src/components/settings/settings.component.html b/shared/src/components/settings/settings.component.html index 93b57114..83dc6fb7 100644 --- a/shared/src/components/settings/settings.component.html +++ b/shared/src/components/settings/settings.component.html @@ -4,11 +4,7 @@ Settings -
- To be done... -
-; diff --git a/shared/src/components/side-menu/side-menu.component.html b/shared/src/components/side-menu/side-menu.component.html index c4cdcf52..ea4fd94e 100644 --- a/shared/src/components/side-menu/side-menu.component.html +++ b/shared/src/components/side-menu/side-menu.component.html @@ -61,10 +61,10 @@ - diff --git a/shared/src/components/side-menu/side-menu.component.ts b/shared/src/components/side-menu/side-menu.component.ts index f9796434..670cdc79 100644 --- a/shared/src/components/side-menu/side-menu.component.ts +++ b/shared/src/components/side-menu/side-menu.component.ts @@ -8,6 +8,7 @@ import 'rxjs/add/operator/do'; import 'rxjs/add/operator/map'; import 'rxjs/add/operator/let'; +import { runInElectron } from '../../util/index'; import { Keymap } from '../../config-serializer/config-items/keymap'; import { Macro } from '../../config-serializer/config-items/macro'; @@ -32,6 +33,8 @@ import { getKeymaps, getMacros } from '../../store/reducers/user-configuration'; styleUrls: ['./side-menu.component.scss'] }) export class SideMenuComponent { + runInElectron = runInElectron(); + private keymaps$: Observable; private macros$: Observable; private animation: { [key: string]: 'active' | 'inactive' }; diff --git a/web/src/main-app/main-app.routes.ts b/web/src/main-app/main-app.routes.ts index 8d28a9fc..68a6316b 100644 --- a/web/src/main-app/main-app.routes.ts +++ b/web/src/main-app/main-app.routes.ts @@ -4,13 +4,11 @@ import { RouterModule, Routes } from '@angular/router'; import { addOnRoutes } from '../shared/components/add-on'; import { keymapRoutes } from '../components/keymap'; import { macroRoutes } from '../shared/components/macro'; -import { settingsRoutes } from '../shared/components/settings'; const appRoutes: Routes = [ ...keymapRoutes, ...macroRoutes, - ...addOnRoutes, - ...settingsRoutes + ...addOnRoutes ]; export const appRoutingProviders: any[] = [];