From fe43dc0497f1c2d588de6bcd3efbe787559730c2 Mon Sep 17 00:00:00 2001
From: cheeest <e.a.sunduk@gmail.com>
Date: Mon, 7 Apr 2025 15:44:09 +0300
Subject: [PATCH] fix: side nav

---
 templates/_forensicsidenav.html               | 19 +++++++++++++++++++
 .../{_sidenav.html => _mainsidenav.html}      |  2 +-
 templates/_osintsidenav.html                  | 17 +++++++++++++++++
 templates/_task.html                          |  2 +-
 templates/_websidenav.html                    | 19 +++++++++++++++++++
 templates/forensic-main.html                  |  2 +-
 templates/osint-main.html                     |  4 ++--
 templates/osint-questions.html                |  6 ++++++
 templates/sql-injection.html                  |  3 +--
 templates/task1-metadata.html                 |  1 +
 templates/web-main.html                       |  4 ++--
 11 files changed, 70 insertions(+), 9 deletions(-)
 create mode 100644 templates/_forensicsidenav.html
 rename templates/{_sidenav.html => _mainsidenav.html} (88%)
 create mode 100644 templates/_osintsidenav.html
 create mode 100644 templates/_websidenav.html
 create mode 100644 templates/osint-questions.html

diff --git a/templates/_forensicsidenav.html b/templates/_forensicsidenav.html
new file mode 100644
index 0000000..7543104
--- /dev/null
+++ b/templates/_forensicsidenav.html
@@ -0,0 +1,19 @@
+<div class="navigation capsule-window">
+    <div class="decore1"></div>
+    <nav class="navlink">
+        <a href="{{ url_for('index') }}" class="link">На главную</a>
+{%- for link, text in (
+    ('fmetadata',    "Метаданные и как их найти"),
+    ('fbinwalk',  "Что не так с моим докладом?"),
+    ('fbase', "0K3RgtC+INCx0LDQt9Cw"),
+    ('fhex',  "Hex в картинках"),
+    ('fhash',  "Зачем Cat нужен hash"),
+) %}
+    {%- if request.path != url_for(link) %}
+        <a href="{{ url_for(link) }}" class="link">{{ text }}</a>
+    {%- endif %}
+{%- endfor %}
+{#-        <!--    <a href="">rfi</a>--> #}
+{#-        <!--    <a href="">lfi</a>--> #}
+    </nav>
+</div>
diff --git a/templates/_sidenav.html b/templates/_mainsidenav.html
similarity index 88%
rename from templates/_sidenav.html
rename to templates/_mainsidenav.html
index 2b7227c..57ac395 100644
--- a/templates/_sidenav.html
+++ b/templates/_mainsidenav.html
@@ -1,7 +1,7 @@
 <div class="navigation capsule-window">
     <div class="decore1"></div>
     <nav class="navlink">
-        <a href="{{ url_for('index') }}" class="link">на главную</a>
+        <a href="{{ url_for('index') }}" class="link">На главную</a>
 {%- for link, text in (
     ('web', 'Web'),
     ('forensic', 'Форензика'),
diff --git a/templates/_osintsidenav.html b/templates/_osintsidenav.html
new file mode 100644
index 0000000..3dc8202
--- /dev/null
+++ b/templates/_osintsidenav.html
@@ -0,0 +1,17 @@
+<div class="navigation capsule-window">
+    <div class="decore1"></div>
+    <nav class="navlink">
+        <a href="{{ url_for('index') }}" class="link">На главную</a>
+{%- for link, text in (
+    ('osintquestions',    "Чур ответы не гуглить!"),
+    ('osintgeoguessr',  "Мастер яндекс-карт"),
+    ('osintrht', "Реально сложный таск"),
+) %}
+    {%- if request.path != url_for(link) %}
+        <a href="{{ url_for(link) }}" class="link">{{ text }}</a>
+    {%- endif %}
+{%- endfor %}
+{#-        <!--    <a href="">rfi</a>--> #}
+{#-        <!--    <a href="">lfi</a>--> #}
+    </nav>
+</div>
diff --git a/templates/_task.html b/templates/_task.html
index 972ba71..1b4598a 100644
--- a/templates/_task.html
+++ b/templates/_task.html
@@ -10,7 +10,7 @@
 
     {% block content -%}{% endblock -%}
 
-{% include '_sidenav.html' %}
+
     <img id="help" onclick="showPopup()" src="{{ url_for('static', filename='imgs/icon.png') }}">
 </body>
 
diff --git a/templates/_websidenav.html b/templates/_websidenav.html
new file mode 100644
index 0000000..40e370d
--- /dev/null
+++ b/templates/_websidenav.html
@@ -0,0 +1,19 @@
+<div class="navigation capsule-window">
+    <div class="decore1"></div>
+    <nav class="navlink">
+        <a href="{{ url_for('index') }}" class="link">На главную</a>
+{%- for link, text in (
+    ('websql',    "SQL-инъекция"),
+    ('webidor',  "Уязвимость IDOR"),
+    ('webpt', "Уязвимость Path Traversal"),
+    ('webssti',  "Уязвимость SSTI"),
+    ('webpsguide',  "Немного о PortSwigger"),
+) %}
+    {%- if request.path != url_for(link) %}
+        <a href="{{ url_for(link) }}" class="link">{{ text }}</a>
+    {%- endif %}
+{%- endfor %}
+{#-        <!--    <a href="">rfi</a>--> #}
+{#-        <!--    <a href="">lfi</a>--> #}
+    </nav>
+</div>
diff --git a/templates/forensic-main.html b/templates/forensic-main.html
index b2041e1..282a37f 100644
--- a/templates/forensic-main.html
+++ b/templates/forensic-main.html
@@ -2,7 +2,7 @@
     {% include '_head.html' %}
     <body>
         {% include '_header.html' %}
-        {% include '_sidenav.html' %}
+        {% include '_mainsidenav.html' %}
             <div class="container">
                 <div class="small info1 capsule-window">
                 <p class="simpletext">< Задания категории Форензика ></p>
diff --git a/templates/osint-main.html b/templates/osint-main.html
index b0c04a8..cf7d118 100644
--- a/templates/osint-main.html
+++ b/templates/osint-main.html
@@ -2,7 +2,7 @@
     {% include '_head.html' %}
     <body>
         {% include '_header.html' %}
-        {% include '_sidenav.html' %}
+        {% include '_mainsidenav.html' %}
             <div class="container">
                 <div class="small info1 capsule-window">
                 <p class="simpletext">< Задания категории OSINT ></p>
@@ -10,7 +10,7 @@
                 {%- for name, descr in (
                     ('osintquestions',    "Чур ответы не гуглить!"),
                     ('osintgeoguessr',  "Профессионал Яндекс-карт"),
-                    ('osintrht', "UmVhbGx5IGhhcmQgdGFzaw=="),
+                    ('osintrht', "Реально сложный таск"),
                 ) %}
                     <a href="{{ url_for(name) }}" class="btn1">{{ descr }}</a>
                 {%- endfor %}
diff --git a/templates/osint-questions.html b/templates/osint-questions.html
new file mode 100644
index 0000000..79fe760
--- /dev/null
+++ b/templates/osint-questions.html
@@ -0,0 +1,6 @@
+{% extends '_task.html' %}
+{% include '_osintsidenav.html' %}
+{% block content %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/sql-injection.html b/templates/sql-injection.html
index 99d2280..0e11af5 100644
--- a/templates/sql-injection.html
+++ b/templates/sql-injection.html
@@ -1,5 +1,5 @@
 {% extends '_task.html' %}
-
+{% include '_websidenav.html' %}
 {% block content %}
     <div class="container">
         <div id="popup" class="sql-guide capsule-window">
@@ -35,4 +35,3 @@ cursor.execute(f'SELECT * FROM Users WHERE login == "{login}" AND password == "{
     {% endif %}
 
 {% endblock %}
-D
\ No newline at end of file
diff --git a/templates/task1-metadata.html b/templates/task1-metadata.html
index 747e214..db5bfaf 100644
--- a/templates/task1-metadata.html
+++ b/templates/task1-metadata.html
@@ -1,4 +1,5 @@
 {% extends '_task.html' %}
+{% include '_forensicsidenav.html' %}
 {% block content %}
 <div class="container">
     <div class="capsule-window info1">
diff --git a/templates/web-main.html b/templates/web-main.html
index 31462b1..d3f7c31 100644
--- a/templates/web-main.html
+++ b/templates/web-main.html
@@ -2,7 +2,7 @@
     {% include '_head.html' %}
     <body>
         {% include '_header.html' %}
-        {% include '_sidenav.html' %}
+        {% include '_mainsidenav.html' %}
             <div class="container">
                 <div class="small info1 capsule-window">
                 <p class="simpletext">< Задания категории Web ></p>
@@ -12,7 +12,7 @@
                     ('webidor',  "Уязвимость IDOR"),
                     ('webpt', "Уязвимость Path Traversal"),
                     ('webssti',  "Уязвимость SSTI"),
-                    ('webpsguide',  "PortSwigger и с чем его едят"),
+                    ('webpsguide',  "Немного о PortSwigger"),
                 ) %}
                     <a href="{{ url_for(name) }}" class="btn1">{{ descr }}</a>
                 {%- endfor %}