Skip to content

Commit

Permalink
Move varfish export Vue app (#711)
Browse files Browse the repository at this point in the history
Closes: #711
Related-Issue: #711
Projected-Results-Impact: none
  • Loading branch information
holtgrewe committed Sep 27, 2022
1 parent e2e2c25 commit 89b1c68
Show file tree
Hide file tree
Showing 77 changed files with 15 additions and 62 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Expand Up @@ -360,4 +360,4 @@ celerybeat-schedule

staticfiles.bak/

varfish/vueapp/webpack-stats.json
webpack-stats.json
48 changes: 0 additions & 48 deletions .gitlab-ci.yml

This file was deleted.

1 change: 1 addition & 0 deletions HISTORY.rst
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Expand Up @@ -7,15 +7,15 @@ black:

.PHONY: npm-install
npm-install:
cd varfish/vueapp && npm ci
cd clinvar_export/vueapp && npm ci

.PHONY: serve
serve:
$(MANAGE) runserver

.PHONY: serve_vue
serve_vue:
npm run --prefix varfish/vueapp serve
npm run --prefix clinvar_export/vueapp serve

.PHONY: serve_public
serve_public:
Expand Down Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion config/settings/base.py
Expand Up @@ -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"),
}
}

Expand Down
4 changes: 2 additions & 2 deletions config/settings/production.py
Expand Up @@ -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=[])
Expand Down Expand Up @@ -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")))
4 changes: 2 additions & 2 deletions docker/Dockerfile
Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions docs_manual/developer_installation.rst
Expand Up @@ -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.
Expand Down

0 comments on commit 89b1c68

Please sign in to comment.