diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 570113ae..5d9dc9f3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -113,7 +113,7 @@ build: name: "dist" expire_in: 1 week paths: - - "openflexure_microscope/api/static/dist/" + - "src/openflexure_microscope/static/" # Package application into distribution tarball package: @@ -128,7 +128,7 @@ package: # Build distribution archive - mkdir -p dist - tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz . - - tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-webapp-${CI_COMMIT_REF_NAME}.tar.gz ./openflexure_microscope/api/static/dist/ + - tar -c --exclude-vcs --exclude-from .tarignore -vzf dist/openflexure-microscope-webapp-${CI_COMMIT_REF_NAME}.tar.gz ./openflexure_microscope_server/static/ - cp docs/build/swagger.yaml dist/openflexure-microscope-api-${CI_COMMIT_REF_NAME}.yaml - cd dist/ - sha256sum openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz > openflexure-microscope-server-${CI_COMMIT_REF_NAME}.tar.gz.sha256 diff --git a/webapp/.env.development b/webapp/.env.development index 0fd381c8..6044878d 100644 --- a/webapp/.env.development +++ b/webapp/.env.development @@ -2,4 +2,4 @@ NODE_ENV=development VUE_APP_MODE=development VUE_APP_PLATFORM=web VUE_APP_TARGET=web -VUE_APP_ENABLE_IMJOY=true \ No newline at end of file +VUE_APP_ENABLE_IMJOY=true diff --git a/webapp/vue.config.js b/webapp/vue.config.js index 867d77ba..afdf30d8 100644 --- a/webapp/vue.config.js +++ b/webapp/vue.config.js @@ -1,3 +1,3 @@ module.exports = { - outputDir: "../openflexure_microscope/api/static/dist" + outputDir: "../src/openflexure_microscope_server/static" };