diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 359076206..1a0dfa394 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -69,8 +69,8 @@ jobs: pip freeze - name: Build and run Vue app run: | - npm ci --prefix varfish/vueapp - nohup npm run -prefix varfish/vueapp serve & + npm ci --prefix clinvar_export/vueapp + nohup npm run -prefix clinvar_export/vueapp serve & - name: download icons run: python manage.py geticons - name: run collectstatic diff --git a/.gitignore b/.gitignore index 495238797..60afbbc5d 100644 --- a/.gitignore +++ b/.gitignore @@ -360,4 +360,4 @@ celerybeat-schedule staticfiles.bak/ -varfish/vueapp/webpack-stats.json +webpack-stats.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index a576d67f5..000000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,48 +0,0 @@ -image: python:3.6 - -services: -- postgres:12 -- redis:latest - -variables: - POSTGRES_DB: varfish_web - POSTGRES_USER: varfish_web - POSTGRES_PASSWORD: varfish_web - DATABASE_URL: postgres://varfish_web:varfish_web@postgres/varfish_web - CELERY_BROKER_URL: redis://redis:6379/0 - -before_script: -# SSH setup taken from https://gitlab.com/gitlab-examples/ssh-private-key -# -# install ssh-agent -- 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' -# run ssh-agent -- eval $(ssh-agent -s) -# add ssh key stored in SSH_PRIVATE_KEY variable to the agent store -- echo -n "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null -# disable host key checking (NOTE: makes you susceptible to man-in-the-middle attacks) -# WARNING: use only in docker container, if you use it with shell you will overwrite your user's ssh config -- mkdir -p ~/.ssh -- chmod 700 ~/.ssh -- echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config - -- sh ./utility/install_os_gitlab.sh -- sh ./utility/install_chrome_gitlab.sh -- pip3 install virtualenv -- virtualenv env -- source env/bin/activate -- sh ./utility/install_python_dependencies.sh -- npm ci --prefix varfish/vueapp -# Temporary HACK, should not actually do this -- nohup npm run -prefix varfish/vueapp serve & - -all_tests: - script: - # Run tests for Django app. - - python manage.py collectstatic --noinput - - coverage run manage.py test -v2 --settings=config.settings.test - - coverage report - # Run syntax checks and static code analysis. - - black -l 100 --check --exclude '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.?v?env|_build|buck-out|build|dist|src)/' . - # - flake8 - when: on_success diff --git a/HISTORY.rst b/HISTORY.rst index 003839146..29fce4292 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -128,6 +128,7 @@ Full Change List - Initial vue.js implementation for small variant filtration (#563). - Changing ClinVar link-out to VCV entry instead of coordinates (#693). - Adding unit test for clinvar Vue app (#692). +- Moving clinvar Vue app (#711). ------ v1.2.0 diff --git a/Makefile b/Makefile index 8889b1689..1e9846f54 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ black: .PHONY: npm-install npm-install: - cd varfish/vueapp && npm ci + cd clinvar_export/vueapp && npm ci .PHONY: serve serve: @@ -15,7 +15,7 @@ serve: .PHONY: serve_vue serve_vue: - npm run --prefix varfish/vueapp serve + npm run --prefix clinvar_export/vueapp serve .PHONY: serve_public serve_public: @@ -66,11 +66,11 @@ test-noselenium: .PHONY: test_clinvar_export_vue test_clinvar_export_vue: - npm run --prefix varfish/vueapp test:unit $(arg) + npm run --prefix clinvar_export/vueapp test:unit $(arg) .PHONY: lint_clinvar_export_vue lint_clinvar_export_vue: - npm run --prefix varfish/vueapp lint $(arg) + npm run --prefix clinvar_export/vueapp lint $(arg) .PHONY: lint lint: flake8 diff --git a/varfish/vueapp/.editorconfig b/clinvar_export/vueapp/.editorconfig similarity index 100% rename from varfish/vueapp/.editorconfig rename to clinvar_export/vueapp/.editorconfig diff --git a/varfish/vueapp/.eslintrc.js b/clinvar_export/vueapp/.eslintrc.js similarity index 100% rename from varfish/vueapp/.eslintrc.js rename to clinvar_export/vueapp/.eslintrc.js diff --git a/varfish/vueapp/.gitignore b/clinvar_export/vueapp/.gitignore similarity index 100% rename from varfish/vueapp/.gitignore rename to clinvar_export/vueapp/.gitignore diff --git a/varfish/vueapp/.prettierignore b/clinvar_export/vueapp/.prettierignore similarity index 100% rename from varfish/vueapp/.prettierignore rename to clinvar_export/vueapp/.prettierignore diff --git a/varfish/vueapp/README.md b/clinvar_export/vueapp/README.md similarity index 100% rename from varfish/vueapp/README.md rename to clinvar_export/vueapp/README.md diff --git a/varfish/vueapp/babel.config.js b/clinvar_export/vueapp/babel.config.js similarity index 100% rename from varfish/vueapp/babel.config.js rename to clinvar_export/vueapp/babel.config.js diff --git a/varfish/vueapp/jest.config.js b/clinvar_export/vueapp/jest.config.js similarity index 100% rename from varfish/vueapp/jest.config.js rename to clinvar_export/vueapp/jest.config.js diff --git a/varfish/vueapp/package-lock.json b/clinvar_export/vueapp/package-lock.json similarity index 100% rename from varfish/vueapp/package-lock.json rename to clinvar_export/vueapp/package-lock.json diff --git a/varfish/vueapp/package.json b/clinvar_export/vueapp/package.json similarity index 100% rename from varfish/vueapp/package.json rename to clinvar_export/vueapp/package.json diff --git a/varfish/vueapp/prettier.config.js b/clinvar_export/vueapp/prettier.config.js similarity index 100% rename from varfish/vueapp/prettier.config.js rename to clinvar_export/vueapp/prettier.config.js diff --git a/varfish/vueapp/public/favicon.ico b/clinvar_export/vueapp/public/favicon.ico similarity index 100% rename from varfish/vueapp/public/favicon.ico rename to clinvar_export/vueapp/public/favicon.ico diff --git a/varfish/vueapp/public/index.html b/clinvar_export/vueapp/public/index.html similarity index 100% rename from varfish/vueapp/public/index.html rename to clinvar_export/vueapp/public/index.html diff --git a/varfish/vueapp/src/App.vue b/clinvar_export/vueapp/src/App.vue similarity index 100% rename from varfish/vueapp/src/App.vue rename to clinvar_export/vueapp/src/App.vue diff --git a/varfish/vueapp/src/api/clinvarExport.js b/clinvar_export/vueapp/src/api/clinvarExport.js similarity index 100% rename from varfish/vueapp/src/api/clinvarExport.js rename to clinvar_export/vueapp/src/api/clinvarExport.js diff --git a/varfish/vueapp/src/assets/logo.png b/clinvar_export/vueapp/src/assets/logo.png similarity index 100% rename from varfish/vueapp/src/assets/logo.png rename to clinvar_export/vueapp/src/assets/logo.png diff --git a/varfish/vueapp/src/components/ClinvarExportApp.vue b/clinvar_export/vueapp/src/components/ClinvarExportApp.vue similarity index 100% rename from varfish/vueapp/src/components/ClinvarExportApp.vue rename to clinvar_export/vueapp/src/components/ClinvarExportApp.vue diff --git a/varfish/vueapp/src/components/SubmissionCaseList.vue b/clinvar_export/vueapp/src/components/SubmissionCaseList.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionCaseList.vue rename to clinvar_export/vueapp/src/components/SubmissionCaseList.vue diff --git a/varfish/vueapp/src/components/SubmissionCaseListEntry.vue b/clinvar_export/vueapp/src/components/SubmissionCaseListEntry.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionCaseListEntry.vue rename to clinvar_export/vueapp/src/components/SubmissionCaseListEntry.vue diff --git a/varfish/vueapp/src/components/SubmissionEditor.vue b/clinvar_export/vueapp/src/components/SubmissionEditor.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionEditor.vue rename to clinvar_export/vueapp/src/components/SubmissionEditor.vue diff --git a/varfish/vueapp/src/components/SubmissionList.vue b/clinvar_export/vueapp/src/components/SubmissionList.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionList.vue rename to clinvar_export/vueapp/src/components/SubmissionList.vue diff --git a/varfish/vueapp/src/components/SubmissionSetEditor.vue b/clinvar_export/vueapp/src/components/SubmissionSetEditor.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionSetEditor.vue rename to clinvar_export/vueapp/src/components/SubmissionSetEditor.vue diff --git a/varfish/vueapp/src/components/SubmissionSetList.vue b/clinvar_export/vueapp/src/components/SubmissionSetList.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionSetList.vue rename to clinvar_export/vueapp/src/components/SubmissionSetList.vue diff --git a/varfish/vueapp/src/components/SubmissionSetWizard.vue b/clinvar_export/vueapp/src/components/SubmissionSetWizard.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionSetWizard.vue rename to clinvar_export/vueapp/src/components/SubmissionSetWizard.vue diff --git a/varfish/vueapp/src/components/SubmissionSetWizardFooter.vue b/clinvar_export/vueapp/src/components/SubmissionSetWizardFooter.vue similarity index 100% rename from varfish/vueapp/src/components/SubmissionSetWizardFooter.vue rename to clinvar_export/vueapp/src/components/SubmissionSetWizardFooter.vue diff --git a/varfish/vueapp/src/constants.js b/clinvar_export/vueapp/src/constants.js similarity index 100% rename from varfish/vueapp/src/constants.js rename to clinvar_export/vueapp/src/constants.js diff --git a/varfish/vueapp/src/helpers.js b/clinvar_export/vueapp/src/helpers.js similarity index 100% rename from varfish/vueapp/src/helpers.js rename to clinvar_export/vueapp/src/helpers.js diff --git a/varfish/vueapp/src/main.js b/clinvar_export/vueapp/src/main.js similarity index 100% rename from varfish/vueapp/src/main.js rename to clinvar_export/vueapp/src/main.js diff --git a/varfish/vueapp/src/router/index.js b/clinvar_export/vueapp/src/router/index.js similarity index 100% rename from varfish/vueapp/src/router/index.js rename to clinvar_export/vueapp/src/router/index.js diff --git a/varfish/vueapp/src/store/index.js b/clinvar_export/vueapp/src/store/index.js similarity index 100% rename from varfish/vueapp/src/store/index.js rename to clinvar_export/vueapp/src/store/index.js diff --git a/varfish/vueapp/src/store/modules/clinvarExport.js b/clinvar_export/vueapp/src/store/modules/clinvarExport.js similarity index 100% rename from varfish/vueapp/src/store/modules/clinvarExport.js rename to clinvar_export/vueapp/src/store/modules/clinvarExport.js diff --git a/varfish/vueapp/tests/testUtils.js b/clinvar_export/vueapp/tests/testUtils.js similarity index 100% rename from varfish/vueapp/tests/testUtils.js rename to clinvar_export/vueapp/tests/testUtils.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/ClinvarExportApp.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/ClinvarExportApp.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/ClinvarExportApp.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/ClinvarExportApp.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionCaseList.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionCaseList.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionCaseList.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionCaseList.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionCaseListEntry.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionCaseListEntry.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionCaseListEntry.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionCaseListEntry.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionEditor.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionEditor.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionEditor.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionEditor.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionList.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionList.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionList.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionList.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionSetEditor.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetEditor.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionSetEditor.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetEditor.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionSetList.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetList.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionSetList.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetList.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionSetWizard.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetWizard.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionSetWizard.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetWizard.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/SubmissionSetWizardFooter.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetWizardFooter.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/SubmissionSetWizardFooter.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/SubmissionSetWizardFooter.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/api.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/api.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/api.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/api.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/store.actions.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/store.actions.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/store.actions.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/store.actions.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/store.constants.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/store.constants.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/store.constants.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/store.constants.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/store.funcs.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/store.funcs.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/store.funcs.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/store.funcs.spec.js diff --git a/varfish/vueapp/tests/unit/clinvarExport/store.mutations.spec.js b/clinvar_export/vueapp/tests/unit/clinvarExport/store.mutations.spec.js similarity index 100% rename from varfish/vueapp/tests/unit/clinvarExport/store.mutations.spec.js rename to clinvar_export/vueapp/tests/unit/clinvarExport/store.mutations.spec.js diff --git a/varfish/vueapp/tests/unit/data/clinvarExportEmptyState.json b/clinvar_export/vueapp/tests/unit/data/clinvarExportEmptyState.json similarity index 100% rename from varfish/vueapp/tests/unit/data/clinvarExportEmptyState.json rename to clinvar_export/vueapp/tests/unit/data/clinvarExportEmptyState.json diff --git a/varfish/vueapp/tests/unit/data/firstAssertionMethod.json b/clinvar_export/vueapp/tests/unit/data/firstAssertionMethod.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstAssertionMethod.json rename to clinvar_export/vueapp/tests/unit/data/firstAssertionMethod.json diff --git a/varfish/vueapp/tests/unit/data/firstFamily.json b/clinvar_export/vueapp/tests/unit/data/firstFamily.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstFamily.json rename to clinvar_export/vueapp/tests/unit/data/firstFamily.json diff --git a/varfish/vueapp/tests/unit/data/firstIndividual.json b/clinvar_export/vueapp/tests/unit/data/firstIndividual.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstIndividual.json rename to clinvar_export/vueapp/tests/unit/data/firstIndividual.json diff --git a/varfish/vueapp/tests/unit/data/firstOrganisation.json b/clinvar_export/vueapp/tests/unit/data/firstOrganisation.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstOrganisation.json rename to clinvar_export/vueapp/tests/unit/data/firstOrganisation.json diff --git a/varfish/vueapp/tests/unit/data/firstSubmission.json b/clinvar_export/vueapp/tests/unit/data/firstSubmission.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstSubmission.json rename to clinvar_export/vueapp/tests/unit/data/firstSubmission.json diff --git a/varfish/vueapp/tests/unit/data/firstSubmissionIndividual.json b/clinvar_export/vueapp/tests/unit/data/firstSubmissionIndividual.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstSubmissionIndividual.json rename to clinvar_export/vueapp/tests/unit/data/firstSubmissionIndividual.json diff --git a/varfish/vueapp/tests/unit/data/firstSubmissionSet.json b/clinvar_export/vueapp/tests/unit/data/firstSubmissionSet.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstSubmissionSet.json rename to clinvar_export/vueapp/tests/unit/data/firstSubmissionSet.json diff --git a/varfish/vueapp/tests/unit/data/firstSubmitter.json b/clinvar_export/vueapp/tests/unit/data/firstSubmitter.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstSubmitter.json rename to clinvar_export/vueapp/tests/unit/data/firstSubmitter.json diff --git a/varfish/vueapp/tests/unit/data/firstSubmittingOrg.json b/clinvar_export/vueapp/tests/unit/data/firstSubmittingOrg.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstSubmittingOrg.json rename to clinvar_export/vueapp/tests/unit/data/firstSubmittingOrg.json diff --git a/varfish/vueapp/tests/unit/data/firstUserAnnotation.json b/clinvar_export/vueapp/tests/unit/data/firstUserAnnotation.json similarity index 100% rename from varfish/vueapp/tests/unit/data/firstUserAnnotation.json rename to clinvar_export/vueapp/tests/unit/data/firstUserAnnotation.json diff --git a/varfish/vueapp/tests/unit/data/rawAppContext.json b/clinvar_export/vueapp/tests/unit/data/rawAppContext.json similarity index 100% rename from varfish/vueapp/tests/unit/data/rawAppContext.json rename to clinvar_export/vueapp/tests/unit/data/rawAppContext.json diff --git a/varfish/vueapp/tests/unit/data/secondAssertionMethod.json b/clinvar_export/vueapp/tests/unit/data/secondAssertionMethod.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondAssertionMethod.json rename to clinvar_export/vueapp/tests/unit/data/secondAssertionMethod.json diff --git a/varfish/vueapp/tests/unit/data/secondFamily.json b/clinvar_export/vueapp/tests/unit/data/secondFamily.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondFamily.json rename to clinvar_export/vueapp/tests/unit/data/secondFamily.json diff --git a/varfish/vueapp/tests/unit/data/secondIndividual.json b/clinvar_export/vueapp/tests/unit/data/secondIndividual.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondIndividual.json rename to clinvar_export/vueapp/tests/unit/data/secondIndividual.json diff --git a/varfish/vueapp/tests/unit/data/secondOrganisation.json b/clinvar_export/vueapp/tests/unit/data/secondOrganisation.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondOrganisation.json rename to clinvar_export/vueapp/tests/unit/data/secondOrganisation.json diff --git a/varfish/vueapp/tests/unit/data/secondSubmission.json b/clinvar_export/vueapp/tests/unit/data/secondSubmission.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondSubmission.json rename to clinvar_export/vueapp/tests/unit/data/secondSubmission.json diff --git a/varfish/vueapp/tests/unit/data/secondSubmissionIndividual.json b/clinvar_export/vueapp/tests/unit/data/secondSubmissionIndividual.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondSubmissionIndividual.json rename to clinvar_export/vueapp/tests/unit/data/secondSubmissionIndividual.json diff --git a/varfish/vueapp/tests/unit/data/secondSubmissionSet.json b/clinvar_export/vueapp/tests/unit/data/secondSubmissionSet.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondSubmissionSet.json rename to clinvar_export/vueapp/tests/unit/data/secondSubmissionSet.json diff --git a/varfish/vueapp/tests/unit/data/secondSubmitter.json b/clinvar_export/vueapp/tests/unit/data/secondSubmitter.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondSubmitter.json rename to clinvar_export/vueapp/tests/unit/data/secondSubmitter.json diff --git a/varfish/vueapp/tests/unit/data/secondSubmittingOrg.json b/clinvar_export/vueapp/tests/unit/data/secondSubmittingOrg.json similarity index 100% rename from varfish/vueapp/tests/unit/data/secondSubmittingOrg.json rename to clinvar_export/vueapp/tests/unit/data/secondSubmittingOrg.json diff --git a/varfish/vueapp/tests/unit/fixtures.js b/clinvar_export/vueapp/tests/unit/fixtures.js similarity index 100% rename from varfish/vueapp/tests/unit/fixtures.js rename to clinvar_export/vueapp/tests/unit/fixtures.js diff --git a/varfish/vueapp/vue.config.js b/clinvar_export/vueapp/vue.config.js similarity index 100% rename from varfish/vueapp/vue.config.js rename to clinvar_export/vueapp/vue.config.js diff --git a/config/settings/base.py b/config/settings/base.py index 82ea54a3a..596763ee5 100644 --- a/config/settings/base.py +++ b/config/settings/base.py @@ -941,7 +941,7 @@ def set_logging(debug): # ------------------------------------------------------------------------------ WEBPACK_LOADER = { "VARFISH_VUE": { - "STATS_FILE": ROOT_DIR("varfish/vueapp/webpack-stats.json"), + "STATS_FILE": ROOT_DIR("clinvar_export/vueapp/webpack-stats.json"), } } diff --git a/config/settings/production.py b/config/settings/production.py index 185795d62..176d9f9da 100644 --- a/config/settings/production.py +++ b/config/settings/production.py @@ -83,7 +83,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" # Add Samplesheets vue.js app assets -STATICFILES_DIRS.append(str(ROOT_DIR("varfish/vueapp/dist"))) +STATICFILES_DIRS.append(str(ROOT_DIR("clinvar_export/vueapp/dist"))) # Add optonal custom directory for static includes at deployment stage STATICFILES_DIRS += env.list("CUSTOM_STATIC_DIR", default=[]) @@ -147,4 +147,4 @@ # WEBPACK / VUE.JS CONFIGURATION # ------------------------------------------------------------------------------ -STATICFILES_DIRS.append(str(ROOT_DIR("varfish/vueapp/dist"))) +STATICFILES_DIRS.append(str(ROOT_DIR("clinvar_export/vueapp/dist"))) diff --git a/docker/Dockerfile b/docker/Dockerfile index da5242548..c0b6af4a6 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,7 +66,7 @@ RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - && \ apt install nodejs # Install npm dependencies. -RUN cd /usr/src/app/varfish/vueapp && \ +RUN cd /usr/src/app/clinvar_export/vueapp && \ npm ci && \ npm run build @@ -117,7 +117,7 @@ RUN cd /usr/src/app && \ # Prepare static files RUN cd /usr/src/app && \ - mkdir -p /usr/src/app/varfish/vueapp/dist && \ + mkdir -p /usr/src/app/clinvar_export/vueapp/dist && \ DJANGO_SECRET_KEY=for-build-only \ DJANGO_SETTINGS_MODULE=config.settings.production \ DATABASE_URL=postgres://varfish:varfish@fake/varfish \ diff --git a/docs_manual/developer_installation.rst b/docs_manual/developer_installation.rst index d51848116..242786aa1 100644 --- a/docs_manual/developer_installation.rst +++ b/docs_manual/developer_installation.rst @@ -111,11 +111,11 @@ Use the tool provided in ``utility/`` to set up vue.js. $ sudo bash utility/install_vue_dev.sh Open an additional terminal and switch into the vue directory. Then install -the VarFish vue app. +the Clinvar Exprot vue app. .. code-block:: bash - $ cd varfish/vueapp + $ cd clinvar_export/vueapp $ npm install When finished, keep this terminal open to run the vue app.