diff --git a/movere_local/mainapp/templates/mainapp/create_3d_model.html b/movere_local/mainapp/templates/mainapp/create_3d_model.html
index db29173f771f4680c0fd279397249462f03d5819..434da854a3855bae871b30686305e566d336c1f1 100644
--- a/movere_local/mainapp/templates/mainapp/create_3d_model.html
+++ b/movere_local/mainapp/templates/mainapp/create_3d_model.html
@@ -204,7 +204,7 @@
padding: 10px;
border: none;
border-radius: 20px;
- background-color: rgb(116, 12, 173);
+ background-color: #8d53ff;
color: white;
font-size: 16px;
cursor: pointer;
@@ -213,12 +213,12 @@
}
.card button[type="submit"]:hover {
- background-color: rgb(128, 35, 179); /* Легкое осветление */
+ background-color: #9e6dff; /* Легкое осветление */
transform: scale(1.01); /* Увеличение при наведении */
}
.card button[type="submit"]:active {
- background-color: rgba(128, 35, 179); /* Еще большее осветление */
+ background-color: #9e6dff; /* Еще большее осветление */
transform: scale(1.01); /* Увеличение при клике */
}
diff --git a/movere_local/mainapp/templates/mainapp/create_order.html b/movere_local/mainapp/templates/mainapp/create_order.html
index e0fe9e6355fc4f45f333bf027367b75650c4325d..8ea2ada8db729301b9fde9f57633775645a86ee8 100644
--- a/movere_local/mainapp/templates/mainapp/create_order.html
+++ b/movere_local/mainapp/templates/mainapp/create_order.html
@@ -202,7 +202,7 @@
padding: 10px;
border: none;
border-radius: 20px;
- background-color: rgb(116, 12, 173);
+ background-color: #8d53ff;
color: white;
font-size: 16px;
cursor: pointer;
@@ -211,12 +211,12 @@
}
.card button[type="submit"]:hover {
- background-color: rgb(128, 35, 179); /* Легкое осветление */
+ background-color: #9e6dff; /* Легкое осветление */
transform: scale(1.01); /* Увеличение при наведении */
}
.card button[type="submit"]:active {
- background-color: rgba(128, 35, 179); /* Еще большее осветление */
+ background-color: #9e6dff; /* Еще большее осветление */
transform: scale(1.01); /* Увеличение при клике */
}
diff --git a/movere_local/mainapp/templates/mainapp/home.html b/movere_local/mainapp/templates/mainapp/home.html
index 3d3b8f0fabaa9bbfa2137d39d175575ca96db3d0..e17e7605b9ed700ecfe0c925b22d2908632b690b 100644
--- a/movere_local/mainapp/templates/mainapp/home.html
+++ b/movere_local/mainapp/templates/mainapp/home.html
@@ -1,39 +1,3 @@
-<!--
-
-
-
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Home</title>
- {% load static %} Загрузка тега static
- <link rel="stylesheet" href="{% static 'mainapp/css/styles.css' %}">
-</head>
-<body>
- <h1>Добро пожаловать!</h1>
-
-
-
- {% if is_manager %}
- <button onclick="location.href='{% url 'manager_dashboard' %}'">Панель менеджера</button>
- {% else %}
-
-
-
- <button onclick="location.href='{% url 'view_orders' %}'">Заказы</button>
- <button onclick="location.href='{% url 'storage' %}'">Хранилище</button>
- <button onclick="location.href='{% url 'view_archive' %}'">РђСЂС…РёРІ</button>
- <button onclick="location.href='{% url 'create3d' %}'">Создать 3D!</button>
- <button onclick="location.href='{% url 'home' %}'">Домой</button>
-
- {% endif %}
- <button onclick="location.href='{% url 'profile' %}'">Профиль</button>
-</body>
-</html>
--->
@@ -50,6 +14,9 @@
@import url('https://fonts.googleapis.com/css2?family=Krona+One&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Mulish:wght@200..1000&display=swap');
+ a {
+ text-decoration: none;
+ }
.navbar {
display: flex;
justify-content: space-between;
@@ -109,7 +76,7 @@
color: #FFFFFF;
border: 1px solid #ffffff00; /* Белая рамка */
padding: 15px 30px; /* Увеличенный внутренний отступ */
- font-family: "Roboto", sans-serif;
+ font-family: "Mulish", sans-serif;
/* font-weight: bold; */
font-size: 16px; /* Увеличенный размер шрифта */
border-radius: 20px; /* Скругленные углы */
@@ -154,33 +121,45 @@
}
.card {
- width: 300px;
- height: 400px;
- background-color: #3A3A3A;
- border-radius: 10px;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: flex-end;
- overflow: hidden;
- position: relative;
- cursor: pointer;
- transition: transform 0.3s;
- }
-
- .card:hover {
- transform: scale(1.05);
- }
-
- .card img {
- width: 100%;
- height: 100%;
- object-fit: cover;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 1;
- }
+ position: relative;
+ width: 300px;
+ height: 400px;
+ background-color: #3A3A3A;
+ border-radius: 10px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-end;
+ overflow: hidden;
+ cursor: pointer;
+ transition: transform 0.3s;
+}
+
+.card:hover {
+ transform: scale(1.05);
+}
+
+.card svg {
+ position: absolute;
+ top: 20px;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 80%;
+ height: 80%;
+}
+
+.card svg .color-change {
+ fill: #ffffff; /* Начальный цвет */
+ transition: fill 0.2s ease; /* Плавное изменение цвета */
+}
+
+.card svg .no-change {
+ fill: none; /* Оставляем как есть */
+}
+
+.card:hover svg .color-change {
+ fill: #8d53ff; /* Цвет при наведении */
+}
.card video {
width: 100%;
@@ -199,11 +178,11 @@
.card .label {
position: relative;
- font-family: 'Roboto', Arial, sans-serif;
+ font-family: 'Mulish', Arial, sans-serif;
color: #FFFFFF;
padding: 5px 10px;
border-radius: 5px;
- font-size: 14px;
+ font-size: 20px;
font-weight: bold;
margin-bottom: 5px;
text-align: center;
@@ -211,12 +190,12 @@
}
.card .description {
- font-family: 'Roboto', Arial, sans-serif;
+ font-family: 'Mulish', Arial, sans-serif;
position: relative;
- color: #FFFFFF;
+ color: #c1c1c1;
padding: 5px 10px;
border-radius: 5px;
- font-size: 12px;
+ font-size: 16px;
text-align: center;
margin-bottom: 10px;
z-index: 3;
@@ -264,38 +243,59 @@
<div class="container">
{% if is_manager %}
- <button onclick="location.href='{% url 'manager_dashboard' %}'">Панель менеджера</button>
+ <div class="card">
+ <a href="{% url 'manager_dashboard' %}" class="card">
+ <svg width="250px" height="250px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <path class="color-change" d="M15.2 6l-1.1-0.2c-0.1-0.2-0.1-0.4-0.2-0.6l0.6-0.9 0.5-0.7-2.6-2.6-0.7 0.5-0.9 0.6c-0.2-0.1-0.4-0.1-0.6-0.2l-0.2-1.1-0.2-0.8h-3.6l-0.2 0.8-0.2 1.1c-0.2 0.1-0.4 0.1-0.6 0.2l-0.9-0.6-0.7-0.4-2.5 2.5 0.5 0.7 0.6 0.9c-0.2 0.2-0.2 0.4-0.3 0.6l-1.1 0.2-0.8 0.2v3.6l0.8 0.2 1.1 0.2c0.1 0.2 0.1 0.4 0.2 0.6l-0.6 0.9-0.5 0.7 2.6 2.6 0.7-0.5 0.9-0.6c0.2 0.1 0.4 0.1 0.6 0.2l0.2 1.1 0.2 0.8h3.6l0.2-0.8 0.2-1.1c0.2-0.1 0.4-0.1 0.6-0.2l0.9 0.6 0.7 0.5 2.6-2.6-0.5-0.7-0.6-0.9c0.1-0.2 0.2-0.4 0.2-0.6l1.1-0.2 0.8-0.2v-3.6l-0.8-0.2zM15 9l-1.7 0.3c-0.1 0.5-0.3 1-0.6 1.5l0.9 1.4-1.4 1.4-1.4-0.9c-0.5 0.3-1 0.5-1.5 0.6l-0.3 1.7h-2l-0.3-1.7c-0.5-0.1-1-0.3-1.5-0.6l-1.4 0.9-1.4-1.4 0.9-1.4c-0.3-0.5-0.5-1-0.6-1.5l-1.7-0.3v-2l1.7-0.3c0.1-0.5 0.3-1 0.6-1.5l-1-1.4 1.4-1.4 1.4 0.9c0.5-0.3 1-0.5 1.5-0.6l0.4-1.7h2l0.3 1.7c0.5 0.1 1 0.3 1.5 0.6l1.4-0.9 1.4 1.4-0.9 1.4c0.3 0.5 0.5 1 0.6 1.5l1.7 0.3v2z"></path>
+ <path class="color-change" d="M8 4.5c-1.9 0-3.5 1.6-3.5 3.5s1.6 3.5 3.5 3.5 3.5-1.6 3.5-3.5c0-1.9-1.6-3.5-3.5-3.5zM8 10.5c-1.4 0-2.5-1.1-2.5-2.5s1.1-2.5 2.5-2.5 2.5 1.1 2.5 2.5c0 1.4-1.1 2.5-2.5 2.5z"></path>
+ </svg>
+ <div class="label">ПАНЕЛЬ МЕНЕДЖЕРА</div>
+ <div class="description">Все заявки на 3D печать и управление ими </div>
+ </a>
+ </div>
+
{% else %}
-
- <a href="{% url 'create_order' %}" class="card">
- <img src="{% static 'mainapp/images/tunder.png' %}" alt="Preview">
- <video src="{% static 'mainapp/images/purple_tunder.mp4' %}" muted data-playing="false"></video>
- <div class="label">НАПЕЧАТАТЬ</div>
- <div class="description">Отправить заявку на печать на 3D принтере</div>
- </a>
+ <div class="card">
+ <a href="{% url 'create_order' %}" class="card">
+ <svg width="250px" height="250px" viewBox="0 0 256 256" id="Flat" xmlns="http://www.w3.org/2000/svg">
+ <path class="color-change" d="M226.40723,72.72314c-.0127-.02368-.01856-.04907-.03223-.07251-.00391-.00732-.00977-.01293-.01416-.02026a11.99344,11.99344,0,0,0-4.47754-4.41064l-88-49.5a12.07124,12.07124,0,0,0-11.7666,0l-88,49.5a11.99326,11.99326,0,0,0-4.48389,4.42334c-.00586.01025-.01367.01782-.01953.02783-.01416.02588-.02051.05347-.03418.07959A11.98438,11.98438,0,0,0,28,78.67871v98.64258a12.01534,12.01534,0,0,0,6.1167,10.459l88.00049,49.5a11.97922,11.97922,0,0,0,5.606,1.51343c.085.0061.16553.02686.252.02759h.03613c.1001,0,.19434-.022.293-.0293a11.98372,11.98372,0,0,0,5.5791-1.51172l88-49.5A12.01534,12.01534,0,0,0,228,177.32129V78.67871A11.98919,11.98919,0,0,0,226.40723,72.72314ZM126.03906,25.69238a4.02317,4.02317,0,0,1,3.92188,0l85.91113,48.32471-86.94238,49.39355L40.18945,73.98291Zm-88,155.11524A4.00514,4.00514,0,0,1,36,177.32129V80.80664l88.92822,49.53223-.86865,98.85547Zm179.92188,0-85.90039,48.31909.86816-98.78711L220,80.87305v96.44824A4.00514,4.00514,0,0,1,217.96094,180.80762Z"/>
+ </svg>
+ <div class="label">НАПЕЧАТАТЬ</div>
+ <div class="description">Отправить заявку на печать на 3D принтере</div>
+ </a>
+ </div>
+
<div class="card">
<a href="{% url 'create3d' %}" class="card">
- <!-- <img src="{% static 'mainapp/images/store.png' %}" alt="Preview"> -->
- <!-- <video src="{% static 'mainapp/images/store.mp4' %}" muted data-playing="false"></video> -->
+ <svg width="250px" height="250px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path class="color-change" fill-rule="evenodd" clip-rule="evenodd" d="M12.5 6.00004C12.5 5.31322 12.2163 4.67366 11.7431 4.25578C11.2602 3.82926 10.5847 3.64296 9.87881 3.88387C9.12643 4.14065 8.27977 4.57906 7.61885 5.33233C7.12428 5.89599 6.74984 6.61798 6.58793 7.53045C5.74098 7.65664 5.00843 8.16524 4.47868 8.87157C3.86487 9.68999 3.5 10.7977 3.5 12C3.5 13.2023 3.86487 14.31 4.47868 15.1284C4.99276 15.8139 5.69782 16.3131 6.51308 16.4574C6.50452 16.494 6.5 16.5322 6.5 16.5715C6.5 17.7099 6.9821 18.5424 7.66175 19.1267C8.32466 19.6965 9.1633 20.0221 9.89841 20.212C11.366 20.5912 12.5 19.3418 12.5 18V6.00004ZM7.48691 16.4573C7.49547 16.494 7.5 16.5322 7.5 16.5715C7.5 17.3882 7.83089 17.9534 8.31361 18.3683C8.81308 18.7977 9.48618 19.0727 10.1486 19.2438C10.8199 19.4173 11.5 18.8674 11.5 18V6.00004C11.5 5.58229 11.3265 5.22198 11.0812 5.00533C10.8456 4.79731 10.5413 4.71442 10.2018 4.83027C9.55295 5.05172 8.87946 5.41182 8.37053 5.99186C7.87016 6.56214 7.5 7.37709 7.5 8.57147C7.5 8.84761 7.27614 9.07147 7 9.07147C6.72388 9.07147 6.50003 8.84764 6.5 8.57152C6.04804 8.70228 5.62513 9.00964 5.27868 9.47157C4.80671 10.1009 4.5 10.9932 4.5 12C4.5 13.0068 4.80671 13.8991 5.27868 14.5284C5.75054 15.1576 6.36424 15.5 7 15.5C7.59053 15.5 8.15996 15.2055 8.61676 14.6603C8.79412 14.4487 9.10948 14.4209 9.32114 14.5982C9.53279 14.7756 9.5606 15.091 9.38324 15.3026C8.88463 15.8976 8.23125 16.3255 7.48691 16.4573Z"/>
+ <path class="color-change" fill-rule="evenodd" clip-rule="evenodd" d="M16.55 11.5H14.5C14.2239 11.5 14 11.7239 14 12C14 12.2761 14.2239 12.5 14.5 12.5H16.55C16.7816 13.6411 17.7905 14.5 19 14.5C20.3807 14.5 21.5 13.3807 21.5 12C21.5 10.6193 20.3807 9.5 19 9.5C17.7905 9.5 16.7816 10.3589 16.55 11.5ZM17.5 11.9963C17.502 11.1695 18.1728 10.5 19 10.5C19.8284 10.5 20.5 11.1716 20.5 12C20.5 12.8284 19.8284 13.5 19 13.5C18.1728 13.5 17.502 12.8305 17.5 12.0037L17.5 12L17.5 11.9963Z"/>
+ <path class="color-change" fill-rule="evenodd" clip-rule="evenodd" d="M17.3385 16.132C17.7802 15.7388 18.3622 15.5 19 15.5C20.3807 15.5 21.5 16.6193 21.5 18C21.5 19.3807 20.3807 20.5 19 20.5C17.6193 20.5 16.5 19.3807 16.5 18C16.5 17.6162 16.5865 17.2527 16.741 16.9277C16.7227 16.9166 16.7049 16.9042 16.6877 16.8904L14.1877 14.8904C13.972 14.7179 13.9371 14.4033 14.1096 14.1877C14.2821 13.972 14.5967 13.9371 14.8124 14.1096L17.3124 16.1096C17.3214 16.1168 17.3301 16.1243 17.3385 16.132ZM19 16.5C18.1716 16.5 17.5 17.1716 17.5 18C17.5 18.8284 18.1716 19.5 19 19.5C19.8284 19.5 20.5 18.8284 20.5 18C20.5 17.1716 19.8284 16.5 19 16.5Z" />
+ <path class="color-change" fill-rule="evenodd" clip-rule="evenodd" d="M19 3.5C17.6193 3.5 16.5 4.61929 16.5 6C16.5 6.38376 16.5865 6.74733 16.741 7.07228C16.7227 7.08341 16.7049 7.09584 16.6877 7.10958L14.1877 9.10958C13.972 9.28209 13.9371 9.59674 14.1096 9.81237C14.2821 10.028 14.5967 10.063 14.8124 9.89045L17.3124 7.89045C17.3214 7.88323 17.3301 7.87575 17.3385 7.86804C17.7802 8.26116 18.3622 8.5 19 8.5C20.3807 8.5 21.5 7.38071 21.5 6C21.5 4.61929 20.3807 3.5 19 3.5ZM17.5 6C17.5 5.17157 18.1716 4.5 19 4.5C19.8284 4.5 20.5 5.17157 20.5 6C20.5 6.82843 19.8284 7.5 19 7.5C18.1716 7.5 17.5 6.82843 17.5 6Z" />
+ </svg>
<div class="label">СОЗДАТЬ</div>
<div class="description">Сгенерировать 3D модель РїСЂРё помощи РР</div>
</a>
</div>
<div class="card">
<a href="{% url 'redactor' %}" class="card">
- <!-- <img src="{% static 'mainapp/images/store.png' %}" alt="Preview"> -->
- <!-- <video src="{% static 'mainapp/images/store.mp4' %}" muted data-playing="false"></video> -->
+ <svg width="250px" height="250px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg">
+ <path class="color-change" d="M832 512a32 32 0 1 1 64 0v352a32 32 0 0 1-32 32H160a32 32 0 0 1-32-32V160a32 32 0 0 1 32-32h352a32 32 0 0 1 0 64H192v640h640V512z"/>
+ <path class="color-change" d="m469.952 554.24 52.8-7.552L847.104 222.4a32 32 0 1 0-45.248-45.248L477.44 501.44l-7.552 52.8zm422.4-422.4a96 96 0 0 1 0 135.808l-331.84 331.84a32 32 0 0 1-18.112 9.088L436.8 623.68a32 32 0 0 1-36.224-36.224l15.104-105.6a32 32 0 0 1 9.024-18.112l331.904-331.84a96 96 0 0 1 135.744 0z"/>
+ </svg>
<div class="label">РЕДАКТРР РћР’РђРўР¬</div>
<div class="description">Редактировать 3D модель прямо в браузере</div>
</a>
</div>
<div class="card">
<a href="{% url 'view_story_and_files' %}" class="card">
- <img src="{% static 'mainapp/images/store.png' %}" alt="Preview">
- <video src="{% static 'mainapp/images/store.mp4' %}" muted data-playing="false"></video>
+ <svg width="250px" height="250px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path class="color-change" d="M9.5 2h-6A1.502 1.502 0 0 0 2 3.5v6A1.502 1.502 0 0 0 3.5 11h6A1.502 1.502 0 0 0 11 9.5v-6A1.502 1.502 0 0 0 9.5 2zm.5 7.5a.501.501 0 0 1-.5.5h-6a.501.501 0 0 1-.5-.5v-6a.501.501 0 0 1 .5-.5h6a.501.501 0 0 1 .5.5zM20.5 2h-6A1.502 1.502 0 0 0 13 3.5v6a1.502 1.502 0 0 0 1.5 1.5h6A1.502 1.502 0 0 0 22 9.5v-6A1.502 1.502 0 0 0 20.5 2zm.5 7.5a.501.501 0 0 1-.5.5h-6a.501.501 0 0 1-.5-.5v-6a.501.501 0 0 1 .5-.5h6a.501.501 0 0 1 .5.5zM9.5 13h-6A1.502 1.502 0 0 0 2 14.5v6A1.502 1.502 0 0 0 3.5 22h6a1.502 1.502 0 0 0 1.5-1.5v-6A1.502 1.502 0 0 0 9.5 13zm.5 7.5a.501.501 0 0 1-.5.5h-6a.501.501 0 0 1-.5-.5v-6a.501.501 0 0 1 .5-.5h6a.501.501 0 0 1 .5.5zM20.5 13h-6a1.502 1.502 0 0 0-1.5 1.5v6a1.502 1.502 0 0 0 1.5 1.5h6a1.502 1.502 0 0 0 1.5-1.5v-6a1.502 1.502 0 0 0-1.5-1.5zm.5 7.5a.501.501 0 0 1-.5.5h-6a.501.501 0 0 1-.5-.5v-6a.501.501 0 0 1 .5-.5h6a.501.501 0 0 1 .5.5z"/>
+ <path class="no-change" fill="none" d="M0 0h24v24H0z"/>
+ </svg>
<div class="label">ЗАКАЗЫ РФАЙЛЫ</div>
- <div class="description">Список заявок, запросов, файлов</div>
+ <div class="description">Список заявок, запросов, хранилище и архив </div>
</a>
</div>
diff --git a/movere_local/mainapp/templates/mainapp/manager_dashboard.html b/movere_local/mainapp/templates/mainapp/manager_dashboard.html
index c03bf42bb556327d82098391eb39b11387d190d7..d871488fb910fc3623be615ed7e220eb3a219f84 100644
--- a/movere_local/mainapp/templates/mainapp/manager_dashboard.html
+++ b/movere_local/mainapp/templates/mainapp/manager_dashboard.html
@@ -5,28 +5,416 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Панель менеджера</title>
<style>
- table {
+
+ {% load static %}
+ @import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
+ @import url('https://fonts.googleapis.com/css2?family=Krona+One&display=swap');
+ @import url('https://fonts.googleapis.com/css2?family=Mulish:wght@200..1000&display=swap');
+
+ body {
+ margin: 0;
+ font-family: "Mulish", sans-serif;
+ font-weight: 400;
+ font-style: normal;
+ background-color: #121212;
+ color: #FFFFFF;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ height: 100vh;
+ word-break: break-all;
+ }
+
+ .navbar {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
width: 100%;
- border-collapse: collapse;
+ background-color: #121212; /* Цвет в тон страницы */
+ padding: 30px 20px;
+ position: fixed;
+ top: 0;
+ z-index: 10;
+ word-break: normal;
+ /* box-shadow: 0 2px 5px rgba(0, 0, 0, 0.5); */
}
- th, td {
- border: 1px solid #ddd;
- padding: 8px;
- white-space: nowrap;
+
+ .navbar .logo {
+ display: flex; /* Располагает элементы (логотип и текст) в одну строку */
+ align-items: center; /* Вертикальное выравнивание элементов по центру */
+ margin-left: 100px;
+ margin-top: 20px;
+ /* margin-left: 30px; */
}
- th {
- background-color: #f2f2f2;
+
+ .navbar .logo img {
+ height: 60px; /* Размер логотипа */
+ margin-right: 15px; /* Отступ между логотипом и текстом */
}
- th.sortable:hover {
+
+ .navbar .logo span {
+ font-family: "Krona One", serif;
+ font-size: 20px; /* Размер текста */
+ font-weight: bold;
+ color: #FFFFFF; /* Цвет текста */
+ white-space: nowrap; /* Запрещает перенос текста на новую строку */
+ }
+
+
+ .navbar .profile-btn {
+ background-color: rgb(45, 42, 42);/* Прозрачный фон */
+ color: #FFFFFF;
+ border: 1px solid #ffffff00; /* Белая рамка */
+ padding: 15px 30px; /* Увеличенный внутренний отступ */
+ font-family: "Mulish", sans-serif;
+ /* font-weight: bold; */
+ font-size: 16px; /* Увеличенный размер шрифта */
+ border-radius: 20px; /* Скругленные углы */
cursor: pointer;
+ transition: transform 0.3s, background-color 0.3s, color 0.3s;
+ margin-right: 10%; /*Отступ справа */
+ /* margin-left: 10%; */
}
+
+ .navbar .profile-btn:hover {
+ background-color: rgb(58, 54, 54); /* Полупрозрачный белый при наведении */
+ transform: scale(1.1); /* Увеличение кнопки */
+ }
+
+ .navbar .storage_home_button {
+ background-color: rgb(45, 42, 42);/* Прозрачный фон */
+ color: #FFFFFF;
+ border: 1px solid #ffffff00; /* Белая рамка */
+ padding: 15px 30px; /* Увеличенный внутренний отступ */
+ font-family: "Mulish", sans-serif;
+ /* font-weight: bold; */
+ font-size: 16px; /* Увеличенный размер шрифта */
+ border-radius: 20px; /* Скругленные углы */
+ cursor: pointer;
+ transition: transform 0.3s, background-color 0.3s, color 0.3s;
+ margin-right: 10%; /*Отступ справа */
+ /* margin-left: 10%; */
+ }
+
+ .navbar .storage_home_button:hover {
+ background-color: rgb(58, 54, 54); /* Полупрозрачный белый при наведении */
+ transform: scale(1.1); /* Увеличение кнопки */
+ }
+
+
+ .navbar .btns_in_nav {
+ display: flex;
+ margin-right: 10%;
+ }
+
+
+
+
+ .view_orders_h1 {
+ align-self: flex-start; /* Расположить элемент слева */
+ /* margin: 20px; Отступы сверху и слева */
+ color: rgb(255, 253, 253);
+ font-size: 20px;
+ font-family: "Mulish", sans-serif;
+ /* font-family: "Krona One", serif; */
+ text-align: left;
+ margin-top: 10%;
+ padding: 0 5%;
+
+ }
+
+
+ .container {
+ display: flex;
+ gap: 10px;
+ }
+
+
+ .card {
+ width: 200px;
+ height: 300px;
+ background-color: #3A3A3A;
+ border-radius: 10px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-end;
+ overflow: hidden;
+ position: relative;
+ cursor: pointer;
+ transition: transform 0.3s;
+ }
+
+ .card:hover {
+ transform: scale(1.05);
+ }
+
+ .card img {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 1;
+ }
+
+ .card video {
+ width: 100%;
+ height: 100%;
+ object-fit: cover;
+ display: none;
+ position: absolute;
+ top: 0;
+ left: 0;
+ z-index: 2;
+ }
+
+ .card video[data-playing="true"] {
+ display: block;
+ }
+
+ .card .label {
+ position: relative;
+ font-family: 'Roboto', Arial, sans-serif;
+ color: #FFFFFF;
+ padding: 5px 10px;
+ border-radius: 5px;
+ font-size: 14px;
+ font-weight: bold;
+ margin-bottom: 5px;
+ text-align: center;
+ z-index: 3;
+ }
+
+ .card .description {
+ font-family: 'Roboto', Arial, sans-serif;
+ position: relative;
+ color: #FFFFFF;
+ padding: 5px 10px;
+ border-radius: 5px;
+ font-size: 12px;
+ text-align: center;
+ margin-bottom: 10px;
+ z-index: 3;
+ }
+
+ .home-button {
+ background-color: transparent; /* Фон кнопки прозрачный */
+ position: absolute;
+ padding: 1px 1px; /* Отступы внутри кнопки */
+ top: 7%;
+ right: 3%;
+ width: 7%;
+ font-size: 20px;
+ font-weight: 700;
+ color: rgb(247, 249, 250); /* Цвет текста */
+ border: none; /* Убирает границу */
+ outline: none; /* Убирает контур при фокусе */
+ }
+
+ .create-order-button {
+ display: block;
+ padding: 8px 16px;
+ background-color: transparent;
+ color: white;
+ font-size: 20px;
+ text-decoration: none;
+ border-radius: 5px;
+ text-align: center;
+ transition: background-color 0.3s; /* Добавляем плавную анимацию */
+ z-index: 1000; /* Убедитесь, что кнопка будет видна над другими элементами */
+ }
+
+ .create-order-button:hover {
+ background-color: #4a4646; /* меняем цвет фона на серый при наведении */
+
+ }
+
+ .modal {
+ display: none; /* Скрытое по умолчанию */
+ position: fixed; /* Фиксийрованное положение */
+ z-index: 1; /* Лежит над другими элементами */
+ left: 0;
+ top: 0;
+ width: 100%; /* Полная ширина */
+ height: 100%; /* Полная высота */
+ overflow: auto; /* Включение прокрутки, если необходимо */
+ background-color: rgb(0,0,0); /* Цвет фона */
+ background-color: rgba(0,0,0,0.4); /* Черный фон с небольшой прозрачностью */
+}
+
+.modal-content {
+ background-color: #ad8181;
+ margin: 15% auto; /* 15% сверху и по центру по горизонтали */
+ padding: 20px;
+ border: 1px solid #888;
+ width: 50%; /* Можете изменить ширину */
+}
+
+.close {
+ color: #aaa;
+ float: right;
+ font-size: 28px;
+ font-weight: bold;
+}
+
+.close:hover,
+.close:focus {
+ color: black;
+ cursor: pointer;
+}
+
+
+
+
+table {
+ width: 90%;
+ table-layout: fixed; /* Фиксированная ширина колонок */
+ border-collapse: collapse;
+
+
+ border-spacing: 0;
+ margin: 10px auto;
+ border-radius: 10px;
+ overflow: hidden;
+ background-color: #1e1e1e;
+}
+
+th, td {
+ width: 20%; /* Устанавливаем одинаковую ширину для всех колонок */
+ border-bottom: 1px solid #616161;
+ border-right: 0.5px solid #7b7b7b;
+ padding: 12px 15px;
+ color: #f0f0f0;
+ vertical-align: top; /* Содержимое по верхнему краю */
+}
+
+ th.sortable a {
+ text-decoration: none; /* Отменяем подчеркивание ссылок */
+ color: white; /* Цвет текста ссылок */
+ }
+ th:nth-child(1) { width: 5%; }
+ th:nth-child(2) { width: 12%; }
+ th:nth-child(3) { width: 15%; }
+ th:nth-child(4) { width: 19%; }
+ th:nth-child(5) { width: 19%; }
+ th:nth-child(6) { width: 10%; }
+ th:nth-child(7) { width: 10%; }
+
+
+
+ th:last-child, td:last-child {
+ border-right: none; /* Убирает правую границу у последней колонки */
+ width: 20%;
+ }
+
+
+ th {
+ background-color: #292929; /* Более темный фон для заголовков */
+ color: #ffffff; /* Белый цвет текста для заголовков */
+
+ }
+
+ td {
+ vertical-align: top; /* Выравнивание содержимого ячейки по верху */
+ }
+
+
+ .status-column ul {
+ list-style-type: none; /* Убирает маркеры списка */
+ padding: 0; /* Убирает отступ слева, если он есть */
+ top: 10px;
+ }
+
+ td .order-card {
+ margin: 10px;
+ width: 90%; /* Карточка занимает всю ширину колонки */
+ box-sizing: border-box; /* Включаем padding и border в расчет ширины */
+ /* margin: 0 auto; Центрируем содержимое внутри ячейки */
+ background-color: #4a4646;
+ box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+ border: 2px solid rgba(255, 255, 255, 0.62);
+ border-width: 0.5px;
+ color: white;
+ border-radius: 8px;
+ padding: 10px;
+ text-wrap: wrap;
+
+ }
+ /* .order-card {
+ margin: 10px;
+ padding: 10px;
+ border-radius: 8px;
+ background-color: #4a4646;
+ box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+ border: 2px solid rgba(255, 255, 255, 0.62);
+ border-width: 0.5px;
+ color: white;
+ cursor: pointer;
+ } */
+
+
+ /* Стили для формы */
+
+/* Стили для select элемента */
+select {
+
+ width: 100%; /* ширина, соответствующая ширине формы */
+ padding: 8px; /* внутренний отступ */
+ /* margin-top: 10px; отступ сверху */
+ border: 1px solid #8d53ff; /* граница */
+ border-radius: 4px; /* скругленные углы */
+ display: block; /* блочное отображение */
+ font-family: "Mulish", sans-serif;
+
+}
+
+ button {
+ background-color: #8d53ff; /* цвет фона */
+ width: 100%;
+
+ border: none; /* без рамки */
+ border-radius: 4px; /* скругленные углы */
+ color: white;
+ font-family: "Mulish", sans-serif;
+ }
+
+ .footer {
+ font-family: "Krona One", sans-serif;
+ width: 100%; /* Футер растягивается на всю ширину */
+ text-align: center;
+ /* padding: 10px 20px; Внутренние отступы */
+ background-color: #121212; /* Цвет фона футера */
+ color: #888; /* Цвет текста */
+ font-size: 12px;
+ margin-top: 20px; /* Футер перемещается в самый низ */
+ margin-bottom: 20px;
+ }
+
</style>
+
</head>
<body>
- <h1>Панель менеджера</h1>
- <h2>Все заказы</h2>
- <button onclick="location.href='{% url 'home' %}'">Домой</button>
+
+ <div class="navbar">
+ <div class="logo">
+ <a href="{% url 'home' %}" style="text-decoration: none; color: inherit; display: flex; align-items: center;">
+ <img src="{% static 'mainapp/images/download.png' %}" alt="Logo">
+ <span>MOVERELAB</span>
+ </a>
+ </div>
+ <div class="btns_in_nav">
+ <button class="profile-btn" onclick="location.href='{% url 'home' %}'">Домой</button>
+ <button class="storage_home_button" onclick="location.href='{% url 'profile' %}'">Профиль</button>
+ </div>
+ </div>
+
+ <div class = 'view_orders_h1'>
+ <h1>>>> РЎРџРРЎРћРљ Р—РђРљРђР—РћР’</h1>
+ </div>
+
<table>
<thead>
<tr>
@@ -37,15 +425,22 @@
<th>Файлы</th>
<th class="sortable"><a href="?sort=order_state">Статус</a></th>
<th>Рзменить статус</th>
+
</tr>
</thead>
<tbody>
{% for order in orders %}
<tr>
<td>{{ order.id }}</td>
- <td>{{ order.order_datetime }}</td>
+ <td>{{ order.order_datetime|date:"Y-m-d" }}</td>
<td>{{ order.user.username }}</td>
- <td>{{ order.order_parameters }}</td>
+ <td>
+ {% for key, value in order.parsed_params.items%}
+
+ <li><strong>{{key}}</strong> : {{value}}</span>
+
+ {% endfor %}
+ </td>
<td>
{% if order.file_basename %}
{{ order.file_basename }}
@@ -53,7 +448,12 @@
Нет файлов
{% endif %}
</td>
- <td>{{ order.order_state }}</td>
+ <td> {% if order.order_state == 'wait_confirmation' %}
+ awaiting
+ {% else %}
+ {{ order.order_state }}
+ {% endif %}
+ </td>
<td>
<form method="post" action="{% url 'manager_dashboard' %}">
{% csrf_token %}
@@ -77,6 +477,7 @@
</tbody>
</table>
- <a href="{% url 'home' %}">Назад на главную</a>
+
+ <div class="footer">(C) MOVERELAB</div>
</body>
</html>
diff --git a/movere_local/mainapp/templates/mainapp/redactor.html b/movere_local/mainapp/templates/mainapp/redactor.html
index 400ef6d21aedcc5336df348dada65501de84cfb7..386710df18c289a0629a241ba78a4dfd8ca6a1ff 100644
--- a/movere_local/mainapp/templates/mainapp/redactor.html
+++ b/movere_local/mainapp/templates/mainapp/redactor.html
@@ -216,7 +216,7 @@
}
label {
- background-color: rgb(116, 12, 173);
+ background-color: #8d53ff;
color: white;
padding: 15px 30px;
font-size: 18px;
@@ -227,7 +227,7 @@
}
label:hover {
- background-color: rgb(100, 0, 182);
+ background-color: #9e6dff;
}
.info-text {
@@ -241,7 +241,7 @@
position: absolute;
bottom: 40px;
left: 100px;
- background-color: rgb(116, 12, 173);
+ background-color: #8d53ff;
color: white;
padding: 10px 20px;
border-radius: 20px;
@@ -252,7 +252,7 @@
}
#new-file-button:hover {
- background-color: rgb(100, 0, 182);
+ background-color: #9e6dff;
}
#scale-controls {
@@ -279,7 +279,7 @@
position: absolute;
bottom: 40px;
right: 100px;
- background-color: rgb(116, 12, 173);
+ background-color: #8d53ff;
color: white;
padding: 10px 20px;
border-radius: 20px;
@@ -290,7 +290,7 @@
}
#export-button:hover {
- background-color: rgb(100, 0, 182);
+ background-color: #9e6dff;
}
diff --git a/movere_local/mainapp/templates/mainapp/storage.html b/movere_local/mainapp/templates/mainapp/storage.html
index 197e887af0038cdbf3845b12dc8c46417f56a84e..e28b2045b8f522d092c8d26e101d4053526a3dc4 100644
--- a/movere_local/mainapp/templates/mainapp/storage.html
+++ b/movere_local/mainapp/templates/mainapp/storage.html
@@ -271,7 +271,7 @@
</div>
<div class = 'view_orders_h1'>
- <h1><span style="font-family: 'Krona One', monospace; font-weight: 400; font-size: 40px;">>>></span> Хранилище</h1>
+ <h1><span style="font-family: 'Krona One', monospace; font-weight: 400; font-size: 40px;">>>></span> РҐР РђРќРР›РЩЕ</h1>
</div>
diff --git a/movere_local/mainapp/templates/mainapp/view_story_and_files.html b/movere_local/mainapp/templates/mainapp/view_story_and_files.html
index 7996abee88b7db64b56c15322fa648c043764de3..87ac62964e9b3327ade470403eabdf91f5460395 100644
--- a/movere_local/mainapp/templates/mainapp/view_story_and_files.html
+++ b/movere_local/mainapp/templates/mainapp/view_story_and_files.html
@@ -12,7 +12,11 @@
{% load static %}
@import url('https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap');
@import url('https://fonts.googleapis.com/css2?family=Krona+One&display=swap');
-
+ @import url('https://fonts.googleapis.com/css2?family=Mulish:wght@200..1000&display=swap');
+
+ a {
+ text-decoration: none;
+ }
.navbar {
display: flex;
@@ -118,33 +122,45 @@
}
.card {
- width: 300px;
- height: 400px;
- background-color: #3A3A3A;
- border-radius: 10px;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: flex-end;
- overflow: hidden;
- position: relative;
- cursor: pointer;
- transition: transform 0.3s;
- }
-
- .card:hover {
- transform: scale(1.05);
- }
-
- .card img {
- width: 100%;
- height: 100%;
- object-fit: cover;
- position: absolute;
- top: 0;
- left: 0;
- z-index: 1;
- }
+ position: relative;
+ width: 300px;
+ height: 400px;
+ background-color: #3A3A3A;
+ border-radius: 10px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: flex-end;
+ overflow: hidden;
+ cursor: pointer;
+ transition: transform 0.3s;
+}
+
+.card:hover {
+ transform: scale(1.05);
+}
+
+.card svg {
+ position: absolute;
+ top: 20px;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 80%;
+ height: 80%;
+}
+
+.card svg .color-change {
+ fill: #ffffff; /* Начальный цвет */
+ transition: fill 0.2s ease; /* Плавное изменение цвета */
+}
+
+.card svg .no-change {
+ fill: none; /* Оставляем как есть */
+}
+
+.card:hover svg .color-change {
+ fill: #8d53ff; /* Цвет при наведении */
+}
.card video {
width: 100%;
@@ -163,11 +179,11 @@
.card .label {
position: relative;
- font-family: 'Roboto', Arial, sans-serif;
+ font-family: 'Mulish', Arial, sans-serif;
color: #FFFFFF;
padding: 5px 10px;
border-radius: 5px;
- font-size: 14px;
+ font-size: 20px;
font-weight: bold;
margin-bottom: 5px;
text-align: center;
@@ -175,12 +191,12 @@
}
.card .description {
- font-family: 'Roboto', Arial, sans-serif;
+ font-family: 'Mulish', Arial, sans-serif;
position: relative;
- color: #FFFFFF;
+ color: #c1c1c1;
padding: 5px 10px;
border-radius: 5px;
- font-size: 12px;
+ font-size: 16px;
text-align: center;
margin-bottom: 10px;
z-index: 3;
@@ -230,31 +246,119 @@
<a href="{% url 'view_orders' %}" class="card">
- <!-- <img src="{% static 'mainapp/images/tunder.png' %}" alt="Preview"> -->
- <!-- <video src="{% static 'mainapp/images/purple_tunder.mp4' %}" muted data-playing="false"></video> -->
+ <svg height="250px" width="250px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ viewBox="0 0 470 470" xml:space="preserve">
+ <!-- <path class="color-change" d="M18 5.498l-5.5-2.26L7 5.499v5.655l-5 2.054v6.443l5.5 2.259 5-2.054 5 2.054 5.5-2.26v-6.442l-5-2.054zm-.5 9.462l-3.432-1.404 3.576-1.468 3.432 1.41zM12 8.127v4.669l-4-1.643V6.492zm1 4.669V8.127l4-1.635v4.661zm-2.068.76L7.5 14.96l-3.576-1.463 3.432-1.41zM8 15.836l4-1.636v4.78l-4 1.642zm8.076-10.047L12.5 7.25 8.924 5.79 12.5 4.32zM3 14.2l4 1.636v4.786L3 18.98zm10 0l4 1.636v4.786l-4-1.642zm5 6.422v-4.786l4-1.636v4.78z"/>
+ <path class="no-change" fill="none" d="M0 0h24v24H0z"/> -->
+
+ <path class="color-change" d="M211.683,151.084c-2.086-3.58-6.679-4.788-10.256-2.705l-51.978,30.281c-3.579,2.085-4.79,6.677-2.705,10.256
+ c1.394,2.392,3.906,3.726,6.487,3.726c1.282,0,2.581-0.329,3.769-1.021l51.978-30.281
+ C212.557,159.255,213.768,154.663,211.683,151.084z"/>
+ <path class="color-change" d="M261.021,161.34l51.978,30.28c1.188,0.691,2.486,1.021,3.769,1.021c2.581,0,5.094-1.334,6.487-3.726
+ c2.085-3.579,0.874-8.171-2.705-10.256l-51.978-30.28c-3.579-2.084-8.17-0.875-10.256,2.705
+ C256.231,154.663,257.442,159.255,261.021,161.34z"/>
+ <path class="color-change" d="M149.551,356.399l51.877,30.223c1.188,0.692,2.486,1.021,3.769,1.021c2.581,0,5.094-1.334,6.487-3.726
+ c2.085-3.579,0.874-8.171-2.705-10.256l-51.877-30.223c-3.579-2.088-8.17-0.874-10.256,2.705
+ C144.761,349.723,145.972,354.314,149.551,356.399z"/>
+ <path class="color-change" d="M465.642,267.424c-0.006-0.597-0.084-1.196-0.235-1.787c-0.019-0.072-0.04-0.142-0.061-0.213
+ c-0.063-0.218-0.137-0.434-0.221-0.649c-0.029-0.076-0.057-0.151-0.089-0.226c-0.102-0.238-0.217-0.472-0.346-0.703
+ c-0.018-0.032-0.032-0.067-0.051-0.099c-0.16-0.277-0.323-0.515-0.494-0.745c-0.04-0.054-0.084-0.104-0.126-0.156
+ c-0.148-0.187-0.303-0.366-0.466-0.536c-0.053-0.055-0.106-0.109-0.161-0.163c-0.185-0.181-0.376-0.352-0.577-0.511
+ c-0.034-0.027-0.065-0.056-0.099-0.082c-0.243-0.186-0.495-0.356-0.756-0.51c-0.039-0.026-107.888-62.857-107.888-62.857V72.5
+ c0-0.026-0.005-0.05-0.005-0.076c-0.006-0.597-0.084-1.196-0.235-1.787c-0.019-0.072-0.04-0.142-0.061-0.213
+ c-0.063-0.218-0.137-0.434-0.221-0.649c-0.029-0.076-0.057-0.151-0.089-0.226c-0.102-0.238-0.217-0.472-0.346-0.703
+ c-0.018-0.032-0.032-0.067-0.051-0.099c-0.16-0.278-0.323-0.516-0.495-0.746c-0.039-0.052-0.082-0.101-0.122-0.152
+ c-0.15-0.19-0.307-0.371-0.471-0.542c-0.051-0.053-0.102-0.105-0.155-0.156c-0.188-0.185-0.384-0.36-0.589-0.522
+ c-0.029-0.023-0.056-0.049-0.086-0.071c-0.245-0.189-0.5-0.36-0.764-0.516C350.349,66.02,238.775,1.02,238.775,1.02
+ c-2.334-1.359-5.217-1.359-7.551,0l-111.573,65c-0.297,0.178-0.554,0.351-0.801,0.54c-0.027,0.021-0.052,0.044-0.079,0.066
+ c-0.207,0.164-0.405,0.34-0.595,0.527c-0.052,0.051-0.102,0.102-0.153,0.155c-0.165,0.172-0.322,0.354-0.472,0.544
+ c-0.04,0.051-0.083,0.099-0.122,0.151c-0.172,0.23-0.335,0.468-0.483,0.722c-0.031,0.056-0.045,0.09-0.063,0.123
+ c-0.129,0.231-0.244,0.465-0.346,0.703c-0.032,0.074-0.06,0.15-0.089,0.226c-0.084,0.214-0.158,0.43-0.221,0.649
+ c-0.021,0.071-0.042,0.141-0.06,0.213c-0.152,0.591-0.23,1.19-0.235,1.787c0,0.025-0.005,0.05-0.005,0.076v125.689L8.078,261.02
+ c-0.3,0.18-0.553,0.35-0.796,0.537c-0.033,0.026-0.064,0.054-0.097,0.08c-0.201,0.16-0.393,0.331-0.578,0.512
+ c-0.054,0.053-0.108,0.107-0.16,0.162c-0.163,0.17-0.318,0.349-0.466,0.536c-0.042,0.053-0.086,0.103-0.126,0.157
+ c-0.171,0.229-0.334,0.467-0.482,0.72c-0.031,0.056-0.045,0.09-0.063,0.123c-0.129,0.231-0.244,0.465-0.346,0.703
+ c-0.032,0.074-0.06,0.15-0.089,0.226c-0.084,0.214-0.158,0.43-0.221,0.649c-0.021,0.071-0.042,0.141-0.06,0.213
+ c-0.152,0.591-0.23,1.19-0.235,1.787c0,0.025-0.005,0.05-0.005,0.076v130c0,2.669,1.419,5.137,3.725,6.48l111.573,65
+ c0.021,0.012,0.044,0.02,0.065,0.032c0.268,0.153,0.545,0.293,0.833,0.413c0.28,0.116,0.562,0.208,0.85,0.289
+ c0.071,0.02,0.143,0.037,0.215,0.055c0.225,0.056,0.454,0.101,0.687,0.136c0.077,0.012,0.152,0.026,0.229,0.035
+ c0.295,0.035,0.593,0.059,0.897,0.059s0.603-0.023,0.897-0.059c0.077-0.009,0.152-0.023,0.229-0.035
+ c0.233-0.035,0.462-0.08,0.687-0.136c0.072-0.018,0.144-0.035,0.215-0.055c0.288-0.081,0.57-0.173,0.843-0.286
+ c0.294-0.122,0.571-0.262,0.839-0.416c0.021-0.012,0.044-0.02,0.065-0.032L235,406.18l107.798,62.801
+ c0.021,0.012,0.044,0.02,0.065,0.032c0.268,0.153,0.544,0.293,0.832,0.413c0.281,0.116,0.562,0.208,0.849,0.289
+ c0.072,0.02,0.144,0.038,0.216,0.056c0.225,0.056,0.453,0.101,0.686,0.136c0.077,0.012,0.153,0.026,0.23,0.035
+ c0.295,0.035,0.593,0.059,0.897,0.059s0.602-0.023,0.897-0.059c0.077-0.009,0.153-0.023,0.23-0.035
+ c0.232-0.035,0.461-0.08,0.686-0.136c0.072-0.018,0.144-0.035,0.216-0.056c0.287-0.081,0.569-0.173,0.841-0.286
+ c0.296-0.123,0.572-0.263,0.84-0.416c0.021-0.012,0.044-0.02,0.065-0.032l111.573-65c2.306-1.344,3.725-3.812,3.725-6.48v-130
+ C465.646,267.474,465.642,267.45,465.642,267.424z M443.247,267.5l-96.674,56.32l-96.674-56.32l96.674-56.32L443.247,267.5z
+ M130.927,85.549l96.573,56.261v112.64l-96.573-56.261V85.549z M339.073,198.189L242.5,254.451v-112.64l96.573-56.261V198.189z
+ M227.5,393.189l-96.573,56.262v-112.64l96.573-56.261V393.189z M242.5,280.549l96.573,56.261v112.64L242.5,393.189V280.549z
+ M235,16.18l96.674,56.32L235,128.82L138.326,72.5L235,16.18z M123.427,211.18l96.674,56.32l-96.674,56.32L26.753,267.5
+ L123.427,211.18z M19.354,280.549l96.573,56.261v112.64l-96.573-56.262V280.549z M354.073,449.451v-112.64l96.573-56.261v112.64
+ L354.073,449.451z"/>
+ <path class="color-change" d="M323.156,346.142c-2.086-3.58-6.678-4.788-10.256-2.705l-51.877,30.223c-3.579,2.085-4.79,6.677-2.705,10.256
+ c1.394,2.392,3.906,3.726,6.487,3.726c1.282,0,2.581-0.329,3.769-1.021l51.877-30.223
+ C324.03,354.313,325.241,349.721,323.156,346.142z"/>
+ <path class="color-change" d="M100.109,346.084c-2.086-3.58-6.679-4.788-10.256-2.705l-51.877,30.223c-3.579,2.085-4.79,6.677-2.705,10.256
+ c1.394,2.392,3.906,3.726,6.487,3.726c1.282,0,2.581-0.329,3.769-1.021l51.877-30.223
+ C100.983,354.255,102.194,349.663,100.109,346.084z"/>
+ <path class="color-change" d="M432.024,373.603l-51.676-30.105c-3.579-2.087-8.171-0.875-10.256,2.705c-2.085,3.579-0.874,8.171,2.705,10.256
+ l51.676,30.105c1.188,0.692,2.486,1.021,3.769,1.021c2.581,0,5.094-1.334,6.487-3.726
+ C436.814,380.279,435.604,375.688,432.024,373.603z"/>
+
+
+ </svg>
<div class="label">РњРћР Р—РђРЇР’РљР</div>
<div class="description"></div>
</a>
<div class="card">
<a href="{% url 'view_editrequests' %}" class="card">
- <!-- <img src="{% static 'mainapp/images/store.png' %}" alt="Preview"> -->
- <!-- <video src="{% static 'mainapp/images/store.mp4' %}" muted data-playing="false"></video> -->
- <div class="label">МОРМОДЕЛР</div>
- <div class="description">РР</div>
+ <svg width="800px" height="800px" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+ <path class="color-change" d="M6,19.7439414 C4.25221144,19.1261868 3,17.4593282 3,15.5 L3,8.5 C3,6.01471863 5.01471863,4 7.5,4 L8,4 L8,3.5 C8,2.67157288 8.67157288,2 9.5,2 L14.5,2 C15.3284271,2 16,2.67157288 16,3.5 L16,4 L16.5,4 C18.9852814,4 21,6.01471863 21,8.5 L21,15.5 C21,17.4593282 19.7477886,19.1261868 18,19.7439414 L18,20.5 C18,21.3284271 17.3284271,22 16.5,22 L7.5,22 C6.67157288,22 6,21.3284271 6,20.5 L6,19.7439414 L6,19.7439414 Z M7,19.9725356 L7,20.5 C7,20.7761424 7.22385763,21 7.5,21 L16.5,21 C16.7761424,21 17,20.7761424 17,20.5 L17,19.9725356 C16.8358331,19.9906833 16.6690045,20 16.5,20 L7.5,20 C7.33099545,20 7.16416693,19.9906833 7,19.9725356 L7,19.9725356 Z M9,4 L15,4 L15,3.5 C15,3.22385763 14.7761424,3 14.5,3 L9.5,3 C9.22385763,3 9,3.22385763 9,3.5 L9,4 Z M7.5,5 C5.56700338,5 4,6.56700338 4,8.5 L4,15.5 C4,17.4329966 5.56700338,19 7.5,19 L16.5,19 C18.4329966,19 20,17.4329966 20,15.5 L20,8.5 C20,6.56700338 18.4329966,5 16.5,5 L7.5,5 Z M14.5,10 L15.5,10 C15.7761424,10 16,10.2238576 16,10.5 L16,11.5 C16,11.7761424 15.7761424,12 15.5,12 L14.5,12 C14.2238576,12 14,11.7761424 14,11.5 L14,10.5 C14,10.2238576 14.2238576,10 14.5,10 Z M8.5,10 L9.5,10 C9.77614237,10 10,10.2238576 10,10.5 L10,11.5 C10,11.7761424 9.77614237,12 9.5,12 L8.5,12 C8.22385763,12 8,11.7761424 8,11.5 L8,10.5 C8,10.2238576 8.22385763,10 8.5,10 Z M9.14644661,14.8535534 C8.95118446,14.6582912 8.95118446,14.3417088 9.14644661,14.1464466 C9.34170876,13.9511845 9.65829124,13.9511845 9.85355339,14.1464466 C10.4248566,14.7177498 11.1304821,15 12,15 C12.8695179,15 13.5751434,14.7177498 14.1464466,14.1464466 C14.3417088,13.9511845 14.6582912,13.9511845 14.8535534,14.1464466 C15.0488155,14.3417088 15.0488155,14.6582912 14.8535534,14.8535534 C14.0915232,15.6155836 13.1304821,16 12,16 C10.8695179,16 9.90847678,15.6155836 9.14644661,14.8535534 Z"/>
+ </svg>
+ <div class="label">МОРГЕНЕРАЦРР</div>
+ <div class="description"></div>
</a>
</div>
<div class="card">
<a href="{% url 'view_archive' %}" class="card">
- <!-- <img src="{% static 'mainapp/images/store.png' %}" alt="Preview"> -->
- <!-- <video src="{% static 'mainapp/images/store.mp4' %}" muted data-playing="false"></video> -->
+ <svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+ <path class="color-change" fill-rule="evenodd" clip-rule="evenodd" d="M5.07868 5.06891C8.87402 1.27893 15.0437 1.31923 18.8622 5.13778C22.6824 8.95797 22.7211 15.1313 18.9262 18.9262C15.1312 22.7211 8.95793 22.6824 5.13774 18.8622C2.87389 16.5984 1.93904 13.5099 2.34047 10.5812C2.39672 10.1708 2.775 9.88377 3.18537 9.94002C3.59575 9.99627 3.88282 10.3745 3.82658 10.7849C3.4866 13.2652 4.27782 15.881 6.1984 17.8016C9.44288 21.0461 14.6664 21.0646 17.8655 17.8655C21.0646 14.6664 21.046 9.44292 17.8015 6.19844C14.5587 2.95561 9.33889 2.93539 6.13935 6.12957L6.88705 6.13333C7.30126 6.13541 7.63535 6.47288 7.63327 6.88709C7.63119 7.3013 7.29372 7.63539 6.87951 7.63331L4.33396 7.62052C3.92269 7.61845 3.58981 7.28556 3.58774 6.8743L3.57495 4.32874C3.57286 3.91454 3.90696 3.57707 4.32117 3.57498C4.73538 3.5729 5.07285 3.907 5.07493 4.32121L5.07868 5.06891ZM11.9999 7.24992C12.4141 7.24992 12.7499 7.58571 12.7499 7.99992V11.6893L15.0302 13.9696C15.3231 14.2625 15.3231 14.7374 15.0302 15.0302C14.7373 15.3231 14.2624 15.3231 13.9696 15.0302L11.2499 12.3106V7.99992C11.2499 7.58571 11.5857 7.24992 11.9999 7.24992Z"/>
+ </svg>
<div class="label">РђР РҐРР’</div>
<div class="description"></div>
</a>
</div>
<div class="card">
<a href="{% url 'storage' %}" class="card">
- <img src="{% static 'mainapp/images/store.png' %}" alt="Preview">
- <video src="{% static 'mainapp/images/store.mp4' %}" muted data-playing="false"></video>
+ <svg version="1.1" id="CLOUD_NETWORK" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px"
+ y="0px" width="800px" height="800px" viewBox="0 0 1800 1800" enable-background="new 0 0 1800 1800" xml:space="preserve">
+ <path class="color-change" d="M1635.687,1278.4c-47.769,0-88.294,31.611-101.762,75.016h-145.789v-349.629h73.367
+ c4.988,0.22,9.674,0.326,14.307,0.326c4.782,0,9.635-0.115,14.817-0.348c0.079-0.005,0.158-0.01,0.237-0.01
+ c173.133-7.938,308.756-150.018,308.756-323.454c0-134.669-81.956-253.44-205.979-301.697
+ c-14.456-100.161-63.179-192.209-138.563-260.994c-80.945-73.862-185.92-114.539-295.579-114.539
+ c-137.799,0-266.188,64.115-349.019,172.916c-45.162-22.9-95.19-34.891-146.321-34.891c-139.064,0-261.005,87.974-305.833,217.184
+ c-11.335-1.191-22.746-1.793-34.13-1.793C145.642,356.487,0.38,501.749,0.38,680.302c0,178.549,145.262,323.812,323.815,323.812
+ c5.393,0,10.958-0.146,16.592-0.436c0.875,0.074,1.758,0.109,2.65,0.109h72.515v349.629h-145.79
+ c-13.467-43.404-53.993-75.016-101.761-75.016c-58.735,0-106.521,47.787-106.521,106.521c0,58.735,47.786,106.521,106.521,106.521
+ c47.769,0,88.294-31.611,101.761-75.016h177.295c17.401,0,31.506-14.104,31.506-31.506v-381.135h194.534v586.93
+ c-43.404,13.463-75.016,53.988-75.016,101.762c0,58.735,47.787,106.521,106.521,106.521s106.521-47.786,106.521-106.521
+ c0-47.773-31.611-88.299-75.016-101.762v-586.93h331.067v586.93c-43.403,13.463-75.016,53.988-75.016,101.762
+ c0,58.735,47.787,106.521,106.521,106.521c58.735,0,106.522-47.786,106.522-106.521c0-47.773-31.612-88.299-75.016-101.762v-586.93
+ h194.534v381.135c0,17.401,14.104,31.506,31.506,31.506h177.295c13.468,43.404,53.993,75.016,101.762,75.016
+ c58.735,0,106.521-47.786,106.521-106.521C1742.208,1326.188,1694.422,1278.4,1635.687,1278.4z M168.401,1428.432
+ c-23.99,0-43.51-19.52-43.51-43.51s19.52-43.51,43.51-43.51c23.99,0,43.51,19.52,43.51,43.51S192.391,1428.432,168.401,1428.432z
+ M705.004,1735.988c-23.99,0-43.51-19.52-43.51-43.51s19.52-43.51,43.51-43.51s43.51,19.52,43.51,43.51
+ S728.994,1735.988,705.004,1735.988z M1099.083,1735.988c-23.989,0-43.509-19.52-43.509-43.51s19.52-43.51,43.509-43.51
+ c23.99,0,43.51,19.52,43.51,43.51S1123.073,1735.988,1099.083,1735.988z M341.398,940.525c-5.886,0.382-11.674,0.575-17.204,0.575
+ c-143.807,0-260.803-116.996-260.803-260.799c0-143.807,116.996-260.803,260.803-260.803c16.909,0,33.875,1.644,50.428,4.883
+ c16.469,3.2,32.53-7.002,36.608-23.247c29.133-116.007,133.14-197.026,252.927-197.026c49.272,0,97.252,13.81,138.753,39.941
+ c14.479,9.116,33.615,5.006,43.062-9.279c69.877-105.629,187.079-168.687,313.525-168.687c194.314,0,355.039,145.629,373.86,338.749
+ c1.222,12.531,9.784,23.133,21.783,26.961c108.539,34.626,181.467,134.493,181.467,248.509c0,139.628-109.119,254.017-248.452,260.5
+ c-0.065,0-0.127,0.005-0.193,0.009c-8.602,0.387-15.744,0.387-24.311,0c-0.479-0.021-0.963-0.035-1.441-0.035H347.895
+ C345.763,940.468,343.587,940.385,341.398,940.525z M1635.687,1428.432c-23.99,0-43.51-19.52-43.51-43.51s19.52-43.51,43.51-43.51
+ s43.51,19.52,43.51,43.51S1659.677,1428.432,1635.687,1428.432z"/>
+ </svg>
<div class="label">РҐР РђРќРР›РЩЕ</div>
<div class="description"></div>
</a>
diff --git a/movere_local/mainapp/views.py b/movere_local/mainapp/views.py
index 7a5ab00b78d7dd184027d79b3e2b588e67c57fd5..97001831a27bcb2ce584fc52eff2334ce676b3b4 100644
--- a/movere_local/mainapp/views.py
+++ b/movere_local/mainapp/views.py
@@ -17,7 +17,7 @@ from rest_framework.response import Response
from rest_framework.decorators import api_view
from .models import Order
from .serializers import OrderSerializer
-
+import ast
@@ -539,6 +539,11 @@ def logout(request):
@login_required
def manager_dashboard(request):
+
+
+ def parse_params(parametrs):
+ d = ast.literal_eval(parametrs)
+ return d
if request.user.groups.filter(name='manager').exists():
if request.method == 'POST':
order_id = request.POST.get('order_id')
@@ -557,8 +562,14 @@ def manager_dashboard(request):
sort_by = 'order_datetime'
# Получаем все заказы для отображения
+
orders = Order.objects.all().order_by(sort_by)
for order in orders:
+ try:
+ parsed_params = parse_params(order.order_parameters)
+ order.parsed_params = parsed_params
+ except:
+ order.parsed_params = {}
if order.file_path:
order.file_basename = os.path.basename(order.file_path)
else: