diff --git a/src/app.module.ts b/src/app.module.ts index 3e442f0b..7316c057 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -9,10 +9,12 @@ import { Select2Component } from 'ng2-select2/ng2-select2'; import { ContenteditableDirective } from './directives/contenteditable'; +import { AddOnComponent } from './components/add-on'; import { KeymapAddComponent, KeymapComponent, KeymapHeaderComponent } from './components/keymap'; import { LayersComponent } from './components/layers'; import { MacroActionEditorComponent, + MacroAddComponent, MacroComponent, MacroDelayTabComponent, MacroItemComponent, @@ -32,6 +34,7 @@ import { } from './components/popover/tab'; import { CaptureKeystrokeButtonComponent } from './components/popover/widgets/capture-keystroke'; import { IconComponent } from './components/popover/widgets/icon'; +import { SettingsComponent } from './components/settings'; import { SideMenuComponent } from './components/side-menu'; import { SvgKeyboardComponent } from './components/svg/keyboard'; import { @@ -102,13 +105,16 @@ const storeConfig = { CaptureKeystrokeButtonComponent, IconComponent, MacroComponent, + MacroAddComponent, MacroItemComponent, MacroActionEditorComponent, MacroDelayTabComponent, MacroKeyTabComponent, MacroMouseTabComponent, MacroTextTabComponent, - ContenteditableDirective + ContenteditableDirective, + AddOnComponent, + SettingsComponent ], imports: [ BrowserModule, diff --git a/src/components/add-on/add-on.component.html b/src/components/add-on/add-on.component.html new file mode 100644 index 00000000..0261804c --- /dev/null +++ b/src/components/add-on/add-on.component.html @@ -0,0 +1,7 @@ +
+

+ + {{ name$ | async }} +

+
+To be done... \ No newline at end of file diff --git a/src/components/add-on/add-on.component.scss b/src/components/add-on/add-on.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/components/add-on/add-on.component.ts b/src/components/add-on/add-on.component.ts new file mode 100644 index 00000000..9f17b67e --- /dev/null +++ b/src/components/add-on/add-on.component.ts @@ -0,0 +1,19 @@ +import { Component } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; + +import { Observable } from 'rxjs/Observable'; + +@Component({ + selector: 'add-on', + template: require('./add-on.component.html'), + styles: [require('./add-on.component.scss')] +}) +export class AddOnComponent { + private name$: Observable; + + constructor(private route: ActivatedRoute) { + this.name$ = route + .params + .select('name'); + } +} diff --git a/src/components/add-on/add-on.routes.ts b/src/components/add-on/add-on.routes.ts new file mode 100644 index 00000000..53603444 --- /dev/null +++ b/src/components/add-on/add-on.routes.ts @@ -0,0 +1,10 @@ +import { Routes } from '@angular/router'; + +import { AddOnComponent } from './add-on.component'; + +export const addOnRoutes: Routes = [ + { + path: 'add-on/:name', + component: AddOnComponent + } +]; diff --git a/src/components/add-on/index.ts b/src/components/add-on/index.ts new file mode 100644 index 00000000..546d0516 --- /dev/null +++ b/src/components/add-on/index.ts @@ -0,0 +1,2 @@ +export * from './add-on.component'; +export * from './add-on.routes'; diff --git a/src/components/macro/add/macro-add.component.html b/src/components/macro/add/macro-add.component.html new file mode 100644 index 00000000..2aec5781 --- /dev/null +++ b/src/components/macro/add/macro-add.component.html @@ -0,0 +1,7 @@ +
+

+ + Add macro +

+
+To be done... \ No newline at end of file diff --git a/src/components/macro/add/macro-add.component.scss b/src/components/macro/add/macro-add.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/components/macro/add/macro-add.component.ts b/src/components/macro/add/macro-add.component.ts new file mode 100644 index 00000000..385de43c --- /dev/null +++ b/src/components/macro/add/macro-add.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'macro-add', + template: require('./macro-add.component.html'), + styles: [require('./macro-add.component.scss')] +}) +export class MacroAddComponent { + constructor() { } +} diff --git a/src/components/macro/index.ts b/src/components/macro/index.ts index 1bf72a94..62dcbd9c 100644 --- a/src/components/macro/index.ts +++ b/src/components/macro/index.ts @@ -1,4 +1,5 @@ export * from './macro.component'; +export * from './add/macro-add.component'; export * from './macro.routes'; export * from './macro-item'; export * from './macro-action-editor'; diff --git a/src/components/macro/macro.routes.ts b/src/components/macro/macro.routes.ts index 91fdf80a..fac9b78f 100644 --- a/src/components/macro/macro.routes.ts +++ b/src/components/macro/macro.routes.ts @@ -1,5 +1,6 @@ import { Routes } from '@angular/router'; +import { MacroAddComponent } from './add/macro-add.component'; import { MacroComponent } from './macro.component'; export const macroRoutes: Routes = [ @@ -7,6 +8,10 @@ export const macroRoutes: Routes = [ path: 'macro', component: MacroComponent }, + { + path: 'macro/add', + component: MacroAddComponent + }, { path: 'macro/:id', component: MacroComponent diff --git a/src/components/settings/index.ts b/src/components/settings/index.ts new file mode 100644 index 00000000..5d00f663 --- /dev/null +++ b/src/components/settings/index.ts @@ -0,0 +1,2 @@ +export * from './settings.component'; +export * from './settings.routes'; diff --git a/src/components/settings/settings.component.html b/src/components/settings/settings.component.html new file mode 100644 index 00000000..9fd90dd6 --- /dev/null +++ b/src/components/settings/settings.component.html @@ -0,0 +1,7 @@ +
+

+ + Settings +

+
+To be done... \ No newline at end of file diff --git a/src/components/settings/settings.component.scss b/src/components/settings/settings.component.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/components/settings/settings.component.ts b/src/components/settings/settings.component.ts new file mode 100644 index 00000000..3bea3dcf --- /dev/null +++ b/src/components/settings/settings.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'settings', + template: require('./settings.component.html'), + styles: [require('./settings.component.scss')] +}) +export class SettingsComponent { + constructor() { } +} diff --git a/src/components/settings/settings.routes.ts b/src/components/settings/settings.routes.ts new file mode 100644 index 00000000..4aa5cec0 --- /dev/null +++ b/src/components/settings/settings.routes.ts @@ -0,0 +1,10 @@ +import { Routes } from '@angular/router'; + +import { SettingsComponent } from './settings.component'; + +export const settingsRoutes: Routes = [ + { + path: 'settings', + component: SettingsComponent + } +]; diff --git a/src/components/side-menu/side-menu.component.html b/src/components/side-menu/side-menu.component.html index 206d5ae8..4e2545e2 100644 --- a/src/components/side-menu/side-menu.component.html +++ b/src/components/side-menu/side-menu.component.html @@ -19,7 +19,7 @@
  • Macros - + @@ -40,22 +40,22 @@ @@ -63,6 +63,8 @@ \ No newline at end of file diff --git a/src/components/side-menu/side-menu.component.scss b/src/components/side-menu/side-menu.component.scss index abbb05f2..504a8326 100644 --- a/src/components/side-menu/side-menu.component.scss +++ b/src/components/side-menu/side-menu.component.scss @@ -31,6 +31,7 @@ ul { padding: 0.5rem 1rem; font-size: 2rem; line-height: 3rem; + cursor: default; &:hover { .fa-chevron-up, @@ -59,6 +60,7 @@ ul { position: relative; top: 0.5rem; display: none; + cursor: pointer; } } @@ -81,6 +83,10 @@ ul { } } + &:hover { + cursor: pointer; + } + // General "right side" icon theming. .fa.pull-right { position: relative; @@ -108,7 +114,6 @@ ul { &__level-1, &__level-2--item { &:hover { - cursor: pointer; background-color: rgba(0, 0, 0, 0.05); } } @@ -128,8 +133,13 @@ ul { .sidebar { &__level-1 { - background-color: transparent; + display: block; padding: 1rem; + cursor: pointer; + + &:hover { + text-decoration: none; + } } } } diff --git a/src/main-app/main-app.routes.ts b/src/main-app/main-app.routes.ts index 05dab80d..a0804926 100644 --- a/src/main-app/main-app.routes.ts +++ b/src/main-app/main-app.routes.ts @@ -1,12 +1,16 @@ import { ModuleWithProviders } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { addOnRoutes } from '../components/add-on'; import { keymapRoutes } from '../components/keymap'; import { macroRoutes } from '../components/macro'; +import { settingsRoutes } from '../components/settings'; const appRoutes: Routes = [ ...keymapRoutes, - ...macroRoutes + ...macroRoutes, + ...addOnRoutes, + ...settingsRoutes ]; export const appRoutingProviders: any[] = [ ];