From 13f7252dd761e0767a7d32ae732d2cd172677dc8 Mon Sep 17 00:00:00 2001 From: Kaspar Emanuel Date: Tue, 17 Aug 2021 11:09:22 +0100 Subject: [PATCH 1/7] Move Vue app to a js directory --- .../api/static => js}/.env.development | 0 .../api/static => js}/.env.production | 0 .../api/static => js}/.eslintrc.js | 0 .../api/static => js}/.gitignore | 0 .../api/static => js}/CONTRIBUTING.md | 0 {openflexure_microscope/api/static => js}/LICENSE | 0 {openflexure_microscope/api/static => js}/README.md | 0 .../api/static => js}/babel.config.js | 0 .../api/static => js}/package-lock.json | 0 .../api/static => js}/package.json | 0 .../static => js}/public/ListServices.imjoy.html | 0 .../public/OpenFlexureScriptEditor.imjoy.html | 0 .../public/OpenFlexureSnapImageTemplate.imjoy.html | 0 .../public/OpenFlexureTestMoveStage.imjoy.html | 0 .../api/static => js}/public/favicon-16x16.png | Bin .../api/static => js}/public/favicon-32x32.png | Bin .../api/static => js}/public/favicon.ico | Bin .../api/static => js}/public/index.html | 0 .../api/static => js}/public/titleicon.svg | 0 .../api/static => js}/src/App.vue | 0 .../static => js}/src/assets/less/highlight.less | 0 .../api/static => js}/src/assets/less/theme.less | 0 .../api/static => js}/src/components/appContent.vue | 0 .../src/components/fieldComponents/checkList.vue | 0 .../src/components/fieldComponents/htmlBlock.vue | 0 .../src/components/fieldComponents/keyvalList.vue | 0 .../src/components/fieldComponents/labelInput.vue | 0 .../src/components/fieldComponents/numberInput.vue | 0 .../src/components/fieldComponents/radioList.vue | 0 .../src/components/fieldComponents/selectList.vue | 0 .../src/components/fieldComponents/tagList.vue | 0 .../src/components/fieldComponents/textInput.vue | 0 .../genericComponents/miniStreamDisplay.vue | 0 .../components/genericComponents/progressBar.vue | 0 .../src/components/genericComponents/tabContent.vue | 0 .../src/components/genericComponents/tabIcon.vue | 0 .../components/genericComponents/taskSubmitter.vue | 0 .../static => js}/src/components/loadingContent.vue | 0 .../components/modalComponents/calibrationModal.vue | 0 .../src/components/pluginComponents/JsonForm.vue | 0 .../aboutComponents/devTools.vue | 0 .../aboutComponents/statusPane.vue | 0 .../tabContentComponents/aboutContent.vue | 0 .../captureComponents/paneCapture.vue | 0 .../tabContentComponents/captureContent.vue | 0 .../tabContentComponents/extensionContent.vue | 0 .../galleryComponents/captureCard.vue | 0 .../galleryComponents/scanCard.vue | 0 .../galleryComponents/zipDownloader.vue | 0 .../tabContentComponents/galleryContent.vue | 0 .../imjoyComponents/imjoyPluginCard.vue | 0 .../tabContentComponents/imjoyContent.vue | 0 .../tabContentComponents/loggingContent.vue | 0 .../navigateComponents/paneNavigate.vue | 0 .../tabContentComponents/navigateContent.vue | 0 .../settingsComponents/CSMSettings.vue | 0 .../CSMCalibrationSettings.vue | 0 .../settingsComponents/appSettings.vue | 0 .../settingsComponents/cameraSettings.vue | 0 .../cameraCalibrationSettings.vue | 0 .../settingsComponents/featuresSettings.vue | 0 .../settingsComponents/microscopeSettings.vue | 0 .../settingsComponents/stageSettings.vue | 0 .../settingsComponents/streamSettings.vue | 0 .../tabContentComponents/settingsContent.vue | 0 .../slideScanComponents/paneSlideScan.vue | 0 .../tabContentComponents/slideScanContent.vue | 0 .../tabContentComponents/streamContent.vue | 0 .../components/tabContentComponents/viewContent.vue | 0 .../api/static => js}/src/main.js | 0 .../api/static => js}/src/store.js | 0 .../static => js}/src/syncDataWithLocalStorage.js | 0 72 files changed, 0 insertions(+), 0 deletions(-) rename {openflexure_microscope/api/static => js}/.env.development (100%) rename {openflexure_microscope/api/static => js}/.env.production (100%) rename {openflexure_microscope/api/static => js}/.eslintrc.js (100%) rename {openflexure_microscope/api/static => js}/.gitignore (100%) rename {openflexure_microscope/api/static => js}/CONTRIBUTING.md (100%) rename {openflexure_microscope/api/static => js}/LICENSE (100%) rename {openflexure_microscope/api/static => js}/README.md (100%) rename {openflexure_microscope/api/static => js}/babel.config.js (100%) rename {openflexure_microscope/api/static => js}/package-lock.json (100%) rename {openflexure_microscope/api/static => js}/package.json (100%) rename {openflexure_microscope/api/static => js}/public/ListServices.imjoy.html (100%) rename {openflexure_microscope/api/static => js}/public/OpenFlexureScriptEditor.imjoy.html (100%) rename {openflexure_microscope/api/static => js}/public/OpenFlexureSnapImageTemplate.imjoy.html (100%) rename {openflexure_microscope/api/static => js}/public/OpenFlexureTestMoveStage.imjoy.html (100%) rename {openflexure_microscope/api/static => js}/public/favicon-16x16.png (100%) rename {openflexure_microscope/api/static => js}/public/favicon-32x32.png (100%) rename {openflexure_microscope/api/static => js}/public/favicon.ico (100%) rename {openflexure_microscope/api/static => js}/public/index.html (100%) rename {openflexure_microscope/api/static => js}/public/titleicon.svg (100%) rename {openflexure_microscope/api/static => js}/src/App.vue (100%) rename {openflexure_microscope/api/static => js}/src/assets/less/highlight.less (100%) rename {openflexure_microscope/api/static => js}/src/assets/less/theme.less (100%) rename {openflexure_microscope/api/static => js}/src/components/appContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/checkList.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/htmlBlock.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/keyvalList.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/labelInput.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/numberInput.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/radioList.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/selectList.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/tagList.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/fieldComponents/textInput.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/genericComponents/miniStreamDisplay.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/genericComponents/progressBar.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/genericComponents/tabContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/genericComponents/tabIcon.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/genericComponents/taskSubmitter.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/loadingContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/modalComponents/calibrationModal.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/pluginComponents/JsonForm.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/aboutComponents/devTools.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/aboutComponents/statusPane.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/aboutContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/captureComponents/paneCapture.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/captureContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/extensionContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/galleryComponents/captureCard.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/galleryComponents/scanCard.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/galleryComponents/zipDownloader.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/galleryContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/imjoyContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/loggingContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/navigateComponents/paneNavigate.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/navigateContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/CSMSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/appSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/cameraSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/featuresSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/stageSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsComponents/streamSettings.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/settingsContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/slideScanContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/streamContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/components/tabContentComponents/viewContent.vue (100%) rename {openflexure_microscope/api/static => js}/src/main.js (100%) rename {openflexure_microscope/api/static => js}/src/store.js (100%) rename {openflexure_microscope/api/static => js}/src/syncDataWithLocalStorage.js (100%) diff --git a/openflexure_microscope/api/static/.env.development b/js/.env.development similarity index 100% rename from openflexure_microscope/api/static/.env.development rename to js/.env.development diff --git a/openflexure_microscope/api/static/.env.production b/js/.env.production similarity index 100% rename from openflexure_microscope/api/static/.env.production rename to js/.env.production diff --git a/openflexure_microscope/api/static/.eslintrc.js b/js/.eslintrc.js similarity index 100% rename from openflexure_microscope/api/static/.eslintrc.js rename to js/.eslintrc.js diff --git a/openflexure_microscope/api/static/.gitignore b/js/.gitignore similarity index 100% rename from openflexure_microscope/api/static/.gitignore rename to js/.gitignore diff --git a/openflexure_microscope/api/static/CONTRIBUTING.md b/js/CONTRIBUTING.md similarity index 100% rename from openflexure_microscope/api/static/CONTRIBUTING.md rename to js/CONTRIBUTING.md diff --git a/openflexure_microscope/api/static/LICENSE b/js/LICENSE similarity index 100% rename from openflexure_microscope/api/static/LICENSE rename to js/LICENSE diff --git a/openflexure_microscope/api/static/README.md b/js/README.md similarity index 100% rename from openflexure_microscope/api/static/README.md rename to js/README.md diff --git a/openflexure_microscope/api/static/babel.config.js b/js/babel.config.js similarity index 100% rename from openflexure_microscope/api/static/babel.config.js rename to js/babel.config.js diff --git a/openflexure_microscope/api/static/package-lock.json b/js/package-lock.json similarity index 100% rename from openflexure_microscope/api/static/package-lock.json rename to js/package-lock.json diff --git a/openflexure_microscope/api/static/package.json b/js/package.json similarity index 100% rename from openflexure_microscope/api/static/package.json rename to js/package.json diff --git a/openflexure_microscope/api/static/public/ListServices.imjoy.html b/js/public/ListServices.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/ListServices.imjoy.html rename to js/public/ListServices.imjoy.html diff --git a/openflexure_microscope/api/static/public/OpenFlexureScriptEditor.imjoy.html b/js/public/OpenFlexureScriptEditor.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/OpenFlexureScriptEditor.imjoy.html rename to js/public/OpenFlexureScriptEditor.imjoy.html diff --git a/openflexure_microscope/api/static/public/OpenFlexureSnapImageTemplate.imjoy.html b/js/public/OpenFlexureSnapImageTemplate.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/OpenFlexureSnapImageTemplate.imjoy.html rename to js/public/OpenFlexureSnapImageTemplate.imjoy.html diff --git a/openflexure_microscope/api/static/public/OpenFlexureTestMoveStage.imjoy.html b/js/public/OpenFlexureTestMoveStage.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/OpenFlexureTestMoveStage.imjoy.html rename to js/public/OpenFlexureTestMoveStage.imjoy.html diff --git a/openflexure_microscope/api/static/public/favicon-16x16.png b/js/public/favicon-16x16.png similarity index 100% rename from openflexure_microscope/api/static/public/favicon-16x16.png rename to js/public/favicon-16x16.png diff --git a/openflexure_microscope/api/static/public/favicon-32x32.png b/js/public/favicon-32x32.png similarity index 100% rename from openflexure_microscope/api/static/public/favicon-32x32.png rename to js/public/favicon-32x32.png diff --git a/openflexure_microscope/api/static/public/favicon.ico b/js/public/favicon.ico similarity index 100% rename from openflexure_microscope/api/static/public/favicon.ico rename to js/public/favicon.ico diff --git a/openflexure_microscope/api/static/public/index.html b/js/public/index.html similarity index 100% rename from openflexure_microscope/api/static/public/index.html rename to js/public/index.html diff --git a/openflexure_microscope/api/static/public/titleicon.svg b/js/public/titleicon.svg similarity index 100% rename from openflexure_microscope/api/static/public/titleicon.svg rename to js/public/titleicon.svg diff --git a/openflexure_microscope/api/static/src/App.vue b/js/src/App.vue similarity index 100% rename from openflexure_microscope/api/static/src/App.vue rename to js/src/App.vue diff --git a/openflexure_microscope/api/static/src/assets/less/highlight.less b/js/src/assets/less/highlight.less similarity index 100% rename from openflexure_microscope/api/static/src/assets/less/highlight.less rename to js/src/assets/less/highlight.less diff --git a/openflexure_microscope/api/static/src/assets/less/theme.less b/js/src/assets/less/theme.less similarity index 100% rename from openflexure_microscope/api/static/src/assets/less/theme.less rename to js/src/assets/less/theme.less diff --git a/openflexure_microscope/api/static/src/components/appContent.vue b/js/src/components/appContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/appContent.vue rename to js/src/components/appContent.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/checkList.vue b/js/src/components/fieldComponents/checkList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/checkList.vue rename to js/src/components/fieldComponents/checkList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/htmlBlock.vue b/js/src/components/fieldComponents/htmlBlock.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/htmlBlock.vue rename to js/src/components/fieldComponents/htmlBlock.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/keyvalList.vue b/js/src/components/fieldComponents/keyvalList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/keyvalList.vue rename to js/src/components/fieldComponents/keyvalList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/labelInput.vue b/js/src/components/fieldComponents/labelInput.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/labelInput.vue rename to js/src/components/fieldComponents/labelInput.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/numberInput.vue b/js/src/components/fieldComponents/numberInput.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/numberInput.vue rename to js/src/components/fieldComponents/numberInput.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/radioList.vue b/js/src/components/fieldComponents/radioList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/radioList.vue rename to js/src/components/fieldComponents/radioList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/selectList.vue b/js/src/components/fieldComponents/selectList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/selectList.vue rename to js/src/components/fieldComponents/selectList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/tagList.vue b/js/src/components/fieldComponents/tagList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/tagList.vue rename to js/src/components/fieldComponents/tagList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/textInput.vue b/js/src/components/fieldComponents/textInput.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/textInput.vue rename to js/src/components/fieldComponents/textInput.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/miniStreamDisplay.vue b/js/src/components/genericComponents/miniStreamDisplay.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/miniStreamDisplay.vue rename to js/src/components/genericComponents/miniStreamDisplay.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/progressBar.vue b/js/src/components/genericComponents/progressBar.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/progressBar.vue rename to js/src/components/genericComponents/progressBar.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/tabContent.vue b/js/src/components/genericComponents/tabContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/tabContent.vue rename to js/src/components/genericComponents/tabContent.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/tabIcon.vue b/js/src/components/genericComponents/tabIcon.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/tabIcon.vue rename to js/src/components/genericComponents/tabIcon.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue b/js/src/components/genericComponents/taskSubmitter.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue rename to js/src/components/genericComponents/taskSubmitter.vue diff --git a/openflexure_microscope/api/static/src/components/loadingContent.vue b/js/src/components/loadingContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/loadingContent.vue rename to js/src/components/loadingContent.vue diff --git a/openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue b/js/src/components/modalComponents/calibrationModal.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue rename to js/src/components/modalComponents/calibrationModal.vue diff --git a/openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue b/js/src/components/pluginComponents/JsonForm.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue rename to js/src/components/pluginComponents/JsonForm.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/devTools.vue b/js/src/components/tabContentComponents/aboutComponents/devTools.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/devTools.vue rename to js/src/components/tabContentComponents/aboutComponents/devTools.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/statusPane.vue b/js/src/components/tabContentComponents/aboutComponents/statusPane.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/statusPane.vue rename to js/src/components/tabContentComponents/aboutComponents/statusPane.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/aboutContent.vue b/js/src/components/tabContentComponents/aboutContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/aboutContent.vue rename to js/src/components/tabContentComponents/aboutContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue b/js/src/components/tabContentComponents/captureComponents/paneCapture.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue rename to js/src/components/tabContentComponents/captureComponents/paneCapture.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/captureContent.vue b/js/src/components/tabContentComponents/captureContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/captureContent.vue rename to js/src/components/tabContentComponents/captureContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/extensionContent.vue b/js/src/components/tabContentComponents/extensionContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/extensionContent.vue rename to js/src/components/tabContentComponents/extensionContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/captureCard.vue b/js/src/components/tabContentComponents/galleryComponents/captureCard.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/captureCard.vue rename to js/src/components/tabContentComponents/galleryComponents/captureCard.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/scanCard.vue b/js/src/components/tabContentComponents/galleryComponents/scanCard.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/scanCard.vue rename to js/src/components/tabContentComponents/galleryComponents/scanCard.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/zipDownloader.vue b/js/src/components/tabContentComponents/galleryComponents/zipDownloader.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/zipDownloader.vue rename to js/src/components/tabContentComponents/galleryComponents/zipDownloader.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryContent.vue b/js/src/components/tabContentComponents/galleryContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryContent.vue rename to js/src/components/tabContentComponents/galleryContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue b/js/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue rename to js/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/imjoyContent.vue b/js/src/components/tabContentComponents/imjoyContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/imjoyContent.vue rename to js/src/components/tabContentComponents/imjoyContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/loggingContent.vue b/js/src/components/tabContentComponents/loggingContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/loggingContent.vue rename to js/src/components/tabContentComponents/loggingContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/navigateComponents/paneNavigate.vue b/js/src/components/tabContentComponents/navigateComponents/paneNavigate.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/navigateComponents/paneNavigate.vue rename to js/src/components/tabContentComponents/navigateComponents/paneNavigate.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/navigateContent.vue b/js/src/components/tabContentComponents/navigateContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/navigateContent.vue rename to js/src/components/tabContentComponents/navigateContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettings.vue b/js/src/components/tabContentComponents/settingsComponents/CSMSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/CSMSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/js/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/appSettings.vue b/js/src/components/tabContentComponents/settingsComponents/appSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/appSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/appSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/js/src/components/tabContentComponents/settingsComponents/cameraSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/cameraSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue b/js/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue b/js/src/components/tabContentComponents/settingsComponents/featuresSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/featuresSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue b/js/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/stageSettings.vue b/js/src/components/tabContentComponents/settingsComponents/stageSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/stageSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/stageSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/streamSettings.vue b/js/src/components/tabContentComponents/settingsComponents/streamSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/streamSettings.vue rename to js/src/components/tabContentComponents/settingsComponents/streamSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsContent.vue b/js/src/components/tabContentComponents/settingsContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsContent.vue rename to js/src/components/tabContentComponents/settingsContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue b/js/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue rename to js/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue b/js/src/components/tabContentComponents/slideScanContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue rename to js/src/components/tabContentComponents/slideScanContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/streamContent.vue b/js/src/components/tabContentComponents/streamContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/streamContent.vue rename to js/src/components/tabContentComponents/streamContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/viewContent.vue b/js/src/components/tabContentComponents/viewContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/viewContent.vue rename to js/src/components/tabContentComponents/viewContent.vue diff --git a/openflexure_microscope/api/static/src/main.js b/js/src/main.js similarity index 100% rename from openflexure_microscope/api/static/src/main.js rename to js/src/main.js diff --git a/openflexure_microscope/api/static/src/store.js b/js/src/store.js similarity index 100% rename from openflexure_microscope/api/static/src/store.js rename to js/src/store.js diff --git a/openflexure_microscope/api/static/src/syncDataWithLocalStorage.js b/js/src/syncDataWithLocalStorage.js similarity index 100% rename from openflexure_microscope/api/static/src/syncDataWithLocalStorage.js rename to js/src/syncDataWithLocalStorage.js From dd0b8b9a8b73a30c618d837077cb5f53f81732d5 Mon Sep 17 00:00:00 2001 From: Kaspar Emanuel Date: Tue, 17 Aug 2021 11:13:59 +0100 Subject: [PATCH 2/7] Change static folder to js folder in gitlab-ci --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4a720c5..61355464 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,7 +9,7 @@ stages: .python-install-template: &python-install before_script: - python3 -m venv .venv # NB this does not overwrite an existing cached venv - - source .venv/bin/activate + - source .venv/bin/activate - pip install pipenv # Should be cached after first run - pipenv install --dev --deploy # Should be cached after first run - will just check packages are present cache: @@ -21,12 +21,12 @@ stages: # Re-usable block to install (and cache) openflexure-microscope-server static app .node-install-template: &node-install before_script: - - cd openflexure_microscope/api/static/ + - cd js/ - npm install cache: key: "${CI_COMMIT_REF_SLUG}" paths: - - openflexure_microscope/api/static/node_modules + - js/node_modules # Python static analysis with PyLint pylint: @@ -162,7 +162,7 @@ build: name: "dist" expire_in: 1 week paths: - - "./openflexure_microscope/api/static/dist/" + - "js/" only: - master From caa6284e7d32fdbc5199de04ed310a039a827ede Mon Sep 17 00:00:00 2001 From: Kaspar Emanuel Date: Tue, 17 Aug 2021 11:17:26 +0100 Subject: [PATCH 3/7] Add missing vue-config --- js/vue.config.js | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 js/vue.config.js diff --git a/js/vue.config.js b/js/vue.config.js new file mode 100644 index 00000000..87a775fa --- /dev/null +++ b/js/vue.config.js @@ -0,0 +1,3 @@ +module.exports = { + outputDir: '../openflexure_microscope/api/static/dist', +}; From c835bf3b7e8ef43b54bfc66dbd5c6527bae3ef4f Mon Sep 17 00:00:00 2001 From: Kaspar Emanuel Date: Tue, 17 Aug 2021 11:29:18 +0100 Subject: [PATCH 4/7] Update readme with new js directory --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index ba15fa86..9fa81d15 100644 --- a/README.md +++ b/README.md @@ -83,10 +83,10 @@ To set up a development version of the software (most likely using emulated came * `curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -` * `sudo apt install nodejs` * To build the web application (this produces a set of static files, that are served by the Flask webserver) - * `cd openflexure_microscope/api/static` + * `cd js` * `npm install` * `npm run build` -* To create a Node.js development server (this will help various development tools to display more information, and auto-rebuilds when you change the source files) +* To create a Node.js development server (this will help various development tools to display more information, and auto-rebuilds when you change the source files) * `npm run serve` * You access the development server on a different port (it's printed on the command line when you run the above command). This means that when it starts up you will need to tell it where the microscope server is, using the "override API origin" field in the page that pops up. If you are running a test server on your computer, this is most likely `http://localhost:5000/`. @@ -97,25 +97,25 @@ All of the commands below assume that you are running in the OFM virtual environ * To auto-format the Python code run `poe format` * To auto-format the Javascript code, run - * `cd openflexure_microscope/api/static` + * `cd js` * `npm run lint` **Before submitting a merge request/merging** please auto-format your code and also run the quality checks (linting, static analysis, and unit tests) * To auto-format and type-check the Python code run `poe check` * To auto-format the Javascript code, run - * `cd openflexure_microscope/api/static` + * `cd js` * `npm run lint` ### Details -We use several code analysis and formatting libraries in this project. **Please run all of these before submitting a merge request.** +We use several code analysis and formatting libraries in this project. **Please run all of these before submitting a merge request.** Our CI will check each of these automatically, so ensuring they pass locally will save you time. * **Black** - Code formatting with minimal configuration. - * While sometimes it's not perfect, its fine 90% of the time and prevents arguments about formatting. + * While sometimes it's not perfect, its fine 90% of the time and prevents arguments about formatting. * Automatically formats your code * This will rewrite your files in-place, so if you want to be able to revert, make a backup first! * `poe black` From a42e94ce6670ba0fe4e7debab04364fcb90868d4 Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 10 Aug 2021 11:16:08 +0100 Subject: [PATCH 5/7] Fix JS build artifact The JS build step was reporting the JS source folder as an artifact. I've updated it to use the output folder instead. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61355464..532cf68b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,7 @@ build: name: "dist" expire_in: 1 week paths: - - "js/" + - "openflexure_microscope/static/dist/" only: - master From 375bcf4e733a15e366997832c2c8bbc7ea512a22 Mon Sep 17 00:00:00 2001 From: Richard Date: Tue, 10 Aug 2021 12:18:24 +0100 Subject: [PATCH 6/7] fix typo in artifact path --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 532cf68b..a2ccca0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,7 +162,7 @@ build: name: "dist" expire_in: 1 week paths: - - "openflexure_microscope/static/dist/" + - "openflexure_microscope/api/static/dist/" only: - master From b2eb1e0f057682fd28c40b5872ddbda3c5f602c6 Mon Sep 17 00:00:00 2001 From: Kaspar Emanuel Date: Tue, 17 Aug 2021 16:14:23 +0100 Subject: [PATCH 7/7] Rename js directory to webapp --- .gitlab-ci.yml | 4 ++-- README.md | 6 +++--- {js => webapp}/.env.development | 0 {js => webapp}/.env.production | 0 {js => webapp}/.eslintrc.js | 0 {js => webapp}/.gitignore | 0 {js => webapp}/CONTRIBUTING.md | 0 {js => webapp}/LICENSE | 0 {js => webapp}/README.md | 0 {js => webapp}/babel.config.js | 0 {js => webapp}/package-lock.json | 0 {js => webapp}/package.json | 0 {js => webapp}/public/ListServices.imjoy.html | 0 .../public/OpenFlexureScriptEditor.imjoy.html | 0 .../public/OpenFlexureSnapImageTemplate.imjoy.html | 0 .../public/OpenFlexureTestMoveStage.imjoy.html | 0 {js => webapp}/public/favicon-16x16.png | Bin {js => webapp}/public/favicon-32x32.png | Bin {js => webapp}/public/favicon.ico | Bin {js => webapp}/public/index.html | 0 {js => webapp}/public/titleicon.svg | 0 {js => webapp}/src/App.vue | 0 {js => webapp}/src/assets/less/highlight.less | 0 {js => webapp}/src/assets/less/theme.less | 0 {js => webapp}/src/components/appContent.vue | 0 .../src/components/fieldComponents/checkList.vue | 0 .../src/components/fieldComponents/htmlBlock.vue | 0 .../src/components/fieldComponents/keyvalList.vue | 0 .../src/components/fieldComponents/labelInput.vue | 0 .../src/components/fieldComponents/numberInput.vue | 0 .../src/components/fieldComponents/radioList.vue | 0 .../src/components/fieldComponents/selectList.vue | 0 .../src/components/fieldComponents/tagList.vue | 0 .../src/components/fieldComponents/textInput.vue | 0 .../genericComponents/miniStreamDisplay.vue | 0 .../components/genericComponents/progressBar.vue | 0 .../src/components/genericComponents/tabContent.vue | 0 .../src/components/genericComponents/tabIcon.vue | 0 .../components/genericComponents/taskSubmitter.vue | 0 {js => webapp}/src/components/loadingContent.vue | 0 .../components/modalComponents/calibrationModal.vue | 0 .../src/components/pluginComponents/JsonForm.vue | 0 .../aboutComponents/devTools.vue | 0 .../aboutComponents/statusPane.vue | 0 .../tabContentComponents/aboutContent.vue | 0 .../captureComponents/paneCapture.vue | 0 .../tabContentComponents/captureContent.vue | 0 .../tabContentComponents/extensionContent.vue | 0 .../galleryComponents/captureCard.vue | 0 .../galleryComponents/scanCard.vue | 0 .../galleryComponents/zipDownloader.vue | 0 .../tabContentComponents/galleryContent.vue | 0 .../imjoyComponents/imjoyPluginCard.vue | 0 .../tabContentComponents/imjoyContent.vue | 0 .../tabContentComponents/loggingContent.vue | 0 .../navigateComponents/paneNavigate.vue | 0 .../tabContentComponents/navigateContent.vue | 0 .../settingsComponents/CSMSettings.vue | 0 .../CSMCalibrationSettings.vue | 0 .../settingsComponents/appSettings.vue | 0 .../settingsComponents/cameraSettings.vue | 0 .../cameraCalibrationSettings.vue | 0 .../settingsComponents/featuresSettings.vue | 0 .../settingsComponents/microscopeSettings.vue | 0 .../settingsComponents/stageSettings.vue | 0 .../settingsComponents/streamSettings.vue | 0 .../tabContentComponents/settingsContent.vue | 0 .../slideScanComponents/paneSlideScan.vue | 0 .../tabContentComponents/slideScanContent.vue | 0 .../tabContentComponents/streamContent.vue | 0 .../components/tabContentComponents/viewContent.vue | 0 {js => webapp}/src/main.js | 0 {js => webapp}/src/store.js | 0 {js => webapp}/src/syncDataWithLocalStorage.js | 0 {js => webapp}/vue.config.js | 0 75 files changed, 5 insertions(+), 5 deletions(-) rename {js => webapp}/.env.development (100%) rename {js => webapp}/.env.production (100%) rename {js => webapp}/.eslintrc.js (100%) rename {js => webapp}/.gitignore (100%) rename {js => webapp}/CONTRIBUTING.md (100%) rename {js => webapp}/LICENSE (100%) rename {js => webapp}/README.md (100%) rename {js => webapp}/babel.config.js (100%) rename {js => webapp}/package-lock.json (100%) rename {js => webapp}/package.json (100%) rename {js => webapp}/public/ListServices.imjoy.html (100%) rename {js => webapp}/public/OpenFlexureScriptEditor.imjoy.html (100%) rename {js => webapp}/public/OpenFlexureSnapImageTemplate.imjoy.html (100%) rename {js => webapp}/public/OpenFlexureTestMoveStage.imjoy.html (100%) rename {js => webapp}/public/favicon-16x16.png (100%) rename {js => webapp}/public/favicon-32x32.png (100%) rename {js => webapp}/public/favicon.ico (100%) rename {js => webapp}/public/index.html (100%) rename {js => webapp}/public/titleicon.svg (100%) rename {js => webapp}/src/App.vue (100%) rename {js => webapp}/src/assets/less/highlight.less (100%) rename {js => webapp}/src/assets/less/theme.less (100%) rename {js => webapp}/src/components/appContent.vue (100%) rename {js => webapp}/src/components/fieldComponents/checkList.vue (100%) rename {js => webapp}/src/components/fieldComponents/htmlBlock.vue (100%) rename {js => webapp}/src/components/fieldComponents/keyvalList.vue (100%) rename {js => webapp}/src/components/fieldComponents/labelInput.vue (100%) rename {js => webapp}/src/components/fieldComponents/numberInput.vue (100%) rename {js => webapp}/src/components/fieldComponents/radioList.vue (100%) rename {js => webapp}/src/components/fieldComponents/selectList.vue (100%) rename {js => webapp}/src/components/fieldComponents/tagList.vue (100%) rename {js => webapp}/src/components/fieldComponents/textInput.vue (100%) rename {js => webapp}/src/components/genericComponents/miniStreamDisplay.vue (100%) rename {js => webapp}/src/components/genericComponents/progressBar.vue (100%) rename {js => webapp}/src/components/genericComponents/tabContent.vue (100%) rename {js => webapp}/src/components/genericComponents/tabIcon.vue (100%) rename {js => webapp}/src/components/genericComponents/taskSubmitter.vue (100%) rename {js => webapp}/src/components/loadingContent.vue (100%) rename {js => webapp}/src/components/modalComponents/calibrationModal.vue (100%) rename {js => webapp}/src/components/pluginComponents/JsonForm.vue (100%) rename {js => webapp}/src/components/tabContentComponents/aboutComponents/devTools.vue (100%) rename {js => webapp}/src/components/tabContentComponents/aboutComponents/statusPane.vue (100%) rename {js => webapp}/src/components/tabContentComponents/aboutContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/captureComponents/paneCapture.vue (100%) rename {js => webapp}/src/components/tabContentComponents/captureContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/extensionContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/galleryComponents/captureCard.vue (100%) rename {js => webapp}/src/components/tabContentComponents/galleryComponents/scanCard.vue (100%) rename {js => webapp}/src/components/tabContentComponents/galleryComponents/zipDownloader.vue (100%) rename {js => webapp}/src/components/tabContentComponents/galleryContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue (100%) rename {js => webapp}/src/components/tabContentComponents/imjoyContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/loggingContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/navigateComponents/paneNavigate.vue (100%) rename {js => webapp}/src/components/tabContentComponents/navigateContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/CSMSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/appSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/cameraSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/featuresSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/stageSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsComponents/streamSettings.vue (100%) rename {js => webapp}/src/components/tabContentComponents/settingsContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue (100%) rename {js => webapp}/src/components/tabContentComponents/slideScanContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/streamContent.vue (100%) rename {js => webapp}/src/components/tabContentComponents/viewContent.vue (100%) rename {js => webapp}/src/main.js (100%) rename {js => webapp}/src/store.js (100%) rename {js => webapp}/src/syncDataWithLocalStorage.js (100%) rename {js => webapp}/vue.config.js (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2ccca0a..eb3fec24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,12 +21,12 @@ stages: # Re-usable block to install (and cache) openflexure-microscope-server static app .node-install-template: &node-install before_script: - - cd js/ + - cd webapp - npm install cache: key: "${CI_COMMIT_REF_SLUG}" paths: - - js/node_modules + - webapp/node_modules # Python static analysis with PyLint pylint: diff --git a/README.md b/README.md index 9fa81d15..9800b7f6 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ To set up a development version of the software (most likely using emulated came * `curl -sL https://deb.nodesource.com/setup_14.x | sudo bash -` * `sudo apt install nodejs` * To build the web application (this produces a set of static files, that are served by the Flask webserver) - * `cd js` + * `cd webapp` * `npm install` * `npm run build` * To create a Node.js development server (this will help various development tools to display more information, and auto-rebuilds when you change the source files) @@ -97,14 +97,14 @@ All of the commands below assume that you are running in the OFM virtual environ * To auto-format the Python code run `poe format` * To auto-format the Javascript code, run - * `cd js` + * `cd webapp` * `npm run lint` **Before submitting a merge request/merging** please auto-format your code and also run the quality checks (linting, static analysis, and unit tests) * To auto-format and type-check the Python code run `poe check` * To auto-format the Javascript code, run - * `cd js` + * `cd webapp` * `npm run lint` diff --git a/js/.env.development b/webapp/.env.development similarity index 100% rename from js/.env.development rename to webapp/.env.development diff --git a/js/.env.production b/webapp/.env.production similarity index 100% rename from js/.env.production rename to webapp/.env.production diff --git a/js/.eslintrc.js b/webapp/.eslintrc.js similarity index 100% rename from js/.eslintrc.js rename to webapp/.eslintrc.js diff --git a/js/.gitignore b/webapp/.gitignore similarity index 100% rename from js/.gitignore rename to webapp/.gitignore diff --git a/js/CONTRIBUTING.md b/webapp/CONTRIBUTING.md similarity index 100% rename from js/CONTRIBUTING.md rename to webapp/CONTRIBUTING.md diff --git a/js/LICENSE b/webapp/LICENSE similarity index 100% rename from js/LICENSE rename to webapp/LICENSE diff --git a/js/README.md b/webapp/README.md similarity index 100% rename from js/README.md rename to webapp/README.md diff --git a/js/babel.config.js b/webapp/babel.config.js similarity index 100% rename from js/babel.config.js rename to webapp/babel.config.js diff --git a/js/package-lock.json b/webapp/package-lock.json similarity index 100% rename from js/package-lock.json rename to webapp/package-lock.json diff --git a/js/package.json b/webapp/package.json similarity index 100% rename from js/package.json rename to webapp/package.json diff --git a/js/public/ListServices.imjoy.html b/webapp/public/ListServices.imjoy.html similarity index 100% rename from js/public/ListServices.imjoy.html rename to webapp/public/ListServices.imjoy.html diff --git a/js/public/OpenFlexureScriptEditor.imjoy.html b/webapp/public/OpenFlexureScriptEditor.imjoy.html similarity index 100% rename from js/public/OpenFlexureScriptEditor.imjoy.html rename to webapp/public/OpenFlexureScriptEditor.imjoy.html diff --git a/js/public/OpenFlexureSnapImageTemplate.imjoy.html b/webapp/public/OpenFlexureSnapImageTemplate.imjoy.html similarity index 100% rename from js/public/OpenFlexureSnapImageTemplate.imjoy.html rename to webapp/public/OpenFlexureSnapImageTemplate.imjoy.html diff --git a/js/public/OpenFlexureTestMoveStage.imjoy.html b/webapp/public/OpenFlexureTestMoveStage.imjoy.html similarity index 100% rename from js/public/OpenFlexureTestMoveStage.imjoy.html rename to webapp/public/OpenFlexureTestMoveStage.imjoy.html diff --git a/js/public/favicon-16x16.png b/webapp/public/favicon-16x16.png similarity index 100% rename from js/public/favicon-16x16.png rename to webapp/public/favicon-16x16.png diff --git a/js/public/favicon-32x32.png b/webapp/public/favicon-32x32.png similarity index 100% rename from js/public/favicon-32x32.png rename to webapp/public/favicon-32x32.png diff --git a/js/public/favicon.ico b/webapp/public/favicon.ico similarity index 100% rename from js/public/favicon.ico rename to webapp/public/favicon.ico diff --git a/js/public/index.html b/webapp/public/index.html similarity index 100% rename from js/public/index.html rename to webapp/public/index.html diff --git a/js/public/titleicon.svg b/webapp/public/titleicon.svg similarity index 100% rename from js/public/titleicon.svg rename to webapp/public/titleicon.svg diff --git a/js/src/App.vue b/webapp/src/App.vue similarity index 100% rename from js/src/App.vue rename to webapp/src/App.vue diff --git a/js/src/assets/less/highlight.less b/webapp/src/assets/less/highlight.less similarity index 100% rename from js/src/assets/less/highlight.less rename to webapp/src/assets/less/highlight.less diff --git a/js/src/assets/less/theme.less b/webapp/src/assets/less/theme.less similarity index 100% rename from js/src/assets/less/theme.less rename to webapp/src/assets/less/theme.less diff --git a/js/src/components/appContent.vue b/webapp/src/components/appContent.vue similarity index 100% rename from js/src/components/appContent.vue rename to webapp/src/components/appContent.vue diff --git a/js/src/components/fieldComponents/checkList.vue b/webapp/src/components/fieldComponents/checkList.vue similarity index 100% rename from js/src/components/fieldComponents/checkList.vue rename to webapp/src/components/fieldComponents/checkList.vue diff --git a/js/src/components/fieldComponents/htmlBlock.vue b/webapp/src/components/fieldComponents/htmlBlock.vue similarity index 100% rename from js/src/components/fieldComponents/htmlBlock.vue rename to webapp/src/components/fieldComponents/htmlBlock.vue diff --git a/js/src/components/fieldComponents/keyvalList.vue b/webapp/src/components/fieldComponents/keyvalList.vue similarity index 100% rename from js/src/components/fieldComponents/keyvalList.vue rename to webapp/src/components/fieldComponents/keyvalList.vue diff --git a/js/src/components/fieldComponents/labelInput.vue b/webapp/src/components/fieldComponents/labelInput.vue similarity index 100% rename from js/src/components/fieldComponents/labelInput.vue rename to webapp/src/components/fieldComponents/labelInput.vue diff --git a/js/src/components/fieldComponents/numberInput.vue b/webapp/src/components/fieldComponents/numberInput.vue similarity index 100% rename from js/src/components/fieldComponents/numberInput.vue rename to webapp/src/components/fieldComponents/numberInput.vue diff --git a/js/src/components/fieldComponents/radioList.vue b/webapp/src/components/fieldComponents/radioList.vue similarity index 100% rename from js/src/components/fieldComponents/radioList.vue rename to webapp/src/components/fieldComponents/radioList.vue diff --git a/js/src/components/fieldComponents/selectList.vue b/webapp/src/components/fieldComponents/selectList.vue similarity index 100% rename from js/src/components/fieldComponents/selectList.vue rename to webapp/src/components/fieldComponents/selectList.vue diff --git a/js/src/components/fieldComponents/tagList.vue b/webapp/src/components/fieldComponents/tagList.vue similarity index 100% rename from js/src/components/fieldComponents/tagList.vue rename to webapp/src/components/fieldComponents/tagList.vue diff --git a/js/src/components/fieldComponents/textInput.vue b/webapp/src/components/fieldComponents/textInput.vue similarity index 100% rename from js/src/components/fieldComponents/textInput.vue rename to webapp/src/components/fieldComponents/textInput.vue diff --git a/js/src/components/genericComponents/miniStreamDisplay.vue b/webapp/src/components/genericComponents/miniStreamDisplay.vue similarity index 100% rename from js/src/components/genericComponents/miniStreamDisplay.vue rename to webapp/src/components/genericComponents/miniStreamDisplay.vue diff --git a/js/src/components/genericComponents/progressBar.vue b/webapp/src/components/genericComponents/progressBar.vue similarity index 100% rename from js/src/components/genericComponents/progressBar.vue rename to webapp/src/components/genericComponents/progressBar.vue diff --git a/js/src/components/genericComponents/tabContent.vue b/webapp/src/components/genericComponents/tabContent.vue similarity index 100% rename from js/src/components/genericComponents/tabContent.vue rename to webapp/src/components/genericComponents/tabContent.vue diff --git a/js/src/components/genericComponents/tabIcon.vue b/webapp/src/components/genericComponents/tabIcon.vue similarity index 100% rename from js/src/components/genericComponents/tabIcon.vue rename to webapp/src/components/genericComponents/tabIcon.vue diff --git a/js/src/components/genericComponents/taskSubmitter.vue b/webapp/src/components/genericComponents/taskSubmitter.vue similarity index 100% rename from js/src/components/genericComponents/taskSubmitter.vue rename to webapp/src/components/genericComponents/taskSubmitter.vue diff --git a/js/src/components/loadingContent.vue b/webapp/src/components/loadingContent.vue similarity index 100% rename from js/src/components/loadingContent.vue rename to webapp/src/components/loadingContent.vue diff --git a/js/src/components/modalComponents/calibrationModal.vue b/webapp/src/components/modalComponents/calibrationModal.vue similarity index 100% rename from js/src/components/modalComponents/calibrationModal.vue rename to webapp/src/components/modalComponents/calibrationModal.vue diff --git a/js/src/components/pluginComponents/JsonForm.vue b/webapp/src/components/pluginComponents/JsonForm.vue similarity index 100% rename from js/src/components/pluginComponents/JsonForm.vue rename to webapp/src/components/pluginComponents/JsonForm.vue diff --git a/js/src/components/tabContentComponents/aboutComponents/devTools.vue b/webapp/src/components/tabContentComponents/aboutComponents/devTools.vue similarity index 100% rename from js/src/components/tabContentComponents/aboutComponents/devTools.vue rename to webapp/src/components/tabContentComponents/aboutComponents/devTools.vue diff --git a/js/src/components/tabContentComponents/aboutComponents/statusPane.vue b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue similarity index 100% rename from js/src/components/tabContentComponents/aboutComponents/statusPane.vue rename to webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue diff --git a/js/src/components/tabContentComponents/aboutContent.vue b/webapp/src/components/tabContentComponents/aboutContent.vue similarity index 100% rename from js/src/components/tabContentComponents/aboutContent.vue rename to webapp/src/components/tabContentComponents/aboutContent.vue diff --git a/js/src/components/tabContentComponents/captureComponents/paneCapture.vue b/webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue similarity index 100% rename from js/src/components/tabContentComponents/captureComponents/paneCapture.vue rename to webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue diff --git a/js/src/components/tabContentComponents/captureContent.vue b/webapp/src/components/tabContentComponents/captureContent.vue similarity index 100% rename from js/src/components/tabContentComponents/captureContent.vue rename to webapp/src/components/tabContentComponents/captureContent.vue diff --git a/js/src/components/tabContentComponents/extensionContent.vue b/webapp/src/components/tabContentComponents/extensionContent.vue similarity index 100% rename from js/src/components/tabContentComponents/extensionContent.vue rename to webapp/src/components/tabContentComponents/extensionContent.vue diff --git a/js/src/components/tabContentComponents/galleryComponents/captureCard.vue b/webapp/src/components/tabContentComponents/galleryComponents/captureCard.vue similarity index 100% rename from js/src/components/tabContentComponents/galleryComponents/captureCard.vue rename to webapp/src/components/tabContentComponents/galleryComponents/captureCard.vue diff --git a/js/src/components/tabContentComponents/galleryComponents/scanCard.vue b/webapp/src/components/tabContentComponents/galleryComponents/scanCard.vue similarity index 100% rename from js/src/components/tabContentComponents/galleryComponents/scanCard.vue rename to webapp/src/components/tabContentComponents/galleryComponents/scanCard.vue diff --git a/js/src/components/tabContentComponents/galleryComponents/zipDownloader.vue b/webapp/src/components/tabContentComponents/galleryComponents/zipDownloader.vue similarity index 100% rename from js/src/components/tabContentComponents/galleryComponents/zipDownloader.vue rename to webapp/src/components/tabContentComponents/galleryComponents/zipDownloader.vue diff --git a/js/src/components/tabContentComponents/galleryContent.vue b/webapp/src/components/tabContentComponents/galleryContent.vue similarity index 100% rename from js/src/components/tabContentComponents/galleryContent.vue rename to webapp/src/components/tabContentComponents/galleryContent.vue diff --git a/js/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue b/webapp/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue similarity index 100% rename from js/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue rename to webapp/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue diff --git a/js/src/components/tabContentComponents/imjoyContent.vue b/webapp/src/components/tabContentComponents/imjoyContent.vue similarity index 100% rename from js/src/components/tabContentComponents/imjoyContent.vue rename to webapp/src/components/tabContentComponents/imjoyContent.vue diff --git a/js/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue similarity index 100% rename from js/src/components/tabContentComponents/loggingContent.vue rename to webapp/src/components/tabContentComponents/loggingContent.vue diff --git a/js/src/components/tabContentComponents/navigateComponents/paneNavigate.vue b/webapp/src/components/tabContentComponents/navigateComponents/paneNavigate.vue similarity index 100% rename from js/src/components/tabContentComponents/navigateComponents/paneNavigate.vue rename to webapp/src/components/tabContentComponents/navigateComponents/paneNavigate.vue diff --git a/js/src/components/tabContentComponents/navigateContent.vue b/webapp/src/components/tabContentComponents/navigateContent.vue similarity index 100% rename from js/src/components/tabContentComponents/navigateContent.vue rename to webapp/src/components/tabContentComponents/navigateContent.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/CSMSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/CSMSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/appSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/appSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/appSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/appSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/cameraSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/featuresSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/featuresSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/featuresSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/featuresSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/stageSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/stageSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue diff --git a/js/src/components/tabContentComponents/settingsComponents/streamSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsComponents/streamSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue diff --git a/js/src/components/tabContentComponents/settingsContent.vue b/webapp/src/components/tabContentComponents/settingsContent.vue similarity index 100% rename from js/src/components/tabContentComponents/settingsContent.vue rename to webapp/src/components/tabContentComponents/settingsContent.vue diff --git a/js/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue b/webapp/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue similarity index 100% rename from js/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue rename to webapp/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue diff --git a/js/src/components/tabContentComponents/slideScanContent.vue b/webapp/src/components/tabContentComponents/slideScanContent.vue similarity index 100% rename from js/src/components/tabContentComponents/slideScanContent.vue rename to webapp/src/components/tabContentComponents/slideScanContent.vue diff --git a/js/src/components/tabContentComponents/streamContent.vue b/webapp/src/components/tabContentComponents/streamContent.vue similarity index 100% rename from js/src/components/tabContentComponents/streamContent.vue rename to webapp/src/components/tabContentComponents/streamContent.vue diff --git a/js/src/components/tabContentComponents/viewContent.vue b/webapp/src/components/tabContentComponents/viewContent.vue similarity index 100% rename from js/src/components/tabContentComponents/viewContent.vue rename to webapp/src/components/tabContentComponents/viewContent.vue diff --git a/js/src/main.js b/webapp/src/main.js similarity index 100% rename from js/src/main.js rename to webapp/src/main.js diff --git a/js/src/store.js b/webapp/src/store.js similarity index 100% rename from js/src/store.js rename to webapp/src/store.js diff --git a/js/src/syncDataWithLocalStorage.js b/webapp/src/syncDataWithLocalStorage.js similarity index 100% rename from js/src/syncDataWithLocalStorage.js rename to webapp/src/syncDataWithLocalStorage.js diff --git a/js/vue.config.js b/webapp/vue.config.js similarity index 100% rename from js/vue.config.js rename to webapp/vue.config.js