diff --git a/env.example b/env.example
index 27ce975b..bcd994f5 100644
--- a/env.example
+++ b/env.example
@@ -48,6 +48,6 @@ ALGORITHM=HS256
ACCESS_TOKEN_EXPIRE_MINUTES=30
# URLs проекта Procharity
-PROCHARITY_URL=http://test6.procharity.corptest.ru/ # Основной URL проекта
+PROCHARITY_URL=https://test6.procharity.corptest.ru/ # Основной URL проекта
HELP_PROCHARITY_URL=https://help.procharity.ru/ # URL "Ответы на вопросы" проекта
ACCESS_TOKEN_SEND_DATA_TO_PROCHARITY= # Токен для обновления данных на сайте
diff --git a/src/bot/schemas/web_app_query_params.py b/src/bot/schemas/web_app_query_params.py
index fe5b839d..c5807997 100644
--- a/src/bot/schemas/web_app_query_params.py
+++ b/src/bot/schemas/web_app_query_params.py
@@ -23,5 +23,4 @@ class FeedbackFormQueryParams(QueryParams):
class TaskInfoPageQueryParams(QueryParams):
"""Параметры запроса для страницы с информацией о задании."""
- id: NonNegativeInt
- api_root_path: str
+ task_id: NonNegativeInt
diff --git a/src/bot/web_apps.py b/src/bot/web_apps.py
index 30d79af7..1710d6f8 100644
--- a/src/bot/web_apps.py
+++ b/src/bot/web_apps.py
@@ -25,13 +25,10 @@ def get_feedback_web_app_info(user: User) -> WebAppInfo:
def get_task_web_app_info(task: Task) -> WebAppInfo:
"""WebApp для отображения подробной информации о задании и фонде."""
- query_params = TaskInfoPageQueryParams(
- id=task.id,
- api_root_path=settings.ROOT_PATH,
- )
+ query_params = TaskInfoPageQueryParams(task_id=task.id)
return WebAppInfo(
url=urljoin(
- settings.task_info_page_template_url,
+ settings.procharity_task_url,
query_params.as_url_query(),
)
)
diff --git a/src/settings.py b/src/settings.py
index da22edb8..3cd3b574 100644
--- a/src/settings.py
+++ b/src/settings.py
@@ -153,9 +153,9 @@ def feedback_form_template_url(self) -> str:
return urljoin(self.static_url, "feedback_form/feedback_form.html")
@property
- def task_info_page_template_url(self) -> str:
- """Получить url-ссылку на HTML шаблон страницы с информацией о задании."""
- return urljoin(self.static_url, "task_info_page/task_info_page.html")
+ def procharity_task_url(self) -> str:
+ """Получить url-ссылку на страницу с информацией о задании."""
+ return urljoin(self.PROCHARITY_URL, "webapp/")
@property
def procharity_registration_url(self) -> str:
diff --git a/templates/task_info_page/pages/task_info_page.css b/templates/task_info_page/pages/task_info_page.css
deleted file mode 100644
index e69de29b..00000000
diff --git a/templates/task_info_page/scripts/task_info_page.js b/templates/task_info_page/scripts/task_info_page.js
deleted file mode 100644
index 118b118d..00000000
--- a/templates/task_info_page/scripts/task_info_page.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function view_query_parameters(destElementSelector) {
- let destElement = document.querySelector(destElementSelector);
- if (destElement) {
- const searchParams = new URL(document.location).searchParams;
- for (const [key, value] of searchParams) {
- let paramElement = document.createElement('p');
- paramElement.innerText = `${key} = ${value}`;
- destElement.append(paramElement);
- }
- }
-}
-
-view_query_parameters('main');
diff --git a/templates/task_info_page/task_info_page.html b/templates/task_info_page/task_info_page.html
deleted file mode 100644
index 96e727e7..00000000
--- a/templates/task_info_page/task_info_page.html
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
- ProCharity Bot
-
-
-
-
-
-
- Полученные параметры запроса
-
-
-
-
-