From 251f6deec6deb7bffaca9ded895f25abe2a774ad Mon Sep 17 00:00:00 2001
From: Anton Kamalov <kamalovap@paksurion.ru>
Date: Sat, 30 Nov 2024 18:11:25 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B2=20=D0=BE=D1=81=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=BC=D0=B5=D0=BD=D1=8E=20=D0=B8=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B5=20=D1=80=D0=B5=D0=B7=D1=83?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App/templates/main_menu.html | 47 +++++++++++++++++++++++++++-
 App/templates/output.html    | 59 ++++++++++++++++++------------------
 2 files changed, 76 insertions(+), 30 deletions(-)

diff --git a/App/templates/main_menu.html b/App/templates/main_menu.html
index 99ca57e..d001b60 100644
--- a/App/templates/main_menu.html
+++ b/App/templates/main_menu.html
@@ -3,7 +3,6 @@
 <head>
     <meta charset="UTF-8">
     <title>Главное меню</title>
-    <link href="static/css/main.css" type="text/css" rel="stylesheet">
     <link
       href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css"
       rel="stylesheet"
@@ -15,6 +14,7 @@
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
 </head>
 <body class="p-3 m-0 border-0 bd-example m-0 border-0">
+  <header
     <div class="row flex-nowrap justify-content-between">
         <div class="col-1 pt-1"></div>
         <div class="col-10 text-center">
@@ -32,6 +32,51 @@
           {% endif %}
         </div>
     </div>
+  </header>
+  <main class="flex-shrink-0">
+    <div class="d-flex gap-2 justify-content-center py-5">
+      {% if ses['access_user'] == 'internal_users' %}
+      <div class="d-flex justify-content-center">
+      <div class="feature col">
+        <div
+          class="feature-icon d-inline-flex align-items-center justify-content-center text-bg-primary bg-gradient fs-2 mb-3"
+        >
+        </div>
+        <h3 class="fs-2 text-body-emphasis">Запросы</h3>
+        <!-- <p>
+          Paragraph of text beneath the heading to explain the heading. We'll
+          add onto it with another sentence and probably just keep going until
+          we run out of words.
+        </p> -->
+        <a href="{{ url_for('requests_bp.requests') }}">
+          <button class="btn btn-primary">Перейти</button>
+        </a>
+        <div class="feature col">
+          <div
+            class="feature-icon d-inline-flex align-items-center justify-content-center text-bg-primary bg-gradient fs-2 mb-3"
+          >
+          </div>
+          <h3 class="fs-2 text-body-emphasis">Отчёты</h3>
+          <!-- <p>
+            Paragraph of text beneath the heading to explain the heading. We'll
+            add onto it with another sentence and probably just keep going until
+            we run out of words.
+          </p> -->
+          <a href="{{ url_for('report_bp.menu') }}">
+            <button class="btn btn-primary">Перейти</button>
+          </a>
+        </div>
+      </div>
+      </div>
+      {% else %}
+      <div class="feature col">
+        <div
+          class="feature-icon d-inline-flex align-items-center justify-content-center text-bg-primary bg-gradient fs-2 mb-3"
+        >
+      </div>
+      {% endif %}
+  </div>
+  </main>
     <!-- {% if 'role' in ses %}
 
         <label class="display-5 fw-bold">Добро пожаловать, username</label>
diff --git a/App/templates/output.html b/App/templates/output.html
index e793af9..643c6f6 100644
--- a/App/templates/output.html
+++ b/App/templates/output.html
@@ -13,7 +13,7 @@
     />
     <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
 </head>
-<body>
+<body class="p-3 m-0 border-0 bd-example m-0 border-0">
     <div class="row flex-nowrap justify-content-between">
         <div class="col-1 pt-1"></div>
         <div class="col-10 text-center">
@@ -25,36 +25,37 @@
     </div>
     <!-- Output -->
     {% if items %}
-    <div class="row flex-nowrap justify-content-between">
-        <div class="col-3"></div>
-        <div class="col-6">
-            <table class="table">
-                <thead class="table-dark">
-                    <tr>
-                        {% for key in items[0].keys() %}
-                            <th>{{ key }}</th>
+        <div class="row flex-nowrap justify-content-between py-5">
+            <div class="col-3"></div>
+            <div class="col-6">
+                <table class="table">
+                    <thead class="table-dark">
+                        <tr>
+                            {% for key in items[0].keys() %}
+                                <th>{{ key }}</th>
+                            {% endfor %}
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {% for item in items %}
+                        <tr>
+                            {% for value in item.values() %}
+                                <td>{{ value }}</td>
+                            {% endfor %}
+                        </tr>
                         {% endfor %}
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for item in items %}
-                    <tr>
-                        {% for value in item.values() %}
-                            <td>{{ value }}</td>
-                        {% endfor %}
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
+                    </tbody>
+                </table>
+            </div>
+            <div class="col-3"></div>
         </div>
-        <div class="col-3"></div>
-    </div>
-        
-        
     {% else %}
-        <p>Информации не найдено</p>
+        <div class="d-flex justify-content-center gap-2 py-5">
+            <p>Информации не найдено</p>
+        </div>
     {% endif %}
-    <div class="return">
-        <a href="{{ link }}"><button>Вернуться в меню выбора</button></a>
-    </div></body>
+    <div class="d-flex justify-content-center gap-2">
+        <a href="{{ link }}"><button class="btn btn-primary">Вернуться в меню выбора</button></a>
+    </div>
+</body>
 </html>
\ No newline at end of file