From 171da12746cbedff65226b7ffab93b468e5c4a72 Mon Sep 17 00:00:00 2001 From: Allan Crisostomo Date: Sun, 9 Aug 2020 12:50:09 +0800 Subject: [PATCH] Improve app appearance Use custom button for closing, improve app window. --- .gitignore | 2 + package.json | 6 +- public/index.html | 46 +++- public/style.css | 23 +- src/App.tsx | 39 ++- src/components/Keyboard/Keyboard.tsx | 27 +- src/components/PedalBoard/PedalBoard.tsx | 5 +- src/electron.ts | 194 ++++++++++++++ src/index.tsx | 15 +- src/react-app-env.d.ts | 2 + src/services/Config.ts | 5 + src/services/getKeyName.ts | 15 ++ src/services/getKeyOctave.ts | 7 + src/services/getNaturalKeyCount.ts | 15 ++ src/services/isNaturalKey.test.ts | 64 +++++ src/services/isNaturalKey.ts | 21 ++ src/services/keyNames.json | 14 + src/services/messages.json | 6 + src/services/messages.ts | 12 + src/services/scaleFactors.json | 4 + src/services/spans.json | 34 +++ src/shell/electron.ts | 161 ------------ yarn.lock | 319 +++-------------------- 23 files changed, 541 insertions(+), 495 deletions(-) create mode 100644 src/electron.ts create mode 100644 src/services/Config.ts create mode 100644 src/services/getKeyName.ts create mode 100644 src/services/getKeyOctave.ts create mode 100644 src/services/getNaturalKeyCount.ts create mode 100644 src/services/isNaturalKey.test.ts create mode 100644 src/services/isNaturalKey.ts create mode 100644 src/services/keyNames.json create mode 100644 src/services/messages.json create mode 100644 src/services/messages.ts create mode 100644 src/services/scaleFactors.json create mode 100644 src/services/spans.json delete mode 100644 src/shell/electron.ts diff --git a/.gitignore b/.gitignore index 9de0ec3..0e71b52 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,5 @@ dist .pnp.* build public/electron.js +public/services +config.json diff --git a/package.json b/package.json index 2a20294..af65278 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "description": "Simple monitor for displaying MIDI status for digital pianos.", "author": "TheoryOfNekomata (https://modal.sh)", "version": "0.1.0", + "main": "public/electron.js", "private": true, "license": "MIT", "dependencies": { @@ -11,7 +12,6 @@ "@testing-library/user-event": "^7.1.2", "@theoryofnekomata/react-musical-keyboard": "1.0.4", "@types/jest": "^24.0.0", - "@types/node": "^12.0.0", "@types/react": "^16.9.0", "@types/react-dom": "^16.9.0", "electron-is-dev": "^1.2.0", @@ -25,7 +25,7 @@ "postinstall": "electron-builder install-app-deps", "start": "concurrently \"BROWSER=none react-scripts start\" \"wait-on http://localhost:3000 && electron .\"", "test": "react-scripts test", - "compile": "tsc src/shell/electron.ts --outDir public/", + "compile": "tsc src/electron.ts --resolveJsonModule --esModuleInterop --outDir public/", "rebuild": "electron-rebuild -f -w midi", "prebuild": "react-scripts build", "build": "electron-builder" @@ -46,9 +46,11 @@ ] }, "devDependencies": { + "@types/node": "12", "concurrently": "^5.3.0", "electron": "^9.2.0", "electron-builder": "^22.8.0", + "fast-check": "^2.1.0", "wait-on": "^5.1.0" }, "build": { diff --git a/public/index.html b/public/index.html index 71307a2..4fb02c4 100644 --- a/public/index.html +++ b/public/index.html @@ -1,5 +1,5 @@ - + @@ -28,8 +28,46 @@ Piano MIDI Monitor + -