From 45e5c5dd91bf77651f6228b724d4e55ae78a0980 Mon Sep 17 00:00:00 2001 From: Simon K <6615834+simon-20@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:23:12 +0100 Subject: [PATCH 1/7] feat: updated tests for move to $web --- tests-local-environment/.env | 2 +- tests/artifacts/config-files/env-file-1 | 2 +- tests/artifacts/config-files/env-file-2 | 2 +- tests/unit/test_config.py | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests-local-environment/.env b/tests-local-environment/.env index 11a82eb..717369a 100644 --- a/tests-local-environment/.env +++ b/tests-local-environment/.env @@ -1,7 +1,7 @@ DATA_REGISTRATION=ckan-registry DATA_REGISTRY_BASE_URL=http://localhost:3000/registration/datasets-03 -BLOB_STORAGE_BASE_PUBLIC_URL=http://127.0.0.1:10000/devstoreaccount1 +WEB_BASE_URL=http://127.0.0.1:10000/devstoreaccount1 NUMBER_DOWNLOADER_THREADS=25 diff --git a/tests/artifacts/config-files/env-file-1 b/tests/artifacts/config-files/env-file-1 index f6f8d2b..49311fe 100644 --- a/tests/artifacts/config-files/env-file-1 +++ b/tests/artifacts/config-files/env-file-1 @@ -1,7 +1,7 @@ DATA_REGISTRATION=ckan-registry DATA_REGISTRY_BASE_URL=http://localhost:3000/registration-service/ -BLOB_STORAGE_BASE_PUBLIC_URL=http://127.0.0.1:10000/devstoreaccount1 +WEB_BASE_URL=http://127.0.0.1:10000/devstoreaccount1 NUMBER_DOWNLOADER_THREADS=1 diff --git a/tests/artifacts/config-files/env-file-2 b/tests/artifacts/config-files/env-file-2 index f010261..6577004 100644 --- a/tests/artifacts/config-files/env-file-2 +++ b/tests/artifacts/config-files/env-file-2 @@ -1,7 +1,7 @@ DATA_REGISTRATION=ckan-registry DATA_REGISTRY_BASE_URL=http://localhost:3000/registration-service/ -BLOB_STORAGE_BASE_PUBLIC_URL=http://127.0.0.1:10000/devstoreaccount1/ +WEB_BASE_URL=http://127.0.0.1:10000/devstoreaccount1/ NUMBER_DOWNLOADER_THREADS=1 diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py index 10eaba0..141a801 100644 --- a/tests/unit/test_config.py +++ b/tests/unit/test_config.py @@ -9,7 +9,7 @@ def test_config_blob_storage_base_url_has_no_trailing_slash_1(): config = get_config() - assert config["BLOB_STORAGE_BASE_PUBLIC_URL"] == 'http://127.0.0.1:10000/devstoreaccount1' + assert config["WEB_BASE_URL"] == 'http://127.0.0.1:10000/devstoreaccount1' def test_config_blob_storage_base_url_has_no_trailing_slash_2(): @@ -18,4 +18,4 @@ def test_config_blob_storage_base_url_has_no_trailing_slash_2(): config = get_config() - assert config["BLOB_STORAGE_BASE_PUBLIC_URL"] == 'http://127.0.0.1:10000/devstoreaccount1' + assert config["WEB_BASE_URL"] == 'http://127.0.0.1:10000/devstoreaccount1' From eaa108cb5547a8c93a9b80fc74981f2e58c7b0b6 Mon Sep 17 00:00:00 2001 From: Simon K <6615834+simon-20@users.noreply.github.com> Date: Tue, 27 Aug 2024 09:24:12 +0100 Subject: [PATCH 2/7] feat: updated web templates --- web/404.html | 66 +++++++++++++++++++++++++++++++++++++++++ web/index-template.html | 33 ++++++++++++--------- 2 files changed, 85 insertions(+), 14 deletions(-) create mode 100644 web/404.html diff --git a/web/404.html b/web/404.html new file mode 100644 index 0000000..8d86bbe --- /dev/null +++ b/web/404.html @@ -0,0 +1,66 @@ + + + + IATI Bulk Data Service + + + + +
+
+
+ + + +
+ +
+
+ IATI Bulk Data Download +
+
+ +
+

404 - Page or file not found

+

The requested page or file was not found.

+
+ + + + + \ No newline at end of file diff --git a/web/index-template.html b/web/index-template.html index d4c5906..5158e3c 100644 --- a/web/index-template.html +++ b/web/index-template.html @@ -7,44 +7,49 @@
-
- +
- -
IATI Bulk Data Service
+
+ IATI Bulk Data Download +

Links

-

IATI Dataset Index - Minimal (JSON)

-

IATI Dataset Index - Full (JSON)

-

IATI Bulk Data Download ZIP

+

IATI Dataset Index - Minimal (JSON)

+

IATI Dataset Index - Full (JSON)

+

IATI Bulk Data Download ZIP

-