From a2d617718be89990ffca028151a77e46e04bdb1b Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Nov 2023 11:05:56 +0100 Subject: [PATCH 1/4] Update .vscode directory contents --- .vscode/extensions.json | 5 +++-- .vscode/settings.json | 6 +----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index ecf868e0..0af05016 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,7 +1,8 @@ { "recommendations": [ - "samuelcolvin.jinjahtml", + "mikestead.dotenv", "ms-azuretools.vscode-docker", - "ms-python.python" + "ms-python.python", + "wholroyd.jinja" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index abafcbe3..3cf5f82d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,7 +1,6 @@ { "editor.rulers": [79], "files.insertFinalNewline": true, - "python.terminal.activateEnvironment": false, "[css]": { "editor.tabSize": 2 }, @@ -14,10 +13,7 @@ "[javascript]": { "editor.tabSize": 2 }, - "[jinja-html]": { - "editor.tabSize": 2 - }, - "[jinja-js]": { + "[jinja]": { "editor.tabSize": 2 } } From 79bafdea8916f94f507b95f7079e5ce3120e6507 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Mon, 20 Nov 2023 15:26:22 +0100 Subject: [PATCH 2/4] Switch back to older settings and extension .vscode setup --- .vscode/extensions.json | 4 ++-- .vscode/settings.json | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 0af05016..6dab7cd6 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,8 +1,8 @@ { "recommendations": [ - "mikestead.dotenv", + "irongeek.vscode-env", "ms-azuretools.vscode-docker", "ms-python.python", - "wholroyd.jinja" + "samuelcolvin.jinjahtml" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index 3cf5f82d..a8cd0c3d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -4,16 +4,16 @@ "[css]": { "editor.tabSize": 2 }, - "[scss]": { - "editor.tabSize": 2 - }, "[html]": { "editor.tabSize": 2 }, "[javascript]": { "editor.tabSize": 2 }, - "[jinja]": { + "[jinja-html]": { + "editor.tabSize": 2 + }, + "[scss]": { "editor.tabSize": 2 } } From 1bb1408988fdd6caa560d47eb7679b6be849e792 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Nov 2023 10:11:49 +0100 Subject: [PATCH 3/4] make the workshops package fit the new file scheme --- .../{_aufgaben.html.j2 => aufgaben.html.j2} | 0 .../{_vorbereitungen.html.j2 => vorbereitungen.html.j2} | 0 app/templates/workshops/fgho_sommerschule_2023.html.j2 | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) rename app/templates/workshops/_fgho_sommerschule_2023/{_aufgaben.html.j2 => aufgaben.html.j2} (100%) rename app/templates/workshops/_fgho_sommerschule_2023/{_vorbereitungen.html.j2 => vorbereitungen.html.j2} (100%) diff --git a/app/templates/workshops/_fgho_sommerschule_2023/_aufgaben.html.j2 b/app/templates/workshops/_fgho_sommerschule_2023/aufgaben.html.j2 similarity index 100% rename from app/templates/workshops/_fgho_sommerschule_2023/_aufgaben.html.j2 rename to app/templates/workshops/_fgho_sommerschule_2023/aufgaben.html.j2 diff --git a/app/templates/workshops/_fgho_sommerschule_2023/_vorbereitungen.html.j2 b/app/templates/workshops/_fgho_sommerschule_2023/vorbereitungen.html.j2 similarity index 100% rename from app/templates/workshops/_fgho_sommerschule_2023/_vorbereitungen.html.j2 rename to app/templates/workshops/_fgho_sommerschule_2023/vorbereitungen.html.j2 diff --git a/app/templates/workshops/fgho_sommerschule_2023.html.j2 b/app/templates/workshops/fgho_sommerschule_2023.html.j2 index bcfb6741..fce5faf9 100644 --- a/app/templates/workshops/fgho_sommerschule_2023.html.j2 +++ b/app/templates/workshops/fgho_sommerschule_2023.html.j2 @@ -12,11 +12,11 @@
- {% include "workshops/_fgho_sommerschule_2023/_vorbereitungen.html.j2" %} + {% include "workshops/_fgho_sommerschule_2023/vorbereitungen.html.j2" %}
- {% include "workshops/_fgho_sommerschule_2023/_aufgaben.html.j2" %} + {% include "workshops/_fgho_sommerschule_2023/aufgaben.html.j2" %}
From 9627708950c1974dd097d774f15ed09b5ec60435 Mon Sep 17 00:00:00 2001 From: Patrick Jentsch Date: Tue, 21 Nov 2023 12:31:10 +0100 Subject: [PATCH 4/4] rename manual files to fit new naming convention --- ...roduction.html.j2 => 01_introduction.html.j2} | 0 ...tml.j2 => 02_registration_and_log_in.html.j2} | 0 ...03_dashboard.html.j2 => 03_dashboard.html.j2} | 0 ...{_06_services.html.j2 => 06_services.html.j2} | 0 ...a_closer_look_at_the_corpus_analysis.html.j2} | 0 ...age.html.j2 => 08_cqp_query_language.html.j2} | 0 ..._builder.html.j2 => 09_query_builder.html.j2} | 0 .../{_10_tagsets.html.j2 => 10_tagsets.html.j2} | 0 app/templates/_base/_modals/manual.html.j2 | 16 ++++++++-------- 9 files changed, 8 insertions(+), 8 deletions(-) rename app/templates/_base/_modals/_manual/{_01_introduction.html.j2 => 01_introduction.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_02_registration_and_log_in.html.j2 => 02_registration_and_log_in.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_03_dashboard.html.j2 => 03_dashboard.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_06_services.html.j2 => 06_services.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_07_a_closer_look_at_the_corpus_analysis.html.j2 => 07_a_closer_look_at_the_corpus_analysis.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_08_cqp_query_language.html.j2 => 08_cqp_query_language.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_09_query_builder.html.j2 => 09_query_builder.html.j2} (100%) rename app/templates/_base/_modals/_manual/{_10_tagsets.html.j2 => 10_tagsets.html.j2} (100%) diff --git a/app/templates/_base/_modals/_manual/_01_introduction.html.j2 b/app/templates/_base/_modals/_manual/01_introduction.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_01_introduction.html.j2 rename to app/templates/_base/_modals/_manual/01_introduction.html.j2 diff --git a/app/templates/_base/_modals/_manual/_02_registration_and_log_in.html.j2 b/app/templates/_base/_modals/_manual/02_registration_and_log_in.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_02_registration_and_log_in.html.j2 rename to app/templates/_base/_modals/_manual/02_registration_and_log_in.html.j2 diff --git a/app/templates/_base/_modals/_manual/_03_dashboard.html.j2 b/app/templates/_base/_modals/_manual/03_dashboard.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_03_dashboard.html.j2 rename to app/templates/_base/_modals/_manual/03_dashboard.html.j2 diff --git a/app/templates/_base/_modals/_manual/_06_services.html.j2 b/app/templates/_base/_modals/_manual/06_services.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_06_services.html.j2 rename to app/templates/_base/_modals/_manual/06_services.html.j2 diff --git a/app/templates/_base/_modals/_manual/_07_a_closer_look_at_the_corpus_analysis.html.j2 b/app/templates/_base/_modals/_manual/07_a_closer_look_at_the_corpus_analysis.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_07_a_closer_look_at_the_corpus_analysis.html.j2 rename to app/templates/_base/_modals/_manual/07_a_closer_look_at_the_corpus_analysis.html.j2 diff --git a/app/templates/_base/_modals/_manual/_08_cqp_query_language.html.j2 b/app/templates/_base/_modals/_manual/08_cqp_query_language.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_08_cqp_query_language.html.j2 rename to app/templates/_base/_modals/_manual/08_cqp_query_language.html.j2 diff --git a/app/templates/_base/_modals/_manual/_09_query_builder.html.j2 b/app/templates/_base/_modals/_manual/09_query_builder.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_09_query_builder.html.j2 rename to app/templates/_base/_modals/_manual/09_query_builder.html.j2 diff --git a/app/templates/_base/_modals/_manual/_10_tagsets.html.j2 b/app/templates/_base/_modals/_manual/10_tagsets.html.j2 similarity index 100% rename from app/templates/_base/_modals/_manual/_10_tagsets.html.j2 rename to app/templates/_base/_modals/_manual/10_tagsets.html.j2 diff --git a/app/templates/_base/_modals/manual.html.j2 b/app/templates/_base/_modals/manual.html.j2 index 34ce1877..4660db74 100644 --- a/app/templates/_base/_modals/manual.html.j2 +++ b/app/templates/_base/_modals/manual.html.j2 @@ -13,35 +13,35 @@

