From 7e904728e3674e44988a07b7a8fc461683c3cfcf Mon Sep 17 00:00:00 2001 From: Marcello Perathoner Date: Wed, 25 Sep 2019 19:52:41 +0200 Subject: [PATCH] WIP on docker. #94 --- Makefile | 2 +- client/package.json | 1 + client/src/components/app.vue | 305 ++++++++++++++++-- client/src/components/attestation.vue | 3 +- client/src/components/coherence.vue | 18 +- client/src/components/comparison.vue | 7 +- client/src/components/comparison_table.vue | 3 +- client/src/components/flash_messages.vue | 103 ++++++ client/src/components/index.vue | 17 +- client/src/components/notes_list.vue | 1 - client/src/components/optimal_substemma.vue | 7 +- .../components/optimal_substemma_table.vue | 3 +- client/src/components/page_header.vue | 120 +++---- client/src/components/project_list.vue | 66 ++++ client/src/components/set_cover.vue | 7 +- client/src/index.html | 4 +- client/src/js/app.js | 17 + client/src/js/main.js | 148 --------- client/webpack.common.js | 7 +- client/yarn.lock | 5 + doc_src/install-docker.rst | 67 ++-- doc_src/install-linux.rst | 6 +- docker/Makefile | 4 +- docker/_global.conf | 2 +- docker/acts_ph4.conf | 2 +- docker/docker-entrypoint.sh | 12 +- docs/_sources/install-docker.rst.txt | 70 ++-- docs/_sources/install-linux.rst.txt | 6 +- docs/client_dev.html | 9 +- docs/client_user.html | 9 +- docs/database.html | 9 +- docs/developer.html | 9 +- docs/domain.html | 9 +- docs/genindex.html | 9 +- docs/index.html | 11 +- docs/install-docker.html | 69 ++-- docs/install-linux.html | 15 +- docs/install.html | 18 +- docs/intro.html | 9 +- docs/ntg_common.html | 9 +- docs/objects.inv | Bin 3392 -> 3417 bytes docs/py-modindex.html | 9 +- docs/scripts_dev.html | 9 +- docs/scripts_user.html | 9 +- docs/search.html | 9 +- docs/searchindex.js | 2 +- docs/server_dev.html | 9 +- docs/server_user.html | 9 +- docs/user.html | 9 +- server/__main__.py | 36 ++- server/info.py | 71 ++++ server/login.py | 31 +- server/main.py | 23 -- server/static.py | 1 + server/templates/site.html | 6 +- server/templates/welcome.html | 42 --- server/textflow.py | 2 +- 57 files changed, 934 insertions(+), 541 deletions(-) create mode 100644 client/src/components/flash_messages.vue create mode 100644 client/src/components/project_list.vue create mode 100644 client/src/js/app.js delete mode 100644 client/src/js/main.js create mode 100644 server/info.py delete mode 100644 server/templates/welcome.html diff --git a/Makefile b/Makefile index 3dd27d8..ddc2fcd 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ common-clean: server-clean: cd server ; make clean; cd .. -docker-build: server-clean common-clean +docker-build: server-clean common-clean client cd docker; make build; cd .. docker-run: diff --git a/client/package.json b/client/package.json index 982f7f9..76506ef 100644 --- a/client/package.json +++ b/client/package.json @@ -28,6 +28,7 @@ "pegjs": "^0.10.0", "popper.js": "^1.12", "url": "^0.11.0", + "velocity-animate": "^2.0.5", "vue": "^2.5.16", "vue-devtools": "*", "vue-router": "^3.0.1", diff --git a/client/src/components/app.vue b/client/src/components/app.vue index b04163a..2fa4763 100644 --- a/client/src/components/app.vue +++ b/client/src/components/app.vue @@ -1,23 +1,131 @@ diff --git a/client/src/components/index.vue b/client/src/components/index.vue index f4934e2..8e232c5 100644 --- a/client/src/components/index.vue +++ b/client/src/components/index.vue @@ -1,16 +1,14 @@