From 3900c3e1ad80a582c182c769225657c3d7c388dc Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Mon, 27 Oct 2025 17:58:21 +0000 Subject: [PATCH 1/4] Add prettier config, stop npm lint formatting, warn if formatting bad --- webapp/.prettierrc.json | 7 +++++++ webapp/package.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 webapp/.prettierrc.json diff --git a/webapp/.prettierrc.json b/webapp/.prettierrc.json new file mode 100644 index 00000000..8ff73226 --- /dev/null +++ b/webapp/.prettierrc.json @@ -0,0 +1,7 @@ +{ + "trailingComma": "all", + "semi": true, + "singleQuote": false, + "printWidth": 100, + "tabWidth": 2 +} \ No newline at end of file diff --git a/webapp/package.json b/webapp/package.json index d49b048f..9fd7749d 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -8,7 +8,7 @@ "gv": "genversion src/version.js", "serve": "npm run gv && vue-cli-service serve --mode development", "build": "npm run gv && vue-cli-service build --openssl-legacy-provider --mode production", - "lint": "vue-cli-service lint", + "lint": "vue-cli-service lint --no-fix --max-warnings 0", "lint:fix": "vue-cli-service lint --fix" }, "dependencies": { From c085d2c0ac26a5497d9dfa0cc3649f7488658788 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Mon, 27 Oct 2025 18:00:00 +0000 Subject: [PATCH 2/4] Run lint:fix and accept a huge formatting change --- webapp/.eslintrc.js | 8 +- webapp/babel.config.js | 2 +- webapp/src/App.vue | 56 ++---- webapp/src/components/appContent.vue | 51 ++---- .../components/fieldComponents/checkList.vue | 14 +- .../components/fieldComponents/htmlBlock.vue | 10 +- .../components/fieldComponents/keyvalList.vue | 31 ++-- .../components/fieldComponents/labelInput.vue | 19 +- .../fieldComponents/numberInput.vue | 12 +- .../components/fieldComponents/radioList.vue | 12 +- .../components/fieldComponents/selectList.vue | 12 +- .../components/fieldComponents/tagList.vue | 14 +- .../components/fieldComponents/textInput.vue | 12 +- .../genericComponents/miniStreamDisplay.vue | 8 +- .../genericComponents/progressBar.vue | 21 +-- .../genericComponents/tabContent.vue | 8 +- .../components/genericComponents/tabIcon.vue | 30 ++-- .../labThingsComponents/actionButton.vue | 162 +++++++++--------- .../labThingsComponents/actionLogDisplay.vue | 55 +++--- .../labThingsComponents/actionProgressBar.vue | 19 +- .../labThingsComponents/endpointButton.vue | 29 ++-- .../labThingsComponents/inputFromSchema.vue | 99 +++++------ .../labThingsComponents/propertyControl.vue | 47 +++-- .../serverSpecifiedActionButton.vue | 9 +- .../serverSpecifiedPropertyControl.vue | 6 +- .../syncPropertyButton.vue | 9 +- webapp/src/components/loadingContent.vue | 12 +- .../modalComponents/calibrationWizard.vue | 29 ++-- .../calibrationWizardTask.vue | 30 ++-- .../camCalibrationExplanation.vue | 2 +- .../cameraMainCalibrationStep.vue | 13 +- .../cameraCalibrationTask.vue | 15 +- .../cameraStageMappingTask.vue | 16 +- .../csmSteps/csmExplanation.vue | 2 +- .../csmSteps/focusStep.vue | 15 +- .../csmSteps/runCsmStep.vue | 6 +- .../calibrationWizardComponents/finalStep.vue | 2 +- .../singleStepTask.vue | 18 +- .../stepTemplateWithStream.vue | 6 +- .../welcomeStep.vue | 6 +- .../aboutComponents/devTools.vue | 26 +-- .../aboutComponents/statusPane.vue | 34 ++-- .../tabContentComponents/aboutContent.vue | 4 +- .../paneBackgroundDetect.vue | 34 ++-- .../backgroundDetectContent.vue | 4 +- .../controlComponents/paneControl.vue | 55 +++--- .../tabContentComponents/controlContent.vue | 4 +- .../tabContentComponents/loggingContent.vue | 48 ++---- .../tabContentComponents/powerContent.vue | 44 ++--- .../openSeadragonViewer.vue | 35 ++-- .../scanListComponents/scanCard.vue | 85 ++++----- .../scanListComponents/scanViewer.vue | 65 ++----- .../tabContentComponents/scanListContent.vue | 43 +++-- .../settingsComponents/CSMSettings.vue | 15 +- .../CSMCalibrationSettings.vue | 74 ++++---- .../settingsComponents/appSettings.vue | 28 +-- .../settingsComponents/cameraSettings.vue | 11 +- .../cameraCalibrationSettings.vue | 18 +- .../settingsComponents/stageSettings.vue | 14 +- .../settingsComponents/streamSettings.vue | 12 +- .../tabContentComponents/settingsContent.vue | 48 ++---- .../tabContentComponents/slideScanContent.vue | 41 ++--- .../tabContentComponents/streamContent.vue | 23 +-- .../tabContentComponents/viewContent.vue | 4 +- webapp/src/main.js | 51 +++--- webapp/src/store.js | 10 +- webapp/src/wot-client.js | 44 ++--- webapp/vue.config.js | 2 +- 68 files changed, 756 insertions(+), 1047 deletions(-) diff --git a/webapp/.eslintrc.js b/webapp/.eslintrc.js index a75de351..395e280b 100644 --- a/webapp/.eslintrc.js +++ b/webapp/.eslintrc.js @@ -2,17 +2,17 @@ module.exports = { root: true, env: { - node: true + node: true, }, parserOptions: { - parser: "babel-eslint" + parser: "babel-eslint", }, rules: { "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", - "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off" + "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", }, - extends: ["plugin:vue/recommended", "eslint:recommended", "@vue/prettier"] + extends: ["plugin:vue/recommended", "eslint:recommended", "@vue/prettier"], }; diff --git a/webapp/babel.config.js b/webapp/babel.config.js index 3ecebf1a..1d248fcf 100644 --- a/webapp/babel.config.js +++ b/webapp/babel.config.js @@ -1,3 +1,3 @@ module.exports = { - presets: ["@vue/app"] + presets: ["@vue/app"], }; diff --git a/webapp/src/App.vue b/webapp/src/App.vue index 169f2889..dde959f6 100644 --- a/webapp/src/App.vue +++ b/webapp/src/App.vue @@ -1,18 +1,9 @@