From 8a55b36527bc6b28de3bf93e89ce8fb07539084f Mon Sep 17 00:00:00 2001 From: Fabio Di Stasio Date: Sat, 14 May 2022 11:15:42 +0200 Subject: [PATCH] refactor: ts and composition api for single instance components --- scripts/devRunner.js | 2 +- src/common/libs/bufferToBase64.ts | 2 +- src/renderer/components/BaseTextEditor.vue | 2 +- src/renderer/components/FakerSelect.vue | 261 +++++++++--------- src/renderer/components/ModalFakerRows.vue | 2 +- src/renderer/components/TheFooter.vue | 61 ++-- .../components/TheNotificationsBoard.vue | 98 +++---- src/renderer/components/TheScratchpad.vue | 63 ++--- src/renderer/components/TheSettingBar.vue | 82 +++++- src/renderer/components/TheTitleBar.vue | 121 ++++---- .../libs/{arrayToFile.js => arrayToFile.ts} | 8 +- .../libs/{unproxify.js => unproxify.ts} | 5 +- 12 files changed, 364 insertions(+), 343 deletions(-) rename src/renderer/libs/{arrayToFile.js => arrayToFile.ts} (89%) rename src/renderer/libs/{unproxify.js => unproxify.ts} (76%) diff --git a/scripts/devRunner.js b/scripts/devRunner.js index a981080c..6b9bda17 100644 --- a/scripts/devRunner.js +++ b/scripts/devRunner.js @@ -59,7 +59,7 @@ async function restartElectron () { console.error(chalk.red(data.toString())); }); - electronProcess.on('exit', (code, signal) => { + electronProcess.on('exit', () => { if (!manualRestart) process.exit(0); }); } diff --git a/src/common/libs/bufferToBase64.ts b/src/common/libs/bufferToBase64.ts index 62db5d49..312ead6a 100644 --- a/src/common/libs/bufferToBase64.ts +++ b/src/common/libs/bufferToBase64.ts @@ -2,5 +2,5 @@ export function bufferToBase64 (buf: Buffer) { const binstr = Array.prototype.map.call(buf, ch => { return String.fromCharCode(ch); }).join(''); - return Buffer.from(binstr, 'base64'); + return Buffer.from(binstr, 'binary').toString('base64'); } diff --git a/src/renderer/components/BaseTextEditor.vue b/src/renderer/components/BaseTextEditor.vue index d11ac390..5764536a 100644 --- a/src/renderer/components/BaseTextEditor.vue +++ b/src/renderer/components/BaseTextEditor.vue @@ -99,7 +99,7 @@ onMounted(() => { enableLiveAutocompletion: false }); - editor.session.on('changeFold', () => { + (editor.session as unknown as ace.Ace.Editor).on('change', () => { const content = editor.getValue(); emit('update:modelValue', content); }); diff --git a/src/renderer/components/FakerSelect.vue b/src/renderer/components/FakerSelect.vue index b5714ec8..e4b709ac 100644 --- a/src/renderer/components/FakerSelect.vue +++ b/src/renderer/components/FakerSelect.vue @@ -104,151 +104,148 @@ - diff --git a/src/renderer/components/ModalFakerRows.vue b/src/renderer/components/ModalFakerRows.vue index 4552c6e4..e3aac3cc 100644 --- a/src/renderer/components/ModalFakerRows.vue +++ b/src/renderer/components/ModalFakerRows.vue @@ -271,7 +271,7 @@ export default { else if ([...TIME, ...DATE].includes(field.type)) fieldDefault = field.default; else if (BIT.includes(field.type)) - fieldDefault = field.default.replaceAll('\'', '').replaceAll('b', ''); + fieldDefault = field.default?.replaceAll('\'', '').replaceAll('b', ''); else if (DATETIME.includes(field.type)) { if (field.default && ['current_timestamp', 'now()'].some(term => field.default.toLowerCase().includes(term))) { let datePrecision = ''; diff --git a/src/renderer/components/TheFooter.vue b/src/renderer/components/TheFooter.vue index 4a904038..0401d723 100644 --- a/src/renderer/components/TheFooter.vue +++ b/src/renderer/components/TheFooter.vue @@ -26,46 +26,39 @@ -