diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d4a720c5..eb3fec24 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 webapp - npm install cache: key: "${CI_COMMIT_REF_SLUG}" paths: - - openflexure_microscope/api/static/node_modules + - webapp/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/" + - "openflexure_microscope/api/static/dist/" only: - master diff --git a/README.md b/README.md index ba15fa86..9800b7f6 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 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) +* 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 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 openflexure_microscope/api/static` + * `cd webapp` * `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` diff --git a/openflexure_microscope/api/static/.env.development b/webapp/.env.development similarity index 100% rename from openflexure_microscope/api/static/.env.development rename to webapp/.env.development diff --git a/openflexure_microscope/api/static/.env.production b/webapp/.env.production similarity index 100% rename from openflexure_microscope/api/static/.env.production rename to webapp/.env.production diff --git a/openflexure_microscope/api/static/.eslintrc.js b/webapp/.eslintrc.js similarity index 100% rename from openflexure_microscope/api/static/.eslintrc.js rename to webapp/.eslintrc.js diff --git a/openflexure_microscope/api/static/.gitignore b/webapp/.gitignore similarity index 100% rename from openflexure_microscope/api/static/.gitignore rename to webapp/.gitignore diff --git a/openflexure_microscope/api/static/CONTRIBUTING.md b/webapp/CONTRIBUTING.md similarity index 100% rename from openflexure_microscope/api/static/CONTRIBUTING.md rename to webapp/CONTRIBUTING.md diff --git a/openflexure_microscope/api/static/LICENSE b/webapp/LICENSE similarity index 100% rename from openflexure_microscope/api/static/LICENSE rename to webapp/LICENSE diff --git a/openflexure_microscope/api/static/README.md b/webapp/README.md similarity index 100% rename from openflexure_microscope/api/static/README.md rename to webapp/README.md diff --git a/openflexure_microscope/api/static/babel.config.js b/webapp/babel.config.js similarity index 100% rename from openflexure_microscope/api/static/babel.config.js rename to webapp/babel.config.js diff --git a/openflexure_microscope/api/static/package-lock.json b/webapp/package-lock.json similarity index 100% rename from openflexure_microscope/api/static/package-lock.json rename to webapp/package-lock.json diff --git a/openflexure_microscope/api/static/package.json b/webapp/package.json similarity index 100% rename from openflexure_microscope/api/static/package.json rename to webapp/package.json diff --git a/openflexure_microscope/api/static/public/ListServices.imjoy.html b/webapp/public/ListServices.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/ListServices.imjoy.html rename to webapp/public/ListServices.imjoy.html diff --git a/openflexure_microscope/api/static/public/OpenFlexureScriptEditor.imjoy.html b/webapp/public/OpenFlexureScriptEditor.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/OpenFlexureScriptEditor.imjoy.html rename to webapp/public/OpenFlexureScriptEditor.imjoy.html diff --git a/openflexure_microscope/api/static/public/OpenFlexureSnapImageTemplate.imjoy.html b/webapp/public/OpenFlexureSnapImageTemplate.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/OpenFlexureSnapImageTemplate.imjoy.html rename to webapp/public/OpenFlexureSnapImageTemplate.imjoy.html diff --git a/openflexure_microscope/api/static/public/OpenFlexureTestMoveStage.imjoy.html b/webapp/public/OpenFlexureTestMoveStage.imjoy.html similarity index 100% rename from openflexure_microscope/api/static/public/OpenFlexureTestMoveStage.imjoy.html rename to webapp/public/OpenFlexureTestMoveStage.imjoy.html diff --git a/openflexure_microscope/api/static/public/favicon-16x16.png b/webapp/public/favicon-16x16.png similarity index 100% rename from openflexure_microscope/api/static/public/favicon-16x16.png rename to webapp/public/favicon-16x16.png diff --git a/openflexure_microscope/api/static/public/favicon-32x32.png b/webapp/public/favicon-32x32.png similarity index 100% rename from openflexure_microscope/api/static/public/favicon-32x32.png rename to webapp/public/favicon-32x32.png diff --git a/openflexure_microscope/api/static/public/favicon.ico b/webapp/public/favicon.ico similarity index 100% rename from openflexure_microscope/api/static/public/favicon.ico rename to webapp/public/favicon.ico diff --git a/openflexure_microscope/api/static/public/index.html b/webapp/public/index.html similarity index 100% rename from openflexure_microscope/api/static/public/index.html rename to webapp/public/index.html diff --git a/openflexure_microscope/api/static/public/titleicon.svg b/webapp/public/titleicon.svg similarity index 100% rename from openflexure_microscope/api/static/public/titleicon.svg rename to webapp/public/titleicon.svg diff --git a/openflexure_microscope/api/static/src/App.vue b/webapp/src/App.vue similarity index 100% rename from openflexure_microscope/api/static/src/App.vue rename to webapp/src/App.vue diff --git a/openflexure_microscope/api/static/src/assets/less/highlight.less b/webapp/src/assets/less/highlight.less similarity index 100% rename from openflexure_microscope/api/static/src/assets/less/highlight.less rename to webapp/src/assets/less/highlight.less diff --git a/openflexure_microscope/api/static/src/assets/less/theme.less b/webapp/src/assets/less/theme.less similarity index 100% rename from openflexure_microscope/api/static/src/assets/less/theme.less rename to webapp/src/assets/less/theme.less diff --git a/openflexure_microscope/api/static/src/components/appContent.vue b/webapp/src/components/appContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/appContent.vue rename to webapp/src/components/appContent.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/checkList.vue b/webapp/src/components/fieldComponents/checkList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/checkList.vue rename to webapp/src/components/fieldComponents/checkList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/htmlBlock.vue b/webapp/src/components/fieldComponents/htmlBlock.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/htmlBlock.vue rename to webapp/src/components/fieldComponents/htmlBlock.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/keyvalList.vue b/webapp/src/components/fieldComponents/keyvalList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/keyvalList.vue rename to webapp/src/components/fieldComponents/keyvalList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/labelInput.vue b/webapp/src/components/fieldComponents/labelInput.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/labelInput.vue rename to webapp/src/components/fieldComponents/labelInput.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/numberInput.vue b/webapp/src/components/fieldComponents/numberInput.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/numberInput.vue rename to webapp/src/components/fieldComponents/numberInput.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/radioList.vue b/webapp/src/components/fieldComponents/radioList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/radioList.vue rename to webapp/src/components/fieldComponents/radioList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/selectList.vue b/webapp/src/components/fieldComponents/selectList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/selectList.vue rename to webapp/src/components/fieldComponents/selectList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/tagList.vue b/webapp/src/components/fieldComponents/tagList.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/tagList.vue rename to webapp/src/components/fieldComponents/tagList.vue diff --git a/openflexure_microscope/api/static/src/components/fieldComponents/textInput.vue b/webapp/src/components/fieldComponents/textInput.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/fieldComponents/textInput.vue rename to webapp/src/components/fieldComponents/textInput.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/miniStreamDisplay.vue b/webapp/src/components/genericComponents/miniStreamDisplay.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/miniStreamDisplay.vue rename to webapp/src/components/genericComponents/miniStreamDisplay.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/progressBar.vue b/webapp/src/components/genericComponents/progressBar.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/progressBar.vue rename to webapp/src/components/genericComponents/progressBar.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/tabContent.vue b/webapp/src/components/genericComponents/tabContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/tabContent.vue rename to webapp/src/components/genericComponents/tabContent.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/tabIcon.vue b/webapp/src/components/genericComponents/tabIcon.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/tabIcon.vue rename to webapp/src/components/genericComponents/tabIcon.vue diff --git a/openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue b/webapp/src/components/genericComponents/taskSubmitter.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/genericComponents/taskSubmitter.vue rename to webapp/src/components/genericComponents/taskSubmitter.vue diff --git a/openflexure_microscope/api/static/src/components/loadingContent.vue b/webapp/src/components/loadingContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/loadingContent.vue rename to webapp/src/components/loadingContent.vue diff --git a/openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue b/webapp/src/components/modalComponents/calibrationModal.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/modalComponents/calibrationModal.vue rename to webapp/src/components/modalComponents/calibrationModal.vue diff --git a/openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue b/webapp/src/components/pluginComponents/JsonForm.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/pluginComponents/JsonForm.vue rename to webapp/src/components/pluginComponents/JsonForm.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/devTools.vue b/webapp/src/components/tabContentComponents/aboutComponents/devTools.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/devTools.vue rename to webapp/src/components/tabContentComponents/aboutComponents/devTools.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/statusPane.vue b/webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/aboutComponents/statusPane.vue rename to webapp/src/components/tabContentComponents/aboutComponents/statusPane.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/aboutContent.vue b/webapp/src/components/tabContentComponents/aboutContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/aboutContent.vue rename to webapp/src/components/tabContentComponents/aboutContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue b/webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/captureComponents/paneCapture.vue rename to webapp/src/components/tabContentComponents/captureComponents/paneCapture.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/captureContent.vue b/webapp/src/components/tabContentComponents/captureContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/captureContent.vue rename to webapp/src/components/tabContentComponents/captureContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/extensionContent.vue b/webapp/src/components/tabContentComponents/extensionContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/extensionContent.vue rename to webapp/src/components/tabContentComponents/extensionContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/captureCard.vue b/webapp/src/components/tabContentComponents/galleryComponents/captureCard.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/captureCard.vue rename to webapp/src/components/tabContentComponents/galleryComponents/captureCard.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/scanCard.vue b/webapp/src/components/tabContentComponents/galleryComponents/scanCard.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/scanCard.vue rename to webapp/src/components/tabContentComponents/galleryComponents/scanCard.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/zipDownloader.vue b/webapp/src/components/tabContentComponents/galleryComponents/zipDownloader.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryComponents/zipDownloader.vue rename to webapp/src/components/tabContentComponents/galleryComponents/zipDownloader.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/galleryContent.vue b/webapp/src/components/tabContentComponents/galleryContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/galleryContent.vue rename to webapp/src/components/tabContentComponents/galleryContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue b/webapp/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue rename to webapp/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/imjoyContent.vue b/webapp/src/components/tabContentComponents/imjoyContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/imjoyContent.vue rename to webapp/src/components/tabContentComponents/imjoyContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/loggingContent.vue b/webapp/src/components/tabContentComponents/loggingContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/loggingContent.vue rename to webapp/src/components/tabContentComponents/loggingContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/navigateComponents/paneNavigate.vue b/webapp/src/components/tabContentComponents/navigateComponents/paneNavigate.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/navigateComponents/paneNavigate.vue rename to webapp/src/components/tabContentComponents/navigateComponents/paneNavigate.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/navigateContent.vue b/webapp/src/components/tabContentComponents/navigateContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/navigateContent.vue rename to webapp/src/components/tabContentComponents/navigateContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/CSMSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/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 webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/appSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/appSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/appSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/appSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/cameraSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue b/webapp/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 webapp/src/components/tabContentComponents/settingsComponents/cameraSettingsComponents/cameraCalibrationSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/featuresSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/featuresSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/featuresSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/microscopeSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/stageSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/stageSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/stageSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/streamSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsComponents/streamSettings.vue rename to webapp/src/components/tabContentComponents/settingsComponents/streamSettings.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/settingsContent.vue b/webapp/src/components/tabContentComponents/settingsContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/settingsContent.vue rename to webapp/src/components/tabContentComponents/settingsContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue b/webapp/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue rename to webapp/src/components/tabContentComponents/slideScanComponents/paneSlideScan.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue b/webapp/src/components/tabContentComponents/slideScanContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue rename to webapp/src/components/tabContentComponents/slideScanContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/streamContent.vue b/webapp/src/components/tabContentComponents/streamContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/streamContent.vue rename to webapp/src/components/tabContentComponents/streamContent.vue diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/viewContent.vue b/webapp/src/components/tabContentComponents/viewContent.vue similarity index 100% rename from openflexure_microscope/api/static/src/components/tabContentComponents/viewContent.vue rename to webapp/src/components/tabContentComponents/viewContent.vue diff --git a/openflexure_microscope/api/static/src/main.js b/webapp/src/main.js similarity index 100% rename from openflexure_microscope/api/static/src/main.js rename to webapp/src/main.js diff --git a/openflexure_microscope/api/static/src/store.js b/webapp/src/store.js similarity index 100% rename from openflexure_microscope/api/static/src/store.js rename to webapp/src/store.js diff --git a/openflexure_microscope/api/static/src/syncDataWithLocalStorage.js b/webapp/src/syncDataWithLocalStorage.js similarity index 100% rename from openflexure_microscope/api/static/src/syncDataWithLocalStorage.js rename to webapp/src/syncDataWithLocalStorage.js diff --git a/webapp/vue.config.js b/webapp/vue.config.js new file mode 100644 index 00000000..87a775fa --- /dev/null +++ b/webapp/vue.config.js @@ -0,0 +1,3 @@ +module.exports = { + outputDir: '../openflexure_microscope/api/static/dist', +};