final merge

Author: JanLunge

.prettierrc.yaml

@@ -6,7 +6,7 @@ files:
   - '!**/.vscode/*'
   - '!src/*'
   - '!electron.vite.config.{js,ts,mjs,cjs}'
-  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
+  - '!{.eslintignore,.eslintrc.cjs,.prettierignore,yulyuly.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
   - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
 asarUnpack:
   - resources/*

electron-builder.yml

@@ -56,7 +56,7 @@
     "less": "^4.1.3",
     "postcss": "^8.4.21",
     "prettier": "^2.8.2",
-    "prettier-plugin-tailwindcss": "^0.2.2",
+    "prettier-plugin-tailwindcss": "^0.2.3",
     "typescript": "^4.9.4",
     "vite": "^4.0.4",
     "vue": "^3.2.45",

package.json

@@ -0,0 +1,8 @@
+// prettier.config.js
+module.exports = {
+  plugins: [require('prettier-plugin-tailwindcss')],
+  singleQuote: true,
+  semi: false,
+  printWidth: 100,
+  trailingComma: "none",
+}

prettier.config.js

@@ -2,7 +2,7 @@ import { app, shell, BrowserWindow, ipcMain } from 'electron'
 import { join } from 'path'
 import { electronApp, optimizer, is } from '@electron-toolkit/utils'
 import icon from '../../resources/icon.png?asset'
-import {handleSelectDrive, selectKeyboard} from './selectKeyboard'
+import { handleSelectDrive, selectKeyboard } from './selectKeyboard'
 import { updateFirmware } from './kmkUpdater'
 import { saveConfiguration } from './saveConfig'
 
@@ -26,7 +26,7 @@ function createWindow(): void {
   })
 
   mainWindow.on('ready-to-show', () => {
-    mainWindow.show()
+    if (mainWindow) mainWindow.show()
   })
 
   mainWindow.webContents.setWindowOpenHandler((details) => {

src/main/index.ts

@@ -2,7 +2,6 @@ import { appDir, currentKeyboard } from './store'
 import * as fs from 'fs-extra'
 import request from 'request'
 import decompress from 'decompress'
-import {ipcMain, shell} from 'electron'
 import {mainWindow} from "./index";
 
 // downloads kmk to app storage

src/main/kmkUpdater.ts

@@ -11,12 +11,12 @@ export const saveConfiguration = (data: string) => {
   })
   if (writeFirmware) {
     console.log('should also write firmware files')
+    handleKeymapSave(pogConfig)
   }
 }
 
-export const handleKeymapSave = (jsondata) => {
-  console.log('saving keymap', jsondata)
-  const data = JSON.parse(jsondata)
+export const handleKeymapSave = (pogConfig) => {
+  console.log('saving keymap', pogConfig)
   // const codeblockraw = fs.readFileSync(`${keyboardPath}/code.py`, {encoding:'utf8', flag:'r'})
   // console.log(codeblockraw)
   // const codeblock = codeblockraw.match(/# CodeBlock([\S\s]*)# \/CodeBlock/gm)[1]
@@ -26,7 +26,6 @@ export const handleKeymapSave = (jsondata) => {
   let pythonImports = ''
   let kmkAddons = ''
   let codeblock = ''
-  const pogConfig = data.config.configContents
   //layers
   if (true) {
     pythonImports += '\nfrom kmk.modules.layers import Layers\n'
@@ -91,15 +90,15 @@ keyboard = KMKKeyboard()
 ${kmkAddons}
 
 # Cols
-keyboard.col_pins = (${data.colPins.map((a) => 'board.GP' + a).join(', ')})
+keyboard.col_pins = (${pogConfig.colPins.map((a) => 'board.GP' + a).join(', ')})
 # Rows
-keyboard.row_pins = (${data.rowPins.map((a) => 'board.GP' + a).join(', ')})
+keyboard.row_pins = (${pogConfig.rowPins.map((a) => 'board.GP' + a).join(', ')})
 # Diode Direction
-keyboard.diode_orientation = DiodeOrientation.${data.diodeDirection}
+keyboard.diode_orientation = DiodeOrientation.${pogConfig.diodeDirection}
 
 # Keymap
 keyboard.keymap = [
-    ${data.keymap.map((layer) => '[' + layer.join(', ') + ']').join(', ')}
+    ${pogConfig.keymap.map((layer) => '[' + layer.join(', ') + ']').join(', ')}
 ]
 
 ${codeblock}
@@ -108,15 +107,6 @@ if __name__ == '__main__':
     keyboard.go()
 `
   fs.writeFile(currentKeyboard.path + '/code.py', keymapString, () => {
-    console.log('File written successfully\n')
+    console.log('Firmware File written successfully\n')
   })
-
-  // write pog.json
-  fs.writeFile(
-    currentKeyboard.path + '/pog.json',
-    JSON.stringify(data.config.configContents, null, 4),
-    () => {
-      console.log('pog File written successfully\n')
-    }
-  )
 }

src/main/saveConfig.ts

@@ -5,6 +5,7 @@ import {keyboardStore} from "./store";
 const store = computed(()=>{
   return keyboardStore
 })
+console.log('store initiated', store.value.path)
 </script>
 
 <template>
@@ -13,5 +14,6 @@ const store = computed(()=>{
 <style lang="scss">
 html,body,#app{
   height: 100%;
+  font-family: -apple-system, BlinkMacSystemFont;
 }
 </style>

src/renderer/src/App.vue

@@ -1,40 +1,31 @@
 <template>
   <div
-    class="flex gap-4 items-center mb-4"
-    v-if="
-      selectedConfig &&
-      selectedConfig.encoderKeymap[lindex] &&
-      selectedConfig.encoderKeymap[lindex][eindex]
-    "
+    v-if="keyboardStore.encoderKeymap[lindex] && keyboardStore.encoderKeymap[lindex][eindex]"
+    class="mb-4 flex items-center gap-4"
   >
     <p class="w-24">layer {{ lindex }}</p>
     <input
+      v-model="keyboardStore.encoderKeymap[lindex][eindex][0]"
       type="text"
-      class="input input-bordered"
-      v-model="selectedConfig.encoderKeymap[lindex][eindex][0]"
+      class="input-bordered input"
     />
     <input
+      v-model="keyboardStore.encoderKeymap[lindex][eindex][1]"
       type="text"
-      class="input input-bordered"
-      v-model="selectedConfig.encoderKeymap[lindex][eindex][1]"
+      class="input-bordered input"
     />
   </div>
 </template>
 
 <script lang="ts" setup>
-import { keyboardStore } from "../store";
-const props = defineProps(["lindex", "layer", "eindex"]);
-if (selectedConfig.value) {
-  if (!selectedConfig.value.encoderKeymap[props.lindex]) {
-    // create the layer
-    selectedConfig.value.encoderKeymap[props.lindex] = [];
-  }
-  if (!selectedConfig.value.encoderKeymap[props.lindex][props.eindex]) {
-    selectedConfig.value.encoderKeymap[props.lindex][props.eindex] = [
-      "KC.TRNS",
-      "KC.TRNS",
-    ];
-  }
+import { keyboardStore } from '../store'
+const props = defineProps(['lindex', 'layer', 'eindex'])
+if (!keyboardStore.encoderKeymap[props.lindex]) {
+  // create the layer
+  keyboardStore.encoderKeymap[props.lindex] = []
+}
+if (!keyboardStore.encoderKeymap[props.lindex][props.eindex]) {
+  keyboardStore.encoderKeymap[props.lindex][props.eindex] = ['KC.TRNS', 'KC.TRNS']
 }
 </script>
 

src/renderer/src/components/EncoderLayer.vue

@@ -32,7 +32,7 @@
       <div>
         Keymap
         <EncoderLayer
-          v-for="(layer, lindex) in keymap"
+          v-for="(_layer, lindex) in keyboardStore.keymap"
           :lindex="lindex"
           :eindex="eindex"
         ></EncoderLayer>
@@ -91,14 +91,14 @@ const removeEncoder = (index: number) => {
 
   // cleanEncoders();
   keyboardStore.encoders = keyboardStore.encoders.filter(
-    (e, eindex) => {
+    (_e, eindex) => {
       return eindex !== index;
     }
   );
   // remove that index from each keymap layer
   keyboardStore.encoderKeymap.forEach((layer, lindex) => {
     keyboardStore.encoderKeymap[lindex] = layer.filter(
-      (l, eindex) => eindex !== index
+      (_l, eindex) => eindex !== index
     );
   });
 };