diff --git a/packages/uhk-web/src/app/services/svg-module-provider.service.ts b/packages/uhk-web/src/app/services/svg-module-provider.service.ts index e897f972..a0b921f2 100644 --- a/packages/uhk-web/src/app/services/svg-module-provider.service.ts +++ b/packages/uhk-web/src/app/services/svg-module-provider.service.ts @@ -17,12 +17,12 @@ export class SvgModuleProviderService { private getLeftModule(layout = KeyboardLayout.ANSI): SvgModule { if (layout === KeyboardLayout.ISO) { if (!this.isoLeft) { - this.isoLeft = new SvgModule(require('xml-loader!../../modules/uhk60-left-half/layout-iso.xml').svg); + this.isoLeft = new SvgModule(require('xml-loader!../../modules/uhk60-left/layout-iso.xml').svg); } return this.isoLeft; } if (!this.ansiLeft) { - this.ansiLeft = new SvgModule(require('xml-loader!../../modules/uhk60-left-half/layout-ansi.xml').svg); + this.ansiLeft = new SvgModule(require('xml-loader!../../modules/uhk60-left/layout-ansi.xml').svg); } return this.ansiLeft; } @@ -30,7 +30,7 @@ export class SvgModuleProviderService { private getRightModule(): SvgModule { if (!this.right) { - this.right = new SvgModule(require('xml-loader!../../modules/uhk60-right-half/layout.xml').svg); + this.right = new SvgModule(require('xml-loader!../../modules/uhk60-right/layout.xml').svg); } return this.right; } diff --git a/packages/uhk-web/src/modules/uhk60-left-half/layout-ansi.xml b/packages/uhk-web/src/modules/uhk60-left/layout-ansi.xml similarity index 100% rename from packages/uhk-web/src/modules/uhk60-left-half/layout-ansi.xml rename to packages/uhk-web/src/modules/uhk60-left/layout-ansi.xml diff --git a/packages/uhk-web/src/modules/uhk60-left-half/layout-iso.xml b/packages/uhk-web/src/modules/uhk60-left/layout-iso.xml similarity index 100% rename from packages/uhk-web/src/modules/uhk60-left-half/layout-iso.xml rename to packages/uhk-web/src/modules/uhk60-left/layout-iso.xml diff --git a/packages/uhk-web/src/modules/uhk60-left-half/module.json b/packages/uhk-web/src/modules/uhk60-left/module.json similarity index 80% rename from packages/uhk-web/src/modules/uhk60-left-half/module.json rename to packages/uhk-web/src/modules/uhk60-left/module.json index 098bc2ec..24c72e33 100644 --- a/packages/uhk-web/src/modules/uhk60-left-half/module.json +++ b/packages/uhk-web/src/modules/uhk60-left/module.json @@ -1,6 +1,6 @@ { "id": 1, - "name": "uhk60-left-half", + "name": "uhk60-left", "description": "Left UHK60 keyboard half", "slot": "left-half", "keyCount": 35, diff --git a/packages/uhk-web/src/modules/uhk60-right-half/layout.xml b/packages/uhk-web/src/modules/uhk60-right/layout.xml similarity index 100% rename from packages/uhk-web/src/modules/uhk60-right-half/layout.xml rename to packages/uhk-web/src/modules/uhk60-right/layout.xml diff --git a/packages/uhk-web/src/modules/uhk60-right-half/module.json b/packages/uhk-web/src/modules/uhk60-right/module.json similarity index 80% rename from packages/uhk-web/src/modules/uhk60-right-half/module.json rename to packages/uhk-web/src/modules/uhk60-right/module.json index c913d066..ccda8345 100644 --- a/packages/uhk-web/src/modules/uhk60-right-half/module.json +++ b/packages/uhk-web/src/modules/uhk60-right/module.json @@ -1,6 +1,6 @@ { "id": 0, - "name": "uhk60-right-half", + "name": "uhk60-right", "description": "Right UHK60 keyboard half", "slot": "right-half", "keyCount": 35,