From d6ab379418f884e06c9c74e57ec1a00066ac957d Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 20 Jul 2021 15:07:42 +0200 Subject: [PATCH] Change directory structure (move ./nopaque/* to ./) --- .dockerignore | 1 + .env.tpl | 4 ++-- web/Dockerfile => Dockerfile | 13 ++++++++++--- README.md | 4 +++- {web/app => app}/__init__.py | 0 {web/app => app}/admin/__init__.py | 0 {web/app => app}/admin/forms.py | 0 {web/app => app}/admin/views.py | 0 {web/app => app}/auth/__init__.py | 0 {web/app => app}/auth/forms.py | 0 {web/app => app}/auth/views.py | 0 {web/app => app}/corpora/__init__.py | 0 {web/app => app}/corpora/events.py | 0 {web/app => app}/corpora/events2.py | 0 {web/app => app}/corpora/forms.py | 0 {web/app => app}/corpora/import_corpus.py | 0 {web/app => app}/corpora/tasks.py | 0 {web/app => app}/corpora/views.py | 0 {web/app => app}/decorators.py | 0 {web/app => app}/email.py | 0 {web/app => app}/errors/__init__.py | 0 {web/app => app}/errors/handlers.py | 0 {web/app => app}/events.py | 0 {web/app => app}/jobs/__init__.py | 0 {web/app => app}/jobs/tasks.py | 0 {web/app => app}/jobs/views.py | 0 {web/app => app}/main/__init__.py | 0 {web/app => app}/main/views.py | 0 {web/app => app}/models.py | 0 {web/app => app}/services/__init__.py | 0 {web/app => app}/services/forms.py | 0 {web/app => app}/services/views.py | 0 {web/app => app}/settings/__init__.py | 0 {web/app => app}/settings/forms.py | 0 {web/app => app}/settings/tasks.py | 0 {web/app => app}/settings/views.py | 0 {web/app => app}/static/css/material_icons.css | 0 {web/app => app}/static/css/materialize.min.css | 0 {web/app => app}/static/css/materialize_fixes.css | 0 {web/app => app}/static/css/nopaque.css | 0 {web/app => app}/static/css/nopaque_icons.css | 0 {web/app => app}/static/css/sidenav_fixed.css | 0 {web/app => app}/static/css/sticky_footer.css | 0 .../material_icons/MaterialIcons-Regular.ttf | Bin .../MaterialIconsOutlined-Regular.otf | Bin .../material_icons/MaterialIconsRound-Regular.otf | Bin .../material_icons/MaterialIconsSharp-Regular.otf | Bin .../MaterialIconsTwoTone-Regular.otf | Bin .../fonts/nopaque_icons/nopaqueIcons-Regular.otf | Bin .../fonts/nopaque_icons/nopaqueIcons-Regular.woff | Bin .../nopaque_icons/nopaqueIcons-Regular.woff2 | Bin {web/app => app}/static/images/logo_-_dfg.gif | Bin .../app => app}/static/images/logo_-_sfb_1288.png | Bin .../static/images/nopaque_-_favicon.png | Bin {web/app => app}/static/images/nopaque_-_logo.svg | 0 .../static/images/nopaque_-_logo_name_slogan.svg | 0 .../images/parallax_hq/book_text_read_paper.jpg | Bin .../images/parallax_hq/books_antique_book_old.jpg | Bin .../parallax_hq/concept_document_focus_letter.jpg | Bin .../static/images/parallax_hq/text_data_wide.png | Bin .../parallax_lq/01_books_antique_book_old.jpg | Bin .../02_concept_document_focus_letter.jpg | Bin .../images/parallax_lq/03_text_data_wide.png | Bin .../parallax_lq/04_german_text_book_paper.jpg | Bin .../parallax_lq/05_chapter_book_text_tale.jpg | Bin .../static/images/parallax_lq/bible_text.jpg | Bin .../static/images/parallax_lq/text_data.png | Bin {web/app => app}/static/images/qr_-_inf.svg | 0 .../app => app}/static/images/server_activity.png | Bin .../app => app}/static/images/sfb_background.jpeg | Bin {web/app => app}/static/images/workflow.png | Bin {web/app => app}/static/js/darkreader.js | 0 {web/app => app}/static/js/jsonpatch.min.js | 0 {web/app => app}/static/js/list.min.js | 0 {web/app => app}/static/js/list.min.js.map | 0 {web/app => app}/static/js/materialize.min.js | 0 .../js/modules/corpus_analysis/client/Client.js | 0 .../modules/corpus_analysis/client/callbacks.js | 0 .../modules/corpus_analysis/client/listeners.js | 0 .../js/modules/corpus_analysis/model/Results.js | 0 .../modules/corpus_analysis/view/ResultsView.js | 0 .../js/modules/corpus_analysis/view/callbacks.js | 0 .../js/modules/corpus_analysis/view/listeners.js | 0 .../modules/corpus_analysis/view/scrollToTop.js | 0 .../js/modules/corpus_analysis/view/spinner.js | 0 .../js/nopaque/RessourceDisplays/CorpusDisplay.js | 0 .../js/nopaque/RessourceDisplays/JobDisplay.js | 0 .../nopaque/RessourceDisplays/RessourceDisplay.js | 0 .../js/nopaque/RessourceLists/CorpusFileList.js | 0 .../js/nopaque/RessourceLists/CorpusList.js | 0 .../js/nopaque/RessourceLists/JobInputList.js | 0 .../static/js/nopaque/RessourceLists/JobList.js | 0 .../js/nopaque/RessourceLists/JobResultList.js | 0 .../js/nopaque/RessourceLists/QueryResultList.js | 0 .../js/nopaque/RessourceLists/RessourceList.js | 0 .../static/js/nopaque/RessourceLists/UserList.js | 0 {web/app => app}/static/js/nopaque/main.js | 0 {web/app => app}/static/js/socket.io.min.js | 0 {web/app => app}/static/js/socket.io.min.js.map | 0 .../static/json_schema/combined_ners_tags.txt | 0 .../nopaque_cqi_py_results_schema.json | 0 {web/app => app}/tasks/__init__.py | 0 {web/app => app}/tasks/corpus_utils.py | 0 {web/app => app}/tasks/job_utils.py | 0 {web/app => app}/templates/_colors.html.j2 | 0 {web/app => app}/templates/_footer.html.j2 | 0 {web/app => app}/templates/_navbar.html.j2 | 0 {web/app => app}/templates/_roadmap.html.j2 | 0 {web/app => app}/templates/_scripts.html.j2 | 0 {web/app => app}/templates/_sidenav.html.j2 | 0 {web/app => app}/templates/_styles.html.j2 | 0 .../templates/admin/_breadcrumbs.html.j2 | 0 .../app => app}/templates/admin/edit_user.html.j2 | 0 {web/app => app}/templates/admin/user.html.j2 | 0 {web/app => app}/templates/admin/users.html.j2 | 0 .../templates/auth/_breadcrumbs.html.j2 | 0 .../templates/auth/email/confirm.html.j2 | 0 .../templates/auth/email/confirm.txt.j2 | 0 .../templates/auth/email/reset_password.html.j2 | 0 .../templates/auth/email/reset_password.txt.j2 | 0 {web/app => app}/templates/auth/login.html.j2 | 0 {web/app => app}/templates/auth/register.html.j2 | 0 .../templates/auth/reset_password.html.j2 | 0 .../templates/auth/reset_password_request.html.j2 | 0 .../templates/auth/unconfirmed.html.j2 | 0 {web/app => app}/templates/base.html.j2 | 0 .../templates/corpora/_breadcrumbs.html.j2 | 0 .../templates/corpora/add_corpus.html.j2 | 0 .../templates/corpora/add_corpus_file.html.j2 | 0 .../templates/corpora/analyse_corpus.html.j2 | 0 {web/app => app}/templates/corpora/corpus.html.j2 | 0 .../templates/corpora/corpus_file.html.j2 | 0 .../templates/corpora/import_corpus.html.j2 | 0 .../corpora/interactions/analysis.html.j2 | 0 .../templates/corpora/interactions/cite.html.j2 | 0 .../templates/corpora/interactions/create.html.j2 | 0 .../corpora/interactions/display.html.j2 | 0 .../templates/corpora/interactions/export.html.j2 | 0 .../templates/corpora/interactions/infos.html.j2 | 0 .../corpora/interactions/scroll_to_top.html.j2 | 0 .../corpora/query_results/_breadcrumbs.html.j2 | 0 .../query_results/add_query_result.html.j2 | 0 .../corpora/query_results/inspect.html.j2 | 0 .../corpora/query_results/query_result.html.j2 | 0 {web/app => app}/templates/errors/403.html.j2 | 0 {web/app => app}/templates/errors/404.html.j2 | 0 {web/app => app}/templates/errors/413.html.j2 | 0 {web/app => app}/templates/errors/500.html.j2 | 0 .../templates/jobs/_breadcrumbs.html.j2 | 0 {web/app => app}/templates/jobs/job.html.j2 | 0 .../templates/main/_breadcrumbs.html.j2 | 0 .../templates/main/about_and_faq.html.j2 | 0 {web/app => app}/templates/main/dashboard.html.j2 | 0 {web/app => app}/templates/main/index.html.j2 | 0 {web/app => app}/templates/main/news.html.j2 | 0 .../templates/main/privacy_policy.html.j2 | 0 .../templates/main/terms_of_use.html.j2 | 0 .../templates/materialize/base.html.j2 | 0 .../app => app}/templates/materialize/wtf.html.j2 | 0 .../templates/modals/analysis_init.html.j2 | 0 .../templates/modals/context_modal.html.j2 | 0 .../templates/modals/export_query_results.html.j2 | 0 .../templates/modals/query_builder.html.j2 | 0 .../templates/modals/show_corpus_files.html.j2 | 0 .../templates/modals/show_metadata.html.j2 | 0 .../templates/modals/show_text_details.html.j2 | 0 .../templates/services/_breadcrumbs.html.j2 | 0 .../templates/services/corpus_analysis.html.j2 | 0 .../templates/services/file_setup.html.j2 | 0 {web/app => app}/templates/services/nlp.html.j2 | 0 {web/app => app}/templates/services/ocr.html.j2 | 0 .../templates/settings/_breadcrumbs.html.j2 | 0 {web/app => app}/templates/settings/_menu.html.j2 | 0 .../templates/settings/change_password.html.j2 | 0 .../settings/edit_general_settings.html.j2 | 0 .../settings/edit_notification_settings.html.j2 | 0 .../templates/tables/query_results.html.j2 | 0 .../templates/tasks/email/notification.html.j2 | 0 .../templates/tasks/email/notification.txt.j2 | 0 web/boot.sh => boot.sh | 0 web/config.py => config.py | 0 docker-compose.development.yml | 14 +++++++------- docker-compose.yml | 6 +++--- {web/migrations => migrations}/README | 0 {web/migrations => migrations}/alembic.ini | 0 {web/migrations => migrations}/env.py | 0 {web/migrations => migrations}/script.py.mako | 0 .../versions/099037c4aa06_.py | 0 .../versions/0aa38a7973c5_.py | 0 .../versions/0d7aed934679_.py | 0 .../versions/10a92d8f4616_.py | 0 .../versions/1210adfe1e34_.py | 0 .../versions/318074622d14_.py | 0 .../versions/33ec4d09b4ca_.py | 0 .../versions/389bcf564726_.py | 0 .../versions/3d9a20b8b26c_.py | 0 .../versions/421ba4373e50_.py | 0 .../versions/4638e6509e13_.py | 0 .../versions/471aa04c1a92_.py | 0 .../versions/4886241e0f5d_.py | 0 .../versions/49a42c69e523_.py | 0 .../versions/4cf5e5606a83_.py | 0 .../versions/55d2b1a82ba9_.py | 0 .../versions/5ba6786a847e_.py | 0 .../versions/62233e0cb2c7_.py | 0 .../versions/6227310c2112_.py | 0 .../versions/66253783654f_.py | 0 .../versions/68772b6560c3_.py | 0 .../versions/6c2227f1cc77_.py | 0 .../versions/7378391345fa_.py | 0 .../versions/776761fb7466_.py | 0 .../versions/790ce9512e75_.py | 0 .../versions/8b2e0d43384a_.py | 0 .../versions/9d21b228d353_.py | 0 .../versions/abf60427ff84_.py | 0 .../versions/b15366b25bea_.py | 0 .../versions/befe5326787e_.py | 0 .../versions/c3827cddea6e_.py | 0 .../versions/da9fd175af8c_.py | 0 .../versions/ded5a37f8a7b_.py | 0 .../versions/e256f5cac75d_.py | 0 .../versions/ecaf75fece7b_.py | 0 web/nopaque-daemon.sh => nopaque-daemon.sh | 0 web/nopaque.py => nopaque.py | 0 web/requirements.txt => requirements.txt | 0 {web/tests => tests}/__init__.py | 0 {web/tests => tests}/test_basics.py | 0 {web/tests => tests}/test_client.py | 0 {web/tests => tests}/test_user_model.py | 0 web/.dockerignore | 6 ------ web/.flaskenv | 1 - 231 files changed, 26 insertions(+), 23 deletions(-) create mode 100644 .dockerignore rename web/Dockerfile => Dockerfile (69%) rename {web/app => app}/__init__.py (100%) rename {web/app => app}/admin/__init__.py (100%) rename {web/app => app}/admin/forms.py (100%) rename {web/app => app}/admin/views.py (100%) rename {web/app => app}/auth/__init__.py (100%) rename {web/app => app}/auth/forms.py (100%) rename {web/app => app}/auth/views.py (100%) rename {web/app => app}/corpora/__init__.py (100%) rename {web/app => app}/corpora/events.py (100%) rename {web/app => app}/corpora/events2.py (100%) rename {web/app => app}/corpora/forms.py (100%) rename {web/app => app}/corpora/import_corpus.py (100%) rename {web/app => app}/corpora/tasks.py (100%) rename {web/app => app}/corpora/views.py (100%) rename {web/app => app}/decorators.py (100%) rename {web/app => app}/email.py (100%) rename {web/app => app}/errors/__init__.py (100%) rename {web/app => app}/errors/handlers.py (100%) rename {web/app => app}/events.py (100%) rename {web/app => app}/jobs/__init__.py (100%) rename {web/app => app}/jobs/tasks.py (100%) rename {web/app => app}/jobs/views.py (100%) rename {web/app => app}/main/__init__.py (100%) rename {web/app => app}/main/views.py (100%) rename {web/app => app}/models.py (100%) rename {web/app => app}/services/__init__.py (100%) rename {web/app => app}/services/forms.py (100%) rename {web/app => app}/services/views.py (100%) rename {web/app => app}/settings/__init__.py (100%) rename {web/app => app}/settings/forms.py (100%) rename {web/app => app}/settings/tasks.py (100%) rename {web/app => app}/settings/views.py (100%) rename {web/app => app}/static/css/material_icons.css (100%) rename {web/app => app}/static/css/materialize.min.css (100%) rename {web/app => app}/static/css/materialize_fixes.css (100%) rename {web/app => app}/static/css/nopaque.css (100%) rename {web/app => app}/static/css/nopaque_icons.css (100%) rename {web/app => app}/static/css/sidenav_fixed.css (100%) rename {web/app => app}/static/css/sticky_footer.css (100%) rename {web/app => app}/static/fonts/material_icons/MaterialIcons-Regular.ttf (100%) rename {web/app => app}/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf (100%) rename {web/app => app}/static/fonts/material_icons/MaterialIconsRound-Regular.otf (100%) rename {web/app => app}/static/fonts/material_icons/MaterialIconsSharp-Regular.otf (100%) rename {web/app => app}/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf (100%) rename {web/app => app}/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf (100%) rename {web/app => app}/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff (100%) rename {web/app => app}/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 (100%) rename {web/app => app}/static/images/logo_-_dfg.gif (100%) rename {web/app => app}/static/images/logo_-_sfb_1288.png (100%) rename {web/app => app}/static/images/nopaque_-_favicon.png (100%) rename {web/app => app}/static/images/nopaque_-_logo.svg (100%) rename {web/app => app}/static/images/nopaque_-_logo_name_slogan.svg (100%) rename {web/app => app}/static/images/parallax_hq/book_text_read_paper.jpg (100%) rename {web/app => app}/static/images/parallax_hq/books_antique_book_old.jpg (100%) rename {web/app => app}/static/images/parallax_hq/concept_document_focus_letter.jpg (100%) rename {web/app => app}/static/images/parallax_hq/text_data_wide.png (100%) rename {web/app => app}/static/images/parallax_lq/01_books_antique_book_old.jpg (100%) rename {web/app => app}/static/images/parallax_lq/02_concept_document_focus_letter.jpg (100%) rename {web/app => app}/static/images/parallax_lq/03_text_data_wide.png (100%) rename {web/app => app}/static/images/parallax_lq/04_german_text_book_paper.jpg (100%) rename {web/app => app}/static/images/parallax_lq/05_chapter_book_text_tale.jpg (100%) rename {web/app => app}/static/images/parallax_lq/bible_text.jpg (100%) rename {web/app => app}/static/images/parallax_lq/text_data.png (100%) rename {web/app => app}/static/images/qr_-_inf.svg (100%) rename {web/app => app}/static/images/server_activity.png (100%) rename {web/app => app}/static/images/sfb_background.jpeg (100%) rename {web/app => app}/static/images/workflow.png (100%) rename {web/app => app}/static/js/darkreader.js (100%) rename {web/app => app}/static/js/jsonpatch.min.js (100%) rename {web/app => app}/static/js/list.min.js (100%) rename {web/app => app}/static/js/list.min.js.map (100%) rename {web/app => app}/static/js/materialize.min.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/client/Client.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/client/callbacks.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/client/listeners.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/model/Results.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/view/ResultsView.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/view/callbacks.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/view/listeners.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/view/scrollToTop.js (100%) rename {web/app => app}/static/js/modules/corpus_analysis/view/spinner.js (100%) rename {web/app => app}/static/js/nopaque/RessourceDisplays/CorpusDisplay.js (100%) rename {web/app => app}/static/js/nopaque/RessourceDisplays/JobDisplay.js (100%) rename {web/app => app}/static/js/nopaque/RessourceDisplays/RessourceDisplay.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/CorpusFileList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/CorpusList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/JobInputList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/JobList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/JobResultList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/QueryResultList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/RessourceList.js (100%) rename {web/app => app}/static/js/nopaque/RessourceLists/UserList.js (100%) rename {web/app => app}/static/js/nopaque/main.js (100%) rename {web/app => app}/static/js/socket.io.min.js (100%) rename {web/app => app}/static/js/socket.io.min.js.map (100%) rename {web/app => app}/static/json_schema/combined_ners_tags.txt (100%) rename {web/app => app}/static/json_schema/nopaque_cqi_py_results_schema.json (100%) rename {web/app => app}/tasks/__init__.py (100%) rename {web/app => app}/tasks/corpus_utils.py (100%) rename {web/app => app}/tasks/job_utils.py (100%) rename {web/app => app}/templates/_colors.html.j2 (100%) rename {web/app => app}/templates/_footer.html.j2 (100%) rename {web/app => app}/templates/_navbar.html.j2 (100%) rename {web/app => app}/templates/_roadmap.html.j2 (100%) rename {web/app => app}/templates/_scripts.html.j2 (100%) rename {web/app => app}/templates/_sidenav.html.j2 (100%) rename {web/app => app}/templates/_styles.html.j2 (100%) rename {web/app => app}/templates/admin/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/admin/edit_user.html.j2 (100%) rename {web/app => app}/templates/admin/user.html.j2 (100%) rename {web/app => app}/templates/admin/users.html.j2 (100%) rename {web/app => app}/templates/auth/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/auth/email/confirm.html.j2 (100%) rename {web/app => app}/templates/auth/email/confirm.txt.j2 (100%) rename {web/app => app}/templates/auth/email/reset_password.html.j2 (100%) rename {web/app => app}/templates/auth/email/reset_password.txt.j2 (100%) rename {web/app => app}/templates/auth/login.html.j2 (100%) rename {web/app => app}/templates/auth/register.html.j2 (100%) rename {web/app => app}/templates/auth/reset_password.html.j2 (100%) rename {web/app => app}/templates/auth/reset_password_request.html.j2 (100%) rename {web/app => app}/templates/auth/unconfirmed.html.j2 (100%) rename {web/app => app}/templates/base.html.j2 (100%) rename {web/app => app}/templates/corpora/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/corpora/add_corpus.html.j2 (100%) rename {web/app => app}/templates/corpora/add_corpus_file.html.j2 (100%) rename {web/app => app}/templates/corpora/analyse_corpus.html.j2 (100%) rename {web/app => app}/templates/corpora/corpus.html.j2 (100%) rename {web/app => app}/templates/corpora/corpus_file.html.j2 (100%) rename {web/app => app}/templates/corpora/import_corpus.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/analysis.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/cite.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/create.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/display.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/export.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/infos.html.j2 (100%) rename {web/app => app}/templates/corpora/interactions/scroll_to_top.html.j2 (100%) rename {web/app => app}/templates/corpora/query_results/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/corpora/query_results/add_query_result.html.j2 (100%) rename {web/app => app}/templates/corpora/query_results/inspect.html.j2 (100%) rename {web/app => app}/templates/corpora/query_results/query_result.html.j2 (100%) rename {web/app => app}/templates/errors/403.html.j2 (100%) rename {web/app => app}/templates/errors/404.html.j2 (100%) rename {web/app => app}/templates/errors/413.html.j2 (100%) rename {web/app => app}/templates/errors/500.html.j2 (100%) rename {web/app => app}/templates/jobs/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/jobs/job.html.j2 (100%) rename {web/app => app}/templates/main/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/main/about_and_faq.html.j2 (100%) rename {web/app => app}/templates/main/dashboard.html.j2 (100%) rename {web/app => app}/templates/main/index.html.j2 (100%) rename {web/app => app}/templates/main/news.html.j2 (100%) rename {web/app => app}/templates/main/privacy_policy.html.j2 (100%) rename {web/app => app}/templates/main/terms_of_use.html.j2 (100%) rename {web/app => app}/templates/materialize/base.html.j2 (100%) rename {web/app => app}/templates/materialize/wtf.html.j2 (100%) rename {web/app => app}/templates/modals/analysis_init.html.j2 (100%) rename {web/app => app}/templates/modals/context_modal.html.j2 (100%) rename {web/app => app}/templates/modals/export_query_results.html.j2 (100%) rename {web/app => app}/templates/modals/query_builder.html.j2 (100%) rename {web/app => app}/templates/modals/show_corpus_files.html.j2 (100%) rename {web/app => app}/templates/modals/show_metadata.html.j2 (100%) rename {web/app => app}/templates/modals/show_text_details.html.j2 (100%) rename {web/app => app}/templates/services/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/services/corpus_analysis.html.j2 (100%) rename {web/app => app}/templates/services/file_setup.html.j2 (100%) rename {web/app => app}/templates/services/nlp.html.j2 (100%) rename {web/app => app}/templates/services/ocr.html.j2 (100%) rename {web/app => app}/templates/settings/_breadcrumbs.html.j2 (100%) rename {web/app => app}/templates/settings/_menu.html.j2 (100%) rename {web/app => app}/templates/settings/change_password.html.j2 (100%) rename {web/app => app}/templates/settings/edit_general_settings.html.j2 (100%) rename {web/app => app}/templates/settings/edit_notification_settings.html.j2 (100%) rename {web/app => app}/templates/tables/query_results.html.j2 (100%) rename {web/app => app}/templates/tasks/email/notification.html.j2 (100%) rename {web/app => app}/templates/tasks/email/notification.txt.j2 (100%) rename web/boot.sh => boot.sh (100%) rename web/config.py => config.py (100%) rename {web/migrations => migrations}/README (100%) rename {web/migrations => migrations}/alembic.ini (100%) rename {web/migrations => migrations}/env.py (100%) rename {web/migrations => migrations}/script.py.mako (100%) rename {web/migrations => migrations}/versions/099037c4aa06_.py (100%) rename {web/migrations => migrations}/versions/0aa38a7973c5_.py (100%) rename {web/migrations => migrations}/versions/0d7aed934679_.py (100%) rename {web/migrations => migrations}/versions/10a92d8f4616_.py (100%) rename {web/migrations => migrations}/versions/1210adfe1e34_.py (100%) rename {web/migrations => migrations}/versions/318074622d14_.py (100%) rename {web/migrations => migrations}/versions/33ec4d09b4ca_.py (100%) rename {web/migrations => migrations}/versions/389bcf564726_.py (100%) rename {web/migrations => migrations}/versions/3d9a20b8b26c_.py (100%) rename {web/migrations => migrations}/versions/421ba4373e50_.py (100%) rename {web/migrations => migrations}/versions/4638e6509e13_.py (100%) rename {web/migrations => migrations}/versions/471aa04c1a92_.py (100%) rename {web/migrations => migrations}/versions/4886241e0f5d_.py (100%) rename {web/migrations => migrations}/versions/49a42c69e523_.py (100%) rename {web/migrations => migrations}/versions/4cf5e5606a83_.py (100%) rename {web/migrations => migrations}/versions/55d2b1a82ba9_.py (100%) rename {web/migrations => migrations}/versions/5ba6786a847e_.py (100%) rename {web/migrations => migrations}/versions/62233e0cb2c7_.py (100%) rename {web/migrations => migrations}/versions/6227310c2112_.py (100%) rename {web/migrations => migrations}/versions/66253783654f_.py (100%) rename {web/migrations => migrations}/versions/68772b6560c3_.py (100%) rename {web/migrations => migrations}/versions/6c2227f1cc77_.py (100%) rename {web/migrations => migrations}/versions/7378391345fa_.py (100%) rename {web/migrations => migrations}/versions/776761fb7466_.py (100%) rename {web/migrations => migrations}/versions/790ce9512e75_.py (100%) rename {web/migrations => migrations}/versions/8b2e0d43384a_.py (100%) rename {web/migrations => migrations}/versions/9d21b228d353_.py (100%) rename {web/migrations => migrations}/versions/abf60427ff84_.py (100%) rename {web/migrations => migrations}/versions/b15366b25bea_.py (100%) rename {web/migrations => migrations}/versions/befe5326787e_.py (100%) rename {web/migrations => migrations}/versions/c3827cddea6e_.py (100%) rename {web/migrations => migrations}/versions/da9fd175af8c_.py (100%) rename {web/migrations => migrations}/versions/ded5a37f8a7b_.py (100%) rename {web/migrations => migrations}/versions/e256f5cac75d_.py (100%) rename {web/migrations => migrations}/versions/ecaf75fece7b_.py (100%) rename web/nopaque-daemon.sh => nopaque-daemon.sh (100%) rename web/nopaque.py => nopaque.py (100%) rename web/requirements.txt => requirements.txt (100%) rename {web/tests => tests}/__init__.py (100%) rename {web/tests => tests}/test_basics.py (100%) rename {web/tests => tests}/test_client.py (100%) rename {web/tests => tests}/test_user_model.py (100%) delete mode 100644 web/.dockerignore delete mode 100644 web/.flaskenv diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..1269488f --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +data diff --git a/.env.tpl b/.env.tpl index 8c6a3b60..ad27fb60 100644 --- a/.env.tpl +++ b/.env.tpl @@ -1,11 +1,11 @@ ################################################################################ # Docker # ################################################################################ -# DEFAULT: ./db +# DEFAULT: ./data/db # NOTE: Use `.` as # HOST_DB_DIR= -# DEFAULT: ./mq +# DEFAULT: ./data/mq # NOTE: Use `.` as # HOST_MQ_DIR= diff --git a/web/Dockerfile b/Dockerfile similarity index 69% rename from web/Dockerfile rename to Dockerfile index d5de0392..cec71a3f 100644 --- a/web/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ARG GID ENV LANG=C.UTF-8 -EXPOSE 5000 +ENV FLASK_APP nopaque.py RUN apt-get update \ @@ -26,10 +26,17 @@ RUN groupadd --gid ${DOCKER_GID} --system docker \ USER nopaque WORKDIR /home/nopaque - -COPY --chown=nopaque:nopaque [".", "."] +COPY --chown=nopaque:nopaque requirements.txt ./ RUN python -m venv venv \ && venv/bin/pip install --requirement requirements.txt +COPY --chown=nopaque:nopaque app app +COPY --chown=nopaque:nopaque migrations migrations +COPY --chown=nopaque:nopaque tests tests +COPY --chown=nopaque:nopaque boot.sh config.py nopaque-daemon.sh nopaque.py ./ + + +# run-time configuration +EXPOSE 5000 ENTRYPOINT ["./boot.sh"] diff --git a/README.md b/README.md index f991459a..91473370 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,8 @@ username@hostname:~$ sudo mount --types cifs --options gid=${USER},password=nopa ``` bash # Clone the nopaque repository username@hostname:~$ git clone https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git +# Create data directories for the database and message queue +username@hostname:~$ mkdir data/{db,mq} username@hostname:~$ cp db.env.tpl db.env username@hostname:~$ cp .env.tpl .env # Fill out the variables within these files. @@ -58,7 +60,7 @@ username@hostname:~$ docker-compose build touch nopaque.log nopaqued.log # For background execution add the -d flag username@hostname:~$ docker-compose up -# To scale your app use +# To scale your app use the following command after starting it normally username@hostname:~$ docker-compose -f docker-compose.yml \ -f docker-compose.override.yml -f docker-compose.scale.yml diff --git a/web/app/__init__.py b/app/__init__.py similarity index 100% rename from web/app/__init__.py rename to app/__init__.py diff --git a/web/app/admin/__init__.py b/app/admin/__init__.py similarity index 100% rename from web/app/admin/__init__.py rename to app/admin/__init__.py diff --git a/web/app/admin/forms.py b/app/admin/forms.py similarity index 100% rename from web/app/admin/forms.py rename to app/admin/forms.py diff --git a/web/app/admin/views.py b/app/admin/views.py similarity index 100% rename from web/app/admin/views.py rename to app/admin/views.py diff --git a/web/app/auth/__init__.py b/app/auth/__init__.py similarity index 100% rename from web/app/auth/__init__.py rename to app/auth/__init__.py diff --git a/web/app/auth/forms.py b/app/auth/forms.py similarity index 100% rename from web/app/auth/forms.py rename to app/auth/forms.py diff --git a/web/app/auth/views.py b/app/auth/views.py similarity index 100% rename from web/app/auth/views.py rename to app/auth/views.py diff --git a/web/app/corpora/__init__.py b/app/corpora/__init__.py similarity index 100% rename from web/app/corpora/__init__.py rename to app/corpora/__init__.py diff --git a/web/app/corpora/events.py b/app/corpora/events.py similarity index 100% rename from web/app/corpora/events.py rename to app/corpora/events.py diff --git a/web/app/corpora/events2.py b/app/corpora/events2.py similarity index 100% rename from web/app/corpora/events2.py rename to app/corpora/events2.py diff --git a/web/app/corpora/forms.py b/app/corpora/forms.py similarity index 100% rename from web/app/corpora/forms.py rename to app/corpora/forms.py diff --git a/web/app/corpora/import_corpus.py b/app/corpora/import_corpus.py similarity index 100% rename from web/app/corpora/import_corpus.py rename to app/corpora/import_corpus.py diff --git a/web/app/corpora/tasks.py b/app/corpora/tasks.py similarity index 100% rename from web/app/corpora/tasks.py rename to app/corpora/tasks.py diff --git a/web/app/corpora/views.py b/app/corpora/views.py similarity index 100% rename from web/app/corpora/views.py rename to app/corpora/views.py diff --git a/web/app/decorators.py b/app/decorators.py similarity index 100% rename from web/app/decorators.py rename to app/decorators.py diff --git a/web/app/email.py b/app/email.py similarity index 100% rename from web/app/email.py rename to app/email.py diff --git a/web/app/errors/__init__.py b/app/errors/__init__.py similarity index 100% rename from web/app/errors/__init__.py rename to app/errors/__init__.py diff --git a/web/app/errors/handlers.py b/app/errors/handlers.py similarity index 100% rename from web/app/errors/handlers.py rename to app/errors/handlers.py diff --git a/web/app/events.py b/app/events.py similarity index 100% rename from web/app/events.py rename to app/events.py diff --git a/web/app/jobs/__init__.py b/app/jobs/__init__.py similarity index 100% rename from web/app/jobs/__init__.py rename to app/jobs/__init__.py diff --git a/web/app/jobs/tasks.py b/app/jobs/tasks.py similarity index 100% rename from web/app/jobs/tasks.py rename to app/jobs/tasks.py diff --git a/web/app/jobs/views.py b/app/jobs/views.py similarity index 100% rename from web/app/jobs/views.py rename to app/jobs/views.py diff --git a/web/app/main/__init__.py b/app/main/__init__.py similarity index 100% rename from web/app/main/__init__.py rename to app/main/__init__.py diff --git a/web/app/main/views.py b/app/main/views.py similarity index 100% rename from web/app/main/views.py rename to app/main/views.py diff --git a/web/app/models.py b/app/models.py similarity index 100% rename from web/app/models.py rename to app/models.py diff --git a/web/app/services/__init__.py b/app/services/__init__.py similarity index 100% rename from web/app/services/__init__.py rename to app/services/__init__.py diff --git a/web/app/services/forms.py b/app/services/forms.py similarity index 100% rename from web/app/services/forms.py rename to app/services/forms.py diff --git a/web/app/services/views.py b/app/services/views.py similarity index 100% rename from web/app/services/views.py rename to app/services/views.py diff --git a/web/app/settings/__init__.py b/app/settings/__init__.py similarity index 100% rename from web/app/settings/__init__.py rename to app/settings/__init__.py diff --git a/web/app/settings/forms.py b/app/settings/forms.py similarity index 100% rename from web/app/settings/forms.py rename to app/settings/forms.py diff --git a/web/app/settings/tasks.py b/app/settings/tasks.py similarity index 100% rename from web/app/settings/tasks.py rename to app/settings/tasks.py diff --git a/web/app/settings/views.py b/app/settings/views.py similarity index 100% rename from web/app/settings/views.py rename to app/settings/views.py diff --git a/web/app/static/css/material_icons.css b/app/static/css/material_icons.css similarity index 100% rename from web/app/static/css/material_icons.css rename to app/static/css/material_icons.css diff --git a/web/app/static/css/materialize.min.css b/app/static/css/materialize.min.css similarity index 100% rename from web/app/static/css/materialize.min.css rename to app/static/css/materialize.min.css diff --git a/web/app/static/css/materialize_fixes.css b/app/static/css/materialize_fixes.css similarity index 100% rename from web/app/static/css/materialize_fixes.css rename to app/static/css/materialize_fixes.css diff --git a/web/app/static/css/nopaque.css b/app/static/css/nopaque.css similarity index 100% rename from web/app/static/css/nopaque.css rename to app/static/css/nopaque.css diff --git a/web/app/static/css/nopaque_icons.css b/app/static/css/nopaque_icons.css similarity index 100% rename from web/app/static/css/nopaque_icons.css rename to app/static/css/nopaque_icons.css diff --git a/web/app/static/css/sidenav_fixed.css b/app/static/css/sidenav_fixed.css similarity index 100% rename from web/app/static/css/sidenav_fixed.css rename to app/static/css/sidenav_fixed.css diff --git a/web/app/static/css/sticky_footer.css b/app/static/css/sticky_footer.css similarity index 100% rename from web/app/static/css/sticky_footer.css rename to app/static/css/sticky_footer.css diff --git a/web/app/static/fonts/material_icons/MaterialIcons-Regular.ttf b/app/static/fonts/material_icons/MaterialIcons-Regular.ttf similarity index 100% rename from web/app/static/fonts/material_icons/MaterialIcons-Regular.ttf rename to app/static/fonts/material_icons/MaterialIcons-Regular.ttf diff --git a/web/app/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf b/app/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf similarity index 100% rename from web/app/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf rename to app/static/fonts/material_icons/MaterialIconsOutlined-Regular.otf diff --git a/web/app/static/fonts/material_icons/MaterialIconsRound-Regular.otf b/app/static/fonts/material_icons/MaterialIconsRound-Regular.otf similarity index 100% rename from web/app/static/fonts/material_icons/MaterialIconsRound-Regular.otf rename to app/static/fonts/material_icons/MaterialIconsRound-Regular.otf diff --git a/web/app/static/fonts/material_icons/MaterialIconsSharp-Regular.otf b/app/static/fonts/material_icons/MaterialIconsSharp-Regular.otf similarity index 100% rename from web/app/static/fonts/material_icons/MaterialIconsSharp-Regular.otf rename to app/static/fonts/material_icons/MaterialIconsSharp-Regular.otf diff --git a/web/app/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf b/app/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf similarity index 100% rename from web/app/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf rename to app/static/fonts/material_icons/MaterialIconsTwoTone-Regular.otf diff --git a/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf b/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf similarity index 100% rename from web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf rename to app/static/fonts/nopaque_icons/nopaqueIcons-Regular.otf diff --git a/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff b/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff similarity index 100% rename from web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff rename to app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff diff --git a/web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 b/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 similarity index 100% rename from web/app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 rename to app/static/fonts/nopaque_icons/nopaqueIcons-Regular.woff2 diff --git a/web/app/static/images/logo_-_dfg.gif b/app/static/images/logo_-_dfg.gif similarity index 100% rename from web/app/static/images/logo_-_dfg.gif rename to app/static/images/logo_-_dfg.gif diff --git a/web/app/static/images/logo_-_sfb_1288.png b/app/static/images/logo_-_sfb_1288.png similarity index 100% rename from web/app/static/images/logo_-_sfb_1288.png rename to app/static/images/logo_-_sfb_1288.png diff --git a/web/app/static/images/nopaque_-_favicon.png b/app/static/images/nopaque_-_favicon.png similarity index 100% rename from web/app/static/images/nopaque_-_favicon.png rename to app/static/images/nopaque_-_favicon.png diff --git a/web/app/static/images/nopaque_-_logo.svg b/app/static/images/nopaque_-_logo.svg similarity index 100% rename from web/app/static/images/nopaque_-_logo.svg rename to app/static/images/nopaque_-_logo.svg diff --git a/web/app/static/images/nopaque_-_logo_name_slogan.svg b/app/static/images/nopaque_-_logo_name_slogan.svg similarity index 100% rename from web/app/static/images/nopaque_-_logo_name_slogan.svg rename to app/static/images/nopaque_-_logo_name_slogan.svg diff --git a/web/app/static/images/parallax_hq/book_text_read_paper.jpg b/app/static/images/parallax_hq/book_text_read_paper.jpg similarity index 100% rename from web/app/static/images/parallax_hq/book_text_read_paper.jpg rename to app/static/images/parallax_hq/book_text_read_paper.jpg diff --git a/web/app/static/images/parallax_hq/books_antique_book_old.jpg b/app/static/images/parallax_hq/books_antique_book_old.jpg similarity index 100% rename from web/app/static/images/parallax_hq/books_antique_book_old.jpg rename to app/static/images/parallax_hq/books_antique_book_old.jpg diff --git a/web/app/static/images/parallax_hq/concept_document_focus_letter.jpg b/app/static/images/parallax_hq/concept_document_focus_letter.jpg similarity index 100% rename from web/app/static/images/parallax_hq/concept_document_focus_letter.jpg rename to app/static/images/parallax_hq/concept_document_focus_letter.jpg diff --git a/web/app/static/images/parallax_hq/text_data_wide.png b/app/static/images/parallax_hq/text_data_wide.png similarity index 100% rename from web/app/static/images/parallax_hq/text_data_wide.png rename to app/static/images/parallax_hq/text_data_wide.png diff --git a/web/app/static/images/parallax_lq/01_books_antique_book_old.jpg b/app/static/images/parallax_lq/01_books_antique_book_old.jpg similarity index 100% rename from web/app/static/images/parallax_lq/01_books_antique_book_old.jpg rename to app/static/images/parallax_lq/01_books_antique_book_old.jpg diff --git a/web/app/static/images/parallax_lq/02_concept_document_focus_letter.jpg b/app/static/images/parallax_lq/02_concept_document_focus_letter.jpg similarity index 100% rename from web/app/static/images/parallax_lq/02_concept_document_focus_letter.jpg rename to app/static/images/parallax_lq/02_concept_document_focus_letter.jpg diff --git a/web/app/static/images/parallax_lq/03_text_data_wide.png b/app/static/images/parallax_lq/03_text_data_wide.png similarity index 100% rename from web/app/static/images/parallax_lq/03_text_data_wide.png rename to app/static/images/parallax_lq/03_text_data_wide.png diff --git a/web/app/static/images/parallax_lq/04_german_text_book_paper.jpg b/app/static/images/parallax_lq/04_german_text_book_paper.jpg similarity index 100% rename from web/app/static/images/parallax_lq/04_german_text_book_paper.jpg rename to app/static/images/parallax_lq/04_german_text_book_paper.jpg diff --git a/web/app/static/images/parallax_lq/05_chapter_book_text_tale.jpg b/app/static/images/parallax_lq/05_chapter_book_text_tale.jpg similarity index 100% rename from web/app/static/images/parallax_lq/05_chapter_book_text_tale.jpg rename to app/static/images/parallax_lq/05_chapter_book_text_tale.jpg diff --git a/web/app/static/images/parallax_lq/bible_text.jpg b/app/static/images/parallax_lq/bible_text.jpg similarity index 100% rename from web/app/static/images/parallax_lq/bible_text.jpg rename to app/static/images/parallax_lq/bible_text.jpg diff --git a/web/app/static/images/parallax_lq/text_data.png b/app/static/images/parallax_lq/text_data.png similarity index 100% rename from web/app/static/images/parallax_lq/text_data.png rename to app/static/images/parallax_lq/text_data.png diff --git a/web/app/static/images/qr_-_inf.svg b/app/static/images/qr_-_inf.svg similarity index 100% rename from web/app/static/images/qr_-_inf.svg rename to app/static/images/qr_-_inf.svg diff --git a/web/app/static/images/server_activity.png b/app/static/images/server_activity.png similarity index 100% rename from web/app/static/images/server_activity.png rename to app/static/images/server_activity.png diff --git a/web/app/static/images/sfb_background.jpeg b/app/static/images/sfb_background.jpeg similarity index 100% rename from web/app/static/images/sfb_background.jpeg rename to app/static/images/sfb_background.jpeg diff --git a/web/app/static/images/workflow.png b/app/static/images/workflow.png similarity index 100% rename from web/app/static/images/workflow.png rename to app/static/images/workflow.png diff --git a/web/app/static/js/darkreader.js b/app/static/js/darkreader.js similarity index 100% rename from web/app/static/js/darkreader.js rename to app/static/js/darkreader.js diff --git a/web/app/static/js/jsonpatch.min.js b/app/static/js/jsonpatch.min.js similarity index 100% rename from web/app/static/js/jsonpatch.min.js rename to app/static/js/jsonpatch.min.js diff --git a/web/app/static/js/list.min.js b/app/static/js/list.min.js similarity index 100% rename from web/app/static/js/list.min.js rename to app/static/js/list.min.js diff --git a/web/app/static/js/list.min.js.map b/app/static/js/list.min.js.map similarity index 100% rename from web/app/static/js/list.min.js.map rename to app/static/js/list.min.js.map diff --git a/web/app/static/js/materialize.min.js b/app/static/js/materialize.min.js similarity index 100% rename from web/app/static/js/materialize.min.js rename to app/static/js/materialize.min.js diff --git a/web/app/static/js/modules/corpus_analysis/client/Client.js b/app/static/js/modules/corpus_analysis/client/Client.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/client/Client.js rename to app/static/js/modules/corpus_analysis/client/Client.js diff --git a/web/app/static/js/modules/corpus_analysis/client/callbacks.js b/app/static/js/modules/corpus_analysis/client/callbacks.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/client/callbacks.js rename to app/static/js/modules/corpus_analysis/client/callbacks.js diff --git a/web/app/static/js/modules/corpus_analysis/client/listeners.js b/app/static/js/modules/corpus_analysis/client/listeners.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/client/listeners.js rename to app/static/js/modules/corpus_analysis/client/listeners.js diff --git a/web/app/static/js/modules/corpus_analysis/model/Results.js b/app/static/js/modules/corpus_analysis/model/Results.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/model/Results.js rename to app/static/js/modules/corpus_analysis/model/Results.js diff --git a/web/app/static/js/modules/corpus_analysis/view/ResultsView.js b/app/static/js/modules/corpus_analysis/view/ResultsView.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/view/ResultsView.js rename to app/static/js/modules/corpus_analysis/view/ResultsView.js diff --git a/web/app/static/js/modules/corpus_analysis/view/callbacks.js b/app/static/js/modules/corpus_analysis/view/callbacks.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/view/callbacks.js rename to app/static/js/modules/corpus_analysis/view/callbacks.js diff --git a/web/app/static/js/modules/corpus_analysis/view/listeners.js b/app/static/js/modules/corpus_analysis/view/listeners.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/view/listeners.js rename to app/static/js/modules/corpus_analysis/view/listeners.js diff --git a/web/app/static/js/modules/corpus_analysis/view/scrollToTop.js b/app/static/js/modules/corpus_analysis/view/scrollToTop.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/view/scrollToTop.js rename to app/static/js/modules/corpus_analysis/view/scrollToTop.js diff --git a/web/app/static/js/modules/corpus_analysis/view/spinner.js b/app/static/js/modules/corpus_analysis/view/spinner.js similarity index 100% rename from web/app/static/js/modules/corpus_analysis/view/spinner.js rename to app/static/js/modules/corpus_analysis/view/spinner.js diff --git a/web/app/static/js/nopaque/RessourceDisplays/CorpusDisplay.js b/app/static/js/nopaque/RessourceDisplays/CorpusDisplay.js similarity index 100% rename from web/app/static/js/nopaque/RessourceDisplays/CorpusDisplay.js rename to app/static/js/nopaque/RessourceDisplays/CorpusDisplay.js diff --git a/web/app/static/js/nopaque/RessourceDisplays/JobDisplay.js b/app/static/js/nopaque/RessourceDisplays/JobDisplay.js similarity index 100% rename from web/app/static/js/nopaque/RessourceDisplays/JobDisplay.js rename to app/static/js/nopaque/RessourceDisplays/JobDisplay.js diff --git a/web/app/static/js/nopaque/RessourceDisplays/RessourceDisplay.js b/app/static/js/nopaque/RessourceDisplays/RessourceDisplay.js similarity index 100% rename from web/app/static/js/nopaque/RessourceDisplays/RessourceDisplay.js rename to app/static/js/nopaque/RessourceDisplays/RessourceDisplay.js diff --git a/web/app/static/js/nopaque/RessourceLists/CorpusFileList.js b/app/static/js/nopaque/RessourceLists/CorpusFileList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/CorpusFileList.js rename to app/static/js/nopaque/RessourceLists/CorpusFileList.js diff --git a/web/app/static/js/nopaque/RessourceLists/CorpusList.js b/app/static/js/nopaque/RessourceLists/CorpusList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/CorpusList.js rename to app/static/js/nopaque/RessourceLists/CorpusList.js diff --git a/web/app/static/js/nopaque/RessourceLists/JobInputList.js b/app/static/js/nopaque/RessourceLists/JobInputList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/JobInputList.js rename to app/static/js/nopaque/RessourceLists/JobInputList.js diff --git a/web/app/static/js/nopaque/RessourceLists/JobList.js b/app/static/js/nopaque/RessourceLists/JobList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/JobList.js rename to app/static/js/nopaque/RessourceLists/JobList.js diff --git a/web/app/static/js/nopaque/RessourceLists/JobResultList.js b/app/static/js/nopaque/RessourceLists/JobResultList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/JobResultList.js rename to app/static/js/nopaque/RessourceLists/JobResultList.js diff --git a/web/app/static/js/nopaque/RessourceLists/QueryResultList.js b/app/static/js/nopaque/RessourceLists/QueryResultList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/QueryResultList.js rename to app/static/js/nopaque/RessourceLists/QueryResultList.js diff --git a/web/app/static/js/nopaque/RessourceLists/RessourceList.js b/app/static/js/nopaque/RessourceLists/RessourceList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/RessourceList.js rename to app/static/js/nopaque/RessourceLists/RessourceList.js diff --git a/web/app/static/js/nopaque/RessourceLists/UserList.js b/app/static/js/nopaque/RessourceLists/UserList.js similarity index 100% rename from web/app/static/js/nopaque/RessourceLists/UserList.js rename to app/static/js/nopaque/RessourceLists/UserList.js diff --git a/web/app/static/js/nopaque/main.js b/app/static/js/nopaque/main.js similarity index 100% rename from web/app/static/js/nopaque/main.js rename to app/static/js/nopaque/main.js diff --git a/web/app/static/js/socket.io.min.js b/app/static/js/socket.io.min.js similarity index 100% rename from web/app/static/js/socket.io.min.js rename to app/static/js/socket.io.min.js diff --git a/web/app/static/js/socket.io.min.js.map b/app/static/js/socket.io.min.js.map similarity index 100% rename from web/app/static/js/socket.io.min.js.map rename to app/static/js/socket.io.min.js.map diff --git a/web/app/static/json_schema/combined_ners_tags.txt b/app/static/json_schema/combined_ners_tags.txt similarity index 100% rename from web/app/static/json_schema/combined_ners_tags.txt rename to app/static/json_schema/combined_ners_tags.txt diff --git a/web/app/static/json_schema/nopaque_cqi_py_results_schema.json b/app/static/json_schema/nopaque_cqi_py_results_schema.json similarity index 100% rename from web/app/static/json_schema/nopaque_cqi_py_results_schema.json rename to app/static/json_schema/nopaque_cqi_py_results_schema.json diff --git a/web/app/tasks/__init__.py b/app/tasks/__init__.py similarity index 100% rename from web/app/tasks/__init__.py rename to app/tasks/__init__.py diff --git a/web/app/tasks/corpus_utils.py b/app/tasks/corpus_utils.py similarity index 100% rename from web/app/tasks/corpus_utils.py rename to app/tasks/corpus_utils.py diff --git a/web/app/tasks/job_utils.py b/app/tasks/job_utils.py similarity index 100% rename from web/app/tasks/job_utils.py rename to app/tasks/job_utils.py diff --git a/web/app/templates/_colors.html.j2 b/app/templates/_colors.html.j2 similarity index 100% rename from web/app/templates/_colors.html.j2 rename to app/templates/_colors.html.j2 diff --git a/web/app/templates/_footer.html.j2 b/app/templates/_footer.html.j2 similarity index 100% rename from web/app/templates/_footer.html.j2 rename to app/templates/_footer.html.j2 diff --git a/web/app/templates/_navbar.html.j2 b/app/templates/_navbar.html.j2 similarity index 100% rename from web/app/templates/_navbar.html.j2 rename to app/templates/_navbar.html.j2 diff --git a/web/app/templates/_roadmap.html.j2 b/app/templates/_roadmap.html.j2 similarity index 100% rename from web/app/templates/_roadmap.html.j2 rename to app/templates/_roadmap.html.j2 diff --git a/web/app/templates/_scripts.html.j2 b/app/templates/_scripts.html.j2 similarity index 100% rename from web/app/templates/_scripts.html.j2 rename to app/templates/_scripts.html.j2 diff --git a/web/app/templates/_sidenav.html.j2 b/app/templates/_sidenav.html.j2 similarity index 100% rename from web/app/templates/_sidenav.html.j2 rename to app/templates/_sidenav.html.j2 diff --git a/web/app/templates/_styles.html.j2 b/app/templates/_styles.html.j2 similarity index 100% rename from web/app/templates/_styles.html.j2 rename to app/templates/_styles.html.j2 diff --git a/web/app/templates/admin/_breadcrumbs.html.j2 b/app/templates/admin/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/admin/_breadcrumbs.html.j2 rename to app/templates/admin/_breadcrumbs.html.j2 diff --git a/web/app/templates/admin/edit_user.html.j2 b/app/templates/admin/edit_user.html.j2 similarity index 100% rename from web/app/templates/admin/edit_user.html.j2 rename to app/templates/admin/edit_user.html.j2 diff --git a/web/app/templates/admin/user.html.j2 b/app/templates/admin/user.html.j2 similarity index 100% rename from web/app/templates/admin/user.html.j2 rename to app/templates/admin/user.html.j2 diff --git a/web/app/templates/admin/users.html.j2 b/app/templates/admin/users.html.j2 similarity index 100% rename from web/app/templates/admin/users.html.j2 rename to app/templates/admin/users.html.j2 diff --git a/web/app/templates/auth/_breadcrumbs.html.j2 b/app/templates/auth/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/auth/_breadcrumbs.html.j2 rename to app/templates/auth/_breadcrumbs.html.j2 diff --git a/web/app/templates/auth/email/confirm.html.j2 b/app/templates/auth/email/confirm.html.j2 similarity index 100% rename from web/app/templates/auth/email/confirm.html.j2 rename to app/templates/auth/email/confirm.html.j2 diff --git a/web/app/templates/auth/email/confirm.txt.j2 b/app/templates/auth/email/confirm.txt.j2 similarity index 100% rename from web/app/templates/auth/email/confirm.txt.j2 rename to app/templates/auth/email/confirm.txt.j2 diff --git a/web/app/templates/auth/email/reset_password.html.j2 b/app/templates/auth/email/reset_password.html.j2 similarity index 100% rename from web/app/templates/auth/email/reset_password.html.j2 rename to app/templates/auth/email/reset_password.html.j2 diff --git a/web/app/templates/auth/email/reset_password.txt.j2 b/app/templates/auth/email/reset_password.txt.j2 similarity index 100% rename from web/app/templates/auth/email/reset_password.txt.j2 rename to app/templates/auth/email/reset_password.txt.j2 diff --git a/web/app/templates/auth/login.html.j2 b/app/templates/auth/login.html.j2 similarity index 100% rename from web/app/templates/auth/login.html.j2 rename to app/templates/auth/login.html.j2 diff --git a/web/app/templates/auth/register.html.j2 b/app/templates/auth/register.html.j2 similarity index 100% rename from web/app/templates/auth/register.html.j2 rename to app/templates/auth/register.html.j2 diff --git a/web/app/templates/auth/reset_password.html.j2 b/app/templates/auth/reset_password.html.j2 similarity index 100% rename from web/app/templates/auth/reset_password.html.j2 rename to app/templates/auth/reset_password.html.j2 diff --git a/web/app/templates/auth/reset_password_request.html.j2 b/app/templates/auth/reset_password_request.html.j2 similarity index 100% rename from web/app/templates/auth/reset_password_request.html.j2 rename to app/templates/auth/reset_password_request.html.j2 diff --git a/web/app/templates/auth/unconfirmed.html.j2 b/app/templates/auth/unconfirmed.html.j2 similarity index 100% rename from web/app/templates/auth/unconfirmed.html.j2 rename to app/templates/auth/unconfirmed.html.j2 diff --git a/web/app/templates/base.html.j2 b/app/templates/base.html.j2 similarity index 100% rename from web/app/templates/base.html.j2 rename to app/templates/base.html.j2 diff --git a/web/app/templates/corpora/_breadcrumbs.html.j2 b/app/templates/corpora/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/corpora/_breadcrumbs.html.j2 rename to app/templates/corpora/_breadcrumbs.html.j2 diff --git a/web/app/templates/corpora/add_corpus.html.j2 b/app/templates/corpora/add_corpus.html.j2 similarity index 100% rename from web/app/templates/corpora/add_corpus.html.j2 rename to app/templates/corpora/add_corpus.html.j2 diff --git a/web/app/templates/corpora/add_corpus_file.html.j2 b/app/templates/corpora/add_corpus_file.html.j2 similarity index 100% rename from web/app/templates/corpora/add_corpus_file.html.j2 rename to app/templates/corpora/add_corpus_file.html.j2 diff --git a/web/app/templates/corpora/analyse_corpus.html.j2 b/app/templates/corpora/analyse_corpus.html.j2 similarity index 100% rename from web/app/templates/corpora/analyse_corpus.html.j2 rename to app/templates/corpora/analyse_corpus.html.j2 diff --git a/web/app/templates/corpora/corpus.html.j2 b/app/templates/corpora/corpus.html.j2 similarity index 100% rename from web/app/templates/corpora/corpus.html.j2 rename to app/templates/corpora/corpus.html.j2 diff --git a/web/app/templates/corpora/corpus_file.html.j2 b/app/templates/corpora/corpus_file.html.j2 similarity index 100% rename from web/app/templates/corpora/corpus_file.html.j2 rename to app/templates/corpora/corpus_file.html.j2 diff --git a/web/app/templates/corpora/import_corpus.html.j2 b/app/templates/corpora/import_corpus.html.j2 similarity index 100% rename from web/app/templates/corpora/import_corpus.html.j2 rename to app/templates/corpora/import_corpus.html.j2 diff --git a/web/app/templates/corpora/interactions/analysis.html.j2 b/app/templates/corpora/interactions/analysis.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/analysis.html.j2 rename to app/templates/corpora/interactions/analysis.html.j2 diff --git a/web/app/templates/corpora/interactions/cite.html.j2 b/app/templates/corpora/interactions/cite.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/cite.html.j2 rename to app/templates/corpora/interactions/cite.html.j2 diff --git a/web/app/templates/corpora/interactions/create.html.j2 b/app/templates/corpora/interactions/create.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/create.html.j2 rename to app/templates/corpora/interactions/create.html.j2 diff --git a/web/app/templates/corpora/interactions/display.html.j2 b/app/templates/corpora/interactions/display.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/display.html.j2 rename to app/templates/corpora/interactions/display.html.j2 diff --git a/web/app/templates/corpora/interactions/export.html.j2 b/app/templates/corpora/interactions/export.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/export.html.j2 rename to app/templates/corpora/interactions/export.html.j2 diff --git a/web/app/templates/corpora/interactions/infos.html.j2 b/app/templates/corpora/interactions/infos.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/infos.html.j2 rename to app/templates/corpora/interactions/infos.html.j2 diff --git a/web/app/templates/corpora/interactions/scroll_to_top.html.j2 b/app/templates/corpora/interactions/scroll_to_top.html.j2 similarity index 100% rename from web/app/templates/corpora/interactions/scroll_to_top.html.j2 rename to app/templates/corpora/interactions/scroll_to_top.html.j2 diff --git a/web/app/templates/corpora/query_results/_breadcrumbs.html.j2 b/app/templates/corpora/query_results/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/corpora/query_results/_breadcrumbs.html.j2 rename to app/templates/corpora/query_results/_breadcrumbs.html.j2 diff --git a/web/app/templates/corpora/query_results/add_query_result.html.j2 b/app/templates/corpora/query_results/add_query_result.html.j2 similarity index 100% rename from web/app/templates/corpora/query_results/add_query_result.html.j2 rename to app/templates/corpora/query_results/add_query_result.html.j2 diff --git a/web/app/templates/corpora/query_results/inspect.html.j2 b/app/templates/corpora/query_results/inspect.html.j2 similarity index 100% rename from web/app/templates/corpora/query_results/inspect.html.j2 rename to app/templates/corpora/query_results/inspect.html.j2 diff --git a/web/app/templates/corpora/query_results/query_result.html.j2 b/app/templates/corpora/query_results/query_result.html.j2 similarity index 100% rename from web/app/templates/corpora/query_results/query_result.html.j2 rename to app/templates/corpora/query_results/query_result.html.j2 diff --git a/web/app/templates/errors/403.html.j2 b/app/templates/errors/403.html.j2 similarity index 100% rename from web/app/templates/errors/403.html.j2 rename to app/templates/errors/403.html.j2 diff --git a/web/app/templates/errors/404.html.j2 b/app/templates/errors/404.html.j2 similarity index 100% rename from web/app/templates/errors/404.html.j2 rename to app/templates/errors/404.html.j2 diff --git a/web/app/templates/errors/413.html.j2 b/app/templates/errors/413.html.j2 similarity index 100% rename from web/app/templates/errors/413.html.j2 rename to app/templates/errors/413.html.j2 diff --git a/web/app/templates/errors/500.html.j2 b/app/templates/errors/500.html.j2 similarity index 100% rename from web/app/templates/errors/500.html.j2 rename to app/templates/errors/500.html.j2 diff --git a/web/app/templates/jobs/_breadcrumbs.html.j2 b/app/templates/jobs/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/jobs/_breadcrumbs.html.j2 rename to app/templates/jobs/_breadcrumbs.html.j2 diff --git a/web/app/templates/jobs/job.html.j2 b/app/templates/jobs/job.html.j2 similarity index 100% rename from web/app/templates/jobs/job.html.j2 rename to app/templates/jobs/job.html.j2 diff --git a/web/app/templates/main/_breadcrumbs.html.j2 b/app/templates/main/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/main/_breadcrumbs.html.j2 rename to app/templates/main/_breadcrumbs.html.j2 diff --git a/web/app/templates/main/about_and_faq.html.j2 b/app/templates/main/about_and_faq.html.j2 similarity index 100% rename from web/app/templates/main/about_and_faq.html.j2 rename to app/templates/main/about_and_faq.html.j2 diff --git a/web/app/templates/main/dashboard.html.j2 b/app/templates/main/dashboard.html.j2 similarity index 100% rename from web/app/templates/main/dashboard.html.j2 rename to app/templates/main/dashboard.html.j2 diff --git a/web/app/templates/main/index.html.j2 b/app/templates/main/index.html.j2 similarity index 100% rename from web/app/templates/main/index.html.j2 rename to app/templates/main/index.html.j2 diff --git a/web/app/templates/main/news.html.j2 b/app/templates/main/news.html.j2 similarity index 100% rename from web/app/templates/main/news.html.j2 rename to app/templates/main/news.html.j2 diff --git a/web/app/templates/main/privacy_policy.html.j2 b/app/templates/main/privacy_policy.html.j2 similarity index 100% rename from web/app/templates/main/privacy_policy.html.j2 rename to app/templates/main/privacy_policy.html.j2 diff --git a/web/app/templates/main/terms_of_use.html.j2 b/app/templates/main/terms_of_use.html.j2 similarity index 100% rename from web/app/templates/main/terms_of_use.html.j2 rename to app/templates/main/terms_of_use.html.j2 diff --git a/web/app/templates/materialize/base.html.j2 b/app/templates/materialize/base.html.j2 similarity index 100% rename from web/app/templates/materialize/base.html.j2 rename to app/templates/materialize/base.html.j2 diff --git a/web/app/templates/materialize/wtf.html.j2 b/app/templates/materialize/wtf.html.j2 similarity index 100% rename from web/app/templates/materialize/wtf.html.j2 rename to app/templates/materialize/wtf.html.j2 diff --git a/web/app/templates/modals/analysis_init.html.j2 b/app/templates/modals/analysis_init.html.j2 similarity index 100% rename from web/app/templates/modals/analysis_init.html.j2 rename to app/templates/modals/analysis_init.html.j2 diff --git a/web/app/templates/modals/context_modal.html.j2 b/app/templates/modals/context_modal.html.j2 similarity index 100% rename from web/app/templates/modals/context_modal.html.j2 rename to app/templates/modals/context_modal.html.j2 diff --git a/web/app/templates/modals/export_query_results.html.j2 b/app/templates/modals/export_query_results.html.j2 similarity index 100% rename from web/app/templates/modals/export_query_results.html.j2 rename to app/templates/modals/export_query_results.html.j2 diff --git a/web/app/templates/modals/query_builder.html.j2 b/app/templates/modals/query_builder.html.j2 similarity index 100% rename from web/app/templates/modals/query_builder.html.j2 rename to app/templates/modals/query_builder.html.j2 diff --git a/web/app/templates/modals/show_corpus_files.html.j2 b/app/templates/modals/show_corpus_files.html.j2 similarity index 100% rename from web/app/templates/modals/show_corpus_files.html.j2 rename to app/templates/modals/show_corpus_files.html.j2 diff --git a/web/app/templates/modals/show_metadata.html.j2 b/app/templates/modals/show_metadata.html.j2 similarity index 100% rename from web/app/templates/modals/show_metadata.html.j2 rename to app/templates/modals/show_metadata.html.j2 diff --git a/web/app/templates/modals/show_text_details.html.j2 b/app/templates/modals/show_text_details.html.j2 similarity index 100% rename from web/app/templates/modals/show_text_details.html.j2 rename to app/templates/modals/show_text_details.html.j2 diff --git a/web/app/templates/services/_breadcrumbs.html.j2 b/app/templates/services/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/services/_breadcrumbs.html.j2 rename to app/templates/services/_breadcrumbs.html.j2 diff --git a/web/app/templates/services/corpus_analysis.html.j2 b/app/templates/services/corpus_analysis.html.j2 similarity index 100% rename from web/app/templates/services/corpus_analysis.html.j2 rename to app/templates/services/corpus_analysis.html.j2 diff --git a/web/app/templates/services/file_setup.html.j2 b/app/templates/services/file_setup.html.j2 similarity index 100% rename from web/app/templates/services/file_setup.html.j2 rename to app/templates/services/file_setup.html.j2 diff --git a/web/app/templates/services/nlp.html.j2 b/app/templates/services/nlp.html.j2 similarity index 100% rename from web/app/templates/services/nlp.html.j2 rename to app/templates/services/nlp.html.j2 diff --git a/web/app/templates/services/ocr.html.j2 b/app/templates/services/ocr.html.j2 similarity index 100% rename from web/app/templates/services/ocr.html.j2 rename to app/templates/services/ocr.html.j2 diff --git a/web/app/templates/settings/_breadcrumbs.html.j2 b/app/templates/settings/_breadcrumbs.html.j2 similarity index 100% rename from web/app/templates/settings/_breadcrumbs.html.j2 rename to app/templates/settings/_breadcrumbs.html.j2 diff --git a/web/app/templates/settings/_menu.html.j2 b/app/templates/settings/_menu.html.j2 similarity index 100% rename from web/app/templates/settings/_menu.html.j2 rename to app/templates/settings/_menu.html.j2 diff --git a/web/app/templates/settings/change_password.html.j2 b/app/templates/settings/change_password.html.j2 similarity index 100% rename from web/app/templates/settings/change_password.html.j2 rename to app/templates/settings/change_password.html.j2 diff --git a/web/app/templates/settings/edit_general_settings.html.j2 b/app/templates/settings/edit_general_settings.html.j2 similarity index 100% rename from web/app/templates/settings/edit_general_settings.html.j2 rename to app/templates/settings/edit_general_settings.html.j2 diff --git a/web/app/templates/settings/edit_notification_settings.html.j2 b/app/templates/settings/edit_notification_settings.html.j2 similarity index 100% rename from web/app/templates/settings/edit_notification_settings.html.j2 rename to app/templates/settings/edit_notification_settings.html.j2 diff --git a/web/app/templates/tables/query_results.html.j2 b/app/templates/tables/query_results.html.j2 similarity index 100% rename from web/app/templates/tables/query_results.html.j2 rename to app/templates/tables/query_results.html.j2 diff --git a/web/app/templates/tasks/email/notification.html.j2 b/app/templates/tasks/email/notification.html.j2 similarity index 100% rename from web/app/templates/tasks/email/notification.html.j2 rename to app/templates/tasks/email/notification.html.j2 diff --git a/web/app/templates/tasks/email/notification.txt.j2 b/app/templates/tasks/email/notification.txt.j2 similarity index 100% rename from web/app/templates/tasks/email/notification.txt.j2 rename to app/templates/tasks/email/notification.txt.j2 diff --git a/web/boot.sh b/boot.sh similarity index 100% rename from web/boot.sh rename to boot.sh diff --git a/web/config.py b/config.py similarity index 100% rename from web/config.py rename to config.py diff --git a/docker-compose.development.yml b/docker-compose.development.yml index d1ac7719..564eae38 100644 --- a/docker-compose.development.yml +++ b/docker-compose.development.yml @@ -6,10 +6,10 @@ services: - "5000:5000" volumes: # Mount code as volumes - - "./web/app:/home/nopaque/app" - - "./web/boot.sh:/home/nopaque/boot.sh" - - "./web/config.py:/home/nopaque/config.py" - - "./web/migrations:/home/nopaque/migrations" - - "./web/nopaque.py:/home/nopaque/nopaque.py" - - "./web/requirements.txt:/home/nopaque/requirements.txt" - - "./web/tests:/home/nopaque/tests" + - "./app:/home/nopaque/app" + - "./boot.sh:/home/nopaque/boot.sh" + - "./config.py:/home/nopaque/config.py" + - "./migrations:/home/nopaque/migrations" + - "./nopaque.py:/home/nopaque/nopaque.py" + - "./requirements.txt:/home/nopaque/requirements.txt" + - "./tests:/home/nopaque/tests" diff --git a/docker-compose.yml b/docker-compose.yml index 388deb8f..e5c1ecef 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,13 +6,13 @@ services: image: postgres:11 restart: unless-stopped volumes: - - "${HOST_DB_DIR:-./db}:/var/lib/postgresql/data" + - "${HOST_DB_DIR:-./data/db}:/var/lib/postgresql/data" mq: image: redis:6 restart: unless-stopped volumes: - - "${HOST_MQ_DIR:-./mq}:/data" + - "${HOST_MQ_DIR:-./data/mq}:/data" nopaque: build: @@ -20,7 +20,7 @@ services: DOCKER_GID: ${HOST_DOCKER_GID} GID: ${HOST_GID} UID: ${HOST_UID} - context: ./web + context: . depends_on: - db - mq diff --git a/web/migrations/README b/migrations/README similarity index 100% rename from web/migrations/README rename to migrations/README diff --git a/web/migrations/alembic.ini b/migrations/alembic.ini similarity index 100% rename from web/migrations/alembic.ini rename to migrations/alembic.ini diff --git a/web/migrations/env.py b/migrations/env.py similarity index 100% rename from web/migrations/env.py rename to migrations/env.py diff --git a/web/migrations/script.py.mako b/migrations/script.py.mako similarity index 100% rename from web/migrations/script.py.mako rename to migrations/script.py.mako diff --git a/web/migrations/versions/099037c4aa06_.py b/migrations/versions/099037c4aa06_.py similarity index 100% rename from web/migrations/versions/099037c4aa06_.py rename to migrations/versions/099037c4aa06_.py diff --git a/web/migrations/versions/0aa38a7973c5_.py b/migrations/versions/0aa38a7973c5_.py similarity index 100% rename from web/migrations/versions/0aa38a7973c5_.py rename to migrations/versions/0aa38a7973c5_.py diff --git a/web/migrations/versions/0d7aed934679_.py b/migrations/versions/0d7aed934679_.py similarity index 100% rename from web/migrations/versions/0d7aed934679_.py rename to migrations/versions/0d7aed934679_.py diff --git a/web/migrations/versions/10a92d8f4616_.py b/migrations/versions/10a92d8f4616_.py similarity index 100% rename from web/migrations/versions/10a92d8f4616_.py rename to migrations/versions/10a92d8f4616_.py diff --git a/web/migrations/versions/1210adfe1e34_.py b/migrations/versions/1210adfe1e34_.py similarity index 100% rename from web/migrations/versions/1210adfe1e34_.py rename to migrations/versions/1210adfe1e34_.py diff --git a/web/migrations/versions/318074622d14_.py b/migrations/versions/318074622d14_.py similarity index 100% rename from web/migrations/versions/318074622d14_.py rename to migrations/versions/318074622d14_.py diff --git a/web/migrations/versions/33ec4d09b4ca_.py b/migrations/versions/33ec4d09b4ca_.py similarity index 100% rename from web/migrations/versions/33ec4d09b4ca_.py rename to migrations/versions/33ec4d09b4ca_.py diff --git a/web/migrations/versions/389bcf564726_.py b/migrations/versions/389bcf564726_.py similarity index 100% rename from web/migrations/versions/389bcf564726_.py rename to migrations/versions/389bcf564726_.py diff --git a/web/migrations/versions/3d9a20b8b26c_.py b/migrations/versions/3d9a20b8b26c_.py similarity index 100% rename from web/migrations/versions/3d9a20b8b26c_.py rename to migrations/versions/3d9a20b8b26c_.py diff --git a/web/migrations/versions/421ba4373e50_.py b/migrations/versions/421ba4373e50_.py similarity index 100% rename from web/migrations/versions/421ba4373e50_.py rename to migrations/versions/421ba4373e50_.py diff --git a/web/migrations/versions/4638e6509e13_.py b/migrations/versions/4638e6509e13_.py similarity index 100% rename from web/migrations/versions/4638e6509e13_.py rename to migrations/versions/4638e6509e13_.py diff --git a/web/migrations/versions/471aa04c1a92_.py b/migrations/versions/471aa04c1a92_.py similarity index 100% rename from web/migrations/versions/471aa04c1a92_.py rename to migrations/versions/471aa04c1a92_.py diff --git a/web/migrations/versions/4886241e0f5d_.py b/migrations/versions/4886241e0f5d_.py similarity index 100% rename from web/migrations/versions/4886241e0f5d_.py rename to migrations/versions/4886241e0f5d_.py diff --git a/web/migrations/versions/49a42c69e523_.py b/migrations/versions/49a42c69e523_.py similarity index 100% rename from web/migrations/versions/49a42c69e523_.py rename to migrations/versions/49a42c69e523_.py diff --git a/web/migrations/versions/4cf5e5606a83_.py b/migrations/versions/4cf5e5606a83_.py similarity index 100% rename from web/migrations/versions/4cf5e5606a83_.py rename to migrations/versions/4cf5e5606a83_.py diff --git a/web/migrations/versions/55d2b1a82ba9_.py b/migrations/versions/55d2b1a82ba9_.py similarity index 100% rename from web/migrations/versions/55d2b1a82ba9_.py rename to migrations/versions/55d2b1a82ba9_.py diff --git a/web/migrations/versions/5ba6786a847e_.py b/migrations/versions/5ba6786a847e_.py similarity index 100% rename from web/migrations/versions/5ba6786a847e_.py rename to migrations/versions/5ba6786a847e_.py diff --git a/web/migrations/versions/62233e0cb2c7_.py b/migrations/versions/62233e0cb2c7_.py similarity index 100% rename from web/migrations/versions/62233e0cb2c7_.py rename to migrations/versions/62233e0cb2c7_.py diff --git a/web/migrations/versions/6227310c2112_.py b/migrations/versions/6227310c2112_.py similarity index 100% rename from web/migrations/versions/6227310c2112_.py rename to migrations/versions/6227310c2112_.py diff --git a/web/migrations/versions/66253783654f_.py b/migrations/versions/66253783654f_.py similarity index 100% rename from web/migrations/versions/66253783654f_.py rename to migrations/versions/66253783654f_.py diff --git a/web/migrations/versions/68772b6560c3_.py b/migrations/versions/68772b6560c3_.py similarity index 100% rename from web/migrations/versions/68772b6560c3_.py rename to migrations/versions/68772b6560c3_.py diff --git a/web/migrations/versions/6c2227f1cc77_.py b/migrations/versions/6c2227f1cc77_.py similarity index 100% rename from web/migrations/versions/6c2227f1cc77_.py rename to migrations/versions/6c2227f1cc77_.py diff --git a/web/migrations/versions/7378391345fa_.py b/migrations/versions/7378391345fa_.py similarity index 100% rename from web/migrations/versions/7378391345fa_.py rename to migrations/versions/7378391345fa_.py diff --git a/web/migrations/versions/776761fb7466_.py b/migrations/versions/776761fb7466_.py similarity index 100% rename from web/migrations/versions/776761fb7466_.py rename to migrations/versions/776761fb7466_.py diff --git a/web/migrations/versions/790ce9512e75_.py b/migrations/versions/790ce9512e75_.py similarity index 100% rename from web/migrations/versions/790ce9512e75_.py rename to migrations/versions/790ce9512e75_.py diff --git a/web/migrations/versions/8b2e0d43384a_.py b/migrations/versions/8b2e0d43384a_.py similarity index 100% rename from web/migrations/versions/8b2e0d43384a_.py rename to migrations/versions/8b2e0d43384a_.py diff --git a/web/migrations/versions/9d21b228d353_.py b/migrations/versions/9d21b228d353_.py similarity index 100% rename from web/migrations/versions/9d21b228d353_.py rename to migrations/versions/9d21b228d353_.py diff --git a/web/migrations/versions/abf60427ff84_.py b/migrations/versions/abf60427ff84_.py similarity index 100% rename from web/migrations/versions/abf60427ff84_.py rename to migrations/versions/abf60427ff84_.py diff --git a/web/migrations/versions/b15366b25bea_.py b/migrations/versions/b15366b25bea_.py similarity index 100% rename from web/migrations/versions/b15366b25bea_.py rename to migrations/versions/b15366b25bea_.py diff --git a/web/migrations/versions/befe5326787e_.py b/migrations/versions/befe5326787e_.py similarity index 100% rename from web/migrations/versions/befe5326787e_.py rename to migrations/versions/befe5326787e_.py diff --git a/web/migrations/versions/c3827cddea6e_.py b/migrations/versions/c3827cddea6e_.py similarity index 100% rename from web/migrations/versions/c3827cddea6e_.py rename to migrations/versions/c3827cddea6e_.py diff --git a/web/migrations/versions/da9fd175af8c_.py b/migrations/versions/da9fd175af8c_.py similarity index 100% rename from web/migrations/versions/da9fd175af8c_.py rename to migrations/versions/da9fd175af8c_.py diff --git a/web/migrations/versions/ded5a37f8a7b_.py b/migrations/versions/ded5a37f8a7b_.py similarity index 100% rename from web/migrations/versions/ded5a37f8a7b_.py rename to migrations/versions/ded5a37f8a7b_.py diff --git a/web/migrations/versions/e256f5cac75d_.py b/migrations/versions/e256f5cac75d_.py similarity index 100% rename from web/migrations/versions/e256f5cac75d_.py rename to migrations/versions/e256f5cac75d_.py diff --git a/web/migrations/versions/ecaf75fece7b_.py b/migrations/versions/ecaf75fece7b_.py similarity index 100% rename from web/migrations/versions/ecaf75fece7b_.py rename to migrations/versions/ecaf75fece7b_.py diff --git a/web/nopaque-daemon.sh b/nopaque-daemon.sh similarity index 100% rename from web/nopaque-daemon.sh rename to nopaque-daemon.sh diff --git a/web/nopaque.py b/nopaque.py similarity index 100% rename from web/nopaque.py rename to nopaque.py diff --git a/web/requirements.txt b/requirements.txt similarity index 100% rename from web/requirements.txt rename to requirements.txt diff --git a/web/tests/__init__.py b/tests/__init__.py similarity index 100% rename from web/tests/__init__.py rename to tests/__init__.py diff --git a/web/tests/test_basics.py b/tests/test_basics.py similarity index 100% rename from web/tests/test_basics.py rename to tests/test_basics.py diff --git a/web/tests/test_client.py b/tests/test_client.py similarity index 100% rename from web/tests/test_client.py rename to tests/test_client.py diff --git a/web/tests/test_user_model.py b/tests/test_user_model.py similarity index 100% rename from web/tests/test_user_model.py rename to tests/test_user_model.py diff --git a/web/.dockerignore b/web/.dockerignore deleted file mode 100644 index 21803000..00000000 --- a/web/.dockerignore +++ /dev/null @@ -1,6 +0,0 @@ -# Docker related files -Dockerfile -.dockerignore - -# Packages -__pycache__ diff --git a/web/.flaskenv b/web/.flaskenv deleted file mode 100644 index 1fd672d3..00000000 --- a/web/.flaskenv +++ /dev/null @@ -1 +0,0 @@ -FLASK_APP=nopaque.py