- {% include "_base/_modals/_manual/_01_introduction.html.j2" %} + {% include "_base/_modals/_manual/01_introduction.html.j2" %}

- {% include "_base/_modals/_manual/_02_registration_and_log_in.html.j2" %} + {% include "_base/_modals/_manual/02_registration_and_log_in.html.j2" %}

- {% include "_base/_modals/_manual/_03_dashboard.html.j2" %} + {% include "_base/_modals/_manual/03_dashboard.html.j2" %}

- {% include "_base/_modals/_manual/_06_services.html.j2" %} + {% include "_base/_modals/_manual/06_services.html.j2" %}

- {% include "_base/_modals/_manual/_07_a_closer_look_at_the_corpus_analysis.html.j2" %} + {% include "_base/_modals/_manual/07_a_closer_look_at_the_corpus_analysis.html.j2" %}

- {% include "_base/_modals/_manual/_08_cqp_query_language.html.j2" %} + {% include "_base/_modals/_manual/08_cqp_query_language.html.j2" %}

- {% include "_base/_modals/_manual/_09_query_builder.html.j2" %} + {% include "_base/_modals/_manual/09_query_builder.html.j2" %}

- {% include "_base/_modals/_manual/_10_tagsets.html.j2" %} + {% include "_base/_modals/_manual/10_tagsets.html.j2" %}