diff --git a/templates/_task.html b/templates/_task.html deleted file mode 100644 index 1b4598a..0000000 --- a/templates/_task.html +++ /dev/null @@ -1,17 +0,0 @@ - - - -{% block head %} - {%- include '_head.html' %} -{%- endblock %} - - -{% include '_header.html' -%} - - {% block content -%}{% endblock -%} - - - - - - diff --git a/templates/forensic-main.html b/templates/forensic-main.html index 282a37f..0894524 100644 --- a/templates/forensic-main.html +++ b/templates/forensic-main.html @@ -1,8 +1,8 @@ - {% include '_head.html' %} + {% include 'utils/_head.html' %} - {% include '_header.html' %} - {% include '_mainsidenav.html' %} + {% include 'utils/_header.html' %} + {% include 'utils/_mainsidenav.html' %}

< Задания категории Форензика >

diff --git a/templates/index.html b/templates/index.html index c9691a2..7bcbe33 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,8 +1,8 @@ -{% include '_head.html' %} +{% include 'utils/_head.html' %} - {% include '_header.html' %} + {% include 'utils/_header.html' %}
@@ -36,7 +36,21 @@

- +

Это ресурс для обучения, где можно попробовать свои силы в самых @@ -56,6 +70,6 @@

- + diff --git a/templates/osint-main.html b/templates/osint-main.html index cf7d118..daaebcd 100644 --- a/templates/osint-main.html +++ b/templates/osint-main.html @@ -1,8 +1,8 @@ - {% include '_head.html' %} + {% include 'utils/_head.html' %} - {% include '_header.html' %} - {% include '_mainsidenav.html' %} + {% include 'utils/_header.html' %} + {% include 'utils/_mainsidenav.html' %}

< Задания категории OSINT >

diff --git a/templates/osint-questions.html b/templates/osint-questions.html index 79fe760..df8ea9f 100644 --- a/templates/osint-questions.html +++ b/templates/osint-questions.html @@ -1,5 +1,5 @@ -{% extends '_task.html' %} -{% include '_osintsidenav.html' %} +{% extends 'utils/_task.html' %} +{% include 'utils/_osintsidenav.html' %} {% block content %} diff --git a/templates/sql-injection.html b/templates/sql-injection.html index 0e11af5..1506e0b 100644 --- a/templates/sql-injection.html +++ b/templates/sql-injection.html @@ -1,9 +1,9 @@ -{% extends '_task.html' %} -{% include '_websidenav.html' %} +{% extends 'utils/_task.html' %} +{% include 'utils/_websidenav.html' %} {% block content %}
-
+
+

Попробуй войти от имени админа,
используя уязвимостьSQL-инъекции. Найдите флаг

@@ -25,7 +26,6 @@ cursor.execute(f'SELECT * FROM Users WHERE login == "{login}" AND password == "{

Пароль:

-
{% if error %} diff --git a/templates/success-sql.html b/templates/success-sql.html index 36cc105..4f9275d 100644 --- a/templates/success-sql.html +++ b/templates/success-sql.html @@ -1,8 +1,8 @@ - {% include '_head.html' %} + {% include 'utils/_head.html' %} - {% include '_header.html' %} + {% include 'utils/_header.html' %}

Ваш Профиль:

@@ -18,7 +18,7 @@
- {% include '_sidenav.html' %} + {% include 'utils/_websidenav.html' %} {% if error %}

{{ error }}

diff --git a/templates/task1-metadata.html b/templates/task1-metadata.html index db5bfaf..a2b8b6a 100644 --- a/templates/task1-metadata.html +++ b/templates/task1-metadata.html @@ -1,5 +1,5 @@ -{% extends '_task.html' %} -{% include '_forensicsidenav.html' %} +{% extends 'utils/_task.html' %} +{% include 'utils/_forensicsidenav.html' %} {% block content %}
diff --git a/templates/_forensicsidenav.html b/templates/utils/_forensicsidenav.html similarity index 100% rename from templates/_forensicsidenav.html rename to templates/utils/_forensicsidenav.html diff --git a/templates/_head.html b/templates/utils/_head.html similarity index 99% rename from templates/_head.html rename to templates/utils/_head.html index 2e46b2d..cac95c9 100644 --- a/templates/_head.html +++ b/templates/utils/_head.html @@ -3,8 +3,6 @@ - - {%- if request.path != url_for('index') %} diff --git a/templates/_header.html b/templates/utils/_header.html similarity index 100% rename from templates/_header.html rename to templates/utils/_header.html diff --git a/templates/_mainsidenav.html b/templates/utils/_mainsidenav.html similarity index 100% rename from templates/_mainsidenav.html rename to templates/utils/_mainsidenav.html diff --git a/templates/_osintsidenav.html b/templates/utils/_osintsidenav.html similarity index 100% rename from templates/_osintsidenav.html rename to templates/utils/_osintsidenav.html diff --git a/templates/utils/_task.html b/templates/utils/_task.html new file mode 100644 index 0000000..638838c --- /dev/null +++ b/templates/utils/_task.html @@ -0,0 +1,17 @@ + + + +{% block head %} + {%- include 'utils/_head.html' %} +{%- endblock %} + + +{% include 'utils/_header.html' -%} + + {% block content -%}{% endblock -%} + + + + + + diff --git a/templates/_websidenav.html b/templates/utils/_websidenav.html similarity index 100% rename from templates/_websidenav.html rename to templates/utils/_websidenav.html diff --git a/templates/web-main.html b/templates/web-main.html index d3f7c31..facffe9 100644 --- a/templates/web-main.html +++ b/templates/web-main.html @@ -1,8 +1,8 @@ - {% include '_head.html' %} + {% include 'utils/_head.html' %} - {% include '_header.html' %} - {% include '_mainsidenav.html' %} + {% include 'utils/_header.html' %} + {% include 'utils/_mainsidenav.html' %}

< Задания категории Web >